diff options
| author | Ted Gould <ted@gould.cx> | 2010-12-03 21:17:05 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-12-03 21:17:05 -0600 |
| commit | 671666f8ece765624fe6f2c94e6ece24688c5b8c (patch) | |
| tree | 30c47a7a2a7fad360fc0602a5cacea94952bdde1 /configure.ac | |
| parent | b90242a423f62ee594f2421b1147e317d9a4ab68 (diff) | |
| parent | 6145439d03bae606b1376795b10e934dfe76293f (diff) | |
| download | libayatana-appindicator-671666f8ece765624fe6f2c94e6ece24688c5b8c.tar.gz libayatana-appindicator-671666f8ece765624fe6f2c94e6ece24688c5b8c.tar.bz2 libayatana-appindicator-671666f8ece765624fe6f2c94e6ece24688c5b8c.zip | |
Updating to trunk with GTK3 support.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 65 |
1 files changed, 33 insertions, 32 deletions
diff --git a/configure.ac b/configure.ac index fbccf0a..30e2f68 100644 --- a/configure.ac +++ b/configure.ac @@ -37,17 +37,35 @@ AC_CONFIG_MACRO_DIR(m4) # Dependencies ########################### -GTK_REQUIRED_VERSION=2.12 +GTK_REQUIRED_VERSION=2.18 +GTK3_REQUIRED_VERSION=2.91 INDICATOR_REQUIRED_VERSION=0.3.5 DBUSMENUGTK_REQUIRED_VERSION=0.2.2 DBUS_GLIB_REQUIRED_VERSION=0.82 -PKG_CHECK_MODULES(LIBRARY, gtk+-2.0 >= $GTK_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION) - -AC_SUBST(LIBRARY_CFLAGS) -AC_SUBST(LIBRARY_LIBS) +AC_ARG_WITH([gtk], + [AS_HELP_STRING([--with-gtk], + [Which version of gtk to use @<:@default=2@:>@])], + [], + [with_gtk=2]) +AS_IF([test "x$with_gtk" = x3], + [PKG_CHECK_MODULES(LIBRARAY, gtk+-3.0 >= $GTK3_REQUIRED_VERSION + dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION + dbusmenu-gtk3 >= $DBUSMENUGTK_REQUIRED_VERSION) + AC_SUBST(LIBRARY_CFLAGS) + AC_SUBST(LIBRARY_LIBS) + AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available]) + ], + [test "x$with_gtk" = x2], + [PKG_CHECK_MODULES(LIBRARY, gtk+-2.0 >= $GTK_REQUIRED_VERSION + dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION + dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION) + AC_SUBST(LIBRARY_CFLAGS) + AC_SUBST(LIBRARY_LIBS) + ], + [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] +) +AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3]) ########################### # GObject Introspection @@ -55,6 +73,12 @@ AC_SUBST(LIBRARY_LIBS) GOBJECT_INTROSPECTION_CHECK([0.6.7]) +PKG_CHECK_EXISTS([gobject-introspection-1.0 >= 0.10], + introspection_ten=yes, + introspection_ten=no) + +AM_CONDITIONAL(INTROSPECTION_TEN, [test "x$introspection_ten" = "xyes"]) + ########################### # Vala API Generation ########################### @@ -127,31 +151,6 @@ with_localinstall="no" AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all of the files localy instead of system directories (for distcheck)]), with_localinstall=$enableval, with_localinstall=no) ########################### -# Indicator Info -########################### - -if test "x$with_localinstall" = "xyes"; then - INDICATORDIR="${libdir}/indicators/2/" - INDICATORICONSDIR="${datadir}/libindicate/icons/" -else - INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator` - INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator` -fi -AC_SUBST(INDICATORDIR) -AC_SUBST(INDICATORICONSDIR) - -########################### -# DBus Service Info -########################### - -if test "x$with_localinstall" = "xyes"; then - DBUSSERVICEDIR="${datadir}/dbus-1/services/" -else - DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1` -fi -AC_SUBST(DBUSSERVICEDIR) - -########################### # Python ########################### @@ -188,6 +187,7 @@ AC_OUTPUT([ Makefile src/Makefile src/appindicator-0.1.pc +src/appindicator3-0.1.pc bindings/Makefile bindings/mono/Makefile bindings/mono/appindicator-sharp.dll.config @@ -213,4 +213,5 @@ Libappindicator Configuration: Prefix: $prefix Indicator Dir: $INDICATORDIR + GTK+ Version: $with_gtk ]) |