diff options
| author | foobar <sniper@php.net> | 2003-02-23 07:32:03 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2003-02-23 07:32:03 +0000 |
| commit | 6000c7b46cb11dfe76d55f31e0dbf8a3984bcb14 (patch) | |
| tree | 050f1128e0a5b4d157361834e6c176fad8ce8ef7 /sapi | |
| parent | 5f1975a432f13dea6535d4a37fa59f5aa002a734 (diff) | |
| download | php-git-6000c7b46cb11dfe76d55f31e0dbf8a3984bcb14.tar.gz | |
- Fixed bug #22376 (wrong httpd.conf modified when using INSTALL_ROOT)
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/apache/config.m4 | 14 | ||||
| -rw-r--r-- | sapi/apache2filter/config.m4 | 13 | ||||
| -rw-r--r-- | sapi/apache2handler/config.m4 | 13 |
3 files changed, 31 insertions, 9 deletions
diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4 index 85bd89290f..9b952785d1 100644 --- a/sapi/apache/config.m4 +++ b/sapi/apache/config.m4 @@ -70,7 +70,19 @@ AC_ARG_WITH(apxs, if test "$?" != "0"; then APACHE_INSTALL="$APXS -i -a -n php4 $SAPI_SHARED" # Old apxs does not have -S option else - APACHE_INSTALL="\$(mkinstalldirs) \"\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\" && $APXS -S LIBEXECDIR=\"\$(INSTALL_ROOT)`$APXS -q LIBEXECDIR`\" -i -a -n php4 $SAPI_SHARED" + APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` + if test -z `$APXS -q SYSCONFDIR`; then + APACHE_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ + -i -n php4 $SAPI_SHARED" + else + APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR` + APACHE_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ + \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ + -S SYSCONFDIR='$APXS_SYSCONFDIR' \ + -i -a -n php4 $SAPI_SHARED" + fi fi if test -z "`$APXS -q LD_SHLIB`" || test "`$APXS -q LIBEXECDIR`" = "modules"; then diff --git a/sapi/apache2filter/config.m4 b/sapi/apache2filter/config.m4 index 3520d524a9..770c3eabd7 100644 --- a/sapi/apache2filter/config.m4 +++ b/sapi/apache2filter/config.m4 @@ -52,13 +52,18 @@ AC_ARG_WITH(apxs2, APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` if test -z `$APXS -q SYSCONFDIR`; then - optarg= + INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ + -i -n php4" else - optarg=-a + APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR` + INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ + \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ + -S SYSCONFDIR='$APXS_SYSCONFDIR' \ + -i -a -n php4" fi - INSTALL_IT='$(mkinstalldirs) '"$APXS_LIBEXECDIR && $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' -i ${optarg} -n php4" - case $host_alias in *aix*) EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp" diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 index 1fa8b516f8..7eb001cfe2 100644 --- a/sapi/apache2handler/config.m4 +++ b/sapi/apache2handler/config.m4 @@ -52,13 +52,18 @@ AC_ARG_WITH(apxs2handler, APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` if test -z `$APXS -q SYSCONFDIR`; then - optarg= + INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ + -i -n php4" else - optarg=-a + APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR` + INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ + \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ + -S SYSCONFDIR='$APXS_SYSCONFDIR' \ + -i -a -n php4" fi - INSTALL_IT='$(mkinstalldirs) '"$APXS_LIBEXECDIR && $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' -i ${optarg} -n php4" - case $host_alias in *aix*) EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-brtl -Wl,-bI:$APXS_LIBEXECDIR/httpd.exp" |