If M4 is an absolute file name that

	no longer exists, use M4=m4.

diff --git a/autoconf.in b/autoconf.in
index bfca676324f4ad9901fcfd9f913e1f581a99a005..e222c0a8cfed0d6315d5e668521e389dfddb0334 100644 (file)
--- a/autoconf.in
+++ b/autoconf.in
@@ -31,6 +31,11 @@ if test "${LANG+set}"   = 'set' ; then LANG=C;   export LANG;   fi
 
 test -z "${AC_MACRODIR}" && AC_MACRODIR=@datadir@
 test -z "${M4}" && M4=@M4@
+case "${M4}" in
+/*) # Handle the case that m4 has moved since we were configured.
+    # It may have been found originally in a build directory.
+    test -f "${M4}" || M4=m4 ;;
+esac
 
 tmpout=/tmp/acout.$$
 

diff --git a/autoconf.sh b/autoconf.sh
index bfca676324f4ad9901fcfd9f913e1f581a99a005..e222c0a8cfed0d6315d5e668521e389dfddb0334 100644 (file)
--- a/autoconf.sh
+++ b/autoconf.sh
@@ -31,6 +31,11 @@ if test "${LANG+set}"   = 'set' ; then LANG=C;   export LANG;   fi
 
 test -z "${AC_MACRODIR}" && AC_MACRODIR=@datadir@
 test -z "${M4}" && M4=@M4@
+case "${M4}" in
+/*) # Handle the case that m4 has moved since we were configured.
+    # It may have been found originally in a build directory.
+    test -f "${M4}" || M4=m4 ;;
+esac
 
 tmpout=/tmp/acout.$$
 

diff --git a/bin/autoconf.in b/bin/autoconf.in
index bfca676324f4ad9901fcfd9f913e1f581a99a005..e222c0a8cfed0d6315d5e668521e389dfddb0334 100644 (file)
--- a/bin/autoconf.in
+++ b/bin/autoconf.in
@@ -31,6 +31,11 @@ if test "${LANG+set}"   = 'set' ; then LANG=C;   export LANG;   fi
 
 test -z "${AC_MACRODIR}" && AC_MACRODIR=@datadir@
 test -z "${M4}" && M4=@M4@
+case "${M4}" in
+/*) # Handle the case that m4 has moved since we were configured.
+    # It may have been found originally in a build directory.
+    test -f "${M4}" || M4=m4 ;;
+esac
 
 tmpout=/tmp/acout.$$