Magellan Linux

Contents of /trunk/php/patches/php-5.2.3-httpd-config.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1711 - (show annotations) (download)
Fri Mar 23 13:03:30 2012 UTC (12 years, 1 month ago) by niro
File size: 3132 byte(s)
-php5 -> php move
1 diff -Naur php-5.2.3/sapi/apache/config.m4 php-5.2.3-magellan/sapi/apache/config.m4
2 --- php-5.2.3/sapi/apache/config.m4 2005-05-30 01:16:45.000000000 +0200
3 +++ php-5.2.3-magellan/sapi/apache/config.m4 2007-07-07 20:02:35.000000000 +0200
4 @@ -88,7 +88,7 @@
5 $APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1
6
7 if test "$?" != "0"; then
8 - APACHE_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
9 + APACHE_INSTALL="$APXS -i -n php5 $SAPI_SHARED" # Old apxs does not have -S option
10 else
11 APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
12 if test -z `$APXS -q SYSCONFDIR`; then
13 @@ -101,7 +101,7 @@
14 \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
15 $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
16 -S SYSCONFDIR='$APXS_SYSCONFDIR' \
17 - -i -a -n php5 $SAPI_SHARED"
18 + -i -n php5 $SAPI_SHARED"
19 fi
20 fi
21
22 diff -Naur php-5.2.3/sapi/apache2filter/config.m4 php-5.2.3-magellan/sapi/apache2filter/config.m4
23 --- php-5.2.3/sapi/apache2filter/config.m4 2005-09-01 16:33:47.000000000 +0200
24 +++ php-5.2.3-magellan/sapi/apache2filter/config.m4 2007-07-07 20:02:47.000000000 +0200
25 @@ -76,7 +76,7 @@
26 \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
27 $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
28 -S SYSCONFDIR='$APXS_SYSCONFDIR' \
29 - -i -a -n php5"
30 + -i -n php5"
31 fi
32
33 case $host_alias in
34 diff -Naur php-5.2.3/sapi/apache2handler/config.m4 php-5.2.3-magellan/sapi/apache2handler/config.m4
35 --- php-5.2.3/sapi/apache2handler/config.m4 2005-09-01 16:33:47.000000000 +0200
36 +++ php-5.2.3-magellan/sapi/apache2handler/config.m4 2007-07-07 20:02:58.000000000 +0200
37 @@ -75,7 +75,7 @@
38 \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
39 $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
40 -S SYSCONFDIR='$APXS_SYSCONFDIR' \
41 - -i -a -n php5"
42 + -i -n php5"
43 fi
44
45 case $host_alias in
46 diff -Naur php-5.2.3/sapi/apache_hooks/config.m4 php-5.2.3-magellan/sapi/apache_hooks/config.m4
47 --- php-5.2.3/sapi/apache_hooks/config.m4 2005-05-30 01:16:46.000000000 +0200
48 +++ php-5.2.3-magellan/sapi/apache_hooks/config.m4 2007-07-07 20:03:12.000000000 +0200
49 @@ -89,7 +89,7 @@
50 $APXS -q -S CFLAGS="$APXS_CFLAGS" CFLAGS >/dev/null 2>&1
51
52 if test "$?" != "0"; then
53 - APACHE_HOOKS_INSTALL="$APXS -i -a -n php5 $SAPI_SHARED" # Old apxs does not have -S option
54 + APACHE_HOOKS_INSTALL="$APXS -i -n php5 $SAPI_SHARED" # Old apxs does not have -S option
55 else
56 APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
57 if test -z `$APXS -q SYSCONFDIR`; then
58 @@ -102,7 +102,7 @@
59 \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
60 $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
61 -S SYSCONFDIR='$APXS_SYSCONFDIR' \
62 - -i -a -n php5 $SAPI_SHARED"
63 + -i -n php5 $SAPI_SHARED"
64 fi
65 fi
66