From c7fcd39a6326f4d07c5ce6f286ee713e6150d681 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 28 Mar 2006 16:56:33 +0000 Subject: [PATCH] Require autoconf 2.59 or later. More m4 quoting --- Makefile.am | 2 +- buildconf.sh | 6 ++++-- configure.ac | 10 +++++----- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 18da25b..65558cd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = foreign -EXTRA_DIST = m4/yazpp.m4 m4/yaz.m4 buildconf.sh +EXTRA_DIST = NEWS m4/yazpp.m4 m4/yaz.m4 buildconf.sh MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure diff --git a/buildconf.sh b/buildconf.sh index 9dc4045..121a2cf 100755 --- a/buildconf.sh +++ b/buildconf.sh @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: buildconf.sh,v 1.5 2005-10-25 15:17:47 adam Exp $ +# $Id: buildconf.sh,v 1.6 2006-03-28 16:56:33 adam Exp $ if automake --version|head -1 |grep '1\.[4-7]'; then echo "automake 1.4-1.7 is active. You should use automake 1.8 or later" @@ -11,7 +11,9 @@ if automake --version|head -1 |grep '1\.[4-7]'; then fi set -x -aclocal -I m4 + +# I am tired of underquoted warnings for Tcl macros +aclocal -I m4 2>&1 | grep -v aclocal/tcl.m4 autoheader libtoolize --automake --force automake --add-missing diff --git a/configure.ac b/configure.ac index a200724..0a62c88 100644 --- a/configure.ac +++ b/configure.ac @@ -2,17 +2,17 @@ ## Process this file with autoconf to produce a configure script. # Autoconf and automake setup -AC_PREREQ(2.57) -AC_INIT(metaproxy, 0.9, adam@indexdata.dk) +AC_PREREQ(2.59) +AC_INIT([metaproxy],[0.9], [adam@indexdata.dk]) AC_CONFIG_HEADERS(src/config.hpp) -AC_CONFIG_SRCDIR(configure.ac) -AC_CONFIG_AUX_DIR(config) +AC_CONFIG_SRCDIR([configure.ac]) +AC_CONFIG_AUX_DIR([config]) AC_CANONICAL_SYSTEM ##AC_PREFIX_DEFAULT(`pwd`/install) -AM_INIT_AUTOMAKE(1.8) +AM_INIT_AUTOMAKE([1.8]) # Checks for programs. AC_PROG_CXX -- 1.7.10.4