1
0
forked from pool/xfce4-session
xfce4-session/xfce4-session-fix-libgmodule-underlinking.patch

55 lines
1.9 KiB
Diff
Raw Normal View History

Index: xfce4-session-4.8.2/configure.in
===================================================================
--- xfce4-session-4.8.2.orig/configure.in
+++ xfce4-session-4.8.2/configure.in
@@ -82,6 +82,7 @@ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.
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])
+XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [])
XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.8.0])
dnl we provide a panel plugin now
Index: xfce4-session-4.8.2/settings/Makefile.am
===================================================================
--- xfce4-session-4.8.2.orig/settings/Makefile.am
+++ xfce4-session-4.8.2/settings/Makefile.am
@@ -25,6 +25,7 @@ xfce4_session_settings_CFLAGS = \
-DMODULESDIR=\"$(libdir)/xfce4/session/splash-engines\" \
-DG_LOG_DOMAIN=\"xfce4-session-settings\" \
-I$(top_srcdir) \
+ $(GMODULE_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
$(LIBXFCE4UI_CFLAGS) \
$(XFCONF_CFLAGS) \
@@ -32,7 +33,8 @@ xfce4_session_settings_CFLAGS = \
xfce4_session_settings_LDADD = \
$(top_builddir)/libxfsm/libxfsm-4.6.la \
- $(LIBXFCE4UTIL_CFLAGS) \
+ $(GMODULE_LIBS) \
+ $(LIBXFCE4UTIL_LIBS) \
$(LIBXFCE4UI_LIBS) \
$(XFCONF_LIBS) \
$(DBUS_GLIB_LIBS)
Index: xfce4-session-4.8.2/xfce4-session/Makefile.am
===================================================================
--- xfce4-session-4.8.2.orig/xfce4-session/Makefile.am
+++ xfce4-session-4.8.2/xfce4-session/Makefile.am
@@ -51,6 +51,7 @@ xfce4_session_SOURCES = \
xfsm-startup.h
xfce4_session_CFLAGS = \
+ $(GMODULE_CFLAGS) \
$(GNOME_CFLAGS) \
$(GNOME_KEYRING_CFLAGS) \
$(LIBSM_CFLAGS) \
@@ -69,6 +70,7 @@ xfce4_session_CFLAGS = \
xfce4_session_LDADD = \
$(top_builddir)/libxfsm/libxfsm-4.6.la \
+ $(GMODULE_LIBS) \
$(LIBSM_LDFLAGS) \
$(LIBSM_LIBS) \
$(LIBX11_LDFLAGS) \