Bustage fix following Bug 580407 landing in m-c - force building of shared js library for now
authorMark Banner <bugzilla@standard8.plus.com>
Sat, 14 Aug 2010 09:32:08 +0100
changeset 6157 ea32f3539d5d9a9c337a22bb150b48cc8915a14f
parent 6156 579f8b02ac2976565b856072b5afa693476187d1
child 6158 e05dc1486d500c5ca4331a96276a16712bcae3ca
push idunknown
push userunknown
push dateunknown
bugs580407
Bustage fix following Bug 580407 landing in m-c - force building of shared js library for now
configure.in
--- a/configure.in
+++ b/configure.in
@@ -4190,16 +4190,21 @@ SYSTEM_LIBXUL=
 MOZ_ARG_WITH_BOOL(system-libxul,
 [  --with-system-libxul   Use system installed libxul SDK],
     SYSTEM_LIBXUL=1)
 
 if test -n "$SYSTEM_LIBXUL" && test -z "$MOZ_ENABLE_LIBXUL"; then
     AC_MSG_ERROR([--with-system-libxul needs --with-libxul-sdk])
 fi
 
+MOZ_ARG_DISABLE_BOOL(shared-js,
+[  --disable-shared-js    Disable the shared JavaScript library, use a static.],
+    JS_SHARED_LIBRARY=0,
+    JS_SHARED_LIBRARY=1)
+
 dnl ========================================================
 dnl = If NSPR was not detected in the system, 
 dnl = use the one in the source tree (mozilla/nsprpub)
 dnl ========================================================
 MOZ_ARG_WITH_BOOL(system-nspr,
 [  --with-system-nspr      Use system installed NSPR],
     _USE_SYSTEM_NSPR=1 )
 
@@ -7373,21 +7378,28 @@ fi
 
 # --enable-application needs to find confvars.sh, build.mk, etc in the gived dir, so add ../
 # --disable-official-branding disables all checks for official branding, as we're doing this ourselves in our own repo
 ac_configure_args="$_SUBDIR_CONFIG_ARGS --enable-application=../$MOZ_BUILD_APP --disable-official-branding --with-branding=../$REAL_BRANDING_DIRECTORY"
 if test -n "$L10NBASEDIR"; then
     dnl Override the initial value with the new one which is guaranteed to be an absolute path.
     ac_configure_args="$ac_configure_args --with-l10n-base=$L10NBASEDIR"
 fi
+
+# Make sure we've got js set to shared or static appropriately
+if test -z "$JS_SHARED_LIBRARY"; then
+    ac_configure_args="$ac_configure_args --enable-shared-js"
+fi
+
 # for Mac universal builds, we need to call the Mozilla configure with MOZ_BUILD_APP=[ppc|i386]
 MOZ_BUILD_APP_CACHED="$MOZ_BUILD_APP"
 if test -n "$MOZ_CURRENT_PROJECT"; then
     export MOZ_BUILD_APP="$MOZ_CURRENT_PROJECT"
 fi
+
 AC_OUTPUT_SUBDIRS(mozilla)
 ac_configure_args="$_SUBDIR_CONFIG_ARGS"
 MOZ_BUILD_APP="$MOZ_BUILD_APP_CACHED"
 
 # if we're building the LDAP XPCOM component, we need to build 
 # the c-sdk first.  
 if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM"; then
     # these subdirs may not yet have been created in the build tree.