To allow altoptions.m4 to be shared by both the main Mozilla and the
authorJim Blandy <jimb@mozilla.org>
Tue, 26 Aug 2008 14:34:35 -0700
changeset 18461 c397279747fa966ebedd9806d691c7aeede5cbe3
parent 18428 43e89bd626d27eb3574f5a3af9239b2fc24e7c97
child 18462 8bfe86107c171a3366af7e4367ccff43add2022b
push idunknown
push userunknown
push dateunknown
milestone1.9.1a2pre
To allow altoptions.m4 to be shared by both the main Mozilla and the SpiderMonkey build code, sincluding it shouldn't have any side effects. Since only Mozilla wants the side effect, move it to Mozilla's aclocal.m4.
aclocal.m4
build/autoconf/altoptions.m4
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -8,12 +8,15 @@ builtin(include, build/autoconf/gtk.m4)d
 builtin(include, build/autoconf/libIDL.m4)dnl
 builtin(include, build/autoconf/libIDL-2.m4)dnl
 builtin(include, build/autoconf/nspr.m4)dnl
 builtin(include, build/autoconf/nss.m4)dnl
 builtin(include, build/autoconf/libart.m4)dnl
 builtin(include, build/autoconf/pkg.m4)dnl
 builtin(include, build/autoconf/freetype2.m4)dnl
 builtin(include, build/autoconf/codeset.m4)dnl
-dnl
-define(MOZ_TOPSRCDIR,.)dnl MOZ_TOPSRCDIR is used in altoptions.m4
 builtin(include, build/autoconf/altoptions.m4)dnl
 
+# Read the user's .mozconfig script.  We can't do this in
+# configure.in: autoconf puts the argument parsing code above anything
+# expanded from configure.in, and we need to get the configure options
+# from .mozconfig in place before that argument parsing code.
+MOZ_READ_MOZCONFIG(.)
--- a/build/autoconf/altoptions.m4
+++ b/build/autoconf/altoptions.m4
@@ -147,11 +147,8 @@ echo "
 
 dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file
 AC_DEFUN([MOZ_READ_MOZCONFIG],
 [AC_REQUIRE([AC_INIT_BINSH])dnl
 # Read in '.mozconfig' script to set the initial options.
 # See the mozconfig2configure script for more details.
 _AUTOCONF_TOOLS_DIR=`dirname [$]0`/[$1]/build/autoconf
 . $_AUTOCONF_TOOLS_DIR/mozconfig2configure])
-
-dnl This gets inserted at the top of the configure script
-MOZ_READ_MOZCONFIG(MOZ_TOPSRCDIR)