CVS: moonbase/compilers/php CONFIGURE,1.3,1.4 DETAILS,1.23,1.24

[Auke Kok]

Update of /var/cvs/lunar/moonbase/compilers/php
In directory dbguin.lunar-linux.org:/tmp/cvs-serv668

Modified Files:
	CONFIGURE DETAILS 
Log Message:
New version, including bumped imap version. Note that the --with-apxs{2} options are now mandatory, since otherwise php won't build the DSO's.


Index: CONFIGURE
===================================================================
RCS file: /var/cvs/lunar/moonbase/compilers/php/CONFIGURE,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CONFIGURE	24 Nov 2002 21:07:27 -0000	1.3
+++ CONFIGURE	5 Nov 2003 12:20:45 -0000	1.4
@@ -1,10 +1,14 @@
-if  !  grep  -q  CONFIGURED  $MODULE_CONFIG;  then
 
-  if    module_installed  apache  ||
-        module_installed  apache-mod_ssl
-  then 
-    OPTS="$OPTS --with-apxs=/usr/sbin/apxs"
-  fi
+# The following ALWAYS needs to be set, so we put it outside of the CONFIGURED
+# statement, otherwise php fails to install against apache2 on the first
+# update. -- 20031105 - sofar
+if module_installed apache || module_installed apache-mod_ssl ; then 
+  OPTS="$OPTS --with-apxs=/usr/sbin/apxs"
+elif module_installed apache2 ; then
+  OPTS="$OPTS --with-apxs2=/usr/sbin/apxs"
+fi
+
+if  !  grep  -q  CONFIGURED  $MODULE_CONFIG;  then
 
   if  query  "Install ftp support?" y;  then
     OPTS="$OPTS --enable-ftp"

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/compilers/php/DETAILS,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- DETAILS	25 Aug 2003 20:12:31 -0000	1.23
+++ DETAILS	5 Nov 2003 12:20:45 -0000	1.24
@@ -1,11 +1,9 @@
           MODULE=php
-         VERSION=4.3.3
-        #VERSION=4.3.2
-    IMAP_VERSION=2002d
-   #IMAP_VERSION=2002.RC10
+         VERSION=4.3.4
+    IMAP_VERSION=2002e
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
           SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_VFY=md5:1171d96104e2ff2cff9e19789a4a1536
+      SOURCE_VFY=md5:b9dd601863e08e52e3c4d5e02c2627cf
    SOURCE_URL[0]=http://www.php.net/distributions/$SOURCE
    SOURCE_URL[1]=http://uk2.php.net/distributions/$SOURCE
    SOURCE_URL[2]=http://us2.php.net/distributions/$SOURCE
@@ -14,7 +12,7 @@
    SOURCE_URL[5]=http://de.php.net/distributions/$SOURCE
    SOURCE_URL[6]=http://fr.php.net/distributions/$SOURCE
          SOURCE2=imap-$IMAP_VERSION.tar.Z
-     SOURCE2_VFY=md5:64e82a195d21481fc4c54c4ed9fe0527
+     SOURCE2_VFY=md5:0d246d868f20d8c441d235b77c940676
   SOURCE2_URL[0]=ftp://ftp.cac.washington.edu/imap/$SOURCE2
         WEB_SITE=http://www.php.net
          ENTERED=20011024