1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-29 19:30:36 +02:00

Fix use of uninstalled header by installed headers

* libguile/Makefile.am (libpath.h): Remove definition of
  SCM_EFFECTIVE_VERSION, which is defined in version.h.
* libguile/extensions.h: Remove libpath.h inclusion, as it's not
  installed.
* libguile/atomic.c:
* libguile/bytevectors.c:
* libguile/control.c:
* libguile/fdes-finalizers.c:
* libguile/foreign-object.c:
* libguile/foreign.c:
* libguile/fports.c:
* libguile/frames.c:
* libguile/goops.c:
* libguile/i18n.c:
* libguile/instructions.c:
* libguile/intrinsics.c:
* libguile/ioext.c:
* libguile/load.c:
* libguile/loader.c:
* libguile/poll.c:
* libguile/ports.c:
* libguile/posix.c:
* libguile/programs.c:
* libguile/r6rs-ports.c:
* libguile/srfi-1.c:
* libguile/srfi-60.c:
* libguile/threads.c:
* libguile/unicode.c:
* libguile/vm.c:
* libguile/weak-vector.c: Include version.h for the
  SCM_EFFECTIVE_VERSION definition.
This commit is contained in:
Andy Wingo 2018-10-07 15:15:02 +02:00
parent d08f2c1166
commit 6cd9b3114f
28 changed files with 26 additions and 2 deletions

View file

@ -744,7 +744,6 @@ libpath.h: $(srcdir)/Makefile.in $(top_builddir)/config.status
@echo '#define SCM_EXTENSIONS_DIR "$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/extensions"' >> libpath.tmp
@echo '#define SCM_CCACHE_DIR "$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/ccache"' >> libpath.tmp
@echo '#define SCM_SITE_CCACHE_DIR "$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/site-ccache"' >> libpath.tmp
@echo '#define SCM_EFFECTIVE_VERSION "$(GUILE_EFFECTIVE_VERSION)"' >> libpath.tmp
@echo '#define SCM_BUILD_INFO { \' >> libpath.tmp
@echo ' { "srcdir", "'"`cd @srcdir@; pwd`"'" }, \' >> libpath.tmp
@echo ' { "top_srcdir", "@top_srcdir_absolute@" }, \' >> libpath.tmp

View file

@ -29,6 +29,7 @@
#include "extensions.h"
#include "gsubr.h"
#include "ports.h"
#include "version.h"
#include "atomic.h"

View file

@ -52,6 +52,7 @@
#include "strings.h"
#include "symbols.h"
#include "uniform.h"
#include "version.h"
#include "bytevectors.h"

View file

@ -33,6 +33,7 @@
#include "pairs.h"
#include "programs.h"
#include "threads.h"
#include "version.h"
#include "vm.h"
#include "control.h"

View file

@ -23,7 +23,6 @@
#include "libguile/scm.h"
#include "libguile/libpath.h"

View file

@ -31,6 +31,7 @@
#include "numbers.h"
#include "pairs.h"
#include "threads.h"
#include "version.h"
#include "fdes-finalizers.h"

View file

@ -35,6 +35,7 @@
#include "procs.h"
#include "threads.h"
#include "variable.h"
#include "version.h"
#include "foreign-object.h"

View file

@ -49,6 +49,7 @@
#include "symbols.h"
#include "threads.h"
#include "weak-table.h"
#include "version.h"
#include "foreign.h"

View file

@ -67,6 +67,7 @@
#include "symbols.h"
#include "syscalls.h"
#include "variable.h"
#include "version.h"
#include "fports.h"

View file

@ -36,6 +36,7 @@
#include "symbols.h"
#include "threads.h"
#include "variable.h"
#include "version.h"
#include "vm.h"
#include "frames.h"

View file

@ -53,6 +53,7 @@
#include "symbols.h"
#include "variable.h"
#include "vectors.h"
#include "version.h"
#include "weak-table.h"
#include "goops.h"

View file

@ -47,6 +47,7 @@
#include "threads.h"
#include "values.h"
#include "variable.h"
#include "version.h"
#include "i18n.h"

View file

@ -28,6 +28,7 @@
#include "pairs.h"
#include "symbols.h"
#include "threads.h"
#include "version.h"
#include "instructions.h"

View file

@ -36,6 +36,7 @@
#include "numbers.h"
#include "symbols.h"
#include "threads.h"
#include "version.h"
#include "intrinsics.h"

View file

@ -48,6 +48,7 @@
#include "strings.h"
#include "syscalls.h"
#include "weak-set.h"
#include "version.h"
#include "ioext.h"

View file

@ -60,6 +60,7 @@
#include "symbols.h"
#include "throw.h"
#include "variable.h"
#include "version.h"
#include "vm.h" /* for load-compiled/vm */
#include "load.h"

View file

@ -47,6 +47,7 @@
#include "programs.h"
#include "strings.h"
#include "threads.h"
#include "version.h"
#include "loader.h"

View file

@ -39,6 +39,7 @@
#include "ports-internal.h"
#include "syscalls.h"
#include "vectors.h"
#include "version.h"
#include "poll.h"

View file

@ -77,6 +77,7 @@
#include "syscalls.h"
#include "variable.h"
#include "vectors.h"
#include "version.h"
#include "weak-set.h"
#include "ports.h"

View file

@ -85,6 +85,7 @@
#include "threads.h"
#include "values.h"
#include "vectors.h"
#include "version.h"
#include "posix.h"

View file

@ -35,6 +35,7 @@
#include "ports.h"
#include "procprop.h" /* scm_sym_name */
#include "variable.h"
#include "version.h"
#include "vm.h"
#include "programs.h"

View file

@ -40,6 +40,7 @@
#include "syscalls.h"
#include "values.h"
#include "vectors.h"
#include "version.h"
#include "r6rs-ports.h"

View file

@ -38,6 +38,7 @@
#include "procs.h"
#include "values.h"
#include "vectors.h"
#include "version.h"
#include "srfi-1.h"

View file

@ -32,6 +32,7 @@
#include "list.h"
#include "numbers.h"
#include "pairs.h"
#include "version.h"
#include "srfi-60.h"

View file

@ -63,6 +63,7 @@
#include "strings.h"
#include "symbols.h"
#include "variable.h"
#include "version.h"
#include "vm.h"
#include "threads.h"

View file

@ -34,6 +34,7 @@
#include "extensions.h"
#include "gsubr.h"
#include "strings.h"
#include "version.h"
#include "unicode.h"

View file

@ -69,6 +69,7 @@
#include "symbols.h"
#include "values.h"
#include "vectors.h"
#include "version.h"
#include "vm-builtins.h"
#include "vm.h"

View file

@ -32,6 +32,7 @@
#include "list.h"
#include "pairs.h"
#include "vectors.h"
#include "version.h"
#include "weak-vector.h"