From 0fa4be4e9d80d9870104252d04e49975367f64a3 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 19 May 2002 12:50:47 +0000
Subject: * stepmake/aclocal.m4: Bugfix: complain if program not found.

* scripts/update-lily.py (next_version, prev_version, diff_name):
New function.  Patches now named name-prev-latest.diff.gz.
Bugfix: import shutil.
---
 stepmake/aclocal.m4 | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'stepmake')

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index cf2176ed43..b32e9fcc99 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -55,11 +55,11 @@ AC_DEFUN(STEPMAKE_OPTIONAL_REQUIRED, [
 # Return if tested proram ($1) was found (true) or not (false).
 AC_DEFUN(STEPMAKE_CHECK_SEARCH_RESULT, [
     r="`eval echo '$'"$1"`"
-    if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"$1"`' : '.*\(echo\)' > /dev/null; then
+    if test -n "$r" -a "$r" != "error" -a "$r" != "no" && expr '`eval echo '$'"$1"`' : '.*\(echo\)' > /dev/null; then
+	true
+    else
 	##STEPMAKE_WARN(cannot find $2. $3)
 	false
-    else
-	true
     fi
 ])
 
@@ -596,8 +596,9 @@ AC_DEFUN(STEPMAKE_INIT, [
     AC_SUBST(INSTALL)
     AC_DEFINE_UNQUOTED(DIRSEP, '${DIRSEP}')
     AC_DEFINE_UNQUOTED(PATHSEP, '${PATHSEP}')
-    AC_SUBST(PATHSEP)
     AC_SUBST(DIRSEP)
+    AC_SUBST(PATHSEP)
+    AC_SUBST(ROOTSEP)
   
     STEPMAKE_DATADIR
 ])
-- 
cgit v1.2.3