diff options
| author | Ted Gould <ted@gould.cx> | 2011-09-14 14:17:39 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-09-14 14:17:39 -0500 |
| commit | 3a8fb0811440d5e266699bcd5e0e1b2bea8a58ff (patch) | |
| tree | 1722f023f4d1223106b9ec6cad9068b64b021a48 /configure.ac | |
| parent | ffb532bdd37d51a328c92258a3c1ee1fb6e9a787 (diff) | |
| parent | 4810423912b7f53f716ba5665aba56234461ca6f (diff) | |
| download | libdbusmenu-3a8fb0811440d5e266699bcd5e0e1b2bea8a58ff.tar.gz libdbusmenu-3a8fb0811440d5e266699bcd5e0e1b2bea8a58ff.tar.bz2 libdbusmenu-3a8fb0811440d5e266699bcd5e0e1b2bea8a58ff.zip | |
* Upstream Merge
* Build fixes to allow more optional builds
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 45 |
1 files changed, 37 insertions, 8 deletions
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)]) +) + |