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

diff --git a/src/cairo/Makefile.am b/src/cairo/Makefile.am
index e0179d1fe36e74dbb4fd1d79c659a96ac7c120d5..f78a292020078da68ddf433063680834aec505c1 100644 (file)
--- a/src/cairo/Makefile.am
+++ b/src/cairo/Makefile.am
@@ -47,7 +47,7 @@ htmldir = $(libdir)/mit-scheme-pucked/doc
 dvidir = $(libdir)/mit-scheme-pucked/doc
 pdfdir = $(libdir)/mit-scheme-pucked/doc
 
-AM_CPPFLAGS = -I$(scmlibdir)
+AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
 AM_CFLAGS = `pkg-config --cflags pangocairo`
 LIBS = `pkg-config --libs pangocairo`
 

diff --git a/src/cairo/configure.ac b/src/cairo/configure.ac
index 48e4bc4465fa6c55336662f29fff75d0fa6b7eba..460a3db283a1c3dbc4dc5a251c215181883ec9d9 100644 (file)
--- a/src/cairo/configure.ac
+++ b/src/cairo/configure.ac
@@ -71,11 +71,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/gl/Makefile.am b/src/gl/Makefile.am
index cca8856d8312836f98fc15790f5ad6a092626df4..6ff876f4a3805882573864c4cb03b3c58d5896e9 100644 (file)
--- a/src/gl/Makefile.am
+++ b/src/gl/Makefile.am
@@ -48,7 +48,7 @@ htmldir = $(libdir)/mit-scheme-pucked/doc
 dvidir = $(libdir)/mit-scheme-pucked/doc
 pdfdir = $(libdir)/mit-scheme-pucked/doc
 
-AM_CPPFLAGS = -I$(scmlibdir)
+AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
 AM_CFLAGS = `pkg-config --cflags gl glu gtk+-3.0`
 LIBS = `pkg-config --libs gl glu gtk+-3.0`
 

diff --git a/src/gl/configure.ac b/src/gl/configure.ac
index 91ed2330bc144315a57325a44a8a607315f6e7ef..60f83e9db43261a14308d46e37c102f3960241ca 100644 (file)
--- a/src/gl/configure.ac
+++ b/src/gl/configure.ac
@@ -71,11 +71,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/glib/Makefile.am b/src/glib/Makefile.am
index 19dd9ac3b67585bf3ee71d9d72479cd821b98678..e85d334d1aef33408929601a0c9f2bcd7c04f2ec 100644 (file)
--- a/src/glib/Makefile.am
+++ b/src/glib/Makefile.am
@@ -50,7 +50,7 @@ htmldir = $(libdir)/mit-scheme-pucked/doc
 dvidir = $(libdir)/mit-scheme-pucked/doc
 pdfdir = $(libdir)/mit-scheme-pucked/doc
 
-AM_CPPFLAGS = -I$(scmlibdir)
+AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
 AM_CFLAGS = `pkg-config --cflags gio-2.0`
 LIBS = `pkg-config --libs glib-2.0 gthread-2.0 gio-2.0`
 

diff --git a/src/glib/configure.ac b/src/glib/configure.ac
index 842bc0f386a8943eee6c5c78c1b384b64e7f77f4..8de90be47217c4c585fe9006d61d908672097732 100644 (file)
--- a/src/glib/configure.ac
+++ b/src/glib/configure.ac
@@ -71,11 +71,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/gtk/Makefile.am b/src/gtk/Makefile.am
index dada39bbc9ed1c626cd0c130e409f575a216dce4..d15867e781d13fc79760b90c6158df5bac5a6540 100644 (file)
--- a/src/gtk/Makefile.am
+++ b/src/gtk/Makefile.am
@@ -60,7 +60,7 @@ htmldir = $(libdir)/mit-scheme-pucked/doc
 dvidir = $(libdir)/mit-scheme-pucked/doc
 pdfdir = $(libdir)/mit-scheme-pucked/doc
 
-AM_CPPFLAGS = -I$(scmlibdir)
+AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
 AM_CFLAGS = `pkg-config --cflags gtk+-3.0`
 LIBS = `pkg-config --libs gtk+-3.0 gthread-2.0`
 

diff --git a/src/gtk/configure.ac b/src/gtk/configure.ac
index ec1623df497b514fa93db13d8a9ee572e794e979..729416a68e79566e35a71064035563837c0fd4b0 100644 (file)
--- a/src/gtk/configure.ac
+++ b/src/gtk/configure.ac
@@ -93,11 +93,17 @@ ln -sf gtkpanedview-$GTK_VERSION.c gtkpanedview.c
 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/pango/Makefile.am b/src/pango/Makefile.am
index 4c23b3350da80a37ef00555f08ab6395efc6f4c8..a217777e5a0ffbe33701d892b207c49d3cea1d89 100644 (file)
--- a/src/pango/Makefile.am
+++ b/src/pango/Makefile.am
@@ -46,7 +46,7 @@ htmldir = $(libdir)/mit-scheme-pucked/doc
 dvidir = $(libdir)/mit-scheme-pucked/doc
 pdfdir = $(libdir)/mit-scheme-pucked/doc
 
-AM_CPPFLAGS = -I$(scmlibdir)
+AM_CPPFLAGS = -I@MIT_SCHEME_INCLUDEDIR@
 AM_CFLAGS = `pkg-config --cflags pango`
 LIBS = `pkg-config --libs pango`
 

diff --git a/src/pango/configure.ac b/src/pango/configure.ac
index d264fc628723a8fb5e950a35873121f78afce19d..035fd814791f4f5c17934c3e2047b9c9a9844f51 100644 (file)
--- a/src/pango/configure.ac
+++ b/src/pango/configure.ac
@@ -71,11 +71,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