* m4/missing.m4 (AM_MISSING_PROG): Use $SHELL to run "missing"

        * configure.in: Don't add $SHELL to the path of help2man -
        it is already added by AM_MISSING_PROG.

diff --git a/ChangeLog b/ChangeLog
index 852f7bee3f17312e4ace5322c4646865455c9b72..2f27425f17c2f0cb6566656e98257ff0a520b4b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-14  Pavel Roskin  <proski@gnu.org>
+
+       * m4/missing.m4 (AM_MISSING_PROG): Use $SHELL to run "missing"
+       * configure.in: Don't add $SHELL to the path of help2man -
+       it is already added by AM_MISSING_PROG.
+
 2000-10-13  Akim Demaille  <akim@epita.fr>
 
        * tests/mktests.sh: If ever it fails, touch the output files

diff --git a/configure b/configure
index e085d5b445f98f8be594d6c8258b05488471fe01..d8dfc83299c1ef9e5fea81fece787a856ffe1d2d 100755 (executable)
--- a/configure
+++ b/configure
@@ -953,7 +953,7 @@ if (aclocal --version) < /dev/null > /dev/null 2>&1; then
    echo "configure:953: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
-   ACLOCAL="$missing_dir/missing aclocal"
+   ACLOCAL="$SHELL $missing_dir/missing aclocal"
    echo "configure:957: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
@@ -968,7 +968,7 @@ if (autoconf --version) < /dev/null > /dev/null 2>&1; then
    echo "configure:968: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
-   AUTOCONF="$missing_dir/missing autoconf"
+   AUTOCONF="$SHELL $missing_dir/missing autoconf"
    echo "configure:972: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
@@ -983,7 +983,7 @@ if (automake --version) < /dev/null > /dev/null 2>&1; then
    echo "configure:983: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
-   AUTOMAKE="$missing_dir/missing automake"
+   AUTOMAKE="$SHELL $missing_dir/missing automake"
    echo "configure:987: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
@@ -998,7 +998,7 @@ if (autoheader --version) < /dev/null > /dev/null 2>&1; then
    echo "configure:998: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
-   AUTOHEADER="$missing_dir/missing autoheader"
+   AUTOHEADER="$SHELL $missing_dir/missing autoheader"
    echo "configure:1002: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
@@ -1013,7 +1013,7 @@ if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
    echo "configure:1013: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
-   MAKEINFO="$missing_dir/missing makeinfo"
+   MAKEINFO="$SHELL $missing_dir/missing makeinfo"
    echo "configure:1017: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi
@@ -1134,7 +1134,7 @@ if (help2man --version) < /dev/null > /dev/null 2>&1; then
    echo "configure:1134: result: found" >&5
 echo "${ECHO_T}found" >&6
 else
-   HELP2MAN="\${SHELL} \${top_srcdir}/missing help2man"
+   HELP2MAN="$SHELL $missing_dir/missing help2man"
    echo "configure:1138: result: missing" >&5
 echo "${ECHO_T}missing" >&6
 fi

diff --git a/configure.in b/configure.in
index cad5e66ecf93e7cf9520c610f79fb22c41c9accd..22aad3ee1095a71c2effeffb68ab62ced4a7823c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -23,7 +23,7 @@ AC_SUBST(M4)
 AC_PROG_AWK
 
 # Generating man pages.
-AM_MISSING_PROG(HELP2MAN, help2man, [\${SHELL} \${top_srcdir}])
+AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
 
 # We use a path for perl so the #! line in autoscan will work.
 AC_PATH_PROG(PERL, perl, no)

diff --git a/m4/missing.m4 b/m4/missing.m4
index 39178df201c7846b220231fb7b3c771924a96eee..6d383f2bd6e0b6fbe6f671bbf14f968929e29161 100644 (file)
--- a/m4/missing.m4
+++ b/m4/missing.m4
@@ -12,7 +12,7 @@ if ($2 --version) < /dev/null > /dev/null 2>&1; then
    $1=$2
    AC_MSG_RESULT(found)
 else
-   $1="$3/missing $2"
+   $1="$SHELL $3/missing $2"
    AC_MSG_RESULT(missing)
 fi
 AC_SUBST($1)])