Switch to autoconf-2.57 and automake-1.7.2.

diff --git a/ChangeLog b/ChangeLog
index 102b401313e339bb503ea7267e2f0ba753c3cd76..6a827064d0a22f58ddd1106164e80a03f26b25d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-12-07  Bruno Haible  <bruno@clisp.org>
+
+       Switch to autoconf-2.57 and automake-1.7.2.
+       * configure.in: Use AC_CONFIG_FILES, because the AC_OUTPUT commands
+       and not run any more when config.status is called to create a single
+       file.
+       * elisp-comp: New file, from automake-1.7.2.
+
 2002-11-19  Bruno Haible  <bruno@clisp.org>
 
        Switch to autoconf-2.56.

diff --git a/configure.in b/configure.in
index 209f993b4288c5789d6b3074c817a877d0b508db..6258640a98dfbbe6b8205b22696440d24be2a96d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -260,32 +260,43 @@ AC_SUBST(LTALLOCA)
 
 AC_CONFIG_SUBDIRS(libasprintf)
 
-AC_OUTPUT([Makefile \
-           intl/Makefile intl-java/Makefile \
-           lib/Makefile lib/javacomp.sh lib/javaexec.sh \
-           libuniname/Makefile \
-           src/Makefile src/user-email \
-           po/Makefile.in \
-           doc/Makefile man/Makefile man/x-to-1 \
-           tests/Makefile \
-           m4/Makefile \
-           projects/Makefile \
-           misc/Makefile misc/gettextize misc/autopoint], [
-  dnl Fix unesthetic build commands generated by automake.
-  for m in lib/Makefile src/Makefile tests/Makefile; do
-    sed -e "s,\`test -f \\\$< || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," < $m > $m.tmp
-    mv $m.tmp $m
-  done
-  dnl Fix an automake-1.5 bug.
-  for m in Makefile doc/Makefile; do
-    sed -e 's,^#distdir:,distdir:,' < $m > $m.tmp
-    mv $m.tmp $m
-  done
-  dnl Fix an automake-1.5 bug: all info files are erased by "make".
-  for m in doc/Makefile; do
-    sed -e '/cd \$(srcdir) && rm -f /d' < $m > $m.tmp
-    mv $m.tmp $m
-  done
-  dnl Fix permissions of misc/gettextize and misc/autopoint.
-  chmod a+x misc/gettextize misc/autopoint
-])
+AC_CONFIG_FILES([Makefile],
+                [FIX_MAKEFILE_DISTRIB([Makefile])])
+
+AC_CONFIG_FILES([intl/Makefile])
+
+AC_CONFIG_FILES([intl-java/Makefile])
+
+AC_CONFIG_FILES([lib/Makefile],
+                [FIX_MAKEFILE_COMPILE([lib/Makefile])])
+AC_CONFIG_FILES([lib/javacomp.sh lib/javaexec.sh])
+
+AC_CONFIG_FILES([libuniname/Makefile],
+                [FIX_MAKEFILE_COMPILE([libuniname/Makefile])])
+
+AC_CONFIG_FILES([src/Makefile],
+                [FIX_MAKEFILE_COMPILE([src/Makefile])])
+AC_CONFIG_FILES([src/user-email])
+
+AC_CONFIG_FILES([po/Makefile.in])
+
+AC_CONFIG_FILES([doc/Makefile],
+                [FIX_MAKEFILE_COMPILE([doc/Makefile])
+                 FIX_MAKEFILE_DISTRIB([doc/Makefile])
+                 FIX_MAKEFILE_INFO([doc/Makefile])])
+
+AC_CONFIG_FILES([man/Makefile])
+AC_CONFIG_FILES([man/x-to-1])
+
+AC_CONFIG_FILES([tests/Makefile],
+                [FIX_MAKEFILE_COMPILE([tests/Makefile])])
+
+AC_CONFIG_FILES([m4/Makefile])
+
+AC_CONFIG_FILES([projects/Makefile])
+
+AC_CONFIG_FILES([misc/Makefile])
+AC_CONFIG_FILES([misc/gettextize], [chmod a+x misc/gettextize])
+AC_CONFIG_FILES([misc/autopoint], [chmod a+x misc/autopoint])
+
+AC_OUTPUT

diff --git a/misc/elisp-comp b/elisp-comp
similarity index 60%
rename from misc/elisp-comp
rename to elisp-comp
index ddd15f65bd309d5af3cf0f34fc847c3152cb2602..dc7d7ca6d85a4bb4ad45a602f3078e839344ebab 100755 (executable)
--- a/misc/elisp-comp
+++ b/elisp-comp
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+# Copyright 1995 Free Software Foundation, Inc.
 # François Pinard <pinard@iro.umontreal.ca>, 1995.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -16,6 +16,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
 # This script byte-compiles all `.el' files which are part of its
 # arguments, using GNU Emacs, and put the resulting `.elc' files into
 # the current directory, so disregarding the original directories used
@@ -26,17 +31,24 @@
 # they require or load-library one another.
 
 if test $# = 0; then
-  echo 1>&2 "No files given to $0"
+   echo 1>&2 "No files given to $0"
+   exit 1
 else
-  tempdir=elc.$$
-  mkdir $tempdir
-  cp $* $tempdir
-  cd $tempdir
+   if test -z "$EMACS" || test "$EMACS" = "t"; then
+      # Value of "t" means we are running in a shell under Emacs.
+      # Just assume Emacs is called "emacs".
+      EMACS=emacs
+   fi
+
+   tempdir=elc.$$
+   mkdir $tempdir
+   cp $* $tempdir
+   cd $tempdir
 
-  echo "(setq load-path (cons nil load-path))" > script
-  ${EMACS-emacs} -batch -l script -f batch-byte-compile *.el
-  mv *.elc ..
+   echo "(setq load-path (cons nil load-path))" > script
+   $EMACS -batch -q -l script -f batch-byte-compile *.el
+   mv *.elc ..
 
-  cd ..
-  rm -fr $tempdir
+   cd ..
+   rm -fr $tempdir
 fi

diff --git a/libasprintf/ChangeLog b/libasprintf/ChangeLog
index b5a2fa266995f074d9618dcc3a95979ba5116910..ec64ee6ac9400e5e7ac913bf2ebf2722f630a775 100644 (file)
--- a/libasprintf/ChangeLog
+++ b/libasprintf/ChangeLog
@@ -1,3 +1,10 @@
+2002-12-07  Bruno Haible  <bruno@clisp.org>
+
+       Switch to autoconf-2.57 and automake-1.7.2.
+       * configure.in: Use AC_CONFIG_FILES, because the AC_OUTPUT commands
+       and not run any more when config.status is called to create a single
+       file.
+
 2002-11-13  Bruno Haible  <bruno@clisp.org>
 
        Assume ANSI C.

diff --git a/libasprintf/configure.in b/libasprintf/configure.in
index ec9e8a4b7fe13e9226ea04b3bd93e7baa6e73826..a7759af962130b2de552ade8a2b71215915643cd 100644 (file)
--- a/libasprintf/configure.in
+++ b/libasprintf/configure.in
@@ -45,20 +45,9 @@ 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_OUTPUT([Makefile], [
-  dnl Fix unesthetic build commands generated by automake.
-  for m in Makefile; do
-    sed -e "s,\`test -f \\\$< || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," < $m > $m.tmp
-    mv $m.tmp $m
-  done
-  dnl Fix an automake-1.5 bug.
-  for m in Makefile; do
-    sed -e 's,^#distdir:,distdir:,' < $m > $m.tmp
-    mv $m.tmp $m
-  done
-  dnl Fix an automake-1.5 bug: all info files are erased by "make".
-  for m in Makefile; do
-    sed -e '/cd \$(srcdir) && rm -f /d' < $m > $m.tmp
-    mv $m.tmp $m
-  done
-])
+AC_CONFIG_FILES([Makefile],
+                [FIX_MAKEFILE_COMPILE([Makefile])
+                 FIX_MAKEFILE_DISTRIB([Makefile])
+                 FIX_MAKEFILE_INFO([Makefile])])
+
+AC_OUTPUT

diff --git a/m4/ChangeLog b/m4/ChangeLog
index a808e0e37c7d936619e81161f04093db5111f95c..26f3e9e485c9ed9ecf527aa4b08fdcd2c0fb9de9 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-07  Bruno Haible  <bruno@clisp.org>
+
+       Switch to autoconf-2.57 and automake-1.7.2.
+       * fixautomake.m4: New file, extracted from configure.in.
+
 2002-11-19  Bruno Haible  <bruno@clisp.org>
 
        Switch to autoconf-2.56.

diff --git a/m4/fixautomake.m4 b/m4/fixautomake.m4
new file mode 100644 (file)
index 0000000..82371c5
--- /dev/null
+++ b/m4/fixautomake.m4
@@ -0,0 +1,27 @@
+# fixautomake.m4 serial 1 (gettext-0.11.6)
+dnl Copyright (C) 2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible
+
+dnl Fix unesthetic build commands generated by automake.
+AC_DEFUN([FIX_MAKEFILE_COMPILE], [
+  sed -e "s,\`test -f \\\$< || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," -e "s,\`test -f '\\\$<' || echo '\\\$(srcdir)/'\`\\\$<,\\\$<," < $1 > $1.tmp
+  mv $1.tmp $1
+])
+
+dnl Fix an automake-1.5-1.7.2 bug: the distrib rule is omitted.
+AC_DEFUN([FIX_MAKEFILE_DISTRIB], [
+  sed -e 's,^#distdir:,distdir:,' < $1 > $1.tmp
+  mv $1.tmp $1
+])
+
+dnl Fix an automake-1-5.1.7.2 bug: all info files are erased by "make".
+AC_DEFUN([FIX_MAKEFILE_INFO], [
+  sed -e '/@rm -f \$''@/d' < $1 > $1.tmp
+  mv $1.tmp $1
+])

diff --git a/misc/ChangeLog b/misc/ChangeLog
index 9e683ba68d4be69e62cd08d0b1629aa354aaf47f..57cdc5b0a92e72d3febc65715a68fc7e332ce541 100644 (file)
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-07  Bruno Haible  <bruno@clisp.org>
+
+       Switch to autoconf-2.57 and automake-1.7.2.
+       * elisp-comp: Remove, moved to top directory.
+
 2002-11-13  Bruno Haible  <bruno@clisp.org>
 
        Assume ANSI C.