Bug 454841 - glib.h not found when building qt-cairo backend without --disable-elf-dynstr-gc; r=ted.mielczarek
authorAntonio Gomes <tonikitoo@gmail.com>
Mon, 29 Sep 2008 00:24:40 +0200
changeset 19858 ce3fd20cce9fc718deed140d2b21525a31c45e47
parent 19857 d7e0ac0b376a56cefdb039b1b69bf66e4d201586
child 19859 62b670248ab799fd8816bc2fb39a45a881f65e66
push idunknown
push userunknown
push dateunknown
reviewersted
bugs454841
milestone1.9.1b1pre
Bug 454841 - glib.h not found when building qt-cairo backend without --disable-elf-dynstr-gc; r=ted.mielczarek
configure.in
--- a/configure.in
+++ b/configure.in
@@ -4765,16 +4765,17 @@ cairo-gtk2-dfb)
     fi
     ;;
 
 cairo-qt)
     MOZ_WIDGET_TOOLKIT=qt
     MOZ_GFX_TOOLKIT=cairo
     MOZ_ENABLE_QT=1
     MOZ_ENABLE_XREMOTE=1
+    USE_ELF_DYNSTR_GC=
 
     AC_DEFINE(MOZ_X11)
     MOZ_X11=1
 
     TK_CFLAGS='$(MOZ_QT_CFLAGS)'
     TK_LIBS='$(MOZ_QT_LIBS)'
     AC_DEFINE(MOZ_WIDGET_QT)
     ;;
@@ -7339,17 +7340,17 @@ if test -n "$CROSS_COMPILE"; then
     else
         HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS"
         HOST_LIBIDL_LIBS="$LIBIDL_LIBS"
     fi
 fi
 
 if test -z "$SKIP_PATH_CHECKS"; then
 if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then
-    if test "$MOZ_ENABLE_GTK2"; then
+    if test "$MOZ_ENABLE_GTK2" || test "$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