merge from guile master

Had to fix up .gitignore for some conflicts.

diff --cc .gitignore
index 4dde2cb,a122176..64a1a40
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -68,4 -68,5 +68,6 @@@ guile-procedures.tx
  guile-config/guile-config
  guile-readline/guile-readline-config.h
  guile-readline/guile-readline-config.h.in
 +*.go
+ TAGS
+ guile-1.8.pc

diff --cc Makefile.am
Simple merge

diff --cc configure.in
index 876e49c,fcccb20..2674d69
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -1469,18 -1553,9 +1555,19 @@@ AC_CONFIG_FILES(
    srfi/Makefile
    test-suite/Makefile
    test-suite/standalone/Makefile
 +  src/Makefile
 +  module/Makefile
 +  module/system/Makefile
 +  module/system/base/Makefile
 +  module/system/vm/Makefile
 +  module/system/il/Makefile
 +  module/system/repl/Makefile
 +  module/language/Makefile
 +  module/language/scheme/Makefile
 +  testsuite/Makefile
  ])
  
+ AC_CONFIG_FILES([guile-1.8.pc])
  AC_CONFIG_FILES([check-guile], [chmod +x check-guile])
  AC_CONFIG_FILES([benchmark-guile], [chmod +x benchmark-guile])
  AC_CONFIG_FILES([guile-tools], [chmod +x guile-tools])

diff --cc doc/Makefile.am
Simple merge

diff --cc libguile/Makefile.am
index 0f91cbc,579ae89..92a33ee
--- 1/libguile/Makefile.am
--- 2/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@@ -75,9 -83,9 +83,9 @@@ guile_filter_doc_snarfage_SOURCES = c-t
  ## For some reason, OBJEXT does not include the dot
  c-tokenize.$(OBJEXT): c-tokenize.c
        if [ "$(cross_compiling)" = "yes" ]; then \
-               $(CC_FOR_BUILD) $(DEFS) $(INCLUDES) -c -o $@ $<; \
+               $(CC_FOR_BUILD) $(DEFS) $(AM_CPPFLAGS) -c -o $@ $<; \
        else \
 -              $(COMPILE) -c -o $@ $<; \
 +              $(filter-out -Werror,$(COMPILE)) -c -o $@ $<; \
        fi
  
  ## Override default rule; this should run on BUILD host.