summaryrefslogtreecommitdiff
path: root/m4/progtest.m4
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2001-08-04 16:58:55 +0000
committerJim Meyering <jim@meyering.net>2001-08-04 16:58:55 +0000
commit2029c3f7c4fb99587f31db9d7ca13e4154631932 (patch)
treedab5835a7cae4bd9f2e79b347747e919f3b840a4 /m4/progtest.m4
parent4ed098d64fa2f79e955010c3eadf4a24bda48d74 (diff)
downloadcoreutils-2029c3f7c4fb99587f31db9d7ca13e4154631932.tar.xz
(AM_PATH_PROG_WITH_TEST): Quote first arg of AC_DEFUN.
(AM_PATH_PROG_WITH_TEST): Output "no" only if $1 isn't $4.
Diffstat (limited to 'm4/progtest.m4')
-rw-r--r--m4/progtest.m414
1 files changed, 8 insertions, 6 deletions
diff --git a/m4/progtest.m4 b/m4/progtest.m4
index 2482d4a9b..08840d5dd 100644
--- a/m4/progtest.m4
+++ b/m4/progtest.m4
@@ -2,15 +2,17 @@
# Ulrich Drepper <drepper@cygnus.com>, 1996.
#
# This file can be copied and used freely without restrictions. It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.
-# serial 1
+# serial 2
dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN(AM_PATH_PROG_WITH_TEST,
+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
[# Extract the first word of "$2", so it can be a program name with args.
set dummy $2; ac_word=[$]2
AC_MSG_CHECKING([for $ac_word])
@@ -38,7 +40,7 @@ ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
;;
esac])dnl
$1="$ac_cv_path_$1"
-if test -n "[$]$1"; then
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
AC_MSG_RESULT([$]$1)
else
AC_MSG_RESULT(no)