bug 454256 - --enable-static firefox builds should error in configure. r=bsmedberg
authorTed Mielczarek <ted.mielczarek@gmail.com>
Tue, 09 Sep 2008 13:59:11 -0400
changeset 19017 dbdaae775f5bf718e0816f5a400c5dcb292d3a72
parent 19016 957eab222b84b9dc4b4a0e67249567ff0761c9c2
child 19018 1023e41aa9b45dabf8a8961605e244450f4725d0
push idunknown
push userunknown
push dateunknown
reviewersbsmedberg
bugs454256
milestone1.9.1b1pre
bug 454256 - --enable-static firefox builds should error in configure. r=bsmedberg
browser/confvars.sh
configure.in
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -36,16 +36,17 @@
 #
 # ***** END LICENSE BLOCK *****
 
 MOZ_APP_NAME=firefox
 MOZ_UPDATER=1
 MOZ_PHOENIX=1
 
 MOZ_ENABLE_LIBXUL=1
+MOZ_STATIC_BUILD_UNSUPPORTED=1
 MOZ_PLACES=1
 # always enabled for form history
 MOZ_MORKREADER=1
 MOZ_SAFE_BROWSING=1
 MOZ_APP_VERSION=$FIREFOX_VERSION
 MOZ_NO_XPCOM_OBSOLETE=1
 MOZ_EXTENSIONS_DEFAULT=" gnomevfs reporter"
 # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
--- a/configure.in
+++ b/configure.in
@@ -7156,16 +7156,20 @@ if test -n "$MOZ_DEBUG" -a "$MOZ_BUILD_A
    MOZ_ENABLE_LIBXUL=
 fi
 
 MOZ_ARG_ENABLE_BOOL(libxul,
 [  --enable-libxul         Enable building of libxul],
     MOZ_ENABLE_LIBXUL=1,
     MOZ_ENABLE_LIBXUL=)
 
+if test -n "$MOZ_STATIC_BUILD_UNSUPPORTED" -a -n "$BUILD_STATIC_LIBS"; then
+	AC_MSG_ERROR([--enable-static is not supported for building $MOZ_APP_NAME. You probably want --enable-libxul.])
+fi
+
 if test -n "$MOZ_ENABLE_LIBXUL" -a -n "$BUILD_STATIC_LIBS"; then
 	AC_MSG_ERROR([--enable-libxul is not compatible with --enable-static])
 fi
 
 if test -n "$MOZ_ENABLE_LIBXUL" -a -z "$MOZ_XUL_APP"; then
 	AC_MSG_ERROR([--enable-libxul is only compatible with toolkit XUL applications.])
 fi