Changes from arch/CVS synchronization

diff --git a/ChangeLog b/ChangeLog
index c6b06b4..9800486 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-29  Ludovic Courtès  <ludo@gnu.org>
+
+       * configure.in: Use `build-aux' as `AC_CONFIG_AUX_DIR', and `m4'
+       as `AC_CONFIG_MACRO_DIR'.  Use Automake's `gnu' and `check-news'
+       options.
+
 2007-07-25  Ludovic Courtès  <ludo@gnu.org>
 
        * NEWS: Mention bug fix for "(set! 'x #f)".

diff --git a/configure.in b/configure.in
index 4786d51..5ce84a3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -37,9 +37,11 @@ AC_INIT(patsubst(m4_esyscmd(. ./GUILE-VERSION && echo ${PACKAGE}),[
         patsubst(m4_esyscmd(. ./GUILE-VERSION && echo ${GUILE_VERSION}),[
 ]),
         [bug-guile@gnu.org])
-AC_CONFIG_AUX_DIR([.])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(GUILE-VERSION)
-AM_INIT_AUTOMAKE([no-define])
+
+AM_INIT_AUTOMAKE([gnu no-define check-news])
 
 AC_COPYRIGHT(GUILE_CONFIGURE_COPYRIGHT)
 AC_CONFIG_SRCDIR([GUILE-VERSION])