Changeset 23003 for gs2-extensions/gsdl-amp/trunk/packages/CASCADE-MAKE/PHP.sh

Timestamp:

2010-10-01T15:56:46+13:00 (14 years ago)

Author:

sjm84

Message:

Various changes to the amp extension to make it compatible with having previously installed mysql extension

File:

• gs2-extensions/gsdl-amp/trunk/packages/CASCADE-MAKE/PHP.sh (modified) (2 diffs)

gs2-extensions/gsdl-amp/trunk/packages/CASCADE-MAKE/PHP.sh

@@ -3 +3 @@
 package=php
 version=-5.3.2
-
-apache_version=httpd-2.2.15
 
 progname=$0
@@ -11 +9 @@
 
 prefix=$GEXTAMP_INSTALLED
+mysqlprefix=
+if [ "x$COMPILE_UP_MYSQL" = "x1" ] ; then
+  mysqlprefix=$GEXTAMP_INSTALLED
+else
+  if [ -n "$GEXTMYSQL_INSTALLED" ] ; then
+    mysqlprefix=$GEXTMYSQL_INSTALLED
+  fi
+fi
 
 opt_run_untar $force_untar $auto_untar $package $version
 
-opt_run_configure $force_config $auto_config $package $version $prefix --with-mysql=$prefix --with-png-dir=$prefix --with-apxs2=$prefix/bin/apxs --with-gd
+opt_run_configure $force_config $auto_config $package $version $prefix --with-mysql=$mysqlprefix --with-png-dir=$prefix --with-apxs2=$prefix/bin/apxs --with-gd
 
 opt_run_make $compile   $package $version