Fix for ash as /bin/sh.

diff --git a/ChangeLog b/ChangeLog
index e6181c0f4abbcc141ba4d0d353e7a5cc399229cf..8f67e141639b39b75c0cc11d11e37e0b83a32a07 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-31  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * stepmake/aclocal.m4: Fix for ash as /bin/sh.
+
 2002-05-31  Han-Wen  <hanwen@cs.uu.nl>
 
        * scripts/musedata2ly.py (Parser.parse_note_line): add dots. Add

diff --git a/aclocal.m4 b/aclocal.m4
index 2aca44bed32961f7205e95c94f4abaf765be37aa..13de08358ced5b3880b6438a19a0feb7606ef6b7 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,7 @@
 dnl aclocal.m4   -*-shell-script-*-
+dnl WARNING WARNING WARNING
+dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
+dnl aclocal.m4   -*-shell-script-*-
 dnl StepMake subroutines for configure.in
 
 
@@ -6,7 +9,12 @@ dnl StepMake subroutines for configure.in
 
 # Get full path of executable ($1)
 AC_DEFUN(STEPMAKE_GET_EXECUTABLE, [
-    type -p "$1" 2>&1 | awk '{print $NF}'
+    ## which doesn't work in ash, if /usr/bin/which isn't installed
+    ## type -p doesn't work in ash
+    ## command -v doesn't work in zsh
+    ## command -v "$1" 2>&1
+    ## this test should work in ash, bash, pdksh (ksh), zsh
+    type -p "$1" 2>/dev/null | tail -1 | awk '{print $NF}'
 ])
 
 
@@ -70,6 +78,7 @@ AC_DEFUN(STEPMAKE_CHECK_SEARCH_RESULT, [
 AC_DEFUN(STEPMAKE_CHECK_VERSION, [
     r="`eval echo '$'"$1"`"
     AC_MSG_CHECKING("$r version")
+    #exe=`STEPMAKE_GET_EXECUTABLE($r)`
     exe=`STEPMAKE_GET_EXECUTABLE($r)`
     ver=`STEPMAKE_GET_VERSION($exe)`
     num=`STEPMAKE_NUMERIC_VERSION($ver)`

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 2aca44bed32961f7205e95c94f4abaf765be37aa..b63198794a9abc035b6b9fb951ade8e0056e43a7 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -6,7 +6,12 @@ dnl StepMake subroutines for configure.in
 
 # Get full path of executable ($1)
 AC_DEFUN(STEPMAKE_GET_EXECUTABLE, [
-    type -p "$1" 2>&1 | awk '{print $NF}'
+    ## which doesn't work in ash, if /usr/bin/which isn't installed
+    ## type -p doesn't work in ash
+    ## command -v doesn't work in zsh
+    ## command -v "$1" 2>&1
+    ## this test should work in ash, bash, pdksh (ksh), zsh
+    type -p "$1" 2>/dev/null | tail -1 | awk '{print $NF}'
 ])
 
 
@@ -70,6 +75,7 @@ AC_DEFUN(STEPMAKE_CHECK_SEARCH_RESULT, [
 AC_DEFUN(STEPMAKE_CHECK_VERSION, [
     r="`eval echo '$'"$1"`"
     AC_MSG_CHECKING("$r version")
+    #exe=`STEPMAKE_GET_EXECUTABLE($r)`
     exe=`STEPMAKE_GET_EXECUTABLE($r)`
     ver=`STEPMAKE_GET_VERSION($exe)`
     num=`STEPMAKE_NUMERIC_VERSION($ver)`