[Xfce4-commits] <xfce4-session:xfce-4.8> Link to gmodule (bug #8340).
Nick Schermer
noreply at xfce.org
Sat Feb 4 11:58:01 CET 2012
Updating branch refs/heads/xfce-4.8
to 955566472c179aa0e15609c01d74cde4c4f67729 (commit)
from ec3666f937befa22c2a830e1f170ee00b0fc85cc (commit)
commit 955566472c179aa0e15609c01d74cde4c4f67729
Author: Nick Schermer <nick at xfce.org>
Date: Sat Feb 4 11:55:02 2012 +0100
Link to gmodule (bug #8340).
configure.in.in | 1 +
settings/Makefile.am | 6 ++++--
xfce4-session/Makefile.am | 2 ++
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index d7d736e..9364eea 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -74,6 +74,7 @@ dnl Check for required packages
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0])
+XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.10.0])
XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.22])
XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.0.0])
XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.73])
diff --git a/settings/Makefile.am b/settings/Makefile.am
index ba569eb..65bb99e 100644
--- a/settings/Makefile.am
+++ b/settings/Makefile.am
@@ -28,14 +28,16 @@ xfce4_session_settings_CFLAGS = \
$(LIBXFCE4UTIL_CFLAGS) \
$(LIBXFCE4UI_CFLAGS) \
$(XFCONF_CFLAGS) \
- $(DBUS_GLIB_CFLAGS)
+ $(DBUS_GLIB_CFLAGS) \
+ $(GMODULE_CFLAGS)
xfce4_session_settings_LDADD = \
$(top_builddir)/libxfsm/libxfsm-4.6.la \
$(LIBXFCE4UTIL_CFLAGS) \
$(LIBXFCE4UI_LIBS) \
$(XFCONF_LIBS) \
- $(DBUS_GLIB_LIBS)
+ $(DBUS_GLIB_LIBS) \
+ $(GMODULE_LIBS)
xfce4_session_settings_DEPENDENCIES = \
$(top_builddir)/libxfsm/libxfsm-4.6.la
diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am
index 3ea938c..10f2cdb 100644
--- a/xfce4-session/Makefile.am
+++ b/xfce4-session/Makefile.am
@@ -60,6 +60,7 @@ xfce4_session_CFLAGS = \
$(DBUS_GLIB_CFLAGS) \
$(LIBWNCK_CFLAGS) \
$(XFCONF_CFLAGS) \
+ $(GMODULE_CFLAGS) \
-DDBUS_API_SUBJECT_TO_CHANGE \
-DWNCK_I_KNOW_THIS_IS_UNSTABLE \
-DLIBDIR=\"$(libdir)\" \
@@ -74,6 +75,7 @@ xfce4_session_LDADD = \
$(LIBX11_LDFLAGS) \
$(LIBX11_LIBS) \
$(LIBXFCE4UI_LIBS) \
+ $(GMODULE_LIBS) \
$(DBUS_LIBS) \
$(DBUS_GLIB_LIBS) \
$(LIBWNCK_LIBS) \
More information about the Xfce4-commits
mailing list