|
|
|
|
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
|
|
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
|
|
|
|
#
|
|
|
|
|
# Filename: package/.../php/no-httpd.conf.patch
|
|
|
|
|
# Copyright (C) 2012 The OpenSDE Project
|
|
|
|
|
# Copyright (C) 2004 - 2006 The T2 SDE Project
|
|
|
|
|
#
|
|
|
|
|
# More information can be found in the files COPYING and README.
|
|
|
|
|
#
|
|
|
|
|
# This patch file is dual-licensed. It is available under the license the
|
|
|
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
|
|
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
|
|
|
|
# of the GNU General Public License as published by the Free Software
|
|
|
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
|
|
|
|
# version.
|
|
|
|
|
# --- SDE-COPYRIGHT-NOTE-END ---
|
|
|
|
|
|
|
|
|
|
The default Apache httpd.conf must not be touched.
|
|
|
|
|
|
|
|
|
|
- Rene Rebe <rene@exactcode.de>
|
|
|
|
|
|
|
|
|
|
--- ./configure.orig 2012-02-29 08:37:24.000000000 +0100
|
|
|
|
|
+++ ./configure 2012-03-03 17:31:38.764090638 +0100
|
|
|
|
|
@@ -6496,7 +6496,7 @@
|
|
|
|
|
$APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1
|
|
|
|
|
|
|
|
|
|
if test "$?" != "0"; then
|
|
|
|
|
- APACHE_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
|
|
|
|
|
+ APACHE_INSTALL="$APXS -i -n php5 $SAPI_SHARED" # Old apxs does not have -S option
|
|
|
|
|
else
|
|
|
|
|
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
|
|
|
|
|
if test -z `$APXS -q SYSCONFDIR`; then
|
|
|
|
|
@@ -6509,7 +6509,7 @@
|
|
|
|
|
\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
|
|
|
|
|
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|
|
|
|
|
-S SYSCONFDIR='$APXS_SYSCONFDIR' \
|
|
|
|
|
- -i -a -n php5 $SAPI_SHARED"
|
|
|
|
|
+ -i -n php5 $SAPI_SHARED"
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
@@ -7604,7 +7604,7 @@
|
|
|
|
|
\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
|
|
|
|
|
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|
|
|
|
|
-S SYSCONFDIR='$APXS_SYSCONFDIR' \
|
|
|
|
|
- -i -a -n php5"
|
|
|
|
|
+ -i -n php5"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
case $host_alias in
|
|
|
|
|
@@ -8416,7 +8416,7 @@
|
|
|
|
|
\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
|
|
|
|
|
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|
|
|
|
|
-S SYSCONFDIR='$APXS_SYSCONFDIR' \
|
|
|
|
|
- -i -a -n php5"
|
|
|
|
|
+ -i -n php5"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
case $host_alias in
|
|
|
|
|
@@ -9385,7 +9385,7 @@
|
|
|
|
|
$APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1
|
|
|
|
|
|
|
|
|
|
if test "$?" != "0"; then
|
|
|
|
|
- APACHE_HOOKS_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
|
|
|
|
|
+ APACHE_HOOKS_INSTALL="$APXS -i -n php5 $SAPI_SHARED" # Old apxs does not have -S option
|
|
|
|
|
else
|
|
|
|
|
APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
|
|
|
|
|
if test -z `$APXS -q SYSCONFDIR`; then
|
|
|
|
|
@@ -9398,7 +9398,7 @@
|
|
|
|
|
\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
|
|
|
|
|
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
|
|
|
|
|
-S SYSCONFDIR='$APXS_SYSCONFDIR' \
|
|
|
|
|
- -i -a -n php5 $SAPI_SHARED"
|
|
|
|
|
+ -i -n php5 $SAPI_SHARED"
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
