From cfbf3b9d4c846f12a99624331a56048c7e3a75b7 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 24 Jul 2012 11:18:32 -0400 Subject: Use AC_CHECK_LIBM to get -lm now that gtk doesn't include that in it's .pc file --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 6e350b9..a124c29 100644 --- a/configure.ac +++ b/configure.ac @@ -78,6 +78,8 @@ AC_FUNC_MALLOC AC_FUNC_MMAP AC_CHECK_FUNCS([memset munmap strcasecmp strdup]) +AC_CHECK_LIBM + AC_ARG_WITH([gtk], [AS_HELP_STRING([--with-gtk], [Which version of gtk to use @<:@default=3@:>@])], -- cgit v1.2.3 From e99fb9fae2845cf269d71bf197d35eeb69f29354 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 21 Aug 2012 13:10:11 -0500 Subject: make the glib 2.32 requirement explicit in configure.ac --- configure.ac | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 6e350b9..9306054 100644 --- a/configure.ac +++ b/configure.ac @@ -78,6 +78,8 @@ AC_FUNC_MALLOC AC_FUNC_MMAP AC_CHECK_FUNCS([memset munmap strcasecmp strdup]) +GLIB_REQUIRED_VERSION=2.32.0 + AC_ARG_WITH([gtk], [AS_HELP_STRING([--with-gtk], [Which version of gtk to use @<:@default=3@:>@])], @@ -86,9 +88,11 @@ AC_ARG_WITH([gtk], AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3]) if test "x$with_gtk" = "x2"; then - PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.19.7) + PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.19.7 + glib-2.0 >= GLIB_REQUIRED_VERSION]) else - PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0.0) + PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= 3.0.0 + glib-2.0 >= GLIB_REQUIRED_VERSION]) AC_DEFINE_UNQUOTED(USE_GTK3, , [Use GTK3]) fi AC_SUBST(GTK_CFLAGS) -- cgit v1.2.3 From d4f4fa39b6cb87f0658f727a100eb913c74478ee Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 21 Aug 2012 20:06:46 -0500 Subject: bump to 12.10.0 --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 9306054..0ef71bc 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ # # shamelessly stolen from clutter-gtk # -m4_define([ido_major_version], [0]) -m4_define([ido_minor_version], [3]) -m4_define([ido_micro_version], [4]) +m4_define([ido_major_version], [12]) +m4_define([ido_minor_version], [10]) +m4_define([ido_micro_version], [0]) m4_define([ido_api_version], [ido_major_version.ido_minor_version]) -- cgit v1.2.3