More OS/2 support.

diff --git a/intl/ChangeLog b/intl/ChangeLog
index ad43cb859356255f85161022bff3bb85397f24df..d08872accc224a45d3770842ac6608f581aae0e4 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-07  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.in (mostlyclean): Remove object files on OS/2 as well.
+       Reported by Andreas Buening <andreas.buening@nexgo.de>.
+
 2002-10-16  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.in (ps, pdf, html, ctags): New targets, for automake-1.7

diff --git a/intl/Makefile.in b/intl/Makefile.in
index 737dc9422d4d8edfe5c0881133e4fd3012ecb1a7..65cd6b5fe9bc64fba06b74325ea791eeea855db1 100644 (file)
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -299,7 +299,7 @@ ID: $(HEADERS) $(SOURCES)
 
 
 mostlyclean:
-       rm -f *.a *.la *.o *.lo core core.*
+       rm -f *.a *.la *.o *.obj *.lo core core.*
        rm -f libintl.h charset.alias ref-add.sed ref-del.sed
        rm -f -r .libs _libs
 

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 759e1d5500f3663d55edc01814396dd6bf8f2493..4808a93038df3e7a282a251e512fd5f5a045a2a7 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-08  Bruno Haible  <bruno@clisp.org>
+
+       * progtest.m4 (AM_PATH_PROG_WITH_TEST): Portability to OS/2.
+       Reported by Andreas Buening <andreas.buening@nexgo.de>.
+
 2002-11-08  Bruno Haible  <bruno@clisp.org>
 
        * gettext.m4 (AM_GNU_GETTEXT): Print a message containing the macro's

diff --git a/m4/progtest.m4 b/m4/progtest.m4
index 443c8e306303ac5c259041ac4a22b6ff48d70b4c..f99c5a9a3c4c594f6a23a002387d9a56c9c053a1 100644 (file)
--- a/m4/progtest.m4
+++ b/m4/progtest.m4
@@ -1,4 +1,4 @@
-# progtest.m4 serial 2 (gettext-0.10.40)
+# progtest.m4 serial 3 (gettext-0.11.6)
 dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -23,31 +23,63 @@ dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
 dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
 AC_DEFUN([AM_PATH_PROG_WITH_TEST],
-[# Extract the first word of "$2", so it can be a program name with args.
+[
+# 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
+fi
+
+# 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.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "$2", so it can be a program name with args.
 set dummy $2; ac_word=[$]2
 AC_MSG_CHECKING([for $ac_word])
 AC_CACHE_VAL(ac_cv_path_$1,
 [case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
+  [[\\/]]* | ?:[[\\/]]*)
+    ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+    ;;
   *)
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-       ac_cv_path_$1="$ac_dir/$ac_word"
-       break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in ifelse([$5], , $PATH, [$5]); do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          if [$3]; then
+            ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
 dnl If no 4th arg is given, leave the cache variable unset,
 dnl so AC_PATH_PROGS will keep looking.
 ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
 ])dnl
-  ;;
+    ;;
 esac])dnl
 $1="$ac_cv_path_$1"
 if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then