diff options
author | Richard Hughes <richard@hughsie.com> | 2010-01-26 14:18:36 +0000 |
---|---|---|
committer | Richard Hughes <richard@hughsie.com> | 2010-01-26 14:18:36 +0000 |
commit | 8e64ca9b78451b10096180a12b4b7d632915b85a (patch) | |
tree | 01eefe99fa0b0031a08a8df97c67335aaed73409 | |
parent | d5ce446cd5a4317a21844dd7e44c380ea2282c5f (diff) | |
download | gdm-8e64ca9b78451b10096180a12b4b7d632915b85a.tar.gz |
Fix compile when using a linker that defaults to --no-as-needed
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | gui/simple-chooser/Makefile.am | 3 | ||||
-rw-r--r-- | gui/simple-greeter/libnotificationarea/Makefile.am | 3 | ||||
-rw-r--r-- | utils/Makefile.am | 2 |
4 files changed, 9 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 2dcfb077..ac00aa7e 100644 --- a/configure.ac +++ b/configure.ac @@ -120,6 +120,7 @@ PKG_CHECK_MODULES(SIMPLE_GREETER, gtk+-2.0 >= $GTK_REQUIRED_VERSION gconf-2.0 >= $GCONF_REQUIRED_VERSION fontconfig >= $FONTCONFIG_REQUIRED_VERSION + x11 ) AC_SUBST(SIMPLE_GREETER_CFLAGS) AC_SUBST(SIMPLE_GREETER_LIBS) diff --git a/gui/simple-chooser/Makefile.am b/gui/simple-chooser/Makefile.am index 6e103688..2ee3f072 100644 --- a/gui/simple-chooser/Makefile.am +++ b/gui/simple-chooser/Makefile.am @@ -13,6 +13,7 @@ AM_CPPFLAGS = \ -DPIXMAPDIR=\""$(pixmapdir)"\" \ -DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\"" \ $(GTK_CFLAGS) \ + $(XLIB_CFLAGS) \ $(XDMCP_CFLAGS) \ $(EXTRA_CHOOSER_CFLAGS) \ $(SIMPLE_CHOOSER_CFLAGS) \ @@ -43,6 +44,7 @@ gdm_simple_chooser_LDADD = \ $(EXTRA_CHOOSER_LIBS) \ $(SIMPLE_CHOOSER_LIBS) \ $(XDMCP_LIBS) \ + $(XLIB_LIBS) \ $(NULL) gdm_host_chooser_SOURCES = \ @@ -61,6 +63,7 @@ gdm_host_chooser_LDADD = \ $(EXTRA_CHOOSER_LIBS) \ $(SIMPLE_CHOOSER_LIBS) \ $(XDMCP_LIBS) \ + $(XLIB_LIBS) \ $(NULL) EXTRA_DIST = \ diff --git a/gui/simple-greeter/libnotificationarea/Makefile.am b/gui/simple-greeter/libnotificationarea/Makefile.am index 4009aaf5..7df07505 100644 --- a/gui/simple-greeter/libnotificationarea/Makefile.am +++ b/gui/simple-greeter/libnotificationarea/Makefile.am @@ -11,6 +11,7 @@ INCLUDES = \ -DPIXMAPDIR=\"$(pixmapdir)\" \ -DSBINDIR=\"$(sbindir)\" \ $(GTK_CFLAGS) \ + $(XLIB_CFLAGS) \ $(NULL) noinst_LTLIBRARIES = \ @@ -39,6 +40,7 @@ libnotificationarea_la_SOURCES = \ libnotificationarea_la_LIBADD = \ $(GTK_LIBS) \ + $(XLIB_LIBS) \ $(NULL) libnotificationarea_la_LDFLAGS = \ @@ -65,4 +67,5 @@ testtray_SOURCES = \ testtray_LDADD = \ libnotificationarea.la \ $(GREETER_LIBS) \ + $(XLIB_LIBS) \ $(NULL) diff --git a/utils/Makefile.am b/utils/Makefile.am index f1ff3313..64b3024c 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -9,6 +9,7 @@ AM_CPPFLAGS = \ $(UTILS_CFLAGS) \ $(CANBERRA_GTK_CFLAGS) \ $(GTK_CFLAGS) \ + $(XLIB_CFLAGS) \ $(COMMON_CFLAGS) \ $(NULL) @@ -52,6 +53,7 @@ gdm_screenshot_SOURCES = \ gdm_screenshot_LDADD = \ $(GTK_LIBS) \ $(CANBERRA_GTK_LIBS) \ + $(XLIB_LIBS) \ $(COMMON_LIBS) \ $(NULL) |