- (djm) Reorder tests and library inclusion for Krb4/AFS to try to

   resolve linking conflicts with libcrypto. Report and suggested fix
   from Holger Trapp <Holger.Trapp@Informatik.TU-Chemnitz.DE>

diff --git a/ChangeLog b/ChangeLog
index 1c8a59a6c87cb541c1eea7cac7a44ef4c56ac6d1..f21a779ba9f6ab4b1567fef9a1f3603bf76c9d46 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20010328
+ - (djm) Reorder tests and library inclusion for Krb4/AFS to try to 
+   resolve linking conflicts with libcrypto. Report and suggested fix 
+   from Holger Trapp <Holger.Trapp@Informatik.TU-Chemnitz.DE>
+
 20010327
  - Attempt sync with sshlogin.c w/ OpenBSD (mainly CVS ID)
  - Fix pointer issues in waitpid() and wait() replaces.  Patch by Lutz 

diff --git a/configure.in b/configure.in
index af63b623b134f6907211baceca40c5eefd0a106c..7fd15239c44e43a42f4865ae80b1bc826c43ac86 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -404,75 +404,6 @@ AC_EGREP_CPP(FOUNDIT,
         ]
 )
 
-
-
-# Check whether user wants Kerberos support
-KRB4_MSG="no" 
-AC_ARG_WITH(kerberos4,
-       [  --with-kerberos4=PATH   Enable Kerberos 4 support],
-       [
-               if test "x$withval" != "xno" ; then
-       
-                       if test "x$withval" != "xyes" ; then
-                               CPPFLAGS="$CPPFLAGS -I${withval}/include"
-                               LDFLAGS="$LDFLAGS -L${withval}/lib"
-                               if test ! -z "$need_dash_r" ; then
-                                       LDFLAGS="$LDFLAGS -R${withval}/lib"
-                               fi
-                               if test ! -z "$blibpath" ; then
-                                       blibpath="$blibpath:${withval}/lib"
-                               fi
-                       else
-                               if test -d /usr/include/kerberosIV ; then
-                                       CPPFLAGS="$CPPFLAGS -I/usr/include/kerberosIV"
-                               fi
-                       fi
-
-                       AC_CHECK_HEADERS(krb.h)
-                       AC_CHECK_LIB(krb, main)
-                       if test "$ac_cv_header_krb_h" != yes; then
-                               AC_MSG_WARN([Cannot find krb.h, build may fail])
-                       fi
-                       if test "$ac_cv_lib_krb_main" != yes; then
-                               AC_MSG_WARN([Cannot find libkrb, build may fail])
-                       fi
-
-                       KLIBS="-lkrb -ldes"
-                       AC_CHECK_LIB(resolv, dn_expand, , )
-                       KRB4=yes
-                       KRB4_MSG="yes" 
-                       AC_DEFINE(KRB4)
-               fi
-       ]
-)
-
-# Check whether user wants AFS support
-AFS_MSG="no" 
-AC_ARG_WITH(afs,
-       [  --with-afs=PATH         Enable AFS support],
-       [
-               if test "x$withval" != "xno" ; then
-
-                       if test "x$withval" != "xyes" ; then
-                               CPPFLAGS="$CPPFLAGS -I${withval}/include"
-                               LDFLAGS="$LDFLAGS -L${withval}/lib"
-                       fi
-
-                       if test -z "$KRB4" ; then
-                               AC_MSG_WARN([AFS requires Kerberos IV support, build may fail])
-                       fi
-
-                       LIBS="$LIBS -lkafs"
-                       if test ! -z "$AFS_LIBS" ; then
-                               LIBS="$LIBS $AFS_LIBS"
-                       fi
-                       AC_DEFINE(AFS)
-                       AFS_MSG="yes" 
-               fi
-       ]
-)
-LIBS="$LIBS $KLIBS"
-
 # Check whether user wants S/Key support
 SKEY_MSG="no" 
 AC_ARG_WITH(skey,
@@ -1247,6 +1178,73 @@ if test "x$ac_cv_libc_defines_sys_nerr" = "xyes" ; then
 fi
 
 
+# Check whether user wants Kerberos support
+KRB4_MSG="no" 
+AC_ARG_WITH(kerberos4,
+       [  --with-kerberos4=PATH   Enable Kerberos 4 support],
+       [
+               if test "x$withval" != "xno" ; then
+       
+                       if test "x$withval" != "xyes" ; then
+                               CPPFLAGS="$CPPFLAGS -I${withval}/include"
+                               LDFLAGS="$LDFLAGS -L${withval}/lib"
+                               if test ! -z "$need_dash_r" ; then
+                                       LDFLAGS="$LDFLAGS -R${withval}/lib"
+                               fi
+                               if test ! -z "$blibpath" ; then
+                                       blibpath="$blibpath:${withval}/lib"
+                               fi
+                       else
+                               if test -d /usr/include/kerberosIV ; then
+                                       CPPFLAGS="$CPPFLAGS -I/usr/include/kerberosIV"
+                               fi
+                       fi
+
+                       AC_CHECK_HEADERS(krb.h)
+                       AC_CHECK_LIB(krb, main)
+                       if test "$ac_cv_header_krb_h" != yes; then
+                               AC_MSG_WARN([Cannot find krb.h, build may fail])
+                       fi
+                       if test "$ac_cv_lib_krb_main" != yes; then
+                               AC_MSG_WARN([Cannot find libkrb, build may fail])
+                       fi
+
+                       KLIBS="-lkrb -ldes"
+                       AC_CHECK_LIB(resolv, dn_expand, , )
+                       KRB4=yes
+                       KRB4_MSG="yes" 
+                       AC_DEFINE(KRB4)
+               fi
+       ]
+)
+
+# Check whether user wants AFS support
+AFS_MSG="no" 
+AC_ARG_WITH(afs,
+       [  --with-afs=PATH         Enable AFS support],
+       [
+               if test "x$withval" != "xno" ; then
+
+                       if test "x$withval" != "xyes" ; then
+                               CPPFLAGS="$CPPFLAGS -I${withval}/include"
+                               LDFLAGS="$LDFLAGS -L${withval}/lib"
+                       fi
+
+                       if test -z "$KRB4" ; then
+                               AC_MSG_WARN([AFS requires Kerberos IV support, build may fail])
+                       fi
+
+                       LIBS="-lkafs $LIBS"
+                       if test ! -z "$AFS_LIBS" ; then
+                               LIBS="$LIBS $AFS_LIBS"
+                       fi
+                       AC_DEFINE(AFS)
+                       AFS_MSG="yes" 
+               fi
+       ]
+)
+LIBS="$LIBS $KLIBS"
+
 # Looking for programs, paths and files
 AC_ARG_WITH(rsh,
        [  --with-rsh=PATH         Specify path to remote shell program ],