Remove some unneeded autoconf checks. We now have no duplicate libraries

in the generated EXTRA_LIBS in config_vars.mk (at least on Linux 2.4).

APR already determines if we need nsl, socket - checking for it in httpd
is merely redundant.

None of the code in httpd-2.0 seems to deal with HAVE_GMTOFF as all of
that code was moved to APR a long time ago.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90715 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/configure.in b/configure.in
index 77e71b6461450c6d39b2912d92a0870c92d925ff..a7846e47908626baac2fbc1b02b9defa7fd81263 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -225,10 +225,6 @@ initgroups \
 bindprocessor \
 )
 
-AC_CHECK_LIB(nsl, gethostbyname)
-AC_CHECK_LIB(nsl, gethostname)
-AC_CHECK_LIB(socket, socket)
-
 AC_ARG_WITH(port,[  --with-port=PORT        Port on which to listen (default is 80)],
         [if test "$withval" = "yes"; then AC_MSG_ERROR('option --with-port requires a value (the TCP port number)'); else PORT="$withval"; fi],
        [PORT=80])

diff --git a/server/config.m4 b/server/config.m4
index 761be95a53527e52fac2f985b16cbc2b7c2c1432..85fa4d1791059b9ebb45f95a4071307510d40f40 100644 (file)
--- a/server/config.m4
+++ b/server/config.m4
@@ -1,25 +1,11 @@
 dnl ## Check for libraries
 
-AC_CHECK_LIB(nsl, gethostname, APR_ADDTO(LIBS,-lnsl))
-AC_CHECK_LIB(socket, socket, APR_ADDTO(LIBS,-lsocket))
-AC_CHECK_LIB(nsl, gethostbyaddr, APR_ADDTO(LIBS,-lnsl))
-
 dnl ## Check for header files
 
 AC_CHECK_HEADERS(bstring.h unistd.h)
 
 dnl ## Check for typedefs, structures, and compiler characteristics.
 
-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)])
-
-if test "$ac_cv_struct_tm_gmtoff" = "yes"; then
-    AC_DEFINE(HAVE_GMTOFF,,
-        [Define if struct tm has a tm_gmtoff member])
-fi
-
 dnl ## Check for library functions
 
 AC_CHECK_FUNCS(syslog)