diff options
author | Ludovic Courtès <ludo@gnu.org> | 2007-07-29 14:58:21 +0000 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2007-07-29 14:58:21 +0000 |
commit | 6caac03c93f3c0657a9487ee175b2779eae0f747 (patch) | |
tree | 6ce7faaa1aac04c3a283ada14f00f32df266c327 /libguile | |
parent | f6b4d9b42eeabd38068bf18ae612c20c723b5368 (diff) | |
download | guile-6caac03c93f3c0657a9487ee175b2779eae0f747.tar.gz |
Changes from arch/CVS synchronization
Diffstat (limited to 'libguile')
-rw-r--r-- | libguile/ChangeLog | 12 | ||||
-rw-r--r-- | libguile/Makefile.am | 14 | ||||
-rw-r--r-- | libguile/posix.c | 3 | ||||
-rw-r--r-- | libguile/srfi-14.c | 4 |
4 files changed, 22 insertions, 11 deletions
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> |