add support for user-specified include and lib paths

diff --git a/src/modules/rlm_x99_token/configure b/src/modules/rlm_x99_token/configure
index a9d9cb2..d14e05d 100755 (executable)
--- a/src/modules/rlm_x99_token/configure
+++ b/src/modules/rlm_x99_token/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.4 .
+# From configure.in Revision: 1.5 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53.
 #
@@ -820,6 +820,14 @@ if test -n "$ac_init_help"; then
 
   cat <<\_ACEOF
 
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-rlm-x99-token-lib-dir
+                          directory for x99_token libs
+  --with-rlm-x99-token-include-dir
+                          directory for x99_token includes
+
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -1183,7 +1191,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test x$with_rlm_x99_token != xno; then
 
 
-       ac_ext=c
+               ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -1942,69 +1950,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-echo "$as_me:$LINENO: checking for des_cbc_encrypt in -lcrypto" >&5
-echo $ECHO_N "checking for des_cbc_encrypt in -lcrypto... $ECHO_C" >&6
-if test "${ac_cv_lib_crypto_des_cbc_encrypt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcrypto  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char des_cbc_encrypt ();
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-des_cbc_encrypt ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_crypto_des_cbc_encrypt=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_crypto_des_cbc_encrypt=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_des_cbc_encrypt" >&5
-echo "${ECHO_T}$ac_cv_lib_crypto_des_cbc_encrypt" >&6
-if test $ac_cv_lib_crypto_des_cbc_encrypt = yes; then
-   x99_token_ldflags="$x99_token_ldflags -lcrypto"
-else
-   fail="$fail des_cbc_encrypt"
-
-fi
-
-               ac_ext=c
+ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -2512,6 +2458,85 @@ fi
 
 
 
+
+# Check whether --with-rlm-x99-token-lib-dir or --without-rlm-x99-token-lib-dir was given.
+if test "${with_rlm_x99_token_lib_dir+set}" = set; then
+  withval="$with_rlm_x99_token_lib_dir"
+  x99_token_ldflags="$x99_token_ldflags -L$withval"
+fi;
+
+# Check whether --with-rlm-x99-token-include-dir or --without-rlm-x99-token-include-dir was given.
+if test "${with_rlm_x99_token_include_dir+set}" = set; then
+  withval="$with_rlm_x99_token_include_dir"
+  x99_token_cflags="$x99_token_cflags -I$withval"
+fi;
+
+               x99_save_LIBS="$LIBS"
+       LIBS="$LIBS $x99_token_ldflags"
+       echo "$as_me:$LINENO: checking for des_cbc_encrypt in -lcrypto" >&5
+echo $ECHO_N "checking for des_cbc_encrypt in -lcrypto... $ECHO_C" >&6
+if test "${ac_cv_lib_crypto_des_cbc_encrypt+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcrypto  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char des_cbc_encrypt ();
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
+int
+main ()
+{
+des_cbc_encrypt ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_crypto_des_cbc_encrypt=yes
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_lib_crypto_des_cbc_encrypt=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_des_cbc_encrypt" >&5
+echo "${ECHO_T}$ac_cv_lib_crypto_des_cbc_encrypt" >&6
+if test $ac_cv_lib_crypto_des_cbc_encrypt = yes; then
+   x99_token_ldflags="$x99_token_ldflags -lcrypto"
+else
+   fail="$fail des_cbc_encrypt"
+
+fi
+
+       LIBS="$x99_save_LIBS"
+
        targetname=rlm_x99_token     # keep this!  Don't change!
 else
        targetname=            # keep this!  Don't change!

diff --git a/src/modules/rlm_x99_token/configure.in b/src/modules/rlm_x99_token/configure.in
index dcc325a..d91e357 100644 (file)
--- a/src/modules/rlm_x99_token/configure.in
+++ b/src/modules/rlm_x99_token/configure.in
@@ -8,15 +8,30 @@ if test x$with_[]modname != xno; then
        dnl set $fail to what's missing, on fatal errors.
        dnl use AC_MSG_WARN() on important messages.
 
-       AC_CHECK_LIB(crypto, des_cbc_encrypt,
-               [ x99_token_ldflags="$x99_token_ldflags -lcrypto" ],
-               [ fail="$fail des_cbc_encrypt" ]
-       )
        dnl test for almost-c99 compliant compiler
        AC_CHECK_HEADER(inttypes.h, ,
                [ fail="$fail inttypes.h" ]
        )
 
+       dnl mostly for openssl
+       AC_ARG_WITH(rlm-x99-token-lib-dir,
+                   AC_HELP_STRING([--with-rlm-x99-token-lib-dir],
+                                  [directory for x99_token libs]),
+                   x99_token_ldflags="$x99_token_ldflags -L$withval")
+       AC_ARG_WITH(rlm-x99-token-include-dir,
+                   AC_HELP_STRING([--with-rlm-x99-token-include-dir],
+                                  [directory for x99_token includes]),
+                   x99_token_cflags="$x99_token_cflags -I$withval")
+
+       dnl openssl
+       x99_save_LIBS="$LIBS"
+       LIBS="$LIBS $x99_token_ldflags"
+       AC_CHECK_LIB(crypto, des_cbc_encrypt,
+               [ x99_token_ldflags="$x99_token_ldflags -lcrypto" ],
+               [ fail="$fail des_cbc_encrypt" ]
+       )
+       LIBS="$x99_save_LIBS"
+
        targetname=modname     # keep this!  Don't change!
 else
        targetname=            # keep this!  Don't change!