More merge fixes for pucked builds.

Disable default plugins by default.
Restore debian-clean targets in {src,doc}/Makefile.in.
Punt -Werror.

diff --git a/doc/Makefile.in b/doc/Makefile.in
index d3a6eee91f2fb73e080e56fb2489ece6209ac84c..409c6bacbd21b2b3d21ef0fcfc4953c5a5366b1c 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -129,6 +129,7 @@ install-info-gz install-info: $(PROJECT).info
 
 debian-clean:
        rm -f $(DESTDIR)$(infodir)/dir*
+       rm -f $(DESTDIR)$(docdir)/plugins.scm
 
 $(PROJECT).info: $(PROJECT).info.in
        sed -e 's|@SCMDOCDIR@|$(docdir)|g' < $< > $@

diff --git a/src/Makefile.in b/src/Makefile.in
index 74212d59a97979b558f35afc022bc5ba400b2986..22c8b2668e487919c33faef8b456eb6112770284 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -577,6 +577,10 @@ clean-boot-root:
        rm -rf boot-root
        rm -f stamp_*
 
+.PHONY: debian-clean
+debian-clean:
+       rm -f $(DESTDIR)$(AUXDIR)/plugins.scm
+
 .PHONY: tags TAGS
 tags TAGS:
        $(top_srcdir)/Tags.sh $(SUBDIRS)

diff --git a/src/configure.ac b/src/configure.ac
index 1f62e6c2c481351f4db8d0f1663ae1227f832596..c0bfcc4ccb5aebb2269b824686771372e784630a 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -102,8 +102,8 @@ AC_ARG_WITH([scheme-build],
 
 AC_ARG_ENABLE([default-plugins],
     AS_HELP_STRING([--enable-default-plugins],
-       [Enable default plugins [[yes]]]))
-: ${enable_default_plugins=yes}
+       [Enable default plugins [[no]]]))
+: ${enable_default_plugins=no}
 
 AC_ARG_ENABLE([x11],
     AS_HELP_STRING([--enable-x11],

diff --git a/src/microcode/configure.ac b/src/microcode/configure.ac
index 1384c49bdc871a921a0087a0bd4c25c81c7a0d70..fcee7f2aeb868d01893b6fd7ac5cb46d8cef3cbf 100644 (file)
--- a/src/microcode/configure.ac
+++ b/src/microcode/configure.ac
@@ -219,7 +219,7 @@ if test x"${GCC}" = xyes; then
        CFLAGS="-O0 -g ${CFLAGS}"
        LDFLAGS="${LDFLAGS} -g"
     fi
-    CFLAGS_WERROR=-Werror
+    dnl CFLAGS_WERROR=-Werror
 
     for flag in \
        -frounding-math \