From f28c50cd278587f99646ba6b24c0c406dc4b193e Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve Date: Mon, 5 Sep 2011 14:44:54 -0400 Subject: [PATCH] Replace libgnomeui checks with Gtk+ and popt --- configure.in | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index a50617a..92b8688 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ AC_PREREQ(2.52) -AC_INIT(grip, 3.3.1, http://sf.net/tracker/?group_id=3714&atid=103714) +AC_INIT(grip, 3.4.0, [http://sf.net/tracker/?group_id=3714&atid=103714]) AC_CONFIG_SRCDIR(src/main.c) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) @@ -33,9 +33,12 @@ AC_CHECK_HEADERS(linux/soundcard.h machine/soundcard.h sys/soundcard.h sys/audio AM_PROG_LIBTOOL -PKG_CHECK_MODULES(GNOME, libgnomeui-2.0 >= 2.2.0, - [LIBS="$LIBS $GNOME_LIBS" - CFLAGS="$CFLAGS $GNOME_CFLAGS"]) +dnl Check for Gtk+-2.0 +PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8, CFLAGS="${CFLAGS} $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS") + +dnl Check for popt library (popt doesn't use pkg-config) +AC_CHECK_HEADER(popt.h, , AC_MSG_ERROR([popt header file not found.])) +AC_CHECK_LIB(popt, poptGetContext, [LIBS="$LIBS -lpopt"], AC_MSG_ERROR([popt library not found.])) PKG_CHECK_MODULES(TERMINAL_WIDGET, vte) CFLAGS="$TERMINAL_WIDGET_CFLAGS $CFLAGS" -- 2.20.1