plugin Makefile.ams, configure.acs: Search for mit-scheme.h.

diff --git a/src/blowfish/Makefile.am b/src/blowfish/Makefile.am
index 42f91e477d1238fbb6fd0c6d89d935e6e8554660..1a3d7e0e1b5baefc309a8fe584f2481e363be513 100644 (file)
--- a/src/blowfish/Makefile.am
+++ b/src/blowfish/Makefile.am
@@ -46,7 +46,7 @@ AM_MAKEINFOHTMLFLAGS = --no-split
 infodir = $(datarootdir)/info
 htmldir = $(libdir)/mit-scheme/doc
 
-AM_CPPFLAGS = -I$(scmlibdir)
+AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
 
 blowfish_shim_la_LIBADD = blowfish-adapter.lo
 blowfish_shim_la_LDFLAGS = -module -avoid-version -shared

diff --git a/src/blowfish/configure.ac b/src/blowfish/configure.ac
index 36f5bb5eab2730e414d4b1e99c5d7c8549e69a80..2c70000bad232af3769ac3c68f9f419eac62a339 100644 (file)
--- a/src/blowfish/configure.ac
+++ b/src/blowfish/configure.ac
@@ -95,11 +95,17 @@ fi
 MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
                     echo "          (system-library-directory-pathname)))" ) \
                   | ${MIT_SCHEME_EXE} --batch-mode`
+MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
+                        echo "          (directory-pathname" ;\
+                        echo "           (system-library-pathname" ;\
+                        echo '            "mit-scheme.h"))))' ) \
+                      | ${MIT_SCHEME_EXE} --batch-mode`
 MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
                      | ${MIT_SCHEME_EXE} --batch-mode`
 
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_SCHEME_LIBDIR])
+AC_SUBST([MIT_SCHEME_INCLUDEDIR])
 AC_SUBST([MIT_SCHEME_OS_SUFFIX])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

diff --git a/src/gdbm/Makefile.am b/src/gdbm/Makefile.am
index 4166359ab786bc429c0cfdcbba9c3324e345311e..fd2c906ab6d64f5c5527f387613bbeece779c951 100644 (file)
--- a/src/gdbm/Makefile.am
+++ b/src/gdbm/Makefile.am
@@ -46,7 +46,7 @@ AM_MAKEINFOHTMLFLAGS = --no-split
 infodir = $(datarootdir)/info
 htmldir = $(libdir)/mit-scheme/doc
 
-AM_CPPFLAGS = -I$(scmlibdir)
+AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
 
 gdbm_shim_la_LIBADD = gdbm-adapter.lo
 gdbm_shim_la_LDFLAGS = -module -avoid-version -shared

diff --git a/src/gdbm/configure.ac b/src/gdbm/configure.ac
index f7cc8d7a7a1df2aac7b7af2bd12e08fdee6ae203..7e22a055333e17d106a8fea62a741b675acf1fc8 100644 (file)
--- a/src/gdbm/configure.ac
+++ b/src/gdbm/configure.ac
@@ -50,11 +50,17 @@ LIBS="-lgdbm"
 MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
                     echo "          (system-library-directory-pathname)))" ) \
                   | ${MIT_SCHEME_EXE} --batch-mode`
+MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
+                        echo "          (directory-pathname" ;\
+                        echo "           (system-library-pathname" ;\
+                        echo '            "mit-scheme.h"))))' ) \
+                      | ${MIT_SCHEME_EXE} --batch-mode`
 MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
                      | ${MIT_SCHEME_EXE} --batch-mode`
 
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_SCHEME_LIBDIR])
+AC_SUBST([MIT_SCHEME_INCLUDEDIR])
 AC_SUBST([MIT_SCHEME_OS_SUFFIX])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

diff --git a/src/mcrypt/Makefile.am b/src/mcrypt/Makefile.am
index 57b0b4ad72dabaa0e318d995cb17c666f7104eba..61c4b84394533166ffef313aa0a29ccee856e3d9 100644 (file)
--- a/src/mcrypt/Makefile.am
+++ b/src/mcrypt/Makefile.am
@@ -46,7 +46,7 @@ AM_MAKEINFOHTMLFLAGS = --no-split
 infodir = $(datarootdir)/info
 htmldir = $(libdir)/mit-scheme/doc
 
-AM_CPPFLAGS = -I$(scmlibdir)
+AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
 
 mcrypt_shim_la_LIBADD = mcrypt-adapter.lo
 mcrypt_shim_la_LDFLAGS = -module -avoid-version -shared

diff --git a/src/mcrypt/configure.ac b/src/mcrypt/configure.ac
index 3e0189c3a8acafe5dabae351c30684da3b9632be..11b25dce6047d135da93e4bcc3e06b31b0ae7776 100644 (file)
--- a/src/mcrypt/configure.ac
+++ b/src/mcrypt/configure.ac
@@ -80,11 +80,17 @@ LIBS="${LIBS} ${MCRYPT_LIBS}"
 MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
                     echo "          (system-library-directory-pathname)))" ) \
                   | ${MIT_SCHEME_EXE} --batch-mode`
+MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
+                        echo "          (directory-pathname" ;\
+                        echo "           (system-library-pathname" ;\
+                        echo '            "mit-scheme.h"))))' ) \
+                      | ${MIT_SCHEME_EXE} --batch-mode`
 MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
                      | ${MIT_SCHEME_EXE} --batch-mode`
 
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_SCHEME_LIBDIR])
+AC_SUBST([MIT_SCHEME_INCLUDEDIR])
 AC_SUBST([MIT_SCHEME_OS_SUFFIX])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

diff --git a/src/md5/Makefile.am b/src/md5/Makefile.am
index 726b604441b908814ab8f529462239c0c0f64d04..fc43c22013d212e04c76f82e5695ec54855cf0aa 100644 (file)
--- a/src/md5/Makefile.am
+++ b/src/md5/Makefile.am
@@ -46,7 +46,7 @@ AM_MAKEINFOHTMLFLAGS = --no-split
 infodir = $(datarootdir)/info
 htmldir = $(libdir)/mit-scheme/doc
 
-AM_CPPFLAGS = -I$(scmlibdir)
+AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
 
 md5_shim_la_LIBADD = md5-adapter.lo
 md5_shim_la_LDFLAGS = -module -avoid-version -shared

diff --git a/src/md5/configure.ac b/src/md5/configure.ac
index 9a81281297f4225148f41d08611122da8d8d4b71..49e37f2a7a795c5591e36073c3e213fc60bc37a3 100644 (file)
--- a/src/md5/configure.ac
+++ b/src/md5/configure.ac
@@ -95,11 +95,17 @@ fi
 MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
                     echo "          (system-library-directory-pathname)))" ) \
                   | ${MIT_SCHEME_EXE} --batch-mode`
+MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
+                        echo "          (directory-pathname" ;\
+                        echo "           (system-library-pathname" ;\
+                        echo '            "mit-scheme.h"))))' ) \
+                      | ${MIT_SCHEME_EXE} --batch-mode`
 MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
                      | ${MIT_SCHEME_EXE} --batch-mode`
 
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_SCHEME_LIBDIR])
+AC_SUBST([MIT_SCHEME_INCLUDEDIR])
 AC_SUBST([MIT_SCHEME_OS_SUFFIX])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

diff --git a/src/mhash/Makefile.am b/src/mhash/Makefile.am
index 943907c6450a9834465a42a6dc2b5ce28adee6ed..eede07c9a6e0c3ddbe14784b6b13e51985a117ac 100644 (file)
--- a/src/mhash/Makefile.am
+++ b/src/mhash/Makefile.am
@@ -46,7 +46,7 @@ AM_MAKEINFOHTMLFLAGS = --no-split
 infodir = $(datarootdir)/info
 htmldir = $(libdir)/mit-scheme/doc
 
-AM_CPPFLAGS = -I$(scmlibdir)
+AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
 
 mhash_shim_la_LIBADD = mhash-adapter.lo
 mhash_shim_la_LDFLAGS = -module -avoid-version -shared

diff --git a/src/mhash/configure.ac b/src/mhash/configure.ac
index be81a772cdc0112160781a429b3777337546f48e..1713259b8d74bf6d706087b518ada070307d896e 100644 (file)
--- a/src/mhash/configure.ac
+++ b/src/mhash/configure.ac
@@ -77,11 +77,17 @@ LIBS="-lmhash"
 MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
                     echo "          (system-library-directory-pathname)))" ) \
                   | ${MIT_SCHEME_EXE} --batch-mode`
+MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
+                        echo "          (directory-pathname" ;\
+                        echo "           (system-library-pathname" ;\
+                        echo '            "mit-scheme.h"))))' ) \
+                      | ${MIT_SCHEME_EXE} --batch-mode`
 MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
                      | ${MIT_SCHEME_EXE} --batch-mode`
 
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_SCHEME_LIBDIR])
+AC_SUBST([MIT_SCHEME_INCLUDEDIR])
 AC_SUBST([MIT_SCHEME_OS_SUFFIX])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

diff --git a/src/x11/Makefile.am b/src/x11/Makefile.am
index 1a0a8f5890cfe0ed74e0ce0ab13b7ca11c867fb5..e45dfd57f95136ae468540887d644221c052e6c3 100644 (file)
--- a/src/x11/Makefile.am
+++ b/src/x11/Makefile.am
@@ -50,7 +50,7 @@ htmldir = $(libdir)/mit-scheme/doc
 dvidir = $(libdir)/mit-scheme/doc
 pdfdir = $(libdir)/mit-scheme/doc
 
-AM_CPPFLAGS = -I$(scmlibdir)
+AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
 AM_CFLAGS = `pkg-config --cflags x11`
 LIBS = `pkg-config --libs x11`
 

diff --git a/src/x11/configure.ac b/src/x11/configure.ac
index 08e192cac3dbbaa07799866433667a6dd8fcaa6f..ef6712e9159acf849b75cb7684eedb49ce85ce9e 100644 (file)
--- a/src/x11/configure.ac
+++ b/src/x11/configure.ac
@@ -50,11 +50,17 @@ fi
 MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
                     echo "          (system-library-directory-pathname)))" ) \
                   | ${MIT_SCHEME_EXE} --batch-mode`
+MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
+                        echo "          (directory-pathname" ;\
+                        echo "           (system-library-pathname" ;\
+                        echo '            "mit-scheme.h"))))' ) \
+                      | ${MIT_SCHEME_EXE} --batch-mode`
 MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
                      | ${MIT_SCHEME_EXE} --batch-mode`
 
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_SCHEME_LIBDIR])
+AC_SUBST([MIT_SCHEME_INCLUDEDIR])
 AC_SUBST([MIT_SCHEME_OS_SUFFIX])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT