Updating branch refs/heads/master
to bb2b528df1fc548fcde6f62b0d4ed65754a87b2a (commit)
from d7e367a4ce7b9ee0ea638fe1c3ff0e89ba9b1e7f (commit)
commit bb2b528df1fc548fcde6f62b0d4ed65754a87b2a
Author: Jannis Pohlmann <[email protected]>
Date: Tue Oct 19 18:59:32 2010 +0200
Fix broken compilation with -Wl,-z,defs -Wl,--as-needed.
configure.in.in | 5 +++++
plugins/thunar-wallpaper/Makefile.am | 4 +++-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 8b1f2aa..b41c6ce 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -134,6 +134,11 @@ dnl *** Check for i18n support ***
dnl ******************************
XDT_I18N([...@linguas@])
+dnl *********************
+dnl *** Check for X11 ***
+dnl *********************
+XDT_CHECK_LIBX11_REQUIRE()
+
dnl ***********************************
dnl *** Check for required packages ***
dnl ***********************************
diff --git a/plugins/thunar-wallpaper/Makefile.am
b/plugins/thunar-wallpaper/Makefile.am
index d476325..9455670 100644
--- a/plugins/thunar-wallpaper/Makefile.am
+++ b/plugins/thunar-wallpaper/Makefile.am
@@ -19,6 +19,7 @@ thunar_wallpaper_plugin_la_CFLAGS =
\
$(EXO_CFLAGS) \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
+ $(LIBX11_CFLAGS) \
$(PLATFORM_CFLAGS)
thunar_wallpaper_plugin_la_LDFLAGS = \
@@ -32,7 +33,8 @@ thunar_wallpaper_plugin_la_LIBADD =
\
$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la \
$(EXO_LIBS) \
$(GLIB_LIBS) \
- $(GTK_LIBS)
+ $(GTK_LIBS) \
+ $(LIBX11_LIBS)
thunar_wallpaper_plugin_la_DEPENDENCIES = \
$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
