* configure.ac, NEWS: Bump version to 1.8d.

diff --git a/ChangeLog b/ChangeLog
index 3ca7073d32fd4f2651465749367e303c518dbcb4..8511cc7b87652ae427c2236f6c160443aa3abb66 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-07-17  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * configure.ac, NEWS: Bump version to 1.8d.
+
        * lib/config-ml.in, lib/config.sub, lib/config.guess, lib/texinfo.tex:
        New upstream versions.
 

diff --git a/Makefile.in b/Makefile.in
index 496a060952ec54ebc193e0f51694e6c2ea9f8a09..885138ef11c3922a2ec4ed2642c72379d3352d5e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8c from Makefile.am.
+# Makefile.in generated by automake 1.8d from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -379,7 +379,7 @@ distdir: $(DISTFILES)
            || exit 1; \
          fi; \
        done
-       list='$(SUBDIRS)'; for subdir in $$list; do \
+       list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
          if test "$$subdir" = .; then :; else \
            test -d "$(distdir)/$$subdir" \
            || $(mkdir_p) "$(distdir)/$$subdir" \
@@ -591,13 +591,14 @@ uninstall-info: uninstall-info-recursive
        distclean-recursive distclean-tags distcleancheck distdir \
        distuninstallcheck dvi dvi-am html html-am info info-am \
        install install-am install-binSCRIPTS install-data \
-       install-data-am install-exec install-exec-am install-info \
-       install-info-am install-man install-strip installcheck \
-       installcheck-am installdirs installdirs-am maintainer-clean \
-       maintainer-clean-generic maintainer-clean-recursive \
-       mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
-       pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-       uninstall-binSCRIPTS uninstall-info-am
+       install-data-am install-exec install-exec-am install-exec-hook \
+       install-info install-info-am install-man install-strip \
+       installcheck installcheck-am installdirs installdirs-am \
+       maintainer-clean maintainer-clean-generic \
+       maintainer-clean-recursive mostlyclean mostlyclean-generic \
+       mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+       uninstall uninstall-am uninstall-binSCRIPTS uninstall-hook \
+       uninstall-info-am
 
 
 install-exec-hook:

diff --git a/NEWS b/NEWS
index d2eb8ad6d88f9a32d1647ada797c829b6c6ce05d..6e2ed59493ba81fcf28ba600b8c054df5a28f29b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-New in 1.8c:
+New in 1.8d:
 
 * Makefile.in bloat reduction:
 

diff --git a/aclocal.m4 b/aclocal.m4
index 9eb0a1f7275edce6b11272658859795b79bd3468..c58adb1eb70c156f46227eba31e4b5ce3b916f6a 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.8c -*- Autoconf -*-
+# generated automatically by aclocal 1.8d -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 # Free Software Foundation, Inc.

diff --git a/configure b/configure
index 53933c34c077f0de38911da5bc28dd26314986b7..3537654084bfbebe3c9a106aff774c674505e502 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59a for GNU Automake 1.8c.
+# Generated by GNU Autoconf 2.59a for GNU Automake 1.8d.
 #
 # Report bugs to <bug-automake@gnu.org>.
 #
@@ -19,6 +19,7 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
   set -o posix
 fi
@@ -79,7 +80,9 @@ if test ! -f "$as_myself"; then
 fi
 
 # Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
 PS1='$ '
 PS2='> '
 PS4='+ '
@@ -93,7 +96,7 @@ do
   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
-    $as_unset $as_var
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
   fi
 done
 
@@ -209,6 +212,7 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
   set -o posix
 fi
@@ -227,6 +231,7 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
   set -o posix
 fi
@@ -293,8 +298,9 @@ fi
       done
 
       if test "x$CONFIG_SHELL" != x; then
-  $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-        $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+  for as_var in BASH_ENV ENV
+        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+        done
         export CONFIG_SHELL
         exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
@@ -492,8 +498,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='GNU Automake'
 PACKAGE_TARNAME='automake'
-PACKAGE_VERSION='1.8c'
-PACKAGE_STRING='GNU Automake 1.8c'
+PACKAGE_VERSION='1.8d'
+PACKAGE_STRING='GNU Automake 1.8d'
 PACKAGE_BUGREPORT='bug-automake@gnu.org'
 
 ac_unique_file="automake.in"
@@ -946,7 +952,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GNU Automake 1.8c to adapt to many kinds of systems.
+\`configure' configures GNU Automake 1.8d to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1011,7 +1017,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU Automake 1.8c:";;
+     short | recursive ) echo "Configuration of GNU Automake 1.8d:";;
    esac
   cat <<\_ACEOF
 
@@ -1111,7 +1117,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-GNU Automake configure 1.8c
+GNU Automake configure 1.8d
 generated by GNU Autoconf 2.59a
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002,
@@ -1126,7 +1132,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GNU Automake $as_me 1.8c, which was
+It was created by GNU Automake $as_me 1.8d, which was
 generated by GNU Autoconf 2.59a.  Invocation command line was
 
   $ $0 $@
@@ -1530,7 +1536,7 @@ build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 # bothered by `missing'.
 am_AUTOCONF=${AUTOCONF-autoconf}
 
-am__api_version="1.8c"
+am__api_version="1.8d"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -1804,7 +1810,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='automake'
- VERSION='1.8c'
+ VERSION='1.8d'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2642,6 +2648,7 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
   set -o posix
 fi
@@ -2703,7 +2710,9 @@ echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
 fi
 
 # Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
 PS1='$ '
 PS2='> '
 PS4='+ '
@@ -2717,7 +2726,7 @@ do
   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
-    $as_unset $as_var
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
   fi
 done
 
@@ -2865,7 +2874,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by GNU Automake $as_me 1.8c, which was
+This file was extended by GNU Automake $as_me 1.8d, which was
 generated by GNU Autoconf 2.59a.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2920,7 +2929,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-GNU Automake config.status 1.8c
+GNU Automake config.status 1.8d
 configured by $0, generated by GNU Autoconf 2.59a,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

diff --git a/configure.ac b/configure.ac
index 25071af0a472666e3ca3304755801be9225db0d8..cef2cadff4c3328bee21e53c8a7756c82502eaf6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ dnl (abs_top_builddir is used in tests/automake.in).  Note that
 dnl this is a requirement for the Automake package itself.
 dnl Automake users can still use Autoconf 2.58.
 AC_PREREQ(2.58a)
-AC_INIT([GNU Automake], [1.8c], [bug-automake@gnu.org])
+AC_INIT([GNU Automake], [1.8d], [bug-automake@gnu.org])
 
 AC_CONFIG_SRCDIR(automake.in)
 AC_CONFIG_AUX_DIR(lib)

diff --git a/doc/Makefile.in b/doc/Makefile.in
index b736bd87156b61f03e3e4ef30b376f28534ef0b8..d37c28eeeca79935a587368f6a87730d801b9886 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8c from Makefile.am.
+# Makefile.in generated by automake 1.8d from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -208,10 +208,18 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        $(TEXI2PDF) $<
 
 .texi.html:
-       $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-        -o $@ $<
-       if test ! -d $@ && test -d $(@:.html=); then \
-         mv $(@:.html=) $@; else :; fi
+       rm -rf $(@:.html=.htp)
+       if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+        -o $(@:.html=.htp) $<; \
+       then \
+         rm -rf $@; \
+         if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
+           mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \
+       else \
+         if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
+           rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
+         exit 1; \
+       fi
 $(srcdir)/automake.info: automake.texi $(srcdir)/version.texi $(automake_TEXINFOS)
 automake.dvi: automake.texi $(srcdir)/version.texi $(automake_TEXINFOS)
 automake.pdf: automake.texi $(srcdir)/version.texi $(automake_TEXINFOS)

diff --git a/doc/stamp-vti b/doc/stamp-vti
index d1e905e62c8d87bfe6a8fb691f590a020443e412..b443bed367a87ca5fe157f37b0834ae9a7ac6704 100644 (file)
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
 @set UPDATED 17 July 2004
 @set UPDATED-MONTH July 2004
-@set EDITION 1.8c
-@set VERSION 1.8c
+@set EDITION 1.8d
+@set VERSION 1.8d

diff --git a/doc/version.texi b/doc/version.texi
index d1e905e62c8d87bfe6a8fb691f590a020443e412..b443bed367a87ca5fe157f37b0834ae9a7ac6704 100644 (file)
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
 @set UPDATED 17 July 2004
 @set UPDATED-MONTH July 2004
-@set EDITION 1.8c
-@set VERSION 1.8c
+@set EDITION 1.8d
+@set VERSION 1.8d

diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 68e91e263b1ad178888c404014988bc2f3bcefa8..a0c0ae9c882d6e68e148404f04100d4cd5b17a6e 100644 (file)
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8c from Makefile.am.
+# Makefile.in generated by automake 1.8d from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -390,7 +390,7 @@ distdir: $(DISTFILES)
            || exit 1; \
          fi; \
        done
-       list='$(SUBDIRS)'; for subdir in $$list; do \
+       list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
          if test "$$subdir" = .; then :; else \
            test -d "$(distdir)/$$subdir" \
            || $(mkdir_p) "$(distdir)/$$subdir" \

diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index b378986317cfdf3949130ef8db5f1138f7a82fd6..16d719758bdf703b52f33ad604de0f93406d16b3 100644 (file)
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8c from Makefile.am.
+# Makefile.in generated by automake 1.8d from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

diff --git a/lib/Makefile.in b/lib/Makefile.in
index e52e846f7102402a51d3753d195323cf7007ad15..54e8e25fad43095ad65adaf6acc025d1581998e9 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8c from Makefile.am.
+# Makefile.in generated by automake 1.8d from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -366,7 +366,7 @@ distdir: $(DISTFILES)
            || exit 1; \
          fi; \
        done
-       list='$(SUBDIRS)'; for subdir in $$list; do \
+       list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
          if test "$$subdir" = .; then :; else \
            test -d "$(distdir)/$$subdir" \
            || $(mkdir_p) "$(distdir)/$$subdir" \
@@ -468,7 +468,7 @@ uninstall-info: uninstall-info-recursive
        clean clean-generic clean-recursive ctags ctags-recursive \
        distclean distclean-generic distclean-recursive distclean-tags \
        distdir dvi dvi-am html html-am info info-am install \
-       install-am install-data install-data-am \
+       install-am install-data install-data-am install-data-hook \
        install-dist_pkgvdataDATA install-dist_scriptDATA install-exec \
        install-exec-am install-info install-info-am install-man \
        install-strip installcheck installcheck-am installcheck-local \

diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index 931b3d402bb7e453e769ba22e13cf5da03d01cda..d209d752bab6849a56beb5a035545cb64317ff45 100644 (file)
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8c from Makefile.am.
+# Makefile.in generated by automake 1.8d from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 864279215629807a93e53f489da9c75b359969b8..5f779a9341a8a51d4a2c79678905870e8edd646e 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8c from Makefile.am.
+# Makefile.in generated by automake 1.8d from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

diff --git a/m4/amversion.m4 b/m4/amversion.m4
index 654b38351cf08d30e36a70142de24554000f38a0..acc9858e9e3678130b26b9734e47943b674a0e1a 100644 (file)
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -20,11 +20,11 @@
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8c"])
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8d"])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-        [AM_AUTOMAKE_VERSION([1.8c])])
+        [AM_AUTOMAKE_VERSION([1.8d])])

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 5fb7e4d027d832171ece853337ca7d81fdc6d023..3d8e5c31685a9dc5710f56b8eee560792b595770 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8c from Makefile.am.
+# Makefile.in generated by automake 1.8d from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,