patch_2.5.9: clean up the recipe

Earlier the recipe was using 2.5.4 tar ball and a patch for upgrading to
2.5.9. Replaces these with pointer to 2.5.9 tarball.

Also noted that both 2.5.4 & 2.5.9 are GPLv2 sources.

Updated checksums and license of the recipe

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>

7 files changed, 6 insertions, 27409 deletions

diff --git a/meta/recipes-devtools/patch/patch-2.5.9/2.5.9.patch b/meta/recipes-devtools/patch/patch-2.5.9/2.5.9.patch
deleted file mode 100644
index 7b64ecdd42..0000000000
--- a/meta/recipes-devtools/patch/patch-2.5.9/2.5.9.patch
+++ /dev/null
@@ -1,27399 +0,0 @@
-diff -urNd -urNd patch-2.5.4/aclocal.m4 patch-2.5.9/aclocal.m4
---- patch-2.5.4/aclocal.m4	1999-08-29 09:09:30.000000000 -0400
-+++ patch-2.5.9/aclocal.m4	2003-05-19 02:30:52.000000000 -0400
-@@ -1,106 +1,34 @@
--# The following is taken from automake 1.4,
--# except that it prefers the compiler option -Ae to "-Aa -D_HPUX_SOURCE"
--# because only the former supports 64-bit integral types on HP-UX 10.20.
--
--## ----------------------------------------- ##
--## ANSIfy the C compiler whenever possible.  ##
--## From Franc,ois Pinard                     ##
--## ----------------------------------------- ##
--
--# serial 2
-+# backupfile.m4 serial 1
-+dnl Copyright (C) 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
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
- 
--# @defmac AC_PROG_CC_STDC
--# @maindex PROG_CC_STDC
--# @ovindex CC
--# If the C compiler in not in ANSI C mode by default, try to add an option
--# to output variable @code{CC} to make it so.  This macro tries various
--# options that select ANSI C on some system or another.  It considers the
--# compiler to be in ANSI C mode if it handles function prototypes correctly.
--#
--# If you use this macro, you should check after calling it whether the C
--# compiler has been set to accept ANSI C; if not, the shell variable
--# @code{am_cv_prog_cc_stdc} is set to @samp{no}.  If you wrote your source
--# code in ANSI C, you can make an un-ANSIfied copy of it by using the
--# program @code{ansi2knr}, which comes with Ghostscript.
--# @end defmac
-+AC_DEFUN([gl_BACKUPFILE],
-+[
-+  dnl Prerequisites of lib/backupfile.c.
-+  AC_REQUIRE([AC_HEADER_DIRENT])
-+  AC_REQUIRE([AC_FUNC_CLOSEDIR_VOID])
-+  AC_CHECK_HEADERS_ONCE(limits.h stdlib.h string.h)
-+  AC_CHECK_DECLS_ONCE(getenv malloc)
-+  jm_CHECK_TYPE_STRUCT_DIRENT_D_INO
- 
--AC_DEFUN(AM_PROG_CC_STDC,
--[AC_REQUIRE([AC_PROG_CC])
--AC_BEFORE([$0], [AC_C_INLINE])
--AC_BEFORE([$0], [AC_C_CONST])
--dnl Force this before AC_PROG_CPP.  Some cpp's, eg on HPUX, require
--dnl a magic option to avoid problems with ANSI preprocessor commands
--dnl like #elif.
--dnl FIXME: can't do this because then AC_AIX won't work due to a
--dnl circular dependency.
--dnl AC_BEFORE([$0], [AC_PROG_CPP])
--AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
--AC_CACHE_VAL(am_cv_prog_cc_stdc,
--[am_cv_prog_cc_stdc=no
--ac_save_CC="$CC"
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX			-qlanglvl=ansi
--# Ultrix and OSF/1	-std1
--# HP-UX			-Aa -D_HPUX_SOURCE
--# SVR4			-Xc -D__EXTENSIONS__
--for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
--do
--  CC="$ac_save_CC $ac_arg"
--  AC_TRY_COMPILE(
--[#include <stdarg.h>
--#include <stdio.h>
--#include <sys/types.h>
--#include <sys/stat.h>
--/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
--struct buf { int x; };
--FILE * (*rcsopen) (struct buf *, struct stat *, int);
--static char *e (p, i)
--     char **p;
--     int i;
--{
--  return p[i];
--}
--static char *f (char * (*g) (char **, int), char **p, ...)
--{
--  char *s;
--  va_list v;
--  va_start (v,p);
--  s = g (p, va_arg (v,int));
--  va_end (v);
--  return s;
--}
--int test (int i, double x);
--struct s1 {int (*f) (int a);};
--struct s2 {int (*f) (double a);};
--int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
--int argc;
--char **argv;
--], [
--return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
--],
--[am_cv_prog_cc_stdc="$ac_arg"; break])
--done
--CC="$ac_save_CC"
--])
--if test -z "$am_cv_prog_cc_stdc"; then
--  AC_MSG_RESULT([none needed])
--else
--  AC_MSG_RESULT($am_cv_prog_cc_stdc)
--fi
--case "x$am_cv_prog_cc_stdc" in
--  x|xno) ;;
--  *) CC="$CC $am_cv_prog_cc_stdc" ;;
--esac
-+  dnl Prerequisites of lib/addext.c.
-+  AC_REQUIRE([jm_AC_DOS])
-+  AC_SYS_LONG_FILE_NAMES
-+  AC_CHECK_HEADERS_ONCE(limits.h string.h unistd.h)
-+  AC_CHECK_FUNCS(pathconf)
- ])
--#serial 2
-+#serial 5
- 
- dnl From Jim Meyering.
- dnl
- dnl Check whether struct dirent has a member named d_ino.
- dnl
- 
--AC_DEFUN(jm_STRUCT_DIRENT_D_INO,
-+AC_DEFUN([jm_CHECK_TYPE_STRUCT_DIRENT_D_INO],
-   [AC_REQUIRE([AC_HEADER_DIRENT])dnl
-    AC_CACHE_CHECK([for d_ino member in directory struct],
- 		  jm_cv_struct_dirent_d_ino,
-@@ -130,244 +58,548 @@
-    )
-    if test $jm_cv_struct_dirent_d_ino = yes; then
-      AC_DEFINE(D_INO_IN_DIRENT, 1,
--  [Define if there is a member named d_ino in the struct describing
--   directory headers.])
-+       [Define if there is a member named d_ino in the struct describing
-+        directory headers.])
-    fi
-   ]
- )
--#serial 3
-+# dirname.m4 serial 1
-+dnl Copyright (C) 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
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
- 
--dnl From Paul Eggert.
-+AC_DEFUN([gl_DIRNAME],
-+[
-+  dnl Prerequisites of lib/dirname.h.
-+  AC_REQUIRE([jm_AC_DOS])
- 
--# Define HAVE_INTTYPES_H if <inttypes.h> exists,
--# doesn't clash with <sys/types.h>, and declares uintmax_t.
-+  dnl Prerequisites of lib/dirname.c.
-+  AC_REQUIRE([AC_HEADER_STDC])
-+  AC_CHECK_HEADERS_ONCE(string.h)
- 
--AC_DEFUN(jm_AC_HEADER_INTTYPES_H,
--[
--  AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
--  [AC_TRY_COMPILE(
--    [#include <sys/types.h>
--#include <inttypes.h>],
--    [uintmax_t i = (uintmax_t) -1;],
--    jm_ac_cv_header_inttypes_h=yes,
--    jm_ac_cv_header_inttypes_h=no)])
--  if test $jm_ac_cv_header_inttypes_h = yes; then
--    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
--[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
--   and declares uintmax_t. ])
--  fi
-+  dnl Prerequisites of lib/basename.c.
-+  AC_REQUIRE([AC_HEADER_STDC])
-+  AC_CHECK_HEADERS_ONCE(string.h)
-+
-+  dnl Prerequisites of lib/stripslash.c.
-+  AC_REQUIRE([AC_HEADER_STDC])
-+  AC_CHECK_HEADERS_ONCE(string.h)
- ])
- #serial 5
- 
--dnl By default, many hosts won't let programs access large files;
--dnl one must use special compiler options to get large-file access to work.
--dnl For more details about this brain damage please see:
--dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
-+# Define some macros required for proper operation of code in lib/*.c
-+# on MSDOS/Windows systems.
- 
--dnl Written by Paul Eggert <eggert@twinsun.com>.
-+# From Jim Meyering.
- 
--dnl Internal subroutine of AC_SYS_LARGEFILE.
--dnl AC_SYS_LARGEFILE_FLAGS(FLAGSNAME)
--AC_DEFUN(AC_SYS_LARGEFILE_FLAGS,
--  [AC_CACHE_CHECK([for $1 value to request large file support],
--     ac_cv_sys_largefile_$1,
--     [ac_cv_sys_largefile_$1=`($GETCONF LFS_$1) 2>/dev/null` || {
--	ac_cv_sys_largefile_$1=no
--	ifelse($1, CFLAGS,
--	  [case "$host_os" in
--	   # IRIX 6.2 and later require cc -n32.
--changequote(, )dnl
--	   irix6.[2-9]* | irix6.1[0-9]* | irix[7-9].* | irix[1-9][0-9]*)
--changequote([, ])dnl
--	     if test "$GCC" != yes; then
--	       ac_cv_sys_largefile_CFLAGS=-n32
--	     fi
--	     ac_save_CC="$CC"
--	     CC="$CC $ac_cv_sys_largefile_CFLAGS"
--	     AC_TRY_LINK(, , , ac_cv_sys_largefile_CFLAGS=no)
--	     CC="$ac_save_CC"
--	   esac])
--      }])])
-+AC_DEFUN([jm_AC_DOS],
-+  [
-+    AC_CACHE_CHECK([whether system is Windows or MSDOS], [ac_cv_win_or_dos],
-+      [
-+        AC_TRY_COMPILE([],
-+        [#if !defined _WIN32 && !defined __WIN32__ && !defined __MSDOS__
-+neither MSDOS nor Windows
-+#endif],
-+        [ac_cv_win_or_dos=yes],
-+        [ac_cv_win_or_dos=no])
-+      ])
- 
--dnl Internal subroutine of AC_SYS_LARGEFILE.
--dnl AC_SYS_LARGEFILE_SPACE_APPEND(VAR, VAL)
--AC_DEFUN(AC_SYS_LARGEFILE_SPACE_APPEND,
--  [case $2 in
--   no) ;;
--   ?*)
--     case "[$]$1" in
--     '') $1=$2 ;;
--     *) $1=[$]$1' '$2 ;;
--     esac ;;
--   esac])
-+    if test x"$ac_cv_win_or_dos" = xyes; then
-+      ac_fs_accepts_drive_letter_prefix=1
-+      ac_fs_backslash_is_file_name_separator=1
-+    else
-+      ac_fs_accepts_drive_letter_prefix=0
-+      ac_fs_backslash_is_file_name_separator=0
-+    fi
- 
--dnl Internal subroutine of AC_SYS_LARGEFILE.
--dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, CACHE-VAR, COMMENT, CODE-TO-SET-DEFAULT)
--AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE,
--  [AC_CACHE_CHECK([for $1], $2,
--     [$2=no
--changequote(, )dnl
--      $4
--      for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do
--	case "$ac_flag" in
--	-D$1)
--	  $2=1 ;;
--	-D$1=*)
--	  $2=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;;
--	esac
--      done
--changequote([, ])dnl
--      ])
--   if test "[$]$2" != no; then
--     AC_DEFINE_UNQUOTED([$1], [$]$2, [$3])
--   fi])
-+    AH_VERBATIM(FILESYSTEM_PREFIX_LEN,
-+    [#if FILESYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX
-+# define FILESYSTEM_PREFIX_LEN(Filename) \
-+  ((Filename)[0] && (Filename)[1] == ':' ? 2 : 0)
-+#else
-+# define FILESYSTEM_PREFIX_LEN(Filename) 0
-+#endif])
- 
--AC_DEFUN(AC_SYS_LARGEFILE,
--  [AC_REQUIRE([AC_CANONICAL_HOST])
--   AC_ARG_ENABLE(largefile,
--     [  --disable-largefile     omit support for large files])
--   if test "$enable_largefile" != no; then
--     AC_CHECK_TOOL(GETCONF, getconf)
--     AC_SYS_LARGEFILE_FLAGS(CFLAGS)
--     AC_SYS_LARGEFILE_FLAGS(LDFLAGS)
--     AC_SYS_LARGEFILE_FLAGS(LIBS)
-+    AC_DEFINE_UNQUOTED([FILESYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX],
-+      $ac_fs_accepts_drive_letter_prefix,
-+      [Define on systems for which file names may have a so-called
-+       `drive letter' prefix, define this to compute the length of that
-+       prefix, including the colon.])
- 
--     for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do
--       case "$ac_flag" in
--       no) ;;
--       -D_FILE_OFFSET_BITS=*) ;;
--       -D_LARGEFILE_SOURCE | -D_LARGEFILE_SOURCE=*) ;;
--       -D_LARGE_FILES | -D_LARGE_FILES=*) ;;
--       -D?* | -I?*)
--	 AC_SYS_LARGEFILE_SPACE_APPEND(CPPFLAGS, "$ac_flag") ;;
--       *)
--	 AC_SYS_LARGEFILE_SPACE_APPEND(CFLAGS, "$ac_flag") ;;
--       esac
--     done
--     AC_SYS_LARGEFILE_SPACE_APPEND(LDFLAGS, "$ac_cv_sys_largefile_LDFLAGS")
--     AC_SYS_LARGEFILE_SPACE_APPEND(LIBS, "$ac_cv_sys_largefile_LIBS")
--     AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS,
--       ac_cv_sys_file_offset_bits,
--       [Number of bits in a file offset, on hosts where this is settable.],
--       [case "$host_os" in
--	# HP-UX 10.20 and later
--	hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)
--	  ac_cv_sys_file_offset_bits=64 ;;
--	esac])
--     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE,
--       ac_cv_sys_largefile_source,
--       [Define to make fseeko etc. visible, on some hosts.],
--       [case "$host_os" in
--	# HP-UX 10.20 and later
--	hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)
--	  ac_cv_sys_largefile_source=1 ;;
--	esac])
--     AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES,
--       ac_cv_sys_large_files,
--       [Define for large files, on AIX-style hosts.],
--       [case "$host_os" in
--	# AIX 4.2 and later
--	aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*)
--	  ac_cv_sys_large_files=1 ;;
--	esac])
--   fi
-+    AH_VERBATIM(ISSLASH,
-+    [#if FILESYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR
-+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
-+#else
-+# define ISSLASH(C) ((C) == '/')
-+#endif])
-+
-+    AC_DEFINE_UNQUOTED([FILESYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR],
-+      $ac_fs_backslash_is_file_name_separator,
-+      [Define if the backslash character may also serve as a file name
-+       component separator.])
-   ])
--#serial 3
-+#serial 7
-+
-+AC_DEFUN([gl_ERROR],
-+[
-+  AC_FUNC_ERROR_AT_LINE
-+  dnl Note: AC_FUNC_ERROR_AT_LINE does AC_LIBSOURCES([error.h, error.c]).
-+  jm_PREREQ_ERROR
-+])
-+
-+# Prerequisites of lib/error.c.
-+AC_DEFUN([jm_PREREQ_ERROR],
-+[
-+  AC_REQUIRE([AC_HEADER_STDC])
-+  AC_REQUIRE([AC_FUNC_VPRINTF])
-+  AC_CHECK_FUNCS(strerror)
-+  AC_CHECK_DECLS([strerror])
-+  AC_FUNC_STRERROR_R
-+])
-+# getopt.m4 serial 1
-+dnl Copyright (C) 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
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+AC_DEFUN([gl_GETOPT],
-+[
-+  dnl Prerequisites of lib/getopt.c.
-+  AC_CHECK_HEADERS_ONCE(string.h)
-+])
-+# malloc.m4 serial 7
-+dnl Copyright (C) 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
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
- 
- dnl From Jim Meyering.
- dnl Determine whether malloc accepts 0 as its argument.
- dnl If it doesn't, arrange to use the replacement function.
--dnl
- 
--AC_DEFUN(jm_FUNC_MALLOC,
-+AC_DEFUN([jm_FUNC_MALLOC],
- [
-- dnl xmalloc.c requires that this symbol be defined so it doesn't
-- dnl mistakenly use a broken malloc -- as it might if this test were omitted.
-- AC_DEFINE_UNQUOTED(HAVE_DONE_WORKING_MALLOC_CHECK, 1,
--                    [Define if the malloc check has been performed. ])
-+  AC_REQUIRE([AC_FUNC_MALLOC])
-+  dnl autoconf < 2.57 used the symbol ac_cv_func_malloc_works.
-+  if test X"$ac_cv_func_malloc_0_nonnull" = Xno || test X"$ac_cv_func_malloc_works" = Xno; then
-+    gl_PREREQ_MALLOC
-+  fi
-+])
- 
-- AC_CACHE_CHECK([for working malloc], jm_cv_func_working_malloc,
--  [AC_TRY_RUN([
--    char *malloc ();
--    int
--    main ()
--    {
--      exit (malloc (0) ? 0 : 1);
--    }
-+# Prerequisites of lib/malloc.c.
-+AC_DEFUN([gl_PREREQ_MALLOC], [
-+  :
-+])
-+# mbrtowc.m4 serial 5
-+dnl Copyright (C) 2001-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
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl From Paul Eggert
-+
-+dnl This file can be removed, and jm_FUNC_MBRTOWC replaced with
-+dnl AC_FUNC_MBRTOWC, when autoconf 2.57 can be assumed everywhere.
-+
-+AC_DEFUN([jm_FUNC_MBRTOWC],
-+[
-+  AC_CACHE_CHECK([whether mbrtowc and mbstate_t are properly declared],
-+    jm_cv_func_mbrtowc,
-+    [AC_TRY_LINK(
-+       [#include <wchar.h>],
-+       [mbstate_t state; return ! (sizeof state && mbrtowc);],
-+       jm_cv_func_mbrtowc=yes,
-+       jm_cv_func_mbrtowc=no)])
-+  if test $jm_cv_func_mbrtowc = yes; then
-+    AC_DEFINE(HAVE_MBRTOWC, 1,
-+      [Define to 1 if mbrtowc and mbstate_t are properly declared.])
-+  fi
-+])
-+# mbstate_t.m4 serial 9
-+dnl Copyright (C) 2000, 2001, 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
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+# From Paul Eggert.
-+
-+# BeOS 5 has <wchar.h> but does not define mbstate_t,
-+# so you can't declare an object of that type.
-+# Check for this incompatibility with Standard C.
-+
-+# AC_TYPE_MBSTATE_T
-+# -----------------
-+AC_DEFUN([AC_TYPE_MBSTATE_T],
-+  [AC_CACHE_CHECK([for mbstate_t], ac_cv_type_mbstate_t,
-+     [AC_COMPILE_IFELSE(
-+	[AC_LANG_PROGRAM(
-+	   [AC_INCLUDES_DEFAULT
-+#	    include <wchar.h>],
-+	   [mbstate_t x; return sizeof x;])],
-+	[ac_cv_type_mbstate_t=yes],
-+	[ac_cv_type_mbstate_t=no])])
-+   if test $ac_cv_type_mbstate_t = yes; then
-+     AC_DEFINE([HAVE_MBSTATE_T], 1,
-+	       [Define to 1 if <wchar.h> declares mbstate_t.])
-+   else
-+     AC_DEFINE([mbstate_t], int,
-+	       [Define to a type if <wchar.h> does not define.])
-+   fi])
-+# memchr.m4 serial 1
-+dnl Copyright (C) 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
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+AC_DEFUN([gl_FUNC_MEMCHR],
-+[
-+  AC_REPLACE_FUNCS(memchr)
-+  if test $ac_cv_func_memchr = no; then
-+    jm_PREREQ_MEMCHR
-+  fi
-+])
-+
-+# Prerequisites of lib/memchr.c.
-+AC_DEFUN([jm_PREREQ_MEMCHR], [
-+  AC_CHECK_HEADERS_ONCE(limits.h stdlib.h)
-+  AC_CHECK_HEADERS(bp-sym.h)
-+])
-+#serial 1
-+
-+dnl From Mumit Khan and Paul Eggert
-+dnl Determine whether mkdir accepts only one argument instead of the usual two.
-+
-+AC_DEFUN([PATCH_FUNC_MKDIR_TAKES_ONE_ARG],
-+  [AC_CHECK_FUNCS(mkdir)
-+   AC_CACHE_CHECK([whether mkdir takes only one argument],
-+     patch_cv_mkdir_takes_one_arg,
-+     [patch_cv_mkdir_takes_one_arg=no
-+      if test $ac_cv_func_mkdir = yes; then
-+        AC_TRY_COMPILE([
-+#include <sys/types.h>
-+#include <sys/stat.h>
- 	  ],
--	 jm_cv_func_working_malloc=yes,
--	 jm_cv_func_working_malloc=no,
--	 dnl When crosscompiling, assume malloc is broken.
--	 jm_cv_func_working_malloc=no)
-+	  [mkdir (".", 0);],
-+	  ,
-+	  [AC_TRY_COMPILE([
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+	     ],
-+	     [mkdir (".");],
-+	     patch_cv_mkdir_takes_one_arg=yes
-+	  )]
-+	)
-+      fi
-+     ]
-+   )
-+   if test $patch_cv_mkdir_takes_one_arg = yes; then
-+     AC_DEFINE([MKDIR_TAKES_ONE_ARG], 1,
-+       [Define if mkdir takes only one argument.])
-+   fi
-+  ]
-+)
-+# onceonly.m4 serial 3
-+dnl Copyright (C) 2002, 2003 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
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+dnl This file defines some "once only" variants of standard autoconf macros.
-+dnl   AC_CHECK_HEADERS_ONCE         like  AC_CHECK_HEADERS
-+dnl   AC_CHECK_FUNCS_ONCE           like  AC_CHECK_FUNCS
-+dnl   AC_CHECK_DECLS_ONCE           like  AC_CHECK_DECLS
-+dnl   AC_REQUIRE([AC_HEADER_STDC])  like  AC_HEADER_STDC
-+dnl The advantage is that the check for each of the headers/functions/decls
-+dnl will be put only once into the 'configure' file. It keeps the size of
-+dnl the 'configure' file down, and avoids redundant output when 'configure'
-+dnl is run.
-+dnl The drawback is that the checks cannot be conditionalized. If you write
-+dnl   if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi
-+dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to
-+dnl empty, and the check will be inserted before the body of the AC_DEFUNed
-+dnl function.
-+
-+dnl Autoconf version 2.57 or newer is recommended.
-+AC_PREREQ(2.54)
-+
-+# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of
-+# AC_CHECK_HEADERS(HEADER1 HEADER2 ...).
-+AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
-+  :
-+  AC_FOREACH([gl_HEADER_NAME], [$1], [
-+    AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(m4_defn([gl_HEADER_NAME]),
-+                                                 [-./], [___])), [
-+      AC_CHECK_HEADERS(gl_HEADER_NAME)
-+    ])
-+    AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
-+                                                   [-./], [___])))
-   ])
--  if test $jm_cv_func_working_malloc = no; then
--    AC_SUBST(LIBOBJS)
--    LIBOBJS="$LIBOBJS malloc.$ac_objext"
--    AC_DEFINE_UNQUOTED(malloc, rpl_malloc,
--      [Define to rpl_malloc if the replacement function should be used.])
--  fi
- ])
--## ------------------------------- ##
--## Check for function prototypes.  ##
--## From Franc,ois Pinard           ##
--## ------------------------------- ##
- 
--# serial 1
-+# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of
-+# AC_CHECK_FUNCS(FUNC1 FUNC2 ...).
-+AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
-+  :
-+  AC_FOREACH([gl_FUNC_NAME], [$1], [
-+    AC_DEFUN([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]), [
-+      AC_CHECK_FUNCS(m4_defn([gl_FUNC_NAME]))
-+    ])
-+    AC_REQUIRE([gl_CHECK_FUNC_]m4_defn([gl_FUNC_NAME]))
-+  ])
-+])
- 
--AC_DEFUN(AM_C_PROTOTYPES,
--[AC_REQUIRE([AM_PROG_CC_STDC])
--AC_REQUIRE([AC_PROG_CPP])
--AC_MSG_CHECKING([for function prototypes])
--if test "$am_cv_prog_cc_stdc" != no; then
--  AC_MSG_RESULT(yes)
--  AC_DEFINE(PROTOTYPES,1,[Define if compiler has function prototypes])
--  U= ANSI2KNR=
--else
--  AC_MSG_RESULT(no)
--  U=_ ANSI2KNR=./ansi2knr
--  # Ensure some checks needed by ansi2knr itself.
--  AC_HEADER_STDC
--  AC_CHECK_HEADERS(string.h)
--fi
--AC_SUBST(U)dnl
--AC_SUBST(ANSI2KNR)dnl
-+# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of
-+# AC_CHECK_DECLS(DECL1, DECL2, ...).
-+AC_DEFUN([AC_CHECK_DECLS_ONCE], [
-+  :
-+  AC_FOREACH([gl_DECL_NAME], [$1], [
-+    AC_DEFUN([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]), [
-+      AC_CHECK_DECLS(m4_defn([gl_DECL_NAME]))
-+    ])
-+    AC_REQUIRE([gl_CHECK_DECL_]m4_defn([gl_DECL_NAME]))
-+  ])
- ])
--#serial 3
-+# quote.m4 serial 1
-+dnl Copyright (C) 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
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+AC_DEFUN([gl_QUOTE],
-+[
-+  dnl Prerequisites of lib/quote.c.
-+  AC_CHECK_HEADERS_ONCE(stddef.h)
-+])
-+# quotearg.m4 serial 1
-+dnl Copyright (C) 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
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+AC_DEFUN([gl_QUOTEARG],
-+[
-+  dnl Prerequisites of lib/quotearg.c.
-+  AC_CHECK_HEADERS_ONCE(wchar.h wctype.h)
-+  AC_CHECK_FUNCS_ONCE(iswprint mbsinit)
-+  AC_TYPE_MBSTATE_T
-+  jm_FUNC_MBRTOWC
-+])
-+# realloc.m4 serial 7
-+dnl Copyright (C) 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
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
- 
- dnl From Jim Meyering.
- dnl Determine whether realloc works when both arguments are 0.
- dnl If it doesn't, arrange to use the replacement function.
--dnl
- 
--AC_DEFUN(jm_FUNC_REALLOC,
-+AC_DEFUN([jm_FUNC_REALLOC],
- [
-- dnl xmalloc.c requires that this symbol be defined so it doesn't
-- dnl mistakenly use a broken realloc -- as it might if this test were omitted.
-- AC_DEFINE_UNQUOTED(HAVE_DONE_WORKING_REALLOC_CHECK, 1,
--                    [Define if the realloc check has been performed. ])
-+  AC_REQUIRE([AC_FUNC_REALLOC])
-+  dnl autoconf < 2.57 used the symbol ac_cv_func_realloc_works.
-+  if test X"$ac_cv_func_realloc_0_nonnull" = Xno || test X"$ac_cv_func_realloc_works" = Xno; then
-+    gl_PREREQ_REALLOC
-+  fi
-+])
- 
-- AC_CACHE_CHECK([for working realloc], jm_cv_func_working_realloc,
--  [AC_TRY_RUN([
--    char *realloc ();
--    int
--    main ()
--    {
--      exit (realloc (0, 0) ? 0 : 1);
--    }
--	  ],
--	 jm_cv_func_working_realloc=yes,
--	 jm_cv_func_working_realloc=no,
--	 dnl When crosscompiling, assume realloc is broken.
--	 jm_cv_func_working_realloc=no)
--  ])
--  if test $jm_cv_func_working_realloc = no; then
--    AC_SUBST(LIBOBJS)
--    LIBOBJS="$LIBOBJS realloc.$ac_objext"
--    AC_DEFINE_UNQUOTED(realloc, rpl_realloc,
--      [Define to rpl_realloc if the replacement function should be used.])
-+# Prerequisites of lib/realloc.c.
-+AC_DEFUN([gl_PREREQ_REALLOC], [
-+  :
-+])
-+# rmdir.m4 serial 1
-+dnl Copyright (C) 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
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+AC_DEFUN([gl_FUNC_RMDIR],
-+[
-+  AC_REPLACE_FUNCS(rmdir)
-+  if test $ac_cv_func_rmdir = no; then
-+    gl_PREREQ_RMDIR
-   fi
- ])
--#serial 2
-+
-+# Prerequisites of lib/rmdir.c.
-+AC_DEFUN([gl_PREREQ_RMDIR], [
-+  AC_REQUIRE([AC_HEADER_STAT])
-+  :
-+])
-+
-+# Check for setmode, DOS style.
-+
-+# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+AC_DEFUN([AC_FUNC_SETMODE_DOS],
-+  [AC_CHECK_HEADERS(fcntl.h unistd.h)
-+   AC_CACHE_CHECK([for DOS-style setmode],
-+     [ac_cv_func_setmode_dos],
-+     [AC_TRY_LINK(
-+	[#include <io.h>
-+	 #if HAVE_FCNTL_H
-+	 # include <fcntl.h>
-+	 #endif
-+	 #if HAVE_UNISTD_H
-+	 # include <unistd.h>
-+	 #endif],
-+	[int ret = setmode && setmode (1, O_BINARY);],
-+	[ac_cv_func_setmode_dos=yes],
-+	[ac_cv_func_setmode_dos=no])])
-+   if test $ac_cv_func_setmode_dos = yes; then
-+     AC_DEFINE(HAVE_SETMODE_DOS, 1,
-+       [Define to 1 if you have the DOS-style `setmode' function.])
-+   fi])
-+# Check for stdbool.h that conforms to C99.
-+
-+# Copyright (C) 2002-2003 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
-+
-+# Prepare for substituting <stdbool.h> if it is not supported.
-+
-+AC_DEFUN([AM_STDBOOL_H],
-+[
-+  AC_REQUIRE([AC_HEADER_STDBOOL])
-+
-+  # Define two additional variables used in the Makefile substitution.
-+
-+  if test "$ac_cv_header_stdbool_h" = yes; then
-+    STDBOOL_H=''
-+  else
-+    STDBOOL_H='stdbool.h'
-+  fi
-+  AC_SUBST([STDBOOL_H])
-+
-+  if test "$ac_cv_type__Bool" = yes; then
-+    HAVE__BOOL=1
-+  else
-+    HAVE__BOOL=0
-+  fi
-+  AC_SUBST([HAVE__BOOL])
-+])
-+
-+# This macro is only needed in autoconf <= 2.54.  Newer versions of autoconf
-+# have this macro built-in.
-+
-+AC_DEFUN([AC_HEADER_STDBOOL],
-+  [AC_CACHE_CHECK([for stdbool.h that conforms to C99],
-+     [ac_cv_header_stdbool_h],
-+     [AC_TRY_COMPILE(
-+	[
-+	  #include <stdbool.h>
-+	  #ifndef bool
-+	   "error: bool is not defined"
-+	  #endif
-+	  #ifndef false
-+	   "error: false is not defined"
-+	  #endif
-+	  #if false
-+	   "error: false is not 0"
-+	  #endif
-+	  #ifndef true
-+	   "error: false is not defined"
-+	  #endif
-+	  #if true != 1
-+	   "error: true is not 1"
-+	  #endif
-+	  #ifndef __bool_true_false_are_defined
-+	   "error: __bool_true_false_are_defined is not defined"
-+	  #endif
-+
-+	  struct s { _Bool s: 1; _Bool t; } s;
-+
-+	  char a[true == 1 ? 1 : -1];
-+	  char b[false == 0 ? 1 : -1];
-+	  char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-+	  char d[(bool) -0.5 == true ? 1 : -1];
-+	  bool e = &s;
-+	  char f[(_Bool) -0.0 == false ? 1 : -1];
-+	  char g[true];
-+	  char h[sizeof (_Bool)];
-+	  char i[sizeof s.t];
-+	],
-+	[ return !a + !b + !c + !d + !e + !f + !g + !h + !i; ],
-+	[ac_cv_header_stdbool_h=yes],
-+	[ac_cv_header_stdbool_h=no])])
-+   AC_CHECK_TYPES([_Bool])
-+   if test $ac_cv_header_stdbool_h = yes; then
-+     AC_DEFINE(HAVE_STDBOOL_H, 1, [Define to 1 if stdbool.h conforms to C99.])
-+   fi])
-+#serial 7 -*- autoconf -*-
-+
-+dnl From Jim Meyering.
-+dnl
-+dnl See if the glibc *_unlocked I/O macros or functions are available.
-+dnl Use only those *_unlocked macros or functions that are declared
-+dnl (because some of them were declared in Solaris 2.5.1 but were removed
-+dnl in Solaris 2.6, whereas we want binaries built on Solaris 2.5.1 to run
-+dnl on Solaris 2.6).
-+
-+AC_DEFUN([jm_FUNC_GLIBC_UNLOCKED_IO],
-+[
-+  dnl Persuade glibc <stdio.h> to declare fgets_unlocked(), fputs_unlocked()
-+  dnl etc.
-+  AC_REQUIRE([AC_GNU_SOURCE])
-+
-+  AC_CHECK_DECLS_ONCE(
-+     [clearerr_unlocked feof_unlocked ferror_unlocked
-+      fflush_unlocked fgets_unlocked fputc_unlocked fputs_unlocked
-+      fread_unlocked fwrite_unlocked getc_unlocked
-+      getchar_unlocked putc_unlocked putchar_unlocked])
-+])
-+#serial 5
- 
- dnl From Jim Meyering
- 
-@@ -375,9 +607,9 @@
- dnl usually in <utime.h>.
- dnl Some systems have utime.h but don't declare the struct anywhere.
- 
--AC_DEFUN(jm_STRUCT_UTIMBUF,
-+AC_DEFUN([jm_CHECK_TYPE_STRUCT_UTIMBUF],
- [
--  AC_CHECK_HEADERS(utime.h)
-+  AC_CHECK_HEADERS_ONCE(sys/time.h utime.h)
-   AC_REQUIRE([AC_HEADER_TIME])
-   AC_CACHE_CHECK([for struct utimbuf], fu_cv_sys_struct_utimbuf,
-     [AC_TRY_COMPILE(
-@@ -402,8 +634,34 @@
-     ])
- 
-   if test $fu_cv_sys_struct_utimbuf = yes; then
--    AC_DEFINE_UNQUOTED(HAVE_STRUCT_UTIMBUF, 1,
--[Define if struct utimbuf is declared -- usually in <utime.h>.
--   Some systems have utime.h but don't declare the struct anywhere. ])
-+    AC_DEFINE(HAVE_STRUCT_UTIMBUF, 1,
-+      [Define if struct utimbuf is declared -- usually in <utime.h>.
-+       Some systems have utime.h but don't declare the struct anywhere. ])
-   fi
- ])
-+# xalloc.m4 serial 1
-+dnl Copyright (C) 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
-+dnl Public License, this file may be distributed as part of a program
-+dnl that contains a configuration script generated by Autoconf, under
-+dnl the same distribution terms as the rest of that program.
-+
-+AC_DEFUN([gl_XALLOC],
-+[
-+  gl_PREREQ_XMALLOC
-+  gl_PREREQ_XSTRDUP
-+])
-+
-+# Prerequisites of lib/xmalloc.c.
-+AC_DEFUN([gl_PREREQ_XMALLOC], [
-+  AC_REQUIRE([AC_HEADER_STDC])
-+  AC_REQUIRE([jm_FUNC_MALLOC])
-+  AC_REQUIRE([jm_FUNC_REALLOC])
-+])
-+
-+# Prerequisites of lib/xstrdup.c.
-+AC_DEFUN([gl_PREREQ_XSTRDUP], [
-+  AC_REQUIRE([AC_HEADER_STDC])
-+  AC_CHECK_HEADERS_ONCE(string.h)
-+])
-diff -urNd -urNd patch-2.5.4/addext.c patch-2.5.9/addext.c
---- patch-2.5.4/addext.c	1999-01-18 12:02:28.000000000 -0500
-+++ patch-2.5.9/addext.c	2003-05-18 01:30:52.000000000 -0400
-@@ -1,5 +1,7 @@
- /* addext.c -- add an extension to a file name
--   Copyright (C) 1990, 1997, 1998, 1999 Free Software Foundation, Inc.
-+
-+   Copyright (C) 1990, 1997, 199