Bustage Fix for Bug 516758. Be sure to AC_DEFINE MOZ_HELP_VIEWER if set. r=ted
authorJustin Wood <Callek@gmail.com>
Tue, 27 Apr 2010 22:35:00 -0400
changeset 41442 cedd9976e7e0f5e62a01cd9e5c218c6d81b85b20
parent 41441 7f96103154fc92c0b0ef24c3b5524148ddae5211
child 41443 ea7e3f4f45d7a2555529f27838dad8db66d654c0
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs516758, 561663
milestone1.9.3a5pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
Bustage Fix for Bug 516758. Be sure to AC_DEFINE MOZ_HELP_VIEWER if set. r=ted Fixes SM Bug 561663.
configure.in
--- a/configure.in
+++ b/configure.in
@@ -6584,16 +6584,24 @@ else
     if test "x$ac_cv_sqlite_enable_fts3" = "xno"; then
         AC_MSG_ERROR([System SQLite library is not compiled with SQLITE_ENABLE_FTS3.])
     fi
 fi
 
 AC_SUBST(MOZ_NATIVE_SQLITE)
 
 dnl ========================================================
+dnl = Enable help viewer (off by default)
+dnl ========================================================
+if test -n "$MOZ_HELP_VIEWER"; then
+     dnl Do this if defined in confvars.sh
+     AC_DEFINE(MOZ_HELP_VIEWER)
+fi
+
+dnl ========================================================
 dnl = Enable safe browsing (anti-phishing)
 dnl ========================================================
 MOZ_ARG_ENABLE_BOOL(safe-browsing,
 [  --enable-safe-browsing        Enable safe browsing (anti-phishing) implementation],
     MOZ_SAFE_BROWSING=1,
     MOZ_SAFE_BROWSING= )
 if test -n "$MOZ_SAFE_BROWSING"; then
     AC_DEFINE(MOZ_SAFE_BROWSING)