Don't use the PLUGIN system to gather information for the

Makefile's distribution and installation targets; just put it all
in the Makefile directly.
* PLUGIN/this.configure (scm_files, aux_files): Remove sections
for these.
* configure.in: Remove code that gets and substitutes scm_files and
aux_files.
* Makefile.in (scm_files, aux_files): Write out the list of files
here, where people expect to find them.

ice-9/Makefile.in

@@ -32,8 +32,24 @@ install_path=$(libdir)/@library_name@
 INSTALL = $(srcdir)/../install-sh -c
 INSTALL_DATA = $(INSTALL) -m 644
 
-scm_files=  @scm_files@
-aux_files = @aux_files@
+scm_files = \
+	boot-9.scm \
+	debug.scm \
+	hcons.scm \
+	lineio.scm \
+	mapping.scm \
+	poe.scm \
+	slib.scm  \
+	tags.scm
+
+aux_files = \
+	.cvsignore \
+	COPYING \
+	ChangeLog \
+	Makefile.in \
+	configure \
+	configure.in
+
 
 all: 
 

ice-9/configure

@@ -1,8 +1,8 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.10 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+# Generated automatically using autoconf version 2.7 
+# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
@@ -330,7 +330,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.10"
+    echo "configure generated by autoconf version 2.7"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -495,9 +495,12 @@ fi
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_cpp='echo $CPP $CPPFLAGS 1>&5;
+$CPP $CPPFLAGS'
+ac_compile='echo ${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5;
+${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
+ac_link='echo ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5;
+${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
 
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
@@ -515,14 +518,10 @@ fi
 
 . $srcdir/../GUILE-VERSION
 
-scm_files=""
-aux_files=""
 . $srcdir/PLUGIN/this.configure
 
 
 
-
-
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -576,7 +575,7 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
 # Protect against shell expansion while executing Makefile rules.
 # Protect against Makefile macro expansion.
 cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
+s%#define \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%-D\1=\2%g
 s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
 s%\[%\\&%g
 s%\]%\\&%g
@@ -611,7 +610,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.10"
+    echo "$CONFIG_STATUS generated by autoconf version 2.7"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -651,8 +650,6 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@scm_files@%$scm_files%g
-s%@aux_files@%$aux_files%g
 s%@library_name@%$library_name%g
 s%@info_files@%$info_files%g
 s%@GUILE_VERSION@%$GUILE_VERSION%g

ice-9/configure.in

@@ -6,11 +6,7 @@ AC_INIT(boot-9.scm)
 
 . $srcdir/../GUILE-VERSION
 
-scm_files=""
-aux_files=""
 . $srcdir/PLUGIN/this.configure
-AC_SUBST(scm_files)
-AC_SUBST(aux_files)
 AC_SUBST(library_name)
 AC_SUBST(info_files)
 AC_SUBST(GUILE_VERSION)