From: Matt Birkholz Date: Thu, 9 Jun 2016 04:01:20 +0000 (-0700) Subject: plugin Makefile.ams, configure.acs: Search for mit-scheme.h. X-Git-Tag: mit-scheme-pucked-9.2.12~311 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=7ae11371f35d25224b2927803cbf3677231e0169;p=mit-scheme.git plugin Makefile.ams, configure.acs: Search for mit-scheme.h. --- diff --git a/src/cairo/Makefile.am b/src/cairo/Makefile.am index e0179d1fe..f78a29202 100644 --- 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 48e4bc446..460a3db28 100644 --- 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 cca8856d8..6ff876f4a 100644 --- 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 91ed2330b..60f83e9db 100644 --- 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 19dd9ac3b..e85d334d1 100644 --- 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 842bc0f38..8de90be47 100644 --- 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 dada39bbc..d15867e78 100644 --- 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 ec1623df4..729416a68 100644 --- 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 4c23b3350..a217777e5 100644 --- 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 d264fc628..035fd8147 100644 --- 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