Commit b89aa4d2 authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

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
parent bbf7636f

Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -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="#"; \

acinclude.m4

+2 −2
Original line number Diff line number Diff line
@@ -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