[Xfce4-commits] r24264 - in xfce4-panel/branches/4_5_nick: . mcs-plugin

[Nick Schermer]

Author: nick
Date: 2007-01-04 10:42:01 +0000 (Thu, 04 Jan 2007)
New Revision: 24264

Modified:
   xfce4-panel/branches/4_5_nick/configure.in.in
   xfce4-panel/branches/4_5_nick/mcs-plugin/Makefile.am
Log:
Make mcs-plugin optional.

Modified: xfce4-panel/branches/4_5_nick/configure.in.in
===================================================================
--- xfce4-panel/branches/4_5_nick/configure.in.in	2007-01-04 10:23:40 UTC (rev 24263)
+++ xfce4-panel/branches/4_5_nick/configure.in.in	2007-01-04 10:42:01 UTC (rev 24264)
@@ -15,8 +15,8 @@
 m4_define([xfce4_panel_version_minor], [5])
 m4_define([xfce4_panel_version_micro], [0])
 m4_define([xfce4_panel_version_nano],  [2]) dnl leave this empty to have no nano version
-m4_define([xfce4_panel_version_build], [@REVISION@])
-m4_define([xfce4_panel_version_tag],   [])
+m4_define([xfce4_panel_version_build], [r at REVISION@])
+m4_define([xfce4_panel_version_tag],   [svn])
 m4_define([xfce4_panel_version], [xfce4_panel_version_major().xfce4_panel_version_minor().xfce4_panel_version_micro()ifelse(xfce4_panel_version_nano(), [], [], [.xfce4_panel_version_nano()])ifelse(xfce4_panel_version_tag(), [svn], [xfce4_panel_version_tag()-xfce4_panel_version_build()], [xfce4_panel_version_tag()])])
 
 dnl ***************************
@@ -105,8 +105,6 @@
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.4])
 XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.99.2])
 XDT_CHECK_PACKAGE([LIBEXO], [exo-0.3], [0.3.1.11])
-XDT_CHECK_PACKAGE(LIBXFCE4MCS_MANAGER, libxfce4mcs-manager-1.0, 4.3.99.2)
-XFCE_MCS_PLUGIN([XFCE_MCS_MANAGER], [4.3.99.1])
 
 dnl ***********************************
 dnl *** Check for optional packages ***

Modified: xfce4-panel/branches/4_5_nick/mcs-plugin/Makefile.am
===================================================================
--- xfce4-panel/branches/4_5_nick/mcs-plugin/Makefile.am	2007-01-04 10:23:40 UTC (rev 24263)
+++ xfce4-panel/branches/4_5_nick/mcs-plugin/Makefile.am	2007-01-04 10:42:01 UTC (rev 24264)
@@ -4,7 +4,9 @@
 	-I$(top_srcdir)							\
 	-DBINDIR=\"$(bindir)\"						\
 	-DDATADIR=\"$(datadir)\"					\
-	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
+	-DG_LOG_DOMAIN=\"panel-mcs-plugin\"				\
+	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"				\
+	$(PLATFORM_CPPFLAGS)
 
 #
 # build mcs wrapper plugin if xfce-mcs-manager is present.
@@ -21,12 +23,14 @@
 
 libxfce4settings_la_CFLAGS =						\
 	$(LIBXFCEGUI4_CFLAGS)						\
-	$(XFCE_MCS_MANAGER_CFLAGS)
+	$(XFCE_MCS_MANAGER_CFLAGS)					\
+	$(PLATFORM_CFLAGS)
 
 libxfce4settings_la_LDFLAGS =						\
 	-avoid-version							\
 	-no-undefined							\
-	-module
+	-module								\
+	$(PLATFORM_LDFLAGS)
 
 libxfce4settings_la_LIBADD =						\
 	$(LIBXFCEGUI4_LIBS)						\