* configure.in: Remove unnecessary $builddir/server/mpm/$mpm and

[apache] / configure.in

diff --git a/configure.in b/configure.in
index 0cc511ed2642ca5664e69897c05106bbdcb0dadc..7ee2252a2e3397c2ae3fb938e96cc613ce8c8861 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -131,11 +131,10 @@ dnl then we are running in VPATH mode.
 APR_ADDTO(INCLUDES, [-I.])
 
 if test "$abs_builddir" != "$abs_srcdir"; then
-  USE_VPATH=1
-  APR_ADDTO(INCLUDES, [-I\$(srcdir) -I\$(top_builddir)/server/mpm/\$(MPM_SUBDIR_NAME) -I\$(top_builddir)/include])
+  APR_ADDTO(INCLUDES, [-I\$(top_builddir)/include])
 fi
 
-APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/os/\$(OS_DIR) -I\$(top_srcdir)/server/mpm/\$(MPM_SUBDIR_NAME) -I\$(top_srcdir)/modules/http -I\$(top_srcdir)/modules/filters -I\$(top_srcdir)/modules/proxy -I\$(top_srcdir)/include])
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/os/\$(OS_DIR) -I\$(top_srcdir)/server/mpm/\$(MPM_SUBDIR_NAME) -I\$(top_srcdir)/modules/http -I\$(top_srcdir)/modules/filters -I\$(top_srcdir)/modules/proxy -I\$(top_srcdir)/include -I\$(top_srcdir)/modules/generators])
 
 echo $ac_n "${nl}Applying OS-specific hints for httpd ...${nl}"
 
@@ -162,7 +161,7 @@ case $host in
       LIBTOOL="$my_libtool \$(LTFLAGS)"
       libtoolversion=`$my_libtool --version`
       case $libtoolversion in
-          *1.4*)
+          *1.[[45]]*)
               SH_LIBTOOL='$(LIBTOOL)'
               SHLTCFLAGS="-prefer-pic"
               LTCFLAGS="-prefer-non-pic -static"
@@ -295,6 +294,7 @@ if test "$ac_cv_prog_gcc" = "yes"; then
 fi
 
 dnl ## Check for library functions
+AC_SEARCH_LIBS(sqrt, m)
 
 dnl See Comment #Spoon
 
@@ -313,7 +313,7 @@ AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
 #include <time.h>], [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)
+    AC_DEFINE(HAVE_GMTOFF, 1, [Define if struct tm has a tm_gmtoff field])
 fi
 
 dnl ## Set up any appropriate OS-specific environment variables for apachectl
@@ -360,18 +360,17 @@ AC_ARG_ENABLE(v4-mapped,APACHE_HELP_STRING(--enable-v4-mapped,Allow IPv6 sockets
 esac
 ])
 
-if test $v4mapped = "yes" -o $ac_cv_define_APR_HAVE_IPV6 = "no"; then
-    nonssl_listen_stmt_1=""
-    nonssl_listen_stmt_2="Listen @@Port@@"
-    if test $ac_cv_define_APR_HAVE_IPV6 = "yes"; then
-        AC_DEFINE(AP_ENABLE_V4_MAPPED, 1,
-                  [Allow IPv4 connections on IPv6 listening sockets])
-    fi
-else
-    nonssl_listen_stmt_1="Listen 0.0.0.0:@@Port@@"
-    nonssl_listen_stmt_2="Listen [[::]]:@@Port@@"
+if test $v4mapped = "yes" -a $ac_cv_define_APR_HAVE_IPV6 = "yes"; then
+    AC_DEFINE(AP_ENABLE_V4_MAPPED, 1,
+              [Allow IPv4 connections on IPv6 listening sockets])
 fi
 
+AC_ARG_ENABLE(exception-hook,APACHE_HELP_STRING(--enable-exception-hook,Enable fatal exception hook),
+[
+    AC_DEFINE(AP_ENABLE_EXCEPTION_HOOK, 1,
+              [Allow modules to run hook after a fatal exception])
+])dnl
+
 AC_ARG_ENABLE(maintainer-mode,APACHE_HELP_STRING(--enable-maintainer-mode,Turn on debugging and compile time warnings),
 [
   APR_ADDTO(CPPFLAGS, -DAP_DEBUG)