--- old/autoconf-2.59/bin/autoconf.in	Thu May 22 12:05:46 2003
+++ gnu/autoconf-2.59/bin/autoconf.in	Sat May  1 13:56:54 2004
@@ -128,7 +128,7 @@
 Report bugs to <bug-autoconf@gnu.org>."
 
 version="\
-autoconf (@PACKAGE_NAME@) @VERSION@
+autoconf (@PACKAGE_NAME@) @VERSION@ (release 2 for OS/2)
 Written by David J. MacKenzie and Akim Demaille.
 
 Copyright (C) 2003 Free Software Foundation, Inc.
--- old/autoconf-2.59/bin/autoupdate.in	Wed Aug 27 11:26:32 2003
+++ gnu/autoconf-2.59/bin/autoupdate.in	Sun Apr  4 16:17:14 2004
@@ -174,7 +174,7 @@
   my $macros = new Autom4te::XFile ("$autoconf"
 				    . " --trace AU_DEFUN:'AU:\$f:\$1'"
 				    . " --trace define:'AC:\$f:\$1'"
-				    . " --melt /dev/null |");
+				    . " --melt |");
   while ($_ = $macros->getline)
     {
       chomp;
@@ -252,7 +252,7 @@
 
 # au.m4 -- definitions the AU macros.
 xsystem ("$autoconf --trace AU_DEFUN:'_au_defun(\@<:\@\$1\@:>\@,
-\@<:\@\$2\@:>\@)' --melt /dev/null "
+\@<:\@\$2\@:>\@)' --melt "
 	. ">$tmp/au.m4");
 
 
--- old/autoconf-2.59/lib/autoconf/c.m4	Thu Sep 25 07:28:50 2003
+++ gnu/autoconf-2.59/lib/autoconf/c.m4	Sun Apr  4 14:44:44 2004
@@ -504,7 +504,10 @@
 m4_define([_AC_PROG_CC_G],
 [ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
+dnl On OS/2 $ac_objext might depend on CFLAGS, so "gcc -c -g" might fail because
+dnl the object file can not be found, but "gcc -c -g $CFLAGS" will succeed.
+dnl CFLAGS="-g"
+CFLAGS="$CFLAGS -g"
 AC_CACHE_CHECK(whether $CC accepts -g, ac_cv_prog_cc_g,
 	       [_AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ac_cv_prog_cc_g=yes],
 							[ac_cv_prog_cc_g=no])])
--- old/autoconf-2.59/lib/autoconf/general.m4	Mon Oct 27 11:10:56 2003
+++ gnu/autoconf-2.59/lib/autoconf/general.m4	Sun Apr  4 17:55:00 2004
@@ -844,7 +844,7 @@
 do
   eval ac_val=$`echo $ac_var`
   case $ac_val in
-    [[\\/$]]* | ?:[[\\/]]* | NONE | '' ) ;;
+    [[\\/$]]* | ?:[[\\/]]* | ?: | NONE | '' ) ;;
     *)  AC_MSG_ERROR([expected an absolute directory name for --$ac_var: $ac_val]);;
   esac
 done
@@ -1692,6 +1692,36 @@
     . "$ac_site_file"
   fi
 done
+
+# Backslashes into forward slashes:
+# The following OS/2 specific code is performed AFTER config.site
+# has been loaded to allow users to change their environment there.
+# This strange code is necessary to deal with handling of backslashes by ksh.
+
+if test "$ac_emxsupport" != "no" -a "$ac_emxsupport" != "NO"; then
+  ac_save_IFS="$IFS"
+  IFS="\\"
+  ac_TEMP_PATH=
+  for ac_dir in $PATH; do
+    IFS=$ac_save_IFS
+    if test -z "$ac_TEMP_PATH"; then
+      ac_TEMP_PATH="$ac_dir"
+    else
+      ac_TEMP_PATH="$ac_TEMP_PATH/$ac_dir"
+    fi
+  done
+  export PATH="$ac_TEMP_PATH"
+  unset ac_TEMP_PATH
+fi
+
+# set ac_executable_extensions!
+if ls.exe --version >/dev/null 2>/dev/null; then
+  if test "$ac_executable_extensions" = ""; then
+    AC_MSG_WARN([ac_executable_extensions not set, assuming .exe])
+    ac_executable_extensions=".exe"
+    export ac_executable_extensions
+  fi
+fi
 ])
 
 
--- old/autoconf-2.59/lib/autoconf/libs.m4	Thu May 22 12:05:12 2003
+++ gnu/autoconf-2.59/lib/autoconf/libs.m4	Sat May  1 14:12:26 2004
@@ -120,11 +120,25 @@
 	      [AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1''_$2])])dnl
 AC_CACHE_CHECK([for $2 in -l$1], ac_Lib,
 [ac_check_lib_save_LIBS=$LIBS
+dnl special treatment for EMX (OS/2) because AC_CHECK_LIB can fail if FUNCTION is already in libc
+if test "$ac_emxsupport" = no; then
+  AS_VAR_SET(ac_Lib, not_in_libc)
+else
+dnl check whether the function is already in libc
+AC_LINK_IFELSE([AC_LANG_CALL([], [$2])],
+	       [AS_VAR_SET(ac_Lib, no)],
+	       [AS_VAR_SET(ac_Lib, not_in_libc)])
+fi
+dnl if function is not in libc or if $ac_emxsupport=no was specified try to link with that library
+AS_IF([test AS_VAR_GET(ac_Lib) = not_in_libc],
+[
 LIBS="-l$1 $5 $LIBS"
 AC_LINK_IFELSE([AC_LANG_CALL([], [$2])],
 	       [AS_VAR_SET(ac_Lib, yes)],
 	       [AS_VAR_SET(ac_Lib, no)])
-LIBS=$ac_check_lib_save_LIBS])
+])
+LIBS=$ac_check_lib_save_LIBS]) dnl end of AC_CACHE_CHECK
+
 AS_IF([test AS_VAR_GET(ac_Lib) = yes],
       [m4_default([$3], [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1))
   LIBS="-l$1 $LIBS"
--- old/autoconf-2.59/lib/autoconf/programs.m4	Thu May 22 12:05:12 2003
+++ gnu/autoconf-2.59/lib/autoconf/programs.m4	Fri Apr  9 21:37:30 2004
@@ -463,6 +463,7 @@
 set dummy ${MAKE-make}; ac_make=`echo "$[2]" | sed 'y,:./+-,___p_,'`
 AC_CACHE_VAL(ac_cv_prog_make_${ac_make}_set,
 [cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
 all:
 	@echo 'ac_maketemp="$(MAKE)"'
 _ACEOF
--- old/autoconf-2.59/lib/autotest/general.m4	Fri Sep 26 08:14:18 2003
+++ gnu/autoconf-2.59/lib/autotest/general.m4	Tue Apr  6 20:59:30 2004
@@ -566,7 +566,8 @@
   at_devnull=/dev/null
 else
   at_devnull=$at_suite_dir/devnull
-  cp /dev/null $at_devnull
+  cp /dev/null $at_devnull 2>/dev/null
+  test -f $at_devnull || touch $at_devnull
 fi
 
 # Use `diff -u' when possible.
@@ -575,7 +576,10 @@
 else
   at_diff=diff
 fi
-
+# Use 'diff -a' when possible
+if $at_diff -a $at_devnull $at_devnull >/dev/null 2>&1; then
+  at_diff="$at_diff -a"
+fi
 
 for at_group in $at_groups
 do