Shuffled MAXPATHLEN and statvfs checks into os-deps.m4

diff --git a/acinclude/os-deps.m4 b/acinclude/os-deps.m4
index 5dd3df4534935ef95b5bf1bf920da008189b31b8..e43443e8b01227300c3fad8301e51b1f9a6827fe 100644 (file)
--- a/acinclude/os-deps.m4
+++ b/acinclude/os-deps.m4
@@ -610,7 +610,7 @@ dnl check if MAXPATHLEN is defined in the system headers
 dnl or define it ourselves
 
 AC_DEFUN([SQUID_CHECK_MAXPATHLEN],[
-AC_MSG_CHECKING(for MAXPATHLEN)
+AC_MSG_CHECKING(for system-provided MAXPATHLEN)
 AC_LINK_IFELSE([
   AC_LANG_PROGRAM([[
 #include <sys/param.h>]], [[
@@ -620,3 +620,19 @@ int i = MAXPATHLEN;]])], [
   AC_DEFINE(MAXPATHLEN,256,[If MAXPATHLEN has not been defined])])
 ])
 
+AC_DEFUN([SQUID_CHECK_WORKING_STATVFS],[
+AC_CACHE_CHECK(for working statvfs() interface,ac_cv_func_statvfs,[
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/statvfs.h>
+]], [[
+struct statvfs sfs;
+sfs.f_blocks = sfs.f_bfree = sfs.f_frsize = 
+sfs.f_files = sfs.f_ffree = 0;
+statvfs("/tmp", &sfs);
+]])],[ac_cv_func_statvfs=yes],[ac_cv_func_statvfs=no])
+])
+SQUID_DEFINE_BOOL(HAVE_STATVFS,$ac_cv_func_statvfs,[set to 1 if our system has statvfs(), and if it actually works])
+])

diff --git a/configure.in b/configure.in
index 7dc49676975eca7377f5913f4060c712f452efbf..eaf6a40dbdef7941ff2395f27f5b51788fe2a4e9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2982,22 +2982,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[extern int _dns_ttl_;]], [[return _dns_ttl_;]]
 AC_DEFINE(LIBRESOLV_DNS_TTL_HACK,1,[If libresolv.a has been hacked to export _dns_ttl_])],[AC_MSG_RESULT(no)])
 
 if test "$ac_cv_header_sys_statvfs_h" = "yes" ; then
-AC_MSG_CHECKING(for working statvfs() interface)
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/statvfs.h>
-]], [[
-struct statvfs sfs;
-sfs.f_blocks = sfs.f_bfree = sfs.f_frsize = 
-sfs.f_files = sfs.f_ffree = 0;
-statvfs("/tmp", &sfs);
-]])],[ac_cv_func_statvfs=yes],[ac_cv_func_statvfs=no])
-AC_MSG_RESULT($ac_cv_func_statvfs)
-if test "$ac_cv_func_statvfs" = "yes" ; then
-  AC_DEFINE(HAVE_STATVFS,1,[If your system has statvfs(), and if it actually works!])
-fi
+  SQUID_CHECK_WORKING_STATVFS
 fi
 
 dnl Detect what resolver fields we have available to use...