Updating branch refs/heads/master
to d6785af78f96716983b0fb2c39cb95cabcba2ace (commit)
from 31c853f8a867cfec85fbabf15c5d7f5aab9e8169 (commit)
commit d6785af78f96716983b0fb2c39cb95cabcba2ace
Author: Nick Schermer <[email protected]>
Date: Fri Nov 5 12:41:21 2010 +0100
Link against x11 for XInternAtom.
configure.in.in | 5 +++++
thunar-vfs/Makefile.am | 2 ++
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 6a78cbf..d07ba0c 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -153,6 +153,11 @@ dnl *** Check for i18n support ***
dnl ******************************
XDT_I18N([...@linguas@])
+dnl *******************************************
+dnl *** Check for X Window System installed ***
+dnl *******************************************
+XDT_CHECK_LIBX11_REQUIRE()
+
dnl ***********************************
dnl *** Check for required packages ***
dnl ***********************************
diff --git a/thunar-vfs/Makefile.am b/thunar-vfs/Makefile.am
index 3872705..4e545f9 100644
--- a/thunar-vfs/Makefile.am
+++ b/thunar-vfs/Makefile.am
@@ -140,6 +140,7 @@ libthunar_vfs_1_la_CFLAGS =
\
$(LIBJPEG_CFLAGS) \
$(LIBPNG_CFLAGS) \
$(LIBSTARTUP_NOTIFICATION_CFLAGS) \
+ $(LIBX11_CFLAGS) \
$(PLATFORM_CFLAGS)
libthunar_vfs_1_la_LDFLAGS = \
@@ -155,6 +156,7 @@ libthunar_vfs_1_la_LIBADD =
\
$(LIBJPEG_LIBS) \
$(LIBPNG_LIBS) \
$(LIBSTARTUP_NOTIFICATION_LIBS) \
+ $(LIBX11_LIBS) \
-lm
thunar_vfs_helperdir = $(libdir)/thunar-vfs-$(THUNAR_VFS_VERSION_API)
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits