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

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

Author: jfr...@jb...
Date: 2006-06-12 05:51:21 -0400 (Mon, 12 Jun 2006)
New Revision: 4739

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
Arrange jpeg and png detection in gd (note gd's configure is buggy).


Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-11 22:02:16 UTC (rev 4738)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-12 09:51:21 UTC (rev 4739)
@@ -169,6 +169,12 @@
      exit 1
    fi
  fi
+ if [ "$ADDINS" = "libtool" ]
+ then
+   # On Solaris the libtool of old packages is broken
+   # It does not build shared libraries.
+   cp $TOOLS/bin/libtool .
+ fi
  make clean
  if [ $? -ne 0 ]
  then
@@ -420,7 +426,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" "libtool" ""
   ADDCONF="$ADDCONF --with-jpeg-dir=$TOOLS/JPEG"
   LGDCONF="$LGDCONF --with-jpeg=$TOOLS/JPEG"
 else
@@ -439,6 +445,8 @@
   LIBPNG_CONFIG=${TOOLS}/LPNG/bin/libpng-config
   LIBPNG12_CONFIG=${TOOLS}/LPNG/bin/libpng12-config
   CPPFLAGS="$CPPFLAGS -I${TOOLS}/LPNG/include/libpng12"
+  PATH=${TOOLS}/LPNG/bin:$PATH
+  export PATH
   export LIBPNG_CONFIG
   export LIBPNG12_CONFIG
   export CPPFLAGS