[Lunar-commits] r20010 - in moonbase/trunk: compilers/php zbeta/php5

[Jannis Pohlmann]

Author: jannis
Date: 2006-05-09 12:29:27 +0000 (Tue, 09 May 2006)
New Revision: 20010

Modified:
   moonbase/trunk/compilers/php/BUILD
   moonbase/trunk/compilers/php/CONFIGURE
   moonbase/trunk/zbeta/php5/BUILD
   moonbase/trunk/zbeta/php5/CONFIGURE
Log:
php5: 
  * Don't enable ncurses unless the user answered the
    query with: YES, SIR!

php, php5:
  * Add option for building the FastCGI version of PHP
    if lighttpd is installed



Modified: moonbase/trunk/compilers/php/BUILD
===================================================================
--- moonbase/trunk/compilers/php/BUILD	2006-05-09 11:50:58 UTC (rev 20009)
+++ moonbase/trunk/compilers/php/BUILD	2006-05-09 12:29:27 UTC (rev 20010)
@@ -20,6 +20,10 @@
     OPTS="$OPTS --with-apxs2=/usr/sbin/apxs"
   fi
 
+  if [ "x${FASTCGI}" != "x" ]; then
+    OPTS="$OPTS --enable-fastcgi"
+  fi
+
   if echo $OPTS | grep -q -- --enable-xslt ; then
     LDFLAGS="$LDFLAGS -lstdc++"
   fi

Modified: moonbase/trunk/compilers/php/CONFIGURE
===================================================================
--- moonbase/trunk/compilers/php/CONFIGURE	2006-05-09 11:50:58 UTC (rev 20009)
+++ moonbase/trunk/compilers/php/CONFIGURE	2006-05-09 12:29:27 UTC (rev 20010)
@@ -15,6 +15,10 @@
     OPTS="$OPTS --enable-sockets"
   fi
 
+  if  module_installed  lighttpd;  then
+    mquery FASTCGI "Build FastCGI version (required by lighttpd)?" y
+  fi
+
   echo  'CONFIGURED="y"'  >>  $MODULE_CONFIG
   echo  'OPTS='\"$OPTS\"    >>  $MODULE_CONFIG
 

Modified: moonbase/trunk/zbeta/php5/BUILD
===================================================================
--- moonbase/trunk/zbeta/php5/BUILD	2006-05-09 11:50:58 UTC (rev 20009)
+++ moonbase/trunk/zbeta/php5/BUILD	2006-05-09 12:29:27 UTC (rev 20010)
@@ -20,6 +20,10 @@
     OPTS="$OPTS --with-apxs2=/usr/sbin/apxs"
   fi
 
+  if [ "x${FASTCGI}" != "x" ] ; then
+    OPTS="$OPTS --enable-fastcgi"
+  fi
+
 #  sedit "s:^:#include <errno.h>\n:" ext/mysql/libmysql/mysys_err.h &&
 
   verbose_msg "OPTS=$OPTS" &&
@@ -31,7 +35,6 @@
 	       --enable-dio		     \
 	       --with-readline               \
                --with-zlib=/usr              \
-               --with-ncurses                \
                $OPTS                        &&
   default_make
 

Modified: moonbase/trunk/zbeta/php5/CONFIGURE
===================================================================
--- moonbase/trunk/zbeta/php5/CONFIGURE	2006-05-09 11:50:58 UTC (rev 20009)
+++ moonbase/trunk/zbeta/php5/CONFIGURE	2006-05-09 12:29:27 UTC (rev 20010)
@@ -19,6 +19,10 @@
     OPTS="$OPTS --with-ncurses"
   fi
 
+  if  module_installed  lighttpd;  then
+    mquery FASTCGI "Build FastCGI version (required by lighttpd)?" y
+  fi
+
   echo  'CONFIGURED="y"'  >>  $MODULE_CONFIG
   echo  'OPTS='\"$OPTS\"    >>  $MODULE_CONFIG