Bug 551724 - Disable ctypes on x86/msvc if MASM is unavailable; (Bv1-CC) Copy (the useful part of) it to comm-central.
authorSerge Gautherie <sgautherie.bz@free.fr>
Sat, 27 Mar 2010 16:54:46 +0100
changeset 5298 a37e03f88d289ff6600a7bb804ded64db3452a40
parent 5297 78563f185a8ec1c79d0ef22616fff0c8547055fe
child 5299 18080bfb577d766329ceff14f9c3ceb01f47e303
push id4087
push usersgautherie.bz@free.fr
push dateSat, 27 Mar 2010 16:02:35 +0000
treeherdercomm-central@a37e03f88d28 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs551724
Bug 551724 - Disable ctypes on x86/msvc if MASM is unavailable; (Bv1-CC) Copy (the useful part of) it to comm-central. r=Callek.
configure.in
--- a/configure.in
+++ b/configure.in
@@ -4551,16 +4551,19 @@ MOZ_URL_CLASSIFIER=
 MOZ_USE_NATIVE_UCONV=
 MOZ_VIEW_SOURCE=1
 MOZ_XPINSTALL=1
 MOZ_XSLT_STANDALONE=
 MOZ_XTF=1
 MOZ_XUL=1
 MOZ_ZIPWRITER=1
 NS_PRINTING=1
+if test "$MOZILLA_1_9_2_BRANCH" != "1"; then
+BUILD_CTYPES=1
+fi
 
 
 case "$target_os" in
 darwin*)
     ACCESSIBILITY=
     ;;
 *)
     ACCESSIBILITY=1
@@ -6924,25 +6927,48 @@ MOZ_ARG_DISABLE_BOOL(rdf,
 [  --disable-rdf           Disable RDF],
     MOZ_RDF= )
 if test "$MOZ_RDF"; then
   AC_DEFINE(MOZ_RDF)
 fi
 
 AC_SUBST(MOZ_RDF)
 
+if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
+
 dnl
 dnl Build jsctypes on the platforms we can.
 dnl
 AC_SUBST(BUILD_CTYPES)
 if test "$OS_ARCH" != "WINCE" -o `echo $OS_TEST | grep -ic arm` != 1; then
   BUILD_CTYPES=1
   AC_DEFINE(BUILD_CTYPES)
 fi
 
+else
+
+dnl
+dnl Build jsctypes on the platforms we can, unless it's explicitly disabled.
+dnl
+MOZ_ARG_DISABLE_BOOL(ctypes,
+[  --disable-ctypes        Disable js-ctypes],
+    BUILD_CTYPES=,
+    BUILD_CTYPES=1)
+AC_SUBST(BUILD_CTYPES)
+if test "$BUILD_CTYPES"; then
+  if test "$OS_ARCH" = "WINCE" -a `echo $OS_TEST | grep -ic arm` = 1; then
+    # Disable ctypes for arm/wince.
+    BUILD_CTYPES=
+  else
+    AC_DEFINE(BUILD_CTYPES)
+  fi
+fi
+
+fi # ! MOZILLA_1_9_2_BRANCH
+
 dnl Only build Mork if it's required
 AC_SUBST(MOZ_MORK)
 if test "$MOZ_MORK"; then
   AC_DEFINE(MOZ_MORK)
 fi
 
 dnl Build the lightweight Mork reader if required
 AC_SUBST(MOZ_MORKREADER)