[Xfce4-commits] <xfce4-notes-plugin:master> gtk3: Ignore panel plugin from build toolchain

[Mike Massonnet]

Updating branch refs/heads/master
         to c4ef8d9288b70baf112806ef694db53457e9f1be (commit)
       from 9ff1dc87f6eb52389a95b6364662006d4c43d0ce (commit)

commit c4ef8d9288b70baf112806ef694db53457e9f1be
Author: Mike Massonnet <mmassonnet at gmail.com>
Date:   Fri Mar 1 09:03:50 2013 +0100

    gtk3: Ignore panel plugin from build toolchain
    
    The Xfce Panel is not yet compatible with GTK3 therefore it's impossible
    to build a panel plugin.
    
    src/Makefile.am accordingly updated to avoid building the panel plugin.
    
    configure.ac.in warns that GTK3 support is only experimental.

 configure.ac.in |   16 +++++++++++++++-
 src/Makefile.am |    8 ++++++++
 2 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index fae6f31..17b7587 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -45,7 +45,6 @@ XDT_CHECK_LIBX11_REQUIRE()
 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.24.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.10.0])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0])
 
 dnl Check for GTK
@@ -64,6 +63,11 @@ else
 fi
 AM_CONDITIONAL([ENABLE_GTK3], [test "x$enable_gtk3" = "xyes"])
 
+dnl Check for Xfce Panel
+if test "x$enable_gtk3" = "xno" ; then
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.10.0])
+fi
+
 dnl Check for valac
 if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
         AM_PROG_VALAC([0.16.0])
@@ -106,11 +110,21 @@ echo "* Maintainer Mode:        $USE_MAINTAINER_MODE"
 if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
 echo
 echo "    * Vala:               $VALAC $am__vala_version"
+if test "x$enable_gtk3" = "xno" ; then
 echo "    * Xfce4-vala:         $XFCE4VALA_VERSION"
+fi
 echo
 fi
 echo "* GTK+:                   $GTK_VERSION"
+if test "x$enable_gtk3" = "xyes" ; then
+echo "* W"
+echo "* W GTK3 support is only experimental, don't use for production."
+echo "* W"
+echo
+fi
+if test "x$enable_gtk3" = "xno" ; then
 echo "* Xfce Panel:             $LIBXFCE4PANEL_VERSION"
+fi
 echo "* Debug Support:          $enable_debug"
 echo
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 75e9b7c..8d8c565 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -58,6 +58,10 @@ endif
 # Panel plugin
 #
 
+if !ENABLE_GTK3
+# REM Xfce Panel is not yet built with GTK3 support
+# hence it's impossible to build a panel plugin yet
+
 if MAINTAINER_MODE
 notes_VALAFLAGS =							\
 	--vapidir=$(top_srcdir)/lib					\
@@ -101,6 +105,10 @@ libnotes_la_LIBADD =							\
 	@LIBXFCE4UTIL_LIBS@						\
 	@XFCONF_LIBS@
 
+else
+BUILT_SOURCES =
+endif
+
 #
 # Status icon
 #