[Xfce4-commits] <xfce4-notes-plugin:master> Add X11 link to the panel plugin

[Mike Massonnet]

Updating branch refs/heads/master
         to 89aa305b0de38536d5f604d593b79e4128fe2417 (commit)
       from 153bcee9910eb00193543dfa8418a471b18a6735 (commit)

commit 89aa305b0de38536d5f604d593b79e4128fe2417
Author: Mike Massonnet <mmassonnet at xfce.org>
Date:   Sun Nov 22 14:59:19 2009 +0100

    Add X11 link to the panel plugin

 ChangeLog                |    4 ++++
 configure.in.in          |    4 +---
 panel-plugin/Makefile.am |    6 ++++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cea5eb7..a99605b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-22  Mike Massonnet <mmassonnet at xfce.org>
+
+Add X11 link to the panel plugin
+
 2009-09-20  Mike Massonnet <mmassonnet at xfce.org>
 
 Fix typo s/Carmin/Carmine
diff --git a/configure.in.in b/configure.in.in
index 1483ae7..115464e 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -41,10 +41,8 @@ dnl Check for standard header files
 AC_HEADER_STDC()
 AC_CHECK_HEADERS([math.h])
 
-dnl Check for X11 installed
-XDT_CHECK_LIBX11_REQUIRE()
-
 dnl Check for required packages
+XDT_CHECK_LIBX11_REQUIRE()
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.10.0])
 XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index af50691..320121b 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -34,11 +34,13 @@ xfce4_notes_settings_SOURCES =						\
 	xfce4-notes-settings.c
 
 xfce4_notes_settings_CFLAGS =						\
+	@LIBX11_CFLAGS@							\
 	@GTK_CFLAGS@							\
 	@LIBXFCEGUI4_CFLAGS@						\
 	@XFCONF_CFLAGS@
 
 xfce4_notes_settings_LDADD =						\
+	@LIBX11_LIBS@							\
 	@GTK_LIBS@							\
 	@LIBXFCEGUI4_LIBS@						\
 	@XFCONF_LIBS@
@@ -91,12 +93,14 @@ libnotes_la_SOURCES =							\
 	$(notes_VALABUILTSOURCES)
 
 libnotes_la_CFLAGS =							\
+	@LIBX11_CFLAGS@							\
 	@LIBXFCE4PANEL_CFLAGS@						\
 	@LIBXFCE4UTIL_CFLAGS@						\
 	@LIBXFCEGUI4_CFLAGS@						\
 	@XFCONF_CFLAGS@
 
 libnotes_la_LIBADD =							\
+	@LIBX11_LIBS@							\
 	@LIBXFCE4PANEL_LIBS@						\
 	@LIBXFCE4UTIL_LIBS@						\
 	@LIBXFCEGUI4_LIBS@						\
@@ -115,12 +119,14 @@ xfce4_notes_plugin_SOURCES =						\
 	$(notes_VALABUILTSOURCES)
 
 xfce4_notes_plugin_CFLAGS =						\
+	@LIBX11_CFLAGS@							\
 	@LIBXFCE4PANEL_CFLAGS@						\
 	@LIBXFCE4UTIL_CFLAGS@						\
 	@LIBXFCEGUI4_CFLAGS@						\
 	@XFCONF_CFLAGS@
 
 xfce4_notes_plugin_LDADD =						\
+	@LIBX11_LIBS@							\
 	@LIBXFCE4PANEL_LIBS@						\
 	@LIBXFCE4UTIL_LIBS@						\
 	@LIBXFCEGUI4_LIBS@						\