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

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

Author: jfr...@jb...
Date: 2006-06-02 18:23:50 -0400 (Fri, 02 Jun 2006)
New Revision: 4585

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
Make sure that openldap uses the openssl we have built.


Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-02 22:04:45 UTC (rev 4584)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-02 22:23:50 UTC (rev 4585)
@@ -126,7 +126,7 @@
  if [ ${CC} = "cc" ]
  then
    # Sun Studio
-   CC=cc CPPFLAGS="-I/opt/SUNWspro/prod/include/CC/Cstd/rw -I/opt/SUNWspro/prod/include/CC/Cstd -DHUGE_VAL=__builtin_huge_val" ./configure --prefix=${INSDIR} ${ADDCON}
+   CC=cc CPPFLAGS="$CPPFLAGS -I/opt/SUNWspro/prod/include/CC/Cstd/rw -I/opt/SUNWspro/prod/include/CC/Cstd -DHUGE_VAL=__builtin_huge_val" ./configure --prefix=${INSDIR} ${ADDCON}
  else
    ./configure --prefix=${INSDIR} ${ADDCON}
  fi
@@ -135,6 +135,15 @@
    echo "configure in ${SRCDIR} failed"
    exit 1
  fi
+ if [ "$ADDINS" = "depend" ]
+ then
+   make $ADDINS
+   if [ $? -ne 0 ]
+   then
+     echo "Make $ADDINS in ${SRCDIR} failed"
+     exit 1
+   fi
+ fi
  make clean
  if [ $? -ne 0 ]
  then
@@ -153,7 +162,7 @@
    echo "Make install in ${SRCDIR} failed"
    exit 1
  fi
- if [ ! -z "$ADDINS" ]
+ if [ ! -z "$ADDINS" ] && [ "$ADDINS" != "depend" ]
  then
    make $ADDINS
    if [ $? -ne 0 ]
@@ -321,6 +330,12 @@
           COMPILER=solaris-sparcv9-cc
         fi
         ;;
+      i?86)
+        if [ ${CC} = "cc" ]
+        then
+          COMPILER=solaris-x86-cc
+        fi
+        ;;
     esac
 esac
 
@@ -426,7 +441,16 @@
 if ${BUILDLDAP}
 then
   Extract openldap ${LDAPURL} ${LDAPVER}
-  Build openldap-${LDAPVER} ${TOOLS}/LDAP "--disable-slapd --with-tls"  ""
+  if ${BUILDOSSL}
+  then
+    CPPFLAGS=-I$TOOLS/SSL/include
+    export CPPFLAGS
+    LDFLAGS=-L$TOOLS/SSL/lib
+    export LDFLAGS
+    Build openldap-${LDAPVER} ${TOOLS}/LDAP "--disable-slapd --with-tls=openssl" "depend"
+  else
+    Build openldap-${LDAPVER} ${TOOLS}/LDAP "--disable-slapd --with-tls"  ""
+  fi
   ADDCONF="$ADDCONF --with-ldap=$TOOLS/LDAP"
 else
   ADDCONF="$ADDCONF --with-ldap"