[gdm] Fix compile when using a linker that defaults to --no-as-needed



commit 8e64ca9b78451b10096180a12b4b7d632915b85a
Author: Richard Hughes <richard hughsie com>
Date:   Tue Jan 26 14:18:36 2010 +0000

    Fix compile when using a linker that defaults to --no-as-needed

 configure.ac                                       |    1 +
 gui/simple-chooser/Makefile.am                     |    3 +++
 gui/simple-greeter/libnotificationarea/Makefile.am |    3 +++
 utils/Makefile.am                                  |    2 ++
 4 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2dcfb07..ac00aa7 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 6e10368..2ee3f07 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 4009aaf..7df0750 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 f1ff331..64b3024 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)
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]