X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=config%2Fprogtest.m4;h=391bd31f6aa7368eb52fc48bf326feac03833fad;hb=dab43e77955e5b21fa556f53143d42e09e439f40;hp=5bbead0dcf506e2f787b3ee23c6ef4990730f103;hpb=cdcb9b2cc09bed252d5247d89602bbef698a1487;p=lyx.git

diff --git a/config/progtest.m4 b/config/progtest.m4
index 5bbead0dcf..391bd31f6a 100644
--- a/config/progtest.m4
+++ b/config/progtest.m4
@@ -2,15 +2,19 @@
 # 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 or the GNU Library General Public License but which still want
+# to provide support for the GNU gettext functionality.
+# Please note that the actual code of the GNU gettext library is covered
+# by the GNU Library General Public License, and the rest of the GNU
+# gettext package package is covered by the GNU General Public License.
+# They are *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],
 [case "`uname -s 2> /dev/null`" in
 OS/2)
   PATH=`echo -E "$PATH" | sed 's+\\\\+/+g'`
@@ -53,7 +57,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)