From: Stefan Fritsch <sf@apache.org>
Date: Thu, 10 Nov 2011 00:41:20 +0000 (+0000)
Subject: Fix selection of loaded modules on AIX because its grep doesn't understand \< and \>
X-Git-Tag: 2.3.16~213
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9209ff117f9d286b8836dca4f2ff19975003cb22;p=apache

Fix selection of loaded modules on AIX because its grep doesn't understand \< and \>


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

diff --git a/Makefile.in b/Makefile.in
index 6297b27c23..ca5e806c7c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -60,7 +60,7 @@ install-conf:
 	    				< $$i; \
 	    			for j in $(DSO_MODULES) "^EOL^"; do \
 	    				if test $$j != "^EOL^"; then \
-	    					if echo "$(ENABLED_DSO_MODULES)"|$(EGREP) "\<$$j\>" > /dev/null ; then \
+	    					if echo ",$(ENABLED_DSO_MODULES),"|$(EGREP) ",$$j," > /dev/null ; then \
 	    						loading_disabled=""; \
 	    					else \
 	    						loading_disabled="#"; \
diff --git a/acinclude.m4 b/acinclude.m4
index a07838637b..76d79fcb52 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -257,7 +257,7 @@ EOF
             # add default MPM to LoadModule list
             if test $1 = $default_mpm; then
                 DSO_MODULES="$DSO_MODULES mpm_$1"
-                ENABLED_DSO_MODULES="$ENABLED_DSO_MODULES mpm_$1"
+                ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},mpm_$1"
             fi
         fi
         $4
@@ -360,7 +360,7 @@ AC_DEFUN(APACHE_MODULE,[
       shared=yes
       DSO_MODULES="$DSO_MODULES $1"
       if test "$_apmod_required" = "yes" ; then
-        ENABLED_DSO_MODULES="$ENABLED_DSO_MODULES $1"
+        ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},$1"
       fi
       ;;
     esac