From: Matt Birkholz <puck@birchwood-abbey.net>
Date: Thu, 17 Nov 2016 23:39:28 +0000 (-0700)
Subject: Merge branch 'master' into Gtk.
X-Git-Tag: mit-scheme-pucked-9.2.12~254
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=7229238978b79604f93dc23564927608f652e223;p=mit-scheme.git

Merge branch 'master' into Gtk.
---

7229238978b79604f93dc23564927608f652e223
diff --cc src/blowfish/Makefile.am
index fff568fa0,f6b4ddec5..da8a97351
--- a/src/blowfish/Makefile.am
+++ b/src/blowfish/Makefile.am
@@@ -45,11 -45,12 +45,12 @@@ AM_MAKEINFOHTMLFLAGS = --no-spli
  
  # Set these to the defaults used by Scheme.
  infodir = $(datarootdir)/info
 -htmldir = $(libdir)/mit-scheme/doc
 -dvidir = $(libdir)/mit-scheme/doc
 -pdfdir = $(libdir)/mit-scheme/doc
 +htmldir = $(libdir)/mit-scheme-pucked/doc
 +dvidir = $(libdir)/mit-scheme-pucked/doc
 +pdfdir = $(libdir)/mit-scheme-pucked/doc
  
  AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
+ AM_CFLAGS = @MIT_CFLAGS@
  
  blowfish_shim_la_LIBADD = blowfish-adapter.lo
  blowfish_shim_la_LDFLAGS = -module -avoid-version -shared
diff --cc src/gdbm/Makefile.am
index 91969d7e1,332e64860..e0f5031e1
--- a/src/gdbm/Makefile.am
+++ b/src/gdbm/Makefile.am
@@@ -45,11 -45,12 +45,12 @@@ AM_MAKEINFOHTMLFLAGS = --no-spli
  
  # Set these to the defaults used by Scheme.
  infodir = $(datarootdir)/info
 -htmldir = $(libdir)/mit-scheme/doc
 -dvidir = $(libdir)/mit-scheme/doc
 -pdfdir = $(libdir)/mit-scheme/doc
 +htmldir = $(libdir)/mit-scheme-pucked/doc
 +dvidir = $(libdir)/mit-scheme-pucked/doc
 +pdfdir = $(libdir)/mit-scheme-pucked/doc
  
  AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
+ AM_CFLAGS = @MIT_CFLAGS@
  
  gdbm_shim_la_LIBADD = gdbm-adapter.lo
  gdbm_shim_la_LDFLAGS = -module -avoid-version -shared
diff --cc src/mcrypt/Makefile.am
index e986041fc,9bbc0225a..50a311d5b
--- a/src/mcrypt/Makefile.am
+++ b/src/mcrypt/Makefile.am
@@@ -45,11 -45,12 +45,12 @@@ AM_MAKEINFOHTMLFLAGS = --no-spli
  
  # Set these to the defaults used by Scheme.
  infodir = $(datarootdir)/info
 -htmldir = $(libdir)/mit-scheme/doc
 -dvidir = $(libdir)/mit-scheme/doc
 -pdfdir = $(libdir)/mit-scheme/doc
 +htmldir = $(libdir)/mit-scheme-pucked/doc
 +dvidir = $(libdir)/mit-scheme-pucked/doc
 +pdfdir = $(libdir)/mit-scheme-pucked/doc
  
  AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
+ AM_CFLAGS = @MIT_CFLAGS@
  
  mcrypt_shim_la_LIBADD = mcrypt-adapter.lo
  mcrypt_shim_la_LDFLAGS = -module -avoid-version -shared
diff --cc src/md5/Makefile.am
index d6152ac6f,15d6c0493..bc0f8907c
--- a/src/md5/Makefile.am
+++ b/src/md5/Makefile.am
@@@ -45,11 -45,12 +45,12 @@@ AM_MAKEINFOHTMLFLAGS = --no-spli
  
  # Set these to the defaults used by Scheme.
  infodir = $(datarootdir)/info
 -htmldir = $(libdir)/mit-scheme/doc
 -dvidir = $(libdir)/mit-scheme/doc
 -pdfdir = $(libdir)/mit-scheme/doc
 +htmldir = $(libdir)/mit-scheme-pucked/doc
 +dvidir = $(libdir)/mit-scheme-pucked/doc
 +pdfdir = $(libdir)/mit-scheme-pucked/doc
  
  AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
+ AM_CFLAGS = @MIT_CFLAGS@
  
  md5_shim_la_LIBADD = md5-adapter.lo
  md5_shim_la_LDFLAGS = -module -avoid-version -shared
diff --cc src/mhash/Makefile.am
index 427a5f7a3,9dd3dd3f3..a7158f09f
--- a/src/mhash/Makefile.am
+++ b/src/mhash/Makefile.am
@@@ -45,11 -45,12 +45,12 @@@ AM_MAKEINFOHTMLFLAGS = --no-spli
  
  # Set these to the defaults used by Scheme.
  infodir = $(datarootdir)/info
 -htmldir = $(libdir)/mit-scheme/doc
 -dvidir = $(libdir)/mit-scheme/doc
 -pdfdir = $(libdir)/mit-scheme/doc
 +htmldir = $(libdir)/mit-scheme-pucked/doc
 +dvidir = $(libdir)/mit-scheme-pucked/doc
 +pdfdir = $(libdir)/mit-scheme-pucked/doc
  
  AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
+ AM_CFLAGS = @MIT_CFLAGS@
  
  mhash_shim_la_LIBADD = mhash-adapter.lo
  mhash_shim_la_LDFLAGS = -module -avoid-version -shared
diff --cc src/x11-screen/configure.ac
index 6bd367b4c,57ce704e4..5e01a90f8
--- a/src/x11-screen/configure.ac
+++ b/src/x11-screen/configure.ac
@@@ -45,13 -45,10 +45,10 @@@ os_suffix=`echo "(display (microcode-id
  
  MIT_SCHEME_PKD="x11-screen-${os_suffix}.pkd"
  
 -for f in x11-screen; do	# x11-key x11-command
 +for f in x11-screen x11-key x11-command; do
      MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm"
-     MIT_SCHEME_BINs="${MIT_SCHEME_BINs} ${f}.bin"
      MIT_SCHEME_BCIs="${MIT_SCHEME_BCIs} ${f}.bci"
      MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
- ${f}.bin: stamp-scheme"
-     MIT_SCHEME_DEPS="${MIT_SCHEME_DEPS}
  ${f}.bci: stamp-scheme"
      if test "$cc_type" = "c"; then
  	MIT_SCHEME_COMs="${MIT_SCHEME_COMs} ${f}.so"
diff --cc src/x11/Makefile.am
index 815f7b941,e4216c6f3..ba8df27ae
--- a/src/x11/Makefile.am
+++ b/src/x11/Makefile.am
@@@ -45,12 -45,13 +45,13 @@@ AM_MAKEINFOHTMLFLAGS = --no-spli
  
  # Set these to the defaults used by Scheme.
  infodir = $(datarootdir)/info
 -htmldir = $(libdir)/mit-scheme/doc
 -dvidir = $(libdir)/mit-scheme/doc
 -pdfdir = $(libdir)/mit-scheme/doc
 +htmldir = $(libdir)/mit-scheme-pucked/doc
 +dvidir = $(libdir)/mit-scheme-pucked/doc
 +pdfdir = $(libdir)/mit-scheme-pucked/doc
  
  AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
- AM_CFLAGS = `pkg-config --cflags x11`
+ AM_CFLAGS = @MIT_CFLAGS@
+ AM_CFLAGS += `pkg-config --cflags x11`
  LIBS = `pkg-config --libs x11`
  
  x11_shim_la_LIBADD = x11base.lo x11color.lo x11graph.lo x11term.lo