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

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

Author: jfr...@jb...
Date: 2006-06-03 11:41:41 -0400 (Sat, 03 Jun 2006)
New Revision: 4593

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
Build freetype2 on Solaris because SUNWfreetype2 is 2.1.2.


Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-03 14:28:36 UTC (rev 4592)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-03 15:41:41 UTC (rev 4593)
@@ -43,6 +43,10 @@
 
 ICNVVER=1.9.2
 ICNVURL=http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICNVVER}.tar.gz
+
+FTT2VER=2.1.9
+FTT2URL=http://switch.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.9.tar.gz
+
 # Platfrom directory and cache
 TOOLS=$HOME/`uname -s`_`uname -p`_tools
 CACHE=`uname -s`_`uname -p`_cache
@@ -58,6 +62,7 @@
 BUILDMSQL=false
 BUILDLDAP=true
 BUILDICNV=false
+BUILDFTT2=false
 CC=gcc
 COMPILER=""
 ADDCONF=""
@@ -298,10 +303,10 @@
       Linux)     
         EXTTYPE=static
         ADDFLAGS="-I $JAVA_HOME/include/linux"
-        ADDCONF="$ADDCONF --with-freetype-dir"
         ;;
       SunOS)
         BUILDICNV=true
+        BUILDFTT2=true
         pkginfo | grep SPROcc
         if [ $? -eq 0 ]
         then
@@ -309,8 +314,8 @@
           export CC
         fi
         # SUNWfreetype2 /usr/sfw
+        # --with-freetype-dir=/usr/sfw (SUNWfreetype2 is 2.1.2)
         # don't use SMCmysql too old:  /usr/local/mysql
-        ADDCONF="$ADDCONF --with-freetype-dir=/usr/sfw"
         EXTTYPE=shared
         ADDFLAGS="-I $JAVA_HOME/include/solaris"
         ;;
@@ -345,6 +350,18 @@
 
 #
 # build iconv if required.
+if ${BUILDFTT2}
+then
+  Extract freetype ${FTT2URL} ${FTT2VER}
+  Build freetype-${FTT2VER} ${TOOLS}/FTT2 "--enable-shared" "" ""
+  ADDCONF="$ADDCONF --with-freetype-dir=$TOOLS/FTT2"
+else
+  ADDCONF="$ADDCONF  --with-freetype-dir"
+fi
+exit 1
+
+#
+# build iconv if required.
 if ${BUILDICNV}
 then
   Extract libiconv ${ICNVURL} ${ICNVVER}