SOURCES: php4-stupidapache_version.patch, php4-module-install - me...

[glen]

Author: glen                         Date: Sat Jul  9 20:53:18 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- merged apache packages split from DEVEL (1.421.2.3.2.35)

---- Files affected:
SOURCES:
   php4-stupidapache_version.patch (1.2 -> 1.3) , php4-module-install (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SOURCES/php4-stupidapache_version.patch
diff -u SOURCES/php4-stupidapache_version.patch:1.2 SOURCES/php4-stupidapache_version.patch:1.3
--- SOURCES/php4-stupidapache_version.patch:1.2	Thu Apr 21 21:08:30 2005
+++ SOURCES/php4-stupidapache_version.patch	Sat Jul  9 22:53:13 2005
@@ -1,12 +1,12 @@
---- acinclude.m4~	2005-03-17 10:10:04.000000000 +0200
-+++ acinclude.m4	2005-03-17 09:57:25.000000000 +0200
-@@ -1851,8 +1851,14 @@
+--- ./acinclude.m4~	2005-06-16 21:20:24.000000000 +0300
++++ ./acinclude.m4	2005-06-16 21:20:34.000000000 +0300
+@@ -1949,8 +1949,14 @@
  dnl This macro is used to get a comparable
  dnl version for apache1/2.
  dnl
 +
  AC_DEFUN([PHP_AP_EXTRACT_VERSION],[
-+if test -n "$with_apache_version"; then
++if test "$with_apache_version" != "no"; then
 +  ac_output="foo bar baz $with_apache_version"
 +else
    ac_output=`$1 -v 2>&1`
@@ -15,15 +15,3 @@
    ac_IFS=$IFS
  IFS="- /.
  "
---- configure.in~	2005-03-16 22:02:44.000000000 +0200
-+++ configure.in	2005-03-17 01:03:14.000000000 +0200
-@@ -766,6 +766,9 @@
- ])
- AC_MSG_RESULT([$PHP_VERSIONING])
- 
-+PHP_ARG_WITH(apache-version,[apache version],
-+[  --apache-version=MAJOR.MINOR.REVISION      Sets apache version to avoid calling apache/httpd binary], no, no)
-+
- divert(5)
- 
- dnl ## In diversion 5 we check which extensions should be compiled.

================================================================
Index: SOURCES/php4-module-install
diff -u SOURCES/php4-module-install:1.6 SOURCES/php4-module-install:1.7
--- SOURCES/php4-module-install:1.6	Sun Jun 23 16:17:00 2002
+++ SOURCES/php4-module-install	Sat Jul  9 22:53:13 2005
@@ -12,9 +12,13 @@
 	echo "activating module '${MODNAME}.so' in ${INIFILE}" 1>&2
 	echo "extension=${MODNAME}.so" >> ${INIFILE}
 fi
-if [ -f /var/lock/subsys/httpd ]; then
+# restart only if there's module installed
+if [ -f /etc/httpd/httpd.conf/??_mod_php4.conf ] && [ -f /var/lock/subsys/httpd ]; then
 	/etc/rc.d/init.d/httpd restart 1>&2
 fi
+if [ -f /etc/apache/conf.d/??_mod_php4.conf ] && [ -f /var/lock/subsys/apache ]; then
+	/etc/rc.d/init.d/apache restart 1>&2
+fi
 }
 
 deinstall()
@@ -30,8 +34,12 @@
 	mv ${TMPFILE} ${INIFILE}
 	chmod 644 ${INIFILE}
 fi
-if [ -f /var/lock/subsys/httpd ]; then
+# restart only if there's module installed
+if [ -f /etc/httpd/httpd.conf/??_mod_php4.conf ] && [ -f /var/lock/subsys/httpd ]; then
 	/etc/rc.d/init.d/httpd restart 1>&2
+fi
+if [ -f /etc/apache/conf.d/??_mod_php4.conf ] && [ -f /var/lock/subsys/apache ]; then
+	/etc/rc.d/init.d/apache restart 1>&2
 fi
 }
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/php4-stupidapache_version.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/php4-module-install?r1=1.6&r2=1.7&f=u