From: zacheiss <zacheiss>
Date: Tue, 20 Jul 2004 08:10:16 +0000 (+0000)
Subject: Include libresolv in link line; needed for static builds against recent
X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/2dd418e42edd7783ee48b7d1d9a4b21bcfb6e8ad

Include libresolv in link line; needed for static builds against recent
krb5, and doesn't hurt older things.  Regenerate configure.
---

diff --git a/configure b/configure
index 40912fe4..cb89f3d2 100755
--- a/configure
+++ b/configure
@@ -1531,7 +1531,7 @@ 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="-lkrb4 $LIBPATH -ldes425 -lkrb5 -l${crypto} -lcom_err $LIBS"
+LIBS="-lkrb4 $LIBPATH -ldes425 -lkrb5 -l${crypto} -lcom_err -lresolv $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 1537 "configure"
 #include "confdefs.h"
@@ -1559,7 +1559,7 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  KRB4_LIBS="-lkrb4 -ldes425 -lkrb5 -l${crypto}"
+  KRB4_LIBS="-lkrb4 -ldes425 -lkrb5 -l${crypto} -lresolv"
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for krb_rd_req in -lkrb""... $ac_c" 1>&6
@@ -1623,7 +1623,7 @@ if test "$krb5" != no; then
 	REG_SVR_INCLUDES=-I$krb5/include
 	REG_SVR_LIBS=-L$krb5/lib
     fi
-    REG_SVR_LIBS="$REG_SVR_LIBS -lkadm5clnt -lgssapi_krb5 -lgssrpc -ldyn -lkrb4 -ldes425 -lkrb5 -l${crypto}"
+    REG_SVR_LIBS="$REG_SVR_LIBS -lkadm5clnt -lgssapi_krb5 -lgssrpc -ldyn -lkrb4 -ldes425 -lkrb5 -l${crypto} -lresolv"
 else
     REG_SVR_DEFS=-DKRB4
     REG_SVR_LIBS=-lkadm
diff --git a/configure.in b/configure.in
index 9680e937..c37d2aab 100755
--- a/configure.in
+++ b/configure.in
@@ -131,12 +131,12 @@ fi
 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}"],
+	     [KRB4_LIBS="-lkrb4 -ldes425 -lkrb5 -l${crypto} -lresolv"],
 	     [AC_CHECK_LIB(krb, krb_rd_req,
 			   [KRB4_LIBS="-lkrb -ldes"],
 			   [AC_MSG_ERROR(Kerberos 4 libraries not found)],
 			   $LIBPATH -ldes)],
-	     $LIBPATH -ldes425 -lkrb5 -l${crypto} -lcom_err)
+	     $LIBPATH -ldes425 -lkrb5 -l${crypto} -lcom_err -lresolv)
 
 AC_MSG_CHECKING(for Kerberos 5)
 AC_ARG_WITH(krb5,
@@ -149,7 +149,7 @@ if test "$krb5" != no; then
 	REG_SVR_INCLUDES=-I$krb5/include
 	REG_SVR_LIBS=-L$krb5/lib
     fi
-    REG_SVR_LIBS="$REG_SVR_LIBS -lkadm5clnt -lgssapi_krb5 -lgssrpc -ldyn -lkrb4 -ldes425 -lkrb5 -l${crypto}"
+    REG_SVR_LIBS="$REG_SVR_LIBS -lkadm5clnt -lgssapi_krb5 -lgssrpc -ldyn -lkrb4 -ldes425 -lkrb5 -l${crypto} -lresolv"
 else
     REG_SVR_DEFS=-DKRB4
     REG_SVR_LIBS=-lkadm