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

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

Author: jfr...@jb...
Date: 2006-06-08 10:51:43 -0400 (Thu, 08 Jun 2006)
New Revision: 4672

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
Disable crypto stuff to prevent export problems.


Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-08 13:03:21 UTC (rev 4671)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-08 14:51:43 UTC (rev 4672)
@@ -211,6 +211,9 @@
       BUILDJPEG=true
       BUILDMSQL=true
       ;;
+    CRYPT)
+      ALLOWCRYPTO=true 
+      ;;
     *)
       echo "$i: not (yet) supported"
   esac
@@ -218,6 +221,16 @@
 done
 
 #
+# Prevent cryptop stuff
+if ${ALLOWCRYPTO}
+then
+  echo "Be carefull with exporting the package: it contains crypto stuff"
+else
+  BUILDOSSL=false
+  BUILDKRB5=false
+fi
+
+#
 # depending on machine remove or add php extensions.
 OS=`uname -s`
 PR=`uname -p`
@@ -376,7 +389,12 @@
   Build krb5-${KRB5VER} ${TOOLS}/KRB5 "--enable-shared --with-tcl=no" "" "src"
   ADDCONF="$ADDCONF --with-kerberos=$TOOLS/KRB5"
 else
-  ADDCONF="$ADDCONF --with-kerberos"
+  if ${ALLOWCRYPTO}
+  then
+    ADDCONF="$ADDCONF --with-kerberos"
+  else
+    ADDCONF="$ADDCONF --without-kerberos"
+  fi
 fi
 
 #
@@ -477,7 +495,12 @@
   )
   ADDCONF="$ADDCONF --with-openssl=$TOOLS/SSL --with-openssl-dir=$TOOLS/SSL"
 else
-  ADDCONF="$ADDCONF --with-openssl"
+  if ${ALLOWCRYTP}
+  then
+    ADDCONF="$ADDCONF --with-openssl"
+  else
+    ADDCONF="$ADDCONF --without-openssl"
+  fi
 fi
 
 #
@@ -491,9 +514,14 @@
     export CPPFLAGS
     LDFLAGS=-L$TOOLS/SSL/lib
     export LDFLAGS
-    Build openldap-${LDAPVER} ${TOOLS}/LDAP "--disable-slapd --with-tls=openssl" "depend"
+    Build openldap-${LDAPVER} ${TOOLS}/LDAP "--with-threads --disable-slapd --with-tls=openssl" "depend"
   else
-    Build openldap-${LDAPVER} ${TOOLS}/LDAP "--disable-slapd --with-tls"  ""
+    if ${ALLOWCRYPTO}
+    then
+      Build openldap-${LDAPVER} ${TOOLS}/LDAP "--with-threads --disable-slapd --with-tls"  ""
+    else
+      Build openldap-${LDAPVER} ${TOOLS}/LDAP "--with-threads --disable-slapd --without-tls --with-kerberos=no"  ""
+    fi
   fi
   ADDCONF="$ADDCONF --with-ldap=$TOOLS/LDAP"
 else