]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Fix for revno11239. Perform detection where it is not going to be erased
authorAmos Jeffries <squid3@treenet.co.nz>
Tue, 22 Feb 2011 23:39:33 +0000 (12:39 +1300)
committerAmos Jeffries <squid3@treenet.co.nz>
Tue, 22 Feb 2011 23:39:33 +0000 (12:39 +1300)
The kerberos library detection is wrapped inside a state which erases
the results of LIBS and flags found by AC_SEARCH_LIBS.
Do the search outside that block.

configure.ac

index 106fe08f74a2479c746f6f258f2333e8eec77445..8a36faa871336b4d7ac16b8ac2f6cd0bdc70ee51 100644 (file)
@@ -1821,9 +1821,6 @@ if test x"$krb5confpath" != "xno"; then
     fi
 fi
 if test "x$ac_krb5_config" = "xyes" ; then
-  # Kerberos helpers use res_search() from libresolv or libc
-  AC_SEARCH_LIBS([__res_search],[resolv])
-
   ac_heimdal="`$krb5confpath --version 2>/dev/null | grep -i heimdal`"
   ac_solaris="`$krb5confpath --version 2>/dev/null | grep -i solaris`"
   if test "x$ac_heimdal" != "x" ; then
@@ -2514,6 +2511,7 @@ AC_MSG_NOTICE([libcap2 headers are ok: $squid_cv_sys_capability_works])
 dnl Check for needed libraries
 AC_SEARCH_LIBS([gethostbyname],[nsl resolv bind])
 AC_SEARCH_LIBS([res_init],[resolv])
+AC_SEARCH_LIBS([__res_search],[resolv])
 AC_SEARCH_LIBS([bind],[socket])
 AC_SEARCH_LIBS([opcom_stack_trace],[opcom_stack])
 AC_SEARCH_LIBS([strlcpy], [bsd])