From: Akim Demaille <akim@epita.fr>
Date: Tue, 21 Mar 2000 12:22:27 +0000 (+0000)
Subject: * tests/semantics.m4 (AC_PATH_PROG, AC_PATH_PROGS): New tests.
X-Git-Tag: autoconf-2.50~1011
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=700c767833631be9d392184e55c2e100775ceeee;p=thirdparty%2Fautoconf.git

* tests/semantics.m4 (AC_PATH_PROG, AC_PATH_PROGS): New tests.
---

diff --git a/ChangeLog b/ChangeLog
index fa859ee78..b980f5e1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-03-21  Akim Demaille  <akim@epita.fr>
+
+	* tests/semantics.m4 (AC_PATH_PROG, AC_PATH_PROGS): New tests.
+
 2000-03-21  Akim Demaille  <akim@epita.fr>
 
 	Start the language support overhaul: Introduce AC_LANG().
diff --git a/tests/semantics.m4 b/tests/semantics.m4
index 11de539ac..874e8f1e0 100644
--- a/tests/semantics.m4
+++ b/tests/semantics.m4
@@ -155,11 +155,11 @@ rm ac-exists1 ac-exists2],
 
 
 
-## --------------- ##
-## AC_CHECK_PROG.  ##
-## --------------- ##
+## ------------------------------ ##
+## AC_CHECK_PROG & AC_PATH_PROG.  ##
+## ------------------------------ ##
 
-AT_SETUP(AC_CHECK_PROG)
+AT_SETUP(AC_CHECK_PROG & AC_PATH_PROG)
 
 # Create a sub directory `path' with 6 subdirs which all 7 contain
 # an executable `tool'. `6' contains a `better' tool.
@@ -179,10 +179,15 @@ do
 done
 cp path/tool path/6/better
 
-# Perform various tests of AC_CHECK_PROG and AC_CHECK_PROGS.
+
+# -------------------------------- #
+# AC_CHECK_PROG & AC_CHECK_PROGS.  #
+# -------------------------------- #
+
 AT_DATA(configure.in,
 [[AC_INIT
-path=`echo "1:2:3:4:5:6" | sed -e 's,\([[0-9]]\),'\`pwd\`'/path/\1,g'`
+pwd=`pwd`
+path=`echo "1:2:3:4:5:6" | sed -e 's,\([[0-9]]\),'"$pwd"'/path/\1,g'`
 fail=0
 
 AC_CHECK_PROG(TOOL1, tool, found, not-found, $path)
@@ -192,10 +197,10 @@ test "$TOOL1" = found || fail=1
 AC_CHECK_PROG(TOOL2, tool,, not-found, $path)
 test "$TOOL2" = not-found || fail=1
 
-AC_CHECK_PROG(TOOL3, tool, tool, not-found, $path, `pwd`/path/1/tool)
-test "$TOOL3" = `pwd`/path/2/tool || fail=1
+AC_CHECK_PROG(TOOL3, tool, tool, not-found, $path, $pwd/path/1/tool)
+test "$TOOL3" = $pwd/path/2/tool || fail=1
 
-AC_CHECK_PROG(TOOL4, better, better, not-found, $path, `pwd`/path/1/tool)
+AC_CHECK_PROG(TOOL4, better, better, not-found, $path, $pwd/path/1/tool)
 test "$TOOL4" = better || fail=1
 
 # When a tool is not found, and no value is given for not-found,
@@ -213,4 +218,36 @@ exit $fail
 AT_CHECK([../autoconf -m .. -l $at_srcdir], 0,, ignore)
 AT_CHECK([./configure], 0, ignore)
 
+
+# ------------------------------ #
+# AC_PATH_PROG & AC_PATH_PROGS.  #
+# ------------------------------ #
+
+AT_DATA(configure.in,
+[[AC_INIT
+pwd=`pwd`
+path=`echo "1:2:3:4:5:6" | sed -e 's,\([[0-9]]\),'"$pwd"'/path/\1,g'`
+fail=0
+
+AC_PATH_PROG(TOOL1, tool, not-found, $path)
+test "$TOOL1" = $pwd/path/1/tool || fail=1
+
+AC_PATH_PROG(TOOL2, better, not-found, $path)
+test "$TOOL2" = $pwd/path/6/better || fail=1
+
+# When a tool is not found, and no value is given for not-found,
+# the variable is left empty.
+AC_PATH_PROGS(TOOL3, missing,, $path)
+test -z "$TOOL3" || fail=1
+
+AC_PATH_PROGS(TOOL4, missing tool better,, $path)
+test "$TOOL4" = $pwd/path/1/tool || fail=1
+
+# no AC_OUTPUT, we don't need config.status.
+exit $fail
+]])
+
+AT_CHECK([../autoconf -m .. -l $at_srcdir], 0,, ignore)
+AT_CHECK([./configure], 0, ignore)
+
 AT_CLEANUP(path config.log config.cache configure)