[Guile-commits] 01/01: Fix use of uninstalled header by installed headers

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit 6cd9b3114f44383c37421ba4ca8ddcf46df27ce1
Author: Andy Wingo <address@hidden>
Date:   Sun Oct 7 15:15:02 2018 +0200

    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.
---
 libguile/Makefile.am       | 1 -
 libguile/atomic.c          | 1 +
 libguile/bytevectors.c     | 1 +
 libguile/control.c         | 1 +
 libguile/extensions.h      | 1 -
 libguile/fdes-finalizers.c | 1 +
 libguile/foreign-object.c  | 1 +
 libguile/foreign.c         | 1 +
 libguile/fports.c          | 1 +
 libguile/frames.c          | 1 +
 libguile/goops.c           | 1 +
 libguile/i18n.c            | 1 +
 libguile/instructions.c    | 1 +
 libguile/intrinsics.c      | 1 +
 libguile/ioext.c           | 1 +
 libguile/load.c            | 1 +
 libguile/loader.c          | 1 +
 libguile/poll.c            | 1 +
 libguile/ports.c           | 1 +
 libguile/posix.c           | 1 +
 libguile/programs.c        | 1 +
 libguile/r6rs-ports.c      | 1 +
 libguile/srfi-1.c          | 1 +
 libguile/srfi-60.c         | 1 +
 libguile/threads.c         | 1 +
 libguile/unicode.c         | 1 +
 libguile/vm.c              | 1 +
 libguile/weak-vector.c     | 1 +
 28 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 6384fa5..5b25169 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -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
diff --git a/libguile/atomic.c b/libguile/atomic.c
index 714ae47..604a21e 100644
--- a/libguile/atomic.c
+++ b/libguile/atomic.c
@@ -29,6 +29,7 @@
 #include "extensions.h"
 #include "gsubr.h"
 #include "ports.h"
+#include "version.h"
 
 #include "atomic.h"
 
diff --git a/libguile/bytevectors.c b/libguile/bytevectors.c
index 1602995..203bb83 100644
--- a/libguile/bytevectors.c
+++ b/libguile/bytevectors.c
@@ -52,6 +52,7 @@
 #include "strings.h"
 #include "symbols.h"
 #include "uniform.h"
+#include "version.h"
 
 #include "bytevectors.h"
 
diff --git a/libguile/control.c b/libguile/control.c
index c659f8c..5e24bb7 100644
--- a/libguile/control.c
+++ b/libguile/control.c
@@ -33,6 +33,7 @@
 #include "pairs.h"
 #include "programs.h"
 #include "threads.h"
+#include "version.h"
 #include "vm.h"
 
 #include "control.h"
diff --git a/libguile/extensions.h b/libguile/extensions.h
index 7b46cba..fc690a4 100644
--- a/libguile/extensions.h
+++ b/libguile/extensions.h
@@ -23,7 +23,6 @@
 
 
 #include "libguile/scm.h"
-#include "libguile/libpath.h"
 
 
 
diff --git a/libguile/fdes-finalizers.c b/libguile/fdes-finalizers.c
index 192288f..4b3fced 100644
--- a/libguile/fdes-finalizers.c
+++ b/libguile/fdes-finalizers.c
@@ -31,6 +31,7 @@
 #include "numbers.h"
 #include "pairs.h"
 #include "threads.h"
+#include "version.h"
 
 #include "fdes-finalizers.h"
 
diff --git a/libguile/foreign-object.c b/libguile/foreign-object.c
index 7e72c2f..21dc2c0 100644
--- a/libguile/foreign-object.c
+++ b/libguile/foreign-object.c
@@ -35,6 +35,7 @@
 #include "procs.h"
 #include "threads.h"
 #include "variable.h"
+#include "version.h"
 
 #include "foreign-object.h"
 
diff --git a/libguile/foreign.c b/libguile/foreign.c
index 68fa5b2..1368cc9 100644
--- a/libguile/foreign.c
+++ b/libguile/foreign.c
@@ -49,6 +49,7 @@
 #include "symbols.h"
 #include "threads.h"
 #include "weak-table.h"
+#include "version.h"
 
 #include "foreign.h"
 
diff --git a/libguile/fports.c b/libguile/fports.c
index b805fa1..9aa2ea9 100644
--- a/libguile/fports.c
+++ b/libguile/fports.c
@@ -67,6 +67,7 @@
 #include "symbols.h"
 #include "syscalls.h"
 #include "variable.h"
+#include "version.h"
 
 #include "fports.h"
 
diff --git a/libguile/frames.c b/libguile/frames.c
index 0ad40ed..0bb4057 100644
--- a/libguile/frames.c
+++ b/libguile/frames.c
@@ -36,6 +36,7 @@
 #include "symbols.h"
 #include "threads.h"
 #include "variable.h"
+#include "version.h"
 #include "vm.h"
 
 #include "frames.h"
diff --git a/libguile/goops.c b/libguile/goops.c
index 5908c58..fd312a8 100644
--- a/libguile/goops.c
+++ b/libguile/goops.c
@@ -53,6 +53,7 @@
 #include "symbols.h"
 #include "variable.h"
 #include "vectors.h"
+#include "version.h"
 #include "weak-table.h"
 
 #include "goops.h"
diff --git a/libguile/i18n.c b/libguile/i18n.c
index a01ea81..65cfbc7 100644
--- a/libguile/i18n.c
+++ b/libguile/i18n.c
@@ -47,6 +47,7 @@
 #include "threads.h"
 #include "values.h"
 #include "variable.h"
+#include "version.h"
 
 #include "i18n.h"
 
diff --git a/libguile/instructions.c b/libguile/instructions.c
index a9fdc0c..ddd88b3 100644
--- a/libguile/instructions.c
+++ b/libguile/instructions.c
@@ -28,6 +28,7 @@
 #include "pairs.h"
 #include "symbols.h"
 #include "threads.h"
+#include "version.h"
 
 #include "instructions.h"
 
diff --git a/libguile/intrinsics.c b/libguile/intrinsics.c
index 0e7fbb4..a619fda 100644
--- a/libguile/intrinsics.c
+++ b/libguile/intrinsics.c
@@ -36,6 +36,7 @@
 #include "numbers.h"
 #include "symbols.h"
 #include "threads.h"
+#include "version.h"
 
 #include "intrinsics.h"
 
diff --git a/libguile/ioext.c b/libguile/ioext.c
index 896eb27..d08b68d 100644
--- a/libguile/ioext.c
+++ b/libguile/ioext.c
@@ -48,6 +48,7 @@
 #include "strings.h"
 #include "syscalls.h"
 #include "weak-set.h"
+#include "version.h"
 
 #include "ioext.h"
 
diff --git a/libguile/load.c b/libguile/load.c
index aac789b..f6ad92d 100644
--- a/libguile/load.c
+++ b/libguile/load.c
@@ -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"
diff --git a/libguile/loader.c b/libguile/loader.c
index f4ddfed..bf3f9de 100644
--- a/libguile/loader.c
+++ b/libguile/loader.c
@@ -47,6 +47,7 @@
 #include "programs.h"
 #include "strings.h"
 #include "threads.h"
+#include "version.h"
 
 #include "loader.h"
 
diff --git a/libguile/poll.c b/libguile/poll.c
index 08d4c14..82281ff 100644
--- a/libguile/poll.c
+++ b/libguile/poll.c
@@ -39,6 +39,7 @@
 #include "ports-internal.h"
 #include "syscalls.h"
 #include "vectors.h"
+#include "version.h"
 
 #include "poll.h"
 
diff --git a/libguile/ports.c b/libguile/ports.c
index 263bb2f..4a2e384 100644
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -77,6 +77,7 @@
 #include "syscalls.h"
 #include "variable.h"
 #include "vectors.h"
+#include "version.h"
 #include "weak-set.h"
 
 #include "ports.h"
diff --git a/libguile/posix.c b/libguile/posix.c
index 2e3fed6..2ad6c89 100644
--- a/libguile/posix.c
+++ b/libguile/posix.c
@@ -85,6 +85,7 @@
 #include "threads.h"
 #include "values.h"
 #include "vectors.h"
+#include "version.h"
 
 #include "posix.h"
 
diff --git a/libguile/programs.c b/libguile/programs.c
index 2741147..a5f540a 100644
--- a/libguile/programs.c
+++ b/libguile/programs.c
@@ -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"
diff --git a/libguile/r6rs-ports.c b/libguile/r6rs-ports.c
index 4c78a86..279114f 100644
--- a/libguile/r6rs-ports.c
+++ b/libguile/r6rs-ports.c
@@ -40,6 +40,7 @@
 #include "syscalls.h"
 #include "values.h"
 #include "vectors.h"
+#include "version.h"
 
 #include "r6rs-ports.h"
 
diff --git a/libguile/srfi-1.c b/libguile/srfi-1.c
index 0c79448..ca81293 100644
--- a/libguile/srfi-1.c
+++ b/libguile/srfi-1.c
@@ -38,6 +38,7 @@
 #include "procs.h"
 #include "values.h"
 #include "vectors.h"
+#include "version.h"
 
 #include "srfi-1.h"
 
diff --git a/libguile/srfi-60.c b/libguile/srfi-60.c
index 2fe8bc0..578106e 100644
--- a/libguile/srfi-60.c
+++ b/libguile/srfi-60.c
@@ -32,6 +32,7 @@
 #include "list.h"
 #include "numbers.h"
 #include "pairs.h"
+#include "version.h"
 
 #include "srfi-60.h"
 
diff --git a/libguile/threads.c b/libguile/threads.c
index bec7e70..0e01062 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -63,6 +63,7 @@
 #include "strings.h"
 #include "symbols.h"
 #include "variable.h"
+#include "version.h"
 #include "vm.h"
 
 #include "threads.h"
diff --git a/libguile/unicode.c b/libguile/unicode.c
index c932c10..a48a222 100644
--- a/libguile/unicode.c
+++ b/libguile/unicode.c
@@ -34,6 +34,7 @@
 #include "extensions.h"
 #include "gsubr.h"
 #include "strings.h"
+#include "version.h"
 
 #include "unicode.h"
 
diff --git a/libguile/vm.c b/libguile/vm.c
index db7816a..d6b76f9 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -69,6 +69,7 @@
 #include "symbols.h"
 #include "values.h"
 #include "vectors.h"
+#include "version.h"
 #include "vm-builtins.h"
 
 #include "vm.h"
diff --git a/libguile/weak-vector.c b/libguile/weak-vector.c
index 1d68261..b087891 100644
--- a/libguile/weak-vector.c
+++ b/libguile/weak-vector.c
@@ -32,6 +32,7 @@
 #include "list.h"
 #include "pairs.h"
 #include "vectors.h"
+#include "version.h"
 
 #include "weak-vector.h"