* configure.ac, NEWS: Bump version to 1.8.
diff --git a/ChangeLog b/ChangeLog
index bc4c374..f4d1030 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2003-12-10  Alexandre Duret-Lutz  <adl@gnu.org>
 
+	* configure.ac, NEWS: Bump version to 1.8.
+
 	* lib/texinfo.tex: New upstream version.
 
 	* Makefile.am (INSTALL): Copy the source from $(srcdir).
diff --git a/Makefile.in b/Makefile.in
index e1e3956..c1e3703 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7i from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -37,7 +37,8 @@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
-	ChangeLog INSTALL NEWS THANKS TODO configure configure.ac
+	ChangeLog INSTALL NEWS THANKS TODO configure configure.ac \
+	texinfo.tex
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \
 	$(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/init.m4 \
diff --git a/NEWS b/NEWS
index 905b6d4..bac361f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-New in 1.7i:
+New in 1.8:
 
 * Meta-News
 
diff --git a/aclocal.m4 b/aclocal.m4
index 16f3905..de3622f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.7i -*- Autoconf -*-
+# generated automatically by aclocal 1.8 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
diff --git a/configure b/configure
index e443a2b..0f879f2 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for GNU Automake 1.7i.
+# Generated by GNU Autoconf 2.59 for GNU Automake 1.8.
 #
 # Report bugs to <bug-automake@gnu.org>.
 #
@@ -269,8 +269,8 @@
 # Identity of this package.
 PACKAGE_NAME='GNU Automake'
 PACKAGE_TARNAME='automake'
-PACKAGE_VERSION='1.7i'
-PACKAGE_STRING='GNU Automake 1.7i'
+PACKAGE_VERSION='1.8'
+PACKAGE_STRING='GNU Automake 1.8'
 PACKAGE_BUGREPORT='bug-automake@gnu.org'
 
 ac_unique_file="automake.in"
@@ -723,7 +723,7 @@
   # 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.7i to adapt to many kinds of systems.
+\`configure' configures GNU Automake 1.8 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -788,7 +788,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU Automake 1.7i:";;
+     short | recursive ) echo "Configuration of GNU Automake 1.8:";;
    esac
   cat <<\_ACEOF
 
@@ -888,7 +888,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-GNU Automake configure 1.7i
+GNU Automake configure 1.8
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -902,7 +902,7 @@
 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.7i, which was
+It was created by GNU Automake $as_me 1.8, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1304,7 +1304,7 @@
 # bothered by `missing'.
 am_AUTOCONF=${AUTOCONF-autoconf}
 
-am__api_version="1.7i"
+am__api_version="1.8"
 # 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:
@@ -1572,7 +1572,7 @@
 
 # Define the identity of the package.
  PACKAGE='automake'
- VERSION='1.7i'
+ VERSION='1.8'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2360,7 +2360,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by GNU Automake $as_me 1.7i, which was
+This file was extended by GNU Automake $as_me 1.8, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2415,7 +2415,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-GNU Automake config.status 1.7i
+GNU Automake config.status 1.8
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index d9270c8..959679f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@
 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.7i], [bug-automake@gnu.org])
+AC_INIT([GNU Automake], [1.8], [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 d9ea205..f3b0b78 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7i from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/doc/stamp-vti b/doc/stamp-vti
index 89ba196..429a207 100644
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
 @set UPDATED 9 December 2003
 @set UPDATED-MONTH December 2003
-@set EDITION 1.7i
-@set VERSION 1.7i
+@set EDITION 1.8
+@set VERSION 1.8
diff --git a/doc/version.texi b/doc/version.texi
index 89ba196..429a207 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
 @set UPDATED 9 December 2003
 @set UPDATED-MONTH December 2003
-@set EDITION 1.7i
-@set VERSION 1.7i
+@set EDITION 1.8
+@set VERSION 1.8
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index dee4749..674e25f 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7i from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 9d9c35a..10ca2dd 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7i from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 420198e..c180598 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7i from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index ac7e792..fdd0ae6 100644
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7i from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 39bce61..abaa6e0 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7i from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index bfa4152..307de7a 100644
--- 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.7i"])
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
 
 # 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.7i])])
+	 [AM_AUTOMAKE_VERSION([1.8])])
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 6ff203c..26a999f 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7i from Makefile.am.
+# Makefile.in generated by automake 1.8 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003