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

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

Author: jfr...@jb...
Date: 2006-06-04 15:00:33 -0400 (Sun, 04 Jun 2006)
New Revision: 4600

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
Arrange gd configure parameters.


Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-04 13:05:09 UTC (rev 4599)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-04 19:00:33 UTC (rev 4600)
@@ -127,6 +127,9 @@
 ADDCON=$3
 ADDINS=$4
 SUBDIR=$5
+echo "************************* Configure in ${BASDIR} ********************"
+echo "prefix: ${INSDIR}"
+echo "parameters: ${ADDCON}"
 if [ -z "${SUBDIR}" ]
 then
   SRCDIR=${BASDIR}
@@ -198,6 +201,8 @@
       BUILDICNV=true
       BUILDFTT2=true
       BUILDPSQL=true
+      BUILDJPEG=true
+      BUILDMSQL=true
       ;;
     *)
       echo "$i: not (yet) supported"
@@ -379,10 +384,9 @@
   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"
+  LGDCONF="$LGDCONF --with-freetype=$TOOLS/FTT2"
 else
   ADDCONF="$ADDCONF  --with-freetype-dir"
-  LGDCONF="$LGDCONF --with-freetype-dir"
 fi
 
 #
@@ -392,6 +396,7 @@
   Extract libiconv ${ICNVURL} ${ICNVVER}
   Build libiconv-${ICNVVER} ${TOOLS}/ICNV "--enable-shared" "" ""
   ADDCONF="$ADDCONF --with-iconv-dir=$TOOLS/ICNV"
+  LGDCONF="$LGDCONF --with-libiconv-prefix=$TOOLS/ICNV"
 fi
 
 #
@@ -437,10 +442,9 @@
   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"
+  LGDCONF="$LGDCONF --with-jpeg=$TOOLS/JPEG"
 else
   ADDCONF="$ADDCONF --with-jpeg-dir"
-  LGDCONF="$LGDCONF --with-jpeg-dir"
 fi
 
 #
@@ -450,10 +454,16 @@
   Extract libpng ${LPNGURL} ${LPNGVER}
   Build libpng-${LPNGVER} ${TOOLS}/LPNG ""  ""
   ADDCONF="$ADDCONF --with-png-dir=$TOOLS/LPNG"
-  LGDCONF="$LGDCONF --with-png-dir=$TOOLS/LPNG"
+  LGDCONF="$LGDCONF --with-png=$TOOLS/LPNG"
+  # libgd makes _very_ strange things with png.
+  LIBPNG_CONFIG=${TOOLS}/LPNG/bin/libpng-config
+  LIBPNG12_CONFIG=${TOOLS}/LPNG/bin/libpng12-config
+  CPPFLAGS="$CPPFLAGS -I${TOOLS}/LPNG/include/libpng12"
+  export LIBPNG_CONFIG
+  export LIBPNG12_CONFIG
+  export CPPFLAGS
 else
   ADDCONF="$ADDCONF --with-png-dir"
-  LGDCONF="$LGDCONF --with-png-dir"
 fi
 
 #
@@ -461,7 +471,7 @@
 if ${BUILDLBGD}
 then
   Extract gd ${LBGDURL} ${LBGDVER}
-  Build gd-${LBGDVER} ${TOOLS}/LBGD "$LGDCONF"  ""
+  Build gd-${LBGDVER} ${TOOLS}/LBGD "--without-xpm $LGDCONF"  ""
   ADDCONF="$ADDCONF --with-gd=$TOOLS/LBGD \
           --enable-gd-native-ttf \
           --without-xpm \