1.0.39.4: fix build on non-darwin and ppc/darwin platforms

  * fix conditional include of langinfo.h

  * conditionalize the darwin/ppc Config file for :dlshim

diff --git a/src/runtime/Config.ppc-darwin b/src/runtime/Config.ppc-darwin
index fc94e87..014657a 100644 (file)
--- a/src/runtime/Config.ppc-darwin
+++ b/src/runtime/Config.ppc-darwin
@@ -11,7 +11,12 @@
 
 CFLAGS = -g -Wall -O2 -fdollars-in-identifiers -mmacosx-version-min=10.4
 LINKFLAGS += -mmacosx-version-min=10.4
-OS_SRC = bsd-os.c darwin-os.c ppc-darwin-os.c darwin-dlshim.c darwin-langinfo.c
+
+OS_SRC = bsd-os.c darwin-os.c ppc-darwin-os.c darwin-langinfo.c
+ifdef LISP_FEATURE_DLSHIM
+  OS_SRC += darwin-dlshim.c
+endif
+
 OS_LIBS = -lSystem -lc
 
 CC = gcc

diff --git a/tools-for-build/grovel-headers.c b/tools-for-build/grovel-headers.c
index 2058cad..de5340d 100644 (file)
--- a/tools-for-build/grovel-headers.c
+++ b/tools-for-build/grovel-headers.c
@@ -38,6 +38,8 @@
   #include <sys/termios.h>
   #ifdef LISP_FEATURE_DARWIN
     #include "../src/runtime/darwin-langinfo.h"
+  #else
+    #include <langinfo.h>
   #endif
   #ifdef LISP_FEATURE_DLSHIM
     #include "../src/runtime/darwin-dlshim.h"

diff --git a/version.lisp-expr b/version.lisp-expr
index a24e0fc..35d7360 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.39.3"
+"1.0.39.4"