From: William A. Rowe Jr <wrowe@apache.org>
Date: Tue, 5 May 2009 22:37:02 +0000 (+0000)
Subject: Reorder so and watchdog to configure before cluster modules
X-Git-Tag: 2.3.3~646
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a456432d495521a9dcf0454eb612e228c40b4d6;p=thirdparty%2Fapache%2Fhttpd.git

Reorder so and watchdog to configure before cluster modules

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

diff --git a/modules/cluster/config.m4 b/modules/cluster/config5.m4
similarity index 100%
rename from modules/cluster/config.m4
rename to modules/cluster/config5.m4
diff --git a/modules/mappers/config.m4 b/modules/mappers/config.m4
new file mode 100644
index 00000000000..5cecf0f5d77
--- /dev/null
+++ b/modules/mappers/config.m4
@@ -0,0 +1,64 @@
+dnl modules enabled in this directory by default
+
+dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
+
+APACHE_MODPATH_INIT(mappers)
+
+APR_CHECK_APR_DEFINE(APR_HAS_DSO)
+
+case "x$enable_so" in
+    "xyes")
+        if test $ac_cv_define_APR_HAS_DSO = "no"; then
+            AC_MSG_ERROR([mod_so has been requested but cannot be built on your system])
+        fi
+        ;;
+    "xshared")
+        AC_MSG_ERROR([mod_so can not be built as a shared DSO])
+        ;;
+    "xno")
+        ;;
+    "x")
+        enable_so=$ac_cv_define_APR_HAS_DSO
+        ;;
+esac
+
+dnl mod_so can only be built statically. If the user wants modules to
+dnl be built as DSOs by default (eg. ./configure --enable-mods-shared=most)
+dnl then we must override the default here.
+if test "x$enable_so" = "xyes"; then
+    enable_so="static"
+fi
+
+if test "x$enable_so" = "xstatic"; then
+    APR_ADDTO(HTTPD_LDFLAGS, [-export-dynamic])
+    INSTALL_DSO=yes
+else
+    INSTALL_DSO=no
+fi
+APACHE_SUBST(INSTALL_DSO)
+
+if test "$sharedobjs" = "yes"; then
+    if test $ac_cv_define_APR_HAS_DSO = "no"; then
+        AC_MSG_ERROR([shared objects have been requested but cannot be built since mod_so cannot be built])
+    elif test $enable_so = "no"; then
+        AC_MSG_ERROR([shared objects have been requested but cannot be built since mod_so was disabled])
+    fi
+fi
+
+APACHE_MODULE(so, DSO capability, , , $enable_so)
+
+APR_CHECK_APR_DEFINE(APR_HAS_THREADS)
+
+if test $ac_cv_define_APR_HAS_THREADS = "no"; then
+    enable_watchdog="no"
+else
+    enable_watchdog="most"
+fi
+
+APACHE_MODULE(watchdog, Watchdog module, , , $enable_watchdog, [
+    if test $ac_cv_define_APR_HAS_THREADS = "no"; then
+        AC_MSG_ERROR([mod_watchdog requires apr to be built with --enable-threads])
+    fi
+])
+
+APACHE_MODPATH_FINISH
diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4
index 88e8c8a9a8d..8766a89082e 100644
--- a/modules/mappers/config9.m4
+++ b/modules/mappers/config9.m4
@@ -12,65 +12,6 @@ APACHE_MODULE(actions, Action triggering on requests, , , yes)
 APACHE_MODULE(speling, correct common URL misspellings, , , most)
 APACHE_MODULE(userdir, mapping of requests to user-specific directories, , , yes)
 APACHE_MODULE(alias, mapping of requests to different filesystem parts, , , yes)
-
 APACHE_MODULE(rewrite, rule based URL manipulation, , , most)
 
-
-APR_CHECK_APR_DEFINE(APR_HAS_DSO)
-
-case "x$enable_so" in
-    "xyes")
-        if test $ac_cv_define_APR_HAS_DSO = "no"; then
-            AC_MSG_ERROR([mod_so has been requested but cannot be built on your system])
-        fi
-        ;;
-    "xshared")
-        AC_MSG_ERROR([mod_so can not be built as a shared DSO])
-        ;;
-    "xno")
-        ;;
-    "x")
-        enable_so=$ac_cv_define_APR_HAS_DSO
-        ;;
-esac
-
-dnl mod_so can only be built statically. If the user wants modules to
-dnl be built as DSOs by default (eg. ./configure --enable-mods-shared=most)
-dnl then we must override the default here.
-if test "x$enable_so" = "xyes"; then
-    enable_so="static"
-fi
-
-if test "x$enable_so" = "xstatic"; then
-    APR_ADDTO(HTTPD_LDFLAGS, [-export-dynamic])
-    INSTALL_DSO=yes
-else
-    INSTALL_DSO=no
-fi
-APACHE_SUBST(INSTALL_DSO)
-
-if test "$sharedobjs" = "yes"; then
-    if test $ac_cv_define_APR_HAS_DSO = "no"; then
-        AC_MSG_ERROR([shared objects have been requested but cannot be built since mod_so cannot be built])
-    elif test $enable_so = "no"; then
-        AC_MSG_ERROR([shared objects have been requested but cannot be built since mod_so was disabled])
-    fi
-fi
-
-APACHE_MODULE(so, DSO capability, , , $enable_so)
-
-APR_CHECK_APR_DEFINE(APR_HAS_THREADS)
-
-if test $ac_cv_define_APR_HAS_THREADS = "no"; then
-    enable_watchdog="no"
-else
-    enable_watchdog="most"
-fi
-
-APACHE_MODULE(watchdog, Watchdog module, , , $enable_watchdog, [
-    if test $ac_cv_define_APR_HAS_THREADS = "no"; then
-        AC_MSG_ERROR([mod_watchdog requires apr to be built with --enable-threads])
-    fi
-])
-
 APACHE_MODPATH_FINISH