[jbossnative-commits] JBoss Native SVN: r1399 - trunk/build/unix.

[jbossnative-commits at lists.jboss.org]

Author: jfrederic.clere at jboss.com
Date: 2008-02-29 08:56:40 -0500 (Fri, 29 Feb 2008)
New Revision: 1399

Modified:
   trunk/build/unix/buildbin.rhel-httpd.sh
Log:
Make sure that things like experimental libtool are used in both prefork and worker.


Modified: trunk/build/unix/buildbin.rhel-httpd.sh
===================================================================
--- trunk/build/unix/buildbin.rhel-httpd.sh	2008-02-29 13:53:58 UTC (rev 1398)
+++ trunk/build/unix/buildbin.rhel-httpd.sh	2008-02-29 13:56:40 UTC (rev 1399)
@@ -135,18 +135,20 @@
 fi
 
 # Ajust some more platform dependent stuff.
+add_conf_sys=""
 case ${BUILD_SYS} in
     linux*)
     add_conf="$add_conf --enable-pie"
     ;;
     hpux*)
-    add_conf="$add_conf --enable-experimental-libtool --enable-shared"
+    add_conf_sys="--enable-experimental-libtool"
+    add_conf="$add_conf --enable-shared"
     ;;
 esac
 case ${BUILD_CPU} in
     ppc64)
     # XXX: It is also in build.sh but not exported.
-    add_conf="${add_conf} CFLAGS=-m64"
+    add_conf_sys="CFLAGS=-m64"
     ;;
 esac
 echo "Building prefork and mpm with add_conf: $add_conf"
@@ -157,6 +159,7 @@
 mpmbuild prefork \
         --enable-mods-shared=all \
         ${add_conf} \
+        ${add_conf_sys} \
         --enable-proxy \
         --enable-cache --enable-mem-cache \
         --enable-file-cache --enable-disk-cache \
@@ -179,7 +182,7 @@
 make clean
 
 # For the other MPMs, just build httpd and no optional modules
-mpmbuild worker --enable-modules=none
+mpmbuild worker --enable-modules=none ${add_conf_sys}
 if [ $? -ne 0 ]; then
   echo "mpmbuild worker failed"
   exit 1