From 7fac4aa2b6eecf2cc47acffb2d9beebb8c2c2066 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 15 Jan 2009 00:24:30 +0000 Subject: More consistent m4 quoting. --- ChangeLog | 8 ++++++++ configure.ac | 8 ++++---- doc/configure.ac | 8 ++++---- lib/configure.ac | 6 +++--- src/configure.ac | 20 ++++++++++---------- tests/configure.ac | 8 ++++---- 6 files changed, 33 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1fe80dc..f5419a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-01-14 Bruno Haible + + * configure.ac: More consistent m4 quoting. + * src/configure.ac: Likewise. + * lib/configure.ac: Likewise. + * tests/configure.ac: Likewise. + * doc/configure.ac: Likewise. + 2009-01-01 Bruno Haible * doc/gperf.texi (Gperf Declarations): Mention the C99 standard. diff --git a/configure.ac b/configure.ac index fdda1d6..c2ff675 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl autoconf configuration for gperf -dnl Copyright (C) 1998, 2002, 2003, 2005-2007 Free Software Foundation, Inc. +dnl Copyright (C) 1998, 2002, 2003, 2005-2007, 2009 Free Software Foundation, Inc. dnl Written by Douglas C. Schmidt dnl and Bruno Haible . dnl @@ -20,7 +20,7 @@ dnl You should have received a copy of the GNU General Public License dnl along with this program. If not, see . AC_PREREQ([2.60]) -AC_INIT(doc/gperf.1) +AC_INIT([doc/gperf.1]) AC_PROG_MAKE_SET AC_OBJEXT AC_EXEEXT @@ -28,7 +28,7 @@ AC_EXEEXT dnl An autoconf-2.52 bug: AC_CONFIG_SUBDIRS requires AC_CONFIG_AUX_DIR_DEFAULT. ac_aux_dir=$srcdir AC_PROVIDE([AC_CONFIG_AUX_DIR_DEFAULT]) -AC_CONFIG_SUBDIRS(lib src tests doc) +AC_CONFIG_SUBDIRS([lib src tests doc]) dnl This piece of sed script replaces every line containing '@subdir@' dnl by several consecutive lines, each referencing one subdir. @@ -50,4 +50,4 @@ p d } ' -AC_OUTPUT(Makefile) +AC_OUTPUT([Makefile]) diff --git a/doc/configure.ac b/doc/configure.ac index 1c53e33..c4279dc 100644 --- a/doc/configure.ac +++ b/doc/configure.ac @@ -1,6 +1,6 @@ dnl autoconf configuration for gperf/doc -dnl Copyright (C) 1998, 2000, 2002-2003, 2007 Free Software Foundation, Inc. +dnl Copyright (C) 1998, 2000, 2002-2003, 2007, 2009 Free Software Foundation, Inc. dnl Written by Douglas C. Schmidt dnl and Bruno Haible . dnl @@ -20,9 +20,9 @@ dnl You should have received a copy of the GNU General Public License dnl along with this program. If not, see . AC_PREREQ([2.60]) -AC_INIT(gperf.1) +AC_INIT([gperf.1]) PACKAGE=gperf -AC_SUBST(PACKAGE) +AC_SUBST([PACKAGE]) AC_PROG_MAKE_SET dnl dnl checks for programs @@ -32,4 +32,4 @@ CL_PROG_INSTALL dnl dnl That's it. dnl -AC_OUTPUT(Makefile) +AC_OUTPUT([Makefile]) diff --git a/lib/configure.ac b/lib/configure.ac index dbb4412..b3df1cd 100644 --- a/lib/configure.ac +++ b/lib/configure.ac @@ -1,6 +1,6 @@ dnl autoconf configuration for gperf/lib -dnl Copyright (C) 1998, 2002, 2005, 2007 Free Software Foundation, Inc. +dnl Copyright (C) 1998, 2002, 2005, 2007, 2009 Free Software Foundation, Inc. dnl Written by Douglas C. Schmidt dnl and Bruno Haible . dnl @@ -20,7 +20,7 @@ dnl You should have received a copy of the GNU General Public License dnl along with this program. If not, see . AC_PREREQ([2.60]) -AC_INIT(hash.cc) +AC_INIT([hash.cc]) AC_PROG_MAKE_SET dnl dnl checks for programs @@ -40,4 +40,4 @@ CL_PROG_INSTALL dnl dnl That's it. dnl -AC_OUTPUT(Makefile) +AC_OUTPUT([Makefile]) diff --git a/src/configure.ac b/src/configure.ac index 1f05feb..33f4983 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -1,6 +1,6 @@ dnl autoconf configuration for gperf/src -dnl Copyright (C) 1998, 2000, 2002-2003, 2007 Free Software Foundation, Inc. +dnl Copyright (C) 1998, 2000, 2002-2003, 2007, 2009 Free Software Foundation, Inc. dnl Written by Douglas C. Schmidt dnl and Bruno Haible . dnl @@ -20,8 +20,8 @@ dnl You should have received a copy of the GNU General Public License dnl along with this program. If not, see . AC_PREREQ([2.60]) -AC_INIT(main.cc) -AC_CONFIG_HEADER(config.h) +AC_INIT([main.cc]) +AC_CONFIG_HEADER([config.h]) AC_PROG_MAKE_SET dnl dnl checks for programs @@ -40,16 +40,16 @@ dnl dnl checks for compiler characteristics dnl AC_MSG_CHECKING([for stack-allocated variable-size arrays]) -AC_CACHE_VAL(gp_cv_cxx_dynamic_array, [ +AC_CACHE_VAL([gp_cv_cxx_dynamic_array], [ AC_LANG_SAVE() AC_LANG_CPLUSPLUS() AC_TRY_COMPILE([int func (int n) { int dynamic_array[n]; }], [], -gp_cv_cxx_dynamic_array=yes, gp_cv_cxx_dynamic_array=no) + [gp_cv_cxx_dynamic_array=yes], [gp_cv_cxx_dynamic_array=no]) AC_LANG_RESTORE() ]) -AC_MSG_RESULT($gp_cv_cxx_dynamic_array) +AC_MSG_RESULT([$gp_cv_cxx_dynamic_array]) if test $gp_cv_cxx_dynamic_array = yes; then - AC_DEFINE(HAVE_DYNAMIC_ARRAY, 1, + AC_DEFINE([HAVE_DYNAMIC_ARRAY], [1], [Define if the C++ compiler supports stack-allocated variable-size arrays.]) fi dnl @@ -58,9 +58,9 @@ dnl dnl dnl checks for libraries dnl -AC_CHECK_LIB(m, rand, GPERF_LIBM="-lm", GPERF_LIBM="") -AC_SUBST(GPERF_LIBM) +AC_CHECK_LIB([m], [rand], [GPERF_LIBM="-lm"], [GPERF_LIBM=""]) +AC_SUBST([GPERF_LIBM]) dnl dnl That's it. dnl -AC_OUTPUT(Makefile) +AC_OUTPUT([Makefile]) diff --git a/tests/configure.ac b/tests/configure.ac index 27d9013..47723d8 100644 --- a/tests/configure.ac +++ b/tests/configure.ac @@ -1,6 +1,6 @@ dnl autoconf configuration for gperf/tests -dnl Copyright (C) 1998, 2002, 2007 Free Software Foundation, Inc. +dnl Copyright (C) 1998, 2002, 2007, 2009 Free Software Foundation, Inc. dnl Written by Douglas C. Schmidt dnl and Bruno Haible . dnl @@ -20,7 +20,7 @@ dnl You should have received a copy of the GNU General Public License dnl along with this program. If not, see . AC_PREREQ([2.60]) -AC_INIT(c-parse.gperf) +AC_INIT([c-parse.gperf]) AC_PROG_MAKE_SET dnl dnl checks for programs @@ -38,8 +38,8 @@ if test $ac_cv_prog_gcc = yes -a $ac_cv_prog_gxx = yes; then else CHECK_LANG_SYNTAX='' fi -AC_SUBST(CHECK_LANG_SYNTAX) +AC_SUBST([CHECK_LANG_SYNTAX]) dnl dnl That's it. dnl -AC_OUTPUT(Makefile) +AC_OUTPUT([Makefile]) -- cgit v1.2.1