CVS: moonbase/compilers/php CONFIGURE,1.4,1.5 BUILD,1.7,1.8

[Auke Kok]

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

Modified Files:
	CONFIGURE BUILD 
Log Message:
CONFIGURE scripts are *bad* ideas anyway...


Index: CONFIGURE
===================================================================
RCS file: /var/cvs/lunar/moonbase/compilers/php/CONFIGURE,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CONFIGURE	5 Nov 2003 12:20:45 -0000	1.4
+++ CONFIGURE	6 Nov 2003 21:31:17 -0000	1.5
@@ -1,13 +1,3 @@
-
-# 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

Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/compilers/php/BUILD,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- BUILD	22 Sep 2003 21:32:44 -0000	1.7
+++ BUILD	6 Nov 2003 21:31:17 -0000	1.8
@@ -13,6 +13,13 @@
     make -C imap-${IMAP_VERSION} slx SPECIALS="SSLDIR=/etc/ssl SSLINCLUDE=/usr/include SSLLIB=/usr/lib"
     OPTS="$OPTS --with-imap=imap-${IMAP_VERSION}"
   fi
+  
+  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
+      
 
   sedit "s:^:#include <errno.h>\n:" ext/mysql/libmysql/mysys_err.h	&&