Merge lp:~hasselmm/appmenu-gtk/gtk3 into lp:appmenu-gtk/0.4

[Mathias Hasselmann]

This permits building of a gtk3 version of appmenu-gtk.

[lp:~hasselmm/appmenu-gtk/gtk3]

137. By Mathias Hasselmann on 2011-05-08

Generate proper X session script for both gtk flavors

138. By Mathias Hasselmann on 2011-05-11

Include proper appmenu-gtk headers.

139. By Mathias Hasselmann on 2011-05-11

Drop somewhat redundant --with-gtk3 switch.

140. By Mathias Hasselmann on 2011-05-11

Bump package version

Unmerged revisions

=== modified file 'configure.ac'
--- configure.ac	2011-04-14 20:57:14 +0000
+++ configure.ac	2011-05-08 20:25:54 +0000
@@ -1,6 +1,6 @@
 AC_PREREQ(2.59)
 
-AC_INIT([appmenu-gtk], [0.2.1], [[e-mail]])
+AC_INIT([appmenu-gtk], [0.3.0], [[e-mail]])
 AC_COPYRIGHT([Copyright 2010 Canonical])
 AC_CONFIG_SRCDIR([src/bridge.c])
 AC_CONFIG_MACRO_DIR([build/autotools])
@@ -15,23 +15,41 @@
 AM_PROG_CC_C_O
 AC_STDC_HEADERS
 AC_PROG_LIBTOOL
+PKG_PROG_PKG_CONFIG
 
 AC_SUBST(VERSION)
 
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 ###########################
-# Dependencies - GLib
+# Dependencies - Gtk
 ###########################
 
-GTK_REQUIRED_VERSION=2.18
+gtk_api=3.0
+
+GTK2_REQUIRED_VERSION=2.18
+GTK3_REQUIRED_VERSION=3.0
 DBUSMENU_REQUIRED_VERSION=0.3.101
 
-PKG_CHECK_MODULES(APPMENU, gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                           dbusmenu-gtk-0.4 >= $DBUSMENU_REQUIRED_VERSION)
+AC_ARG_WITH(gtk2, [AS_HELP_STRING([--with-gtk2],[use 2.0 API of GTK+])],[gtk_api=2.0])
+AC_ARG_WITH(gtk3, [AS_HELP_STRING([--with-gtk3],[use 3.0 API of GTK+])],[gtk_api=3.0])
+
+if test x$gtk_api = x2.0; then
+  PKG_CHECK_MODULES(APPMENU, gtk+-2.0 >= $GTK2_REQUIRED_VERSION
+                             dbusmenu-gtk-0.4 >= $DBUSMENU_REQUIRED_VERSION)
+  moduledir='$(libdir)/gtk-2.0/2.10.0/menuproxies'
+
+elif test x$gtk_api = x3.0; then
+  PKG_CHECK_MODULES(APPMENU, gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+                             dbusmenu-gtk3-0.4 >= $DBUSMENU_REQUIRED_VERSION)
+  moduledir='$(libdir)/gtk-3.0/3.0.0/menuproxies'
+else
+  AC_MSG_ERROR([unknown GTK+ API: $gtk_api])
+fi
 
 AC_SUBST(APPMENU_CFLAGS)
 AC_SUBST(APPMENU_LIBS)
+AC_SUBST(moduledir)
 
 ###########################
 # Files
@@ -58,6 +76,7 @@
 
 appmenu-gtk configuration:
 
-	Prefix:                 $prefix
+        Prefix:                 $prefix
+        GTK+ API:               $gtk_api
 ])
 

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-01-04 22:54:15 +0000
+++ src/Makefile.am	2011-05-08 20:25:54 +0000
@@ -3,7 +3,6 @@
 BUILT_SOURCES =
 EXTRA_DIST=
 
-moduledir = $(libdir)/gtk-2.0/2.10.0/menuproxies
 module_LTLIBRARIES = libappmenu.la
 
 libappmenu_la_SOURCES =		\
@@ -37,13 +36,13 @@
 	$(GCC_FLAGS)			\
 	$(MAINTAINER_CFLAGS)
 
-gen-%.xml.h: %.xml
+gen-%.xml.h: $(srcdir)/%.xml
 	@echo "Building $@ from $<"
-	@echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $<)));" > $@
+	@echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<))));" > $@
 
-gen-%.xml.c: %.xml
+gen-%.xml.c: $(srcdir)/%.xml
 	@echo "Building $@ from $<"
-	@echo "const char * _$(subst -,_,$(subst .,_,$(basename $<))) = " > $@
+	@echo "const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<)))) = " > $@
 	@sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@
 	@echo ";" >> $@