Move MOZ_PHOENIX to application configure and set MC_BASILISK

3 files changed, 17 insertions, 6 deletions

diff --git a/browser/configure.in b/browser/configure.in
new file mode 100644
index 000000000..fe3e5acf1
--- /dev/null
+++ b/browser/configure.in
@@ -0,0 +1,15 @@
+dnl -*- Mode: Autoconf; tab-width: 2; indent-tabs-mode: nil; -*-
+dnl vi: set tabstop=2 shiftwidth=2 expandtab:
+dnl This Source Code Form is subject to the terms of the Mozilla Public
+dnl License, v. 2.0. If a copy of the MPL was not distributed with this
+dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+dnl Things we need to carry from confvars.sh
+AC_DEFINE(MOZ_PHOENIX)
+AC_SUBST(MOZ_PHOENIX)
+
+AC_DEFINE(MC_BASILISK)
+AC_SUBST(MC_BASILISK)
+
+dnl Optional parts of the build.
+
diff --git a/browser/confvars.sh b/browser/confvars.sh
index 1bc9d1ad0..98fa4cbe9 100755
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -5,8 +5,9 @@
 
 MOZ_APP_BASENAME=Firefox
 MOZ_APP_VENDOR=Mozilla
-MOZ_UPDATER=1
 MOZ_PHOENIX=1
+MC_BASILISK=1
+MOZ_UPDATER=1
 
 if test "$OS_ARCH" = "WINNT" -o \
         "$OS_ARCH" = "Linux"; then
diff --git a/old-configure.in b/old-configure.in
index 2de3e9db8..4fffb721f 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -2401,10 +2401,6 @@ fi
 # that haven't made a confvars.sh yet. Don't add new stuff here, use
 # MOZ_BUILD_APP.
 case "$MOZ_BUILD_APP" in
-browser)
-  AC_DEFINE(MOZ_PHOENIX)
-  ;;
-
 xulrunner)
   AC_DEFINE(MOZ_XULRUNNER)
   ;;
@@ -2433,7 +2429,6 @@ if test -n "$MOZ_RUST"; then
     fi
 fi
 
-AC_SUBST(MOZ_PHOENIX)
 AC_SUBST(MOZ_XULRUNNER)
 AC_SUBST(MOZ_B2G)
 AC_SUBST(MOZ_MULET)