[Xfce4-commits] <parole:master> Fix X11 linking (Bug #6244)

[Christoph Mende]

Updating branch refs/heads/master
         to c7f57add6f9c31e8f59888514d107fcb520830f5 (commit)
       from d2fb7d1426a17ae9689540c227bdc7569b4798d0 (commit)

commit c7f57add6f9c31e8f59888514d107fcb520830f5
Author: Simon Steinbeiss <ochosi at xfce.org>
Date:   Thu Jul 19 20:23:55 2012 +0200

    Fix X11 linking (Bug #6244)

 configure.ac.in |    2 ++
 src/Makefile.am |    6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 029db4b..26f46ce 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -98,6 +98,8 @@ XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [dbus_glib_minimum_version])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1],[libxfce4ui_minimum_version])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0],[libxfce4util_minimum_version])
 
+XDT_CHECK_LIBX11()
+
 #=======================================================#
 #           Check for availability of libnotify         #
 #=======================================================#
diff --git a/src/Makefile.am b/src/Makefile.am
index 901b7b9..35421bc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,8 @@ INCLUDES =					\
         $(LIBXFCE4UI_CFLAGS)                   \
 	$(GST_VIDEO_CFLAGS)			\
 	$(GST_INTERFACES_CFLAGS)		\
-	$(TAGLIBC_CFLAGS)
+	$(TAGLIBC_CFLAGS)			\
+	$(LIBX11_CFLAGS)
 
 GENERATED_FILES =				\
 	gmarshal.c				\
@@ -86,7 +87,8 @@ parole_LDADD =						   	\
         $(LIBXFCE4UI_LIBS)                     \
 	$(GST_VIDEO_LIBS)			\
 	$(GST_INTERFACES_LIBS)			\
-	$(TAGLIBC_LIBS)
+	$(TAGLIBC_LIBS)				\
+	$(LIBX11_LIBS)
 
 parole_glib_enum_headers =			\
 	parole-conf.h				\