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

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

Author: jfr...@jb...
Date: 2006-06-08 09:03:21 -0400 (Thu, 08 Jun 2006)
New Revision: 4671

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
Add xpm.


Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-08 11:43:38 UTC (rev 4670)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-08 13:03:21 UTC (rev 4671)
@@ -274,61 +274,68 @@
           "
 fi
 
-case `uname -n` in
-  *)
-    ADDCONF="$ADDCONF \
-            --with-t1lib=no \
-            --with-xpm-dir=no \
-            "
-    case ${OS} in
-      Linux)     
-        EXTTYPE=static
-        BUILDICNV=false
-        ADDFLAGS="-I $JAVA_HOME/include/linux"
-        ;;
-      SunOS)
-        BUILDICNV=true
-        BUILDFTT2=true
-        pkginfo | grep SPROcc
-        if [ $? -eq 0 ]
-        then
-          CC=cc
-          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
-        EXTTYPE=shared
-        ADDFLAGS="-I $JAVA_HOME/include/solaris"
-        ;;
-    esac
-    case ${PR} in
-      x86_64)
-         #ADDCONF="$ADDCONF --with-pic"
-         # with-libdir=lib64 causes problem with SSL (our openssl location).
-         # but without it ldap libraries are not found.
-         ADDCONF="$ADDCONF --with-libdir=lib64 --with-pic"
-         ADDFLAGS="$ADDFLAGS -fPIC"
-        if [ ${CC} = "cc" ]
-        then
-          COMPILER=solaris-x86-cc
-        fi
-        ;;
-      sparc)
-        if [ ${CC} = "cc" ]
-        then
-          # Why not solaris64-sparcv9-cc? (does someone still use 32?)
-          COMPILER=solaris-sparcv9-cc
-        fi
-        ;;
-      i?86)
-        if [ ${CC} = "cc" ]
-        then
-          COMPILER=solaris-x86-cc
-        fi
-        ;;
-    esac
+ADDCONF="$ADDCONF --with-t1lib=no"
+case ${OS} in
+  Linux)     
+    EXTTYPE=static
+    BUILDICNV=false
+    ADDFLAGS="-I $JAVA_HOME/include/linux"
+    LGDCONF="$LGDCONF --with-xpm"
+    ;;
+  SunOS)
+    BUILDICNV=true
+    BUILDFTT2=true
+    pkginfo | grep SPROcc
+    if [ $? -eq 0 ]
+    then
+      CC=cc
+      export CC
+    fi
+    pkginfo | grep xpm
+    if  [ $? -eq 0 ]
+    then
+      pkginfo | grep SUNWxwinc
+      if [  $? -eq 0 ]
+      then
+        LGDCONF="$LGDCONF --with-xpm=/usr/local"
+      else
+        echo "Please install SUNWxwinc... Otherwise no xpm support"
+        LGDCONF="$LGDCONF --without-xpm"
+      fi
+    fi
+    # SUNWfreetype2 /usr/sfw
+    # --with-freetype-dir=/usr/sfw (SUNWfreetype2 is 2.1.2)
+    # don't use SMCmysql too old:  /usr/local/mysql
+    EXTTYPE=shared
+    ADDFLAGS="-I $JAVA_HOME/include/solaris"
+    ;;
 esac
+case ${PR} in
+  x86_64)
+     #ADDCONF="$ADDCONF --with-pic"
+     # with-libdir=lib64 causes problem with SSL (our openssl location).
+     # but without it ldap libraries are not found.
+     ADDCONF="$ADDCONF --with-libdir=lib64 --with-pic"
+     ADDFLAGS="$ADDFLAGS -fPIC"
+    if [ ${CC} = "cc" ]
+    then
+      COMPILER=solaris-x86-cc
+    fi
+    ;;
+  sparc)
+    if [ ${CC} = "cc" ]
+    then
+      # Why not solaris64-sparcv9-cc? (does someone still use 32?)
+      COMPILER=solaris-sparcv9-cc
+    fi
+    ;;
+  i?86)
+    if [ ${CC} = "cc" ]
+    then
+      COMPILER=solaris-x86-cc
+    fi
+    ;;
+esac
 
 #
 # build iconv if required.
@@ -427,12 +434,10 @@
   Build gd-${LBGDVER} ${TOOLS}/LBGD "--without-xpm $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