From: Matt Birkholz <puck@birchwood-abbey.net>
Date: Sat, 28 May 2016 22:21:11 +0000 (-0700)
Subject: plugin builds: Punt AC_PROG_LIBTOOL.  Use MIT_SCHEME_LIBDIR.
X-Git-Tag: mit-scheme-pucked-9.2.12~261^2~39
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=1894752a6f38afe607af1f8b1e3dc9548a971855;p=mit-scheme.git

plugin builds: Punt AC_PROG_LIBTOOL.  Use MIT_SCHEME_LIBDIR.

AC_PROG_LIBTOOL is deprecated.  MIT_SCHEME_LIBDIR replaces both
MIT_SCHEME_ARCH and the project name, allowing the latter to be more
easily changed.
---

diff --git a/src/blowfish/Makefile.am b/src/blowfish/Makefile.am
index 12edf6d16..42f91e477 100644
--- a/src/blowfish/Makefile.am
+++ b/src/blowfish/Makefile.am
@@ -26,8 +26,8 @@ ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = autogen.sh
 
 MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
-scmlibdir = $(libdir)/mit-scheme-@MIT_SCHEME_ARCH@
-scmlib_blowfishdir = $(scmlibdir)/blowfish
+scmlibdir = @MIT_SCHEME_LIBDIR@
+scmlib_blowfishdir = $(scmlibdir)blowfish
 
 scmlib_LTLIBRARIES = blowfish-shim.la
 scmlib_DATA = blowfish-types.bin blowfish-const.bin
@@ -97,7 +97,7 @@ EXTRA_DIST += blowfish-check.scm blowfish-check.sh
 EXTRA_DIST += make.scm optiondb.scm tags-fix.sh
 
 install-data-hook:
-	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
+	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 	| $(MIT_SCHEME_EXE) --batch-mode
 
 #install-html: install-html-am
@@ -105,7 +105,7 @@ install-data-hook:
 #	| $(MIT_SCHEME_EXE) --batch-mode
 
 uninstall-hook:
-	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
+	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 	| $(MIT_SCHEME_EXE) --batch-mode
 	[ -d "$(DESTDIR)$(scmlib_blowfishdir)" ] \
 	&& rmdir "$(DESTDIR)$(scmlib_blowfishdir)"
diff --git a/src/blowfish/configure.ac b/src/blowfish/configure.ac
index 00a43360a..36f5bb5ea 100644
--- a/src/blowfish/configure.ac
+++ b/src/blowfish/configure.ac
@@ -61,7 +61,9 @@ USA.
 
 AM_INIT_AUTOMAKE
 
-AC_PROG_LIBTOOL
+LT_PREREQ([2.2.6])
+LT_INIT([dlopen])
+
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
@@ -71,10 +73,6 @@ AC_ARG_WITH([openssl],
 	[Use OpenSSL crypto library if available [[yes]]]))
 : ${with_openssl='yes'}
 
-dnl Initialize libtool
-LT_PREREQ([2.2.6])
-LT_INIT([dlopen win32-dll])
-
 dnl The OpenSSL crypto library provides support for blowfish.
 if test "${with_openssl}" != no; then
     if test "${with_openssl}" != yes; then
@@ -94,13 +92,14 @@ if test "${with_openssl}" != no; then
 fi
 
 : ${MIT_SCHEME_EXE=mit-scheme}
-MIT_SCHEME_ARCH=`echo "(display microcode-id/compiled-code-type)" \
-		 | ${MIT_SCHEME_EXE} --batch-mode`
+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`
+		      | ${MIT_SCHEME_EXE} --batch-mode`
 
 AC_SUBST([MIT_SCHEME_EXE])
-AC_SUBST([MIT_SCHEME_ARCH])
+AC_SUBST([MIT_SCHEME_LIBDIR])
 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 47f60794e..4166359ab 100644
--- a/src/gdbm/Makefile.am
+++ b/src/gdbm/Makefile.am
@@ -26,8 +26,8 @@ ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = autogen.sh
 
 MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
-scmlibdir = $(libdir)/mit-scheme-@MIT_SCHEME_ARCH@
-scmlib_gdbmdir = $(scmlibdir)/gdbm
+scmlibdir = @MIT_SCHEME_LIBDIR@
+scmlib_gdbmdir = $(scmlibdir)gdbm
 
 scmlib_LTLIBRARIES = gdbm-shim.la
 scmlib_DATA = gdbm-types.bin gdbm-const.bin
@@ -97,7 +97,7 @@ EXTRA_DIST += compile.scm gdbm-check.scm gdbm-check.sh
 EXTRA_DIST += make.scm optiondb.scm tags-fix.sh
 
 install-data-hook:
-	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
+	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 	| $(MIT_SCHEME_EXE) --batch-mode
 
 #install-html: install-html-am
@@ -105,7 +105,7 @@ install-data-hook:
 #	| $(MIT_SCHEME_EXE) --batch-mode
 
 uninstall-hook:
-	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
+	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 	| $(MIT_SCHEME_EXE) --batch-mode
 	[ -d "$(DESTDIR)$(scmlib_gdbmdir)" ] \
 	&& rmdir "$(DESTDIR)$(scmlib_gdbmdir)"
diff --git a/src/gdbm/configure.ac b/src/gdbm/configure.ac
index 7abf677d3..f7cc8d7a7 100644
--- a/src/gdbm/configure.ac
+++ b/src/gdbm/configure.ac
@@ -34,28 +34,27 @@ USA.
 
 AM_INIT_AUTOMAKE
 
-AC_PROG_LIBTOOL
+LT_PREREQ([2.2.6])
+LT_INIT([dlopen])
+
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
 
-dnl Initialize libtool
-LT_PREREQ([2.2.6])
-LT_INIT([dlopen win32-dll])
-
 AC_CHECK_HEADER([gdbm.h],[],[
     AC_MSG_ERROR([Header file <gdbm.h> not found.])])
 
 LIBS="-lgdbm"
 
 : ${MIT_SCHEME_EXE=mit-scheme}
-MIT_SCHEME_ARCH=`echo "(display microcode-id/compiled-code-type)" \
-		 | ${MIT_SCHEME_EXE} --batch-mode`
+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`
+		      | ${MIT_SCHEME_EXE} --batch-mode`
 
 AC_SUBST([MIT_SCHEME_EXE])
-AC_SUBST([MIT_SCHEME_ARCH])
+AC_SUBST([MIT_SCHEME_LIBDIR])
 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 6f3fbfa2f..57b0b4ad7 100644
--- a/src/mcrypt/Makefile.am
+++ b/src/mcrypt/Makefile.am
@@ -26,8 +26,8 @@ ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = autogen.sh
 
 MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
-scmlibdir = $(libdir)/mit-scheme-@MIT_SCHEME_ARCH@
-scmlib_mcryptdir = $(scmlibdir)/mcrypt
+scmlibdir = @MIT_SCHEME_LIBDIR@
+scmlib_mcryptdir = $(scmlibdir)mcrypt
 
 scmlib_LTLIBRARIES = mcrypt-shim.la
 scmlib_DATA = mcrypt-types.bin mcrypt-const.bin
@@ -92,12 +92,12 @@ all_sources = $(sources) mcrypt-adapter.c
 ETAGS_ARGS = $(all_sources) -r '/^([^iI].*/' $(cdecls)
 TAGS_DEPENDENCIES = $(all_sources) $(cdecls)
 
-EXTRA_DIST += $(all_sources) $(cdecls) mcrypt.pkg
-EXTRA_DIST += compile.scm mcrypt-check.scm mcrypt-check.sh
+EXTRA_DIST += $(all_sources) $(cdecls) compile.scm mcrypt.pkg
+EXTRA_DIST += mcrypt-check.scm mcrypt-check.sh
 EXTRA_DIST += make.scm optiondb.scm tags-fix.sh
 
 install-data-hook:
-	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
+	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 	| $(MIT_SCHEME_EXE) --batch-mode
 
 #install-html: install-html-am
@@ -105,7 +105,7 @@ install-data-hook:
 #	| $(MIT_SCHEME_EXE) --batch-mode
 
 uninstall-hook:
-	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
+	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 	| $(MIT_SCHEME_EXE) --batch-mode
 	[ -d "$(DESTDIR)$(scmlib_mcryptdir)" ] \
 	&& rmdir "$(DESTDIR)$(scmlib_mcryptdir)"
diff --git a/src/mcrypt/configure.ac b/src/mcrypt/configure.ac
index 9ecaa099a..3e0189c3a 100644
--- a/src/mcrypt/configure.ac
+++ b/src/mcrypt/configure.ac
@@ -61,7 +61,9 @@ USA.
 
 AM_INIT_AUTOMAKE
 
-AC_PROG_LIBTOOL
+LT_PREREQ([2.2.6])
+LT_INIT([dlopen])
+
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
@@ -75,13 +77,14 @@ CFLAGS="${MCRYPT_CFLAGS} ${CFLAGS}"
 LIBS="${LIBS} ${MCRYPT_LIBS}"
 
 : ${MIT_SCHEME_EXE=mit-scheme}
-MIT_SCHEME_ARCH=`echo "(display microcode-id/compiled-code-type)" \
-		 | ${MIT_SCHEME_EXE} --batch-mode`
+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`
+		      | ${MIT_SCHEME_EXE} --batch-mode`
 
 AC_SUBST([MIT_SCHEME_EXE])
-AC_SUBST([MIT_SCHEME_ARCH])
+AC_SUBST([MIT_SCHEME_LIBDIR])
 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 263868aa9..726b60444 100644
--- a/src/md5/Makefile.am
+++ b/src/md5/Makefile.am
@@ -26,8 +26,8 @@ ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = autogen.sh
 
 MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
-scmlibdir = $(libdir)/mit-scheme-@MIT_SCHEME_ARCH@
-scmlib_md5dir = $(scmlibdir)/md5
+scmlibdir = @MIT_SCHEME_LIBDIR@
+scmlib_md5dir = $(scmlibdir)md5
 
 scmlib_LTLIBRARIES = md5-shim.la
 scmlib_DATA = md5-types.bin md5-const.bin
@@ -92,12 +92,12 @@ all_sources = $(sources) md5-adapter.c
 ETAGS_ARGS = $(all_sources) -r '/^([^iI].*/' $(cdecls)
 TAGS_DEPENDENCIES = $(all_sources) $(cdecls)
 
-EXTRA_DIST += $(all_sources) $(cdecls) md5.pkg
-EXTRA_DIST += compile.scm md5-check.scm md5-check.sh
+EXTRA_DIST += $(all_sources) $(cdecls) compile.scm md5.pkg
+EXTRA_DIST += md5-check.scm md5-check.sh
 EXTRA_DIST += make.scm optiondb.scm tags-fix.sh
 
 install-data-hook:
-	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
+	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 	| $(MIT_SCHEME_EXE) --batch-mode
 
 #install-html: install-html-am
@@ -105,7 +105,7 @@ install-data-hook:
 #	| $(MIT_SCHEME_EXE) --batch-mode
 
 uninstall-hook:
-	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
+	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 	| $(MIT_SCHEME_EXE) --batch-mode
 	[ -d "$(DESTDIR)$(scmlib_md5dir)" ] \
 	&& rmdir "$(DESTDIR)$(scmlib_md5dir)"
diff --git a/src/md5/configure.ac b/src/md5/configure.ac
index 85f83d9c3..9a8128129 100644
--- a/src/md5/configure.ac
+++ b/src/md5/configure.ac
@@ -61,7 +61,9 @@ USA.
 
 AM_INIT_AUTOMAKE
 
-AC_PROG_LIBTOOL
+LT_PREREQ([2.2.6])
+LT_INIT([dlopen])
+
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
@@ -71,10 +73,6 @@ AC_ARG_WITH([openssl],
 	[Use OpenSSL crypto library if available [[yes]]]))
 : ${with_openssl='yes'}
 
-dnl Initialize libtool
-LT_PREREQ([2.2.6])
-LT_INIT([dlopen win32-dll])
-
 dnl The OpenSSL crypto library provides support for md5.
 if test "${with_openssl}" != no; then
     if test "${with_openssl}" != yes; then
@@ -94,13 +92,14 @@ if test "${with_openssl}" != no; then
 fi
 
 : ${MIT_SCHEME_EXE=mit-scheme}
-MIT_SCHEME_ARCH=`echo "(display microcode-id/compiled-code-type)" \
-		 | ${MIT_SCHEME_EXE} --batch-mode`
+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`
+		      | ${MIT_SCHEME_EXE} --batch-mode`
 
 AC_SUBST([MIT_SCHEME_EXE])
-AC_SUBST([MIT_SCHEME_ARCH])
+AC_SUBST([MIT_SCHEME_LIBDIR])
 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 fb3e6c9d7..943907c64 100644
--- a/src/mhash/Makefile.am
+++ b/src/mhash/Makefile.am
@@ -26,8 +26,8 @@ ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = autogen.sh
 
 MIT_SCHEME_EXE = @MIT_SCHEME_EXE@
-scmlibdir = $(libdir)/mit-scheme-@MIT_SCHEME_ARCH@
-scmlib_mhashdir = $(scmlibdir)/mhash
+scmlibdir = @MIT_SCHEME_LIBDIR@
+scmlib_mhashdir = $(scmlibdir)mhash
 
 scmlib_LTLIBRARIES = mhash-shim.la
 scmlib_DATA = mhash-types.bin mhash-const.bin
@@ -92,12 +92,12 @@ all_sources = $(sources) mhash-adapter.c
 ETAGS_ARGS = $(all_sources) -r '/^([^iI].*/' $(cdecls)
 TAGS_DEPENDENCIES = $(all_sources) $(cdecls)
 
-EXTRA_DIST += $(all_sources) $(cdecls) mhash.pkg
-EXTRA_DIST += compile.scm mhash-check.scm mhash-check.sh
+EXTRA_DIST += $(all_sources) $(cdecls) compile.scm mhash.pkg
+EXTRA_DIST += mhash-check.scm mhash-check.sh
 EXTRA_DIST += make.scm optiondb.scm tags-fix.sh
 
 install-data-hook:
-	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
+	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 	| $(MIT_SCHEME_EXE) --batch-mode
 
 #install-html: install-html-am
@@ -105,7 +105,7 @@ install-data-hook:
 #	| $(MIT_SCHEME_EXE) --batch-mode
 
 uninstall-hook:
-	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)/")' \
+	echo '(update-optiondb "$(DESTDIR)$(scmlibdir)")' \
 	| $(MIT_SCHEME_EXE) --batch-mode
 	[ -d "$(DESTDIR)$(scmlib_mhashdir)" ] \
 	&& rmdir "$(DESTDIR)$(scmlib_mhashdir)"
diff --git a/src/mhash/configure.ac b/src/mhash/configure.ac
index 370d598d5..be81a772c 100644
--- a/src/mhash/configure.ac
+++ b/src/mhash/configure.ac
@@ -61,28 +61,27 @@ USA.
 
 AM_INIT_AUTOMAKE
 
-AC_PROG_LIBTOOL
+LT_PREREQ([2.2.6])
+LT_INIT([dlopen])
+
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
 
-dnl Initialize libtool
-LT_PREREQ([2.2.6])
-LT_INIT([dlopen win32-dll])
-
 AC_CHECK_HEADER([mhash.h],[],[
     AC_MSG_ERROR([Header file <mhash.h> not found.])])
 
 LIBS="-lmhash"
 
 : ${MIT_SCHEME_EXE=mit-scheme}
-MIT_SCHEME_ARCH=`echo "(display microcode-id/compiled-code-type)" \
-		 | ${MIT_SCHEME_EXE} --batch-mode`
+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`
+		      | ${MIT_SCHEME_EXE} --batch-mode`
 
 AC_SUBST([MIT_SCHEME_EXE])
-AC_SUBST([MIT_SCHEME_ARCH])
+AC_SUBST([MIT_SCHEME_LIBDIR])
 AC_SUBST([MIT_SCHEME_OS_SUFFIX])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT