[Xfce4-commits] <exo:master> Fix link problems with --no-add-needed (bug #5951).

[Nick Schermer]

Updating branch refs/heads/master
         to 00e1e909f79f045aa49e016cca1c124e8a156e1a (commit)
       from 4c13968cee9e1271351eb8f270175976cd6c17b2 (commit)

commit 00e1e909f79f045aa49e016cca1c124e8a156e1a
Author: Yves-Alexis Perez <corsac at debian.org>
Date:   Mon Feb 15 12:28:35 2010 +0100

    Fix link problems with --no-add-needed (bug #5951).

 configure.in.in   |    5 +++++
 exo/Makefile.am   |    2 ++
 tests/Makefile.am |    2 ++
 3 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 8e774df..d82ad34 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -183,6 +183,11 @@ fi
 AC_SUBST([GIOMODULEDIR])
 AM_CONDITIONAL([HAVE_GIO_MODULEDIR], [test x"$GIOMODULEDIR" != x""])
 
+dnl *********************
+dnl *** Check for X11 ***
+dnl *********************
+XDT_CHECK_LIBX11_REQUIRE()
+
 dnl **************************************
 dnl *** Check for libnotify (optional) ***
 dnl **************************************
diff --git a/exo/Makefile.am b/exo/Makefile.am
index eadd807..a23bdc4 100644
--- a/exo/Makefile.am
+++ b/exo/Makefile.am
@@ -92,6 +92,7 @@ libexo_1_la_SOURCES =							\
 libexo_1_la_CFLAGS =							\
 	$(GIO_CFLAGS)							\
 	$(GTK_CFLAGS)							\
+	$(LIBX11_CFLAGS)						\
 	$(LIBXFCE4UTIL_CFLAGS)
 
 libexo_1_la_LDFLAGS =							\
@@ -103,6 +104,7 @@ libexo_1_la_LDFLAGS =							\
 libexo_1_la_LIBADD =							\
 	$(GIO_LIBS)							\
 	$(GTK_LIBS)							\
+	$(LIBX11_LIBS)							\
 	$(LIBXFCE4UTIL_LIBS)
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c68460f..79481bf 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -67,6 +67,7 @@ test_exo_icon_chooser_dialog_DEPENDENCIES =				\
 	$(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
 
 test_exo_icon_chooser_dialog_LDADD =					\
+	$(GTK_LIBS)							\
 	$(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
 
 test_exo_wrap_table_SOURCES =						\
@@ -80,6 +81,7 @@ test_exo_wrap_table_DEPENDENCIES =					\
 	$(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
 
 test_exo_wrap_table_LDADD =						\
+	$(GTK_LIBS)							\
 	$(top_builddir)/exo/libexo-$(LIBEXO_VERSION_API).la
 
 DISTCLEANFILES = test-exo-csource-data.c