Changes from arch/CVS synchronization

diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog
index 9d03408..0db6fcb 100644 (file)
--- a/ice-9/ChangeLog
+++ b/ice-9/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-09  Ludovic Courtès  <ludovic.courtes@laas.fr>
+
+       * Makefile.am (ice9_sources): Added `i18n.scm'.
+
 2007-01-31  Ludovic Courtès  <ludovic.courtes@laas.fr>
 
        * i18n.scm: Use `(ice-9 optargs)'.  Don't export `LC_*_MASK'

diff --git a/ice-9/Makefile.am b/ice-9/Makefile.am
index 0eb1ac8..454b117 100644 (file)
--- a/ice-9/Makefile.am
+++ b/ice-9/Makefile.am
@@ -24,18 +24,19 @@ AUTOMAKE_OPTIONS = gnu
 SUBDIRS = debugger debugging
 
 # These should be installed and distributed.
-ice9_sources =                                                            \
-       and-let-star.scm boot-9.scm calling.scm common-list.scm            \
-       debug.scm debugger.scm documentation.scm emacs.scm expect.scm      \
-       format.scm getopt-long.scm hcons.scm lineio.scm ls.scm mapping.scm \
-       match.scm networking.scm null.scm optargs.scm poe.scm popen.scm    \
-       posix.scm psyntax.pp psyntax.ss q.scm r4rs.scm r5rs.scm            \
-       rdelim.scm receive.scm regex.scm runq.scm rw.scm                   \
-       safe-r5rs.scm safe.scm session.scm slib.scm stack-catch.scm        \
-       streams.scm string-fun.scm syncase.scm threads.scm                 \
-       buffered-input.scm time.scm history.scm channel.scm                \
-        pretty-print.scm ftw.scm gap-buffer.scm occam-channel.scm         \
-       weak-vector.scm deprecated.scm list.scm serialize.scm              \
+ice9_sources =                                                         \
+       and-let-star.scm boot-9.scm calling.scm common-list.scm         \
+       debug.scm debugger.scm documentation.scm emacs.scm expect.scm   \
+       format.scm getopt-long.scm hcons.scm i18n.scm                   \
+       lineio.scm ls.scm mapping.scm                                   \
+       match.scm networking.scm null.scm optargs.scm poe.scm popen.scm \
+       posix.scm psyntax.pp psyntax.ss q.scm r4rs.scm r5rs.scm         \
+       rdelim.scm receive.scm regex.scm runq.scm rw.scm                \
+       safe-r5rs.scm safe.scm session.scm slib.scm stack-catch.scm     \
+       streams.scm string-fun.scm syncase.scm threads.scm              \
+       buffered-input.scm time.scm history.scm channel.scm             \
+        pretty-print.scm ftw.scm gap-buffer.scm occam-channel.scm      \
+       weak-vector.scm deprecated.scm list.scm serialize.scm           \
        gds-client.scm gds-server.scm
 
 subpkgdatadir = $(pkgdatadir)/${GUILE_EFFECTIVE_VERSION}/ice-9