Pucked plugin builds: Define MIT_SCHEME_PKD as standard plugins do.

diff --git a/src/cairo/configure.ac b/src/cairo/configure.ac
index df4916b503d0fbc679c5882f266040406444a057..ad7cbea91753542163ea781ade4d9e6c36a61fbd 100644 (file)
--- a/src/cairo/configure.ac
+++ b/src/cairo/configure.ac
@@ -120,16 +120,17 @@ if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then
                             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"
+if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+    MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
+                         | ${MIT_SCHEME_EXE} --batch-mode`
 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`
+                        | ${MIT_SCHEME_EXE} --batch-mode`
 fi
 
+MIT_SCHEME_PKD="cairo-${MIT_SCHEME_OS_SUFFIX}.pkd"
+
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_CFLAGS])

diff --git a/src/devops/configure.ac b/src/devops/configure.ac
index b38d687414acd96785db0edd0f6a03b05edbfa1b..3f9bcc24a9ad699b657327138d9de8c89e79c2b7 100644 (file)
--- a/src/devops/configure.ac
+++ b/src/devops/configure.ac
@@ -47,12 +47,13 @@ if test x"${MIT_SCHEME_LIBDIR}" = x; then
                         echo "          (system-library-directory-pathname)))" ) \
                         | ${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_EXE} --batch-mode`
-    MIT_SCHEME_PKD="devops-${os_suffix}.pkd"
+if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+    MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
+                         | ${MIT_SCHEME_EXE} --batch-mode`
 fi
 
+MIT_SCHEME_PKD="devops-${MIT_SCHEME_OS_SUFFIX}.pkd"
+
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_SCHEME_LIBDIR])

diff --git a/src/gl/configure.ac b/src/gl/configure.ac
index f7f9949c6c732ee08a5136f8eb81761ebbf925e4..3fdfe2e415971ca2f878b4b4e8e6699f176b0570 100644 (file)
--- a/src/gl/configure.ac
+++ b/src/gl/configure.ac
@@ -111,21 +111,22 @@ MIT_SCHEME_PROJECT=mit-scheme-pucked
 if test x"${MIT_SCHEME_LIBDIR}" = x; then
     MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
                         echo "          (system-library-directory-pathname)))" ) \
-                      | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+                      | ${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_TOOLCHAIN_EXE} --batch-mode`
+                            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="gl-${os_suffix}.pkd"
+if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+    MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
+                         | ${MIT_SCHEME_EXE} --batch-mode`
 fi
 
+MIT_SCHEME_PKD="gl-${MIT_SCHEME_OS_SUFFIX}.pkd"
+
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_CFLAGS])

diff --git a/src/glib/configure.ac b/src/glib/configure.ac
index 536202b9f0504f704e35dd516badcc5625e1f55d..2a5a0e517ebeebfb93cb8b92c6a01b1158c4c55d 100644 (file)
--- a/src/glib/configure.ac
+++ b/src/glib/configure.ac
@@ -111,7 +111,7 @@ MIT_SCHEME_PROJECT=mit-scheme-pucked
 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_EXE} --batch-mode`
 fi
 if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then
     MIT_SCHEME_INCLUDEDIR=`( echo "(display (->namestring" ;\
@@ -120,12 +120,13 @@ if test x"${MIT_SCHEME_INCLUDEDIR}" = x; then
                             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_EXE} --batch-mode`
-    MIT_SCHEME_PKD="glib-${os_suffix}.pkd"
+if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+    MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
+                         | ${MIT_SCHEME_EXE} --batch-mode`
 fi
 
+MIT_SCHEME_PKD="glib-${MIT_SCHEME_OS_SUFFIX}.pkd"
+
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_CFLAGS])

diff --git a/src/gtk-screen/configure.ac b/src/gtk-screen/configure.ac
index c60805db85cf21c58499c8b8485f1ef0cd3fd50a..1bd2aebcfbf8d5077a7718328ace9e337711e483 100644 (file)
--- a/src/gtk-screen/configure.ac
+++ b/src/gtk-screen/configure.ac
@@ -44,14 +44,15 @@ MIT_SCHEME_PROJECT=mit-scheme-pucked
 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_EXE} --batch-mode`
 fi
-if test x"${MIT_SCHEME_PKD}" = x; then
-    os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \
-              | ${MIT_SCHEME_EXE} --batch-mode`
-    MIT_SCHEME_PKD="gtk-screen-${os_suffix}.pkd"
+if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+    MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
+                         | ${MIT_SCHEME_EXE} --batch-mode`
 fi
 
+MIT_SCHEME_PKD="gtk-screen-${MIT_SCHEME_OS_SUFFIX}.pkd"
+
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_SCHEME_LIBDIR])

diff --git a/src/gtk/configure.ac b/src/gtk/configure.ac
index 7867de6d2707b18d26d254f9511976b86eddf77b..331e92570c22d5cc2367c25b6d271db0feb07591 100644 (file)
--- a/src/gtk/configure.ac
+++ b/src/gtk/configure.ac
@@ -139,21 +139,22 @@ MIT_SCHEME_PROJECT=mit-scheme-pucked
 if test x"${MIT_SCHEME_LIBDIR}" = x; then
     MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
                         echo "          (system-library-directory-pathname)))" ) \
-                      | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+                      | ${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_TOOLCHAIN_EXE} --batch-mode`
+                            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="gtk-${os_suffix}.pkd"
+if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+    MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
+                         | ${MIT_SCHEME_EXE} --batch-mode`
 fi
 
+MIT_SCHEME_PKD="gtk-${MIT_SCHEME_OS_SUFFIX}.pkd"
+
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_CFLAGS])

diff --git a/src/pango/configure.ac b/src/pango/configure.ac
index 3298b23062caed0c10e2ebab0076f0cd9d33224a..bf1a4edcd8ab3343c1f104695e52ff361c6a9125 100644 (file)
--- a/src/pango/configure.ac
+++ b/src/pango/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 pango plugin],
+AC_INIT([MIT/GNU Scheme Pucked Pango plugin],
         [0.12],
         [matt@birchwood-abbey.net],
         [mit-scheme-pucked-pango])
@@ -111,21 +111,22 @@ MIT_SCHEME_PROJECT=mit-scheme-pucked
 if test x"${MIT_SCHEME_LIBDIR}" = x; then
     MIT_SCHEME_LIBDIR=`( echo "(display (->namestring" ;\
                         echo "          (system-library-directory-pathname)))" ) \
-                      | ${MIT_SCHEME_TOOLCHAIN_EXE} --batch-mode`
+                      | ${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_TOOLCHAIN_EXE} --batch-mode`
+                           | ${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="pango-${os_suffix}.pkd"
+if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+    MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
+                         | ${MIT_SCHEME_EXE} --batch-mode`
 fi
 
+MIT_SCHEME_PKD="pango-${MIT_SCHEME_OS_SUFFIX}.pkd"
+
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_CFLAGS])

diff --git a/src/planetarium/configure.ac b/src/planetarium/configure.ac
index dded75a42914bfdf50acd24e1a88a9f43e3fb45f..c7e402876f39e91dee211f2571dff688de88bc13 100644 (file)
--- a/src/planetarium/configure.ac
+++ b/src/planetarium/configure.ac
@@ -46,12 +46,14 @@ if test x"${MIT_SCHEME_LIBDIR}" = x; then
                         echo "          (system-library-directory-pathname)))" ) \
                         | ${MIT_SCHEME_EXE} --batch-mode`
 fi
-if test x"${MIT_SCHEME_PKD}" = x; then
-    os_suffix=`echo "(display (microcode-id/operating-system-suffix))" \
+if test x"${MIT_SCHEME_OS_SUFFIX}" = x; then
+    MIT_SCHEME_OS_SUFFIX=`echo "(display (microcode-id/operating-system-suffix))" \
               | ${MIT_SCHEME_EXE} --batch-mode`
-    MIT_SCHEME_PKD="mit-${os_suffix}.pkd"
-    MIT_SCHEME_3D_PKD="mit-3d-${os_suffix}.pkd"
 fi
+
+MIT_SCHEME_PKD="mit-${MIT_SCHEME_OS_SUFFIX}.pkd"
+MIT_SCHEME_3D_PKD="mit-3d-${MIT_SCHEME_OS_SUFFIX}.pkd"
+
 AC_SUBST([MIT_SCHEME_PROJECT])
 AC_SUBST([MIT_SCHEME_EXE])
 AC_SUBST([MIT_SCHEME_LIBDIR])