summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2008-04-24 19:25:30 +0200
committerLudovic Courtès <ludo@gnu.org>2008-04-24 19:37:54 +0200
commit535b3592b24693a0d24b7c7fd4702d3c405bf3d6 (patch)
treeafc164bce1b394b3db9d9842ea30ef0e15cbb982
parent839e63263cbd494ef5368448c46b3134c7f3c6a5 (diff)
downloadguile-535b3592b24693a0d24b7c7fd4702d3c405bf3d6.tar.gz
Don't use "-I$(srcdir)", so that our "random.h" doesn't shadow libc's on Tru64.
-rw-r--r--NEWS1
-rw-r--r--libguile/ChangeLog9
-rw-r--r--libguile/Makefile.am10
-rw-r--r--libguile/gen-scmconfig.c2
4 files changed, 19 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index e6f845478..6cce9d27e 100644
--- a/NEWS
+++ b/NEWS
@@ -76,6 +76,7 @@ lead to a stack overflow.
** Fixed build issue with DEC/Compaq/HP's compiler
** Fixed `scm_from_complex_double' build issue on FreeBSD
** Fixed `alloca' build issue on FreeBSD 6
+** Fixed shadowing of libc's <random.h> on Tru64, which broke compilation
** Make sure all tests honor `$TMPDIR'
* Changes to the distribution
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index ee9dd37d7..a68a03dab 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,12 @@
+2008-04-24 Ludovic Courtès <ludo@gnu.org>
+
+ * Makefile.am (DEFAULT_INCLUDES): New. Fixes compilation on
+ Tru64 where our "random.h" would shadown libc's one.
+ (INCLUDES): Add "-I$(top_buildir)", which is normally in
+ `DEFAULT_INCLUDES'.
+ * gen-scmconfig.c: Include <libguile/gen-scmconfig.h>, not
+ "gen-scmconfig.h" since that file is under `$(builddir)'.
+
2008-04-16 Ludovic Courtès <ludo@gnu.org>
* ports.c (scm_getc, scm_putc, scm_puts): Moved...
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 3444f5d70..487b8b274 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, 2007 Free Software Foundation, Inc.
+## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
##
## This file is part of GUILE.
##
@@ -23,10 +23,16 @@ AUTOMAKE_OPTIONS = gnu
## Prevent automake from adding extra -I options
DEFS = @DEFS@
+
+# Override Automake's `DEFAULT_INCLUDES'. By default, it contains
+# "-I$(srcdir)", which causes problems on Tru64 where our "random.h"
+# is picked up by <stdlib.h> instead of the libc's <random.h>.
+DEFAULT_INCLUDES =
+
## Check for headers in $(srcdir)/.., so that #include
## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
## building. Also look for Gnulib headers in `lib'.
-INCLUDES = -I.. -I$(top_srcdir) \
+INCLUDES = -I$(top_srcdir) -I$(top_builddir) \
-I$(top_srcdir)/lib -I$(top_builddir)/lib
## The Gnulib Libtool archive.
diff --git a/libguile/gen-scmconfig.c b/libguile/gen-scmconfig.c
index 6afa72fcc..788b45144 100644
--- a/libguile/gen-scmconfig.c
+++ b/libguile/gen-scmconfig.c
@@ -121,7 +121,7 @@
# include <config.h>
#endif
-#include "gen-scmconfig.h"
+#include <libguile/gen-scmconfig.h>
#include <stdio.h>
#include <string.h>