From 4e96c1cfbc7fc38f62e8d41cbddcd0327a0990eb Mon Sep 17 00:00:00 2001 From: Brian Cameron Date: Mon, 4 Jun 2007 05:39:03 +0000 Subject: Add -lfontconfig to programs that link against gui/libgdmcommon.a since it 2007-06-04 Brian Cameron * gui/Makefile.am, gui/greeter/Makefile.am: Add -lfontconfig to programs that link against gui/libgdmcommon.a since it now contains FontConfig code, due to fix for bug #426653. On Solaris it is necessary to not link libraries implicitely. svn path=/trunk/; revision=4956 --- gui/Makefile.am | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gui/Makefile.am') diff --git a/gui/Makefile.am b/gui/Makefile.am index 0d2a1e39..6fc528d4 100644 --- a/gui/Makefile.am +++ b/gui/Makefile.am @@ -114,6 +114,7 @@ gdmchooser_LDADD = \ $(X_LIBS) \ $(XDMCP_LIBS) \ -lX11 \ + -lfontconfig \ $(NULL) gdmlogin_LDADD = \ @@ -132,6 +133,7 @@ gdmlogin_LDADD = \ $(XINERAMA_LIBS) \ $(X_LIBS) \ -lX11 \ + -lfontconfig \ $(NULL) # LIBGNOMEUI should be removed from gdmsetup at some point. @@ -155,6 +157,7 @@ gdmsetup_LDADD = \ $(X_LIBS) \ -lXau \ -lX11 \ + -lfontconfig \ $(NULL) gdmphotosetup_LDADD = \ @@ -167,7 +170,8 @@ gdmphotosetup_LDADD = \ $(GDKPIXBUF_LIBS) \ $(INTLLIBS) \ -lX11 \ - $(top_builddir)/common/libgdmcommon.a \ + -lfontconfig \ + $(top_builddir)/common/libgdmcommon.a \ $(NULL) gdmXnestchooser_LDADD = \ @@ -177,11 +181,12 @@ gdmXnestchooser_LDADD = \ $(GLIB_LIBS) \ $(GOBJECT_LIBS) \ $(GDK_LIBS) \ - $(top_builddir)/common/libgdmcommon.a \ $(EXTRA_XNEST_LIBS) \ $(X_LIBS) \ -lXau \ -lX11 \ + -lfontconfig \ + $(top_builddir)/common/libgdmcommon.a \ $(NULL) gdmflexiserver_LDADD = \ @@ -196,6 +201,7 @@ gdmflexiserver_LDADD = \ $(X_LIBS) \ -lX11 \ -lXau \ + -lfontconfig \ $(NULL) gdmdynamic_LDADD = \ @@ -210,6 +216,7 @@ gdmdynamic_LDADD = \ $(X_LIBS) \ -lX11 \ -lXau \ + -lfontconfig \ $(NULL) Settingsdir = $(datadir)/gdm/applications -- cgit v1.2.1