Shuffled some os checks into os-deps.m4

diff --git a/acinclude/os-deps.m4 b/acinclude/os-deps.m4
index 310cd2c0706078e8bec8dcff830a2f9f3cfee51c..5dd3df4534935ef95b5bf1bf920da008189b31b8 100644 (file)
--- a/acinclude/os-deps.m4
+++ b/acinclude/os-deps.m4
@@ -593,3 +593,30 @@ if test $SQUID_TCP_SO_RCVBUF -gt 65535; then
 fi
 AC_DEFINE_UNQUOTED(SQUID_TCP_SO_RCVBUF, $SQUID_TCP_SO_RCVBUF,[TCP receive buffer size])
 ])
+
+
+dnl check if we need to define sys_errlist as external
+dnl defines NEED_SYS_ERRLIST
+
+AC_DEFUN([SQUID_CHECK_NEED_SYS_ERRLIST],[
+AC_CACHE_CHECK(if sys_errlist is already defined, ac_cv_needs_sys_errlist,
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[char *s = sys_errlist;]])],[ac_cv_needs_sys_errlist="no"],[ac_cv_needs_sys_errlist="yes"])
+)
+SQUID_DEFINE_BOOL(NEED_SYS_ERRLIST,$ac_cv_needs_sys_errlist,[If we need to declare sys_errlist as extern])
+])
+
+
+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_LINK_IFELSE([
+  AC_LANG_PROGRAM([[
+#include <sys/param.h>]], [[
+int i = MAXPATHLEN;]])], [
+  AC_MSG_RESULT(yes)], [
+  AC_MSG_RESULT(no)
+  AC_DEFINE(MAXPATHLEN,256,[If MAXPATHLEN has not been defined])])
+])
+

diff --git a/configure.in b/configure.in
index 5c9a7a106e1eddc61ae2ef48cd1fd7a6af16038b..7dc49676975eca7377f5913f4060c712f452efbf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2973,20 +2973,8 @@ SQUID_DETECT_UDP_RECV_BUFSIZE
 SQUID_DETECT_TCP_SND_BUFSIZE
 SQUID_DETECT_TCP_RECV_BUFSIZE
 
-AC_CACHE_CHECK(if sys_errlist is already defined, ac_cv_needs_sys_errlist,
-  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[char *s = sys_errlist;]])],[ac_cv_needs_sys_errlist="no"],[ac_cv_needs_sys_errlist="yes"])
-)
-if test "$ac_cv_needs_sys_errlist" = "yes" ; then
-  AC_DEFINE(NEED_SYS_ERRLIST,1,[If we need to declare sys_errlist[] as external])
-fi
-
-dnl Hurd does not supply MAXPATHLEN. we may need to define it outselves.
-dnl Other system define it in system headers
-AC_CHECK_HEADERS([sys/param.h])
-AC_MSG_CHECKING(for MAXPATHLEN)
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/param.h>]],[[int i = MAXPATHLEN;]])],[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
-    AC_DEFINE(MAXPATHLEN,256,[If MAXPATHLEN has not been defined])])
-
+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)