From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Fri, 30 Jul 2010 17:46:37 +0000 (+0200)
Subject: Shuffled some os checks into os-deps.m4
X-Git-Tag: take1~402^2~2^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e28d61e336c5da20378ba034893519fae1e8a94;p=thirdparty%2Fsquid.git

Shuffled some os checks into os-deps.m4
---

diff --git a/acinclude/os-deps.m4 b/acinclude/os-deps.m4
index e43443e8b0..7bb75455f1 100644
--- a/acinclude/os-deps.m4
+++ b/acinclude/os-deps.m4
@@ -620,6 +620,10 @@ int i = MAXPATHLEN;]])], [
   AC_DEFINE(MAXPATHLEN,256,[If MAXPATHLEN has not been defined])])
 ])
 
+
+dnl check that we have a working statvfs
+dnl sets the ac_cv_func_statvfs shell variable and defines HAVE_STATVFS
+
 AC_DEFUN([SQUID_CHECK_WORKING_STATVFS],[
 AC_CACHE_CHECK(for working statvfs() interface,ac_cv_func_statvfs,[
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
@@ -636,3 +640,15 @@ statvfs("/tmp", &sfs);
 ])
 SQUID_DEFINE_BOOL(HAVE_STATVFS,$ac_cv_func_statvfs,[set to 1 if our system has statvfs(), and if it actually works])
 ])
+
+
+dnl check that we can use the libresolv _dns_ttl_ hack
+dnl sets the ac_cv_libresolv_dns_ttl_hack shell variable and defines LIBRESOLV_DNS_TTL_HACK
+
+AC_DEFUN([SQUID_CHECK_LIBRESOLV_DNS_TTL_HACK],[
+  AC_CACHE_CHECK(for libresolv _dns_ttl_ hack, ac_cv_libresolv_dns_ttl_hack, [
+   AC_LINK_IFELSE([AC_LANG_PROGRAM([[extern int _dns_ttl_;]], [[return _dns_ttl_;]])],
+     [ac_cv_libresolv_dns_ttl_hack=yes],[ac_cv_libresolv_dns_ttl_hack=no]) ])
+  SQUID_DEFINE_BOOL(LIBRESOLV_DNS_TTL_HACK,$ac_cv_libresolv_dns_ttl_hack,
+     [libresolv.a has been hacked to export _dns_ttl_])
+])
diff --git a/configure.in b/configure.in
index eaf6a40dbd..01841a2220 100644
--- a/configure.in
+++ b/configure.in
@@ -2976,10 +2976,7 @@ SQUID_DETECT_TCP_RECV_BUFSIZE
 SQUID_CHECK_NEED_SYS_ERRLIST
 SQUID_CHECK_MAXPATHLEN
 
-dnl Not cached since people are likely to change this
-AC_MSG_CHECKING(for libresolv _dns_ttl_ hack)
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[extern int _dns_ttl_;]], [[return _dns_ttl_;]])],[AC_MSG_RESULT(yes)
-AC_DEFINE(LIBRESOLV_DNS_TTL_HACK,1,[If libresolv.a has been hacked to export _dns_ttl_])],[AC_MSG_RESULT(no)])
+SQUID_CHECK_LIBRESOLV_DNS_TTL_HACK
 
 if test "$ac_cv_header_sys_statvfs_h" = "yes" ; then
   SQUID_CHECK_WORKING_STATVFS