From 9bd552b9f554d8ebb0e561cf4c706e7175ec73bb Mon Sep 17 00:00:00 2001 From: Matt Birkholz Date: Wed, 31 Jul 2019 14:02:10 -0700 Subject: [PATCH] Plugin build: use MIT_SCHEME_PKD rather than MIT_SCHEME_OS_SUFFIX. --- src/blowfish/configure.ac | 9 ++++----- src/cairo/Makefile.am | 4 ++-- src/cairo/configure.ac | 31 +++++++++++++++++++++---------- src/edwin/configure.ac | 9 ++++----- src/gdbm/configure.ac | 9 ++++----- src/imail/Makefile.am | 2 +- src/imail/configure.ac | 9 ++++----- src/mcrypt/configure.ac | 9 ++++----- src/pgsql/configure.ac | 9 ++++----- src/x11-screen/configure.ac | 9 ++++----- src/x11/configure.ac | 11 +++++------ 11 files changed, 57 insertions(+), 54 deletions(-) diff --git a/src/blowfish/configure.ac b/src/blowfish/configure.ac index 0eb3249e3..ec8a20bd9 100644 --- a/src/blowfish/configure.ac +++ b/src/blowfish/configure.ac @@ -152,17 +152,16 @@ if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then echo ' "mit-scheme.h"))))' ) \ | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` fi -if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then - MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \ - | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` +if test x"${MIT_SCHEME_PKD}" = x; then + os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \ + | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` + MIT_SCHEME_PKD="blowfish-${os_suffix}.pkd" fi if test x"${MIT_SCHEME_CC_TYPE}" = x; then MIT_SCHEME_CC_TYPE=`echo "(display microcode-id/compiled-code-type)" \ | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` fi -MIT_SCHEME_PKD="blowfish-${MIT_SCHEME_OS_SUFFIX}.pkd" - for f in blowfish; do MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm" MIT_SCHEME_BCIs="${MIT_SCHEME_BCIs} ${f}.bci" diff --git a/src/cairo/Makefile.am b/src/cairo/Makefile.am index d1f0af1d1..9dbcb84d8 100644 --- a/src/cairo/Makefile.am +++ b/src/cairo/Makefile.am @@ -40,7 +40,7 @@ binaries += cairo-graphics.bci cairo-graphics.com scmlib_sub_DATA = $(sources) scmlib_sub_DATA += $(binaries) -scmlib_sub_DATA += make.scm cairo.pkg cairo-@MIT_SCHEME_OS_SUFFIX@.pkd +scmlib_sub_DATA += make.scm cairo.pkg @MIT_SCHEME_OS_PKD@ scminfo_DATA = cairo.info info_TEXINFOS = cairo.texi @@ -77,7 +77,7 @@ cairo.bci: stamp-scheme cairo.com: stamp-scheme cairo-graphics.bci: stamp-scheme cairo-graphics.com: stamp-scheme -cairo-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme +@MIT_SCHEME_PKD@: stamp-scheme stamp-scheme: stamp-shim $(sources) cairo.pkg touch stamp-scheme if ! ./compile.sh; then rm stamp-scheme; exit 1; fi diff --git a/src/cairo/configure.ac b/src/cairo/configure.ac index dcd6d9ccf..df4916b50 100644 --- a/src/cairo/configure.ac +++ b/src/cairo/configure.ac @@ -108,22 +108,33 @@ fi MIT_SCHEME_PROJECT=mit-scheme-pucked : ${MIT_SCHEME_EXE=mit-scheme} -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"))))' ) \ +if test x"${MIT_SCHEME_LIBDIR}" = x; then + MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\ + echo " (system-library-directory-pathname)))" ) \ | ${MIT_SCHEME_EXE} --batch-mode` -MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \ - | ${MIT_SCHEME_EXE} --batch-mode` +fi +if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then + MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\ + echo " (directory-pathname" ;\ + echo " (system-library-pathname" ;\ + echo ' "mit-scheme.h"))))' ) \ + | ${MIT_SCHEME_EXE} --batch-mode` +fi +if test x"${MIT_SCHEME_PKD}" = x; then + os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \ + | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` + MIT_SCHEME_PKD="cairo-${os_suffix}.pkd" +fi +if test x"${MIT_SCHEME_CC_TYPE}" = x; then + MIT_SCHEME_CC_TYPE=`echo "(display microcode-id/compiled-code-type)" \ + | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` +fi AC_SUBST([MIT_SCHEME_PROJECT]) AC_SUBST([MIT_SCHEME_EXE]) AC_SUBST([MIT_CFLAGS]) AC_SUBST([MIT_SCHEME_LIBDIR]) AC_SUBST([MIT_SCHEME_INCLUDEDIR]) -AC_SUBST([MIT_SCHEME_OS_SUFFIX]) +AC_SUBST([MIT_SCHEME_PKD]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/src/edwin/configure.ac b/src/edwin/configure.ac index 05d066d57..47cdb516d 100644 --- a/src/edwin/configure.ac +++ b/src/edwin/configure.ac @@ -53,13 +53,12 @@ if test x"${MIT_SCHEME_LIBDIR}" = x; then echo " (system-library-directory-pathname)))" ) \ | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` fi -if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then - MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \ - | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` +if test x"${MIT_SCHEME_PKD}" = x; then + os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \ + | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` + MIT_SCHEME_PKD="edwin-${os_suffix}.pkd" fi -MIT_SCHEME_PKD="edwin-${MIT_SCHEME_OS_SUFFIX}.pkd" - AC_SUBST([MIT_SCHEME_PROJECT]) AC_SUBST([MIT_SCHEME_TOOLCHAIN_EXE]) AC_SUBST([MIT_SCHEME_LIBDIR]) diff --git a/src/gdbm/configure.ac b/src/gdbm/configure.ac index a917879d3..04d98700b 100644 --- a/src/gdbm/configure.ac +++ b/src/gdbm/configure.ac @@ -103,17 +103,16 @@ if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then echo ' "mit-scheme.h"))))' ) \ | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` fi -if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then - MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \ - | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` +if test x"${MIT_SCHEME_PKD}" = x; then + os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \ + | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` + MIT_SCHEME_PKD="gdbm-${os_suffix}.pkd" fi if test x"${MIT_SCHEME_CC_TYPE}" = x; then MIT_SCHEME_CC_TYPE=`echo "(display microcode-id/compiled-code-type)" \ | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` fi -MIT_SCHEME_PKD="gdbm-${MIT_SCHEME_OS_SUFFIX}.pkd" - for f in gdbm; do MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm" MIT_SCHEME_BCIs="${MIT_SCHEME_BCIs} ${f}.bci" diff --git a/src/imail/Makefile.am b/src/imail/Makefile.am index a1bb904fe..62d4bf9cf 100644 --- a/src/imail/Makefile.am +++ b/src/imail/Makefile.am @@ -80,7 +80,7 @@ imap-response.bci: stamp-scheme imap-response.com: stamp-scheme imap-syntax.bci: stamp-scheme imap-syntax.com: stamp-scheme -imail-@MIT_SCHEME_OS_SUFFIX@.pkd: stamp-scheme +@MIT_SCHEME_PKD@: stamp-scheme stamp-scheme: $(sources) imail.pkg MIT_SCHEME_EXE=$(MIT_SCHEME_EXE) ./compile.sh echo "done" > $@ diff --git a/src/imail/configure.ac b/src/imail/configure.ac index 1eaf840f8..159f854b9 100644 --- a/src/imail/configure.ac +++ b/src/imail/configure.ac @@ -53,13 +53,12 @@ if test x"${MIT_SCHEME_LIBDIR}" = x; then echo " (system-library-directory-pathname)))" ) \ | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` fi -if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then - MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \ - | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` +if test x"${MIT_SCHEME_PKD}" = x; then + os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \ + | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` + MIT_SCHEME_PKD="imail-${os_suffix}.pkd" fi -MIT_SCHEME_PKD="imail-${MIT_SCHEME_OS_SUFFIX}.pkd" - AC_SUBST([MIT_SCHEME_PROJECT]) AC_SUBST([MIT_SCHEME_TOOLCHAIN_EXE]) AC_SUBST([MIT_SCHEME_LIBDIR]) diff --git a/src/mcrypt/configure.ac b/src/mcrypt/configure.ac index 6b3b64f4d..3ee1ae8e2 100644 --- a/src/mcrypt/configure.ac +++ b/src/mcrypt/configure.ac @@ -137,17 +137,16 @@ if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then echo ' "mit-scheme.h"))))' ) \ | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` fi -if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then - MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \ - | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` +if test x"${MIT_SCHEME_PKD}" = x; then + os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \ + | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` + MIT_SCHEME_PKD="mcrypt-${os_suffix}.pkd" fi if test x"${MIT_SCHEME_CC_TYPE}" = x; then MIT_SCHEME_CC_TYPE=`echo "(display microcode-id/compiled-code-type)" \ | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` fi -MIT_SCHEME_PKD="mcrypt-${MIT_SCHEME_OS_SUFFIX}.pkd" - for f in mcrypt; do MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm" MIT_SCHEME_BCIs="${MIT_SCHEME_BCIs} ${f}.bci" diff --git a/src/pgsql/configure.ac b/src/pgsql/configure.ac index 226686f7d..4b795ca98 100644 --- a/src/pgsql/configure.ac +++ b/src/pgsql/configure.ac @@ -138,17 +138,16 @@ if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then echo ' "mit-scheme.h"))))' ) \ | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` fi -if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then - MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \ - | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` +if test x"${MIT_SCHEME_PKD}" = x; then + os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \ + | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` + MIT_SCHEME_PKD="pgsql-${os_suffix}.pkd" fi if test x"${MIT_SCHEME_CC_TYPE}" = x; then MIT_SCHEME_CC_TYPE=`echo "(display microcode-id/compiled-code-type)" \ | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` fi -MIT_SCHEME_PKD="pgsql-${MIT_SCHEME_OS_SUFFIX}.pkd" - for f in pgsql; do MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm" MIT_SCHEME_BCIs="${MIT_SCHEME_BCIs} ${f}.bci" diff --git a/src/x11-screen/configure.ac b/src/x11-screen/configure.ac index 9bfdb937a..4c8207399 100644 --- a/src/x11-screen/configure.ac +++ b/src/x11-screen/configure.ac @@ -53,17 +53,16 @@ if test x"${MIT_SCHEME_LIBDIR}" = x; then echo " (system-library-directory-pathname)))" ) \ | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` fi -if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then - MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \ - | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` +if test x"${MIT_SCHEME_PKD}" = x; then + os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \ + | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` + MIT_SCHEME_PKD="x11-screen-${os_suffix}.pkd" fi if test x"${MIT_SCHEME_CC_TYPE}" = x; then MIT_SCHEME_CC_TYPE=`echo "(display microcode-id/compiled-code-type)" \ | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` fi -MIT_SCHEME_PKD="x11-screen-${MIT_SCHEME_OS_SUFFIX}.pkd" - for f in x11-screen x11-key x11-command; do MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm" MIT_SCHEME_BCIs="${MIT_SCHEME_BCIs} ${f}.bci" diff --git a/src/x11/configure.ac b/src/x11/configure.ac index 772af14af..47b22f8db 100644 --- a/src/x11/configure.ac +++ b/src/x11/configure.ac @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([MIT/GNU Scheme Pucked x11 plugin], +AC_INIT([MIT/GNU Scheme Pucked X11 plugin], [1.3.3], [matt@birchwood-abbey.net], [mit-scheme-pucked-x11]) @@ -125,17 +125,16 @@ if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then echo ' "mit-scheme.h"))))' ) \ | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` fi -if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then - MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \ - | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` +if test x"${MIT_SCHEME_PKD}" = x; then + os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \ + | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` + MIT_SCHEME_PKD="x11-${os_suffix}.pkd" fi if test x"${MIT_SCHEME_CC_TYPE}" = x; then MIT_SCHEME_CC_TYPE=`echo "(display microcode-id/compiled-code-type)" \ | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode` fi -MIT_SCHEME_PKD="x11-${MIT_SCHEME_OS_SUFFIX}.pkd" - for f in x11-base x11-color x11-graphics x11-terminal x11-device; do MIT_SCHEME_SCMs="${MIT_SCHEME_SCMs} ${f}.scm" MIT_SCHEME_BCIs="${MIT_SCHEME_BCIs} ${f}.bci" -- 2.25.1