From b33a883581d0bd008e6f6f77677522db7bfaf8b5 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Mon, 2 May 2011 15:15:35 +0100
Subject: [PATCH] Update autotools configuration

---
 Makefile.am  |  2 ++
 configure.ac | 16 ++++------------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index dfe038c..db086c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 SUBDIRS= doc po src themes icons
 
 icon_DATA = gtetrinet.png
diff --git a/configure.ac b/configure.ac
index a63511f..7c1d6f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,17 +1,14 @@
 # Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.63)
+AC_PREREQ([2.64])
 AC_INIT([gtetrinet],[0.7.11],[http://bugzilla.gnome.org/enter_bug.cgi?product=gtetrinet],[gtetrinet],[http://gtetrinet.sourceforge.net/])
 
 AC_CONFIG_SRCDIR([src/gtetrinet.c])
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_AUX_DIR([config])
-
-AC_SUBST([PACKAGE_NAME], ["$PACKAGE_NAME"])
-AC_SUBST([PACKAGE_VERSION], ["$PACKAGE_VERSION"])
+AC_CONFIG_AUX_DIR([build-aux])
 
 AM_INIT_AUTOMAKE([1.10 dist-bzip2 no-dist-gzip foreign silent-rules])
-AM_MAINTAINER_MODE
+AM_MAINTAINER_MODE([enable])
 
 # Enable silent rules by default
 AM_SILENT_RULES([yes])
@@ -60,8 +57,6 @@ PKG_CHECK_MODULES(GTETRINET,[
                   libgnome-2.0 >= $LIBGNOME_REQUIRED
                   libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
 ])
-AC_SUBST(GTETRINET_CFLAGS)
-AC_SUBST(GTETRINET_LIBS)
 
 # Check for libesd
 if pkg-config --exists esound ; then
@@ -79,9 +74,6 @@ fi
 
 AM_CONDITIONAL(HAVE_ESOUND, test "x$have_esound" = "xyes")
 
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-
 AC_CHECK_FUNC(putenv)
 AC_CHECK_FUNC(setenv)
 if test $ac_cv_func_setenv = no; then
-- 
2.50.1