--- old/sed-3.02/aclocal.m4	Sun Aug  2 00:38:40 1998
+++ gnu/sed-3.02/aclocal.m4	Sun Sep 23 00:48:12 2001
@@ -1,7 +1,7 @@
-dnl aclocal.m4 generated automatically by aclocal 1.3
+dnl aclocal.m4 generated automatically by aclocal 1.4-p5
 
-dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-dnl This Makefile.in is free software; the Free Software Foundation
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 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.
 
@@ -13,7 +13,7 @@
 
 # Like AC_CONFIG_HEADER, but automatically create stamp file.
 
-AC_DEFUN(AM_CONFIG_HEADER,
+AC_DEFUN([AM_CONFIG_HEADER],
 [AC_PREREQ([2.12])
 AC_CONFIG_HEADER([$1])
 dnl When config.status generates a header, we must update the stamp-h file.
@@ -43,8 +43,8 @@
 dnl Usage:
 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
-AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AM_PROG_INSTALL])
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_REQUIRE([AC_PROG_INSTALL])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -54,8 +54,8 @@
   AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
 fi
 ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
 AC_REQUIRE([AM_SANITY_CHECK])
 AC_REQUIRE([AC_ARG_PROGRAM])
 dnl FIXME This is truly gross.
@@ -67,20 +67,11 @@
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_REQUIRE([AC_PROG_MAKE_SET])])
 
-
-# serial 1
-
-AC_DEFUN(AM_PROG_INSTALL,
-[AC_REQUIRE([AC_PROG_INSTALL])
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-AC_SUBST(INSTALL_SCRIPT)dnl
-])
-
 #
 # Check to make sure that the build environment is sane.
 #
 
-AC_DEFUN(AM_SANITY_CHECK,
+AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
@@ -121,7 +112,7 @@
 
 dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
 dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
+AC_DEFUN([AM_MISSING_PROG],
 [AC_MSG_CHECKING(for working $2)
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
--- old/sed-3.02/configure.in	Sun Aug  2 00:38:32 1998
+++ gnu/sed-3.02/configure.in	Sun Sep 23 00:48:02 2001
@@ -6,6 +6,9 @@
 AC_PROG_CC
 AC_PROG_RANLIB
 
+AC_EXEEXT
+AC_OBJEXT
+
 dnl Solaris 2.6 needs special compilation flags to support large files
 dnl (i.e. files larger than 2 GB).
 dnl This code frament taken from the configure.in file from patch-2.5.
@@ -53,12 +56,12 @@
 AC_TYPE_SIZE_T
 
 AC_MSG_CHECKING(which regex library to use)
-ac_regex_lib=lib/regex.o
+ac_regex_lib=lib/regex.$ac_objext
 AC_ARG_WITH(regex,
    [  --with-regex=REGEX-LIB  specify an alternative regex implementation],
    [case "$withval" in yes|no) ;; *) ac_regex_lib="$withval" ;; esac])
 case "$ac_regex_lib" in
-  lib/regex.o) LIBOBJS="$LIBOBJS regex.o" ;;
+  lib/regex.$ac_objext) LIBOBJS="$LIBOBJS regex.$ac_objext" ;;
   ""|no) ;;
   *) LIBS="$LIBS $ac_regex_lib" ;;
 esac
@@ -68,7 +71,7 @@
 esac
 
 case " $LIBOBJS " in
-  *\ regex.o\ *)
+  *\ regex.$ac_objext\ *)
     ac_cv_func_regnexec=yes
     ac_cv_func_regexec=yes
     cat >> confdefs.h <<\EOF
--- old/sed-3.02/sed/basicdefs.h	Sat Jul  4 14:25:44 1998
+++ gnu/sed-3.02/sed/basicdefs.h	Mon Sep 17 21:55:34 2001
@@ -111,5 +111,14 @@
 #define ISUPPER(c) (ISASCII (c) && isupper (c))
 #define ISXDIGIT(c) (ISASCII (c) && isxdigit (c))
 
+#ifndef initialize_main
+# ifdef __EMX__
+#  define initialize_main(argcp, argvp) \
+  { _response(argcp, argvp); _wildcard(argcp, argvp); }
+# else /* NOT __EMX__ */
+#  define initialize_main(argcp, argvp)
+# endif
+#endif
+
 
 #endif /*!BASICDEFS_H*/
--- old/sed-3.02/sed/sed.c	Fri Jul  3 01:06:26 1998
+++ gnu/sed-3.02/sed/sed.c	Mon Sep 17 21:54:22 2001
@@ -129,6 +129,8 @@
   flagT bad_input;	/* If this variable is non-zero at exit, one or
 			   more of the input files couldn't be opened. */
 
+  initialize_main(&argc, &argv);
+
   POSIXLY_CORRECT = (getenv("POSIXLY_CORRECT") != NULL);
 #ifdef STUB_FROM_RX_LIBRARY_USAGE
   if (!rx_default_cache)