Merge branch 'syncase-in-boot-9'
authorAndy Wingo <wingo@pobox.com>
Fri, 29 May 2009 14:01:43 +0000 (16:01 +0200)
committerAndy Wingo <wingo@pobox.com>
Fri, 29 May 2009 14:01:43 +0000 (16:01 +0200)
Conflicts:
module/Makefile.am

1  2 
libguile/read.c
module/Makefile.am
test-suite/Makefile.am
test-suite/tests/reader.test

diff --cc libguile/read.c
Simple merge
@@@ -53,9 -46,9 +46,10 @@@ SOURCES =                                                            
                                                                        \
    $(ICE_9_SOURCES)                                                    \
    $(SRFI_SOURCES)                                                     \
 +  $(RNRS_SOURCES)                                                     \
    $(OOP_SOURCES)                                                      \
-                                                                       \
+   $(SYSTEM_SOURCES)                                                     \
+   $(ECMASCRIPT_LANG_SOURCES)                                          \
    $(SCRIPTS_SOURCES)
  
  ## test.scm is not currently installed.
Simple merge
Simple merge