diff options
| author | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2014-12-14 12:53:35 -0500 |
|---|---|---|
| committer | Andrew J. Schorr <aschorr@telemetry-investments.com> | 2014-12-14 12:53:35 -0500 |
| commit | 1fc7a1fe6aba3c1ba98c44f8df1926c10ff79c87 (patch) | |
| tree | e6eff5ba1ffaa2250c59ce02464d783b08508f4c /m4/progtest.m4 | |
| parent | f9c7ec30542ef2550761f49cd25503e0775ef271 (diff) | |
| parent | 0d52289482d468c8566976d77c0c6a6a4e602add (diff) | |
| download | egawk-1fc7a1fe6aba3c1ba98c44f8df1926c10ff79c87.tar.gz egawk-1fc7a1fe6aba3c1ba98c44f8df1926c10ff79c87.tar.bz2 egawk-1fc7a1fe6aba3c1ba98c44f8df1926c10ff79c87.zip | |
Merge branch 'master' into select
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, |