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

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

Author: jfr...@jb...
Date: 2006-06-02 04:51:12 -0400 (Fri, 02 Jun 2006)
New Revision: 4562

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
Arrange the Solaris logic.


Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-02 08:33:16 UTC (rev 4561)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-02 08:51:12 UTC (rev 4562)
@@ -97,12 +97,14 @@
 ADDCON=$3
 ADDINS=$4
 SUBDIR=$5
-if [ -z ${SUBDIR} ]
+if [ -z "${SUBDIR}" ]
 then
   SRCDIR=${BASDIR}
 else
   SRCDIR=${BASDIR}/${SUBDIR}
 fi
+rm -f ${BASDIR}/${SUBDIR}/config.cache
+rm -f ${BASDIR}/${SUBDIR}/config.status
 (cd ${SRCDIR}
  if [ ${CC} = "cc" ]
  then
@@ -134,7 +136,7 @@
    echo "Make install in ${SRCDIR} failed"
    exit 1
  fi
- if [ ! -z $ADDINS ]
+ if [ ! -z "$ADDINS" ]
  then
    make $ADDINS
    if [ $? -ne 0 ]
@@ -190,14 +192,8 @@
             \
             --without-pear \
              \
-            --with-bz2=no \
-            --with-xpm-dir=no \
-            --with-ldap=no \
-            --with-mysql=no \
-            --with-mysqli=no \
-            --with-pdo-mysql=no \
+            --with-mysql=/opt/mysql-standard-4.1.20-pc-linux-gnu-i686-glibc23 \
             --with-curl \
-            --with-openssl \
             "
     ADDFLAGS="-I $JAVA_HOME/include/linux"
     ;;
@@ -225,20 +221,34 @@
     ADDFLAGS="-I $JAVA_HOME/include/solaris"
     ;;
   *)
-    ADDCONF="\
-            --with-freetype-dir \
+    ADDCONF="$ADDCONF \
             --with-t1lib=no \
             --with-xpm-dir \
-            --with-mysqli \
-            --with-mysql \
-            --with-pdo-mysql \
             "
     case ${OS} in
       Linux)     
         EXTTYPE=static
         ADDFLAGS="-I $JAVA_HOME/include/linux"
+        ADDCONF="$ADDCONF --with-freetype-dir \
+            --with-mysqli \
+            --with-mysql \
+            --with-pdo-mysql \
+            "
         ;;
       SunOS)
+        pkginfo | grep SPROcc
+        if [ $? -eq 0 ]
+        then
+          CC=cc
+          export CC
+        fi
+        # SUNWfreetype2 /usr/sfw
+        # SMCmysql      /usr/local/mysql
+        ADDCONF="$ADDCONF --with-freetype-dir=/usr/sfw \
+            --with-mysqli \
+            --with-mysql=/usr/local/mysql \
+            --with-pdo-mysql \
+            "
         EXTTYPE=shared
         ADDFLAGS="-I $JAVA_HOME/include/solaris"
         ;;
@@ -250,7 +260,18 @@
          # 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
+        ;;
     esac
 esac
 
@@ -270,7 +291,7 @@
 if ${BUILDGTTX}
 then
   Extract gettext ${GTTXURL} ${GTTXVER}
-  Build gettext-${GTTXVER} ${TOOLS}/GTTX "--enable-shared"
+  Build gettext-${GTTXVER} ${TOOLS}/GTTX "--enable-shared" "" ""
   ADDCONF="$ADDCONF --with-gettext=$TOOLS/GTTX"
 else
   ADDCONF="$ADDCONF --with-gettext"
@@ -286,7 +307,7 @@
   mkdir -p ${TOOLS}/JPEG/bin
   mkdir -p ${TOOLS}/JPEG/man/man1
   Extract jpeg ${JPEGURL} ${JPEGVER}
-  Build jpeg-${JPEGVER} ${TOOLS}/JPEG "--enable-shared"
+  Build jpeg-${JPEGVER} ${TOOLS}/JPEG "--enable-shared" "" ""
   ADDCONF="$ADDCONF --with-jpeg-dir=$TOOLS/JPEG"
 else
   ADDCONF="$ADDCONF --with-jpeg-dir"
@@ -297,7 +318,7 @@
 if ${BUILDLPNG}
 then
   Extract libpng ${LPNGURL} ${LPNGVER}
-  Build libpng-${LPNGVER} ${TOOLS}/LPNG ""
+  Build libpng-${LPNGVER} ${TOOLS}/LPNG ""  ""
   ADDCONF="$ADDCONF --with-png-dir=$TOOLS/LPNG"
 else
   ADDCONF="$ADDCONF --with-png-dir"
@@ -308,7 +329,7 @@
 if ${BUILDXML2}
 then
   Extract libxml2 ${XML2URL} ${XML2VER}
-  Build libxml2-${XML2VER} ${TOOLS}/LIBXML2 ""
+  Build libxml2-${XML2VER} ${TOOLS}/LIBXML2 ""  ""
   ADDCONF="$ADDCONF --with-libxml-dir=$TOOLS/LIBXML2"
 else
   ADDCONF="$ADDCONF --with-libxml-dir"
@@ -350,9 +371,9 @@
   Extract postgresql ${PSQLURL} ${PSQLVER}
   if ${BUILDOSSL}
   then
-    Build postgresql-${PSQLVER} ${TOOLS}/POSTGRESQL "--without-readline LDFLAGS=-L${TOOLS}/SSL/lib"
+    Build postgresql-${PSQLVER} ${TOOLS}/POSTGRESQL "--without-readline LDFLAGS=-L${TOOLS}/SSL/lib"  ""  ""
   else
-    Build postgresql-${PSQLVER} ${TOOLS}/POSTGRESQL --without-readline
+    Build postgresql-${PSQLVER} ${TOOLS}/POSTGRESQL --without-readline  ""  ""
   fi
   ADDCONF="$ADDCONF --with-pgsql=$TOOLS/POSTGRESQL --with-pdo-pgsql=$TOOLS/POSTGRESQL"
 else