[Lunar-commits] r21175 - moonbase/trunk/zbeta/php5

[Auke Kok]

Author: sofar
Date: 2006-08-29 03:55:09 +0000 (Tue, 29 Aug 2006)
New Revision: 21175

Modified:
   moonbase/trunk/zbeta/php5/BUILD
   moonbase/trunk/zbeta/php5/CONFIGURE
Log:
clean up BUILD and CONFIGURE myself.


Modified: moonbase/trunk/zbeta/php5/BUILD
===================================================================
--- moonbase/trunk/zbeta/php5/BUILD	2006-08-29 03:39:24 UTC (rev 21174)
+++ moonbase/trunk/zbeta/php5/BUILD	2006-08-29 03:55:09 UTC (rev 21175)
@@ -1,39 +1,71 @@
 (
 
-  if [ -s /etc/httpsd/httpd.conf ] ; then
-    cp /etc/httpsd/httpd.conf /etc/httpsd/httpd.conf.`date +%Y%m%d`
+  if [ "$USE_IMAP" == "y" ]; then
+    unpack $SOURCE2
+    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 [ -s /etc/httpd/httpd.conf ] ; then
-    cp /etc/httpd/httpd.conf /etc/httpd/httpd.conf.`date +%Y%m%d`
+  if [ "$USE_REGGLOBALS" == "y" ]; then
+    OPTS="$OPTS "
   fi
 
-  if [ "$IMAP" == "y" ]; then
-    unpack $SOURCE2
-    make -C imap-${IMAP_VERSION} slx SPECIALS="SSLDIR=/etc/ssl SSLINCLUDE=/usr/include SSLLIB=/usr/lib"
-    OPTS="$OPTS --with-imap=imap-${IMAP_VERSION}"
+  if [ "$USE_FTP" == "y" ]; then
+    OPTS="$OPTS --enable-ftp"
   fi
-  
+
+  if [ "$USE_SESSIONID" == "y" ]; then
+    OPTS="$OPTS --enable-trans-sid"
+  fi
+
+  if [ "$USE_SQLITE" == "y" ]; then
+    OPTS="$OPTS --enable-sqlite-utf8"
+  fi
+
+  if [ "$USE_SOCKETS" == "y" ]; then
+    OPTS="$OPTS --enable-sockets"
+  fi
+
+  if [ "$USE_NCURSES" == "y" ]; then
+    OPTS="$OPTS --with-ncurses"
+  fi
+
+  if [ "$USE_FASTCGI" == "y" ]; then
+    OPTS="$OPTS --enable-fastcgi"
+  fi
+
+  if [ "$USE_MBYTESTR" == "y" ]; then
+    OPTS="$OPTS --enable-mbstring"
+  fi
+
+  if [ "$USE_MBYTEREGEX" == "n" ]; then
+    OPTS="$OPTS --disable-mbregex"
+  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
 
-  if [ "x${FASTCGI}" != "x" ] ; then
-    OPTS="$OPTS --enable-fastcgi"
+  if [ -s /etc/httpsd/httpd.conf ] ; then
+    cp /etc/httpsd/httpd.conf /etc/httpsd/httpd.conf.`date +%Y%m%d`
   fi
 
-#  sedit "s:^:#include <errno.h>\n:" ext/mysql/libmysql/mysys_err.h &&
+  if [ -s /etc/httpd/httpd.conf ] ; then
+    cp /etc/httpd/httpd.conf /etc/httpd/httpd.conf.`date +%Y%m%d`
+  fi
 
+  # sedit "s:^:#include <errno.h>\n:" ext/mysql/libmysql/mysys_err.h &&
+
   verbose_msg "OPTS=$OPTS" &&
   ./configure  --prefix=/usr                 \
                --sysconfdir=/etc             \
                --with-config-file-path=/etc  \
-	       --enable-dbase		     \
-	       --enable-dbx		     \
-	       --enable-dio		     \
-	       --with-readline               \
+               --enable-dbase                \
+               --enable-dbx                  \
+               --enable-dio                  \
+               --with-readline               \
                --with-zlib=/usr              \
                $OPTS                        &&
   default_make

Modified: moonbase/trunk/zbeta/php5/CONFIGURE
===================================================================
--- moonbase/trunk/zbeta/php5/CONFIGURE	2006-08-29 03:39:24 UTC (rev 21174)
+++ moonbase/trunk/zbeta/php5/CONFIGURE	2006-08-29 03:55:09 UTC (rev 21175)
@@ -1,40 +1,16 @@
-mquery IMAP "Install imap support?" y
-mquery REGGLOBALS "Enable global variable support (potential security risk)?" n
-
-if  !  grep  -q  CONFIGURED  $MODULE_CONFIG;  then
-
-  if  query  "Install ftp support?" y;  then
-    OPTS="$OPTS --enable-ftp"
-  fi
-
-  if  query  "Enable transparent session id?" y;  then
-    OPTS="$OPTS --enable-trans-sid"
-  fi
-  
-  if  query  "Enable UTF-8 support for SQLite?" y;  then
-    OPTS="$OPTS --enable-sqlite-utf8"
-  fi
-
-  if  query  "Enable sockets support (experimental)?" y;  then
-    OPTS="$OPTS --enable-sockets"
-  fi
-
-  if  query  "Enable ncurses support (experimental)?" y;  then
-    OPTS="$OPTS --with-ncurses"
-  fi
-
-  if  module_installed  lighttpd;  then
-    mquery FASTCGI "Build FastCGI version (required by lighttpd)?" y
-  fi
-
-  if  query  "Enable multibyte string support?" n;  then
-    OPTS="$OPTS --enable-mbstring"
-    if  query  "Disable multibyte regular expression functions?" n;  then
-      OPTS="$OPTS --disable-mbregex"
-    fi
-  fi
-
-  echo  'CONFIGURED="y"'  >>  $MODULE_CONFIG
-  echo  'OPTS='\"$OPTS\"  >>  $MODULE_CONFIG
-
+mquery USE_IMAP "Install imap support?" y
+mquery USE_REGGLOBALS "Enable global variable support (potential security risk)?" n
+mquery USE_FTP "Install ftp support?" y
+mquery USE_SESSIONID "Enable transparent session id?" y
+mquery USE_SQLITE "Enable UTF-8 support for SQLite?" y
+mquery USE_SOCKETS "Enable sockets support (experimental)?" y
+mquery USE_NCURSES "Enable ncurses support (experimental)?" y
+if module_installed lighttpd; then
+  mquery USE_FASTCGI "Build FastCGI version (required by lighttpd)?" y
 fi
+mquery USE_MBYTESTR "Enable multibyte string support?" n
+if [ "$USE_MBYTESTR" == "y" ]; then
+  mquery USE_MBYTEREGEX "Enable multibyte regular expression functions?" n
+else
+  set_module_config USE_MBYTEREGEX n
+fi