Follow up to bug 701875 - Fix red on windows fennec builds by always defining the omnijar name, r=bustage
authorMichael Wu <mwu@mozilla.com>
Sun, 13 Nov 2011 11:31:48 -0800
changeset 80200 7ae3089be8a5e06d95f3d54f2c09736d311b2d34
parent 80199 3f0b94325b80819e778aebd977b73c991d0b9198
child 80201 b51eb4007926047af2294d2ec536a330625db886
push id323
push userrcampbell@mozilla.com
push dateTue, 15 Nov 2011 21:58:36 +0000
treeherderfx-team@3ea216303184 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs701875
milestone11.0a1
Follow up to bug 701875 - Fix red on windows fennec builds by always defining the omnijar name, r=bustage
configure.in
--- a/configure.in
+++ b/configure.in
@@ -7651,27 +7651,27 @@ dnl Omnijar packaging is compatible with
 dnl In unpackaged builds, omnijar looks for files as if
 dnl things were flat packaged. After packaging, all files
 dnl are loaded from a single jar. MOZ_CHROME_FILE_FORMAT
 dnl is set to flat since putting files into jars is only
 dnl done during packaging with omnijar.
 if test "$MOZ_CHROME_FILE_FORMAT" = "omni"; then
     MOZ_OMNIJAR=1
     AC_DEFINE(MOZ_OMNIJAR)
-    OMNIJAR_NAME=omni.ja
-    AC_SUBST(OMNIJAR_NAME)
     if test "$OS_ARCH" = "WINNT" -o "$OS_ARCH" = "OS2" -o "$OS_TARGET" = "Android"; then
         MOZ_CHROME_FILE_FORMAT=flat
     else
         MOZ_CHROME_FILE_FORMAT=symlink
     fi
 elif test "$MOZ_CHROME_FILE_FORMAT" = "jar"; then
     AC_DEFINE(MOZ_CHROME_FILE_FORMAT_JAR)
 fi
 
+OMNIJAR_NAME=omni.ja
+AC_SUBST(OMNIJAR_NAME)
 AC_SUBST(MOZ_OMNIJAR)
 
 dnl ========================================================
 dnl = Define default location for MOZILLA_FIVE_HOME
 dnl ========================================================
 MOZ_ARG_WITH_STRING(default-mozilla-five-home,
 [  --with-default-mozilla-five-home
                           Set the default value for MOZILLA_FIVE_HOME],