summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Cameron <brian.cameron@sun.com>2006-10-08 13:42:41 +0000
committerBrian Cameron <bcameron@src.gnome.org>2006-10-08 13:42:41 +0000
commitbb175d229269fb0671d72e0bed5ef3e2a1b1bb16 (patch)
tree8b912e633392927030fe12d6e8fae0d7a9666842
parenta0f07838c925c35b1d5fc2bce881da7168030fc8 (diff)
downloadgdm-bb175d229269fb0671d72e0bed5ef3e2a1b1bb16.tar.gz
Add -lX11 to link statements so that the new code from Ariel that uses X
2006-10-08 Brian Cameron <brian.cameron@sun.com> * gui/Makefile.am: Add -lX11 to link statements so that the new code from Ariel that uses X atoms will build on Solaris.
-rw-r--r--ChangeLog5
-rw-r--r--gui/Makefile.am3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d648398..f13811c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-10-08 Brian Cameron <brian.cameron@sun.com>
+ * gui/Makefile.am: Add -lX11 to link statements so that the new code
+ from Ariel that uses X atoms will build on Solaris.
+
+2006-10-08 Brian Cameron <brian.cameron@sun.com>
+
* daemon/auth.c: Fix comment.
2006-10-08 Brian Cameron <brian.cameron@sun.com>
diff --git a/gui/Makefile.am b/gui/Makefile.am
index d8f7f305..4ce1eb77 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -155,6 +155,7 @@ gdmphotosetup_LDADD = \
$(GDK_LIBS) \
$(GDKPIXBUF_LIBS) \
$(INTLLIBS) \
+ -lX11 \
$(top_builddir)/vicious-extensions/libviciousui.a
gdmXnestchooser_LDADD = \
@@ -181,6 +182,7 @@ gdmflexiserver_LDADD = \
$(top_builddir)/vicious-extensions/libviciousui.a \
$(EXTRA_FLEXI_LIBS) \
$(X_LIBS) \
+ -lX11 \
-lXau \
-lpopt
@@ -194,6 +196,7 @@ gdmdynamic_LDADD = \
$(top_builddir)/vicious-extensions/libviciousui.a \
$(EXTRA_DYNAMIC_LIBS) \
$(X_LIBS) \
+ -lX11 \
-lXau
Settingsdir = $(datadir)/applications