diff options
| author | Ted Gould <ted@gould.cx> | 2010-11-11 14:40:03 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-11-11 14:40:03 -0600 |
| commit | df21e797234f5bb4bd7e2a014296efe20ac6d2f3 (patch) | |
| tree | 9b46318f3c6ff12e79b3a3da65523b5a1818bc3e /configure.ac | |
| parent | b91aaa92453fbab73397019070d86c0a9b6fa7ce (diff) | |
| parent | 7d8375c7694f91fb05f72cf175a0a0219ba19bb1 (diff) | |
| download | libayatana-indicator-df21e797234f5bb4bd7e2a014296efe20ac6d2f3.tar.gz libayatana-indicator-df21e797234f5bb4bd7e2a014296efe20ac6d2f3.tar.bz2 libayatana-indicator-df21e797234f5bb4bd7e2a014296efe20ac6d2f3.zip | |
Import upstream version 0.3.15
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 44 |
1 files changed, 36 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index d9a6240..365ebea 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ -AC_INIT(libindicator, 0.3.14, ted@canonical.com) +AC_INIT(libindicator, 0.3.15, ted@canonical.com) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libindicator, 0.3.14) +AM_INIT_AUTOMAKE(libindicator, 0.3.15) AM_MAINTAINER_MODE m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES]) @@ -24,20 +24,46 @@ AC_CONFIG_MACRO_DIR([m4]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) +AC_ARG_ENABLE([deprecations], + [AS_HELP_STRING([--enable-deprecations], + [allow deprecated API usage @<:@default=yes@:>@])], + [], + [enable_deprecations=yes]) +AS_IF([test "x$enable_deprecations" = xno], + [CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -DGTK_DISABLE_SINGLE_INCLUDES"] +) + ############################## # Dependencies ############################## GTK_REQUIRED_VERSION=2.18 +GTK3_REQUIRED_VERSION=2.91 DBUS_REQUIRED_VERSION=0.76 GIO_UNIX_REQUIRED_VERSION=2.22 -PKG_CHECK_MODULES(LIBINDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION) - -AC_SUBST(LIBINDICATOR_CFLAGS) -AC_SUBST(LIBINDICATOR_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(LIBINDICATOR, gtk+-3.0 >= $GTK3_REQUIRED_VERSION + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION + dbus-glib-1 >= $DBUS_REQUIRED_VERSION) + AC_SUBST(LIBINDICATOR_CFLAGS) + AC_SUBST(LIBINDICATOR_LIBS) + ], + [test "x$with_gtk" = x2], + [PKG_CHECK_MODULES(LIBINDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION + dbus-glib-1 >= $DBUS_REQUIRED_VERSION) + AC_SUBST(LIBINDICATOR_CFLAGS) + AC_SUBST(LIBINDICATOR_LIBS) + ], + [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] +) +AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3]) ############################## # Custom Junk @@ -106,6 +132,7 @@ AC_OUTPUT([ Makefile libindicator/Makefile libindicator/indicator.pc +libindicator/indicator3.pc tests/Makefile tools/Makefile ]) @@ -119,6 +146,7 @@ AC_MSG_NOTICE([ Libindicator Configuration: Prefix: $prefix + GTK+ Version: $with_gtk Enable debugging: $enable_debug ]) |