Bash required for configure

5 files changed, 31 insertions, 38 deletions

diff --git a/Makefile.am b/Makefile.am
index c5e80ec..12f9ca5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ EXTRA_DIST = config.rpath m4/ChangeLog  \
              config/patches bootstrap  \
              po/Makevars.template po/meson.build \
              README.md doc/README.libtool doc/autogen-examples  \
-             l10n nls.h gettext.h version-tool \
+             l10n nls.h gettext.h \
              mpu/binexp \
              mpu/decexp \
              mpu/etens \
diff --git a/acsite.m4 b/acsite.m4
index 8c25e7b..4687fb8 100644
--- a/acsite.m4
+++ b/acsite.m4
@@ -37,12 +37,29 @@ define([_AC_LANG], [C])dnl
 ])dnl
 
 dnl ============================================================
+dnl Force configure to run under /bin/bash
+dnl ============================================================
+m4_define([AC_LIBMPU_REQUIRE_BASH], [dnl
+m4_divert_push([M4SH-SANITIZE])dnl
+
+if test ! -x /bin/bash; then
+  echo "configure: error: /bin/bash is required" >&2
+  exit 1
+fi
+
+CONFIG_SHELL=/bin/bash
+export CONFIG_SHELL
+
+m4_divert_pop([M4SH-SANITIZE])dnl
+])dnl
+
+
+dnl ============================================================
 dnl Support for Configuration Headers
 dnl
 dnl    configure.ac:
 dnl       AC_LIBMPU_HEADLINE(<short-name>, <long-name>,
-dnl                          <vers-var>, <vers-file>,
-dnl                          <copyright>)
+dnl                          <vers-var>, <copyright>)
 dnl
 dnl NOTE:
 dnl ====
@@ -52,16 +69,9 @@ dnl     https://www.gnu.org/software/autoconf/manual/autoconf.html#Diversion-sup
 dnl
 dnl ============================================================
 m4_define([AC_LIBMPU_HEADLINE], [dnl
-m4_divert_push([M4SH-SANITIZE])dnl
+m4_divert_push([M4SH-INIT])dnl
 {
   if test ".`echo dummy [$]@ | grep help`" = .; then
-    ####### bootstrapping version-tool
-    ac_prog=[$]0
-changequote(, )dnl
-    ac_srcdir=`echo $ac_prog | sed -e 's%/[^/][^/]*$%%' -e 's%\([^/]\)/*$%\1%'`
-changequote([, ])dnl
-    test ".$ac_srcdir" = ".$ac_prog" && ac_srcdir=.
-    ac_version_tool="${CONFIG_SHELL-/bin/sh} $ac_srcdir/version-tool"
 
     ####### нахождение escape последовательностей для
     ####### обозначения начала и конца выделяемого текста
@@ -69,23 +79,20 @@ changequote([, ])dnl
     TB=`echo -n -e '\033@<:@1m'`
     TN=`echo -n -e '\033@<:@0m'`
 
-    ####### чтение короткого номера версии продукта (например, "1.0.0")
-    $3="`$ac_version_tool $ac_srcdir/$4`"
+    ####### получение короткого номера версии продукта
+    ####### из AC_INIT()
+    $3="AC_PACKAGE_VERSION"
     AC_SUBST($3)
 
     ####### печать заголовка
     echo "Configuring:"
     echo ""
     echo "${TB}$1${TN} ($2), Version ${TB}${$3}${TN}"
-    echo "$5"
+    echo "$4"
     echo ""
-
-    ####### чтение шестнадцатеричного номера версии продукта (например, 0x100200)
-#    $3_HEX="`$ac_version_tool version -lc -dhex $ac_srcdir/$4`"
-#    AC_SUBST($3_HEX)
   fi
 }
-m4_divert_pop([M4SH-SANITIZE])dnl
+m4_divert_pop([M4SH-INIT])dnl
 ])dnl
 
 
diff --git a/bootstrap b/bootstrap
index b1fa3be..98c7a9b 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 CWD=`pwd`
 
diff --git a/configure.ac b/configure.ac
index 4e962fc..ccaf15e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,14 @@
 
 AC_PREREQ([2.71])
 
-AC_LIBMPU_HEADLINE([libmpu], [MPU Emulation Library],dnl
-[LIBMPU_VERSION], [configure.ac],dnl
-[Copyright (c) 1999-2024 Andrey V.Kosteltsev])dnl
+AC_LIBMPU_REQUIRE_BASH
 
 
 AC_INIT([MPU Library],[1.0.19],[Andrey V.Kosteltsev <support@radix-linux.su>],[libmpu],[https://radix-linux.su])
 
+AC_LIBMPU_HEADLINE([libmpu], [MPU Emulation Library], [LIBMPU_VERSION],dnl
+[Copyright (c) 1999-2024 Andrey V.Kosteltsev])dnl
+
 AC_MSG_CFG_PART(Getting the canonical system type)
 dnl
 dnl NOTE: Следующие вызовы должны осуществляться строго до
diff --git a/version-tool b/version-tool
deleted file mode 100755
index 1e8bbcb..0000000
--- a/version-tool
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-config=$1
-
-version=`cat "$config" | grep '^AC_INIT' | sed 's,.*\[\([0-9]*\.[0-9]*\.[0-9]*\)\].*,\1,'`
-
-echo "${version}"
-
-
-#
-# доработать так, стобы он мог выдавать version_HEX в зависимости от параметра -d short/hex
-#
-# $1 - это configure.ac но с путем к top_srcdir !!!!!!!!!
-#
-