* configure.in:  Display a banner to remind users that this is
an ex-branch.
diff --git a/ChangeLog b/ChangeLog
index 0113b8b..2f08519 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-24  Gary V. Vaughan  <gary@gnu.org>
+
+	* configure.in:  Display a banner to remind users that this is
+	an ex-branch.
+	
 2000-06-04  Mark Mitchell  <mark@codesourcery.com>
 
 	* ltcf-c.sh (archive_cmds, archive_expsym_cmds) [solaris,
@@ -82,7 +87,7 @@
 	newer config.guess in addition to older /unixware*/.  Use
 	compiler driver, not linker, for linking shared libraries.
 			
-2001-04-24  Gary V. Vaughan  <gvv@techie.com>
+2001-04-24  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltdl.m4 (AC_C_INLINE): No longer required.
 	* libltdl/ltdl.c (strdup, strcmp, strchr, strrchr, memcpy, trim,
@@ -103,7 +108,7 @@
 	"output_verbose_link_cmd" to better conform to libtool naming
 	conventions.
 
-2001-04-24  Gary V. Vaughan  <gvv@techie.com>
+2001-04-24  Gary V. Vaughan  <gary@gnu.org>
 
 	From Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>
 	* tests/Makefile.am (TESTS_ENVIRONMENT): Make sure the *.test
@@ -115,7 +120,7 @@
 	* libltdl/ltdl.c (lt_dlexit): Quit loop if only resident modules
 	are left.
 	
-2001-04-23  Gary V. Vaughan  <gvv@techie.com>
+2001-04-23  Gary V. Vaughan  <gary@gnu.org>
 
 	From Albert Chin-A-Young <china@thewrittenword.com>
 	* ltmain.in:  `test -L' is not portable, and infact breaks uninstall
@@ -141,7 +146,7 @@
 	if the variable was not set with `=' earlier.  `+=' was not useful
 	here anyway.
 
-2001-04-22  Gary V. Vaughan  <gvv@techie.com>
+2001-04-22  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltdl.m4 (AC_CHECK_HEADERS): UW7 has sys/dl.h, so we must
 	check for that here.
@@ -153,7 +158,7 @@
 	various releases of UnixWare and OpenServer that support it.
 	Reported by Matthew Schalit <mschalit@pacbell.net>
 
-2001-04-21  Gary V. Vaughan  <gvv@techie.com>
+2001-04-21  Gary V. Vaughan  <gary@gnu.org>
 
 	* TODO:  propose pkg-config merge.
 
@@ -217,7 +222,7 @@
 	* ltcf-cxx.sh (archive_expsym_cmds, osf4/osf5):  Added support
 	for cxx	under Compaq Tru64.
 
-2001-04-08  Gary V. Vaughan  <gvv@techie.com>
+2001-04-08  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltcf-c.sh (hardcode_libdir_flag_spec, osf4/osf5): Use ${wl}
 	to pass -rpath when compiling with gcc.
@@ -239,7 +244,7 @@
 
 	* ltmain.in: Improve check for valid -version-info parameter.
 
-2001-04-08  Gary V. Vaughan  <gvv@techie.com>
+2001-04-08  Gary V. Vaughan  <gary@gnu.org>
 
 	From Nick Hudson  <skrll@netbsd.org>
 	* doc/Makefile.am (libtool_TEXINFOS): Add fdl.texi so that it
@@ -256,7 +261,7 @@
 	match_pattern that does pattern matching on filenames...
 	* libtool.m4: ...use it with NetBSD
 
-2001-04-05  Gary V. Vaughan  <gvv@techie.com>
+2001-04-05  Gary V. Vaughan  <gary@gnu.org>
 
 	* doc/libtool.texi (Multiple dependencies): A note about the
 	problems I've reintroduced by reverting the my patch of 2001-03-31.
@@ -309,7 +314,7 @@
 	Darwin. One of them was misplaced. Added version_type case for
 	Rhapsody and Darwin, named "darwin".
 
-2001-03-31  Gary V. Vaughan  <gvv@techie.com>
+2001-03-31  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltmain.in: Remove the code for stripping duplicate deplibs
 	from libtool link lines -- duplicates are somtimes necessary
@@ -377,12 +382,12 @@
 
 	* ltmain.in (clean): Automatically remove $objdir (usually '.libs').
 
-2001-03-08  Gary V. Vaughan  <gvv@techie.com>
+2001-03-08  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltconfig.in (library_names_spec): Undo latin-1 spaces I pasted
 	in yesterday by mistake.
 	
-2001-03-07  Gary V. Vaughan  <gvv@techie.com>
+2001-03-07  Gary V. Vaughan  <gary@gnu.org>
 	
 	From Tor Lillqvist <tml@iki.fi>
 	* ltcf-c.sh, ltcf-gcj.sh (export_symbols): On Windows, if the
@@ -404,13 +409,13 @@
 
 	* ltcf-cxx.sh (archive_cmds) [HP-UX, GCC]: Port.
 
-2001-03-06  Gary Vaughan  <gvv@techie.com>
+2001-03-06  Gary Vaughan  <gary@gnu.org>
 
 	From Albert Chin-A-Young <china@thewrittenword.com>
 	* libtool.m4: Apply missing m4 quotes that were originally applied to
 	HEAD branch only.
 	
-2001-03-05  Gary Vaughan  <gvv@techie.com>
+2001-03-05  Gary Vaughan  <gary@gnu.org>
 
 	* NEWS: Updated.
 	* doc/libtool.texi (Thread Safety in libltdl): New node describing
@@ -469,7 +474,7 @@
 	sentences to describe how piecewise linking is done
 	for shared objects by creating reloadable object files.
 
-2001-02-20  Gary Vaughan  <gvv@techie.com>
+2001-02-20  Gary Vaughan  <gary@gnu.org>
 
 	* libltdl/ltdl.c (lt_dlcaller_register): dont set an unsigned
 	type to a negative number.
@@ -522,14 +527,14 @@
 
 	* ltcf-cxx.sh: Eliminated setting LD to $CC
 
-2001-02-05  Gary V. Vaughan  <gvv@techie.com>
+2001-02-05  Gary V. Vaughan  <gary@gnu.org>
 
 	From Nick Hudson <skrll@netbsd.org>
 	* ltdl.m4 (AC_LTDL_SYS_DLOPEN_DEPLIBS): netbsd* is able to
 	automatically load module deplibs without assistance from
 	libltdl.
 
-2001-02-02  Gary V. Vaughan  <gvv@techie.com>
+2001-02-02  Gary V. Vaughan  <gary@gnu.org>
 
 	* libltdl/ltdl.c (load_deplibs): Make sure the depcount is reset,
 	even when deplibs are not used because of the patch below.
@@ -547,7 +552,7 @@
 
 	* AUTHORS: added myself to the list of maintainers.
 
-2001-01-31  Gary V. Vaughan  <gvv@techie.com>
+2001-01-31  Gary V. Vaughan  <gary@gnu.org>
 
 	* libltdl/ltdl.c (load_deplibs): If loading a deplib fails,
 	don't sweat -- it may be a lib that is already statically linked
@@ -592,14 +597,14 @@
 	* ltcf-gcj.sh (lt_simple_link_test_code): Remove stray `(0)'.
 	* libtool.m4 (_AC_LIBTOOL_GCJ): Pass $CPPFLAGS on.
 
-2001-01-07  Gary V. Vaughan  <gvv@techie.com>
+2001-01-07  Gary V. Vaughan  <gary@gnu.org>
 
 	* NEWS: Updated.
 	* doc/libtool.texi (User defined module data): Updated.
 	* libltdl/ltdl.c (lt_dlhandle_next): New function.
 	* libltdl/ltdl.h (lt_dlhandle_next): Prototypes.
 
-2001-01-05  Gary V. Vaughan  <gvv@techie.com>
+2001-01-05  Gary V. Vaughan  <gary@gnu.org>
 
 	* NEWS: Updated.
 	* doc/libtool.texi (User defined module data):  Document it all.
@@ -617,7 +622,7 @@
 	* ltdl.h (lt_dlcaller_register, lt_dlcaller_set_data,
 	lt_dlcaller_get_data): Prototyped.
 
-2000-12-23  Gary V. Vaughan  <gvv@techie.com>
+2000-12-23  Gary V. Vaughan  <gary@gnu.org>
 
 	From vvv@vsu.ru:
 	* doc/fdl.texi (GNU Free Documentation License): contained @bye
@@ -634,7 +639,7 @@
 
 	* libtool.m4 (OSF/1):  Revert my patch of 2000-12-16.
 
-2000-12-20  Gary V. Vaughan  <gvv@techie.com>
+2000-12-20  Gary V. Vaughan  <gary@gnu.org>
 
 	* libltdl/ltdl.c (lt_dlexit): Was checking for residency of the
 	wrong module.
@@ -651,7 +656,7 @@
 	compiler on a Tru64 machine.
 	* ltcf-cxx.sh (OSF/1): ditto.
 
-2000-12-16  Gary V. Vaughan  <gvv@techie.com>
+2000-12-16  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltcf-c.sh (archive_cmds): And another one.  Use test instead of
 	`['.
@@ -673,7 +678,7 @@
 	* libtool.m4 (AC_DEPLIBS_CHECK_METHOD): Use the HPUX 10.20
 	methods to check for library dependencies on HPUX 11.
 
-2000-12-16  Gary V. Vaughan  <gvv@techie.com>
+2000-12-16  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltconfig.in (deplibs_check_method, file_magic_cmd,
 	file_magic_test_file): Arghh!  I keep forgetting that this stuff
@@ -731,20 +736,20 @@
 	* libtool.m4:  Don't depend on Autoconf internals:
 	s/ac_cv_prog_gcc/GCC/.
 
-2000-11-29  Gary V. Vaughan  <gvv@techie.com>
+2000-11-29  Gary V. Vaughan  <gary@gnu.org>
 
 	* libltdl/ltdl.h (lt_dlhandle): Rename the wrapped structure
 	to prevent nameclash when used from C++.
 	* libltdl/ltdl.c: Fixed all references.
 
-2000-11-25  Gary V. Vaughan  <gvv@techie.com>
+2000-11-25  Gary V. Vaughan  <gary@gnu.org>
 
 	* libltdl/ltdl.c (lt_dlopen):  Change the default search order
 	for modules.  If the named module has no directory component,
 	always start the search with the user_search_path directories,
 	and then fall back on the current directory only if that fails.
 
-2000-11-20  Gary V. Vaughan  <gvv@techie.com>
+2000-11-20  Gary V. Vaughan  <gary@gnu.org>
 
 	* libltdl/Makefile.am (libltdl_la_LDFLAGS): increment the version
 	number to reflect the breakage of binary compatibility.
@@ -764,7 +769,7 @@
 	* ltmain.in: Some versions of expr respond with "0" if a
 	regexp fails to match.
 
-2000-11-19  Gary V. Vaughan  <gvv@techie.com>
+2000-11-19  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltdl.c: Relegate non-POSIX-compliant symbols (e.g. those
 	ending in ``_t'') to deprecated #define compatibility macros.
@@ -772,12 +777,12 @@
 	and ``LT_'' prefixes are taken from the global namespace.
 	* ltdl.h: ditto.
 
-2000-11-17  Gary V. Vaughan  <gvv@techie.com>
+2000-11-17  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltdl.c: Reformatted.
 	* ltdl.h: ditto.
 
-2000-11-11  Gary V. Vaughan  <gvv@techie.com>
+2000-11-11  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltdl.m4, ltcf-c.sh, libtool.m4: Use $ac_ext and $ac_objext
 	respectively for conftest sources and objects.
@@ -801,7 +806,7 @@
 	(AM_DISABLE_SHARED, AM_DISABLE_STATIC, AM_PROG_LD, AM_PROG_NM):
 	Don't use indir when useless.  Don't add trailing `dnl' either.
 
-2000-10-30  Gary V. Vaughan  <gvv@techie.com>
+2000-10-30  Gary V. Vaughan  <gary@gnu.org>
 
 	* doc/libtool.texi:  Corrected another attack of CRLF line
 	endings.
@@ -827,7 +832,7 @@
 	* libtool.m4 (AC_LIBTOOL_CXX, AC_LIBTOOL_GCJ): Pass LD down to
 	ltconfig.
 
-2000-10-02  Gary V. Vaughan  <gvv@techie.com>
+2000-10-02  Gary V. Vaughan  <gary@gnu.org>
 
 	From Bruce Korb <bkorb@cruzio.com>
 	* ltmain.in (execute_dlfiles): Reduce obfuscation.
@@ -842,7 +847,7 @@
 	'${OBJDUMP}'; Solaris' /bin/sh loses with `}' in cache files.
 	(ac_cv_path_MAGIC_CMD): Renamed to lt_cv_path_MAGIC_CMD.
 
-2000-09-28  Gary V. Vaughan  <gvv@techie.com>
+2000-09-28  Gary V. Vaughan  <gary@gnu.org>
 
 	* libtool.m4 (MAGIC_CMD): Don't use MAGIC, since BSD versions of
 	the file command use this environment variable to hold the
@@ -863,13 +868,13 @@
 	* ltcf-cxx.sh (netbsd): Improved support.
 	* ltconfig.in (netbsd): ditto.
 
-2000-09-15  Gary V. Vaughan  <gvv@techie.com>
+2000-09-15  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltmain.in (version_type): Use "-iface" as the windows
 	versioning scheme, where iface is the number of the oldest
 	interface supported.
 
-2000-09-14  Gary V. Vaughan  <gvv@techie.com>
+2000-09-14  Gary V. Vaughan  <gary@gnu.org>
 
 	From Paul Sokolovsky <Paul.Sokolovsky@technologist.com>
 	* libtool.m4 (pw32): Initial support for pw32, assuming that
@@ -1003,7 +1008,7 @@
 	* ltconfig.in: Add back ranlib calls for static libraries if there
 	is a ranlib.
 
-2000-08-31  Gary V. Vaughan  <gvv@techie.com>
+2000-08-31  Gary V. Vaughan  <gary@gnu.org>
 
 	sh.test was failing unnecessarily.
 
@@ -1017,7 +1022,7 @@
 	libtool in their own CVS repository.
 	Reported by Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
 
-2000-08-27  Gary V. Vaughan  <gvv@techie.com>
+2000-08-27  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltconfig.in (with_gcc):  Make the value of this option
 	available to the generated libtool script.
@@ -1192,7 +1197,7 @@
 	Reported by Stephan Kulow <coolo@kde.org> and Michael Matz
 	<matz@ifh.de>
 
-2000-05-30  Gary V. Vaughan  <gvv@techie.com>
+2000-05-30  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltconfig.in (ORIGINAL_CONFIG_SHELL): Prevent lossage when
 	the echo probing code falls into this branch without setting
@@ -1203,7 +1208,7 @@
 	* ltcf-gcj.sh (netbsd*): ditto.
 	From Keisuke Inoue <keisuke@csl.sony.co.jp>
 
-2000-05-29  Gary V. Vaughan  <gvv@techie.com>
+2000-05-29  Gary V. Vaughan  <gary@gnu.org>
 
 	* libtool.m4 (netbsd*): Use -L option to file_magic_cmd as for
 	freebsd (below).
@@ -1217,7 +1222,7 @@
 	rather than regular files.  Adding -L tells the file program
 	to follow the symlink.
 
-2000-05-29  Gary V. Vaughan  <gvv@techie.com>
+2000-05-29  Gary V. Vaughan  <gary@gnu.org>
 
 	* libtool.m4 (i*86-*-freebsd*): Forgot to changequote(,).
 
@@ -1235,7 +1240,7 @@
 	* ltcf-c.sh: ditto.
 	* ltcf-gcj.sh: ditto.
 
-2000-05-29  Gary V. Vaughan  <gvv@techie.com>
+2000-05-29  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltconfig.in (echo): The following code actually prints the
 	double quotes -- so I removed them:
@@ -1266,7 +1271,7 @@
 	* tests/suffix.test: Corrected typo in error message, and improved
 	the message.
 
-2000-05-27  Gary V. Vaughan  <gvv@techie.com>
+2000-05-27  Gary V. Vaughan  <gary@gnu.org>
 
 	* README-alpha: note new location of config.(guess|sub).
 
diff --git a/ChangeLog.0 b/ChangeLog.0
index 2424f89..5b6b557 100644
--- a/ChangeLog.0
+++ b/ChangeLog.0
@@ -273,7 +273,7 @@
 	* mdemo/configure.in: use AC_LIBLTDL_CONVENIENCE
 	* mdemo/Makefile.am: refer to @LIBLTDL@
 
-1999-03-09  Gary V. Vaughan <gvaughan@oranda.demon.co.uk>
+1999-03-09  Gary V. Vaughan <gary@gnu.org>
 
 	* NEWS: updated.
 
@@ -396,7 +396,7 @@
 	only on FreeBSD and when not static linking; it's been causing
 	trouble on platforms such as OpenBSD.
 
-1999-02-26  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1999-02-26  Gary V. Vaughan  <gary@gnu.org>
 
 	* libtool.m4 (cygwin): s/\\(mingw\\|cygwin\\)32/\\1/g.  Must've
 	missed this file when I changed to cygnus' new sanction name.
@@ -514,7 +514,7 @@
 	* libltdl/ltdl.c (lt_dlopen): use newhandle instead of handle
 	where appropriate, when dlopening a non-libtool library
 
-1999-02-19  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1999-02-19  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltconfig.in (export_symbols_cmds): renamed from
 	export_symbols_cmd.
@@ -545,7 +545,7 @@
 	alternate name without ${release}, otherwise build fails when
 	-release is used
 
-1999-02-18  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1999-02-18  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltconfig.in (archive{,_sym}_commands): Be careful not to
 	re-export the dll entry points DllMain@12, _cygwin_dll_entry@12 and
@@ -610,7 +610,7 @@
 	* mdemo/configure.in: use AC_LIBTOOL_DLOPEN
 	* mdemo/main.c: demonstrate lt_dlopen(0)
 	  	  
-1999-02-15  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1999-02-15  Gary V. Vaughan  <gary@gnu.org>
 
 	* demo/dlmain.c (_WIN32): The lt_symlist structure is now const,
 	so my original horrible temporary win32 hack no longer worked.
@@ -648,7 +648,7 @@
 	* ltmain.in: allow -export-symbols for modules, use thread_safe flag,
 	  add include_expsyms to the exported symbols
 
-1999-02-12  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1999-02-12  Gary V. Vaughan  <gary@gnu.org>
 
 	* libltdl/ltdl.h (_LTDLL_EXTERN): libltdl is no longer linked as a
 	shared library, so the _declspec's were preventing the linker from
@@ -740,7 +740,7 @@
 	* libltdl/ltdl.c (lt_dlopenext): tmp would be trashed if shlib_ext
  	was longer than 3 characters
 
-1999-02-02  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1999-02-02  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltconfig.in: new config.guess returns *-*-cygwin now instead of
 	*-*-cygwin32.  sed -e 's%\(cygwin\|mingw\)32%\1%g' ltconfig.in
@@ -752,7 +752,7 @@
 	yes' implies gnu ld, otherwise MSVC++ (which I haven't tested
 	since I inheritted the code from Ian Lance Taylor btw!) is implied.
 	
-1999-01-28  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1999-01-28  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltmain.in: Reverted this change of Alexandre's from the
 	1999-01-25; "don't try to use .o instead of .lo just because
@@ -770,7 +770,7 @@
 	AM_PROG_LIBTOOL
 	Reported by Jeff Garzik <jgarzik@pobox.com>
 
-1999-01-27  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1999-01-27  Gary V. Vaughan  <gary@gnu.org>
 
 	* THANKS: Now that we have a policy, applied it to the existing
 	list.  This in no way demeans the work of those people removed
@@ -876,7 +876,7 @@
 	message, and added a warning about inter-library dependencies even 
 	for non-module builds
 
-1999-01-26  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1999-01-26  Gary V. Vaughan  <gary@gnu.org>
 
 	* Makefile.am (install-data-hook): Don't show the if expression
 	that tests for gzip with a conditional error message; just do it
@@ -981,7 +981,7 @@
 	anything about the format of the date, just that it does not
 	contain `$'
 
-1999-01-22  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1999-01-22  Gary V. Vaughan  <gary@gnu.org>
 
 	* configure.in (date): echo the version number during
 	configuration, and show $date for cvs versions.
@@ -1004,7 +1004,7 @@
 	* ltconfig.in, ltmain.in (TIMESTAMP): append timestamp to most
 	references to VERSION
 
-1999-01-22  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1999-01-22  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltmain.in (ild): Revert the change which allowed libtool to
 	link libraries with dependencies on .la libs.
@@ -1037,7 +1037,7 @@
 	* demo/configure.in, demo/Makefile.am (DLPREOPEN): reverted; it
 	didn't make any difference.
 
-1999-01-21  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1999-01-21  Gary V. Vaughan  <gary@gnu.org>
 
 	* THANKS: Added Chris Laas <golem@MIT.EDU>
 	
@@ -1167,7 +1167,7 @@
 
 	* mdemo/main.c (LTDL_PREOPENED_SYMBOLS): remove
 
-1999-01-20  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1999-01-20  Gary V. Vaughan  <gary@gnu.org>
 
 	* TODO: Added inter-library deps for ltlibs.
 
@@ -1224,7 +1224,7 @@
 	flags to LDADD
 	* doc/libtool.texi (Using Automake): how to add -dlopen to LDADD
 
-1999-01-19  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1999-01-19  Gary V. Vaughan  <gary@gnu.org>
 
 	From Andrey Slepuhin <pooh@msu.ru>
 	* ltmain.in (hardcode_action) Oops, misapplied the patch!
@@ -1334,7 +1334,7 @@
 	(find_module) tryall_dlopen old_name first, so that we don't
  	override statically linked symbols with dlopened ones
 
-1999-01-15  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1999-01-15  Gary V. Vaughan  <gary@gnu.org>
 
 	From Andrey Slepuhin <pooh@msu.ru>
 	* libtoolize.in (cd $pkgdatadir): Make sure we return the the
@@ -1381,7 +1381,7 @@
 	* mdemo/Makefile.am: use -export-dynamic until libtool 
 	  and libltdl are able to handle module dependencies
 	  
-1999-01-14  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1999-01-14  Gary V. Vaughan  <gary@gnu.org>
 
 	* THANKS: added Mark Elbrecht.
 	* ltconfig.in (PATH_SEPARATOR): new variable to hold valid $PATH
@@ -1508,7 +1508,7 @@
 	(@DIST_MAKEFILE_LIST@): create subdir if needed, then run
 	configure.
 	On-demand configuration of subdirs at distribution time was
-	suggested by Gary V. Vaughan <gvaughan@oranda.demon.co.uk>
+	suggested by Gary V. Vaughan <gary@gnu.org>
 
 	* libtool.m4, ltconfig.in (NM): search for NM in PATH before
 	/usr/ccs/bin, /usr/ucb and /bin.  However, if the found one isn't
@@ -1565,7 +1565,7 @@
 	* mdemo/configure.in: check only for math.h (string.h is no longer
 	  necessary)
 
-1999-01-12  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1999-01-12  Gary V. Vaughan  <gary@gnu.org>
 
 	* configure.in (ltdl-install): Fixed up the indentation so that
 	`configure --help' is pretty again.
@@ -1659,12 +1659,12 @@
 	  non-libtool modules, dlopen with the flags GLOBAL and NOW
 	* mdemo/main.c: report the error using lt_dlerror()
 	
-1999-01-08  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1999-01-08  Gary V. Vaughan  <gary@gnu.org>
 
 	* doc/libtool.texi (old_archive_from_new_commands): Documented
 	this ltcofig variable.
 
-1999-01-07  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1999-01-07  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltmain.sh (cygwin, allow_undefined): Unfortunately, there are
 	problems with this variable when trying to make a dll which has
@@ -1680,7 +1680,7 @@
 	* libltdl/ltdl.c: assigned copyright to the FSF
 	* libltdl/ltdl.h, mdemo/foo*,main.c: likewise
 	
-1999-01-06  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1999-01-06  Gary V. Vaughan  <gary@gnu.org>
 	
 	* ltmain.in (dllsearchpath): add absolute directory paths to
 	dllsearchpath so that the wrapper scripts can be called from any
@@ -1812,7 +1812,7 @@
 	  USE_DLPREOPEN was defined, integrated shl_load code from GModule
 	  (still untested)
 
-1998-12-24  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1998-12-24  Gary V. Vaughan  <gary@gnu.org>
 
 	* libltdl/configure.in: fixup spacing in --enable-ltdl-install
 	help string so that it lines up nicely for configure --help.
@@ -1853,7 +1853,7 @@
 	* mdemo/Makefile.am (mdemo_debug_LDADD, mdemo_debug_DEPENDENCIES): 
 	use libltdl.la
 
-1998-12-23  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1998-12-23  Gary V. Vaughan  <gary@gnu.org>
 
 	* doc/PLATFORMS: added my cygwin32 box (i686-pc-cygwin32).
 
@@ -1912,7 +1912,7 @@
 	* libltdl/configure.in: warn if dlopen is not supported
 	* mdemo/Makefile.am (mdemo.debug): use libltdls
 
-1998-12-22  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1998-12-22  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltconfig.in: revert Thomas Tanners change to create all
 	libraries without the `lib' prefix on win32, otherwise `gcc foo.c
@@ -1934,7 +1934,7 @@
 	* depdemo/.cvsignore: renamed hell* to depdemo*, added *.lo,*.la
 	* mdemo/.cvsignore: ditto
 	
-1998-12-21  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1998-12-21  Gary V. Vaughan  <gary@gnu.org>
 
 	* libtool.m4 (AM_SYS_NM_PARSE): apparently  __ptr_t is predefined
 	on some systems - use lt_ptr_t instead.
@@ -2006,7 +2006,7 @@
 	  demo), updated the documentation, import sin and cos in main
 	  program rather than linking libfoo1 statically
 
-1998-12-17  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1998-12-17  Gary V. Vaughan  <gary@gnu.org>
 
 	* libtool.m4 (AM_PROG_LIBTOOL): Added AC_PREREQ(2.12) to prevent
 	people using libtool with old autoconfs that don't provide the
@@ -2122,7 +2122,7 @@
 	(*demo/Makefile.in): don't update autoconf/automake files any
 	more; make check is needed
 
-1998-12-14  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1998-12-14  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltconfig.in (archive_cmds): tweaked for cygwin b18->b20.1
 	compatibility and fixed a bug with generating the export
@@ -2152,7 +2152,7 @@
 	* libltdl/Makefile.am (noinst_HEADERS): don't install ltdl.h yet
 	(noinst_LTLIBRARIES): ditto for libltdl.la
 
-1998-12-08  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1998-12-08  Gary V. Vaughan  <gary@gnu.org>
 
 	* README-alpha: adapted the release procedure from
 	  automake/HACKING.
@@ -2198,7 +2198,7 @@
 	* ltmain.in: use sys_lib_search_path, removed extradeplibs
 	(they're not portable)
 	
-1998-12-02  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1998-12-02  Gary V. Vaughan  <gary@gnu.org>
 
 	* libltdl/configure.in: look for string.h or else strings.h, and
 	also check for ANSI strrchr() function.  Fix `undescore before
@@ -2223,7 +2223,7 @@
 	* mdemo/modules/Makefile.am: replaced -export-symbols with 
 	-export-dynamic since it doesn't work for modules
 	
-1998-12-01  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1998-12-01  Gary V. Vaughan  <gary@gnu.org>
 
 	* README: Updated homepage pointer to gnu libtool page.
 
@@ -2246,7 +2246,7 @@
 
 	* config.guess, config.sub: imported from autoconf pre-2.13
 
-1998-11-27  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1998-11-27  Gary V. Vaughan  <gary@gnu.org>
 
 	* libtool (AM_PROG_LD): Oops... we need to know the host_os for
 	the changes below.  I'm not sure whether mingw32 and os2 support
@@ -2401,7 +2401,7 @@
 	* PORTING: new file, with general instructions and inter-library
 	dependencies tips
 
-1998-11-11  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1998-11-11  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltconfig.in: make use of '~' field separator in reload_cmds,
 	old_archive_from_new_cmds, old_archive_cmds, archive_cmds,
@@ -2477,7 +2477,7 @@
 	modules
 	* tests/Makefile.am, tests/mdemo*: added some tests for mdemo
 
-1998-11-04  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
+1998-11-04  Gary V. Vaughan  <gary@gnu.org>
 
 	* demo/configure.in: added AC_EXEEXT macro so that the tests can
 	work on cywin32/mingw32 hosts.  This requires the current CVS
diff --git a/ChangeLog.1 b/ChangeLog.1
index 970f67d..8c453ac 100644
--- a/ChangeLog.1
+++ b/ChangeLog.1
@@ -23,13 +23,13 @@
 
 	* ltconfig.in (linux-gnu*): Set hardcode_into_libs=yes.
 
-1999-11-29  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-11-29  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltconfig.in:  Be friendlier to C++ compilers when testing
 	for dlopen support.
 	Reported by Stephan Kulow <coolo@itm.mu-luebeck.de>
 
-1999-11-26  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-11-26  Gary V. Vaughan  <gary@gnu.org>
 
 	* libtool.m4:  better use of $target instead of $host to support
 	cross compilation.
@@ -76,7 +76,7 @@
 
 	* ltconfig.in: add support for Unixware (sysv4.2uw2*)
 
-1999-10-29  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-10-29  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltmain.in:  Damnit!  Cygwin cvs committed all the
 	dos line endings.
@@ -112,7 +112,7 @@
 	* libltdl/ltdl.c (lt_dlopen): Do not search paths when the
 	specified library is not just a basename.
 
-1999-10-10  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-10-10  Gary V. Vaughan  <gary@gnu.org>
 
 	* libtool.m4 (AC_PATH_FILE): new macro replaces
 	AC_PATH_TOOL_GREP_OUTPUT.
@@ -123,7 +123,7 @@
 	* ltconfig.in (reload_flag): moved to libtool.m4.
 	(deplbs_check_method): ditto.
 
-1999-10-07  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-10-07  Gary V. Vaughan  <gary@gnu.org>
 
 	* libtool.m4 (AC_PATH_PROG_VERSION_GREP): removed in favour of the 
 	more general AC_PATH_PROG_GREP_OUTPUT.
@@ -132,13 +132,13 @@
 	(AC_PROG_LIBTOOL):  Search for a working find program in the
 	user's PATH using the new macros.
 	
-1999-10-06  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-10-06  Gary V. Vaughan  <gary@gnu.org>
 
 	* NEWS: updtaed.
         * ltconfig.in: Accept osf5.
         Reported by Sascha Schumann <sascha@schumann.cx>
 
-1999-10-04  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-10-04  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltmain.in (-no-install):  This doesn't work on win32 since
 	the search path for libraries is not encoded in the binary,
@@ -148,7 +148,7 @@
 	* ltmain.in (-no-fast-install):  Wrapper script used to add the
 	exeext on again when naming the wrapped executable.
 
-1999-10-03  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-10-03  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltconfig.in:  Set $FILE to @FILE@ for substitution with
 	the value found in libtool.m4 at configure time.
@@ -182,7 +182,7 @@
 	* libltdl/Makefile.am: don't preserve file attributes when
 	  installing the libltdl sources
 
-1999-10-01  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-10-01  Gary V. Vaughan  <gary@gnu.org>
 
 	* configure.in (AC_OUTPUT_COMMANDS): generate ltmain.sh
 	* Makefile.am (ltmain.sh ltconfig): removed.  Automake inserts the 
@@ -200,7 +200,7 @@
 	* ltconfig.in (sco3.2v5): use pass_all deplibs_check_method
 	for SCO3.2.
 
-1999-09-29  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-09-29  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltconfig.in (whole-archive-flag-spec):  I had been
 	wondering why my file system was filling up with empty
@@ -221,7 +221,7 @@
 	* ltconfig.in (sysv5): Added support required for shared
 	library linking on SCO UW7.
 
-1999-09-22  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-09-22  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltconfig.in (whole-archive-flag-spec): test whether the
 	version of GNU ld being used understands --whole-archive
@@ -238,7 +238,7 @@
 	* ltmain.in (CDPATH): Likewise.
 	Reported by Greg McGary <gkm@eng.ascend.com>
 
-1999-08-24  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-08-24  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltconfig.in (ltdll.c, impgen.c): Prevent the shell from
 	expanding variables & backslash escapes when writing these
@@ -279,7 +279,7 @@
 	* libltdl/COPYING.LIB: Update to version 2.1.
 	* libltdl/ltdl.h, libltdl/ltdl.c: Update FSF address.
 
-1999-08-03  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-08-03  Gary V. Vaughan  <gary@gnu.org>
 
 	* libtool.m4 (mingw*, AC_PROG_LD): use tr for carriage return
 	stripping.
@@ -353,7 +353,7 @@
 	* ltconfig.in:  Updated bsdi4 soname specs to be more like
 	linux as discussed on the bsdi mailing list.
 
-1999-07-20  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-07-20  Gary V. Vaughan  <gary@gnu.org>
 
 	* configure.in (AC_PROG_RANLIB):  No longer required as we now use
 	AC_CHECK_TOOL in AC_LIBTOOL_SETUP.
@@ -397,7 +397,7 @@
 
 	* doc/libtool.texi (C++ Libraries):  fixed a typo.
 
-1999-07-06  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-07-06  Gary V. Vaughan  <gary@gnu.org>
 
 	* README-alpha:  improved the release instructions to mention
 	actual list addresses for announcements, and urls for upload
@@ -412,7 +412,7 @@
 	* ltconfig.in: finish_cmds for FreeBSD removed
 	* depdemo/l3/Makefile.am: install libl3.la into an extra directory
 
-1999-07-02  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-07-02  Gary V. Vaughan  <gary@gnu.org>
 
 	* configure.in: bumped version to 1.3c.
 
@@ -493,7 +493,7 @@
 	* ltmain.in (ltdll.c): Support for crosscompiling from linux to
 	mingw32.
 
-1999-06-23  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-06-23  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltconfig.in (cygwin, export_symbols_cmds): If there is already
 	an extracted and compiled ltdll.c, then don't delete, reextract
@@ -503,7 +503,7 @@
 	are paths through the code which run archive_expsym_cmds without
 	running export_symbols_cmds.
 
-1999-06-20  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-06-20  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltconfig.in:  moved the test for NM after the test for
 	no_builtin_flag.
@@ -531,13 +531,13 @@
 	* ltconfig.in: CR/LF fix for broken DJGPP bash
 	* ltmain.in: CR/LF fix for DJGPP
 
-1999-06-18  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-06-18  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltmain.in (outputname): When generating the executable wrapper
 	script, $outputname already has the $exeext suffix, so we needn't
 	add it again.
 
-1999-06-16  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-06-16  Gary V. Vaughan  <gary@gnu.org>
 
 	* libltdl/configure.in (ac_cv_lib_dl_dlopen): missing "x" in test
 	comparison corrected.
@@ -551,7 +551,7 @@
 	names passed without an extension, we now add a trailing `.' to
 	prevent this from happening.
 
-1999-06-15  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-06-15  Gary V. Vaughan  <gary@gnu.org>
 
 	* libltdl/ltdl.c (sys_wll_close): Strangely enough, Microsoft have
 	decided that LoadLibrary returns `0' for success, yet FreeLibrary
@@ -582,7 +582,7 @@
 	* NEWS: Note work-around.
 	Reported by Pavel Roskin <pavel_roskin@geocities.com>
 
-1999-06-09  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-06-09  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltconfig.in (exeext): autoconf's AC_EXEEXT uses "no" to indicate
 	no extension, and we must do the same in order to share the cache
@@ -596,7 +596,7 @@
 	* ltconfig.in (exeext): Use quotes in the test, to prevent a 
 	failure in sh.test.
 
-1999-06-09  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-06-09  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltconfig.in: Reordered tests to be more like configure.in's
 	recommended order (programs first, then libraries, etc.).
@@ -615,7 +615,7 @@
 	host.  Also test that the compiler accepts the flag, and cache
 	that result too.
 
-1999-06-08  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-06-08  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltconfig.in (LN_S): Accept, in order of decreasing preference:
 	the cached value; an environment setting; ``ln -s'' if it works;
@@ -769,7 +769,7 @@
 	* ltconfig.in: linkopts -> compiler_flags for $CC and linker_flags
 	  for $LD, link_all_deplibs=yes on IRIX
 
-1999-05-22  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-05-22  Gary V. Vaughan  <gary@gnu.org>
 
 	* NEWS: insert todays date alongside 1.3.1 release.
 	* Makefile.in: use gnu not gnits rules
@@ -796,7 +796,7 @@
 	* doc/PLATFORMS: Updated to 1.3.1 for all platforms I've got.
 	Added sparc-unknown-linux-gnu.
 
-1999-05-21  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-05-21  Gary V. Vaughan  <gary@gnu.org>
 
 	* demo/foo.h: s/PARAMS/LTDL_PARAMS/g
 	* libltdl/ltdl.h: ditto.
@@ -830,19 +830,19 @@
 	* libtool.m4 (AC_LIBLTDL_*): set INCLTDL to the path of ltdl.h
 	* ltconfig.in: check for dlopen with -ldl first
 
-1999-05-19  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-05-19  Gary V. Vaughan  <gary@gnu.org>
 
 	* NEWS: Added 1.3.1 news items.
 	* doc/PLATFORMS: updated the boxes I have access to, to 1.3.1
 	in preparation for the next release.
 
-1999-05-18  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-05-18  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltconfig.in (cygwin*, whole_archive_flag_spec): dlltool chokes
 	on this, so leave it unset in this case so that the ltmain code
 	knows it has to unpack convenience archives by itself.
 
-1999-05-17  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-05-17  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltmain.in: Do not exit when an unknown library name is passed
 	passed in, simply warn and continue since some compilers require
@@ -854,7 +854,7 @@
 	* ltconfig.in: port to NEC UX/4800.
 	* NEWS: updated.
 	
-1999-05-17  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-05-17  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltconfig.in (beos*, deplibs_check_method): set to pass_all.  BeOS
 	is PIC by default.
@@ -882,11 +882,11 @@
 	(instal-data-hook): Add srcdir/instutil to the beginning of the
 	PATH before installing libltdl's sources.
 
-1999-05-09  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-05-09  Gary V. Vaughan  <gary@gnu.org>
 
 	* TODO: updated.
 
-1999-05-06  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-05-06  Gary V. Vaughan  <gary@gnu.org>
 
 	* Makefile.am (install-data-hook):  make sure the install directory
 	is not left world writable.
@@ -906,7 +906,7 @@
 	* ltmain.in: Save exit status of link_command before removing
 	symbol table object file.
 
-1999-04-29  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-04-29  Gary V. Vaughan  <gary@gnu.org>
 
 	* doc/PLATFORMS: updated my hpux-10.20 and cygwin box entries.
 
@@ -931,7 +931,7 @@
 	* libltdl/acconfig.h: New file.  Add #undefs for defines that
 	would be duplicated.
 
-1999-04-29  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-04-29  Gary V. Vaughan  <gary@gnu.org>
 
 	* libtool.m4 (cygwin*|mingw*, DLLTOOL, OBJDUMP, AS): Only expand the
 	code that makes these configure time checks on hosts that need the
@@ -953,7 +953,7 @@
 	(AC_LIBLTDL_CONVENIENCE, AC_LIBLTDL_INSTALLABLE): Fix calls to
 	AC_BEFORE.
 
-1999-04-28  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-04-28  Gary V. Vaughan  <gary@gnu.org>
 
 	* libtool.m4 (ltconfig_enable_win32_dll): pass --enable-win32-dll to
 	ltconfig if this is set.
@@ -1005,7 +1005,7 @@
 	create temporaries in the current directory when output should go
 	elsewhere.  We must perform locking if it does.
 
-1999-04-27  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-04-27  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltmain.in (old_archive_cmds): Ensure that there are always .o
 	objects available before running old_archive_cmds.
@@ -1422,7 +1422,7 @@
 	* ltconfig.in (*_cmds): quote $ so that they're not expanded by
 	the first eval
 
-1999-03-25  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-03-25  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltmain.in ($PATH):  Expand any tildes in the users path to the
 	contents of $HOME to avoid problems with *_cmds splitting and
@@ -1446,7 +1446,7 @@
 
 	* ltconfig.in (ld_shlibs, amigaos*): disable shared libraries
 
-1999-03-23  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-03-23  Gary V. Vaughan  <gary@gnu.org>
 
 	* libltdl/configure.in: the sed expression for finding the shared
 	library extension used to think the . in [.] for the cygwin
@@ -1542,7 +1542,7 @@
 	* tests/Makefile.am (TESTS): added noinst-link.test
 	* doc/libtool.texi: document it
 
-1999-03-19  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-03-19  Gary V. Vaughan  <gary@gnu.org>
 
 	* ltmain.in (dependency_libs): There is no reason to infer that
 	the pseudo library is invalid if dependency_libs='' at
@@ -1599,7 +1599,7 @@
 	  libtool will break ILD, so we ignore it when generating
 	  dependencies.
 	  
-1999-03-17  Gary V. Vaughan  <gary@oranda.demon.co.uk>
+1999-03-17  Gary V. Vaughan  <gary@gnu.org>
 
 	* doc/PLATFORMS: Thanks to Alexandres changes below, both my
 	hp boxes pass the entire test suite.
diff --git a/configure.in b/configure.in
index 58c5aad..88416d6 100644
--- a/configure.in
+++ b/configure.in
@@ -2,16 +2,12 @@
 
 AC_INIT(ltmain.in)
 
-AM_INIT_AUTOMAKE(libtool, 1.4a)
+AM_INIT_AUTOMAKE(libtool, 1.4mlb)
 
 # This is a sanity check so we can see which version is used in bug reports.
 # It is assumed that we only want to see the date extension for cvs libtool
 # versions (i.e. "odd" letters) and not actual alpha releases.
 TIMESTAMP=
-case "$VERSION" in
-changequote(,)
-  *[acegikmoqsuwy]) 
-changequote([,])
     TIMESTAMP=`${CONFIG_SHELL} ${srcdir}/mkstamp < ${srcdir}/ChangeLog`
     banner="Configuring $PACKAGE $VERSION$TIMESTAMP"
     dashes=`echo "$banner" | sed 's/./-/g'`
@@ -22,8 +18,14 @@
     echo "$banner"
     echo $dashes
     echo
-    ;;
-esac    
+
+    # Make sure that users know the branch is dead!
+    banner="This branch is dead.  Please use the HEAD revisions."
+    dashes=`echo "$banner" | sed 's/./-/g'`
+    echo $dashes
+    echo "$banner"
+    echo $dashes
+    echo
 AC_SUBST(TIMESTAMP)
 
 pkgdatadir='${datadir}'"/${PACKAGE}"