Jan Engelhardt on Wed, 05 Feb 2014 04:11:05 +0100 |
[Date Prev] [Date Next] [Thread Prev] [Thread Next] [Date Index] [Thread Index]
[PATCH 2/2] build: replace outdated autotools calls |
These old forms have been long long deprecated and start causing more and more warnings. configure.ac:4: warning: AM_INIT_AUTOMAKE: two- and three-arguments forms are deprecated. For more info, see: http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_005fINIT_005fAUTOMAKE-invocation --- autogen.sh | 11 ++--------- configure.ac | 5 +++-- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/autogen.sh b/autogen.sh index 6b7dc9c..23f8b72 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,10 +1,3 @@ #! /bin/sh -#This file is part of the GP2C package (SVN only) -# -#This very stupid shell script is Public Domain. - -aclocal || { echo "You must have autoconf to proceed. Sorry.";exit 1; } -autoconf || { echo "You must have autoconf to proceed. Sorry.";exit 1; } -autoheader || { echo "You must have autoconf to proceed. Sorry.";exit 1; } -automake -a || { echo "You must have automake to proceed. Sorry.";exit 1; } -CFLAGS="-O2 -g -Wall" ./configure --enable-maintainer-mode $* +autoreconf -fi +CFLAGS="-O2 -g -Wall" ./configure --enable-maintainer-mode "$@" diff --git a/configure.ac b/configure.ac index 6857ce7..6d20c75 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,8 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(src/gp2c.c) +AC_INIT([gp2c], [0.0.8pl1]) +AC_CONFIG_SRCDIR([src/gp2c.c]) AC_CONFIG_AUX_DIR(config) -AM_INIT_AUTOMAKE(gp2c,0.0.8pl1) +AM_INIT_AUTOMAKE([-Wall foreign subdir-objects tar-pax]) AM_MAINTAINER_MODE dnl Be nice with packagers. AM_CONFIG_HEADER(src/config.h) dnl AC_PREFIX_PROGRAM(gp) -- 1.8.4.5