httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1200064 - in /httpd/httpd/trunk: Makefile.in acinclude.m4
Date Thu, 10 Nov 2011 00:41:21 GMT
Author: sf
Date: Thu Nov 10 00:41:20 2011
New Revision: 1200064

URL: http://svn.apache.org/viewvc?rev=1200064&view=rev
Log:
Fix selection of loaded modules on AIX because its grep doesn't understand \< and \>

Modified:
    httpd/httpd/trunk/Makefile.in
    httpd/httpd/trunk/acinclude.m4

Modified: httpd/httpd/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.in?rev=1200064&r1=1200063&r2=1200064&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.in (original)
+++ httpd/httpd/trunk/Makefile.in Thu Nov 10 00:41:20 2011
@@ -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="#"; \

Modified: httpd/httpd/trunk/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/acinclude.m4?rev=1200064&r1=1200063&r2=1200064&view=diff
==============================================================================
--- httpd/httpd/trunk/acinclude.m4 (original)
+++ httpd/httpd/trunk/acinclude.m4 Thu Nov 10 00:41:20 2011
@@ -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



Mime
View raw message