- Changed -a to -A to prevent enabling PHP in httpd.conf automatically.

# Most distributions use separate file in a conf.d/ directory to enable
# PHP, using -a would add unnecessary line in the main httpd.conf and
# causes a warning during startup.

diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4
index 47b397cf6d7b2bfa150f27755c4f59125dde3dc9..6dc4a5717602783eb3127093e8f458e930651348 100644 (file)
--- a/sapi/apache2filter/config.m4
+++ b/sapi/apache2filter/config.m4
@@ -76,7 +76,7 @@ AC_ARG_WITH(apxs2filter,
                 \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
                        -S SYSCONFDIR='$APXS_SYSCONFDIR' \
-                       -i -a -n php5"
+                       -i -A -n php5"
   fi
 
   case $host_alias in

diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
index 05659e5c1e4dea77b4709f2d6dad9b246b8e9739..e2575d641296bd371fa1eaa62ec36cd33af76b96 100644 (file)
--- a/sapi/apache2handler/config.m4
+++ b/sapi/apache2handler/config.m4
@@ -75,7 +75,7 @@ AC_ARG_WITH(apxs2,
                 \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
                        -S SYSCONFDIR='$APXS_SYSCONFDIR' \
-                       -i -a -n php5"
+                       -i -A -n php5"
   fi
 
   case $host_alias in