We don't look for -lcrypto any more on our own, as the top-level

	configure will do that, and we'll pick it up automatically

diff --git a/src/modules/rlm_x99_token/configure b/src/modules/rlm_x99_token/configure
index 457e96a..dc397db 100755 (executable)
--- a/src/modules/rlm_x99_token/configure
+++ b/src/modules/rlm_x99_token/configure
@@ -675,93 +675,6 @@ if test "${with_openssl_includes+set}" = set; then
 fi
 
 
-               x99_save_LIBS="$LIBS"
-       LIBS="$LIBS $x99_token_ldflags"
-               echo $ac_n "checking for DES_cbc_encrypt in -lcrypto""... $ac_c" 1>&6
-echo "configure:682: checking for DES_cbc_encrypt in -lcrypto" >&5
-ac_lib_var=`echo crypto'_'DES_cbc_encrypt | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lcrypto  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 690 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* 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();
-
-int main() {
-DES_cbc_encrypt()
-; return 0; }
-EOF
-if { (eval echo configure:701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-   x99_token_ldflags="$x99_token_ldflags -lcrypto" 
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for des_cbc_encrypt in -lcrypto""... $ac_c" 1>&6
-echo "configure:720: checking for des_cbc_encrypt in -lcrypto" >&5
-ac_lib_var=`echo crypto'_'des_cbc_encrypt | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lcrypto  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 728 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* 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();
-
-int main() {
-des_cbc_encrypt()
-; return 0; }
-EOF
-if { (eval echo configure:739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-   x99_token_ldflags="$x99_token_ldflags -lcrypto" 
-else
-  echo "$ac_t""no" 1>&6
- fail="$fail des_cbc_encrypt" 
-               
-fi
-
-       
-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 f42583e..226f631 100644 (file)
--- a/src/modules/rlm_x99_token/configure.in
+++ b/src/modules/rlm_x99_token/configure.in
@@ -34,19 +34,6 @@ if test x$with_[]modname != xno; then
          esac ]
        )
 
-       dnl openssl
-       x99_save_LIBS="$LIBS"
-       LIBS="$LIBS $x99_token_ldflags"
-       dnl openssl 0.9.7 renamed the functions
-       AC_CHECK_LIB(crypto, DES_cbc_encrypt,
-               [ x99_token_ldflags="$x99_token_ldflags -lcrypto" ],
-               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!