lxpanelx support

Makefile.am

@@ -4,10 +4,14 @@ endif
 if HAVE_LXPANEL
 LXPANEL_DIRS = lxpanel
 endif
+if HAVE_LXPANELX
+LXPANELX_DIRS = lxpanelx
+endif
 SUBDIRS =	\
 	multiload \
 	$(XFCE4_DIRS) \
 	$(LXPANEL_DIRS) \
+	$(LXPANELX_DIRS) \
 	po
 
 distclean-local:

configure.ac

@@ -121,7 +121,30 @@ AM_CONDITIONAL(HAVE_LXPANEL, test x$with_lxpanel = xyes)
 AC_SUBST(LXPANEL_CFLAGS)
 AC_SUBST(LXPANEL_LIBS)
 
-if test x$with_xfce4 != xyes && test x$with_lxpanel != xyes; then
+# lxpanelx
+AC_ARG_WITH([lxpanelx], AS_HELP_STRING([--with-lxpanelx], [Build plugin for lxpanelx]),
+            [], [with_lxpanelx=check])
+AS_IF([test "x$with_lxpanelx" != "xno"], [
+    pkg_modules="lxpanelx"
+    # libmenu-cache is implicitly required; we will fail if it's not present.
+    PKG_CHECK_MODULES(LXPANELX, [$pkg_modules],
+                      [
+                        AC_DEFINE([HAVE_LXPANELX], [1], [Support for lxpanelx])
+                        with_lxpanelx=yes
+                      ],[
+                        if test "x$with_lxpanelx" != xcheck; then
+                          AC_MSG_FAILURE(
+                           [--with-lxpanelx was given, but test failed])
+                        fi
+                        with_lxpanelx=no
+                      ])
+])
+AM_CONDITIONAL(HAVE_LXPANELX, test x$with_lxpanelx = xyes)
+AC_SUBST(LXPANELX_CFLAGS)
+AC_SUBST(LXPANELX_LIBS)
+
+
+if test x$with_xfce4 != xyes && test x$with_lxpanel != xyes && test x$with_lxpanelx != xyes; then
     AC_MSG_FAILURE([No supported panels are installed and available.])
 fi
 
@@ -146,6 +169,7 @@ AC_CONFIG_FILES([
     xfce4/Makefile
     xfce4/multiload.desktop.in
     lxpanel/Makefile
+    lxpanelx/Makefile
     po/Makefile.in
 ])
 AC_OUTPUT
@@ -157,3 +181,6 @@ echo "* xfce4-panel :    $with_xfce4"
 echo
 echo "* lxpanel :        $with_lxpanel"
 echo
+echo "* lxpanelx :        $with_lxpanelx"
+echo
+#echo "LXPANELX_CFLAGS $LXPANELX_CFLAGS"

lxpanelx/Makefile.am

@@ -0,0 +1,42 @@
+# INCLUDES =
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/multiload \
+	-DG_LOG_DOMAIN=\"lxpanelx-multiload-plugin\" \
+	-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+	$(PLATFORM_CPPFLAGS)
+
+#
+# multiload plugin
+#
+plugin_LTLIBRARIES = \
+	multiload.la
+
+plugindir = \
+	$(libdir)/lxpanelx/plugins
+
+multiload_la_SOURCES = \
+	../about-data.h \
+	lxpanelx-multiload-plugin.c
+# xfce4-multiload-plugin.h
+# xfce4-multiload-dialogs.c xfce4-multiload-dialogs.h
+# xfce4-multiload-settings.c xfce4-multiload-settings.h
+
+multiload_la_CFLAGS = \
+	$(GTK_CFLAGS) \
+	$(LXPANELX_CFLAGS)
+
+multiload_la_LDFLAGS = \
+       -avoid-version \
+       -module \
+       -no-undefined \
+       $(PLATFORM_LDFLAGS)
+
+# export-symbols-regex '^multiload_(constructor|destructor|configure|save_configuration|configuration_changed)'
+
+multiload_la_LIBADD = \
+	$(GTK_LIBS) \
+	$(LXPANELXX_LIBS) \
+	../multiload/multiload-core.la
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: