From 322884dde9c0131373989c1fc39d92a4ce7e87f9 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Sat, 19 Jun 2010 08:47:50 -0400 Subject: first pass at providing a gtk3 version --- configure.ac | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 8ae0c74..7c706e9 100644 --- a/configure.ac +++ b/configure.ac @@ -29,6 +29,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) ############################## GTK_REQUIRED_VERSION=2.18 +GTK3_REQUIRED_VERSION=2.90 DBUS_REQUIRED_VERSION=0.76 GIO_UNIX_REQUIRED_VERSION=2.22 @@ -39,6 +40,13 @@ PKG_CHECK_MODULES(LIBINDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION AC_SUBST(LIBINDICATOR_CFLAGS) AC_SUBST(LIBINDICATOR_LIBS) +PKG_CHECK_MODULES(LIBINDICATOR3, gtk+-3.0 >= $GTK3_REQUIRED_VERSION + gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION + dbus-glib-1 >= $DBUS_REQUIRED_VERSION) + +AC_SUBST(LIBINDICATOR3_CFLAGS) +AC_SUBST(LIBINDICATOR3_LIBS) + ############################## # Custom Junk ############################## @@ -92,6 +100,7 @@ AC_OUTPUT([ Makefile libindicator/Makefile libindicator/indicator.pc +libindicator/indicator3.pc tests/Makefile tools/Makefile ]) -- cgit v1.2.3 From ecc6acd2a576fcc11d51ded532f570fb29ab475e Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Wed, 6 Oct 2010 10:58:49 -0400 Subject: instead of always building gtk2 and gtk3, add a --with-gtk= flag to configure to specify which to build with --- configure.ac | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 7c706e9..5f4d3c9 100644 --- a/configure.ac +++ b/configure.ac @@ -29,23 +29,32 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) ############################## GTK_REQUIRED_VERSION=2.18 -GTK3_REQUIRED_VERSION=2.90 +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) - -PKG_CHECK_MODULES(LIBINDICATOR3, gtk+-3.0 >= $GTK3_REQUIRED_VERSION - gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION - dbus-glib-1 >= $DBUS_REQUIRED_VERSION) - -AC_SUBST(LIBINDICATOR3_CFLAGS) -AC_SUBST(LIBINDICATOR3_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 @@ -114,4 +123,5 @@ AC_MSG_NOTICE([ Libindicator Configuration: Prefix: $prefix + GTK+ Version: $with_gtk ]) -- cgit v1.2.3 From 75672d53ab18c2e057927e610ea22890fbb102a2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 09:38:43 -0600 Subject: Checking for deprecations and making sure we check on distcheck --- configure.ac | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 86eec72..8b4a709 100644 --- a/configure.ac +++ b/configure.ac @@ -24,6 +24,15 @@ 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 ############################## -- cgit v1.2.3 From 7d8375c7694f91fb05f72cf175a0a0219ba19bb1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 14:39:02 -0600 Subject: 0.3.15 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 8b4a709..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]) -- cgit v1.2.3