diff options
author | Arnold D. Robbins <arnold@skeeve.com> | 2014-11-19 18:54:23 +0200 |
---|---|---|
committer | Arnold D. Robbins <arnold@skeeve.com> | 2014-11-19 18:54:23 +0200 |
commit | fa17ad763ec4c001a5d1858832e473a3b0ead0fd (patch) | |
tree | bd1efde7e460125b99fe7c54f24f12b3dce83b68 /m4/progtest.m4 | |
parent | deb2fe660265860073c5180a5e31c0375cd0d1f1 (diff) | |
parent | e13c76601a232b24c99a452d8f3403f87f069c22 (diff) | |
download | egawk-fa17ad763ec4c001a5d1858832e473a3b0ead0fd.tar.gz egawk-fa17ad763ec4c001a5d1858832e473a3b0ead0fd.tar.bz2 egawk-fa17ad763ec4c001a5d1858832e473a3b0ead0fd.zip |
Merge branch 'gawk-4.1-stable'
Diffstat (limited to 'm4/progtest.m4')
-rw-r--r-- | m4/progtest.m4 | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/m4/progtest.m4 b/m4/progtest.m4 index 2d804ac9..b499f79c 100644 --- a/m4/progtest.m4 +++ b/m4/progtest.m4 @@ -1,5 +1,5 @@ -# progtest.m4 serial 6 (gettext-0.18) -dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc. +# progtest.m4 serial 7 (gettext-0.18.2) +dnl Copyright (C) 1996-2003, 2005, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -27,15 +27,14 @@ AC_DEFUN([AM_PATH_PROG_WITH_TEST], # Prepare PATH_SEPARATOR. # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi # Find out how to test for executable files. Don't use a zero-byte file, |