Tell aclocal to look in m4/.

diff --git a/ChangeLog b/ChangeLog
index cce592804aca373576821870e77815f90f79a2f0..d01522e052437865775e1350092d7c39c6e80433 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
        * m4/init-package-version.m4: New file.
        * configure.ac: Invoke gl_INIT_PACKAGE. Use the preferred form of
        AM_INIT_AUTOMAKE.
+       * Makefile.am (ACLOCAL_AMFLAGS): New variable.
+       * autogen.sh: Update aclocal invocation.
 
 2009-05-21  Bruno Haible  <bruno@clisp.org>
 

diff --git a/Makefile.am b/Makefile.am
index f510ed28e9710daa427e1274deea472f4293ebbd..d714a051a4c1cafbb02d9eab007948cb257339e2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the toplevel directory of GNU gettext
-## Copyright (C) 1995-1999, 2000-2008 Free Software Foundation, Inc.
+## Copyright (C) 1995-1999, 2000-2009 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 
 AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
 ACLOCAL = build-aux/fixaclocal @ACLOCAL@
+ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = gnulib-local gettext-runtime gettext-tools autoconf-lib-link
 

diff --git a/autogen.sh b/autogen.sh
index 443c78227e420c3f056b615f6711ea9cf84c16c9..3ba9b5be01fd63aff5bfa9fd5dfca0ad00fb4fa7 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -307,7 +307,7 @@ cp -p gettext-runtime/ABOUT-NLS gettext-tools/ABOUT-NLS
  fi
 )
 
-build-aux/fixaclocal aclocal
+build-aux/fixaclocal aclocal -I m4
 autoconf
 automake