Remove changes that weren't in fact needed:

- config.rpath in EXTRA_DIST, in Makefile.am
- dummy definition of AM_INTL_SUBDIR, in acinclude.m4.

ChangeLog

@@ -1,11 +1,5 @@
 2007-02-18  Neil Jerram  <neil@ossau.uklinux.net>
 
-	* acinclude.m4 (AM_INTL_SUBDIR): Remove unnecessary dnl.
-
-	* configure.in: Remove AM_GNU_GETTEXT_VERSION again.
-
-	* Makefile.am (EXTRA_DIST): Add config.rpath.
-
 	* config.rpath (Module): New (from gettext package).
 
 2007-01-31  Ludovic Courtès  <ludovic.courtes@laas.fr>
@@ -15,12 +9,6 @@
 
 2007-01-28  Neil Jerram  <neil@ossau.uklinux.net>
 
-	* configure.in: Do AM_GNU_GETTEXT_VERSION, so that autoreconf will
-	run autopoint.
-
-	* acinclude.m4 (AM_INTL_SUBDIR): Provide dummy definition, to work
-	around current autoconf/automake/gettext bug.
-
 	* INSTALL: New upstream version.
 
 	* ABOUT-NLS: New upstream version.

Makefile.am

@@ -33,7 +33,7 @@ include_HEADERS = libguile.h
 
 # automake sometimes forgets to distribute acconfig.h,
 # apparently depending on the phase of the moon.
-EXTRA_DIST = LICENSE HACKING GUILE-VERSION ANON-CVS SNAPSHOTS BUGS config.rpath
+EXTRA_DIST = LICENSE HACKING GUILE-VERSION ANON-CVS SNAPSHOTS BUGS
 
 TESTS = check-guile
 

acinclude.m4

@@ -308,5 +308,3 @@ else
 fi
 AC_LANG_RESTORE
 ])dnl ACX_PTHREAD
-
-AC_DEFUN([AM_INTL_SUBDIR], [])