Changeset 28344 for gs2-extensions/gsdl-amp

Timestamp:

2013-10-02T15:24:44+13:00 (11 years ago)

Author:

davidb

Message:

Tweak to settings to cope with 'fussy' CURL source code

Location:

gs2-extensions/gsdl-amp/trunk/src/packages

Files:

• CASCADE-MAKE.sh (modified) (1 diff)
• CASCADE-MAKE/CURL.sh (modified) (1 diff)

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

@@ -3 +3 @@
 list=
 if [ "x$COMPILE_UP_MYSQL" = "x1" ] ; then
-  list="MYSQL LIBPNG APACHE CURL PHP"
+  list="MYSQL LIBPNG APACHE CURL LIBXML PHP"
 else  
   list="LIBPNG APACHE PHP"

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

@@ -9 +9 @@
 
 prefix=$GEXTAMP_INSTALLED
+
+# CURL configure script is stricter than most, and insists that 
+# no C pre-processing flags (such -I/aa/bb/cc) appear in the
+# CFLAGS variable
+export CFLAGS=`echo $CFLAGS | sed 's/-I[^ ]*//g'`
 
 opt_run_untar $force_untar $auto_untar $package $version