Bug 514954: add AC_DEFINE/AC_SUBST for official branding, r=ted

This commit is contained in:
Gavin Sharp 2009-09-07 00:07:14 -04:00
parent 34d676d624
commit b432764e55
2 changed files with 10 additions and 1 deletions

View File

@ -652,3 +652,5 @@ HAVE_ARM_NEON = @HAVE_ARM_NEON@
MOZ_SPLASHSCREEN = @MOZ_SPLASHSCREEN@ MOZ_SPLASHSCREEN = @MOZ_SPLASHSCREEN@
MOZ_THEME_FASTSTRIPE = @MOZ_THEME_FASTSTRIPE@ MOZ_THEME_FASTSTRIPE = @MOZ_THEME_FASTSTRIPE@
MOZ_OFFICIAL_BRANDING = @MOZ_OFFICIAL_BRANDING@

View File

@ -4470,6 +4470,7 @@ BUILD_STATIC_LIBS=
ENABLE_TESTS=1 ENABLE_TESTS=1
MOZ_ACTIVEX_SCRIPTING_SUPPORT= MOZ_ACTIVEX_SCRIPTING_SUPPORT=
MOZ_BRANDING_DIRECTORY= MOZ_BRANDING_DIRECTORY=
MOZ_OFFICIAL_BRANDING=
MOZ_DBGRINFO_MODULES= MOZ_DBGRINFO_MODULES=
MOZ_ENABLE_CANVAS=1 MOZ_ENABLE_CANVAS=1
MOZ_ENABLE_CANVAS3D= MOZ_ENABLE_CANVAS3D=
@ -5025,8 +5026,14 @@ MOZ_ARG_ENABLE_BOOL(official-branding,
AC_MSG_ERROR([You must specify MOZ_OFFICIAL_BRANDING_DIRECTORY to use --enable-official-branding.]) AC_MSG_ERROR([You must specify MOZ_OFFICIAL_BRANDING_DIRECTORY to use --enable-official-branding.])
else else
MOZ_BRANDING_DIRECTORY=${MOZ_OFFICIAL_BRANDING_DIRECTORY} MOZ_BRANDING_DIRECTORY=${MOZ_OFFICIAL_BRANDING_DIRECTORY}
MOZ_OFFICIAL_BRANDING=1
fi fi
]) ], MOZ_OFFICIAL_BRANDING=)
AC_SUBST(MOZ_OFFICIAL_BRANDING)
if test -n "$MOZ_OFFICIAL_BRANDING"; then
AC_DEFINE(MOZ_OFFICIAL_BRANDING)
fi
MOZ_ARG_WITH_STRING(branding, MOZ_ARG_WITH_STRING(branding,
[ --with-branding=dir Use branding from the specified directory.], [ --with-branding=dir Use branding from the specified directory.],