INN commit: branches/2.4 (configure configure.in)

INN Commit Russ_Allbery at isc.org
Wed Apr 30 07:06:58 UTC 2008


    Date: Wednesday, April 30, 2008 @ 00:06:58
  Author: iulius
Revision: 7811

Fix a problem at build time:  auth_krb5.c should normally be compiled
only if "--with-kerberos" is given to configure.

Modified:
  branches/2.4/configure
  branches/2.4/configure.in

--------------+
 configure    |    3 ++-
 configure.in |   24 ++++++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

Modified: configure
===================================================================
--- configure	2008-04-28 17:56:15 UTC (rev 7810)
+++ configure	2008-04-30 07:06:58 UTC (rev 7811)
@@ -8054,7 +8054,7 @@
 fi
 
 
-
+if test x"${KRB5_INC}" != x; then
 inn_save_LIBS=$LIBS
 LIBS=${KRB5_LIB}
 
@@ -8222,6 +8222,7 @@
   echo "$ac_t""no" 1>&6
 fi
 done
+fi # test x"${KRB5_INC}" != x;
 
 LIBS=$inn_save_LIBS
 

Modified: configure.in
===================================================================
--- configure.in	2008-04-28 17:56:15 UTC (rev 7810)
+++ configure.in	2008-04-30 07:06:58 UTC (rev 7811)
@@ -818,19 +818,23 @@
 
 dnl Check for Kerberos libraries for auth_krb5, and if found define KRB5_AUTH
 dnl to the relevant object file, which will enable compilation of it.
-INN_SEARCH_AUX_LIBS(krb5_parse_name, krb5, KRB5_LIB,
-    [KRB5_AUTH="auth_krb5"
-     KRB5_LIB="$KRB5_LDFLAGS $KRB5_LIB -lk5crypto -lcom_err"
-     AC_SUBST(KRB5_AUTH)
-     AC_SUBST(KRB5_INC)
-     AC_CHECK_HEADERS([et/com_err.h])], , [$LIBS -lk5crypto -lcom_err])
+if test x"$KRB5_INC" != x ; then
+    INN_SEARCH_AUX_LIBS(krb5_parse_name, krb5, KRB5_LIB,
+        [KRB5_AUTH="auth_krb5"
+         KRB5_LIB="$KRB5_LDFLAGS $KRB5_LIB -lk5crypto -lcom_err"
+         AC_SUBST(KRB5_AUTH)
+         AC_SUBST(KRB5_INC)
+         AC_CHECK_HEADERS([et/com_err.h])], , [$LIBS -lk5crypto -lcom_err])
+fi
 
 dnl Check for necessity of krb5_init_ets
 dnl OSX does not require this function
-inn_save_LIBS=$LIBS
-LIBS=$KRB5_LIB
-AC_CHECK_FUNCS(krb5_init_ets)
-LIBS=$inn_save_LIBS
+if test x"$KRB5_INC" != x ; then
+    inn_save_LIBS=$LIBS
+    LIBS=$KRB5_LIB
+    AC_CHECK_FUNCS(krb5_init_ets)
+    LIBS=$inn_save_LIBS
+fi
 
 dnl Libraries and flags for embedded Perl.  Some distributions of Linux have
 dnl Perl linked with gdbm but don't normally have gdbm installed, so on that



More information about the inn-committers mailing list