Updating branch refs/heads/master
to 7f977d69a0ca4c17dc27554762f50acee1530b07 (commit)
from de0320e7748ba1a227442887a693a846281977d4 (commit)
commit 7f977d69a0ca4c17dc27554762f50acee1530b07
Author: Yves-Alexis Perez <[email protected]>
Date: Tue Jan 4 23:56:31 2011 +0100
Fix linking against x11, dbus and randr
common/Makefile.am | 6 ++++++
configure.ac.in | 2 ++
libdbus/Makefile.am | 5 +++++
3 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/common/Makefile.am b/common/Makefile.am
index 8805985..f2d504f 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -16,3 +16,9 @@ libxfpmcommon_la_CFLAGS = \
$(GTK_CFLAGS) \
$(GLIB_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS)
+
+libxfpmcommon_la_LIBADD = \
+ $(GTK_LIBS) \
+ $(GLIB_LIBS) \
+ $(XRANDR_LIBS) \
+ $(X11_LIBS)
diff --git a/configure.ac.in b/configure.ac.in
index fcb0c08..3cada9f 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -65,6 +65,7 @@ m4_define([libxfce4panel_minimum_version],[4.6.0])
m4_define([libnotify_minimum_version], [0.4.1])
m4_define([xrandr_minimum_version], [1.2.0])
+m4_define([x11_minimum_version], [1.0.0])
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [gtk_minimum_version])
XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [glib_minimum_version])
@@ -78,6 +79,7 @@ XDT_CHECK_PACKAGE([LIBXFCE4UI],
[libxfce4ui-1],[libxfce4ui_minimum_version])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL],
[libxfce4util-1.0],[libxfce4util_minimum_version])
XDT_CHECK_PACKAGE([LIBNOTIFY],[libnotify], [libnotify_minimum_version])
XDT_CHECK_PACKAGE([XRANDR],[xrandr], [xrandr_minimum_version])
+XDT_CHECK_PACKAGE([X11], [x11], [x11_minimum_version])
#=======================================================#
# Polkit? #
diff --git a/libdbus/Makefile.am b/libdbus/Makefile.am
index 6a47cbb..cada510 100644
--- a/libdbus/Makefile.am
+++ b/libdbus/Makefile.am
@@ -17,6 +17,11 @@ libxfpmdbus_la_CFLAGS = \
$(LIBXFCE4UTIL_CFLAGS) \
$(DBUS_GLIB_CFLAGS)
+libxfpmdbus_la_LIBADD = \
+ $(GLIB_LIBS) \
+ $(DBUS_GLIB_LIBS) \
+ $(DBUS_LIBS)
+
if MAINTAINER_MODE
BUILT_SOURCES = \
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
