From: <jbo...@li...> - 2006-05-30 14:47:26
|
Author: jfr...@jb... Date: 2006-05-30 10:47:13 -0400 (Tue, 30 May 2006) New Revision: 4484 Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh Log: Remove special logic for dev17. Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh =================================================================== --- labs/jbossweb/trunk/src/share/native/build/buildphp.sh 2006-05-30 13:50:30 UTC (rev 4483) +++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh 2006-05-30 14:47:13 UTC (rev 4484) @@ -125,6 +125,7 @@ # # depending on machine remove or add php extensions. OS=`uname -s` +PR=`uname -p` case `uname -n` in dev12) BUILDXML2=true @@ -157,27 +158,6 @@ export LD_LIBRARY_PATH ADDFLAGS="-I $JAVA_HOME/include/solaris" ;; - dev17*) - EXTTYPE=static - BUILDPSQL=true - ADDCONF="\ - --with-pic \ - --with-libdir=lib64 \ - --with-freetype-dir \ - \ - --with-xpm-dir=no \ - --with-t1lib=no \ - --with-imap=no \ - --with-pspell=no \ - --with-tidy=no \ - --with-curl \ - --with-openssl \ - --with-mysqli \ - --with-mysql \ - --with-pdo-mysql \ - " - ADDFLAGS="-fPIC" - ;; dev03*) EXTTYPE=static ADDCONF="\ @@ -245,7 +225,7 @@ ADDCONF="\ --with-freetype-dir \ --with-t1lib=no \ - --with-xpm-dir \ + --with-xpm-dir=no \ --with-mysqli \ --with-mysql \ --with-pdo-mysql \ @@ -260,6 +240,15 @@ 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" + ;; + esac esac # @@ -317,6 +306,11 @@ make clean make depend make install + case ${PR} in + x86_64) + ln -s ${TOOLS}/SSL/lib ${TOOLS}/SSL/lib64 + ;; + esac ) ADDCONF="$ADDCONF --with-openssl=$TOOLS/SSL --with-openssl-dir=$TOOLS/SSL" else |