From: foobar <sniper@php.net>
Date: Fri, 5 Aug 2005 08:14:54 +0000 (+0000)
Subject: - Changed -a to -A to prevent enabling PHP in httpd.conf automatically.
X-Git-Tag: RELEASE_2_0_0~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d77c684c422b709cc5d8dc3f87bf240137b55f20;p=php

- 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 47b397cf6d..6dc4a57176 100644
--- 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 05659e5c1e..e2575d6412 100644
--- 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