[file-roller] Modernize autotools configuration with autoupdate
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [file-roller] Modernize autotools configuration with autoupdate
- Date: Thu, 28 Jun 2012 07:20:39 +0000 (UTC)
commit 6c9163774b92b19a73a7f6e47e0800eb652fed34
Author: Paolo Bacchilega <paobac src gnome org>
Date: Thu Jun 28 09:14:54 2012 +0200
Modernize autotools configuration with autoupdate
Makefile.am | 2 +-
configure.ac | 11 +++++------
2 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 98d72f2..b7b2cd8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-ACLOCAL_AMFLAGS=-I m4
+ACLOCAL_AMFLAGS=-I m4 ${ACLOCAL_FLAGS}
if ENABLE_NAUTILUS_ACTIONS
NAUTILUS = nautilus
diff --git a/configure.ac b/configure.ac
index 277bd82..5f5e7a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.61)
+AC_PREREQ([2.69])
-AC_INIT(file-roller, 3.5.2, [http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller])
+AC_INIT([file-roller],[3.5.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller],[file-roller])
AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz tar-ustar])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -10,9 +10,8 @@ AC_CONFIG_SRCDIR([config.h.in])
AC_CONFIG_HEADER([config.h])
AC_CONFIG_MACRO_DIR([m4])
-GNOME_COMMON_INIT
AC_PROG_CC
-AC_PROG_LIBTOOL
+LT_INIT
PKG_PROG_PKG_CONFIG
GLIB_GSETTINGS
@@ -60,7 +59,7 @@ fi
dnl ===========================================================================
-WARN_CFLAGS="-Wall -Wcast-align -Wtype-limits -Wclobbered -Wempty-body -Wignored-qualifiers"
+WARN_CFLAGS="-Wall -Wcast-align -Wtype-limits -Wclobbered -Wempty-body -Wignored-qualifiers -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-sign-compare"
for option in $WARN_CFLAGS; do
SAVE_CFLAGS="$CFLAGS"
@@ -134,7 +133,7 @@ AC_CHECK_LIB(m, floor)
dnl ==========================================================================
AC_ARG_ENABLE(packagekit,
- [AC_HELP_STRING([--disable-packagekit],[build without PackageKit support])],,
+ [AS_HELP_STRING([--disable-packagekit],[build without PackageKit support])],,
[enable_packagekit=yes])
if test "x$enable_packagekit" != "xno"; then
AC_DEFINE(ENABLE_PACKAGEKIT, 1, [define to enable PackageKit installer])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]