[Jboss-svn-commits] JBL Code SVN: r4599 - labs/jbossweb/trunk/src/share/native/build

[<jbo...@li...>]

Author: jfr...@jb...
Date: 2006-06-04 09:05:09 -0400 (Sun, 04 Jun 2006)
New Revision: 4599

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
Add libgd in the bundle.


Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-04 12:17:34 UTC (rev 4598)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-04 13:05:09 UTC (rev 4599)
@@ -47,6 +47,9 @@
 FTT2VER=2.1.9
 FTT2URL=http://switch.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.9.tar.gz
 
+LBGDVER=2.0.28
+LBGDURL=http://www.boutell.com/gd/http/gd-${LBGDVER}.tar.gz
+
 # Platfrom directory and cache
 TOOLS=$HOME/`uname -s`_`uname -p`_tools
 CACHE=`uname -s`_`uname -p`_cache
@@ -63,9 +66,11 @@
 BUILDLDAP=true
 BUILDICNV=false
 BUILDFTT2=false
+BUILDLBGD=true
 CC=gcc
 COMPILER=""
 ADDCONF=""
+LGDCONF=""
 
 #
 # Fonctions
@@ -183,6 +188,24 @@
 }
 
 #
+# Allow to parameters to the build
+n=$#
+for ((i=0 ; i<$n ; i=`expr $i + 1`))
+do
+  case $1 in
+    ALL)
+      BUILDMSQL=true
+      BUILDICNV=true
+      BUILDFTT2=true
+      BUILDPSQL=true
+      ;;
+    *)
+      echo "$i: not (yet) supported"
+  esac
+  shift
+done
+
+#
 # depending on machine remove or add php extensions.
 OS=`uname -s`
 PR=`uname -p`
@@ -302,6 +325,7 @@
     case ${OS} in
       Linux)     
         EXTTYPE=static
+        BUILDICNV=false
         ADDFLAGS="-I $JAVA_HOME/include/linux"
         ;;
       SunOS)
@@ -355,8 +379,10 @@
   Extract freetype ${FTT2URL} ${FTT2VER}
   Build freetype-${FTT2VER} ${TOOLS}/FTT2 "--enable-shared" "" ""
   ADDCONF="$ADDCONF --with-freetype-dir=$TOOLS/FTT2"
+  LGDCONF="$LGDCONF --with-freetype-dir=$TOOLS/FTT2"
 else
   ADDCONF="$ADDCONF  --with-freetype-dir"
+  LGDCONF="$LGDCONF --with-freetype-dir"
 fi
 
 #
@@ -411,8 +437,10 @@
   Extract jpeg ${JPEGURL} ${JPEGVER}
   Build jpeg-${JPEGVER} ${TOOLS}/JPEG "--enable-shared" "" ""
   ADDCONF="$ADDCONF --with-jpeg-dir=$TOOLS/JPEG"
+  LGDCONF="$LGDCONF --with-jpeg-dir=$TOOLS/JPEG"
 else
   ADDCONF="$ADDCONF --with-jpeg-dir"
+  LGDCONF="$LGDCONF --with-jpeg-dir"
 fi
 
 #
@@ -422,11 +450,30 @@
   Extract libpng ${LPNGURL} ${LPNGVER}
   Build libpng-${LPNGVER} ${TOOLS}/LPNG ""  ""
   ADDCONF="$ADDCONF --with-png-dir=$TOOLS/LPNG"
+  LGDCONF="$LGDCONF --with-png-dir=$TOOLS/LPNG"
 else
   ADDCONF="$ADDCONF --with-png-dir"
+  LGDCONF="$LGDCONF --with-png-dir"
 fi
 
 #
+# build libgd if required
+if ${BUILDLBGD}
+then
+  Extract gd ${LBGDURL} ${LBGDVER}
+  Build gd-${LBGDVER} ${TOOLS}/LBGD "$LGDCONF"  ""
+  ADDCONF="$ADDCONF --with-gd=$TOOLS/LBGD \
+          --enable-gd-native-ttf \
+          --without-xpm \
+          "
+else
+  ADDCONF="$ADDCONF --with-gd \
+          --enable-gd-native-ttf \
+          --without-xpm \
+          "
+fi
+
+#
 # build libxml2 if required
 if ${BUILDXML2}
 then
@@ -497,7 +544,7 @@
   else
     Build postgresql-${PSQLVER} ${TOOLS}/POSTGRESQL --without-readline  ""  ""
   fi
-  ADDCONF="$ADDCONF --with-pgsql=$TOOLS/POSTGRESQL --with-pdo-pgsql=$TOOLS/POSTGRESQL"
+  ADDCONF="$ADDCONF --with-pgsql=$TOOLS/POSTGRESQL --with-pdo-pgsql=$TOOLS/POSTGRESQL/bin"
 else
   ADDCONF="$ADDCONF --with-pgsql --with-pdo-pgsql"
 fi
@@ -533,9 +580,7 @@
   --enable-embed=shared \
   --with-kerberos \
   --with-imap-ssl \
-  --with-gd \
   --with-zlib-dir \
-  --enable-gd-native-ttf \
   --with-ttf \
   --with-bz2 \
   --enable-bcmath \