mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-23 13:00:34 +02:00
Code Activity

Don't use "-I$(srcdir)", so that our "random.h" doesn't shadow libc's on Tru64.

Browse source
This commit is contained in:
Ludovic Courtès 2008-04-24 19:25:30 +02:00
parent 5de6e0954f
commit 3df8fc1ba9
4 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -45,6 +45,7 @@ lead to a stack overflow.
** Fixed build issue with DEC/Compaq/HP's compiler ** Fixed build issue with DEC/Compaq/HP's compiler
** Fixed `scm_from_complex_double' build issue on FreeBSD ** Fixed `scm_from_complex_double' build issue on FreeBSD
** Fixed `alloca' build issue on FreeBSD 6 ** 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' ** Make sure all tests honor `$TMPDIR'
* Changes to the distribution * Changes to the distribution

9
libguile/ChangeLog
View file

@ -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> 2008-04-16 Ludovic Courtès <ludo@gnu.org>
Copy Han-Wen's srcprop reimplementation from the 1.9 branch, Copy Han-Wen's srcprop reimplementation from the 1.9 branch,

10
libguile/Makefile.am
View file

@ -1,6 +1,6 @@
## Process this file with Automake to create Makefile.in ## 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, 2008 Free Software Foundation, Inc.
## ##
## This file is part of GUILE. ## This file is part of GUILE.
## ##
@ -23,10 +23,16 @@ AUTOMAKE_OPTIONS = gnu
## Prevent automake from adding extra -I options ## Prevent automake from adding extra -I options
DEFS = @DEFS@ 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 ## Check for headers in $(srcdir)/.., so that #include
## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're ## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
## building. ## building.
INCLUDES = -I.. -I$(top_srcdir) INCLUDES = -I.. -I$(top_srcdir) -I$(top_builddir)
ETAGS_ARGS = --regex='/SCM_\(GLOBAL_\)?\(G?PROC\|G?PROC1\|SYMBOL\|VCELL\|CONST_LONG\).*\"\([^\"]\)*\"/\3/' \ ETAGS_ARGS = --regex='/SCM_\(GLOBAL_\)?\(G?PROC\|G?PROC1\|SYMBOL\|VCELL\|CONST_LONG\).*\"\([^\"]\)*\"/\3/' \
--regex='/[ \t]*SCM_[G]?DEFINE1?[ \t]*(\([^,]*\),[^,]*/\1/' --regex='/[ \t]*SCM_[G]?DEFINE1?[ \t]*(\([^,]*\),[^,]*/\1/'

2
libguile/gen-scmconfig.c
View file

@ -121,7 +121,7 @@
# include <config.h> # include <config.h>
#endif #endif
#include "gen-scmconfig.h" #include <libguile/gen-scmconfig.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>