Changes from arch/CVS synchronization

13 files changed, 90 insertions, 48 deletions

diff --git a/ChangeLog b/ChangeLog
index 98004862c..564e18c27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,24 @@
 2007-07-29  Ludovic Courtès  <ludo@gnu.org>
 
+	Added Gnulib support.
+
+	* autogen.sh: Run `gnulib-tool --update'.
+
+	* Makefile.am (SUBDIRS): Added `lib'.
+	(ACLOCAL_AMFLAGS): Added `-I m4'.
+
+	* NEWS: Comply with Automake's `check-news' option, i.e., have
+	the last "Changes in" line appear within the first 15 lines.
+	Mention use of Gnulib.
+
 	* configure.in: Use `build-aux' as `AC_CONFIG_AUX_DIR', and `m4'
 	as `AC_CONFIG_MACRO_DIR'.  Use Automake's `gnu' and `check-news'
 	options.
+	Require Autoconf 2.59.  Invoke `gl_EARLY' and `gl_INIT', don't
+	run `AC_AIX', `AC_ISC_POSIX' and `AC_MINIX' since they are
+	implied by `gl_EARLY'.  Don't look for <strings.h> and
+	`strncasecmp'.  Don't invoke `AC_FUNC_ALLOCA'.  Produce
+	`lib/Makefile'.
 
 2007-07-25  Ludovic Courtès  <ludo@gnu.org>
 
diff --git a/Makefile.am b/Makefile.am
index 49fc94a8b..888271050 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@
 #
 AUTOMAKE_OPTIONS = 1.10
 
-SUBDIRS = oop libguile ice-9 guile-config guile-readline emacs \
+SUBDIRS = lib oop libguile ice-9 guile-config guile-readline emacs \
 	  scripts srfi doc examples test-suite benchmark-suite lang am
 
 bin_SCRIPTS = guile-tools
@@ -37,7 +37,7 @@ EXTRA_DIST = LICENSE HACKING GUILE-VERSION ANON-CVS SNAPSHOTS
 
 TESTS = check-guile
 
-ACLOCAL_AMFLAGS = -I guile-config
+ACLOCAL_AMFLAGS = -I guile-config -I m4
 
 DISTCLEANFILES = check-guile.log
 
diff --git a/NEWS b/NEWS
index 92b1f0e6f..21b0dd09f 100644
--- a/NEWS
+++ b/NEWS
@@ -6,21 +6,17 @@ Please send Guile bug reports to bug-guile@gnu.org.  Note that you
 must be subscribed to this list first, in order to successfully send a
 report to it.
 
-Each release reports the NEWS in the following sections:
-
-* Changes to the distribution
-* Changes to the stand-alone interpreter
-* Changes to Scheme functions and syntax
-* Changes to the C interface 
-
 
-Changes in 1.9.XXXXXXXX:
+Changes in 1.9.0:
 
 * New modules (see the manual for details)
 
 ** The `(ice-9 i18n)' module provides internationalization support
 
 * Changes to the distribution
+
+** Guile now uses Gnulib as a portability aid
+
 * Changes to the stand-alone interpreter
 * Changes to Scheme functions and syntax
 
diff --git a/autogen.sh b/autogen.sh
index 1a566de1d..a24bd6d97 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,10 +19,13 @@ libtool --version
 echo ""
 ${M4:-/usr/bin/m4} --version
 echo ""
+gnulib-tool --version
+echo ""
 
 ######################################################################
 ### update infrastructure
 
+gnulib-tool --update &&				\
 autoreconf -i --force --verbose
 
 echo "guile-readline..."
diff --git a/configure.in b/configure.in
index 5ce84a3f6..6e6bff695 100644
--- a/configure.in
+++ b/configure.in
@@ -25,7 +25,7 @@ Boston, MA 02110-1301, USA.
 
 ]])
 
-AC_PREREQ(2.53)
+AC_PREREQ(2.59)
 
 dnl  `patsubst' here deletes the newline which "echo" prints.  We can't use
 dnl  "echo -n" since -n is not portable (see autoconf manual "Limitations of
@@ -68,12 +68,12 @@ AC_LIBTOOL_WIN32_DLL
 
 AC_PROG_INSTALL
 AC_PROG_CC
+gl_EARLY
 AC_PROG_CPP
 AC_PROG_AWK
 
-AC_AIX
-AC_ISC_POSIX
-AC_MINIX
+dnl Gnulib.
+gl_INIT
 
 AM_PROG_CC_STDC
 # for per-target cflags in the libguile subdir
@@ -548,7 +548,7 @@ AC_CHECK_HEADERS([complex.h fenv.h io.h libc.h limits.h malloc.h memory.h proces
 regex.h rxposix.h rx/rxposix.h sys/dir.h sys/ioctl.h sys/select.h \
 sys/time.h sys/timeb.h sys/times.h sys/stdtypes.h sys/types.h \
 sys/utime.h time.h unistd.h utime.h pwd.h grp.h sys/utsname.h \
-strings.h direct.h langinfo.h nl_types.h])
+direct.h langinfo.h nl_types.h])
 
 # "complex double" is new in C99, and "complex" is only a keyword if
 # <complex.h> is included
@@ -640,7 +640,7 @@ AC_CHECK_HEADERS([assert.h crt_externs.h])
 #   strcoll_l, newlocale - GNU extensions (glibc), also available on Darwin
 #   nl_langinfo - X/Open, not available on Windows.
 #
-AC_CHECK_FUNCS([DINFINITY DQNAN chsize clog10 ctermid fesetround ftime ftruncate fchown getcwd geteuid gettimeofday gmtime_r ioctl lstat mkdir mknod nice pipe _pipe readdir_r readlink rename rmdir select setegid seteuid setlocale setpgid setsid sigaction siginterrupt stat64 strftime strptime symlink sync sysconf tcgetpgrp tcsetpgrp times uname waitpid strdup system usleep atexit on_exit chown link fcntl ttyname getpwent getgrent kill getppid getpgrp fork setitimer getitimer strchr strcmp index bcopy memcpy rindex truncate unsetenv isblank _NSGetEnviron strncasecmp strcoll strcoll_l newlocale nl_langinfo])
+AC_CHECK_FUNCS([DINFINITY DQNAN chsize clog10 ctermid fesetround ftime ftruncate fchown getcwd geteuid gettimeofday gmtime_r ioctl lstat mkdir mknod nice pipe _pipe readdir_r readlink rename rmdir select setegid seteuid setlocale setpgid setsid sigaction siginterrupt stat64 strftime strptime symlink sync sysconf tcgetpgrp tcsetpgrp times uname waitpid strdup system usleep atexit on_exit chown link fcntl ttyname getpwent getgrent kill getppid getpgrp fork setitimer getitimer strchr strcmp index bcopy memcpy rindex truncate unsetenv isblank _NSGetEnviron strcoll strcoll_l newlocale nl_langinfo])
 
 # Reasons for testing:
 #   netdb.h - not in mingw
@@ -989,16 +989,6 @@ int main () { return (isnan(x) != 0); }]]),
              [Define to 1 if you have the `isnan' macro or function.])],
   [AC_MSG_RESULT([no])])
 
-# We must have a proper stack-using alloca in order for stack-copying
-# continuations to work properly.  If we don't find a native one,
-# abort.
-
-AC_FUNC_ALLOCA
-if test "$ALLOCA" = "alloca.o"
-then
-  AC_ERROR([No native alloca found.])
-fi
-
 # Reasons for checking:
 #
 #     st_rdev
@@ -1352,6 +1342,7 @@ AC_CONFIG_FILES([libguile/gen-scmconfig.h])
 AC_CONFIG_FILES([
   Makefile
   am/Makefile
+  lib/Makefile
   benchmark-suite/Makefile
   doc/Makefile
   doc/goops/Makefile
diff --git a/guile-readline/ChangeLog b/guile-readline/ChangeLog
index 94cd83e71..a599a6699 100644
--- a/guile-readline/ChangeLog
+++ b/guile-readline/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-29  Ludovic Courtès  <ludo@gnu.org>
+
+	* Makefile.am (INCLUDES): Add Gnulib includes.
+	(libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LIBADD): Added
+	`../lib/libgnu.la'.
+
 2007-07-15  Ludovic Courtès  <ludo@gnu.org>
 
 	* LIBGUILEREADLINE-VERSION
diff --git a/guile-readline/Makefile.am b/guile-readline/Makefile.am
index f1f038755..50523e5b3 100644
--- a/guile-readline/Makefile.am
+++ b/guile-readline/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with Automake to create Makefile.in
 ##
-##  	Copyright (C) 1998, 1999, 2000, 2001, 2004, 2006 Free Software Foundation, Inc.
+##  	Copyright (C) 1998, 1999, 2000, 2001, 2004, 2006, 2007 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -25,15 +25,17 @@ SUBDIRS = ice-9
 DEFS = @DEFS@ @EXTRA_DEFS@
 ## Check for headers in $(srcdir)/.., so that #include
 ## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
-## building.
-INCLUDES = -I. -I.. -I$(srcdir)/..
+## building.  Also look for Gnulib headers in `lib'.
+INCLUDES = -I. -I.. -I$(srcdir)/..			\
+	   -I$(top_srcdir)/lib -I$(top_builddir)/lib
 
 GUILE_SNARF = ../libguile/guile-snarf
 
 lib_LTLIBRARIES = libguilereadline-v-@LIBGUILEREADLINE_MAJOR@.la
 
 libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_SOURCES = readline.c
-libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LIBADD = ../libguile/libguile.la
+libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LIBADD =	\
+   ../libguile/libguile.la ../lib/libgnu.la
 libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LDFLAGS = -version-info @LIBGUILEREADLINE_INTERFACE@ -export-dynamic -no-undefined
 
 
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 1fe371b5e..ff4113827 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,15 @@
+2007-07-29  Ludovic Courtès  <ludo@gnu.org>
+
+	* Makefile.am (INCLUDES): Added Gnulib includes.
+	(gnulib_library): New.
+	(libguile_i18n_v_@LIBGUILE_I18N_MAJOR@_la_LIBADD): Added
+	`$(gnulib_library)'.
+	(libguile_la_LIBADD): Likewise.
+
+	* posix.c: Don't define `_GNU_SOURCE' since `gl_EARLY' arranges
+	to define it when available.
+	* srfi-14.c: Likewise.
+
 2007-07-25  Ludovic Courtès  <ludo@gnu.org>
 
 	* eval.c (macroexp): When `scm_ilength (res) <= 0', return
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 73f7fcc71..3444f5d70 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with Automake to create Makefile.in
 ##
-##  	Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+##  	Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -25,8 +25,12 @@ AUTOMAKE_OPTIONS = gnu
 DEFS = @DEFS@
 ## Check for headers in $(srcdir)/.., so that #include
 ## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
-## building.
-INCLUDES = -I.. -I$(top_srcdir)
+## building.  Also look for Gnulib headers in `lib'.
+INCLUDES = -I.. -I$(top_srcdir)				\
+	   -I$(top_srcdir)/lib -I$(top_builddir)/lib
+
+## The Gnulib Libtool archive.
+gnulib_library = $(top_builddir)/lib/libgnu.la
 
 ETAGS_ARGS = --regex='/SCM_\(GLOBAL_\)?\(G?PROC\|G?PROC1\|SYMBOL\|VCELL\|CONST_LONG\).*\"\([^\"]\)*\"/\3/' \
    --regex='/[ \t]*SCM_[G]?DEFINE1?[ \t]*(\([^,]*\),[^,]*/\1/'
@@ -115,7 +119,7 @@ libguile_i18n_v_@LIBGUILE_I18N_MAJOR@_la_SOURCES = i18n.c
 libguile_i18n_v_@LIBGUILE_I18N_MAJOR@_la_CFLAGS =	\
    $(libguile_la_CFLAGS)
 libguile_i18n_v_@LIBGUILE_I18N_MAJOR@_la_LIBADD =	\
-   libguile.la
+   libguile.la $(gnulib_library)
 libguile_i18n_v_@LIBGUILE_I18N_MAJOR@_la_LDFLAGS =	\
    -module -L$(builddir) -lguile				\
    -version-info @LIBGUILE_I18N_INTERFACE@
@@ -189,7 +193,7 @@ noinst_HEADERS = convert.i.c					\
 	         private-gc.h private-options.h
 
 libguile_la_DEPENDENCIES = @LIBLOBJS@
-libguile_la_LIBADD = @LIBLOBJS@
+libguile_la_LIBADD = @LIBLOBJS@ $(gnulib_library)
 libguile_la_LDFLAGS = @LTLIBINTL@ -version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@ -export-dynamic -no-undefined
 
 # These are headers visible as <guile/mumble.h>
diff --git a/libguile/posix.c b/libguile/posix.c
index e0d461075..0cfb6d7bd 100644
--- a/libguile/posix.c
+++ b/libguile/posix.c
@@ -21,9 +21,6 @@
 #  include <config.h>
 #endif
 
-/* Make GNU/Linux libc declare everything it has. */
-#define _GNU_SOURCE
-
 #include <stdio.h>
 #include <errno.h>
 
diff --git a/libguile/srfi-14.c b/libguile/srfi-14.c
index f61db7dd5..908e0c8ff 100644
--- a/libguile/srfi-14.c
+++ b/libguile/srfi-14.c
@@ -1,6 +1,6 @@
 /* srfi-14.c --- SRFI-14 procedures for Guile
  *
- * Copyright (C) 2001, 2004, 2006 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2004, 2006, 2007 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,8 +22,6 @@
 #endif
 
 
-#define _GNU_SOURCE  /* Ask for `isblank ()'.  */
-
 #include <string.h>
 #include <ctype.h>
 
diff --git a/srfi/ChangeLog b/srfi/ChangeLog
index 673a3ce6f..cd04e7508 100644
--- a/srfi/ChangeLog
+++ b/srfi/ChangeLog
@@ -1,3 +1,15 @@
+2007-07-29  Ludovic Courtès  <ludo@gnu.org>
+
+	* Makefile.am (INCLUDES): Added Gnulib includes.
+	(libguile_srfi_srfi_1_v_@LIBGUILE_SRFI_SRFI_1_MAJOR@_la_LIBADD):
+	Added `../lib/libgnu.la'.
+	(libguile_srfi_srfi_4_v_@LIBGUILE_SRFI_SRFI_4_MAJOR@_la_LIBADD):
+	Likewise.
+	(libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_LIBADD):
+	Likewise.
+	(libguile_srfi_srfi_60_v_@LIBGUILE_SRFI_SRFI_60_MAJOR@_la_LIBADD):
+	Likewise.
+
 2007-07-18  Stephen Compall  <s11@member.fsf.org>
 
 	* srfi-37.scm: New file.
diff --git a/srfi/Makefile.am b/srfi/Makefile.am
index 46408cba8..359c19ba2 100644
--- a/srfi/Makefile.am
+++ b/srfi/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with Automake to create Makefile.in
 ##
-##   Copyright (C) 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
+##   Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -25,8 +25,9 @@ AUTOMAKE_OPTIONS = gnu
 DEFS = @DEFS@ @EXTRA_DEFS@
 ## Check for headers in $(srcdir)/.., so that #include
 ## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
-## building.
-INCLUDES = -I.. -I$(srcdir)/..
+## building.  Also look for Gnulib headers in `lib'.
+INCLUDES = -I.. -I$(srcdir)/..				\
+	   -I$(top_srcdir)/lib -I$(top_builddir)/lib
 
 srfiincludedir = $(pkgincludedir)/srfi
 
@@ -42,19 +43,23 @@ lib_LTLIBRARIES = \
 BUILT_SOURCES = srfi-1.x srfi-4.x srfi-13.x srfi-14.x srfi-60.x
 
 libguile_srfi_srfi_1_v_@LIBGUILE_SRFI_SRFI_1_MAJOR@_la_SOURCES = srfi-1.x srfi-1.c
-libguile_srfi_srfi_1_v_@LIBGUILE_SRFI_SRFI_1_MAJOR@_la_LIBADD = ../libguile/libguile.la
+libguile_srfi_srfi_1_v_@LIBGUILE_SRFI_SRFI_1_MAJOR@_la_LIBADD =		\
+   $(top_builddir)/libguile/libguile.la $(top_builddir)/lib/libgnu.la
 libguile_srfi_srfi_1_v_@LIBGUILE_SRFI_SRFI_1_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -version-info @LIBGUILE_SRFI_SRFI_1_INTERFACE@
 
 libguile_srfi_srfi_4_v_@LIBGUILE_SRFI_SRFI_4_MAJOR@_la_SOURCES = srfi-4.x srfi-4.c
-libguile_srfi_srfi_4_v_@LIBGUILE_SRFI_SRFI_4_MAJOR@_la_LIBADD = ../libguile/libguile.la
+libguile_srfi_srfi_4_v_@LIBGUILE_SRFI_SRFI_4_MAJOR@_la_LIBADD =		\
+   $(top_builddir)/libguile/libguile.la $(top_builddir)/lib/libgnu.la
 libguile_srfi_srfi_4_v_@LIBGUILE_SRFI_SRFI_4_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -version-info @LIBGUILE_SRFI_SRFI_4_INTERFACE@
 
 libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_SOURCES = srfi-13.x srfi-13.c srfi-14.x srfi-14.c
-libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_LIBADD = ../libguile/libguile.la
+libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_LIBADD =	\
+   $(top_builddir)/libguile/libguile.la $(top_builddir)/lib/libgnu.la
 libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -version-info @LIBGUILE_SRFI_SRFI_13_14_INTERFACE@
 
 libguile_srfi_srfi_60_v_@LIBGUILE_SRFI_SRFI_60_MAJOR@_la_SOURCES = srfi-60.x srfi-60.c
-libguile_srfi_srfi_60_v_@LIBGUILE_SRFI_SRFI_60_MAJOR@_la_LIBADD = ../libguile/libguile.la
+libguile_srfi_srfi_60_v_@LIBGUILE_SRFI_SRFI_60_MAJOR@_la_LIBADD =	\
+   $(top_builddir)/libguile/libguile.la $(top_builddir)/lib/libgnu.la
 libguile_srfi_srfi_60_v_@LIBGUILE_SRFI_SRFI_60_MAJOR@_la_LDFLAGS = -no-undefined -export-dynamic -version-info @LIBGUILE_SRFI_SRFI_60_INTERFACE@
 
 srfidir = $(datadir)/guile/$(GUILE_EFFECTIVE_VERSION)/srfi