* Upstream Merge

  * Build fixes to allow more optional builds

6 files changed, 80 insertions, 24 deletions

diff --git a/Makefile.am b/Makefile.am
index c2c0980..6b11b31 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,23 @@
+ACLOCAL_AMFLAGS = -I m4
+
 EXTRA_DIST = \
 	COPYING.2.1 \
 	COPYING-GPL3 \
 	m4/introspection.m4
 
+if WANT_TESTS
+TESTS_SUBDIR = tests
+endif
+
+if WANT_LIBDBUSMENUGTK
+LIBDBUSMENUGTK_SUBDIR = libdbusmenu-gtk
+endif
+
 SUBDIRS = \
 	libdbusmenu-glib \
-	libdbusmenu-gtk \
+	$(LIBDBUSMENUGTK_SUBDIR) \
 	tools \
-	tests \
+	$(TESTS_SUBDIR) \
 	docs \
 	po
 
diff --git a/configure.ac b/configure.ac
index fcec99a..895f9f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,27 +58,37 @@ AC_SUBST(DBUSMENUGLIB_LIBS)
 GTK_REQUIRED_VERSION=2.16
 GTK3_REQUIRED_VERSION=2.91
 
+AC_ARG_ENABLE([gtk],
+	AC_HELP_STRING([--disable-gtk], [Disable libdbusmenu-gtk library]),
+	[enable_gtk=$enableval], [enable_gtk=auto])
+AM_CONDITIONAL([WANT_LIBDBUSMENUGTK], [test "x$enable_gtk" != "xno"])
+
 AC_ARG_WITH([gtk],
   [AS_HELP_STRING([--with-gtk],
     [Which version of gtk to use @<:@default=3@:>@])],
   [],
   [with_gtk=3])
+AM_CONDITIONAL([USE_GTK3], [test "x$with_gtk" = "x3"])
+
+AS_IF([test "x$enable_gtk" != "xno"],[
 AS_IF([test "x$with_gtk" = x3],
         [PKG_CHECK_MODULES(DBUSMENUGTK,  gtk+-3.0 >= $GTK3_REQUIRED_VERSION
-                                         glib-2.0 >= $GLIB_REQUIRED_VERSION)
-         AC_SUBST(DBUSMENUGTK_CFLAGS)
-         AC_SUBST(DBUSMENUGTK_LIBS)
+                                         glib-2.0 >= $GLIB_REQUIRED_VERSION,
+                                         [have_gtk=yes]
+)
          AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available])
         ],
       [test "x$with_gtk" = x2],
         [PKG_CHECK_MODULES(DBUSMENUGTK,  gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                                         glib-2.0 >= $GLIB_REQUIRED_VERSION)
-         AC_SUBST(DBUSMENUGTK_CFLAGS)
-         AC_SUBST(DBUSMENUGTK_LIBS)
+                                         glib-2.0 >= $GLIB_REQUIRED_VERSION,
+                                         [have_gtk=yes]
+)
         ],
       [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
 )
-AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
+])
+AC_SUBST(DBUSMENUGTK_CFLAGS)
+AC_SUBST(DBUSMENUGTK_LIBS)
 
 ###########################
 # Dependencies - dumper
@@ -99,8 +109,17 @@ AC_SUBST(DBUSMENUDUMPER_LIBS)
 JSON_GLIB_REQUIRED_VERSION=0.13.4
 GIO_UNIX_REQUIRED_VERSION=2.24
 
+AC_ARG_ENABLE([tests],
+	AC_HELP_STRING([--disable-tests], [Disable tests]),
+	[enable_tests=$enableval], [enable_tests=auto])
+AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"])
+
+AS_IF([test "x$enable_tests" != "xno"],[
 PKG_CHECK_MODULES(DBUSMENUTESTS,  json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
-                                  gio-unix-2.0  >= $GIO_UNIX_REQUIRED_VERSION)
+                                  gio-unix-2.0  >= $GIO_UNIX_REQUIRED_VERSION,
+                                  [have_tests=yes]
+)
+])
 
 AC_SUBST(DBUSMENUTESTS_CFLAGS)
 AC_SUBST(DBUSMENUTESTS_LIBS)
@@ -199,3 +218,13 @@ libdbusmenu Configuration:
 	GTK+ Version:           $with_gtk
 ])
 
+AS_IF([test "x$have_tests" = "xyes"],
+	AC_MSG_NOTICE([	Tests:                  yes]),
+	AC_MSG_NOTICE([	Tests:                  no])
+)
+
+AS_IF([test "x$enable_gtk" = "xno"],
+	AC_MSG_NOTICE([	Gtk:                    no]),
+	AC_MSG_NOTICE([	Gtk:                    yes (gtk$with_gtk)])
+)
+
diff --git a/debian/changelog b/debian/changelog
index 8f44c01..7c35d99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdbusmenu (0.4.93-0ubuntu2~ppa1) UNRELEASED; urgency=low
+
+  * Upstream Merge
+    * Build fixes to allow more optional builds
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 14 Sep 2011 14:17:15 -0500
+
 libdbusmenu (0.4.93-0ubuntu1) oneiric; urgency=low
 
   * New upstream release.
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 87ffe5f..23a4c86 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1 +1,7 @@
-SUBDIRS = libdbusmenu-glib libdbusmenu-gtk
+if WANT_LIBDBUSMENUGTK
+LIBDBUSMENUGTK_SUBDIR = libdbusmenu-gtk
+endif
+
+SUBDIRS = \
+	libdbusmenu-glib \
+	$(LIBDBUSMENUGTK_SUBDIR)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a4763da..e6882af 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -13,13 +13,17 @@ TESTS = \
 	test-glib-proxy \
 	test-glib-simple-items \
 	test-glib-submenu \
-	test-json \
+	test-json
+
+if WANT_LIBDBUSMENUGTK
+TESTS += \
 	test-gtk-objects-test \
 	test-gtk-label \
 	test-gtk-shortcut \
 	test-gtk-reorder \
 	test-gtk-submenu \
 	test-gtk-parser-test
+endif
 
 XFAIL_TESTS = \
 	test-glib-proxy
@@ -44,20 +48,24 @@ check_PROGRAMS = \
 	test-glib-proxy-client \
 	test-glib-proxy-server \
 	test-glib-proxy-proxy \
-	test-gtk-objects \
 	test-glib-submenu-client \
 	test-glib-submenu-server \
+	test-glib-simple-items \
+	test-json-client \
+	test-json-server
+
+if WANT_LIBDBUSMENUGTK
+check_PROGRAMS += \
+	test-gtk-objects \
 	test-gtk-label-client \
 	test-gtk-label-server \
 	test-gtk-shortcut-client \
 	test-gtk-shortcut-server \
-	test-glib-simple-items \
 	test-gtk-reorder-server \
-	test-json-client \
-	test-json-server \
 	test-gtk-submenu-server \
 	test-gtk-submenu-client \
 	test-gtk-parser
+endif
 
 XVFB_RUN=". $(srcdir)/run-xvfb.sh"
 
diff --git a/tools/testapp/Makefile.am b/tools/testapp/Makefile.am
index 39de532..e2bbde7 100644
--- a/tools/testapp/Makefile.am
+++ b/tools/testapp/Makefile.am
@@ -1,11 +1,9 @@
 
-if USE_GTK3
-VER=3
-else
-VER=
-endif
+libexec_PROGRAMS =
 
-libexec_PROGRAMS = dbusmenu-testapp
+if WANT_TESTS
+libexec_PROGRAMS += dbusmenu-testapp
+endif
 
 dbusmenu_testapp_SOURCES = \
 	main.c
@@ -18,6 +16,4 @@ dbusmenu_testapp_CFLAGS = \
 
 dbusmenu_testapp_LDADD = \
 	$(builddir)/../../libdbusmenu-glib/libdbusmenu-glib.la \
-	$(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \
-	$(DBUSMENUGTK_LIBS) \
 	$(DBUSMENUTESTS_LIBS)