[grilo] configure.ac: remove unused macros
- From: Victor Manuel Jaquez Leal <vjaquez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [grilo] configure.ac: remove unused macros
- Date: Mon, 26 Apr 2010 09:58:22 +0000 (UTC)
commit 8bd2ff6afae472cae97a969f2bafa7d267bf0c5b
Author: VÃctor Manuel Jáquez Leal <vjaquez igalia com>
Date: Mon Apr 26 11:47:12 2010 +0200
configure.ac: remove unused macros
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 | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 47d0841..57e7763 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,17 +20,24 @@ 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
-
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-CFLAGS="$CFLAGS -Wall -Werror -Wmissing-prototypes -Wmissing-declarations -std=c99"
+# ----------------------------------------------------------
+# ENVIRONMENT CONFIGURATION
+# ----------------------------------------------------------
+
+GNOME_COMPILE_WARNINGS([maximum])
+CFLAGS+=" ${WARN_CFLAGS} -Wmissing-declarations -std=c99 "
+
+GNOME_MAINTAINER_MODE_DEFINES
# ----------------------------------------------------------
# DEFINITIONS
@@ -75,8 +82,6 @@ if test "x$enable_uninstalled" = "xyes"; then
AC_MSG_WARN("Configuring for running uninstalled!")
fi
-AM_CONDITIONAL([UNINSTALLED], [test "x$enable_uninstalled" = "xyes"])
-
# ----------------------------------------------------------
# DEBUG SUPPORT
# ----------------------------------------------------------
@@ -89,8 +94,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 +148,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")
# ----------------------------------------------------------
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]