From 5d5b1cfaf194883fbfd0950f66a5d3287fdd1b5d Mon Sep 17 00:00:00 2001 From: Thomas White Date: Mon, 5 Mar 2012 22:52:58 +0100 Subject: Check for GTK3 --- configure.ac | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index f0c768e..f86682e 100644 --- a/configure.ac +++ b/configure.ac @@ -24,10 +24,29 @@ if test "$PKG_CONFIG" = "no" ; then echo "*** pkg-config not found. Do you have pkg-config installed?" fi -AM_PATH_GTK_2_0(2.0.0,,AC_MSG_ERROR([ -*** GTK+ 2.6.0 or above is required by OpenMooCow but no GTK+2 was found. -*** Please make sure you have the GTK+ development files installed. The -*** latest version of GTK+ is always available at http://www.gtk.org/.])) +PKG_CHECK_MODULES([GTK3], [gtk+-3.0 > 2.90.0], +[ + + AC_DEFINE([HAVE_GTK3], [1], [Define to 1 if GTK3 is available]) + GTK2_CFLAGS="" + GTK2_LIBS="" + +], [ + + PKG_CHECK_MODULES([GTK2], [gtk+-2.0 > 2.0.0], + [ + + AC_DEFINE([HAVE_GTK2], [1], [Define to 1 if GTK2 is available]) + GTK3_CFLAGS="" + GTK3_LIBS="" + + ], [ + AC_MSG_ERROR([*** You need at least GTK+-2.0 to compile OpenMooCow]) + ]) + +]) + + AC_MSG_CHECKING([SDL]) if $PKG_CONFIG sdl ; then @@ -39,8 +58,8 @@ else AC_MSG_ERROR([*** SDL not found. Do you have 'libsdl-dev' or similar installed?]) fi -CFLAGS="$CFLAGS $GTK_CFLAGS $LIBSDL_CFLAGS" -LIBS="$LIBS $GTK_LIBS $LIBSDL_LIBS -lgthread-2.0" +CFLAGS="$CFLAGS $GTK2_CFLAGS $GTK3_CFLAGS $LIBSDL_CFLAGS" +LIBS="$LIBS $GTK2_LIBS $GTK3_LIBS $LIBSDL_LIBS -lgthread-2.0" AC_CONFIG_FILES([Makefile src/Makefile data/Makefile]) AC_OUTPUT -- cgit v1.2.3