Sophie

Sophie

distrib > * > 2008.0 > x86_64 > by-pkgid > 937e954a3c9276a262ca9d15b34bed30 > files > 7

xfce-session-4.4.1-11mdv2008.0.src.rpm

diff -Nru xfce4-session-4.4.1-orig/configure.in xfce4-session-4.4.1/configure.in
--- xfce4-session-4.4.1-orig/configure.in	2007-04-09 21:27:42 +0400
+++ xfce4-session-4.4.1/configure.in	2007-04-16 10:59:07 +0400
@@ -75,6 +75,7 @@
 
 dnl Configure the MCS plugins
 XDT_XFCE_MCS_PLUGIN([XFCE_MCS_MANAGER], [4.4.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.10.0])
 
 dnl Check for D-Bus support (for HAL shutdown support)
 XDT_CHECK_OPTIONAL_PACKAGE([DBUS], [dbus-1], [0.34], [dbus],
diff -Nru xfce4-session-4.4.1-orig/libxfsm/Makefile.am xfce4-session-4.4.1/libxfsm/Makefile.am
--- xfce4-session-4.4.1-orig/libxfsm/Makefile.am	2007-04-09 21:06:35 +0400
+++ xfce4-session-4.4.1/libxfsm/Makefile.am	2007-04-16 10:59:57 +0400
@@ -18,14 +18,14 @@
 	-export-dynamic							\
 	-version-info 0:1:0
 
+libxfsm_4_2_la_LIBADD =							\
+	@LIBX11_LIBS@							\
+	@LIBXFCEGUI4_LIBS@
+
 if HAVE_OS_CYGWIN
 libxfsm_4_2_la_LDFLAGS +=						\
 	-no-undefined							\
 	@LIBX11_LDFLAGS@
-
-libxfsm_4_2_la_LIBADD =							\
-	@LIBX11_LIBS@							\
-	@LIBXFCEGUI4_LIBS@
 endif
 
 
diff -Nru xfce4-session-4.4.1-orig/settings/session/Makefile.am xfce4-session-4.4.1/settings/session/Makefile.am
--- xfce4-session-4.4.1-orig/settings/session/Makefile.am	2007-04-09 21:06:35 +0400
+++ xfce4-session-4.4.1/settings/session/Makefile.am	2007-04-16 11:01:21 +0400
@@ -19,10 +19,12 @@
 if HAVE_OS_CYGWIN
 session_settings_la_LDFLAGS +=						\
 	-export-symbols $(datadir)/xfce4/devel/mcs-manager.def
+endif
 
 session_settings_la_LIBADD =						\
+	@GTK_LIBS@							\
 	@XFCE_MCS_MANAGER_LIBS@
-endif
+
 
 desktopdir = $(datadir)/applications
 desktop_in_files = xfce-session-settings.desktop.in
diff -Nru xfce4-session-4.4.1-orig/settings/splash/Makefile.am xfce4-session-4.4.1/settings/splash/Makefile.am
--- xfce4-session-4.4.1-orig/settings/splash/Makefile.am	2007-04-09 21:06:35 +0400
+++ xfce4-session-4.4.1/settings/splash/Makefile.am	2007-04-16 11:02:08 +0400
@@ -21,7 +21,9 @@
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
 
 splash_settings_la_LIBADD =						\
-	$(top_builddir)/libxfsm/libxfsm-4.2.la
+	$(top_builddir)/libxfsm/libxfsm-4.2.la                          \
+	@XFCE_MCS_MANAGER_LIBS@						\
+	@GTK_LIBS@
 
 if HAVE_OS_CYGWIN
 splash_settings_la_LDFLAGS +=						\