Bug 666424: Don't use GLIB_CONFIG if if has the value 'no'. r=khuey
authorJoey Armstrong <joey@mozilla.com>
Thu, 30 Jun 2011 09:16:21 -0700
changeset 72658 b4c7d0319ea1ca91bc8c148dbbd816c755169fdb
parent 72657 c97034c07fe6e07f92b4bdf5fabdcbb380f15ca6
child 72659 38e14b78ac76645197ed8cfb1aeefaabb979a897
push id159
push usereakhgari@mozilla.com
push dateTue, 16 Aug 2011 17:53:11 +0000
treeherdermozilla-beta@8786e3e49240 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs666424
milestone7.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 666424: Don't use GLIB_CONFIG if if has the value 'no'. r=khuey
configure.in
--- a/configure.in
+++ b/configure.in
@@ -8446,17 +8446,20 @@ if test -z "${GLIB_CFLAGS}" -o -z "${GLI
     if test "$MOZ_ENABLE_GTK2" -o "$USE_ELF_DYNSTR_GC" ; then
         PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.7 gobject-2.0)
     else
         AM_PATH_GLIB(${GLIB_VERSION})
     fi
 fi
 fi
 
-if test -z "${GLIB_GMODULE_LIBS}" -a -n "${GLIB_CONFIG}"; then
+if test -z "${GLIB_GMODULE_LIBS}" \
+   -a -n "${GLIB_CONFIG}"\
+    -a "${GLIB_CONFIG}" != no\
+; then
     GLIB_GMODULE_LIBS=`$GLIB_CONFIG gmodule --libs`
 fi
 
 AC_SUBST(LIBIDL_CFLAGS)
 AC_SUBST(LIBIDL_LIBS)
 AC_SUBST(STATIC_LIBIDL)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)