diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2007-06-04 05:39:03 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2007-06-04 05:39:03 +0000 |
| commit | 4e96c1cfbc7fc38f62e8d41cbddcd0327a0990eb (patch) | |
| tree | 52551c2213106706b6a96af3dd6fc8b21a58f033 /gui | |
| parent | 5fddaac11dccb6b863027f42a2430f71d670942c (diff) | |
| download | gdm-4e96c1cfbc7fc38f62e8d41cbddcd0327a0990eb.tar.gz | |
Add -lfontconfig to programs that link against gui/libgdmcommon.a since it
2007-06-04 Brian Cameron <brian.cameron@sun.com>
* 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
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/Makefile.am | 11 | ||||
| -rw-r--r-- | gui/greeter/Makefile.am | 3 |
2 files changed, 11 insertions, 3 deletions
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 diff --git a/gui/greeter/Makefile.am b/gui/greeter/Makefile.am index efcbc5f6..3c1e1024 100644 --- a/gui/greeter/Makefile.am +++ b/gui/greeter/Makefile.am @@ -89,7 +89,8 @@ gdmgreeter_LDADD = \ $(X_EXTRA_LIBS) \ $(XINERAMA_LIBS) \ $(X_LIBS) \ - -lX11 + -lX11 \ + -lfontconfig EXTRA_DIST = \ gdmthemetester.in \ |