[diff] bootstrapping guile-core with CVS Autoconf

[Lars J. Aas]

This is a minimal diff for those who want to bootstrap guile-core
with Autoconf from CVS.  I'm not suggesting that you apply it since
it will break compatibility with Autoconf 2.13, but I suggest you
include it in the archive for others to apply if they need it.

A diff for the Makefile.am files is also required for using guile-core
with Automake from CVS, but I'll submit that one later when I see
the response to this one...

  Lars J

Index: acinclude.m4
===================================================================
RCS file: /cvs/guile/guile-core/acinclude.m4,v
retrieving revision 1.11
diff -u -r1.11 acinclude.m4
--- acinclude.m4        2000/04/21 14:11:50     1.11
+++ acinclude.m4        2000/11/15 17:32:24
@@ -76,7 +76,7 @@
     which can conflict with char $1(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
-]ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
+]ifelse(AC_CURRENT_LANG, C++, [#ifdef __cplusplus
 extern "C"
 #endif
 ])dnl
Index: configure.in
===================================================================
RCS file: /cvs/guile/guile-core/configure.in,v
retrieving revision 1.124
diff -u -r1.124 configure.in
--- configure.in        2000/10/25 14:45:36     1.124
+++ configure.in        2000/11/15 17:32:27
@@ -22,6 +22,7 @@
 
 AC_INIT(Makefile.in)
 . $srcdir/GUILE-VERSION
+AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
 AM_MAINTAINER_MODE
 AM_CONFIG_HEADER(libguile/scmconfig.h)
@@ -114,7 +115,7 @@
 AC_MINIX
 
 AM_PROG_CC_STDC
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 
 AC_C_CONST
 AC_C_INLINE
@@ -331,7 +332,7 @@
 #include <sys/stat.h>], [struct stat s; s.st_blocks;],
 ac_cv_struct_st_blocks=yes, ac_cv_struct_st_blocks=no)])
 if test $ac_cv_struct_st_blocks = yes; then
-  AC_DEFINE(HAVE_ST_BLOCKS)
+  AC_DEFINE(HAVE_ST_BLOCKS, , [define if stat::st_blocks is available])
 fi
 
 AC_CACHE_CHECK([for S_ISLNK in sys/stat.h], ac_cv_macro_S_ISLNK,
Index: guile-readline/configure.in
===================================================================
RCS file: /cvs/guile/guile-core/guile-readline/configure.in,v
retrieving revision 1.10
diff -u -r1.10 configure.in
--- guile-readline/configure.in 2000/09/17 21:16:18     1.10
+++ guile-readline/configure.in 2000/11/15 17:32:29
@@ -1,11 +1,12 @@
 AC_INIT(readline.c)
 . $srcdir/../GUILE-VERSION
 PACKAGE=guile-readline
+AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
 
 AC_PROG_CC
 AM_PROG_CC_STDC
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
 
 for termlib in ncurses curses termcap terminfo termlib ; do
    AC_CHECK_LIB(${termlib}, tgoto,