svn commit: r771998 - in /httpd/httpd/trunk/modules: cluster/config.m4 cluster/config5.m4 mappers/config.m4 mappers/config9.m4

[wr...@apache.org]

Author: wrowe
Date: Tue May  5 22:37:02 2009
New Revision: 771998

URL: http://svn.apache.org/viewvc?rev=771998&view=rev
Log:
Reorder so and watchdog to configure before cluster modules

Added:
    httpd/httpd/trunk/modules/cluster/config5.m4   (props changed)
      - copied unchanged from r771610, httpd/httpd/trunk/modules/cluster/config.m4
    httpd/httpd/trunk/modules/mappers/config.m4   (contents, props changed)
      - copied, changed from r771610, httpd/httpd/trunk/modules/mappers/config9.m4
Removed:
    httpd/httpd/trunk/modules/cluster/config.m4
Modified:
    httpd/httpd/trunk/modules/mappers/config9.m4

Propchange: httpd/httpd/trunk/modules/cluster/config5.m4
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/cluster/config5.m4
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue May  5 22:37:02 2009
@@ -0,0 +1 @@
+/httpd/httpd/branches/wombat-integration/modules/cluster/config.m4:723609-723841

Copied: httpd/httpd/trunk/modules/mappers/config.m4 (from r771610, httpd/httpd/trunk/modules/mappers/config9.m4)
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/config.m4?p2=httpd/httpd/trunk/modules/mappers/config.m4&p1=httpd/httpd/trunk/modules/mappers/config9.m4&r1=771610&r2=771998&rev=771998&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/config9.m4 (original)
+++ httpd/httpd/trunk/modules/mappers/config.m4 Tue May  5 22:37:02 2009
@@ -4,18 +4,6 @@
 
 APACHE_MODPATH_INIT(mappers)
 
-APACHE_MODULE(vhost_alias, mass virtual hosting module, , , most)
-APACHE_MODULE(negotiation, content negotiation, , , yes)
-APACHE_MODULE(dir, directory request handling, , , yes)
-APACHE_MODULE(imagemap, server-side imagemaps, , , most)
-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

Propchange: httpd/httpd/trunk/modules/mappers/config.m4
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpd/httpd/trunk/modules/mappers/config.m4
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue May  5 22:37:02 2009
@@ -0,0 +1 @@
+/httpd/httpd/branches/wombat-integration/modules/mappers/config9.m4:723609-723841

Modified: httpd/httpd/trunk/modules/mappers/config9.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/config9.m4?rev=771998&r1=771997&r2=771998&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/config9.m4 (original)
+++ httpd/httpd/trunk/modules/mappers/config9.m4 Tue May  5 22:37:02 2009
@@ -12,65 +12,6 @@
 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