From: Daiki Ueno <ueno@gnu.org>
Date: Thu, 28 Feb 2013 07:55:58 +0000 (+0900)
Subject: gettextize: substitute PATH_SEPARATOR at configure time
X-Git-Tag: v0.18.3~75^2~8
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=3a526d4c8c25c552b24c2e2f95eed02054fd2d28;p=thirdparty%2Fgettext.git

gettextize: substitute PATH_SEPARATOR at configure time
---

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index 6351aceeb..32ba28f14 100644
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,12 @@
+2013-02-28  Daiki Ueno  <ueno@gnu.org>
+
+	* autopoint.in (gettext_dir): Substitute PATH_SEPARATOR at
+	configure time.
+	* gettextize.in (gettext_dir): Substitute PATH_SEPARATOR at
+	configure time.
+	Suggested by Stefano Lattarini in
+	<http://lists.gnu.org/archive/html/bug-gettext/2012-12/msg00066.html>.
+
 2013-01-07  Daiki Ueno  <ueno@gnu.org>
 
 	* autopoint.in: Extract version number from configure.ac in a more
diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in
index 717b0db5e..d0725bc75 100644
--- a/gettext-tools/misc/autopoint.in
+++ b/gettext-tools/misc/autopoint.in
@@ -69,18 +69,7 @@ func_find_curr_installdir ()
   case "$curr_executable" in
     */* | *\\*) ;;
     *) # Need to look in the PATH.
-      if test "${PATH_SEPARATOR+set}" != set; then
-        func_tmpdir
-        { echo "#! /bin/sh"; echo "exit 0"; } > "$tmp"/conf.sh
-        chmod +x "$tmp"/conf.sh
-        if (PATH="/nonexistent;$tmp"; conf.sh) >/dev/null 2>&1; then
-          PATH_SEPARATOR=';'
-        else
-          PATH_SEPARATOR=:
-        fi
-        rm -rf "$tmp"
-      fi
-      save_IFS="$IFS"; IFS="$PATH_SEPARATOR"
+      save_IFS="$IFS"; IFS="${PATH_SEPARATOR='@PATH_SEPARATOR@'}"
       for dir in $PATH; do
         IFS="$save_IFS"
         test -z "$dir" && dir=.
diff --git a/gettext-tools/misc/gettextize.in b/gettext-tools/misc/gettextize.in
index c5ee61014..b21af24a8 100644
--- a/gettext-tools/misc/gettextize.in
+++ b/gettext-tools/misc/gettextize.in
@@ -69,18 +69,7 @@ func_find_curr_installdir ()
   case "$curr_executable" in
     */* | *\\*) ;;
     *) # Need to look in the PATH.
-      if test "${PATH_SEPARATOR+set}" != set; then
-        func_tmpdir
-        { echo "#! /bin/sh"; echo "exit 0"; } > "$tmp"/conf.sh
-        chmod +x "$tmp"/conf.sh
-        if (PATH="/nonexistent;$tmp"; conf.sh) >/dev/null 2>&1; then
-          PATH_SEPARATOR=';'
-        else
-          PATH_SEPARATOR=:
-        fi
-        rm -rf "$tmp"
-      fi
-      save_IFS="$IFS"; IFS="$PATH_SEPARATOR"
+      save_IFS="$IFS"; IFS="${PATH_SEPARATOR='@PATH_SEPARATOR@'}"
       for dir in $PATH; do
         IFS="$save_IFS"
         test -z "$dir" && dir=.