X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fprogtest.m4;h=08840d5ddcf6fcbf41947f8011cba97102fa70c9;hb=b2227080c74868dffbca68f4e88dec0906a03d96;hp=2482d4a9bfde61980eab6bf9f81538b62693a7b7;hpb=293c77be12d1435bb5f6007e2cb6e699d6212fbc;p=gnulib.git

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)