bug 109442 r=cls

extensions/ctl/src/* hardcodes -lgmodule

config/autoconf.mk.in

@@ -335,6 +335,7 @@ MOZ_XIE_LIBS		= @MOZ_XIE_LIBS@
 
 GLIB_CFLAGS	= @GLIB_CFLAGS@
 GLIB_LIBS	= @GLIB_LIBS@
+GLIB_GMODULE_LIBS	= @GLIB_GMODULE_LIBS@
 LIBIDL_CFLAGS = @LIBIDL_CFLAGS@
 LIBIDL_LIBS = @LIBIDL_LIBS@
 

configure.in

@@ -4037,10 +4037,15 @@ if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then
 fi
 fi
 
+if test -z "${GLIB_GMODULE_LIBS}" ; then
+    GLIB_GMODULE_LIBS=`$GLIB_CONFIG gmodule --libs`
+fi
+
 AC_SUBST(LIBIDL_CFLAGS)
 AC_SUBST(LIBIDL_LIBS)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
+AC_SUBST(GLIB_GMODULE_LIBS)
 AC_SUBST(HOST_LIBIDL_CONFIG)
 AC_SUBST(HOST_LIBIDL_CFLAGS)
 AC_SUBST(HOST_LIBIDL_LIBS)

extensions/ctl/src/Makefile.in

@@ -58,6 +58,5 @@ EXTRA_DSO_LDOPTS += \
 	$(MOZ_COMPONENT_LIBS) \
 	-L$(DIST)/lib \
 	$(EXTRA_DSO_LIBS) \
-	$(GLIB_LIBS) \
-	-lgmodule \
+	$(GLIB_GMODULE_LIBS) \
 	$(NULL)

extensions/ctl/src/pangoLite/Makefile.in

@@ -66,7 +66,7 @@ include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS  += $(GLIB_CFLAGS)
 CFLAGS    += $(GLIB_CFLAGS)
-EXTRA_DSO_LDOPTS += $(GLIB_LIBS) -lgmodule
+EXTRA_DSO_LDOPTS += $(GLIB_GMODULE_LIBS)
 
 # Install pango.modules file for Shaping Modules.
 libs::

extensions/ctl/src/thaiShaper/Makefile.in

@@ -55,5 +55,5 @@ EXTRA_DSO_LDOPTS += \
 		-L$(DIST)/lib \
 		$(EXTRA_DSO_LIBS) \
 		$(GLIB_LIBS) \
-		-lgmodule \
+		$(GLIB_GMODULE_LIBS) \
 		$(NULL)