[Xfce4-commits] <xfce4-notes-plugin:master> Include --enable-gtk3 flag in build

[Mike Massonnet]

Updating branch refs/heads/master
         to de5772612cb466ee1aebc8ff10777721f1f15881 (commit)
       from 252d53fc7b93587bac17441c500604df524269cc (commit)

commit de5772612cb466ee1aebc8ff10777721f1f15881
Author: Mike Massonnet <mmassonnet at gmail.com>
Date:   Thu Oct 25 03:54:36 2012 +0200

    Include --enable-gtk3 flag in build
    
    NB: the build with GTK3 will fail currently, and only the xfce4-notes
    standalone program is being build with GTK+3.

 configure.ac.in |   29 +++++++++++++++++++++--------
 lib/Makefile.am |   22 ++++++++++++++++++++--
 src/Makefile.am |   39 +++++++++++++++++++++++++++++++++------
 3 files changed, 74 insertions(+), 16 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index a6f83e5..b3c74b6 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -43,21 +43,34 @@ AC_SUBST([MATH_LIBS], [" -lm"])
 dnl Check for required packages
 XDT_CHECK_LIBX11_REQUIRE()
 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.24.0])
-XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.24.0])
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.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])
-XDT_CHECK_PACKAGE([UNIQUE], [unique-1.0], [1.0.0])
+
+dnl Check for GTK
+AC_ARG_ENABLE([gtk3],
+              [AC_HELP_STRING([--enable-gtk3], [Build with GTK3])],
+              [enable_gtk3=$enableval], [enable_gtk3=no])
+if test "x$enable_gtk3" = "xyes"; then
+        dnl GIO 2.28 for GApplication
+        XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.28.0])
+        XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.2.0])
+        AC_DEFINE([ENABLE_GTK3], [1], [Defined if build with GTK3 is enabled])
+else
+        XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.24.0])
+        XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0])
+        XDT_CHECK_PACKAGE([UNIQUE], [unique-1.0], [1.0.0])
+fi
+AM_CONDITIONAL([ENABLE_GTK3], [test "x$enable_gtk3" = "xyes"])
 
 dnl Check for valac
 if test "x$USE_MAINTAINER_MODE" = "xyes" ; then
-	AM_PROG_VALAC([0.16.0])
-	if test "x$VALAC" = "x" ; then
-		AC_MSG_ERROR([Cannot find the "valac" compiler in your PATH])
-	fi
-	XDT_CHECK_PACKAGE([XFCE4VALA], [xfce4-vala], [4.10])
+        AM_PROG_VALAC([0.16.0])
+        if test "x$VALAC" = "x" ; then
+                AC_MSG_ERROR([Cannot find the "valac" compiler in your PATH])
+        fi
+        XDT_CHECK_PACKAGE([XFCE4VALA], [xfce4-vala], [4.10])
 fi
 
 dnl Translations
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 48864c3..e65b473 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -7,10 +7,18 @@ libnotes_la_VALAFLAGS =							\
 	--vapidir=$(top_srcdir)/data/vapi/gtk214			\
 	--pkg=config							\
 	--pkg=color							\
-	--pkg=gtk+-2.0							\
 	--pkg=libxfconf-0						\
 	--pkg=libxfce4util-1.0
 
+if ENABLE_GTK3
+libnotes_la_VALAFLAGS +=						\
+	-D ENABLE_GTK3							\
+	--pkg=gtk+-3.0
+else
+libnotes_la_VALAFLAGS +=						\
+	--pkg=gtk+-2.0
+endif
+
 libnotes_la_SOURCES =							\
 	icon-button.vala						\
 	window-monitor.vala						\
@@ -18,8 +26,12 @@ libnotes_la_SOURCES =							\
 	hypertextview.vala						\
 	note.vala							\
 	window.vala							\
-	color.c								\
+	color.c
+
+if !ENABLE_GTK3
+libnotes_la_SOURCES +=							\
 	popup.c
+endif
 
 libnotes_la_CFLAGS =							\
 	-DPKGDATADIR=\""$(pkgdatadir)"\"				\
@@ -43,3 +55,9 @@ EXTRA_DIST =								\
 	popup.h								\
 	libnotes.vapi							\
 	libnotes.h
+
+if ENABLE_GTK3
+EXTRA_DIST +=								\
+	popup.c
+endif
+
diff --git a/src/Makefile.am b/src/Makefile.am
index b8d3d8b..22c586e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,6 +9,9 @@ INCLUDES =								\
 # Popup program
 #
 
+if ENABLE_GTK3
+bin_PROGRAMS = 
+else
 bin_PROGRAMS = xfce4-popup-notes
 
 xfce4_popup_notes_SOURCES =						\
@@ -22,11 +25,13 @@ xfce4_popup_notes_CFLAGS =						\
 xfce4_popup_notes_LDADD =						\
 	@LIBX11_LIBS@							\
 	@GTK_LIBS@
+endif
 
 #
 # Settings dialog
 #
 
+if !ENABLE_GTK3
 bin_PROGRAMS += xfce4-notes-settings
 
 xfce4_notes_settings_SOURCES =						\
@@ -47,6 +52,7 @@ xfce4_notes_settings_LDADD =						\
 	@LIBXFCE4UI_LIBS@						\
 	@XFCONF_LIBS@							\
 	@UNIQUE_LIBS@
+endif
 
 #
 # Panel plugin
@@ -57,12 +63,20 @@ notes_VALAFLAGS =							\
 	--vapidir=$(top_srcdir)/lib					\
 	--pkg=libnotes							\
 	--pkg=config							\
-	--pkg=popup							\
-	--pkg=gtk+-2.0							\
 	--pkg=libxfce4panel-1.0						\
 	--pkg=libxfconf-0						\
 	--pkg=libxfce4util-1.0
 
+if ENABLE_GTK3
+notes_VALAFLAGS +=							\
+	-D ENABLE_GTK3							\
+	--pkg=gtk+-3.0
+else
+notes_VALAFLAGS +=							\
+	--pkg=popup							\
+	--pkg=gtk+-2.0
+endif
+
 BUILT_SOURCES = main-panel-plugin.c
 main-panel-plugin.c: main-panel-plugin.vala
 	$(AM_V_GEN) $(VALAC) --vapidir=$(top_srcdir)/data/vapi/xfce47 $(notes_VALAFLAGS) $< -C
@@ -93,20 +107,28 @@ libnotes_la_LIBADD =							\
 
 bin_PROGRAMS += xfce4-notes
 
+if MAINTAINER_MODE
 xfce4_notes_VALAFLAGS =							\
 	--vapidir=$(top_srcdir)/lib					\
 	--vapidir=$(top_srcdir)/data/vapi/gtk214			\
 	--pkg=libnotes							\
 	--pkg=config							\
-	--pkg=popup							\
 	--vapidir=.							\
 	--pkg=xfce-autostart						\
-	--pkg=unique-1.0						\
-	--pkg=gtk+-2.0							\
 	--pkg=libxfconf-0						\
 	--pkg=libxfce4util-1.0
 
-if MAINTAINER_MODE
+if ENABLE_GTK3
+xfce4_notes_VALAFLAGS +=						\
+	-D ENABLE_GTK3							\
+	--pkg=gtk+-3.0
+else
+xfce4_notes_VALAFLAGS +=						\
+	--pkg=popup							\
+	--pkg=unique-1.0						\
+	--pkg=gtk+-2.0
+endif
+
 BUILT_SOURCES += main-status-icon.c
 main-status-icon.c: main-status-icon.vala
 	$(AM_V_GEN) $(VALAC) $(xfce4_notes_VALAFLAGS) $< -C
@@ -170,6 +192,11 @@ EXTRA_DIST =								\
 	$(applications_in_files)					\
 	$(autostart_in_files)
 
+if ENABLE_GTK3
+EXTRA_DIST +=								\
+	xfce4-popup-notes.c
+endif
+
 DISTCLEANFILES =							\
 	$(desktop_DATA)							\
 	$(applications_DATA)						\