[GNUnet-SVN] r37320 - in gnunet-gtk: . m4

[gnunet]

Author: grothoff
Date: 2016-06-21 20:27:38 +0200 (Tue, 21 Jun 2016)
New Revision: 37320

Modified:
   gnunet-gtk/configure.ac
   gnunet-gtk/m4/ltsugar.m4
Log:
use modern pkg_config check for gtk

Modified: gnunet-gtk/configure.ac
===================================================================
--- gnunet-gtk/configure.ac     2016-06-21 13:17:16 UTC (rev 37319)
+++ gnunet-gtk/configure.ac     2016-06-21 18:27:38 UTC (rev 37320)
@@ -31,6 +31,7 @@
 AM_PROG_CC_C_O
 AC_PROG_MKDIR_P
 AC_PROG_CPP
+AC_PROG_CC_C99
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
@@ -242,7 +243,7 @@
 
 AC_MSG_CHECKING(for gtk)
 without_gtk=true
-AM_PATH_GTK_3_0([3.0.0],without_gtk=false,)
+PKG_CHECK_MODULES([GTK], [gtk+-3.0])
 
 # test for libunique
 AC_ARG_WITH([libunique], AC_HELP_STRING([--without-libunique], [disable 
libunique]))
@@ -251,13 +252,6 @@
   PKG_CHECK_MODULES([unique], [unique-3.0], AC_DEFINE(HAVE_LIBUNIQUE, 1, 
[Define if libunique is available]), AC_MSG_WARN([libunique would be nice to 
have]))
 fi
 
-AM_CONDITIONAL(HAVE_GTK, test x$without_gtk != xtrue)
-if test $without_gtk != true
-then
-  AC_DEFINE_UNQUOTED([HAVE_GTK], 1, [We have GTK])
-else
-  AC_MSG_ERROR(Cannot find GTK: Is pkg-config in path?)
-fi
 CFLAGS="$CFLAGS $GTK_CFLAGS"
 CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
 LIBS="$LIBS $GTK_LIBS"

Modified: gnunet-gtk/m4/ltsugar.m4
===================================================================
--- gnunet-gtk/m4/ltsugar.m4    2016-06-21 13:17:16 UTC (rev 37319)
+++ gnunet-gtk/m4/ltsugar.m4    2016-06-21 18:27:38 UTC (rev 37320)
@@ -1,6 +1,7 @@
 # ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 #
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Foundation, Inc.
 # Written by Gary V. Vaughan, 2004
 #
 # This file is free software; the Free Software Foundation gives
@@ -33,7 +34,7 @@
 # ------------
 # Manipulate m4 lists.
 # These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
+# Autoconf-2.59, which quotes differently.
 m4_define([lt_car], [[$1]])
 m4_define([lt_cdr],
 [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
@@ -44,7 +45,7 @@
 
 # lt_append(MACRO-NAME, STRING, [SEPARATOR])
 # ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
 # Note that neither SEPARATOR nor STRING are expanded; they are appended
 # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
 # No SEPARATOR is output if MACRO-NAME was previously undefined (different