Bug 743601 - Remove GLIB check for OSX. r=khuey

Brli · Apr 27, 2012 · bd47fef · bd47fef
1 parent eb56443
commit bd47fef
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 204 deletions.
diff --git a/aclocal.m4 b/aclocal.m4
@@ -3,7 +3,6 @@ dnl Local autoconf macros used with mozilla
 dnl The contents of this file are under the Public Domain.
 dnl 
 
-builtin(include, build/autoconf/glib.m4)dnl
 builtin(include, build/autoconf/nspr.m4)dnl
 builtin(include, build/autoconf/nss.m4)dnl
 builtin(include, build/autoconf/pkg.m4)dnl

diff --git a/build/autoconf/glib.m4 b/build/autoconf/glib.m4
diff --git a/configure.in b/configure.in
@@ -8020,10 +8020,8 @@ dnl ========================================================
 
 if test -z "$SKIP_PATH_CHECKS"; then
 if test -z "${GLIB_CFLAGS}" -o -z "${GLIB_LIBS}" ; then
-    if test "$MOZ_ENABLE_GTK2" -o "$USE_ELF_DYNSTR_GC" ; then
+    if test "$MOZ_ENABLE_GTK2" -o "$MOZ_ENABLE_QT" -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