Check for libk5crypto before libcrypto, so openssl's libcrypto doesn't

give us a false positive.  Regenerate configure.

diff --git a/configure b/configure
index 0879789d5223854e3be41f8399a555ad1445719a..2fb96642c44e74de90af1fe130884e713867fc72 100755 (executable)
--- a/configure
+++ b/configure
@@ -1452,14 +1452,14 @@ elif test -d /usr/include/kerberosIV; then
 
 
 fi
-echo $ac_n "checking for main in -lcrypto""... $ac_c" 1>&6
-echo "configure:1457: checking for main in -lcrypto" >&5
-ac_lib_var=`echo crypto'_'main | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for main in -lk5crypto""... $ac_c" 1>&6
+echo "configure:1457: checking for main in -lk5crypto" >&5
+ac_lib_var=`echo k5crypto'_'main | 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"
+LIBS="-lk5crypto  $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 1465 "configure"
 #include "confdefs.h"
@@ -1483,17 +1483,17 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  crypto="crypto"
+  crypto="k5crypto"
 else
   echo "$ac_t""no" 1>&6
-echo $ac_n "checking for main in -lk5crypto""... $ac_c" 1>&6
-echo "configure:1491: checking for main in -lk5crypto" >&5
-ac_lib_var=`echo k5crypto'_'main | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for main in -lcrypto""... $ac_c" 1>&6
+echo "configure:1491: checking for main in -lcrypto" >&5
+ac_lib_var=`echo crypto'_'main | 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="-lk5crypto  $LIBS"
+LIBS="-lcrypto  $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 1499 "configure"
 #include "confdefs.h"
@@ -1517,7 +1517,7 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  crypto="k5crypto"
+  crypto="crypto"
 else
   echo "$ac_t""no" 1>&6
 fi

diff --git a/configure.in b/configure.in
index f913a4cf37182f6d3c66d0796efc76883332293c..e52675d0b889b2f65b714fc6cb4665d8daa03f9d 100755 (executable)
--- a/configure.in
+++ b/configure.in
@@ -128,8 +128,8 @@ if test "$krb4" != yes; then
 elif test -d /usr/include/kerberosIV; then
     MR_INCLUDE(/usr/include/kerberosIV)
 fi
-AC_CHECK_LIB(crypto, main, crypto="crypto",
-             [AC_CHECK_LIB(k5crypto, main, crypto="k5crypto")])
+AC_CHECK_LIB(k5crypto, main, crypto="k5crypto",
+             [AC_CHECK_LIB(crypto, main, crypto="crypto")])
 AC_CHECK_LIB(krb4, krb_rd_req,
             [KRB4_LIBS="-lkrb4 -ldes425 -lkrb5 -l${crypto}"],
             [AC_CHECK_LIB(krb, krb_rd_req,