More consistent m4 quoting.

12 files changed, 98 insertions, 74 deletions

diff --git a/ChangeLog b/ChangeLog
index 9a962f09f..1c4d917d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-14  Bruno Haible  <bruno@clisp.org>
+
+	* configure.ac: More consistent m4 quoting.
+
 2008-12-07  Bruno Haible  <bruno@clisp.org>
 
 	* build-aux/fixaclocal: Update for automake-1.10.2.
diff --git a/autoconf-lib-link/ChangeLog b/autoconf-lib-link/ChangeLog
index c1b22153d..5b87eb77e 100644
--- a/autoconf-lib-link/ChangeLog
+++ b/autoconf-lib-link/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-14  Bruno Haible  <bruno@clisp.org>
+
+	* configure.ac: More consistent m4 quoting.
+
 2008-09-07  Bruno Haible  <bruno@clisp.org>
 
 	* config.rpath: Update according to libtool-2.2.6.
diff --git a/autoconf-lib-link/configure.ac b/autoconf-lib-link/configure.ac
index a9a282ded..a51e3edcb 100644
--- a/autoconf-lib-link/configure.ac
+++ b/autoconf-lib-link/configure.ac
@@ -1,5 +1,5 @@
 dnl Configuration for the autoconf-lib-link directory of GNU gettext
-dnl Copyright (C) 1995-1999, 2000-2003, 2005-2006, 2008 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-1999, 2000-2003, 2005-2006, 2008-2009 Free Software Foundation, Inc.
 dnl
 dnl This program is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -16,12 +16,12 @@ dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.57)
+AC_PREREQ([2.57])
 AC_INIT
-AC_CONFIG_SRCDIR(tests/rpath-1a)
-AC_CONFIG_AUX_DIR(../build-aux)
+AC_CONFIG_SRCDIR([tests/rpath-1a])
+AC_CONFIG_AUX_DIR([../build-aux])
 . $srcdir/../version.sh
-AM_INIT_AUTOMAKE(autoconf-lib-link, $VERSION_NUMBER)
+AM_INIT_AUTOMAKE([autoconf-lib-link], [$VERSION_NUMBER])
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -49,16 +49,16 @@ dnl Checks for typedefs, structures, and compiler characteristics.
 dnl Checks for library functions.
 
 dnl Checks for tests/rpathcfg.
-AC_SUBST(GCC)
-AC_SUBST(LD)
-AC_SUBST(with_gnu_ld)
+AC_SUBST([GCC])
+AC_SUBST([LD])
+AC_SUBST([with_gnu_ld])
 
 aclocaldir='${datadir}/aclocal'
-AC_SUBST(aclocaldir)
+AC_SUBST([aclocaldir])
 
 AC_LIB_PREPARE_MULTILIB
 LIBDIRSTEM=$acl_libdirstem
-AC_SUBST(LIBDIRSTEM)
+AC_SUBST([LIBDIRSTEM])
 
 AC_CONFIG_FILES([Makefile],
                 [FIX_MAKEFILE_DISTRIB])
diff --git a/configure.ac b/configure.ac
index 90162a047..4cb1a511d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Configuration for the toplevel directory of GNU gettext
-dnl Copyright (C) 1995-1999, 2000-2003, 2005-2006 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-1999, 2000-2003, 2005-2006, 2009 Free Software Foundation, Inc.
 dnl
 dnl This program is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -16,12 +16,12 @@ dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.57)
+AC_PREREQ([2.57])
 AC_INIT
-AC_CONFIG_SRCDIR(gettext-tools/src/msgfmt.c)
-AC_CONFIG_AUX_DIR(build-aux)
+AC_CONFIG_SRCDIR([gettext-tools/src/msgfmt.c])
+AC_CONFIG_AUX_DIR([build-aux])
 . $srcdir/version.sh
-AM_INIT_AUTOMAKE(gettext, $VERSION_NUMBER)
+AM_INIT_AUTOMAKE([gettext], [$VERSION_NUMBER])
 
 dnl Override automake's tar command used for creating distributions.
 am__tar='${AMTAR} chof - --owner=root --group=root "$$tardir"'
@@ -36,7 +36,7 @@ dnl Checks for typedefs, structures, and compiler characteristics.
 
 dnl Checks for library functions.
 
-AC_CONFIG_SUBDIRS(autoconf-lib-link gettext-runtime gettext-tools)
+AC_CONFIG_SUBDIRS([autoconf-lib-link gettext-runtime gettext-tools])
 
 dnl Ensure that "configure --help" lists all the command line options that
 dnl are usable with the subdir configures. Really AC_CONFIG_SUBDIRS should
diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index ef897235b..f4f309eea 100644
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-14  Bruno Haible  <bruno@clisp.org>
+
+	* configure.ac: More consistent m4 quoting.
+
 2008-04-20  Bruno Haible  <bruno@clisp.org>
 
 	* configure.ac: Use LT_INIT instead of AC_PROG_LIBTOOL.
diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index c1ef54d04..0b793593f 100644
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -1,5 +1,5 @@
 dnl Configuration for the gettext-runtime directory of GNU gettext
-dnl Copyright (C) 1995-1999, 2000-2008 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-1999, 2000-2009 Free Software Foundation, Inc.
 dnl
 dnl This program is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -18,11 +18,11 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.59])
 AC_INIT
-AC_CONFIG_SRCDIR(intl/dcigettext.c)
-AC_CONFIG_AUX_DIR(../build-aux)
+AC_CONFIG_SRCDIR([intl/dcigettext.c])
+AC_CONFIG_AUX_DIR([../build-aux])
 . $srcdir/../version.sh
-AM_INIT_AUTOMAKE(gettext-runtime, $VERSION_NUMBER)
-AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE([gettext-runtime], [$VERSION_NUMBER])
+AM_CONFIG_HEADER([config.h])
 
 dnl Installation directories.
 test "$docdir" != '${datarootdir}/doc/${PACKAGE}' || docdir='${datarootdir}/doc/gettext'
@@ -35,13 +35,13 @@ AC_PROG_YACC
 gt_JAVA_CHOICE
 
 gt_JAVACOMP([1.3], [1.1])
-AC_CHECK_PROG(JAR, jar, jar)
+AC_CHECK_PROG([JAR], [jar], [jar])
 if test -n "$HAVE_JAVACOMP" && test -n "$JAR" && test "$JAVA_CHOICE" != no; then
   BUILDJAVA=yes
 else
   BUILDJAVA=no
 fi
-AC_SUBST(BUILDJAVA)
+AC_SUBST([BUILDJAVA])
 
 gt_CSHARPCOMP
 if test -n "$HAVE_CSHARPCOMP" && test "$CSHARP_CHOICE" != no; then
@@ -49,7 +49,7 @@ if test -n "$HAVE_CSHARPCOMP" && test "$CSHARP_CHOICE" != no; then
 else
   BUILDCSHARP=no
 fi
-AC_SUBST(BUILDCSHARP)
+AC_SUBST([BUILDCSHARP])
 
 dnl Check for host type.
 AC_CANONICAL_HOST
@@ -78,7 +78,7 @@ dnl Checks for libraries.
 
 dnl These are the only lines required to internationalize the package.
 dnl (OK, not quite, the AC_CONFIG_FILES has also some parts.)
-AM_GNU_GETTEXT(use-libtool, need-ngettext)
+AM_GNU_GETTEXT([use-libtool], [need-ngettext])
 
 dnl Checks for header files, functions and declarations.
 gl_INIT
@@ -102,11 +102,11 @@ AH_BOTTOM([
 
 dnl Check for tools needed for formatting the documentation.
 ac_aux_dir_abs=`cd $ac_aux_dir && pwd`
-AC_PATH_PROG(PERL, perl, $ac_aux_dir_abs/missing perl)
+AC_PATH_PROG([PERL], [perl], [$ac_aux_dir_abs/missing perl])
 
 dnl Check for tools needed for formatting man pages.
 CROSS_COMPILING=$cross_compiling
-AC_SUBST(CROSS_COMPILING)
+AC_SUBST([CROSS_COMPILING])
 
 dnl Checks for optional programs for the tests/lang-* tests.
 gt_PROG_ANSI_CXX
@@ -116,27 +116,27 @@ dnl On some systems, sched_yield is in librt, rather than in libpthread.
 LIBSCHED=
 if test $gl_threads_api = posix; then
   dnl Solaris has sched_yield in librt, not in libpthread or libc.
-  AC_CHECK_LIB(rt, sched_yield, [LIBSCHED=-lrt],
+  AC_CHECK_LIB([rt], [sched_yield], [LIBSCHED=-lrt],
     [dnl Solaris 2.5.1, 2.6 has sched_yield in libposix4, not librt.
-     AC_CHECK_LIB(posix4, sched_yield, [LIBSCHED=-lposix4])])
+     AC_CHECK_LIB([posix4], [sched_yield], [LIBSCHED=-lposix4])])
 fi
 AC_SUBST([LIBSCHED])
 
 dnl Determine whether to build libasprintf.
-AC_ARG_ENABLE(libasprintf,
+AC_ARG_ENABLE([libasprintf],
   [  --disable-libasprintf   do not build libasprintf],
   [if test "$enableval" != no; then
      SUBDIR_libasprintf=libasprintf
    else
      SUBDIR_libasprintf=
    fi
-  ], SUBDIR_libasprintf=libasprintf)
+  ], [SUBDIR_libasprintf=libasprintf])
 if test "$CXX" = ":"; then
   SUBDIR_libasprintf=
 fi
 AM_CONDITIONAL([ENABLE_LIBASPRINTF], [test -n "$SUBDIR_libasprintf"])
 
-AC_CONFIG_SUBDIRS(libasprintf)
+AC_CONFIG_SUBDIRS([libasprintf])
 
 AC_CONFIG_FILES([Makefile])
 
diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index f50235efa..cddcd11cf 100644
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-14  Bruno Haible  <bruno@clisp.org>
+
+	* configure.ac: More consistent m4 quoting.
+
 2008-09-22  Eric Blake  <ebb9@byu.net>
 	    Bruno Haible  <bruno@clisp.org>
 
diff --git a/gettext-runtime/libasprintf/configure.ac b/gettext-runtime/libasprintf/configure.ac
index e95d49bb4..87bb2bc51 100644
--- a/gettext-runtime/libasprintf/configure.ac
+++ b/gettext-runtime/libasprintf/configure.ac
@@ -1,5 +1,5 @@
 dnl Configuration for the GNU libasprintf library
-dnl Copyright (C) 2002-2008 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2009 Free Software Foundation, Inc.
 dnl
 dnl This program is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -16,12 +16,12 @@ dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.52)
+AC_PREREQ([2.52])
 AC_INIT
-AC_CONFIG_SRCDIR(vasprintf.c)
-AC_CONFIG_AUX_DIR(../../build-aux)
-AM_INIT_AUTOMAKE(libasprintf, 1.0)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_SRCDIR([vasprintf.c])
+AC_CONFIG_AUX_DIR([../../build-aux])
+AM_INIT_AUTOMAKE([libasprintf], [1.0])
+AM_CONFIG_HEADER([config.h])
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -72,8 +72,8 @@ AC_EGREP_CPP([Need own alloca], [
   Need own alloca
 #endif
   ],
-  ALLOCA_H=alloca.h,
-  ALLOCA_H=)
+  [ALLOCA_H=alloca.h],
+  [ALLOCA_H=])
 AC_SUBST([ALLOCA_H])
 
 AC_CHECK_FUNCS([snprintf vasprintf wcslen])
@@ -85,9 +85,9 @@ gl_EOVERFLOW
 
 dnl Check for tools needed for formatting the documentation.
 ac_aux_dir_abs=`cd $ac_aux_dir && pwd`
-AC_PATH_PROG(DVIPS, dvips, $ac_aux_dir_abs/missing dvips)
-AC_PATH_PROG(TEXI2PDF, texi2pdf, $ac_aux_dir_abs/missing texi2pdf)
-AC_PATH_PROG(PERL, perl, $ac_aux_dir_abs/missing perl)
+AC_PATH_PROG([DVIPS], [dvips], [$ac_aux_dir_abs/missing dvips])
+AC_PATH_PROG([TEXI2PDF], [texi2pdf], [$ac_aux_dir_abs/missing texi2pdf])
+AC_PATH_PROG([PERL], [perl], [$ac_aux_dir_abs/missing perl])
 
 AC_CONFIG_FILES([Makefile],
                 [FIX_MAKEFILE_COMPILE
diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index 352b97694..bf900b73d 100644
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-14  Bruno Haible  <bruno@clisp.org>
+
+	* configure.ac: More consistent m4 quoting.
+
 2008-09-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* configure.ac: Use AC_TYPE_UNSIGNED_LONG_LONG_INT instead of
diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index abbcb0b37..0faf135d6 100644
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -1,5 +1,5 @@
 dnl Configuration for the gettext-tools directory of GNU gettext
-dnl Copyright (C) 1995-1999, 2000-2008 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-1999, 2000-2009 Free Software Foundation, Inc.
 dnl
 dnl This program is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -18,11 +18,11 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.59])
 AC_INIT
-AC_CONFIG_SRCDIR(src/msgfmt.c)
-AC_CONFIG_AUX_DIR(../build-aux)
+AC_CONFIG_SRCDIR([src/msgfmt.c])
+AC_CONFIG_AUX_DIR([../build-aux])
 . $srcdir/../version.sh
-AM_INIT_AUTOMAKE(gettext-tools, $VERSION_NUMBER)
-AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE([gettext-tools], [$VERSION_NUMBER])
+AM_CONFIG_HEADER([config.h])
 
 dnl Installation directories.
 test "$docdir" != '${datarootdir}/doc/${PACKAGE}' || docdir='${datarootdir}/doc/gettext'
@@ -40,23 +40,23 @@ if test -n "$HAVE_GCJ" && test "$JAVA_CHOICE" = yes; then
 else
   BUILDJAVAEXE=no
 fi
-AC_SUBST(BUILDJAVAEXE)
+AC_SUBST([BUILDJAVAEXE])
 
 gt_JAVAEXEC
 gt_JAVACOMP([1.3])
-AC_CHECK_PROG(JAR, jar, jar)
+AC_CHECK_PROG([JAR], [jar], [jar])
 if test -n "$HAVE_JAVACOMP" && test -n "$JAR" && test "$JAVA_CHOICE" != no; then
   BUILDJAVA=yes
 else
   BUILDJAVA=no
 fi
-AC_SUBST(BUILDJAVA)
+AC_SUBST([BUILDJAVA])
 if test -n "$HAVE_JAVAEXEC" && test $BUILDJAVA = yes; then
   TESTJAVA=yes
 else
   TESTJAVA=no
 fi
-AC_SUBST(TESTJAVA)
+AC_SUBST([TESTJAVA])
 
 gt_CSHARPCOMP
 if test -n "$HAVE_CSHARPCOMP" && test "$CSHARP_CHOICE" != no; then
@@ -64,7 +64,7 @@ if test -n "$HAVE_CSHARPCOMP" && test "$CSHARP_CHOICE" != no; then
 else
   BUILDCSHARP=no
 fi
-AC_SUBST(BUILDCSHARP)
+AC_SUBST([BUILDCSHARP])
 
 gt_CSHARPEXEC([csharpexec-test.exe], [$srcdir/m4])
 if test -n "$HAVE_CSHARPEXEC" && test $BUILDCSHARP = yes; then
@@ -72,7 +72,7 @@ if test -n "$HAVE_CSHARPEXEC" && test $BUILDCSHARP = yes; then
 else
   TESTCSHARP=no
 fi
-AC_SUBST(TESTCSHARP)
+AC_SUBST([TESTCSHARP])
 
 dnl Check for host type.
 AC_CANONICAL_HOST
@@ -109,7 +109,7 @@ dnl Checks for libraries.
 
 dnl These are the only lines required to internationalize the package.
 dnl (OK, not quite, the AC_CONFIG_FILES has also some parts.)
-AM_GNU_GETTEXT(use-libtool, need-ngettext)
+AM_GNU_GETTEXT([use-libtool], [need-ngettext])
 
 dnl This line internationalizes the bison generated parsers.
 BISON_I18N
@@ -149,13 +149,13 @@ gl_INIT
 gtpo_INIT
 
 dnl Checks for header files.
-AC_CHECK_HEADERS(pwd.h)
+AC_CHECK_HEADERS([pwd.h])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
 AC_TYPE_UNSIGNED_LONG_LONG_INT
 AC_TYPE_SIZE_T
-AC_CHECK_TYPES(ptrdiff_t)
+AC_CHECK_TYPES([ptrdiff_t])
 gt_TYPE_SSIZE_T
 AC_TYPE_PID_T
 gl_GLIBC21
@@ -211,7 +211,7 @@ else
 fi
 AM_CONDITIONAL([WOE32DLL], [test $is_woe32dll = yes])
 if test $is_woe32dll = yes; then
-  AC_DEFINE([WOE32DLL], 1,
+  AC_DEFINE([WOE32DLL], [1],
     [Define when --enable-shared is used on mingw or Cygwin.])
 fi
 
@@ -264,12 +264,12 @@ dnl ship both gettext and expat, we use dynamic loading to avoid a hard
 dnl dependency from gettext to expat.
 case "$host_os" in
   linux*)
-    AC_DEFINE([DYNLOAD_LIBEXPAT], 1,
+    AC_DEFINE([DYNLOAD_LIBEXPAT], [1],
       [Define to 1 if libexpat shall be dynamically loaded via dlopen().])
     LIBEXPAT="-ldl"
     LTLIBEXPAT="-ldl"
-    AC_SUBST(LIBEXPAT)
-    AC_SUBST(LTLIBEXPAT)
+    AC_SUBST([LIBEXPAT])
+    AC_SUBST([LTLIBEXPAT])
     ;;
   *)
     AC_LIB_HAVE_LINKFLAGS([expat], [],
@@ -309,17 +309,17 @@ if test "$EMACS" != no; then
 fi
 
 aclocaldir='${datadir}/aclocal'
-AC_SUBST(aclocaldir)
+AC_SUBST([aclocaldir])
 
 dnl Check for tools needed for formatting the documentation.
 ac_aux_dir_abs=`cd $ac_aux_dir && pwd`
-AC_PATH_PROG(DVIPS, dvips, $ac_aux_dir_abs/missing dvips)
-AC_PATH_PROG(TEXI2PDF, texi2pdf, $ac_aux_dir_abs/missing texi2pdf)
-AC_PATH_PROG(PERL, perl, $ac_aux_dir_abs/missing perl)
+AC_PATH_PROG([DVIPS], [dvips], [$ac_aux_dir_abs/missing dvips])
+AC_PATH_PROG([TEXI2PDF], [texi2pdf], [$ac_aux_dir_abs/missing texi2pdf])
+AC_PATH_PROG([PERL], [perl], [$ac_aux_dir_abs/missing perl])
 
 dnl Check for tools needed for formatting man pages.
 CROSS_COMPILING=$cross_compiling
-AC_SUBST(CROSS_COMPILING)
+AC_SUBST([CROSS_COMPILING])
 
 dnl Checks for optional programs for the tests/lang-*, tests/recode-* tests.
 gt_PROG_ANSI_CXX
@@ -344,7 +344,7 @@ fi
 if test "$CXX" = ":"; then
   TESTLIBASPRINTF=no
 fi
-AC_SUBST(TESTLIBASPRINTF)
+AC_SUBST([TESTLIBASPRINTF])
 
 dnl Generate the version information file in the intl/ directory.
 test -d intl || mkdir intl
@@ -356,7 +356,7 @@ $RELEASE_DATE  GNU  <bug-gnu-gettext@gnu.org>
 
 EOF
 
-AC_CONFIG_SUBDIRS(examples)
+AC_CONFIG_SUBDIRS([examples])
 
 AC_CONFIG_FILES([Makefile])
 
diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index ac5ab0d41..7d03b4d85 100644
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-14  Bruno Haible  <bruno@clisp.org>
+
+	* configure.ac: More consistent m4 quoting.
+
 2007-12-24  Bruno Haible  <bruno@clisp.org>
 
 	* hello-*/po/Makefile.am ($(POFILES), .nop.po-update): When using
diff --git a/gettext-tools/examples/configure.ac b/gettext-tools/examples/configure.ac
index 874fe8dbc..579ab181e 100644
--- a/gettext-tools/examples/configure.ac
+++ b/gettext-tools/examples/configure.ac
@@ -1,5 +1,5 @@
 dnl Configuration for the gettext-tools/examples directory of GNU gettext
-dnl Copyright (C) 2006 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009 Free Software Foundation, Inc.
 dnl
 dnl This program is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -16,12 +16,12 @@ dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.57)
+AC_PREREQ([2.57])
 AC_INIT
-AC_CONFIG_SRCDIR(installpaths.in)
-AC_CONFIG_AUX_DIR(../../build-aux)
+AC_CONFIG_SRCDIR([installpaths.in])
+AC_CONFIG_AUX_DIR([../../build-aux])
 . $srcdir/../../version.sh
-AM_INIT_AUTOMAKE(gettext-examples, $VERSION_NUMBER)
+AM_INIT_AUTOMAKE([gettext-examples], [$VERSION_NUMBER])
 
 dnl Installation directories.
 test "$docdir" != '${datarootdir}/doc/${PACKAGE}' || docdir='${datarootdir}/doc/gettext'
@@ -29,7 +29,7 @@ test "$docdir" != '${datarootdir}/doc/${PACKAGE}' || docdir='${datarootdir}/doc/
 AM_PO_SUBDIRS
 
 aclocaldir='${datadir}/aclocal'
-AC_SUBST(aclocaldir)
+AC_SUBST([aclocaldir])
 
 AC_CONFIG_FILES([Makefile],
                 [FIX_MAKEFILE_TOPDIR_DISTRIB])