Update mergeinfo only: r1735891 was merged to 2.4.x in r1787728.

[apache] / server / config.m4

diff --git a/server/config.m4 b/server/config.m4
index 631d5a375619ad9c102da08e78179bd65566c820..dde51ed3dd9ffdfa0896485486dc4701f341b39d 100644 (file)
--- a/server/config.m4
+++ b/server/config.m4
@@ -1,61 +1,19 @@
 dnl ## Check for libraries
 
-AC_DEFUN(APACHE_DEFINE_HAVE_CRYPT, [
-])
-AC_CHECK_LIB(nsl, gethostname, [
- AC_ADD_LIBRARY(nsl) ], [])
-
-AC_CHECK_LIB(socket, socket, [
- AC_ADD_LIBRARY(socket) ], [])
-
-AC_CHECK_LIB(nsl, gethostbyaddr, [
- AC_ADD_LIBRARY(nsl) ], [])
-
-AC_CHECK_LIB(crypt, crypt, [
- AC_ADD_LIBRARY(crypt) 
- apache_have_crypt=1
-], [
- AC_CHECK_LIB(c, crypt, [
-  apache_have_crypt=1
- ], [
-  AC_CHECK_LIB(ufc, crypt, [
-   AC_ADD_LIBRARY(ufc) 
-   apache_have_crypt=1
-  ], [])
- ])
-])
-if test "$apache_have_crypt" = "1" ; then
-    AC_DEFINE(HAVE_CRYPT,,[Define if this platform has crypt()])
-fi
-
 dnl ## Check for header files
 
-AC_HEADER_STDC
-AC_CHECK_HEADERS(
-bstring.h \
-crypt.h \
-unistd.h \
-sys/resource.h \
-sys/select.h \
-sys/processor.h \
-)
+AC_CHECK_HEADERS(bstring.h unistd.h)
 
 dnl ## Check for typedefs, structures, and compiler characteristics.
 
-AC_TYPE_RLIM_T
-AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
-[AC_TRY_COMPILE([#include <sys/types.h>
-#include <$ac_cv_struct_tm>], [struct tm tm; tm.tm_gmtoff;],
-  ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)])
+dnl ## Check for library functions
 
-if test "$ac_cv_struct_tm_gmtoff" = "yes"; then
-    AC_DEFINE(HAVE_GMTOFF,,
-        [Define if struct tm has a tm_gmtoff member])
-fi
+AC_CHECK_FUNCS(syslog)
 
-dnl ## Check for library functions
+dnl Obsolete scoreboard code uses this.
+    AC_CHECK_HEADERS(sys/times.h)
+    AC_CHECK_FUNCS(times)
 
-AC_CHECK_FUNCS(
-difftime \
-syslog \
-)
+dnl Add expr header files to INCLUDES
+# util_expr needs header files in server source dir
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/server])