From 33a78fa8a8d0edcbdabc1cc330e34acb12b38363 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 4 Sep 2010 11:18:54 +0200 Subject: [PATCH] Set PATH_SEPARATOR the same way autoconf does. --- gettext-runtime/m4/ChangeLog | 6 ++++++ gettext-runtime/m4/progtest.m4 | 19 +++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/gettext-runtime/m4/ChangeLog b/gettext-runtime/m4/ChangeLog index 83411efba..834b665e3 100644 --- a/gettext-runtime/m4/ChangeLog +++ b/gettext-runtime/m4/ChangeLog @@ -1,3 +1,9 @@ +2010-09-04 Bruno Haible + + Set PATH_SEPARATOR the same way autoconf does. + * progtest.m4 (AM_PATH_PROG_WITH_TEST): Determine the value of + PATH_SEPARATOR the same way autoconf-generated configure scripts do. + 2010-08-28 Bruno Haible Prefer using AC_DEFUN_ONCE over AC_DEFUN in projects with gnulib. diff --git a/gettext-runtime/m4/progtest.m4 b/gettext-runtime/m4/progtest.m4 index 2d804ac99..9ffa5c020 100644 --- a/gettext-runtime/m4/progtest.m4 +++ b/gettext-runtime/m4/progtest.m4 @@ -1,4 +1,4 @@ -# progtest.m4 serial 6 (gettext-0.18) +# progtest.m4 serial 7 (gettext-0.18.2) dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -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, -- 2.47.2