[PATCH v2 1/2] configure.ac: remove unused macros

[Víctor Manuel Jáquez Leal <vjaquez igalia com>]

And follow the recommendations from
http://live.gnome.org/GnomeGoals/ModernAutotools

Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez igalia com>
---
 configure.ac |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index 47d0841..c516009 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,17 +20,20 @@ AM_CONFIG_HEADER(src/config.h)
 
 AC_PROG_CC
 AC_PROG_INSTALL
-AC_PROG_LIBTOOL
+
+LT_PREREQ([2.2.6])
+LT_INIT()
 
 AM_PROG_CC_C_O
 
 AC_HEADER_STDC
 
-AM_MAINTAINER_MODE
+GNOME_COMPILE_WARNINGS([maximum])
+CFLAGS+=" ${WARN_CFLAGS} -Wmissing-declarations -std=c99 "
 
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+GNOME_MAINTAINER_MODE_DEFINES
 
-CFLAGS="$CFLAGS -Wall -Werror -Wmissing-prototypes -Wmissing-declarations -std=c99"
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 # ----------------------------------------------------------
 # DEFINITIONS
@@ -89,8 +92,6 @@ if test "x$enable_debug" = "xyes"; then
 	CFLAGS="$CFLAGS -g3 -O0"
 fi
 
-AM_CONDITIONAL([DEBUG], [test "x$enable_debug" = "xyes"])
-
 # ----------------------------------------------------------
 # VALA BINDINGS
 # ----------------------------------------------------------
@@ -145,16 +146,9 @@ PKG_CHECK_MODULES(DEPS, glib-2.0 \
 			gobject-2.0 \
 			gmodule-2.0)
 
-
-AC_SUBST(DEPS_CFLAGS)
-AC_SUBST(DEPS_LIBS)
-
 # Tools
 
 PKG_CHECK_MODULES(GTK, gtk+-2.0, HAVE_GTK=yes, HAVE_GTK=no)
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
-AC_SUBST(HAVE_GTK)
 AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes")
 
 # ----------------------------------------------------------
-- 
1.7.0