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 72613 fb91a23bd158f91a785358405676671fd1aef2df
parent 72612 6eb3f7a54ae1bccf1fca7c8a4525f295187623ea
child 72614 a5870dd2ad7c1b9f4f45336d05f1604887f7e9ef
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
@@ -8453,17 +8453,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)