From: Matt Birkholz Date: Tue, 7 Jun 2016 18:28:31 +0000 (-0700) Subject: plugin Makefile.ams, configure.acs: Search for mit-scheme.h. X-Git-Tag: mit-scheme-pucked-9.2.12~261^2~34 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=64559400ce68c99c8db8c3b8ff6de5f981919bb1;p=mit-scheme.git plugin Makefile.ams, configure.acs: Search for mit-scheme.h. --- diff --git a/src/blowfish/Makefile.am b/src/blowfish/Makefile.am index 42f91e477..1a3d7e0e1 100644 --- 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 36f5bb5ea..2c70000ba 100644 --- 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 4166359ab..fd2c906ab 100644 --- 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 f7cc8d7a7..7e22a0553 100644 --- 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 57b0b4ad7..61c4b8439 100644 --- 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 3e0189c3a..11b25dce6 100644 --- 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 726b60444..fc43c2201 100644 --- 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 9a8128129..49e37f2a7 100644 --- 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 943907c64..eede07c9a 100644 --- 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 be81a772c..1713259b8 100644 --- 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 1a0a8f589..e45dfd57f 100644 --- 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 08e192cac..ef6712e91 100644 --- 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