progtest.m4 (flex-2.6.3) | : | progtest.m4 (flex-2.6.4) | ||
---|---|---|---|---|
# progtest.m4 serial 7 (gettext-0.18.2) | # progtest.m4 serial 6 (gettext-0.18) | |||
dnl Copyright (C) 1996-2003, 2005, 2008-2014 Free Software Foundation, Inc. | dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc. | |||
dnl This file is free software; the Free Software Foundation | dnl This file is free software; the Free Software Foundation | |||
dnl gives unlimited permission to copy and/or distribute it, | dnl gives unlimited permission to copy and/or distribute it, | |||
dnl with or without modifications, as long as this notice is preserved. | dnl with or without modifications, as long as this notice is preserved. | |||
dnl | dnl | |||
dnl This file can can be used in projects which are not available under | dnl This file can can be used in projects which are not available under | |||
dnl the GNU General Public License or the GNU Library General Public | dnl the GNU General Public License or the GNU Library General Public | |||
dnl License but which still want to provide support for the GNU gettext | dnl License but which still want to provide support for the GNU gettext | |||
dnl functionality. | dnl functionality. | |||
dnl Please note that the actual code of the GNU gettext library is covered | dnl Please note that the actual code of the GNU gettext library is covered | |||
dnl by the GNU Library General Public License, and the rest of the GNU | dnl by the GNU Library General Public License, and the rest of the GNU | |||
skipping to change at line 30 | skipping to change at line 30 | |||
# Search path for a program which passes the given test. | # Search path for a program which passes the given test. | |||
dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, | dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, | |||
dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) | 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], | |||
[ | [ | |||
# Prepare PATH_SEPARATOR. | # Prepare PATH_SEPARATOR. | |||
# The user is always right. | # The user is always right. | |||
if test "${PATH_SEPARATOR+set}" != set; then | if test "${PATH_SEPARATOR+set}" != set; then | |||
# Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which | echo "#! /bin/sh" >conf$$.sh | |||
# contains only /bin. Note that ksh looks also at the FPATH variable, | echo "exit 0" >>conf$$.sh | |||
# so we have to set that as well for the test. | chmod +x conf$$.sh | |||
PATH_SEPARATOR=: | if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | |||
(PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ | PATH_SEPARATOR=';' | |||
&& { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ | else | |||
|| PATH_SEPARATOR=';' | PATH_SEPARATOR=: | |||
} | fi | |||
rm -f conf$$.sh | ||||
fi | fi | |||
# Find out how to test for executable files. Don't use a zero-byte file, | # Find out how to test for executable files. Don't use a zero-byte file, | |||
# as systems may use methods other than mode bits to determine executability. | # as systems may use methods other than mode bits to determine executability. | |||
cat >conf$$.file <<_ASEOF | cat >conf$$.file <<_ASEOF | |||
#! /bin/sh | #! /bin/sh | |||
exit 0 | exit 0 | |||
_ASEOF | _ASEOF | |||
chmod +x conf$$.file | chmod +x conf$$.file | |||
if test -x conf$$.file >/dev/null 2>&1; then | if test -x conf$$.file >/dev/null 2>&1; then | |||
End of changes. 2 change blocks. | ||||
10 lines changed or deleted | 11 lines changed or added |