Merge 1.8.4 release commit.

diff --git a/ChangeLog b/ChangeLog
index f0deab1..15de659 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-02-16  Ludovic Courtès  <ludo@gnu.org>
+
+       Guile 1.8.4 released.
+
+       * GUILE-VERSION (LIBGUILE_INTERFACE_REVISION): Increment.
+       (GUILE_MICRO_VERSION): Increment.
+
+       * configure.in (GUILE_CFLAGS): Include `$CPPFLAGS' since they
+       may include required `-I' flags (e.g., `-I/path/to/gmp'), so
+       that "guile-config compile" reports all the needed flags.
+
 2008-02-15  Neil Jerram  <neil@ossau.uklinux.net>
 
        * autogen.sh: Copy versions of config.guess and config.sub from

diff --git a/NEWS b/NEWS
index 67887b6..0daf78b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -52,6 +52,7 @@ called with an associator proc that returns neither a pair nor #f.
 ** Avoid MacOS build problems caused by incorrect combination of "64"
 system and library calls.
 ** `guile-snarf' now honors `$TMPDIR'
+** `guile-config compile' now reports CPPFLAGS used at compile-time
 ** Fixed build with Sun Studio (Solaris 9)
 ** Fixed wrong-type-arg errors when creating zero length SRFI-4
 uniform vectors on AIX.

diff --git a/configure.in b/configure.in
index 8e647aa..193d6a6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1408,7 +1408,7 @@ AC_SUBST(LIBGUILE_I18N_INTERFACE)
 
 dnl Tell guile-config what flags guile users should compile and link with.
 GUILE_LIBS="$LDFLAGS $LIBS"
-GUILE_CFLAGS="$PTHREAD_CFLAGS"
+GUILE_CFLAGS="$CPPFLAGS $PTHREAD_CFLAGS"
 AC_SUBST(GUILE_LIBS)
 AC_SUBST(GUILE_CFLAGS)
 

diff --git a/guile-readline/ChangeLog b/guile-readline/ChangeLog
index 97d2982..3163b5f 100644 (file)
--- a/guile-readline/ChangeLog
+++ b/guile-readline/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-16  Ludovic Courtès  <ludo@gnu.org>
+
+       * LIBGUILEREADLINE-VERSION
+       (LIBGUILEREADLINE_INTERFACE_REVISION): Increment for release.
+
 2008-01-29  Neil Jerram  <neil@ossau.uklinux.net>
 
        * readline.c (scm_init_readline): Only do init_bouncing_parens ()

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index d15d8b5..ca99ccf 100644 (file)
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-17  Ludovic Courtès  <ludo@gnu.org>
+
+       * script.c (scm_compile_shell_switches): Update copyright year.
+
 2008-02-16  Ludovic Courtès  <ludo@gnu.org>
 
        * gc_os_dep.c: Add NetBSD/alpha support.  Patch by Greg Troxel

diff --git a/libguile/script.c b/libguile/script.c
index b024378..2e45d87 100644 (file)
--- a/libguile/script.c
+++ b/libguile/script.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 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
  * License as published by the Free Software Foundation; either
@@ -635,7 +635,7 @@ scm_compile_shell_switches (int argc, char **argv)
        {
          /* Print version number.  */
          printf ("Guile %s\n"
-                 "Copyright (c) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation\n"
+                 "Copyright (c) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation\n"
                  "Guile may be distributed under the terms of the GNU General Public Licence;\n"
                  "certain other uses are permitted as well.  For details, see the file\n"
                  "`COPYING', which is included in the Guile distribution.\n"