Merge r1392120, r1392122, r1392150 from trunk:

Fix shell errors when trying to AC_MSG_RESULT() for --with-module.
(The change to IFS hosed any AC_MSG_foo() invocations.)

It is easy enough to reorder the reset of IFS and the AC_MSG_RESULT()
invocation, but there's a big stretch of shell code where AC_MSG_foo()
might be useful someday, so get rid of the commas at the start and
leave IFS alone and AC_MSG_foo() at will.

fix bug in r1392120: replace ALL commas

--with-module: Fix failure to integrate them into some existing
module directories.

modules/config?.m4 needs to run after the modules/*/config?.m4.
Otherwise, modules.mk as created for --with-module gets wiped
out first.

PR: 40097

Submitted by: trawick
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1436908 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 92e47029ea6713c7afbaff84479fa516fdf377bf..b34c346df1d7961d60afde4df459ba2057c56d38 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.4
 
+  *) --with-module: Fix failure to integrate them into some existing
+     module directories.  PR 40097.  [Jeff Trawick]
+
   *) htcacheclean: Fix potential segfault if "-p" is omitted.  [Joe Orton]
 
   *) mod_proxy_http: Honour special value 0 (unlimited) of LimitRequestBody

diff --git a/STATUS b/STATUS
index b3a2c64d9c41b676494939207e69066e9bf51110..0e525bd3f3e177a4c60753930eac9f4bdf3a5bb4 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -100,26 +100,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
                http://mail-archives.apache.org/mod_mbox/httpd-dev/201301.mbox/%3C20130103112044.GA19653%40redhat.com%3E
         kbrand: configure option added in r1429228
 
-   * configure --with-modules:
-     - Fix shell errors when trying to AC_MSG_RESULT().
-       (The change to IFS hosed any AC_MSG_foo() invocations.)
-       It is easy enough to reorder the reset of IFS and the AC_MSG_RESULT()
-       invocation, but there's a big stretch of shell code where AC_MSG_foo()
-       might be useful someday, so get rid of the commas at the start and
-       leave IFS alone and AC_MSG_foo() at will.
-     - Fix failure to integrate them into some existing module directories.
-       modules/config?.m4 needs to run after the modules/*/config?.m4.
-       Otherwise, modules.mk as created for --with-module gets wiped
-       out first.
-       This is r1392150, a rename of modules/config5.m4 to modules/config7.m4.
-       PR: 40097
-     Not critical for 2.4.4.
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1392120
-                  http://svn.apache.org/viewvc?view=revision&revision=1392122
-                  http://svn.apache.org/viewvc?view=revision&revision=1392150
-     2.4.x patch: Trunk patch works.
-     +1: rjung, kbrand, jerenkrantz
-
   * mod_proxy: Persist balancer and worker data across restarts and stop/start.
     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1387110
                  http://svn.apache.org/viewvc?view=revision&revision=1387444

diff --git a/modules/config5.m4 b/modules/config7.m4
similarity index 97%
rename from modules/config5.m4
rename to modules/config7.m4
index 7dd021ee29a4e9106ea046e30f90ff197e8dc5b7..16f2ff3630bf388e63021d7248667722b4bfcf6e 100644 (file)
--- a/modules/config5.m4
+++ b/modules/config7.m4
@@ -3,7 +3,7 @@ AC_ARG_WITH(module,
   APACHE_HELP_STRING(--with-module=module-type:module-file,
                      Enable module-file in the modules/<module-type> directory.),
   [
-    as_save_IFS="$IFS"; IFS=","
+    withval=`echo $withval | sed -e 's/,/ /g'`
     for mod in $withval
     do
       modtype=`echo $mod | sed -e's/\(.*\):.*/\1/'`
@@ -51,7 +51,6 @@ EOF
     if test ! -z "$EXTRA_MODLIST"; then
       AC_MSG_RESULT(added:$EXTRA_MODLIST)
     fi
-    IFS="$as_save_IFS"
   ],
   [ AC_MSG_RESULT(none) 
   ])