diff options
Diffstat (limited to 'packages/patch/patch-2.5.9/2.5.9.patch')
-rw-r--r-- | packages/patch/patch-2.5.9/2.5.9.patch | 27399 |
1 files changed, 27399 insertions, 0 deletions
diff --git a/packages/patch/patch-2.5.9/2.5.9.patch b/packages/patch/patch-2.5.9/2.5.9.patch index e69de29bb2..7b64ecdd42 100644 --- a/packages/patch/patch-2.5.9/2.5.9.patch +++ b/packages/patch/patch-2.5.9/2.5.9.patch @@ -0,0 +1,27399 @@ +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, 1998, 1999, 2001, 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 +@@ -29,8 +31,6 @@ + # define HAVE_LONG_FILE_NAMES 0 + #endif + +-#include <backupfile.h> +- + #if HAVE_LIMITS_H + # include <limits.h> + #endif +@@ -49,7 +49,13 @@ + # include <unistd.h> + #endif + +-char *base_name PARAMS ((char const *)); ++#include <errno.h> ++#ifndef errno ++extern int errno; ++#endif ++ ++#include "backupfile.h" ++#include "dirname.h" + + /* Append to FILENAME the extension EXT, unless the result would be too long, + in which case just append the character E. */ +@@ -58,25 +64,34 @@ + addext (char *filename, char const *ext, int e) + { + char *s = base_name (filename); +- size_t slen = strlen (s), extlen = strlen (ext); +- long slen_max = -1; ++ size_t slen = base_len (s); ++ size_t extlen = strlen (ext); ++ size_t slen_max = HAVE_LONG_FILE_NAMES ? 255 : _POSIX_NAME_MAX; + + #if HAVE_PATHCONF && defined _PC_NAME_MAX +- if (slen + extlen <= _POSIX_NAME_MAX && ! HAVE_DOS_FILE_NAMES) +- /* The file name is so short there's no need to call pathconf. */ +- slen_max = _POSIX_NAME_MAX; +- else if (s == filename) +- slen_max = pathconf (".", _PC_NAME_MAX); +- else ++ if (_POSIX_NAME_MAX < slen + extlen || HAVE_DOS_FILE_NAMES) + { +- char c = *s; +- *s = 0; +- slen_max = pathconf (filename, _PC_NAME_MAX); +- *s = c; ++ /* The new base name is long enough to require a pathconf check. */ ++ long name_max; ++ errno = 0; ++ if (s == filename) ++ name_max = pathconf (".", _PC_NAME_MAX); ++ else ++ { ++ char c = *s; ++ if (! ISSLASH (c)) ++ *s = 0; ++ name_max = pathconf (filename, _PC_NAME_MAX); ++ *s = c; ++ } ++ if (0 <= name_max || errno == 0) ++ { ++ long size = slen_max = name_max; ++ if (name_max != size) ++ slen_max = -1; ++ } + } + #endif +- if (slen_max < 0) +- slen_max = HAVE_LONG_FILE_NAMES ? 255 : 14; + + if (HAVE_DOS_FILE_NAMES && slen_max <= 12) + { +diff -urNd -urNd patch-2.5.4/ansi2knr.1 patch-2.5.9/ansi2knr.1 +--- patch-2.5.4/ansi2knr.1 1997-07-04 15:39:00.000000000 -0400 ++++ patch-2.5.9/ansi2knr.1 1969-12-31 19:00:00.000000000 -0500 +@@ -1,36 +0,0 @@ +-.TH ANSI2KNR 1 "19 Jan 1996" +-.SH NAME +-ansi2knr \- convert ANSI C to Kernighan & Ritchie C +-.SH SYNOPSIS +-.I ansi2knr +-[--varargs] input_file [output_file] +-.SH DESCRIPTION +-If no output_file is supplied, output goes to stdout. +-.br +-There are no error messages. +-.sp +-.I ansi2knr +-recognizes function definitions by seeing a non-keyword identifier at the left +-margin, followed by a left parenthesis, with a right parenthesis as the last +-character on the line, and with a left brace as the first token on the +-following line (ignoring possible intervening comments). It will recognize a +-multi-line header provided that no intervening line ends with a left or right +-brace or a semicolon. These algorithms ignore whitespace and comments, except +-that the function name must be the first thing on the line. +-.sp +-The following constructs will confuse it: +-.br +- - Any other construct that starts at the left margin and follows the +-above syntax (such as a macro or function call). +-.br +- - Some macros that tinker with the syntax of the function header. +-.sp +-The --varargs switch is obsolete, and is recognized only for +-backwards compatibility. The present version of +-.I ansi2knr +-will always attempt to convert a ... argument to va_alist and va_dcl. +-.SH AUTHOR +-L. Peter Deutsch <ghost@aladdin.com> wrote the original ansi2knr and +-continues to maintain the current version; most of the code in the current +-version is his work. ansi2knr also includes contributions by Francois +-Pinard <pinard@iro.umontreal.ca> and Jim Avera <jima@netcom.com>. +diff -urNd -urNd patch-2.5.4/ansi2knr.c patch-2.5.9/ansi2knr.c +--- patch-2.5.4/ansi2knr.c 1999-04-13 10:44:41.000000000 -0400 ++++ patch-2.5.9/ansi2knr.c 1969-12-31 19:00:00.000000000 -0500 +@@ -1,678 +0,0 @@ +-/* Copyright (C) 1989, 1997, 1998, 1999 Aladdin Enterprises. All rights reserved. */ +- +-/*$Id: ansi2knr.c,v 1.14 1999/04/13 14:44:33 meyering Exp $*/ +-/* Convert ANSI C function definitions to K&R ("traditional C") syntax */ +- +-/* +-ansi2knr is distributed in the hope that it will be useful, but WITHOUT ANY +-WARRANTY. No author or distributor accepts responsibility to anyone for the +-consequences of using it or for whether it serves any particular purpose or +-works at all, unless he says so in writing. Refer to the GNU General Public +-License (the "GPL") for full details. +- +-Everyone is granted permission to copy, modify and redistribute ansi2knr, +-but only under the conditions described in the GPL. A copy of this license +-is supposed to have been given to you along with ansi2knr so you can know +-your rights and responsibilities. It should be in a file named COPYLEFT, +-or, if there is no file named COPYLEFT, a file named COPYING. Among other +-things, the copyright notice and this notice must be preserved on all +-copies. +- +-We explicitly state here what we believe is already implied by the GPL: if +-the ansi2knr program is distributed as a separate set of sources and a +-separate executable file which are aggregated on a storage medium together +-with another program, this in itself does not bring the other program under +-the GPL, nor does the mere fact that such a program or the procedures for +-constructing it invoke the ansi2knr executable bring any other part of the +-program under the GPL. +-*/ +- +-/* +- * Usage: +- ansi2knr [--filename FILENAME] [INPUT_FILE [OUTPUT_FILE]] +- * --filename provides the file name for the #line directive in the output, +- * overriding input_file (if present). +- * If no input_file is supplied, input is read from stdin. +- * If no output_file is supplied, output goes to stdout. +- * There are no error messages. +- * +- * ansi2knr recognizes function definitions by seeing a non-keyword +- * identifier at the left margin, followed by a left parenthesis, +- * with a right parenthesis as the last character on the line, +- * and with a left brace as the first token on the following line +- * (ignoring possible intervening comments), except that a line +- * consisting of only +- * identifier1(identifier2) +- * will not be considered a function definition unless identifier2 is +- * the word "void", and a line consisting of +- * identifier1(identifier2, <<arbitrary>>) +- * will not be considered a function definition. +- * ansi2knr will recognize a multi-line header provided +- * that no intervening line ends with a left or right brace or a semicolon. +- * These algorithms ignore whitespace and comments, except that +- * the function name must be the first thing on the line. +- * The following constructs will confuse it: +- * - Any other construct that starts at the left margin and +- * follows the above syntax (such as a macro or function call). +- * - Some macros that tinker with the syntax of function headers. +- */ +- +-/* +- * The original and principal author of ansi2knr is L. Peter Deutsch +- * <ghost@aladdin.com>. Other authors are noted in the change history +- * that follows (in reverse chronological order): +- lpd 1999-04-12 added minor fixes from Pavel Roskin +- <pavel_roskin@geocities.com> for clean compilation with +- gcc -W -Wall +- lpd 1999-03-22 added hack to recognize lines consisting of +- identifier1(identifier2, xxx) as *not* being procedures +- lpd 1999-02-03 made indentation of preprocessor commands consistent +- lpd 1999-01-28 fixed two bugs: a '/' in an argument list caused an +- endless loop; quoted strings within an argument list +- confused the parser +- lpd 1999-01-24 added a check for write errors on the output, +- suggested by Jim Meyering <meyering@ascend.com> +- lpd 1998-11-09 added further hack to recognize identifier(void) +- as being a procedure +- lpd 1998-10-23 added hack to recognize lines consisting of +- identifier1(identifier2) as *not* being procedures +- lpd 1997-12-08 made input_file optional; only closes input and/or +- output file if not stdin or stdout respectively; prints +- usage message on stderr rather than stdout; adds +- --filename switch (changes suggested by +- <ceder@lysator.liu.se>) +- lpd 1996-01-21 added code to cope with not HAVE_CONFIG_H and with +- compilers that don't understand void, as suggested by +- Tom Lane +- lpd 1996-01-15 changed to require that the first non-comment token +- on the line following a function header be a left brace, +- to reduce sensitivity to macros, as suggested by Tom Lane +- <tgl@sss.pgh.pa.us> +- lpd 1995-06-22 removed #ifndefs whose sole purpose was to define +- undefined preprocessor symbols as 0; changed all #ifdefs +- for configuration symbols to #ifs +- lpd 1995-04-05 changed copyright notice to make it clear that +- including ansi2knr in a program does not bring the entire +- program under the GPL +- lpd 1994-12-18 added conditionals for systems where ctype macros +- don't handle 8-bit characters properly, suggested by +- Francois Pinard <pinard@iro.umontreal.ca>; +- removed --varargs switch (this is now the default) +- lpd 1994-10-10 removed CONFIG_BROKETS conditional +- lpd 1994-07-16 added some conditionals to help GNU `configure', +- suggested by Francois Pinard <pinard@iro.umontreal.ca>; +- properly erase prototype args in function parameters, +- contributed by Jim Avera <jima@netcom.com>; +- correct error in writeblanks (it shouldn't erase EOLs) +- lpd 1989-xx-xx original version +- */ +- +-/* Most of the conditionals here are to make ansi2knr work with */ +-/* or without the GNU configure machinery. */ +- +-#if HAVE_CONFIG_H +-# include <config.h> +-#endif +- +-#include <stdio.h> +-#include <ctype.h> +- +-#if HAVE_CONFIG_H +- +-/* +- For properly autoconfiguring ansi2knr, use AC_CONFIG_HEADER(config.h). +- This will define HAVE_CONFIG_H and so, activate the following lines. +- */ +- +-# if STDC_HEADERS || HAVE_STRING_H +-# include <string.h> +-# else +-# include <strings.h> +-# endif +- +-#else /* not HAVE_CONFIG_H */ +- +-/* Otherwise do it the hard way */ +- +-# ifdef BSD +-# include <strings.h> +-# else +-# ifdef VMS +- extern int strlen(), strncmp(); +-# else +-# include <string.h> +-# endif +-# endif +- +-#endif /* not HAVE_CONFIG_H */ +- +-#if STDC_HEADERS +-# include <stdlib.h> +-#else +-/* +- malloc and free should be declared in stdlib.h, +- but if you've got a K&R compiler, they probably aren't. +- */ +-# ifdef MSDOS +-# include <malloc.h> +-# else +-# ifdef VMS +- extern char *malloc(); +- extern void free(); +-# else +- extern char *malloc(); +- extern int free(); +-# endif +-# endif +- +-#endif +- +-/* Define NULL (for *very* old compilers). */ +-#ifndef NULL +-# define NULL (0) +-#endif +- +-/* +- * The ctype macros don't always handle 8-bit characters correctly. +- * Compensate for this here. +- */ +-#ifdef isascii +-# undef HAVE_ISASCII /* just in case */ +-# define HAVE_ISASCII 1 +-#else +-#endif +-#if STDC_HEADERS || !HAVE_ISASCII +-# define is_ascii(c) 1 +-#else +-# define is_ascii(c) isascii(c) +-#endif +- +-#define is_space(c) (is_ascii(c) && isspace(c)) +-#define is_alpha(c) (is_ascii(c) && isalpha(c)) +-#define is_alnum(c) (is_ascii(c) && isalnum(c)) +- +-/* Scanning macros */ +-#define isidchar(ch) (is_alnum(ch) || (ch) == '_') +-#define isidfirstchar(ch) (is_alpha(ch) || (ch) == '_') +- +-/* Forward references */ +-char *skipspace(); +-char *scanstring(); +-int writeblanks(); +-int test1(); +-int convert1(); +- +-/* The main program */ +-int +-main(argc, argv) +- int argc; +- char *argv[]; +-{ FILE *in = stdin; +- FILE *out = stdout; +- char *filename = 0; +- char *program_name = argv[0]; +- char *output_name = 0; +-#define bufsize 5000 /* arbitrary size */ +- char *buf; +- char *line; +- char *more; +- char *usage = +- "Usage: ansi2knr [--filename FILENAME] [INPUT_FILE [OUTPUT_FILE]]\n"; +- /* +- * In previous versions, ansi2knr recognized a --varargs switch. +- * If this switch was supplied, ansi2knr would attempt to convert +- * a ... argument to va_alist and va_dcl; if this switch was not +- * supplied, ansi2knr would simply drop any such arguments. +- * Now, ansi2knr always does this conversion, and we only +- * check for this switch for backward compatibility. +- */ +- int convert_varargs = 1; +- int output_error; +- +- while ( argc > 1 && argv[1][0] == '-' ) { +- if ( !strcmp(argv[1], "--varargs") ) { +- convert_varargs = 1; +- argc--; +- argv++; +- continue; +- } +- if ( !strcmp(argv[1], "--filename") && argc > 2 ) { +- filename = argv[2]; +- argc -= 2; +- argv += 2; +- continue; +- } +- fprintf(stderr, "%s: Unrecognized switch: %s\n", program_name, +- argv[1]); +- fprintf(stderr, usage); +- exit(1); +- } +- switch ( argc ) +- { +- default: +- fprintf(stderr, usage); +- exit(0); +- case 3: +- output_name = argv[2]; +- out = fopen(output_name, "w"); +- if ( out == NULL ) { +- fprintf(stderr, "%s: Cannot open output file %s\n", +- program_name, output_name); +- exit(1); +- } +- /* falls through */ +- case 2: +- in = fopen(argv[1], "r"); +- if ( in == NULL ) { +- fprintf(stderr, "%s: Cannot open input file %s\n", +- program_name, argv[1]); +- exit(1); +- } +- if ( filename == 0 ) +- filename = argv[1]; +- /* falls through */ +- case 1: +- break; +- } +- if ( filename ) +- fprintf(out, "#line 1 \"%s\"\n", filename); +- buf = malloc(bufsize); +- if ( buf == NULL ) +- { +- fprintf(stderr, "Unable to allocate read buffer!\n"); +- exit(1); +- } +- line = buf; +- while ( fgets(line, (unsigned)(buf + bufsize - line), in) != NULL ) +- { +-test: line += strlen(line); +- switch ( test1(buf) ) +- { +- case 2: /* a function header */ +- convert1(buf, out, 1, convert_varargs); +- break; +- case 1: /* a function */ +- /* Check for a { at the start of the next line. */ +- more = ++line; +-f: if ( line >= buf + (bufsize - 1) ) /* overflow check */ +- goto wl; +- if ( fgets(line, (unsigned)(buf + bufsize - line), in) == NULL ) +- goto wl; +- switch ( *skipspace(more, 1) ) +- { +- case '{': +- /* Definitely a function header. */ +- convert1(buf, out, 0, convert_varargs); +- fputs(more, out); +- break; +- case 0: +- /* The next line was blank or a comment: */ +- /* keep scanning for a non-comment. */ +- line += strlen(line); +- goto f; +- default: +- /* buf isn't a function header, but */ +- /* more might be. */ +- fputs(buf, out); +- strcpy(buf, more); +- line = buf; +- goto test; +- } +- break; +- case -1: /* maybe the start of a function */ +- if ( line != buf + (bufsize - 1) ) /* overflow check */ +- continue; +- /* falls through */ +- default: /* not a function */ +-wl: fputs(buf, out); +- break; +- } +- line = buf; +- } +- if ( line != buf ) +- fputs(buf, out); +- free(buf); +- if ( output_name ) { +- output_error = ferror(out); +- output_error |= fclose(out); +- } else { /* out == stdout */ +- fflush(out); +- output_error = ferror(out); +- } +- if ( output_error ) { +- fprintf(stderr, "%s: error writing to %s\n", program_name, +- (output_name ? output_name : "stdout")); +- exit(1); +- } +- if ( in != stdin ) +- fclose(in); +- return 0; +-} +- +-/* Skip over whitespace and comments, in either direction. */ +-char * +-skipspace(p, dir) +- register char *p; +- register int dir; /* 1 for forward, -1 for backward */ +-{ for ( ; ; ) +- { while ( is_space(*p) ) +- p += dir; +- if ( !(*p == '/' && p[dir] == '*') ) +- break; +- p += dir; p += dir; +- while ( !(*p == '*' && p[dir] == '/') ) +- { if ( *p == 0 ) +- return p; /* multi-line comment?? */ +- p += dir; +- } +- p += dir; p += dir; +- } +- return p; +-} +- +-/* Scan over a quoted string, in either direction. */ +-char * +-scanstring(p, dir) +- register char *p; +- register int dir; +-{ +- for (p += dir; ; p += dir) +- if (*p == '"' && p[-dir] != '\\') +- return p + dir; +-} +- +-/* +- * Write blanks over part of a string. +- * Don't overwrite end-of-line characters. +- */ +-int +-writeblanks(start, end) +- char *start; +- char *end; +-{ char *p; +- for ( p = start; p < end; p++ ) +- if ( *p != '\r' && *p != '\n' ) +- *p = ' '; +- return 0; +-} +- +-/* +- * Test whether the string in buf is a function definition. +- * The string may contain and/or end with a newline. +- * Return as follows: +- * 0 - definitely not a function definition; +- * 1 - definitely a function definition; +- * 2 - definitely a function prototype (NOT USED); +- * -1 - may be the beginning of a function definition, +- * append another line and look again. +- * The reason we don't attempt to convert function prototypes is that +- * Ghostscript's declaration-generating macros look too much like +- * prototypes, and confuse the algorithms. +- */ +-int +-test1(buf) +- char *buf; +-{ register char *p = buf; +- char *bend; +- char *endfn; +- int contin; +- +- if ( !isidfirstchar(*p) ) +- return 0; /* no name at left margin */ +- bend = skipspace(buf + strlen(buf) - 1, -1); +- switch ( *bend ) +- { +- case ';': contin = 0 /*2*/; break; +- case ')': contin = 1; break; +- case '{': return 0; /* not a function */ +- case '}': return 0; /* not a function */ +- default: contin = -1; +- } +- while ( isidchar(*p) ) +- p++; +- endfn = p; +- p = skipspace(p, 1); +- if ( *p++ != '(' ) +- return 0; /* not a function */ +- p = skipspace(p, 1); +- if ( *p == ')' ) +- return 0; /* no parameters */ +- /* Check that the apparent function name isn't a keyword. */ +- /* We only need to check for keywords that could be followed */ +- /* by a left parenthesis (which, unfortunately, is most of them). */ +- { static char *words[] = +- { "asm", "auto", "case", "char", "const", "double", +- "extern", "float", "for", "if", "int", "long", +- "register", "return", "short", "signed", "sizeof", +- "static", "switch", "typedef", "unsigned", +- "void", "volatile", "while", 0 +- }; +- char **key = words; +- char *kp; +- unsigned len = endfn - buf; +- +- while ( (kp = *key) != 0 ) +- { if ( strlen(kp) == len && !strncmp(kp, buf, len) ) +- return 0; /* name is a keyword */ +- key++; +- } +- } +- { +- char *id = p; +- int len; +- /* +- * Check for identifier1(identifier2) and not +- * identifier1(void), or identifier1(identifier2, xxxx). +- */ +- +- while ( isidchar(*p) ) +- p++; +- len = p - id; +- p = skipspace(p, 1); +- if (*p == ',' || +- (*p == ')' && (len != 4 || strncmp(id, "void", 4))) +- ) +- return 0; /* not a function */ +- } +- /* +- * If the last significant character was a ), we need to count +- * parentheses, because it might be part of a formal parameter +- * that is a procedure. +- */ +- if (contin > 0) { +- int level = 0; +- +- for (p = skipspace(buf, 1); *p; p = skipspace(p + 1, 1)) +- level += (*p == '(' ? 1 : *p == ')' ? -1 : 0); +- if (level > 0) +- contin = -1; +- } +- return contin; +-} +- +-/* Convert a recognized function definition or header to K&R syntax. */ +-int +-convert1(buf, out, header, convert_varargs) +- char *buf; +- FILE *out; +- int header; /* Boolean */ +- int convert_varargs; /* Boolean */ +-{ char *endfn; +- register char *p; +- /* +- * The breaks table contains pointers to the beginning and end +- * of each argument. +- */ +- char **breaks; +- unsigned num_breaks = 2; /* for testing */ +- char **btop; +- char **bp; +- char **ap; +- char *vararg = 0; +- +- /* Pre-ANSI implementations don't agree on whether strchr */ +- /* is called strchr or index, so we open-code it here. */ +- for ( endfn = buf; *(endfn++) != '('; ) +- ; +-top: p = endfn; +- breaks = (char **)malloc(sizeof(char *) * num_breaks * 2); +- if ( breaks == NULL ) +- { /* Couldn't allocate break table, give up */ +- fprintf(stderr, "Unable to allocate break table!\n"); +- fputs(buf, out); +- return -1; +- } +- btop = breaks + num_breaks * 2 - 2; +- bp = breaks; +- /* Parse the argument list */ +- do +- { int level = 0; +- char *lp = NULL; +- char *rp = NULL; +- char *end = NULL; +- +- if ( bp >= btop ) +- { /* Filled up break table. */ +- /* Allocate a bigger one and start over. */ +- free((char *)breaks); +- num_breaks <<= 1; +- goto top; +- } +- *bp++ = p; +- /* Find the end of the argument */ +- for ( ; end == NULL; p++ ) +- { switch(*p) +- { +- case ',': +- if ( !level ) end = p; +- break; +- case '(': +- if ( !level ) lp = p; +- level++; +- break; +- case ')': +- if ( --level < 0 ) end = p; +- else rp = p; +- break; +- case '/': +- if (p[1] == '*') +- p = skipspace(p, 1) - 1; +- break; +- case '"': +- p = scanstring(p, 1) - 1; +- break; +- default: +- ; +- } +- } +- /* Erase any embedded prototype parameters. */ +- if ( lp && rp ) +- writeblanks(lp + 1, rp); +- p--; /* back up over terminator */ +- /* Find the name being declared. */ +- /* This is complicated because of procedure and */ +- /* array modifiers. */ +- for ( ; ; ) +- { p = skipspace(p - 1, -1); +- switch ( *p ) +- { +- case ']': /* skip array dimension(s) */ +- case ')': /* skip procedure args OR name */ +- { int level = 1; +- while ( level ) +- switch ( *--p ) +- { +- case ']': case ')': +- level++; +- break; +- case '[': case '(': +- level--; +- break; +- case '/': +- if (p > buf && p[-1] == '*') +- p = skipspace(p, -1) + 1; +- break; +- case '"': +- p = scanstring(p, -1) + 1; +- break; +- default: ; +- } +- } +- if ( *p == '(' && *skipspace(p + 1, 1) == '*' ) +- { /* We found the name being declared */ +- while ( !isidfirstchar(*p) ) +- p = skipspace(p, 1) + 1; +- goto found; +- } +- break; +- default: +- goto found; +- } +- } +-found: if ( *p == '.' && p[-1] == '.' && p[-2] == '.' ) +- { if ( convert_varargs ) +- { *bp++ = "va_alist"; +- vararg = p-2; +- } +- else +- { p++; +- if ( bp == breaks + 1 ) /* sole argument */ +- writeblanks(breaks[0], p); +- else +- writeblanks(bp[-1] - 1, p); +- bp--; +- } +- } +- else +- { while ( isidchar(*p) ) p--; +- *bp++ = p+1; +- } +- p = end; +- } +- while ( *p++ == ',' ); +- *bp = p; +- /* Make a special check for 'void' arglist */ +- if ( bp == breaks+2 ) +- { p = skipspace(breaks[0], 1); +- if ( !strncmp(p, "void", 4) ) +- { p = skipspace(p+4, 1); +- if ( p == breaks[2] - 1 ) +- { bp = breaks; /* yup, pretend arglist is empty */ +- writeblanks(breaks[0], p + 1); +- } +- } +- } +- /* Put out the function name and left parenthesis. */ +- p = buf; +- while ( p != endfn ) putc(*p, out), p++; +- /* Put out the declaration. */ +- if ( header ) +- { fputs(");", out); +- for ( p = breaks[0]; *p; p++ ) +- if ( *p == '\r' || *p == '\n' ) +- putc(*p, out); +- } +- else +- { for ( ap = breaks+1; ap < bp; ap += 2 ) +- { p = *ap; +- while ( isidchar(*p) ) +- putc(*p, out), p++; +- if ( ap < bp - 1 ) +- fputs(", ", out); +- } +- fputs(") ", out); +- /* Put out the argument declarations */ +- for ( ap = breaks+2; ap <= bp; ap += 2 ) +- (*ap)[-1] = ';'; +- if ( vararg != 0 ) +- { *vararg = 0; +- fputs(breaks[0], out); /* any prior args */ +- fputs("va_dcl", out); /* the final arg */ +- fputs(bp[0], out); +- } +- else +- fputs(breaks[0], out); +- } +- free((char *)breaks); +- return 0; +-} +diff -urNd -urNd patch-2.5.4/argmatch.c patch-2.5.9/argmatch.c +--- patch-2.5.4/argmatch.c 1999-08-09 19:09:13.000000000 -0400 ++++ patch-2.5.9/argmatch.c 2003-03-10 02:31:50.000000000 -0500 +@@ -1,5 +1,7 @@ + /* argmatch.c -- find a match for a string in an array +- Copyright (C) 1990, 1998, 1999 Free Software Foundation, Inc. ++ ++ Copyright (C) 1990, 1998, 1999, 2001, 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 +@@ -18,26 +20,24 @@ + /* Written by David MacKenzie <djm@ai.mit.edu> + Modified by Akim Demaille <demaille@inf.enst.fr> */ + ++#if HAVE_CONFIG_H ++# include <config.h> ++#endif ++ ++/* Specification. */ + #include "argmatch.h" + + #include <stdio.h> +-#ifdef STDC_HEADERS +-# include <string.h> +-#endif +- +-#if HAVE_LOCALE_H +-# include <locale.h> +-#endif ++#include <stdlib.h> ++#include <string.h> + +-#if ENABLE_NLS +-# include <libintl.h> +-# define _(Text) gettext (Text) +-#else +-# define _(Text) Text +-#endif ++#include "gettext.h" ++#define _(msgid) gettext (msgid) + + #include "error.h" + #include "quotearg.h" ++#include "quote.h" ++#include "unlocked-io.h" + + /* When reporting an invalid argument, show nonprinting characters + by using the quoting style ARGMATCH_QUOTING_STYLE. Do not use +@@ -46,11 +46,7 @@ + # define ARGMATCH_QUOTING_STYLE locale_quoting_style + #endif + +-/* The following test is to work around the gross typo in +- systems like Sony NEWS-OS Release 4.0C, whereby EXIT_FAILURE +- is defined to 0, not 1. */ +-#if !EXIT_FAILURE +-# undef EXIT_FAILURE ++#ifndef EXIT_FAILURE + # define EXIT_FAILURE 1 + #endif + +@@ -78,7 +74,6 @@ + null-terminated array ARGLIST, return the index in ARGLIST + of the matched element, else -1 if it does not match any element + or -2 if it is ambiguous (is a prefix of more than one element). +- If SENSITIVE, comparison is case sensitive. + + If VALLIST is none null, use it to resolve ambiguities limited to + synonyms, i.e., for +@@ -86,10 +81,9 @@ + "no", "nope" -> 1 + "y" is a valid argument, for `0', and "n" for `1'. */ + +-static int +-__argmatch_internal (const char *arg, const char *const *arglist, +- const char *vallist, size_t valsize, +- int case_sensitive) ++int ++argmatch (const char *arg, const char *const *arglist, ++ const char *vallist, size_t valsize) + { + int i; /* Temporary index in ARGLIST. */ + size_t arglen; /* Length of ARG. */ +@@ -101,9 +95,7 @@ + /* Test all elements for either exact match or abbreviated matches. */ + for (i = 0; arglist[i]; i++) + { +- if (case_sensitive +- ? !strncmp (arglist[i], arg, arglen) +- : !strncasecmp (arglist[i], arg, arglen)) ++ if (!strncmp (arglist[i], arg, arglen)) + { + if (strlen (arglist[i]) == arglen) + /* Exact match found. */ +@@ -131,22 +123,6 @@ + return matchind; + } + +-/* argmatch - case sensitive version */ +-int +-argmatch (const char *arg, const char *const *arglist, +- const char *vallist, size_t valsize) +-{ +- return __argmatch_internal (arg, arglist, vallist, valsize, 1); +-} +- +-/* argcasematch - case insensitive version */ +-int +-argcasematch (const char *arg, const char *const *arglist, +- const char *vallist, size_t valsize) +-{ +- return __argmatch_internal (arg, arglist, vallist, valsize, 0); +-} +- + /* Error reporting for argmatch. + CONTEXT is a description of the type of entity that was being matched. + VALUE is the invalid value that was given. +@@ -156,10 +132,11 @@ + argmatch_invalid (const char *context, const char *value, int problem) + { + char const *format = (problem == -1 +- ? _("invalid argument %s for `%s'") +- : _("ambiguous argument %s for `%s'")); ++ ? _("invalid argument %s for %s") ++ : _("ambiguous argument %s for %s")); + +- error (0, 0, format, quotearg_style (ARGMATCH_QUOTING_STYLE, value), context); ++ error (0, 0, format, quotearg_n_style (0, ARGMATCH_QUOTING_STYLE, value), ++ quote_n (1, context)); + } + + /* List the valid arguments for argmatch. +@@ -200,12 +177,9 @@ + __xargmatch_internal (const char *context, + const char *arg, const char *const *arglist, + const char *vallist, size_t valsize, +- int case_sensitive, + argmatch_exit_fn exit_fn) + { +- int res = __argmatch_internal (arg, arglist, +- vallist, valsize, +- case_sensitive); ++ int res = argmatch (arg, arglist, vallist, valsize); + if (res >= 0) + /* Success. */ + return res; +@@ -291,12 +265,12 @@ + } + + if ((cp = getenv ("VERSION_CONTROL"))) +- backup_type = XARGCASEMATCH ("$VERSION_CONTROL", cp, +- backup_args, backup_vals); ++ backup_type = XARGMATCH ("$VERSION_CONTROL", cp, ++ backup_args, backup_vals); + + if (argc == 2) +- backup_type = XARGCASEMATCH (program_name, argv[1], +- backup_args, backup_vals); ++ backup_type = XARGMATCH (program_name, argv[1], ++ backup_args, backup_vals); + + printf ("The version control is `%s'\n", + ARGMATCH_TO_ARGUMENT (backup_type, backup_args, backup_vals)); +diff -urNd -urNd patch-2.5.4/argmatch.h patch-2.5.9/argmatch.h +--- patch-2.5.4/argmatch.h 1999-01-25 09:57:22.000000000 -0500 ++++ patch-2.5.9/argmatch.h 2002-11-21 15:15:39.000000000 -0500 +@@ -1,5 +1,5 @@ + /* argmatch.h -- definitions and prototypes for argmatch.c +- Copyright (C) 1990, 1998, 1999 Free Software Foundation, Inc. ++ Copyright (C) 1990, 1998, 1999, 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 +@@ -21,109 +21,89 @@ + #ifndef ARGMATCH_H_ + # define ARGMATCH_H_ 1 + +-# if HAVE_CONFIG_H +-# include <config.h> +-# endif ++# include <stddef.h> + +-# include <sys/types.h> ++# define ARRAY_CARDINALITY(Array) (sizeof (Array) / sizeof *(Array)) + +-# ifndef PARAMS +-# if PROTOTYPES || (defined (__STDC__) && __STDC__) +-# define PARAMS(args) args +-# else +-# define PARAMS(args) () +-# endif /* GCC. */ +-# endif /* Not PARAMS. */ ++# define ARGMATCH_CONSTRAINT(Arglist, Vallist) \ ++ (ARRAY_CARDINALITY (Arglist) == ARRAY_CARDINALITY (Vallist) + 1) + + /* Assert there are as many real arguments as there are values +- (argument list ends with a NULL guard). There is no execution +- cost, since it will be statically evalauted to `assert (0)' or +- `assert (1)'. Unfortunately there is no -Wassert-0. */ ++ (argument list ends with a NULL guard). ARGMATCH_VERIFY is ++ preferred, since it is guaranteed to be checked at compile-time. ++ ARGMATCH_ASSERT is for backward compatibility only. */ + +-# undef ARRAY_CARDINALITY +-# define ARRAY_CARDINALITY(Array) (sizeof ((Array)) / sizeof (*(Array))) ++# define ARGMATCH_VERIFY(Arglist, Vallist) \ ++ struct argmatch_verify \ ++ { \ ++ char argmatch_verify[ARGMATCH_CONSTRAINT(Arglist, Vallist) ? 1 : -1]; \ ++ } + +-# define ARGMATCH_ASSERT(Arglist, Vallist) \ +- assert (ARRAY_CARDINALITY ((Arglist)) == ARRAY_CARDINALITY ((Vallist)) + 1) ++# define ARGMATCH_ASSERT(Arglist, Vallist) \ ++ assert (ARGMATCH_CONSTRAINT (Arglist, Vallist)) + + /* Return the index of the element of ARGLIST (NULL terminated) that + matches with ARG. If VALLIST is not NULL, then use it to resolve + false ambiguities (i.e., different matches of ARG but corresponding + to the same values in VALLIST). */ + +-int argmatch +- PARAMS ((const char *arg, const char *const *arglist, +- const char *vallist, size_t valsize)); +-int argcasematch +- PARAMS ((const char *arg, const char *const *arglist, +- const char *vallist, size_t valsize)); ++int argmatch (char const *arg, char const *const *arglist, ++ char const *vallist, size_t valsize); + + # define ARGMATCH(Arg, Arglist, Vallist) \ +- argmatch ((Arg), (Arglist), (const char *) (Vallist), sizeof (*(Vallist))) +- +-# define ARGCASEMATCH(Arg, Arglist, Vallist) \ +- argcasematch ((Arg), (Arglist), (const char *) (Vallist), sizeof (*(Vallist))) ++ argmatch (Arg, Arglist, (char const *) (Vallist), sizeof *(Vallist)) + + /* xargmatch calls this function when it fails. This function should not + return. By default, this is a function that calls ARGMATCH_DIE which + in turn defaults to `exit (EXIT_FAILURE)'. */ +-typedef void (*argmatch_exit_fn) PARAMS ((void)); ++typedef void (*argmatch_exit_fn) (void); + extern argmatch_exit_fn argmatch_die; + + /* Report on stderr why argmatch failed. Report correct values. */ + +-void argmatch_invalid +- PARAMS ((const char *context, const char *value, int problem)); ++void argmatch_invalid (char const *context, char const *value, int problem); + + /* Left for compatibility with the old name invalid_arg */ + + # define invalid_arg(Context, Value, Problem) \ +- argmatch_invalid ((Context), (Value), (Problem)) ++ argmatch_invalid (Context, Value, Problem) + + + + /* Report on stderr the list of possible arguments. */ + +-void argmatch_valid +- PARAMS ((const char *const *arglist, +- const char *vallist, size_t valsize)); ++void argmatch_valid (char const *const *arglist, ++ char const *vallist, size_t valsize); + + # define ARGMATCH_VALID(Arglist, Vallist) \ +- argmatch_valid (Arglist, (const char *) Vallist, sizeof (*(Vallist))) ++ argmatch_valid (Arglist, (char const *) (Vallist), sizeof *(Vallist)) + + + + /* Same as argmatch, but upon failure, reports a explanation on the + failure, and exits using the function EXIT_FN. */ + +-int __xargmatch_internal +- PARAMS ((const char *context, +- const char *arg, const char *const *arglist, +- const char *vallist, size_t valsize, +- int case_sensitive, argmatch_exit_fn exit_fn)); ++int __xargmatch_internal (char const *context, ++ char const *arg, char const *const *arglist, ++ char const *vallist, size_t valsize, ++ argmatch_exit_fn exit_fn); + + /* Programmer friendly interface to __xargmatch_internal. */ + +-# define XARGMATCH(Context, Arg, Arglist, Vallist) \ +- (Vallist [__xargmatch_internal ((Context), (Arg), (Arglist), \ +- (const char *) (Vallist), \ +- sizeof (*(Vallist)), \ +- 1, argmatch_die)]) +- +-# define XARGCASEMATCH(Context, Arg, Arglist, Vallist) \ +- (Vallist [__xargmatch_internal ((Context), (Arg), (Arglist), \ +- (const char *) (Vallist), \ +- sizeof (*(Vallist)), \ +- 0, argmatch_die)]) ++# define XARGMATCH(Context, Arg, Arglist, Vallist) \ ++ ((Vallist) [__xargmatch_internal (Context, Arg, Arglist, \ ++ (char const *) (Vallist), \ ++ sizeof *(Vallist), \ ++ argmatch_die)]) + + /* Convert a value into a corresponding argument. */ + +-const char *argmatch_to_argument +- PARAMS ((char const *value, const char *const *arglist, +- const char *vallist, size_t valsize)); ++char const *argmatch_to_argument (char const *value, ++ char const *const *arglist, ++ char const *vallist, size_t valsize); + + # define ARGMATCH_TO_ARGUMENT(Value, Arglist, Vallist) \ +- argmatch_to_argument ((char const *) &(Value), (Arglist), \ +- (const char *) (Vallist), sizeof (*(Vallist))) ++ argmatch_to_argument (Value, Arglist, \ ++ (char const *) (Vallist), sizeof *(Vallist)) + + #endif /* ARGMATCH_H_ */ +diff -urNd -urNd patch-2.5.4/backupfile.c patch-2.5.9/backupfile.c +--- patch-2.5.4/backupfile.c 1999-01-18 12:02:28.000000000 -0500 ++++ patch-2.5.9/backupfile.c 2002-01-16 17:44:24.000000000 -0500 +@@ -1,5 +1,6 @@ + /* backupfile.c -- make Emacs style backup file names +- Copyright (C) 1990-1997, 1998, 1999 Free Software Foundation, Inc. ++ Copyright (C) 1990,91,92,93,94,95,96,97,98,99,2000, 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 +@@ -23,9 +24,6 @@ + # include <config.h> + #endif + +-#include <argmatch.h> +-#include <backupfile.h> +- + #include <stdio.h> + #include <sys/types.h> + #if HAVE_STRING_H +@@ -58,17 +56,23 @@ + # define CLOSEDIR(d) closedir (d) + #endif + +-#if STDC_HEADERS ++#if HAVE_STDLIB_H + # include <stdlib.h> +-#else +-char *malloc (); + #endif + + #ifndef HAVE_DECL_GETENV ++"this configure-time declaration test was not run" ++#endif ++#if !HAVE_DECL_GETENV + char *getenv (); + #endif + +-char *base_name PARAMS ((char const *)); ++#ifndef HAVE_DECL_MALLOC ++"this configure-time declaration test was not run" ++#endif ++#if !HAVE_DECL_MALLOC ++char *malloc (); ++#endif + + #if HAVE_DIRENT_H || HAVE_NDIR_H || HAVE_SYS_DIR_H || HAVE_SYS_NDIR_H + # define HAVE_DIR 1 +@@ -91,10 +95,9 @@ + - Its arg may be any int or unsigned int; it need not be an unsigned char. + - It's guaranteed to evaluate its argument exactly once. + - It's typically faster. +- Posix 1003.2-1992 section 2.5.2.1 page 50 lines 1556-1558 says that +- only '0' through '9' are digits. Prefer ISDIGIT to isdigit unless +- it's important to use the locale's definition of `digit' even when the +- host does not conform to Posix. */ ++ POSIX says that only '0' through '9' are digits. Prefer ISDIGIT to ++ ISDIGIT_LOCALE unless it's important to use the locale's definition ++ of `digit' even when the host does not conform to POSIX. */ + #define ISDIGIT(c) ((unsigned) (c) - '0' <= 9) + + #if D_INO_IN_DIRENT +@@ -103,6 +106,10 @@ + # define REAL_DIR_ENTRY(dp) 1 + #endif + ++#include "argmatch.h" ++#include "backupfile.h" ++#include "dirname.h" ++ + /* The extension added to file names to produce a simple (as opposed + to numbered) backup file name. */ + const char *simple_backup_suffix = "~"; +@@ -129,29 +136,31 @@ + if (HAVE_DIR && backup_suffix_size_max < numbered_suffix_size_max) + backup_suffix_size_max = numbered_suffix_size_max; + +- s = malloc (file_len + backup_suffix_size_max + numbered_suffix_size_max); ++ s = malloc (file_len + 1 ++ + backup_suffix_size_max + numbered_suffix_size_max); + if (s) + { +- strcpy (s, file); +- + #if HAVE_DIR + if (backup_type != simple) + { + int highest_backup; +- size_t dir_len = base_name (s) - s; ++ size_t dirlen = dir_len (file); + +- strcpy (s + dir_len, "."); +- highest_backup = max_backup_version (file + dir_len, s); ++ memcpy (s, file, dirlen); ++ if (dirlen == FILESYSTEM_PREFIX_LEN (file)) ++ s[dirlen++] = '.'; ++ s[dirlen] = '\0'; ++ highest_backup = max_backup_version (base_name (file), s); + if (! (backup_type == numbered_existing && highest_backup == 0)) + { + char *numbered_suffix = s + (file_len + backup_suffix_size_max); + sprintf (numbered_suffix, ".~%d~", highest_backup + 1); + suffix = numbered_suffix; + } +- strcpy (s, file); + } + #endif /* HAVE_DIR */ + ++ strcpy (s, file); + addext (s, suffix, '~'); + } + return s; +@@ -178,7 +187,7 @@ + return 0; + + highest_version = 0; +- file_name_length = strlen (file); ++ file_name_length = base_len (file); + + while ((dp = readdir (dirp)) != 0) + { +diff -urNd -urNd patch-2.5.4/basename.c patch-2.5.9/basename.c +--- patch-2.5.4/basename.c 1999-03-18 11:56:34.000000000 -0500 ++++ patch-2.5.9/basename.c 2001-05-12 11:39:45.000000000 -0400 +@@ -1,5 +1,5 @@ + /* basename.c -- return the last element in a path +- Copyright (C) 1990, 1998, 1999 Free Software Foundation, Inc. ++ Copyright (C) 1990, 1998, 1999, 2000, 2001 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 +@@ -19,37 +19,61 @@ + # include <config.h> + #endif + +-#ifndef FILESYSTEM_PREFIX_LEN +-# define FILESYSTEM_PREFIX_LEN(Filename) 0 +-#endif +- +-#ifndef ISSLASH +-# define ISSLASH(C) ((C) == '/') ++#if STDC_HEADERS || HAVE_STRING_H ++# include <string.h> + #endif ++#include "dirname.h" + + /* In general, we can't use the builtin `basename' function if available, + since it has different meanings in different environments. + In some environments the builtin `basename' modifies its argument. +- If NAME is all slashes, be sure to return `/'. */ ++ ++ Return the address of the last file name component of NAME. If ++ NAME has no file name components because it is all slashes, return ++ NAME if it is empty, the address of its last slash otherwise. */ + + char * + base_name (char const *name) + { +- char const *base = name += FILESYSTEM_PREFIX_LEN (name); +- int all_slashes = 1; ++ char const *base = name + FILESYSTEM_PREFIX_LEN (name); + char const *p; + +- for (p = name; *p; p++) ++ for (p = base; *p; p++) + { + if (ISSLASH (*p)) +- base = p + 1; +- else +- all_slashes = 0; +- } ++ { ++ /* Treat multiple adjacent slashes like a single slash. */ ++ do p++; ++ while (ISSLASH (*p)); + +- /* If NAME is all slashes, arrange to return `/'. */ +- if (*base == '\0' && ISSLASH (*name) && all_slashes) +- --base; ++ /* If the file name ends in slash, use the trailing slash as ++ the basename if no non-slashes have been found. */ ++ if (! *p) ++ { ++ if (ISSLASH (*base)) ++ base = p - 1; ++ break; ++ } ++ ++ /* *P is a non-slash preceded by a slash. */ ++ base = p; ++ } ++ } + + return (char *) base; + } ++ ++/* Return the length of of the basename NAME. Typically NAME is the ++ value returned by base_name. Act like strlen (NAME), except omit ++ redundant trailing slashes. */ ++ ++size_t ++base_len (char const *name) ++{ ++ size_t len; ++ ++ for (len = strlen (name); 1 < len && ISSLASH (name[len - 1]); len--) ++ continue; ++ ++ return len; ++} +diff -urNd -urNd patch-2.5.4/basename.h patch-2.5.9/basename.h +--- patch-2.5.4/basename.h 1999-07-07 14:06:40.000000000 -0400 ++++ patch-2.5.9/basename.h 1969-12-31 19:00:00.000000000 -0500 +@@ -1,9 +0,0 @@ +-#ifndef PARAMS +-# if defined PROTOTYPES || (defined __STDC__ && __STDC__) +-# define PARAMS(Args) Args +-# else +-# define PARAMS(Args) () +-# endif +-#endif +- +-char *base_name PARAMS ((char const *name)); +diff -urNd -urNd patch-2.5.4/ChangeLog patch-2.5.9/ChangeLog +--- patch-2.5.4/ChangeLog 1999-08-30 02:38:49.000000000 -0400 ++++ patch-2.5.9/ChangeLog 2003-05-20 12:16:31.000000000 -0400 +@@ -1,3 +1,359 @@ ++2003-05-20 Paul Eggert <eggert@twinsun.com> ++ ++ * NEWS, configure.ac (AC_INIT): Version 2.5.9 released. ++ ++ * Makefile.in (HDRS): Add gettext.h. ++ ++ Use bool, not int, for booleans. ++ ++ * pch.c (pch_says_nonexistent): Returns int, not bool. ++ ++ * configure.ac: Add AM_STDBOOL_H. ++ ++ * Makefile.in (MISC): Add stdbool.h.in. ++ (stdbool.h): New rule. ++ (ACINCLUDE_INPUTS): Add stdbool.m4. ++ (mostlyclean): Remove stdbool.h. ++ (COMMON): New macro; use it instead of common.h for dependencies. ++ ++ * common.h: Include <stdbool.h>. ++ Remove TRUE, FALSE, bool. All uses changed to standard names. ++ ++ * common.h (reverse, set_time, set_utc): ++ Use bool, not int, for booleans. ++ * pch.c (p_strip_trailing_cr, p_pass_comments_through, ++ prefix_components, pget_line, re_patch, ++ there_is_another_patch, intuit_diff_type, scan_linenum, ++ another_hunk, pget_line, pch_timestamp): Likewise. ++ * inp.h (ifetch): Likewise. ++ * util.c (move_file, version_controller, version_get, ok_to_reverse, ++ set_signals): Likewise. ++ * inp.c (report_revision, get_input_file, plan_a, plan_b, ifetch): ++ Likewise. ++ * util.h (ok_to_reverse, version_controller, version_get, ++ move_file, set_signals): Likewise. ++ * pch.h (another_hunk, pch_says_nonexistent, pch_timestamp): ++ Likewise. ++ * patch.c (struct outstate, numeric_string, make_backups, ++ backup_if_mismatch, remove_empty_files, ++ reverse_flag_specified, main, reinitialize_almost_everything, ++ get_some_switches, apply_hunk, init_output, copy_till): ++ Likewise. ++ ++2003-05-18 Paul Eggert <eggert@twinsun.com> ++ ++ * pch.c (p_pass_comments_through): New var. ++ (pget_line): Accept new arg for pass_comments_through. ++ All callers changed. ++ (there_is_another_patch): Do not suggest -p for ed diffs. ++ (intuit_diff_type): Check ed command for correct syntax. ++ Do not set p_strip_trailing_cr merely because a -p line contains a CR. ++ (get_ed_command_letter): New function. ++ (do_ed_script): Use it. Do not treat '#' data lines as comments in ed ++ scripts. ++ ++ * util.c (move_file): ++ Don't assume that when 'rename(A,B)' succeeds then A no ++ longer exists. This is not true of POSIX 1003.1-2001 rename when A ++ and B are links to the same file. ++ (fetchname): Fix test for file names with internal spaces. ++ ++ * version.c: Don't include patchlevel.h. ++ (version): Use PACKAGE_NAME and PACKAGE_VERSION instead of obsolete ++ PROGRAM_NAME and PATCH_VERSION. ++ (copyright_string): Bump to 2003. ++ ++ * common.h (FILESYSTEM_PREFIX_LEN, ISSLASH): ++ Remove; now done by 'configure'. ++ (PROGRAM_NAME): Remove; now done by 'configure' as PACKAGE_NAME. ++ ++ * patch.c: Do not include <exitfail.h>. ++ (main): Set xalloc_exit_failure, not exit_failure. ++ Add "&& !skip_rest_of_patch" when deciding to continue ed scripts. ++ (option_help): Use PACKAGE_BUGREPORT rather than hardcoding. ++ ++ * configure.ac (AC_PREREQ): Bump to 2.57. ++ (AC_GNU_SOURCE): Add, early on. ++ (gl_BACKUPFILE, gl_DIRNAME, gl_ERROR, gl_FUNC_MEMCHR, gl_FUNC_RMDIR, ++ gl_GETOPT, gl_PREREQ_XMALLOC, gl_QUOTE, gl_QUOTEARG): Add. ++ (jm_PREREQ_ADDEXT): Add, with definition. ++ (jm_PREREQ_DIRNAME, jm_PREREQ_ERROR, jm_PREREQ_MEMCHR, ++ jm_PREREQ_QUOTEARG): Remove. ++ (AC_REPLACE_FUNCS): Remove memchr, rename, rmdir). ++ (jm_FUNC_GLIBC_UNLOCKED_IO, jm_AC_DOS): Add. ++ (jm_CHECK_TYPE_STRUCT_DIRENT_D_INO): Do not call directly. ++ (AC_OUTPUT): Use new style, with AC_CONFIG_FILES. ++ ++ Update to current CVS gnulib. ++ ++ * exitfail.c, exitfail.h, patchlevel.h, rename.c, m4/c-bs-a.m4, ++ m4/jm-glibc-io.m4, m4/prereq.m4: Remove. ++ * m4/backupfile.m4, m4/dirname.m4, m4/dos.m4, m4/getopt.m4, ++ m4/memchr.m4, m4/onceonly.m4, m4/quote.m4, m4/quotearg.m4, ++ m4/rmdir.m4, m4/unlocked-io.m4, m4/xalloc.m4: New files. ++ * Makefile.in (LIBSRCS): Move error.c here from SRCS. ++ Remove rename.c. ++ (OBJS): Remove error.$(OBJEXT). ++ (HDRS): Remove exitfail.h, patchlevel.h. ++ (ACINCLUDE_INPUTS): Remove c-bs-a.m4, jm-glibc-io.m4, prereq.m4. ++ Add backupfile.m4, dirname.m4, dos.m4, getopt.m4, memchr.m4, ++ onceonly.m4, quote.m4, quotearg.m4, rmdir.m4, unlocked-io.m4, ++ xalloc.m4. ++ (patchlevel.h): Remove. All uses removed. ++ (argmatch.$(OBJEXT), error.$(OBJEXT), quotesys.$(OBJEXT)), ++ xmalloc.$(OBJEXT)): Depend on gettext.h. ++ (dirname.$(OBJEXT), quote.$(OBJEXT), strncasecmp.$(OBJEXT)): New rules. ++ (patch.$(OBJEXT), xmalloc.$(OBJEXT)): Remove exitfail.h. ++ (rename.$(OBJEXT)): Remove. ++ (version.$(OBJEXT)): Remove util.h. ++ (xmalloc.$(OBJEXT)): Add error.h. ++ ++2002-11-23 Paul Eggert <eggert@twinsun.com> ++ ++ * patch.c (main): Don't check for zero-sized file after 'ed' ++ when skipping patch. From Michael Fedrowitz. ++ ++2002-06-03 Paul Eggert <eggert@twinsun.com> ++ ++ * configure.ac (AC_OUTPUT): Use new form, with AC_CONFIG_FILES, ++ instead of obsolescent form. Patch from Art Haas. ++ ++ * pch.c (intuit_diff_type): Do not warn about trailing white space ++ after Prereq: word. Bug reported by Mike Castle. ++ ++2002-06-02 Paul Eggert <eggert@twinsun.com> ++ ++ * NEWS, configure.ac (AC_INIT): Version 2.5.8 released. ++ ++ * README: POSIX.2 -> POSIX. ++ * inp.c (report_revision): Don't modify 'revision', since ++ it gets freed later. Bug reported by Mike Castle. ++ ++2002-05-30 Paul Eggert <eggert@twinsun.com> ++ ++ * NEWS, configure.ac (AC_INIT): Version 2.5.7 released. ++ ++ * Makefile.in (MISC): Remove README-alpha. ++ (patchlevel.h): Depend on configure, not configure.ac. ++ ++ * INSTALL: Upgrade to Autoconf 2.53 version. ++ ++2002-05-28 Paul Eggert <eggert@twinsun.com> ++ ++ * patch.c (end_defined, apply_hunk): Output #endif without ++ the comment, as POSIX 1003.1-2001 requires. ++ ++ * pch.c (there_is_another_patch): Flush stderr after perror. ++ ++ * NEWS, configure.ac (AC_INIT): Version 2.5.6 released. ++ ++ * strcasecmp.c, strncasecmp.c: New files, taken from fileutils. ++ * config.guess, config.sub: Remove. ++ * Makefile.in (LIBSRCS): Add strcasecmp.c, strncasecmp.c. ++ (MISC): Remove config.guess, config.sub. ++ ++ The code already assumes C89 or better, so remove K&R stuff. ++ * common.h (volatile): Remove. ++ (GENERIC_OBJECT): Remove; all uses changed to 'void'. ++ (PARAMS): Remove; all uses changed to prototypes. ++ * configure.ac (AC_PROG_CC_STDC): Add. ++ * util.c (vararg_start): Remove. All uses changed to va_start. ++ Always include <stdarg.h>. ++ ++ * configure.ac (AC_CANONICAL_HOST): Remove. ++ (AC_REPLACE_FUNCS): Add strncasecmp. ++ (AC_CHECK_DECLS): Add mktemp. ++ ++ * patch.c (main): Remove useless prototype decl. ++ (mktemp): Don't declare if HAVE_DECL_MKTEMP || defined mktemp. ++ (make_temp): Now accepts char, not int. ++ ++2002-05-26 Paul Eggert <eggert@twinsun.com> ++ ++ * patch.c (not_defined): Prepend newline. All uses changed. ++ (apply_hunk): Fix bug: -D was outputting #ifdef when it should ++ have been outputting #ifndef. Bug report and partial fix by ++ Jason Short. ++ ++ * pch.c (intuit_diff_type): When reading an ed diff, don't use ++ indent and trailing-CR-ness of "." line; instead, use that of the ++ command. Bug reported by Anthony Towns; partial fix by Michael ++ Fedrowitz. ++ (intuit_diff_type): If the index line exists, don't report a ++ missing header. Fix by Chip Salzenberg. ++ ++2002-05-26 Alessandro Rubini <rubini@gnu.org> ++ ++ * patch.c (locate_hunk): Fixed updating of last_offset. ++ ++2002-05-25 Paul Eggert <eggert@twinsun.com> ++ ++ * NEWS, README: Diffutils doc is up to date now. ++ Bug reporting address is now <bug-patch@gnu.org>. ++ * README: Describe '--disable-largefile'. ++ ++ * NEWS-alpha, dirname.c, dirname.h, exitfail.c, exitfail.h, ++ quote.c, quote.h, unlocked-io.h: New files, taken from diffutils ++ and fileutils. ++ ++ * argmatch.c: [STDC_HEADERS]: Include stdlib.h, for 'exit'. ++ ++ * addext.c, argmatch.c, argmatch.h, backupfile.c, basename.c: ++ Update from diffutils and fileutils. ++ ++ * ansi2knr.1, ansi2knr.c: Remove. ++ ++ * common.h: HAVE_SETMODE && O_BINARY -> HAVE_SETMODE_DOS. ++ * patch.c (usage): Likewise. ++ * pch.c (open_patch_file): Likewise. ++ ++ * configure.ac: Renamed from configure.in. Add copyright notice. ++ (AC_PREREQ): Bump to 2.53. ++ (AC_INIT): Use 2.5x style. ++ (AC_CONFIG_SRCDIR): Add. ++ (PACKAGE, VERSION): Remove. ++ (AC_C_PROTOTYPES): Use this instead of AM_C_PROTOTYPES. ++ (jm_CHECK_TYPE_STRUCT_UTIMBUF): Use this instead of jm_STRUCT_UTIMBUF. ++ (jm_PREREQ_ADDEXT, jm_PREREQ_DIRNAME, jm_PREREQ_ERROR, ++ jm_PREREQ_MEMCHR, jm_PREREQ_QUOTEARG): Add. ++ (AC_CHECK_DECLS): Add free, getenv, malloc. ++ (AC_CHECK_FUNCS): Remove setmode. ++ (AC_FUNC_SETMODE_DOS): Add. ++ (jm_CHECK_TYPE_STRUCT_DIRENT_D_INO): Use this instead of ++ jm_STRUCT_DIRENT_D_INO. ++ ++ * Makefile.in (OBJEXT): New var. ++ (PACKAGE_NAME): Renamed from PACKAGE. All uses changed. ++ (PACKAGE_VERSION): Renamed from VERSION. All uses changed. ++ (U): Remove. All uses of "$U.o" changed to ".$(OBJEXT)". ++ (LIBSRCS): REmove getopt.c getopt1.c. Add mkdir.c, rmdir.c. ++ (SRCS): Add dirname.c, exitfail.c, getopt.c, getopt1.c, quote.c. ++ Remove mkdir.c. ++ (OBJS): Keep in sync with SRCS. ++ (HDRS): Remove basename.h. ++ Add dirname.h, exitfail.h, quote.h, unlocked-io.h. ++ (MISC, configure, config.hin, patchlevel.h): ++ configure.ac renamed from configure.in. ++ (MISC): Add README-alpha. Remove ansi2knr.1, ansi2knr.c. ++ (.c.$(OBJEXT)): Renamed from .c.o. ++ (ACINCLUDE_INPUTS): Add c-bs-a.m4, error.m4, jm-glibc-io.m4, ++ mbstate_t.m4, mkdir.m4, mbrtowc.m4, prereq.m4, setmode.m4. ++ Remove ccstdc.m4, inttypes_h.m4, largefile.m4, protos.m4. ++ (mostlyclean): Don't clean ansi2knr. ++ (ansi2knr.o, ansi2knr): Remove. ++ Redo dependencies. ++ ++ * patch.c: Include <exitfail.h>. ++ (main): Initialize exit_failure. ++ ++ * patch.man: Update copyright notice. ++ ++ * pch.c, util.c: Include <dirname.h>, not <basename.h>. ++ ++ * version.c (copyright_string): Update copyright notice. ++ ++2002-02-17 Paul Eggert <eggert@twinsun.com> ++ ++ * partime.c (parse_pattern_letter): Don't overrun buffer if it ++ contains only alphanumerics. Bug reported by Winni ++ <Winni470@gmx.net>. ++ ++2001-07-28 Paul Eggert <eggert@sic.twinsun.com> ++ ++ * util.c (fetchname), NEWS: ++ Allow file names with internal spaces, so long as they ++ don't contain tabs. ++ ++ * pch.c (intuit_diff_type): Do not allow Prereq with multiple words. ++ ++ * configure.in (AC_PREREQ): Bump to 2.50. ++ (AC_CHECK_FUNCS): Remove fseeko. ++ (AC_FUNC_FSEEKO): Add. ++ * Makefile.in (ACINCLUDE_INPUTS): ++ Remove largefile.m4; no longer needed with Autoconf 2.50. ++ ++2001-02-07 "Tony E. Bennett" <tbennett@nvidia.com> ++ ++ * util.c (PERFORCE_CO): New var. ++ (version_controller): Support Perforce. ++ * patch.man: Document this. ++ ++2000-06-30 Paul Eggert <eggert@sic.twinsun.com> ++ ++ * patch.man: Ignore comment lines. ++ ++ * NEWS, pch.c: Ignore lines beginning with "#". ++ ++1999-10-24 Paul Eggert <eggert@twinsun.com> ++ ++ * pch.c (another_hunk): Report a fatal error if a regular ++ context hunk's pattern has a different number of unchanged ++ lines than the replacement. ++ ++1999-10-18 Paul Eggert <eggert@twinsun.com> ++ ++ * patch.c (main): If we skipped an ed patch, exit with nonzero status. ++ ++1999-10-17 Paul Eggert <eggert@twinsun.com> ++ ++ * patch.c (main): Apply do_ed_script even if dry_run, because ++ we need to make progress on the patch file. ++ * pch.c (do_ed_script): If skip_rest_of_patch is nonzero, ++ gobble up the patch without any other side effect. ++ ++1999-10-12 Paul Eggert <eggert@twinsun.com> ++ ++ * NEWS, README: New bug reporting address. ++ * NEWS: Report change in 2.5.4 that we forgot to document. ++ * README: Document `configure --disable-largefile'. ++ ++ * basename.c, COPYING, getopt.c, getopt.h, getopt1.c, m4/largefile.m4: ++ Update to latest version. ++ * Makefile.in (basename$U.o): Depend on basename.h. ++ (config.hin): Depend on $(srcdir)/aclocal.m4. ++ ++ * ansi2knr.c, maketime.c, mkinstalldirs, partime.c: Fix $Id. ++ ++ FreeBSD has an unrelated setmode function; work around this. ++ * common.h (binary_transput): Don't declare unless O_BINARY. ++ * patch.c (option_help, get_some_switches): ++ Don't use setmode unless O_BINARY. ++ * pch.c (open_patch_file): Don't invoke setmode unless O_BINARY. ++ ++ Fix incompatiblities with error.c. ++ * common.h (program_name): Now XTERN char *, for compatibility ++ with error.c. All uses changed. ++ (PROGRAM_NAME): New macro. ++ (PARAMS): Use ANSI C version only if defined PROTOTYPES ++ || (defined __STDC__ && __STDC__), for compatibilty with error.c. ++ * util.c (vararg_start): Likewise. ++ * patch.c (program_name): Remove. ++ (main): Initialize program_name. ++ * version.c (version): Print PROGRAM_NAME, not program_name. ++ ++ Accommodate mingw32 port, which has one-argument mkdir (yuck!) ++ and no geteuid. ++ * m4/mkdir.m4: New file. ++ * Makefile.in (ACINCLUDE_INPUTS): Add $(M4DIR)/mkdir.m4. ++ * configure.in (AC_CHECK_FUNCS): Add geteuid, getuid. ++ (PATCH_FUNC_MKDIR_TAKES_ONE_ARG): Add. ++ * common.h (mkdir): Define if mkdir takes one arg. ++ (geteuid): New macro, if not already defined. ++ ++1999-10-11 Christopher R. Gabriel <cgabriel@tin.it> ++ ++ * patch.c (option_help): Updated bug report address ++ * configure.in (VERSION): Version 2.5.5 released. ++ ++1999-09-01 Paul Eggert <eggert@twinsun.com> ++ ++ * patch.c (main): Default simple_backup_suffix to ".orig". ++ ++1999-10-08 Paul Eggert <eggert@twinsun.com> ++ ++ * patch.man: Make it clear that `patch -o F' should not be ++ used if F is one of the files to be patched. ++ + 1999-08-30 Paul Eggert <eggert@twinsun.com> + + Version 2.5.4 fixes a few minor bugs, converts C sources to +@@ -1910,9 +2266,26 @@ + + 1984-11-09 Larry Wall <sdcrdcf!lwall> + * patch.c: Initial revision +- +-Local Variables: +-mode: indented-text +-left-margin: 8 +-version-control: never +-end: ++ ++ ++Copyright (C) 1984, 1985, 1986, 1987, 1988 Larry Wall. ++ ++Copyright (C) 1989, 1990, 1991, 1992, 1993, 1997, 1998, 1999, 2000, 2001, ++2002 Free Software Foundation, Inc. ++ ++This file is part of GNU Patch. ++ ++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 they 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; see the file COPYING. If not, write to ++the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++Boston, MA 02111-1307, USA. +diff -urNd -urNd patch-2.5.4/common.h patch-2.5.9/common.h +--- patch-2.5.4/common.h 1999-08-30 02:20:08.000000000 -0400 ++++ patch-2.5.9/common.h 2003-05-19 02:57:36.000000000 -0400 +@@ -1,9 +1,11 @@ + /* common definitions for `patch' */ + +-/* $Id: common.h,v 1.20 1999/08/30 06:20:08 eggert Exp $ */ ++/* $Id: common.h,v 1.34 2003/05/19 06:57:36 eggert Exp $ */ + +-/* Copyright 1986, 1988 Larry Wall +- Copyright 1990, 1991-1993, 1997-1998, 1999 Free Software Foundation, Inc. ++/* Copyright (C) 1986, 1988 Larry Wall ++ ++ Copyright (C) 1990, 1991, 1992, 1993, 1997, 1998, 1999, 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 +@@ -24,17 +26,10 @@ + #define DEBUGGING 1 + #endif + +-/* We must define `volatile' and `const' first (the latter inside config.h), +- so that they're used consistently in all system includes. */ +-#ifndef __STDC__ +-# ifndef volatile +-# define volatile +-# endif +-#endif +- + #include <config.h> + + #include <assert.h> ++#include <stdbool.h> + #include <stdio.h> + #include <sys/types.h> + #include <time.h> +@@ -73,6 +68,9 @@ + #ifndef S_IRUSR + #define S_IRUSR (S_IROTH << 6) + #endif ++#ifdef MKDIR_TAKES_ONE_ARG ++# define mkdir(name, mode) ((mkdir) (name)) ++#endif + + #if HAVE_LIMITS_H + # include <limits.h> +@@ -123,27 +121,6 @@ + #endif + + +-#ifndef FILESYSTEM_PREFIX_LEN +-#define FILESYSTEM_PREFIX_LEN(f) 0 +-#endif +- +-#ifndef ISSLASH +-#define ISSLASH(c) ((c) == '/') +-#endif +- +- +-/* constants */ +- +-/* AIX predefines these. */ +-#ifdef TRUE +-#undef TRUE +-#endif +-#ifdef FALSE +-#undef FALSE +-#endif +-#define TRUE 1 +-#define FALSE 0 +- + /* handy definitions */ + + #define strEQ(s1,s2) (!strcmp(s1, s2)) +@@ -151,12 +128,11 @@ + + /* typedefs */ + +-typedef int bool; /* must promote to itself */ + typedef off_t LINENUM; /* must be signed */ + + /* globals */ + +-extern char const program_name[]; ++XTERN char *program_name; /* The name this program was run with. */ + + XTERN char *buf; /* general purpose buffer */ + XTERN size_t bufsize; /* allocated size of buf */ +@@ -190,14 +166,14 @@ + XTERN bool force; + XTERN bool batch; + XTERN bool noreverse; +-XTERN int reverse; ++XTERN bool reverse; + XTERN enum { DEFAULT_VERBOSITY, SILENT, VERBOSE } verbosity; + XTERN bool skip_rest_of_patch; + XTERN int strippath; + XTERN bool canonicalize; + XTERN int patch_get; +-XTERN int set_time; +-XTERN int set_utc; ++XTERN bool set_time; ++XTERN bool set_utc; + + enum diff + { +@@ -213,25 +189,11 @@ + + XTERN char *revision; /* prerequisite revision, if any */ + +-#ifdef __STDC__ +-# define GENERIC_OBJECT void +-#else +-# define GENERIC_OBJECT char +-#endif +- + #if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 6) || __STRICT_ANSI__ + # define __attribute__(x) + #endif + +-#ifndef PARAMS +-# ifdef __STDC__ +-# define PARAMS(args) args +-# else +-# define PARAMS(args) () +-# endif +-#endif +- +-void fatal_exit PARAMS ((int)) __attribute__ ((noreturn)); ++void fatal_exit (int) __attribute__ ((noreturn)); + + #include <errno.h> + #if !STDC_HEADERS && !defined errno +@@ -244,7 +206,7 @@ + # if !HAVE_MEMCHR + # define memcmp(s1, s2, n) bcmp (s1, s2, n) + # define memcpy(d, s, n) bcopy (s, d, n) +-GENERIC_OBJECT *memchr (); ++void *memchr (); + # endif + #endif + +@@ -252,8 +214,8 @@ + # include <stdlib.h> + #else + char *getenv (); +-GENERIC_OBJECT *malloc (); +-GENERIC_OBJECT *realloc (); ++void *malloc (); ++void *realloc (); + #endif + + #if HAVE_UNISTD_H +@@ -284,6 +246,13 @@ + # define file_seek fseek + # define file_tell ftell + #endif ++#if ! (HAVE_GETEUID || defined geteuid) ++# if ! (HAVE_GETUID || defined getuid) ++# define geteuid() (-1) ++# else ++# define geteuid() getuid () ++# endif ++#endif + + #if HAVE_FCNTL_H + # include <fcntl.h> +@@ -313,7 +282,7 @@ + #define O_TRUNC 0 + #endif + +-#if HAVE_SETMODE ++#if HAVE_SETMODE_DOS + XTERN int binary_transput; /* O_BINARY if binary i/o is desired */ + #else + # define binary_transput 0 +diff -urNd -urNd patch-2.5.4/config.guess patch-2.5.9/config.guess +--- patch-2.5.4/config.guess 1999-08-05 08:55:17.000000000 -0400 ++++ patch-2.5.9/config.guess 1969-12-31 19:00:00.000000000 -0500 +@@ -1,1088 +0,0 @@ +-#! /bin/sh +-# Attempt to guess a canonical system name. +-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999 +-# Free Software Foundation, Inc. +-# +-# This file 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 of the License, 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. +-# +-# As a special exception to the GNU General Public License, if you +-# distribute this file as part of a program that contains a +-# configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. +- +-# Written by Per Bothner <bothner@cygnus.com>. +-# The master version of this file is at the FSF in /home/gd/gnu/lib. +-# Please send patches to <autoconf-patches@gnu.org>. +-# +-# This script attempts to guess a canonical system name similar to +-# config.sub. If it succeeds, it prints the system name on stdout, and +-# exits with 0. Otherwise, it exits with 1. +-# +-# The plan is that this can be called by configure scripts if you +-# don't specify an explicit system type (host/target name). +-# +-# Only a few systems have been added to this list; please add others +-# (but try to keep the structure clean). +-# +- +-# Use $HOST_CC if defined. $CC may point to a cross-compiler +-if test x"$CC_FOR_BUILD" = x; then +- if test x"$HOST_CC" != x; then +- CC_FOR_BUILD="$HOST_CC" +- else +- if test x"$CC" != x; then +- CC_FOR_BUILD="$CC" +- else +- CC_FOR_BUILD=cc +- fi +- fi +-fi +- +- +-# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +-# (ghazi@noc.rutgers.edu 8/24/94.) +-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then +- PATH=$PATH:/.attbin ; export PATH +-fi +- +-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +- +-dummy=dummy-$$ +-trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15 +- +-# Note: order is significant - the case branches are not exclusive. +- +-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +- alpha:OSF1:*:*) +- if test $UNAME_RELEASE = "V4.0"; then +- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` +- fi +- # A Vn.n version is a released version. +- # A Tn.n version is a released field test version. +- # A Xn.n version is an unreleased experimental baselevel. +- # 1.2 uses "1.2" for uname -r. +- cat <<EOF >$dummy.s +- .globl main +- .ent main +-main: +- .frame \$30,0,\$26,0 +- .prologue 0 +- .long 0x47e03d80 # implver $0 +- lda \$2,259 +- .long 0x47e20c21 # amask $2,$1 +- srl \$1,8,\$2 +- sll \$2,2,\$2 +- sll \$0,3,\$0 +- addl \$1,\$0,\$0 +- addl \$2,\$0,\$0 +- ret \$31,(\$26),1 +- .end main +-EOF +- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null +- if test "$?" = 0 ; then +- ./$dummy +- case "$?" in +- 7) +- UNAME_MACHINE="alpha" +- ;; +- 15) +- UNAME_MACHINE="alphaev5" +- ;; +- 14) +- UNAME_MACHINE="alphaev56" +- ;; +- 10) +- UNAME_MACHINE="alphapca56" +- ;; +- 16) +- UNAME_MACHINE="alphaev6" +- ;; +- esac +- fi +- rm -f $dummy.s $dummy +- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit 0 ;; +- Alpha\ *:Windows_NT*:*) +- # How do we know it's Interix rather than the generic POSIX subsystem? +- # Should we change UNAME_MACHINE based on the output of uname instead +- # of the specific Alpha model? +- echo alpha-pc-interix +- exit 0 ;; +- 21064:Windows_NT:50:3) +- echo alpha-dec-winnt3.5 +- exit 0 ;; +- Amiga*:UNIX_System_V:4.0:*) +- echo m68k-cbm-sysv4 +- exit 0;; +- amiga:NetBSD:*:*) +- echo m68k-cbm-netbsd${UNAME_RELEASE} +- exit 0 ;; +- amiga:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- *:[Aa]miga[Oo][Ss]:*:*) +- echo ${UNAME_MACHINE}-unknown-amigaos +- exit 0 ;; +- arc64:OpenBSD:*:*) +- echo mips64el-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- arc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- hkmips:OpenBSD:*:*) +- echo mips-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- pmax:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- sgi:OpenBSD:*:*) +- echo mips-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- wgrisc:OpenBSD:*:*) +- echo mipsel-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) +- echo arm-acorn-riscix${UNAME_RELEASE} +- exit 0;; +- arm32:NetBSD:*:*) +- echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` +- exit 0 ;; +- SR2?01:HI-UX/MPP:*:*) +- echo hppa1.1-hitachi-hiuxmpp +- exit 0;; +- Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) +- # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. +- if test "`(/bin/universe) 2>/dev/null`" = att ; then +- echo pyramid-pyramid-sysv3 +- else +- echo pyramid-pyramid-bsd +- fi +- exit 0 ;; +- NILE*:*:*:dcosx) +- echo pyramid-pyramid-svr4 +- exit 0 ;; +- sun4H:SunOS:5.*:*) +- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; +- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) +- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; +- i86pc:SunOS:5.*:*) +- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; +- sun4*:SunOS:6*:*) +- # According to config.sub, this is the proper way to canonicalize +- # SunOS6. Hard to guess exactly what SunOS6 will be like, but +- # it's likely to be more like Solaris than SunOS4. +- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; +- sun4*:SunOS:*:*) +- case "`/usr/bin/arch -k`" in +- Series*|S4*) +- UNAME_RELEASE=`uname -v` +- ;; +- esac +- # Japanese Language versions have a version number like `4.1.3-JL'. +- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` +- exit 0 ;; +- sun3*:SunOS:*:*) +- echo m68k-sun-sunos${UNAME_RELEASE} +- exit 0 ;; +- sun*:*:4.2BSD:*) +- UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` +- test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 +- case "`/bin/arch`" in +- sun3) +- echo m68k-sun-sunos${UNAME_RELEASE} +- ;; +- sun4) +- echo sparc-sun-sunos${UNAME_RELEASE} +- ;; +- esac +- exit 0 ;; +- aushp:SunOS:*:*) +- echo sparc-auspex-sunos${UNAME_RELEASE} +- exit 0 ;; +- atari*:NetBSD:*:*) +- echo m68k-atari-netbsd${UNAME_RELEASE} +- exit 0 ;; +- atari*:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- # The situation for MiNT is a little confusing. The machine name +- # can be virtually everything (everything which is not +- # "atarist" or "atariste" at least should have a processor +- # > m68000). The system name ranges from "MiNT" over "FreeMiNT" +- # to the lowercase version "mint" (or "freemint"). Finally +- # the system name "TOS" denotes a system which is actually not +- # MiNT. But MiNT is downward compatible to TOS, so this should +- # be no problem. +- atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; +- atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; +- *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} +- exit 0 ;; +- milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) +- echo m68k-milan-mint${UNAME_RELEASE} +- exit 0 ;; +- hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) +- echo m68k-hades-mint${UNAME_RELEASE} +- exit 0 ;; +- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) +- echo m68k-unknown-mint${UNAME_RELEASE} +- exit 0 ;; +- sun3*:NetBSD:*:*) +- echo m68k-sun-netbsd${UNAME_RELEASE} +- exit 0 ;; +- sun3*:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mac68k:NetBSD:*:*) +- echo m68k-apple-netbsd${UNAME_RELEASE} +- exit 0 ;; +- mac68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme68k:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- mvme88k:OpenBSD:*:*) +- echo m88k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- powerpc:machten:*:*) +- echo powerpc-apple-machten${UNAME_RELEASE} +- exit 0 ;; +- macppc:NetBSD:*:*) +- echo powerpc-apple-netbsd${UNAME_RELEASE} +- exit 0 ;; +- RISC*:Mach:*:*) +- echo mips-dec-mach_bsd4.3 +- exit 0 ;; +- RISC*:ULTRIX:*:*) +- echo mips-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; +- VAX*:ULTRIX*:*:*) +- echo vax-dec-ultrix${UNAME_RELEASE} +- exit 0 ;; +- 2020:CLIX:*:* | 2430:CLIX:*:*) +- echo clipper-intergraph-clix${UNAME_RELEASE} +- exit 0 ;; +- mips:*:*:UMIPS | mips:*:*:RISCos) +- sed 's/^ //' << EOF >$dummy.c +-#ifdef __cplusplus +- int main (int argc, char *argv[]) { +-#else +- int main (argc, argv) int argc; char *argv[]; { +-#endif +- #if defined (host_mips) && defined (MIPSEB) +- #if defined (SYSTYPE_SYSV) +- printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); +- #endif +- #if defined (SYSTYPE_SVR4) +- printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); +- #endif +- #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) +- printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); +- #endif +- #endif +- exit (-1); +- } +-EOF +- $CC_FOR_BUILD $dummy.c -o $dummy \ +- && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ +- && rm $dummy.c $dummy && exit 0 +- rm -f $dummy.c $dummy +- echo mips-mips-riscos${UNAME_RELEASE} +- exit 0 ;; +- Night_Hawk:Power_UNIX:*:*) +- echo powerpc-harris-powerunix +- exit 0 ;; +- m88k:CX/UX:7*:*) +- echo m88k-harris-cxux7 +- exit 0 ;; +- m88k:*:4*:R4*) +- echo m88k-motorola-sysv4 +- exit 0 ;; +- m88k:*:3*:R3*) +- echo m88k-motorola-sysv3 +- exit 0 ;; +- AViiON:dgux:*:*) +- # DG/UX returns AViiON for all architectures +- UNAME_PROCESSOR=`/usr/bin/uname -p` +- if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then +- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \ +- -o ${TARGET_BINARY_INTERFACE}x = x ] ; then +- echo m88k-dg-dgux${UNAME_RELEASE} +- else +- echo m88k-dg-dguxbcs${UNAME_RELEASE} +- fi +- else echo i586-dg-dgux${UNAME_RELEASE} +- fi +- exit 0 ;; +- M88*:DolphinOS:*:*) # DolphinOS (SVR3) +- echo m88k-dolphin-sysv3 +- exit 0 ;; +- M88*:*:R3*:*) +- # Delta 88k system running SVR3 +- echo m88k-motorola-sysv3 +- exit 0 ;; +- XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) +- echo m88k-tektronix-sysv3 +- exit 0 ;; +- Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) +- echo m68k-tektronix-bsd +- exit 0 ;; +- *:IRIX*:*:*) +- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` +- exit 0 ;; +- ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. +- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id +- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' +- i?86:AIX:*:*) +- echo i386-ibm-aix +- exit 0 ;; +- *:AIX:2:3) +- if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then +- sed 's/^ //' << EOF >$dummy.c +- #include <sys/systemcfg.h> +- +- main() +- { +- if (!__power_pc()) +- exit(1); +- puts("powerpc-ibm-aix3.2.5"); +- exit(0); +- } +-EOF +- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0 +- rm -f $dummy.c $dummy +- echo rs6000-ibm-aix3.2.5 +- elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then +- echo rs6000-ibm-aix3.2.4 +- else +- echo rs6000-ibm-aix3.2 +- fi +- exit 0 ;; +- *:AIX:*:4) +- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` +- if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then +- IBM_ARCH=rs6000 +- else +- IBM_ARCH=powerpc +- fi +- if [ -x /usr/bin/oslevel ] ; then +- IBM_REV=`/usr/bin/oslevel` +- else +- IBM_REV=4.${UNAME_RELEASE} +- fi +- echo ${IBM_ARCH}-ibm-aix${IBM_REV} +- exit 0 ;; +- *:AIX:*:*) +- echo rs6000-ibm-aix +- exit 0 ;; +- ibmrt:4.4BSD:*|romp-ibm:BSD:*) +- echo romp-ibm-bsd4.4 +- exit 0 ;; +- ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and +- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to +- exit 0 ;; # report: romp-ibm BSD 4.3 +- *:BOSX:*:*) +- echo rs6000-bull-bosx +- exit 0 ;; +- DPX/2?00:B.O.S.:*:*) +- echo m68k-bull-sysv3 +- exit 0 ;; +- 9000/[34]??:4.3bsd:1.*:*) +- echo m68k-hp-bsd +- exit 0 ;; +- hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) +- echo m68k-hp-bsd4.4 +- exit 0 ;; +- 9000/[34678]??:HP-UX:*:*) +- case "${UNAME_MACHINE}" in +- 9000/31? ) HP_ARCH=m68000 ;; +- 9000/[34]?? ) HP_ARCH=m68k ;; +- 9000/[678][0-9][0-9]) +- sed 's/^ //' << EOF >$dummy.c +- #include <stdlib.h> +- #include <unistd.h> +- +- int main () +- { +- #if defined(_SC_KERNEL_BITS) +- long bits = sysconf(_SC_KERNEL_BITS); +- #endif +- long cpu = sysconf (_SC_CPU_VERSION); +- +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; +- case CPU_PA_RISC2_0: +- #if defined(_SC_KERNEL_BITS) +- switch (bits) +- { +- case 64: puts ("hppa2.0w"); break; +- case 32: puts ("hppa2.0n"); break; +- default: puts ("hppa2.0"); break; +- } break; +- #else /* !defined(_SC_KERNEL_BITS) */ +- puts ("hppa2.0"); break; +- #endif +- default: puts ("hppa1.0"); break; +- } +- exit (0); +- } +-EOF +- ($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` +- rm -f $dummy.c $dummy +- esac +- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` +- echo ${HP_ARCH}-hp-hpux${HPUX_REV} +- exit 0 ;; +- 3050*:HI-UX:*:*) +- sed 's/^ //' << EOF >$dummy.c +- #include <unistd.h> +- int +- main () +- { +- long cpu = sysconf (_SC_CPU_VERSION); +- /* The order matters, because CPU_IS_HP_MC68K erroneously returns +- true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct +- results, however. */ +- if (CPU_IS_PA_RISC (cpu)) +- { +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; +- case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; +- default: puts ("hppa-hitachi-hiuxwe2"); break; +- } +- } +- else if (CPU_IS_HP_MC68K (cpu)) +- puts ("m68k-hitachi-hiuxwe2"); +- else puts ("unknown-hitachi-hiuxwe2"); +- exit (0); +- } +-EOF +- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0 +- rm -f $dummy.c $dummy +- echo unknown-hitachi-hiuxwe2 +- exit 0 ;; +- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) +- echo hppa1.1-hp-bsd +- exit 0 ;; +- 9000/8??:4.3bsd:*:*) +- echo hppa1.0-hp-bsd +- exit 0 ;; +- *9??*:MPE/iX:*:*) +- echo hppa1.0-hp-mpeix +- exit 0 ;; +- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) +- echo hppa1.1-hp-osf +- exit 0 ;; +- hp8??:OSF1:*:*) +- echo hppa1.0-hp-osf +- exit 0 ;; +- i?86:OSF1:*:*) +- if [ -x /usr/sbin/sysversion ] ; then +- echo ${UNAME_MACHINE}-unknown-osf1mk +- else +- echo ${UNAME_MACHINE}-unknown-osf1 +- fi +- exit 0 ;; +- parisc*:Lites*:*:*) +- echo hppa1.1-hp-lites +- exit 0 ;; +- hppa*:OpenBSD:*:*) +- echo hppa-unknown-openbsd +- exit 0 ;; +- C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) +- echo c1-convex-bsd +- exit 0 ;; +- C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) +- if getsysinfo -f scalar_acc +- then echo c32-convex-bsd +- else echo c2-convex-bsd +- fi +- exit 0 ;; +- C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) +- echo c34-convex-bsd +- exit 0 ;; +- C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) +- echo c38-convex-bsd +- exit 0 ;; +- C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) +- echo c4-convex-bsd +- exit 0 ;; +- CRAY*X-MP:*:*:*) +- echo xmp-cray-unicos +- exit 0 ;; +- CRAY*Y-MP:*:*:*) +- echo ymp-cray-unicos${UNAME_RELEASE} +- exit 0 ;; +- CRAY*[A-Z]90:*:*:*) +- echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ +- | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ +- -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ +- exit 0 ;; +- CRAY*TS:*:*:*) +- echo t90-cray-unicos${UNAME_RELEASE} +- exit 0 ;; +- CRAY*T3E:*:*:*) +- echo alpha-cray-unicosmk${UNAME_RELEASE} +- exit 0 ;; +- CRAY-2:*:*:*) +- echo cray2-cray-unicos +- exit 0 ;; +- F300:UNIX_System_V:*:*) +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` +- echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit 0 ;; +- F301:UNIX_System_V:*:*) +- echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'` +- exit 0 ;; +- hp3[0-9][05]:NetBSD:*:*) +- echo m68k-hp-netbsd${UNAME_RELEASE} +- exit 0 ;; +- hp300:OpenBSD:*:*) +- echo m68k-unknown-openbsd${UNAME_RELEASE} +- exit 0 ;; +- i?86:BSD/386:*:* | i?86:BSD/OS:*:*) +- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +- exit 0 ;; +- sparc*:BSD/OS:*:*) +- echo sparc-unknown-bsdi${UNAME_RELEASE} +- exit 0 ;; +- *:BSD/OS:*:*) +- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} +- exit 0 ;; +- *:FreeBSD:*:*) +- if test -x /usr/bin/objformat; then +- if test "elf" = "`/usr/bin/objformat`"; then +- echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'` +- exit 0 +- fi +- fi +- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` +- exit 0 ;; +- *:NetBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` +- exit 0 ;; +- *:OpenBSD:*:*) +- echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` +- exit 0 ;; +- i*:CYGWIN*:*) +- echo ${UNAME_MACHINE}-pc-cygwin +- exit 0 ;; +- i*:MINGW*:*) +- echo ${UNAME_MACHINE}-pc-mingw32 +- exit 0 ;; +- i*:Windows_NT*:* | Pentium*:Windows_NT*:*) +- # How do we know it's Interix rather than the generic POSIX subsystem? +- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we +- # UNAME_MACHINE based on the output of uname instead of i386? +- echo i386-pc-interix +- exit 0 ;; +- i*:UWIN*:*) +- echo ${UNAME_MACHINE}-pc-uwin +- exit 0 ;; +- p*:CYGWIN*:*) +- echo powerpcle-unknown-cygwin +- exit 0 ;; +- prep*:SunOS:5.*:*) +- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` +- exit 0 ;; +- *:GNU:*:*) +- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` +- exit 0 ;; +- *:Linux:*:*) +- # uname on the ARM produces all sorts of strangeness, and we need to +- # filter it out. +- case "$UNAME_MACHINE" in +- armv*) UNAME_MACHINE=$UNAME_MACHINE ;; +- arm* | sa110*) UNAME_MACHINE="arm" ;; +- esac +- +- # The BFD linker knows what the default object file format is, so +- # first see if it will tell us. cd to the root directory to prevent +- # problems with other programs or directories called `ld' in the path. +- ld_help_string=`cd /; ld --help 2>&1` +- ld_supported_emulations=`echo $ld_help_string \ +- | sed -ne '/supported emulations:/!d +- s/[ ][ ]*/ /g +- s/.*supported emulations: *// +- s/ .*// +- p'` +- case "$ld_supported_emulations" in +- *ia64) echo "${UNAME_MACHINE}-unknown-linux" ; exit 0 ;; +- i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;; +- i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;; +- sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; +- armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; +- m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; +- elf32ppc | elf32ppclinux) +- # Determine Lib Version +- cat >$dummy.c <<EOF +-#include <features.h> +-#if defined(__GLIBC__) +-extern char __libc_version[]; +-extern char __libc_release[]; +-#endif +-main(argc, argv) +- int argc; +- char *argv[]; +-{ +-#if defined(__GLIBC__) +- printf("%s %s\n", __libc_version, __libc_release); +-#else +- printf("unkown\n"); +-#endif +- return 0; +-} +-EOF +- LIBC="" +- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null +- if test "$?" = 0 ; then +- ./$dummy | grep 1\.99 > /dev/null +- if test "$?" = 0 ; then +- LIBC="libc1" +- fi +- fi +- rm -f $dummy.c $dummy +- echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;; +- esac +- +- if test "${UNAME_MACHINE}" = "alpha" ; then +- sed 's/^ //' <<EOF >$dummy.s +- .globl main +- .ent main +- main: +- .frame \$30,0,\$26,0 +- .prologue 0 +- .long 0x47e03d80 # implver $0 +- lda \$2,259 +- .long 0x47e20c21 # amask $2,$1 +- srl \$1,8,\$2 +- sll \$2,2,\$2 +- sll \$0,3,\$0 +- addl \$1,\$0,\$0 +- addl \$2,\$0,\$0 +- ret \$31,(\$26),1 +- .end main +-EOF +- LIBC="" +- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null +- if test "$?" = 0 ; then +- ./$dummy +- case "$?" in +- 7) +- UNAME_MACHINE="alpha" +- ;; +- 15) +- UNAME_MACHINE="alphaev5" +- ;; +- 14) +- UNAME_MACHINE="alphaev56" +- ;; +- 10) +- UNAME_MACHINE="alphapca56" +- ;; +- 16) +- UNAME_MACHINE="alphaev6" +- ;; +- esac +- +- objdump --private-headers $dummy | \ +- grep ld.so.1 > /dev/null +- if test "$?" = 0 ; then +- LIBC="libc1" +- fi +- fi +- rm -f $dummy.s $dummy +- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0 +- elif test "${UNAME_MACHINE}" = "mips" ; then +- cat >$dummy.c <<EOF +-#ifdef __cplusplus +- int main (int argc, char *argv[]) { +-#else +- int main (argc, argv) int argc; char *argv[]; { +-#endif +-#ifdef __MIPSEB__ +- printf ("%s-unknown-linux-gnu\n", argv[1]); +-#endif +-#ifdef __MIPSEL__ +- printf ("%sel-unknown-linux-gnu\n", argv[1]); +-#endif +- return 0; +-} +-EOF +- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0 +- rm -f $dummy.c $dummy +- else +- # Either a pre-BFD a.out linker (linux-gnuoldld) +- # or one that does not give us useful --help. +- # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout. +- # If ld does not provide *any* "supported emulations:" +- # that means it is gnuoldld. +- echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:" +- test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 +- +- case "${UNAME_MACHINE}" in +- i?86) +- VENDOR=pc; +- ;; +- *) +- VENDOR=unknown; +- ;; +- esac +- # Determine whether the default compiler is a.out or elf +- cat >$dummy.c <<EOF +-#include <features.h> +-#ifdef __cplusplus +- int main (int argc, char *argv[]) { +-#else +- int main (argc, argv) int argc; char *argv[]; { +-#endif +-#ifdef __ELF__ +-# ifdef __GLIBC__ +-# if __GLIBC__ >= 2 +- printf ("%s-${VENDOR}-linux-gnu\n", argv[1]); +-# else +- printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); +-# endif +-# else +- printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); +-# endif +-#else +- printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]); +-#endif +- return 0; +-} +-EOF +- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0 +- rm -f $dummy.c $dummy +- fi ;; +-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions +-# are messed up and put the nodename in both sysname and nodename. +- i?86:DYNIX/ptx:4*:*) +- echo i386-sequent-sysv4 +- exit 0 ;; +- i?86:UNIX_SV:4.2MP:2.*) +- # Unixware is an offshoot of SVR4, but it has its own version +- # number series starting with 2... +- # I am not positive that other SVR4 systems won't match this, +- # I just have to hope. -- rms. +- # Use sysv4.2uw... so that sysv4* matches it. +- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} +- exit 0 ;; +- i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*) +- if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then +- echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE} +- else +- echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} +- fi +- exit 0 ;; +- i?86:*:5:7*) +- UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` +- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 +- (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586 +- (/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686 +- (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585 +- echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE} +- exit 0 ;; +- i?86:*:3.2:*) +- if test -f /usr/options/cb.name; then +- UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` +- echo ${UNAME_MACHINE}-pc-isc$UNAME_REL +- elif /bin/uname -X 2>/dev/null >/dev/null ; then +- UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` +- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 +- (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ +- && UNAME_MACHINE=i586 +- (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ +- && UNAME_MACHINE=i686 +- (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ +- && UNAME_MACHINE=i686 +- echo ${UNAME_MACHINE}-pc-sco$UNAME_REL +- else +- echo ${UNAME_MACHINE}-pc-sysv32 +- fi +- exit 0 ;; +- pc:*:*:*) +- # uname -m prints for DJGPP always 'pc', but it prints nothing about +- # the processor, so we play safe by assuming i386. +- echo i386-pc-msdosdjgpp +- exit 0 ;; +- Intel:Mach:3*:*) +- echo i386-pc-mach3 +- exit 0 ;; +- paragon:*:*:*) +- echo i860-intel-osf1 +- exit 0 ;; +- i860:*:4.*:*) # i860-SVR4 +- if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then +- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 +- else # Add other i860-SVR4 vendors below as they are discovered. +- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 +- fi +- exit 0 ;; +- mini*:CTIX:SYS*5:*) +- # "miniframe" +- echo m68010-convergent-sysv +- exit 0 ;; +- M68*:*:R3V[567]*:*) +- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; +- 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) +- OS_REL='' +- test -r /etc/.relid \ +- && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && echo i486-ncr-sysv4.3${OS_REL} && exit 0 +- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ +- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; +- 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && echo i486-ncr-sysv4 && exit 0 ;; +- m68*:LynxOS:2.*:*) +- echo m68k-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; +- mc68030:UNIX_System_V:4.*:*) +- echo m68k-atari-sysv4 +- exit 0 ;; +- i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*) +- echo i386-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; +- TSUNAMI:LynxOS:2.*:*) +- echo sparc-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; +- rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*) +- echo rs6000-unknown-lynxos${UNAME_RELEASE} +- exit 0 ;; +- SM[BE]S:UNIX_SV:*:*) +- echo mips-dde-sysv${UNAME_RELEASE} +- exit 0 ;; +- RM*:ReliantUNIX-*:*:*) +- echo mips-sni-sysv4 +- exit 0 ;; +- RM*:SINIX-*:*:*) +- echo mips-sni-sysv4 +- exit 0 ;; +- *:SINIX-*:*:*) +- if uname -p 2>/dev/null >/dev/null ; then +- UNAME_MACHINE=`(uname -p) 2>/dev/null` +- echo ${UNAME_MACHINE}-sni-sysv4 +- else +- echo ns32k-sni-sysv +- fi +- exit 0 ;; +- PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says <Richard.M.Bartel@ccMail.Census.GOV> +- echo i586-unisys-sysv4 +- exit 0 ;; +- *:UNIX_System_V:4*:FTX*) +- # From Gerald Hewes <hewes@openmarket.com>. +- # How about differentiating between stratus architectures? -djm +- echo hppa1.1-stratus-sysv4 +- exit 0 ;; +- *:*:*:FTX*) +- # From seanf@swdc.stratus.com. +- echo i860-stratus-sysv4 +- exit 0 ;; +- mc68*:A/UX:*:*) +- echo m68k-apple-aux${UNAME_RELEASE} +- exit 0 ;; +- news*:NEWS-OS:*:6*) +- echo mips-sony-newsos6 +- exit 0 ;; +- R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) +- if [ -d /usr/nec ]; then +- echo mips-nec-sysv${UNAME_RELEASE} +- else +- echo mips-unknown-sysv${UNAME_RELEASE} +- fi +- exit 0 ;; +- BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. +- echo powerpc-be-beos +- exit 0 ;; +- BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. +- echo powerpc-apple-beos +- exit 0 ;; +- BePC:BeOS:*:*) # BeOS running on Intel PC compatible. +- echo i586-pc-beos +- exit 0 ;; +- SX-4:SUPER-UX:*:*) +- echo sx4-nec-superux${UNAME_RELEASE} +- exit 0 ;; +- SX-5:SUPER-UX:*:*) +- echo sx5-nec-superux${UNAME_RELEASE} +- exit 0 ;; +- Power*:Rhapsody:*:*) +- echo powerpc-apple-rhapsody${UNAME_RELEASE} +- exit 0 ;; +- *:Rhapsody:*:*) +- echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} +- exit 0 ;; +-esac +- +-#echo '(No uname command or uname output not recognized.)' 1>&2 +-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +- +-cat >$dummy.c <<EOF +-#ifdef _SEQUENT_ +-# include <sys/types.h> +-# include <sys/utsname.h> +-#endif +-main () +-{ +-#if defined (sony) +-#if defined (MIPSEB) +- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, +- I don't know.... */ +- printf ("mips-sony-bsd\n"); exit (0); +-#else +-#include <sys/param.h> +- printf ("m68k-sony-newsos%s\n", +-#ifdef NEWSOS4 +- "4" +-#else +- "" +-#endif +- ); exit (0); +-#endif +-#endif +- +-#if defined (__arm) && defined (__acorn) && defined (__unix) +- printf ("arm-acorn-riscix"); exit (0); +-#endif +- +-#if defined (hp300) && !defined (hpux) +- printf ("m68k-hp-bsd\n"); exit (0); +-#endif +- +-#if defined (NeXT) +-#if !defined (__ARCHITECTURE__) +-#define __ARCHITECTURE__ "m68k" +-#endif +- int version; +- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; +- if (version < 4) +- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); +- else +- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); +- exit (0); +-#endif +- +-#if defined (MULTIMAX) || defined (n16) +-#if defined (UMAXV) +- printf ("ns32k-encore-sysv\n"); exit (0); +-#else +-#if defined (CMU) +- printf ("ns32k-encore-mach\n"); exit (0); +-#else +- printf ("ns32k-encore-bsd\n"); exit (0); +-#endif +-#endif +-#endif +- +-#if defined (__386BSD__) +- printf ("i386-pc-bsd\n"); exit (0); +-#endif +- +-#if defined (sequent) +-#if defined (i386) +- printf ("i386-sequent-dynix\n"); exit (0); +-#endif +-#if defined (ns32000) +- printf ("ns32k-sequent-dynix\n"); exit (0); +-#endif +-#endif +- +-#if defined (_SEQUENT_) +- struct utsname un; +- +- uname(&un); +- +- if (strncmp(un.version, "V2", 2) == 0) { +- printf ("i386-sequent-ptx2\n"); exit (0); +- } +- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ +- printf ("i386-sequent-ptx1\n"); exit (0); +- } +- printf ("i386-sequent-ptx\n"); exit (0); +- +-#endif +- +-#if defined (vax) +-#if !defined (ultrix) +- printf ("vax-dec-bsd\n"); exit (0); +-#else +- printf ("vax-dec-ultrix\n"); exit (0); +-#endif +-#endif +- +-#if defined (alliant) && defined (i860) +- printf ("i860-alliant-bsd\n"); exit (0); +-#endif +- +- exit (1); +-} +-EOF +- +-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0 +-rm -f $dummy.c $dummy +- +-# Apollos put the system type in the environment. +- +-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } +- +-# Convex versions that predate uname can use getsysinfo(1) +- +-if [ -x /usr/convex/getsysinfo ] +-then +- case `getsysinfo -f cpu_type` in +- c1*) +- echo c1-convex-bsd +- exit 0 ;; +- c2*) +- if getsysinfo -f scalar_acc +- then echo c32-convex-bsd +- else echo c2-convex-bsd +- fi +- exit 0 ;; +- c34*) +- echo c34-convex-bsd +- exit 0 ;; +- c38*) +- echo c38-convex-bsd +- exit 0 ;; +- c4*) +- echo c4-convex-bsd +- exit 0 ;; +- esac +-fi +- +-#echo '(Unable to guess system type)' 1>&2 +- +-exit 1 +diff -urNd -urNd patch-2.5.4/config.hin patch-2.5.9/config.hin +--- patch-2.5.4/config.hin 1999-08-30 02:53:17.000000000 -0400 ++++ patch-2.5.9/config.hin 2003-05-19 02:50:40.000000000 -0400 +@@ -1,169 +1,365 @@ +-/* config.hin. Generated automatically from configure.in by autoheader. */ ++/* config.hin. Generated from configure.ac by autoheader. */ + +-/* Define if on AIX 3. +- System headers sometimes define this. +- We just want to avoid a redefinition error message. */ +-#ifndef _ALL_SOURCE +-#undef _ALL_SOURCE ++/* Define to 1 if the `closedir' function returns void instead of `int'. */ ++#undef CLOSEDIR_VOID ++ ++/* Define if there is a member named d_ino in the struct describing directory ++ headers. */ ++#undef D_INO_IN_DIRENT ++ ++/* 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. */ ++#undef FILESYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX ++ ++/* Define if the backslash character may also serve as a file name component ++ separator. */ ++#undef FILESYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR ++ ++#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 + +-/* Define if the closedir function returns void instead of int. */ +-#undef CLOSEDIR_VOID ++/* Define to 1 if you have the <bp-sym.h> header file. */ ++#undef HAVE_BP_SYM_H + +-/* Define to empty if the keyword does not work. */ +-#undef const ++/* Define to 1 if you have the declaration of `clearerr_unlocked', and to 0 if ++ you don't. */ ++#undef HAVE_DECL_CLEARERR_UNLOCKED + +-/* Define if you don't have vprintf but do have _doprnt. */ +-#undef HAVE_DOPRNT ++/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you ++ don't. */ ++#undef HAVE_DECL_FEOF_UNLOCKED + +-/* Define if you support file names longer than 14 characters. */ +-#undef HAVE_LONG_FILE_NAMES ++/* Define to 1 if you have the declaration of `ferror_unlocked', and to 0 if ++ you don't. */ ++#undef HAVE_DECL_FERROR_UNLOCKED + +-/* Define if you have the vprintf function. */ +-#undef HAVE_VPRINTF ++/* Define to 1 if you have the declaration of `fflush_unlocked', and to 0 if ++ you don't. */ ++#undef HAVE_DECL_FFLUSH_UNLOCKED + +-/* Define if on MINIX. */ +-#undef _MINIX ++/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if ++ you don't. */ ++#undef HAVE_DECL_FGETS_UNLOCKED + +-/* Define to `int' if <sys/types.h> doesn't define. */ +-#undef mode_t ++/* Define to 1 if you have the declaration of `fputc_unlocked', and to 0 if ++ you don't. */ ++#undef HAVE_DECL_FPUTC_UNLOCKED + +-/* Define to `long' if <sys/types.h> doesn't define. */ +-#undef off_t ++/* Define to 1 if you have the declaration of `fputs_unlocked', and to 0 if ++ you don't. */ ++#undef HAVE_DECL_FPUTS_UNLOCKED + +-/* Define to `int' if <sys/types.h> doesn't define. */ +-#undef pid_t ++/* Define to 1 if you have the declaration of `fread_unlocked', and to 0 if ++ you don't. */ ++#undef HAVE_DECL_FREAD_UNLOCKED + +-/* Define if the system does not provide POSIX.1 features except +- with this defined. */ +-#undef _POSIX_1_SOURCE ++/* Define to 1 if you have the declaration of `free', and to 0 if you don't. ++ */ ++#undef HAVE_DECL_FREE + +-/* Define if you need to in order for stat and other things to work. */ +-#undef _POSIX_SOURCE ++/* Define to 1 if you have the declaration of `fwrite_unlocked', and to 0 if ++ you don't. */ ++#undef HAVE_DECL_FWRITE_UNLOCKED + +-/* Define as the return type of signal handlers (int or void). */ +-#undef RETSIGTYPE ++/* Define to 1 if you have the declaration of `getchar_unlocked', and to 0 if ++ you don't. */ ++#undef HAVE_DECL_GETCHAR_UNLOCKED + +-/* Define to `unsigned' if <sys/types.h> doesn't define. */ +-#undef size_t ++/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you ++ don't. */ ++#undef HAVE_DECL_GETC_UNLOCKED + +-/* Define if you have the ANSI C header files. */ +-#undef STDC_HEADERS ++/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. ++ */ ++#undef HAVE_DECL_GETENV + +-/* Define if you can safely include both <sys/time.h> and <time.h>. */ +-#undef TIME_WITH_SYS_TIME ++/* Define to 1 if you have the declaration of `malloc', and to 0 if you don't. ++ */ ++#undef HAVE_DECL_MALLOC + +-/* Define if you have the _doprintf function. */ +-#undef HAVE__DOPRINTF ++/* Define to 1 if you have the declaration of `mktemp', and to 0 if you don't. ++ */ ++#undef HAVE_DECL_MKTEMP + +-/* Define if you have the fseeko function. */ ++/* Define to 1 if you have the declaration of `putchar_unlocked', and to 0 if ++ you don't. */ ++#undef HAVE_DECL_PUTCHAR_UNLOCKED ++ ++/* Define to 1 if you have the declaration of `putc_unlocked', and to 0 if you ++ don't. */ ++#undef HAVE_DECL_PUTC_UNLOCKED ++ ++/* Define to 1 if you have the declaration of `strerror', and to 0 if you ++ don't. */ ++#undef HAVE_DECL_STRERROR ++ ++/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you ++ don't. */ ++#undef HAVE_DECL_STRERROR_R ++ ++/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. ++ */ ++#undef HAVE_DIRENT_H ++ ++/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ ++#undef HAVE_DOPRNT ++ ++/* Define to 1 if you have the <fcntl.h> header file. */ ++#undef HAVE_FCNTL_H ++ ++/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ + #undef HAVE_FSEEKO + +-/* Define if you have the isascii function. */ ++/* Define to 1 if you have the `geteuid' function. */ ++#undef HAVE_GETEUID ++ ++/* Define to 1 if you have the `getuid' function. */ ++#undef HAVE_GETUID ++ ++/* Define to 1 if you have the <inttypes.h> header file. */ ++#undef HAVE_INTTYPES_H ++ ++/* Define to 1 if you have the `isascii' function. */ + #undef HAVE_ISASCII + +-/* Define if you have the memchr function. */ ++/* Define to 1 if you have the `iswprint' function. */ ++#undef HAVE_ISWPRINT ++ ++/* Define to 1 if you have the <limits.h> header file. */ ++#undef HAVE_LIMITS_H ++ ++/* Define to 1 if you support file names longer than 14 characters. */ ++#undef HAVE_LONG_FILE_NAMES ++ ++/* Define to 1 if your system has a GNU libc compatible `malloc' function, and ++ to 0 otherwise. */ ++#undef HAVE_MALLOC ++ ++/* Define to 1 if mbrtowc and mbstate_t are properly declared. */ ++#undef HAVE_MBRTOWC ++ ++/* Define to 1 if you have the `mbsinit' function. */ ++#undef HAVE_MBSINIT ++ ++/* Define to 1 if <wchar.h> declares mbstate_t. */ ++#undef HAVE_MBSTATE_T ++ ++/* Define to 1 if you have the `memchr' function. */ + #undef HAVE_MEMCHR + +-/* Define if you have the memcmp function. */ ++/* Define to 1 if you have the `memcmp' function. */ + #undef HAVE_MEMCMP + +-/* Define if you have the mkdir function. */ ++/* Define to 1 if you have the <memory.h> header file. */ ++#undef HAVE_MEMORY_H ++ ++/* Define to 1 if you have the `mkdir' function. */ + #undef HAVE_MKDIR + +-/* Define if you have the mktemp function. */ ++/* Define to 1 if you have the `mktemp' function. */ + #undef HAVE_MKTEMP + +-/* Define if you have the pathconf function. */ ++/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ ++#undef HAVE_NDIR_H ++ ++/* Define to 1 if you have the `pathconf' function. */ + #undef HAVE_PATHCONF + +-/* Define if you have the raise function. */ ++/* Define to 1 if you have the `raise' function. */ + #undef HAVE_RAISE + +-/* Define if you have the rename function. */ +-#undef HAVE_RENAME ++/* Define to 1 if your system has a GNU libc compatible `realloc' function, ++ and to 0 otherwise. */ ++#undef HAVE_REALLOC + +-/* Define if you have the rmdir function. */ ++/* Define to 1 if you have the `rmdir' function. */ + #undef HAVE_RMDIR + +-/* Define if you have the setmode function. */ +-#undef HAVE_SETMODE ++/* Define to 1 if you have the DOS-style `setmode' function. */ ++#undef HAVE_SETMODE_DOS + +-/* Define if you have the sigaction function. */ ++/* Define to 1 if you have the `sigaction' function. */ + #undef HAVE_SIGACTION + +-/* Define if you have the sigprocmask function. */ ++/* Define to 1 if you have the `sigprocmask' function. */ + #undef HAVE_SIGPROCMASK + +-/* Define if you have the sigsetmask function. */ ++/* Define to 1 if you have the `sigsetmask' function. */ + #undef HAVE_SIGSETMASK + +-/* Define if you have the strerror function. */ +-#undef HAVE_STRERROR ++/* Define to 1 if stdbool.h conforms to C99. */ ++#undef HAVE_STDBOOL_H + +-/* Define if you have the <dirent.h> header file. */ +-#undef HAVE_DIRENT_H ++/* Define to 1 if you have the <stddef.h> header file. */ ++#undef HAVE_STDDEF_H + +-/* Define if you have the <fcntl.h> header file. */ +-#undef HAVE_FCNTL_H ++/* Define to 1 if you have the <stdint.h> header file. */ ++#undef HAVE_STDINT_H + +-/* Define if you have the <limits.h> header file. */ +-#undef HAVE_LIMITS_H ++/* Define to 1 if you have the <stdlib.h> header file. */ ++#undef HAVE_STDLIB_H + +-/* Define if you have the <ndir.h> header file. */ +-#undef HAVE_NDIR_H ++/* Define to 1 if you have the `strerror' function. */ ++#undef HAVE_STRERROR + +-/* Define if you have the <string.h> header file. */ ++/* Define to 1 if you have the `strerror_r' function. */ ++#undef HAVE_STRERROR_R ++ ++/* Define to 1 if you have the <strings.h> header file. */ ++#undef HAVE_STRINGS_H ++ ++/* Define to 1 if you have the <string.h> header file. */ + #undef HAVE_STRING_H + +-/* Define if you have the <sys/dir.h> header file. */ ++/* Define to 1 if you have the `strncasecmp' function. */ ++#undef HAVE_STRNCASECMP ++ ++/* Define if struct utimbuf is declared -- usually in <utime.h>. Some systems ++ have utime.h but don't declare the struct anywhere. */ ++#undef HAVE_STRUCT_UTIMBUF ++ ++/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. ++ */ + #undef HAVE_SYS_DIR_H + +-/* Define if you have the <sys/ndir.h> header file. */ ++/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. ++ */ + #undef HAVE_SYS_NDIR_H + +-/* Define if you have the <unistd.h> header file. */ ++/* Define to 1 if you have the <sys/stat.h> header file. */ ++#undef HAVE_SYS_STAT_H ++ ++/* Define to 1 if you have the <sys/time.h> header file. */ ++#undef HAVE_SYS_TIME_H ++ ++/* Define to 1 if you have the <sys/types.h> header file. */ ++#undef HAVE_SYS_TYPES_H ++ ++/* Define to 1 if you have the <unistd.h> header file. */ + #undef HAVE_UNISTD_H + +-/* Define if you have the <utime.h> header file. */ ++/* Define to 1 if you have the <utime.h> header file. */ + #undef HAVE_UTIME_H + +-/* Define if you have the <varargs.h> header file. */ ++/* Define to 1 if you have the <varargs.h> header file. */ + #undef HAVE_VARARGS_H + ++/* Define to 1 if you have the `vprintf' function. */ ++#undef HAVE_VPRINTF ++ ++/* Define to 1 if you have the <wchar.h> header file. */ ++#undef HAVE_WCHAR_H ++ ++/* Define to 1 if you have the <wctype.h> header file. */ ++#undef HAVE_WCTYPE_H ++ ++/* Define to 1 if the system has the type `_Bool'. */ ++#undef HAVE__BOOL ++ ++/* Define to 1 if you have the `_doprintf' function. */ ++#undef HAVE__DOPRINTF ++ ++#if FILESYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR ++# define ISSLASH(C) ((C) == '/' || (C) == '\\') ++#else ++# define ISSLASH(C) ((C) == '/') ++#endif ++ ++/* Define if mkdir takes only one argument. */ ++#undef MKDIR_TAKES_ONE_ARG ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#undef PACKAGE_BUGREPORT ++ ++/* Define to the full name of this package. */ ++#undef PACKAGE_NAME ++ ++/* Define to the full name and version of this package. */ ++#undef PACKAGE_STRING ++ ++/* Define to the one symbol short name of this package. */ ++#undef PACKAGE_TARNAME ++ ++/* Define to the version of this package. */ ++#undef PACKAGE_VERSION ++ ++/* Define to 1 if the C compiler supports function prototypes. */ ++#undef PROTOTYPES ++ ++/* Define as the return type of signal handlers (`int' or `void'). */ ++#undef RETSIGTYPE ++ ++/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */ ++#undef STAT_MACROS_BROKEN ++ ++/* Define to 1 if you have the ANSI C header files. */ ++#undef STDC_HEADERS ++ ++/* Define to 1 if strerror_r returns char *. */ ++#undef STRERROR_R_CHAR_P ++ ++/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ ++#undef TIME_WITH_SYS_TIME ++ ++/* Define to 1 if on AIX 3. ++ System headers sometimes define this. ++ We just want to avoid a redefinition error message. */ ++#ifndef _ALL_SOURCE ++# undef _ALL_SOURCE ++#endif ++ + /* Number of bits in a file offset, on hosts where this is settable. */ + #undef _FILE_OFFSET_BITS + +-/* Define to make fseeko etc. visible, on some hosts. */ ++/* Enable GNU extensions on systems that have them. */ ++#ifndef _GNU_SOURCE ++# undef _GNU_SOURCE ++#endif ++ ++/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ + #undef _LARGEFILE_SOURCE + + /* Define for large files, on AIX-style hosts. */ + #undef _LARGE_FILES + +-/* Define if compiler has function prototypes */ +-#undef PROTOTYPES ++/* Define to 1 if on MINIX. */ ++#undef _MINIX + +-/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, +- and declares uintmax_t. */ +-#undef HAVE_INTTYPES_H ++/* Define to 2 if the system does not provide POSIX.1 features except with ++ this defined. */ ++#undef _POSIX_1_SOURCE + +-/* Define if struct utimbuf is declared -- usually in <utime.h>. +- Some systems have utime.h but don't declare the struct anywhere. */ +-#undef HAVE_STRUCT_UTIMBUF ++/* Define to 1 if you need to in order for `stat' and other things to work. */ ++#undef _POSIX_SOURCE + +-/* Define if the malloc check has been performed. */ +-#undef HAVE_DONE_WORKING_MALLOC_CHECK ++/* Define like PROTOTYPES; this can be used by system headers. */ ++#undef __PROTOTYPES ++ ++/* Define to empty if `const' does not conform to ANSI C. */ ++#undef const + + /* Define to rpl_malloc if the replacement function should be used. */ + #undef malloc + +-/* Define if the realloc check has been performed. */ +-#undef HAVE_DONE_WORKING_REALLOC_CHECK ++/* Define to a type if <wchar.h> does not define. */ ++#undef mbstate_t ++ ++/* Define to `int' if <sys/types.h> does not define. */ ++#undef mode_t ++ ++/* Define to `long' if <sys/types.h> does not define. */ ++#undef off_t ++ ++/* Define to `int' if <sys/types.h> does not define. */ ++#undef pid_t + + /* Define to rpl_realloc if the replacement function should be used. */ + #undef realloc + +-/* Define if there is a member named d_ino in the struct describing +- directory headers. */ +-#undef D_INO_IN_DIRENT +- ++/* Define to `unsigned' if <sys/types.h> does not define. */ ++#undef size_t +diff -urNd -urNd patch-2.5.4/config.sub patch-2.5.9/config.sub +--- patch-2.5.4/config.sub 1999-08-05 08:55:20.000000000 -0400 ++++ patch-2.5.9/config.sub 1969-12-31 19:00:00.000000000 -0500 +@@ -1,1220 +0,0 @@ +-#! /bin/sh +-# Configuration validation subroutine script, version 1.1. +-# Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc. +-# This file is (in principle) common to ALL GNU software. +-# The presence of a machine in this file suggests that SOME GNU software +-# can handle that machine. It does not imply ALL GNU software can. +-# +-# This file 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 of the License, 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. +- +-# As a special exception to the GNU General Public License, if you +-# distribute this file as part of a program that contains a +-# configuration script generated by Autoconf, you may include it under +-# the same distribution terms that you use for the rest of that program. +- +-# Configuration subroutine to validate and canonicalize a configuration type. +-# Supply the specified configuration type as an argument. +-# If it is invalid, we print an error message on stderr and exit with code 1. +-# Otherwise, we print the canonical config type on stdout and succeed. +- +-# This file is supposed to be the same for all GNU packages +-# and recognize all the CPU types, system types and aliases +-# that are meaningful with *any* GNU software. +-# Each package is responsible for reporting which valid configurations +-# it does not support. The user should be able to distinguish +-# a failure to support a valid configuration from a meaningless +-# configuration. +- +-# The goal of this file is to map all the various variations of a given +-# machine specification into a single specification in the form: +-# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +-# or in some cases, the newer four-part form: +-# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +-# It is wrong to echo any other type of specification. +- +-if [ x$1 = x ] +-then +- echo Configuration name missing. 1>&2 +- echo "Usage: $0 CPU-MFR-OPSYS" 1>&2 +- echo "or $0 ALIAS" 1>&2 +- echo where ALIAS is a recognized configuration type. 1>&2 +- exit 1 +-fi +- +-# First pass through any local machine types. +-case $1 in +- *local*) +- echo $1 +- exit 0 +- ;; +- *) +- ;; +-esac +- +-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +-# Here we must recognize all the valid KERNEL-OS combinations. +-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +-case $maybe_os in +- linux-gnu*) +- os=-$maybe_os +- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` +- ;; +- *) +- basic_machine=`echo $1 | sed 's/-[^-]*$//'` +- if [ $basic_machine != $1 ] +- then os=`echo $1 | sed 's/.*-/-/'` +- else os=; fi +- ;; +-esac +- +-### Let's recognize common machines as not being operating systems so +-### that things like config.sub decstation-3100 work. We also +-### recognize some manufacturers as not being operating systems, so we +-### can provide default operating systems below. +-case $os in +- -sun*os*) +- # Prevent following clause from handling this invalid input. +- ;; +- -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ +- -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ +- -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ +- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ +- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ +- -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple) +- os= +- basic_machine=$1 +- ;; +- -sim | -cisco | -oki | -wec | -winbond) +- os= +- basic_machine=$1 +- ;; +- -scout) +- ;; +- -wrs) +- os=-vxworks +- basic_machine=$1 +- ;; +- -hiux*) +- os=-hiuxwe2 +- ;; +- -sco5) +- os=-sco3.2v5 +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -sco4) +- os=-sco3.2v4 +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -sco3.2.[4-9]*) +- os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -sco3.2v[4-9]*) +- # Don't forget version if it is 3.2v4 or newer. +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -sco*) +- os=-sco3.2v2 +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -udk*) +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -isc) +- os=-isc2.2 +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -clix*) +- basic_machine=clipper-intergraph +- ;; +- -isc*) +- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` +- ;; +- -lynx*) +- os=-lynxos +- ;; +- -ptx*) +- basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` +- ;; +- -windowsnt*) +- os=`echo $os | sed -e 's/windowsnt/winnt/'` +- ;; +- -psos*) +- os=-psos +- ;; +- -mint | -mint[0-9]*) +- basic_machine=m68k-atari +- os=-mint +- ;; +-esac +- +-# Decode aliases for certain CPU-COMPANY combinations. +-case $basic_machine in +- # Recognize the basic CPU types without company name. +- # Some are omitted here because they have special meanings below. +- tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ +- | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \ +- | 580 | i960 | h8300 \ +- | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ +- | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \ +- | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \ +- | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \ +- | mips64orion | mips64orionel | mipstx39 | mipstx39el \ +- | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ +- | mips64vr5000 | miprs64vr5000el | mcore \ +- | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \ +- | thumb | d10v) +- basic_machine=$basic_machine-unknown +- ;; +- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65) +- ;; +- +- # We use `pc' rather than `unknown' +- # because (1) that's what they normally are, and +- # (2) the word "unknown" tends to confuse beginning users. +- i[34567]86) +- basic_machine=$basic_machine-pc +- ;; +- # Object if more than one company name word. +- *-*-*) +- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 +- exit 1 +- ;; +- # Recognize the basic CPU types with company name. +- # FIXME: clean up the formatting here. +- vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ +- | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \ +- | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ +- | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ +- | xmp-* | ymp-* \ +- | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \ +- | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \ +- | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ +- | clipper-* | orion-* \ +- | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ +- | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \ +- | mips64el-* | mips64orion-* | mips64orionel-* \ +- | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ +- | mipstx39-* | mipstx39el-* | mcore-* \ +- | f301-* | armv*-* | t3e-* \ +- | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ +- | thumb-* | v850-* | d30v-* | tic30-* | c30-* ) +- ;; +- # Recognize the various machine names and aliases which stand +- # for a CPU type and a company and sometimes even an OS. +- 386bsd) +- basic_machine=i386-unknown +- os=-bsd +- ;; +- 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) +- basic_machine=m68000-att +- ;; +- 3b*) +- basic_machine=we32k-att +- ;; +- a29khif) +- basic_machine=a29k-amd +- os=-udi +- ;; +- adobe68k) +- basic_machine=m68010-adobe +- os=-scout +- ;; +- alliant | fx80) +- basic_machine=fx80-alliant +- ;; +- altos | altos3068) +- basic_machine=m68k-altos +- ;; +- am29k) +- basic_machine=a29k-none +- os=-bsd +- ;; +- amdahl) +- basic_machine=580-amdahl +- os=-sysv +- ;; +- amiga | amiga-*) +- basic_machine=m68k-cbm +- ;; +- amigaos | amigados) +- basic_machine=m68k-cbm +- os=-amigaos +- ;; +- amigaunix | amix) +- basic_machine=m68k-cbm +- os=-sysv4 +- ;; +- apollo68) +- basic_machine=m68k-apollo +- os=-sysv +- ;; +- apollo68bsd) +- basic_machine=m68k-apollo +- os=-bsd +- ;; +- aux) +- basic_machine=m68k-apple +- os=-aux +- ;; +- balance) +- basic_machine=ns32k-sequent +- os=-dynix +- ;; +- convex-c1) +- basic_machine=c1-convex +- os=-bsd +- ;; +- convex-c2) +- basic_machine=c2-convex +- os=-bsd +- ;; +- convex-c32) +- basic_machine=c32-convex +- os=-bsd +- ;; +- convex-c34) +- basic_machine=c34-convex +- os=-bsd +- ;; +- convex-c38) +- basic_machine=c38-convex +- os=-bsd +- ;; +- cray | ymp) +- basic_machine=ymp-cray +- os=-unicos +- ;; +- cray2) +- basic_machine=cray2-cray +- os=-unicos +- ;; +- [ctj]90-cray) +- basic_machine=c90-cray +- os=-unicos +- ;; +- crds | unos) +- basic_machine=m68k-crds +- ;; +- da30 | da30-*) +- basic_machine=m68k-da30 +- ;; +- decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) +- basic_machine=mips-dec +- ;; +- delta | 3300 | motorola-3300 | motorola-delta \ +- | 3300-motorola | delta-motorola) +- basic_machine=m68k-motorola +- ;; +- delta88) +- basic_machine=m88k-motorola +- os=-sysv3 +- ;; +- dpx20 | dpx20-*) +- basic_machine=rs6000-bull +- os=-bosx +- ;; +- dpx2* | dpx2*-bull) +- basic_machine=m68k-bull +- os=-sysv3 +- ;; +- ebmon29k) +- basic_machine=a29k-amd +- os=-ebmon +- ;; +- elxsi) +- basic_machine=elxsi-elxsi +- os=-bsd +- ;; +- encore | umax | mmax) +- basic_machine=ns32k-encore +- ;; +- es1800 | OSE68k | ose68k | ose | OSE) +- basic_machine=m68k-ericsson +- os=-ose +- ;; +- fx2800) +- basic_machine=i860-alliant +- ;; +- genix) +- basic_machine=ns32k-ns +- ;; +- gmicro) +- basic_machine=tron-gmicro +- os=-sysv +- ;; +- h3050r* | hiux*) +- basic_machine=hppa1.1-hitachi +- os=-hiuxwe2 +- ;; +- h8300hms) +- basic_machine=h8300-hitachi +- os=-hms +- ;; +- h8300xray) +- basic_machine=h8300-hitachi +- os=-xray +- ;; +- h8500hms) +- basic_machine=h8500-hitachi +- os=-hms +- ;; +- harris) +- basic_machine=m88k-harris +- os=-sysv3 +- ;; +- hp300-*) +- basic_machine=m68k-hp +- ;; +- hp300bsd) +- basic_machine=m68k-hp +- os=-bsd +- ;; +- hp300hpux) +- basic_machine=m68k-hp +- os=-hpux +- ;; +- hp3k9[0-9][0-9] | hp9[0-9][0-9]) +- basic_machine=hppa1.0-hp +- ;; +- hp9k2[0-9][0-9] | hp9k31[0-9]) +- basic_machine=m68000-hp +- ;; +- hp9k3[2-9][0-9]) +- basic_machine=m68k-hp +- ;; +- hp9k6[0-9][0-9] | hp6[0-9][0-9]) +- basic_machine=hppa1.0-hp +- ;; +- hp9k7[0-79][0-9] | hp7[0-79][0-9]) +- basic_machine=hppa1.1-hp +- ;; +- hp9k78[0-9] | hp78[0-9]) +- # FIXME: really hppa2.0-hp +- basic_machine=hppa1.1-hp +- ;; +- hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) +- # FIXME: really hppa2.0-hp +- basic_machine=hppa1.1-hp +- ;; +- hp9k8[0-9][13679] | hp8[0-9][13679]) +- basic_machine=hppa1.1-hp +- ;; +- hp9k8[0-9][0-9] | hp8[0-9][0-9]) +- basic_machine=hppa1.0-hp +- ;; +- hppa-next) +- os=-nextstep3 +- ;; +- hppaosf) +- basic_machine=hppa1.1-hp +- os=-osf +- ;; +- hppro) +- basic_machine=hppa1.1-hp +- os=-proelf +- ;; +- i370-ibm* | ibm*) +- basic_machine=i370-ibm +- os=-mvs +- ;; +-# I'm not sure what "Sysv32" means. Should this be sysv3.2? +- i[34567]86v32) +- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` +- os=-sysv32 +- ;; +- i[34567]86v4*) +- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` +- os=-sysv4 +- ;; +- i[34567]86v) +- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` +- os=-sysv +- ;; +- i[34567]86sol2) +- basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` +- os=-solaris2 +- ;; +- i386mach) +- basic_machine=i386-mach +- os=-mach +- ;; +- i386-vsta | vsta) +- basic_machine=i386-unknown +- os=-vsta +- ;; +- i386-go32 | go32) +- basic_machine=i386-unknown +- os=-go32 +- ;; +- i386-mingw32 | mingw32) +- basic_machine=i386-unknown +- os=-mingw32 +- ;; +- iris | iris4d) +- basic_machine=mips-sgi +- case $os in +- -irix*) +- ;; +- *) +- os=-irix4 +- ;; +- esac +- ;; +- isi68 | isi) +- basic_machine=m68k-isi +- os=-sysv +- ;; +- m88k-omron*) +- basic_machine=m88k-omron +- ;; +- magnum | m3230) +- basic_machine=mips-mips +- os=-sysv +- ;; +- merlin) +- basic_machine=ns32k-utek +- os=-sysv +- ;; +- miniframe) +- basic_machine=m68000-convergent +- ;; +- *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) +- basic_machine=m68k-atari +- os=-mint +- ;; +- mipsel*-linux*) +- basic_machine=mipsel-unknown +- os=-linux-gnu +- ;; +- mips*-linux*) +- basic_machine=mips-unknown +- os=-linux-gnu +- ;; +- mips3*-*) +- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` +- ;; +- mips3*) +- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown +- ;; +- monitor) +- basic_machine=m68k-rom68k +- os=-coff +- ;; +- msdos) +- basic_machine=i386-unknown +- os=-msdos +- ;; +- ncr3000) +- basic_machine=i486-ncr +- os=-sysv4 +- ;; +- netbsd386) +- basic_machine=i386-unknown +- os=-netbsd +- ;; +- netwinder) +- basic_machine=armv4l-corel +- os=-linux +- ;; +- news | news700 | news800 | news900) +- basic_machine=m68k-sony +- os=-newsos +- ;; +- news1000) +- basic_machine=m68030-sony +- os=-newsos +- ;; +- news-3600 | risc-news) +- basic_machine=mips-sony +- os=-newsos +- ;; +- necv70) +- basic_machine=v70-nec +- os=-sysv +- ;; +- next | m*-next ) +- basic_machine=m68k-next +- case $os in +- -nextstep* ) +- ;; +- -ns2*) +- os=-nextstep2 +- ;; +- *) +- os=-nextstep3 +- ;; +- esac +- ;; +- nh3000) +- basic_machine=m68k-harris +- os=-cxux +- ;; +- nh[45]000) +- basic_machine=m88k-harris +- os=-cxux +- ;; +- nindy960) +- basic_machine=i960-intel +- os=-nindy +- ;; +- mon960) +- basic_machine=i960-intel +- os=-mon960 +- ;; +- np1) +- basic_machine=np1-gould +- ;; +- op50n-* | op60c-*) +- basic_machine=hppa1.1-oki +- os=-proelf +- ;; +- OSE68000 | ose68000) +- basic_machine=m68000-ericsson +- os=-ose +- ;; +- os68k) +- basic_machine=m68k-none +- os=-os68k +- ;; +- pa-hitachi) +- basic_machine=hppa1.1-hitachi +- os=-hiuxwe2 +- ;; +- paragon) +- basic_machine=i860-intel +- os=-osf +- ;; +- pbd) +- basic_machine=sparc-tti +- ;; +- pbb) +- basic_machine=m68k-tti +- ;; +- pc532 | pc532-*) +- basic_machine=ns32k-pc532 +- ;; +- pentium | p5 | k5 | k6 | nexen) +- basic_machine=i586-pc +- ;; +- pentiumpro | p6 | 6x86) +- basic_machine=i686-pc +- ;; +- pentiumii | pentium2) +- basic_machine=i786-pc +- ;; +- pentium-* | p5-* | k5-* | k6-* | nexen-*) +- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- pentiumpro-* | p6-* | 6x86-*) +- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- pentiumii-* | pentium2-*) +- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- pn) +- basic_machine=pn-gould +- ;; +- power) basic_machine=rs6000-ibm +- ;; +- ppc) basic_machine=powerpc-unknown +- ;; +- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- ppcle | powerpclittle | ppc-le | powerpc-little) +- basic_machine=powerpcle-unknown +- ;; +- ppcle-* | powerpclittle-*) +- basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; +- ps2) +- basic_machine=i386-ibm +- ;; +- rom68k) +- basic_machine=m68k-rom68k +- os=-coff +- ;; +- rm[46]00) +- basic_machine=mips-siemens +- ;; +- rtpc | rtpc-*) +- basic_machine=romp-ibm +- ;; +- sa29200) +- basic_machine=a29k-amd +- os=-udi +- ;; +- sequent) +- basic_machine=i386-sequent +- ;; +- sh) +- basic_machine=sh-hitachi +- os=-hms +- ;; +- sparclite-wrs) +- basic_machine=sparclite-wrs +- os=-vxworks +- ;; +- sps7) +- basic_machine=m68k-bull +- os=-sysv2 +- ;; +- spur) +- basic_machine=spur-unknown +- ;; +- st2000) +- basic_machine=m68k-tandem +- ;; +- stratus) +- basic_machine=i860-stratus +- os=-sysv4 +- ;; +- sun2) +- basic_machine=m68000-sun +- ;; +- sun2os3) +- basic_machine=m68000-sun +- os=-sunos3 +- ;; +- sun2os4) +- basic_machine=m68000-sun +- os=-sunos4 +- ;; +- sun3os3) +- basic_machine=m68k-sun +- os=-sunos3 +- ;; +- sun3os4) +- basic_machine=m68k-sun +- os=-sunos4 +- ;; +- sun4os3) +- basic_machine=sparc-sun +- os=-sunos3 +- ;; +- sun4os4) +- basic_machine=sparc-sun +- os=-sunos4 +- ;; +- sun4sol2) +- basic_machine=sparc-sun +- os=-solaris2 +- ;; +- sun3 | sun3-*) +- basic_machine=m68k-sun +- ;; +- sun4) +- basic_machine=sparc-sun +- ;; +- sun386 | sun386i | roadrunner) +- basic_machine=i386-sun +- ;; +- symmetry) +- basic_machine=i386-sequent +- os=-dynix +- ;; +- t3e) +- basic_machine=t3e-cray +- os=-unicos +- ;; +- tx39) +- basic_machine=mipstx39-unknown +- ;; +- tx39el) +- basic_machine=mipstx39el-unknown +- ;; +- tower | tower-32) +- basic_machine=m68k-ncr +- ;; +- udi29k) +- basic_machine=a29k-amd +- os=-udi +- ;; +- ultra3) +- basic_machine=a29k-nyu +- os=-sym1 +- ;; +- v810 | necv810) +- basic_machine=v810-nec +- os=-none +- ;; +- vaxv) +- basic_machine=vax-dec +- os=-sysv +- ;; +- vms) +- basic_machine=vax-dec +- os=-vms +- ;; +- vpp*|vx|vx-*) +- basic_machine=f301-fujitsu +- ;; +- vxworks960) +- basic_machine=i960-wrs +- os=-vxworks +- ;; +- vxworks68) +- basic_machine=m68k-wrs +- os=-vxworks +- ;; +- vxworks29k) +- basic_machine=a29k-wrs +- os=-vxworks +- ;; +- w65*) +- basic_machine=w65-wdc +- os=-none +- ;; +- w89k-*) +- basic_machine=hppa1.1-winbond +- os=-proelf +- ;; +- xmp) +- basic_machine=xmp-cray +- os=-unicos +- ;; +- xps | xps100) +- basic_machine=xps100-honeywell +- ;; +- z8k-*-coff) +- basic_machine=z8k-unknown +- os=-sim +- ;; +- none) +- basic_machine=none-none +- os=-none +- ;; +- +-# Here we handle the default manufacturer of certain CPU types. It is in +-# some cases the only manufacturer, in others, it is the most popular. +- w89k) +- basic_machine=hppa1.1-winbond +- ;; +- op50n) +- basic_machine=hppa1.1-oki +- ;; +- op60c) +- basic_machine=hppa1.1-oki +- ;; +- mips) +- if [ x$os = x-linux-gnu ]; then +- basic_machine=mips-unknown +- else +- basic_machine=mips-mips +- fi +- ;; +- romp) +- basic_machine=romp-ibm +- ;; +- rs6000) +- basic_machine=rs6000-ibm +- ;; +- vax) +- basic_machine=vax-dec +- ;; +- pdp11) +- basic_machine=pdp11-dec +- ;; +- we32k) +- basic_machine=we32k-att +- ;; +- sparc | sparcv9) +- basic_machine=sparc-sun +- ;; +- cydra) +- basic_machine=cydra-cydrome +- ;; +- orion) +- basic_machine=orion-highlevel +- ;; +- orion105) +- basic_machine=clipper-highlevel +- ;; +- mac | mpw | mac-mpw) +- basic_machine=m68k-apple +- ;; +- pmac | pmac-mpw) +- basic_machine=powerpc-apple +- ;; +- c4x*) +- basic_machine=c4x-none +- os=-coff +- ;; +- *) +- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 +- exit 1 +- ;; +-esac +- +-# Here we canonicalize certain aliases for manufacturers. +-case $basic_machine in +- *-digital*) +- basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` +- ;; +- *-commodore*) +- basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` +- ;; +- *) +- ;; +-esac +- +-# Decode manufacturer-specific aliases for certain operating systems. +- +-if [ x"$os" != x"" ] +-then +-case $os in +- # First match some system type aliases +- # that might get confused with valid system types. +- # -solaris* is a basic system type, with this one exception. +- -solaris1 | -solaris1.*) +- os=`echo $os | sed -e 's|solaris1|sunos4|'` +- ;; +- -solaris) +- os=-solaris2 +- ;; +- -svr4*) +- os=-sysv4 +- ;; +- -unixware*) +- os=-sysv4.2uw +- ;; +- -gnu/linux*) +- os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` +- ;; +- # First accept the basic system types. +- # The portable systems comes first. +- # Each alternative MUST END IN A *, to match a version number. +- # -sysv* is not here because it comes later, after sysvr4. +- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ +- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ +- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ +- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ +- | -aos* \ +- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ +- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ +- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ +- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ +- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ +- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ +- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ +- | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*) +- # Remember, each alternative MUST END IN *, to match a version number. +- ;; +- -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ +- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ +- | -macos* | -mpw* | -magic* | -mon960* | -lnews*) +- ;; +- -mac*) +- os=`echo $os | sed -e 's|mac|macos|'` +- ;; +- -linux*) +- os=`echo $os | sed -e 's|linux|linux-gnu|'` +- ;; +- -sunos5*) +- os=`echo $os | sed -e 's|sunos5|solaris2|'` +- ;; +- -sunos6*) +- os=`echo $os | sed -e 's|sunos6|solaris3|'` +- ;; +- -osfrose*) +- os=-osfrose +- ;; +- -osf*) +- os=-osf +- ;; +- -utek*) +- os=-bsd +- ;; +- -dynix*) +- os=-bsd +- ;; +- -acis*) +- os=-aos +- ;; +- -386bsd) +- os=-bsd +- ;; +- -ctix* | -uts*) +- os=-sysv +- ;; +- -ns2 ) +- os=-nextstep2 +- ;; +- # Preserve the version number of sinix5. +- -sinix5.*) +- os=`echo $os | sed -e 's|sinix|sysv|'` +- ;; +- -sinix*) +- os=-sysv4 +- ;; +- -triton*) +- os=-sysv3 +- ;; +- -oss*) +- os=-sysv3 +- ;; +- -svr4) +- os=-sysv4 +- ;; +- -svr3) +- os=-sysv3 +- ;; +- -sysvr4) +- os=-sysv4 +- ;; +- # This must come after -sysvr4. +- -sysv*) +- ;; +- -ose*) +- os=-ose +- ;; +- -es1800*) +- os=-ose +- ;; +- -xenix) +- os=-xenix +- ;; +- -*mint | -*MiNT) +- os=-mint +- ;; +- -none) +- ;; +- *) +- # Get rid of the `-' at the beginning of $os. +- os=`echo $os | sed 's/[^-]*-//'` +- echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 +- exit 1 +- ;; +-esac +-else +- +-# Here we handle the default operating systems that come with various machines. +-# The value should be what the vendor currently ships out the door with their +-# machine or put another way, the most popular os provided with the machine. +- +-# Note that if you're going to try to match "-MANUFACTURER" here (say, +-# "-sun"), then you have to tell the case statement up towards the top +-# that MANUFACTURER isn't an operating system. Otherwise, code above +-# will signal an error saying that MANUFACTURER isn't an operating +-# system, and we'll never get to this point. +- +-case $basic_machine in +- *-acorn) +- os=-riscix1.2 +- ;; +- arm*-corel) +- os=-linux +- ;; +- arm*-semi) +- os=-aout +- ;; +- pdp11-*) +- os=-none +- ;; +- *-dec | vax-*) +- os=-ultrix4.2 +- ;; +- m68*-apollo) +- os=-domain +- ;; +- i386-sun) +- os=-sunos4.0.2 +- ;; +- m68000-sun) +- os=-sunos3 +- # This also exists in the configure program, but was not the +- # default. +- # os=-sunos4 +- ;; +- m68*-cisco) +- os=-aout +- ;; +- mips*-cisco) +- os=-elf +- ;; +- mips*-*) +- os=-elf +- ;; +- *-tti) # must be before sparc entry or we get the wrong os. +- os=-sysv3 +- ;; +- sparc-* | *-sun) +- os=-sunos4.1.1 +- ;; +- *-be) +- os=-beos +- ;; +- *-ibm) +- os=-aix +- ;; +- *-wec) +- os=-proelf +- ;; +- *-winbond) +- os=-proelf +- ;; +- *-oki) +- os=-proelf +- ;; +- *-hp) +- os=-hpux +- ;; +- *-hitachi) +- os=-hiux +- ;; +- i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) +- os=-sysv +- ;; +- *-cbm) +- os=-amigaos +- ;; +- *-dg) +- os=-dgux +- ;; +- *-dolphin) +- os=-sysv3 +- ;; +- m68k-ccur) +- os=-rtu +- ;; +- m88k-omron*) +- os=-luna +- ;; +- *-next ) +- os=-nextstep +- ;; +- *-sequent) +- os=-ptx +- ;; +- *-crds) +- os=-unos +- ;; +- *-ns) +- os=-genix +- ;; +- i370-*) +- os=-mvs +- ;; +- *-next) +- os=-nextstep3 +- ;; +- *-gould) +- os=-sysv +- ;; +- *-highlevel) +- os=-bsd +- ;; +- *-encore) +- os=-bsd +- ;; +- *-sgi) +- os=-irix +- ;; +- *-siemens) +- os=-sysv4 +- ;; +- *-masscomp) +- os=-rtu +- ;; +- f301-fujitsu) +- os=-uxpv +- ;; +- *-rom68k) +- os=-coff +- ;; +- *-*bug) +- os=-coff +- ;; +- *-apple) +- os=-macos +- ;; +- *-atari*) +- os=-mint +- ;; +- *) +- os=-none +- ;; +-esac +-fi +- +-# Here we handle the case where we know the os, and the CPU type, but not the +-# manufacturer. We pick the logical manufacturer. +-vendor=unknown +-case $basic_machine in +- *-unknown) +- case $os in +- -riscix*) +- vendor=acorn +- ;; +- -sunos*) +- vendor=sun +- ;; +- -aix*) +- vendor=ibm +- ;; +- -beos*) +- vendor=be +- ;; +- -hpux*) +- vendor=hp +- ;; +- -mpeix*) +- vendor=hp +- ;; +- -hiux*) +- vendor=hitachi +- ;; +- -unos*) +- vendor=crds +- ;; +- -dgux*) +- vendor=dg +- ;; +- -luna*) +- vendor=omron +- ;; +- -genix*) +- vendor=ns +- ;; +- -mvs*) +- vendor=ibm +- ;; +- -ptx*) +- vendor=sequent +- ;; +- -vxsim* | -vxworks*) +- vendor=wrs +- ;; +- -aux*) +- vendor=apple +- ;; +- -hms*) +- vendor=hitachi +- ;; +- -mpw* | -macos*) +- vendor=apple +- ;; +- -*mint | -*MiNT) +- vendor=atari +- ;; +- esac +- basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` +- ;; +-esac +- +-echo $basic_machine$os +diff -urNd -urNd patch-2.5.4/configure patch-2.5.9/configure +--- patch-2.5.4/configure 1999-08-30 02:44:34.000000000 -0400 ++++ patch-2.5.9/configure 2003-05-19 02:50:21.000000000 -0400 +@@ -1,28 +1,326 @@ + #! /bin/sh +- + # Guess values for system-dependent variables and create Makefiles. +-# Generated automatically using autoconf version 2.13 +-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. ++# Generated by GNU Autoconf 2.57 for patch 2.5.9. + # ++# Report bugs to <bug-patch@gnu.org>. ++# ++# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 ++# Free Software Foundation, Inc. + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. ++## --------------------- ## ++## M4sh Initialization. ## ++## --------------------- ## + +-# Defaults: +-ac_help= ++# Be Bourne compatible ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '${1+"$@"}'='"$@"' ++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then ++ set -o posix ++fi ++ ++# Support unset when possible. ++if (FOO=FOO; unset FOO) >/dev/null 2>&1; then ++ as_unset=unset ++else ++ as_unset=false ++fi ++ ++ ++# Work around bugs in pre-3.0 UWIN ksh. ++$as_unset ENV MAIL MAILPATH ++PS1='$ ' ++PS2='> ' ++PS4='+ ' ++ ++# NLS nuisances. ++for as_var in \ ++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ++ LC_TELEPHONE LC_TIME ++do ++ if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then ++ eval $as_var=C; export $as_var ++ else ++ $as_unset $as_var ++ fi ++done ++ ++# Required to use basename. ++if expr a : '\(a\)' >/dev/null 2>&1; then ++ as_expr=expr ++else ++ as_expr=false ++fi ++ ++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then ++ as_basename=basename ++else ++ as_basename=false ++fi ++ ++ ++# Name of the executable. ++as_me=`$as_basename "$0" || ++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)$' \| \ ++ . : '\(.\)' 2>/dev/null || ++echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } ++ /^X\/\(\/\/\)$/{ s//\1/; q; } ++ /^X\/\(\/\).*/{ s//\1/; q; } ++ s/.*/./; q'` ++ ++ ++# PATH needs CR, and LINENO needs CR and PATH. ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits ++ ++# 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 ++ ++ ++ as_lineno_1=$LINENO ++ as_lineno_2=$LINENO ++ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` ++ test "x$as_lineno_1" != "x$as_lineno_2" && ++ test "x$as_lineno_3" = "x$as_lineno_2" || { ++ # Find who we are. Look in the path if we contain no path at all ++ # relative or not. ++ case $0 in ++ *[\\/]* ) as_myself=$0 ;; ++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++done ++ ++ ;; ++ esac ++ # We did not find ourselves, most probably we were run as `sh COMMAND' ++ # in which case we are not to be found in the path. ++ if test "x$as_myself" = x; then ++ as_myself=$0 ++ fi ++ if test ! -f "$as_myself"; then ++ { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 ++ { (exit 1); exit 1; }; } ++ fi ++ case $CONFIG_SHELL in ++ '') ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for as_base in sh bash ksh sh5; do ++ case $as_dir in ++ /*) ++ if ("$as_dir/$as_base" -c ' ++ as_lineno_1=$LINENO ++ as_lineno_2=$LINENO ++ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` ++ test "x$as_lineno_1" != "x$as_lineno_2" && ++ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then ++ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } ++ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } ++ CONFIG_SHELL=$as_dir/$as_base ++ export CONFIG_SHELL ++ exec "$CONFIG_SHELL" "$0" ${1+"$@"} ++ fi;; ++ esac ++ done ++done ++;; ++ esac ++ ++ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO ++ # uniformly replaced by the line number. The first 'sed' inserts a ++ # line-number line before each line; the second 'sed' does the real ++ # work. The second script uses 'N' to pair each line-number line ++ # with the numbered line, and appends trailing '-' during ++ # substitution so that $LINENO is not a special case at line end. ++ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the ++ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) ++ sed '=' <$as_myself | ++ sed ' ++ N ++ s,$,-, ++ : loop ++ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, ++ t loop ++ s,-$,, ++ s,^['$as_cr_digits']*\n,, ++ ' >$as_me.lineno && ++ chmod +x $as_me.lineno || ++ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 ++ { (exit 1); exit 1; }; } ++ ++ # Don't try to exec as it changes $[0], causing all sort of problems ++ # (the dirname of $[0] is not the place where we might find the ++ # original and so on. Autoconf is especially sensible to this). ++ . ./$as_me.lineno ++ # Exit status is that of the last command. ++ exit ++} ++ ++ ++case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in ++ *c*,-n*) ECHO_N= ECHO_C=' ++' ECHO_T=' ' ;; ++ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; ++ *) ECHO_N= ECHO_C='\c' ECHO_T= ;; ++esac ++ ++if expr a : '\(a\)' >/dev/null 2>&1; then ++ as_expr=expr ++else ++ as_expr=false ++fi ++ ++rm -f conf$$ conf$$.exe conf$$.file ++echo >conf$$.file ++if ln -s conf$$.file conf$$ 2>/dev/null; then ++ # We could just check for DJGPP; but this test a) works b) is more generic ++ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). ++ if test -f conf$$.exe; then ++ # Don't use ln at all; we don't have any links ++ as_ln_s='cp -p' ++ else ++ as_ln_s='ln -s' ++ fi ++elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln ++else ++ as_ln_s='cp -p' ++fi ++rm -f conf$$ conf$$.exe conf$$.file ++ ++if mkdir -p . 2>/dev/null; then ++ as_mkdir_p=: ++else ++ as_mkdir_p=false ++fi ++ ++as_executable_p="test -f" ++ ++# Sed expression to map a string onto a valid CPP name. ++as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" ++ ++# Sed expression to map a string onto a valid variable name. ++as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" ++ ++ ++# IFS ++# We need space, tab and new line, in precisely that order. ++as_nl=' ++' ++IFS=" $as_nl" ++ ++# CDPATH. ++$as_unset CDPATH ++ ++ ++# Name of the host. ++# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, ++# so uname gets run too. ++ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` ++ ++exec 6>&1 ++ ++# ++# Initializations. ++# + ac_default_prefix=/usr/local +-# Any additions from configure.in: +-ac_help="$ac_help +- --disable-largefile omit support for large files" ++ac_config_libobj_dir=. ++cross_compiling=no ++subdirs= ++MFLAGS= ++MAKEFLAGS= ++SHELL=${CONFIG_SHELL-/bin/sh} ++ ++# Maximum number of lines to put in a shell here document. ++# This variable seems obsolete. It should probably be removed, and ++# only ac_max_sed_lines should be used. ++: ${ac_max_here_lines=38} ++ ++# Identity of this package. ++PACKAGE_NAME='patch' ++PACKAGE_TARNAME='patch' ++PACKAGE_VERSION='2.5.9' ++PACKAGE_STRING='patch 2.5.9' ++PACKAGE_BUGREPORT='bug-patch@gnu.org' ++ ++ac_unique_file="patch.c" ++# Factoring default headers for most tests. ++ac_includes_default="\ ++#include <stdio.h> ++#if HAVE_SYS_TYPES_H ++# include <sys/types.h> ++#endif ++#if HAVE_SYS_STAT_H ++# include <sys/stat.h> ++#endif ++#if STDC_HEADERS ++# include <stdlib.h> ++# include <stddef.h> ++#else ++# if HAVE_STDLIB_H ++# include <stdlib.h> ++# endif ++#endif ++#if HAVE_STRING_H ++# if !STDC_HEADERS && HAVE_MEMORY_H ++# include <memory.h> ++# endif ++# include <string.h> ++#endif ++#if HAVE_STRINGS_H ++# include <strings.h> ++#endif ++#if HAVE_INTTYPES_H ++# include <inttypes.h> ++#else ++# if HAVE_STDINT_H ++# include <stdint.h> ++# endif ++#endif ++#if HAVE_UNISTD_H ++# include <unistd.h> ++#endif" ++ ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE ed_PROGRAM EGREP STDBOOL_H HAVE__BOOL LIBOBJS LTLIBOBJS' ++ac_subst_files='' + + # Initialize some variables set by options. ++ac_init_help= ++ac_init_version=false + # The variables have the same names as the options, with + # dashes changed to underlines. +-build=NONE +-cache_file=./config.cache ++cache_file=/dev/null + exec_prefix=NONE +-host=NONE + no_create= +-nonopt=NONE + no_recursion= + prefix=NONE + program_prefix=NONE +@@ -31,10 +329,15 @@ + silent= + site= + srcdir= +-target=NONE + verbose= + x_includes=NONE + x_libraries=NONE ++ ++# Installation directory options. ++# These are left unexpanded so users can "make install exec_prefix=/foo" ++# and all the variables that are supposed to be based on exec_prefix ++# by default will actually change. ++# Use braces instead of parens because sh, perl, etc. also accept them. + bindir='${exec_prefix}/bin' + sbindir='${exec_prefix}/sbin' + libexecdir='${exec_prefix}/libexec' +@@ -48,17 +351,9 @@ + infodir='${prefix}/info' + mandir='${prefix}/man' + +-# Initialize some other variables. +-subdirs= +-MFLAGS= MAKEFLAGS= +-SHELL=${CONFIG_SHELL-/bin/sh} +-# Maximum number of lines to put in a shell here document. +-ac_max_here_lines=12 +- + ac_prev= + for ac_option + do +- + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval "$ac_prev=\$ac_option" +@@ -66,59 +361,59 @@ + continue + fi + +- case "$ac_option" in +- -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; +- *) ac_optarg= ;; +- esac ++ ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` + + # Accept the important Cygnus configure options, so we can diagnose typos. + +- case "$ac_option" in ++ case $ac_option in + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) +- bindir="$ac_optarg" ;; ++ bindir=$ac_optarg ;; + + -build | --build | --buil | --bui | --bu) +- ac_prev=build ;; ++ ac_prev=build_alias ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) +- build="$ac_optarg" ;; ++ build_alias=$ac_optarg ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) +- cache_file="$ac_optarg" ;; ++ cache_file=$ac_optarg ;; ++ ++ --config-cache | -C) ++ cache_file=config.cache ;; + + -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ + | --da=*) +- datadir="$ac_optarg" ;; ++ datadir=$ac_optarg ;; + + -disable-* | --disable-*) +- ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` ++ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. +- if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then +- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } +- fi +- ac_feature=`echo $ac_feature| sed 's/-/_/g'` +- eval "enable_${ac_feature}=no" ;; ++ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ { echo "$as_me: error: invalid feature name: $ac_feature" >&2 ++ { (exit 1); exit 1; }; } ++ ac_feature=`echo $ac_feature | sed 's/-/_/g'` ++ eval "enable_$ac_feature=no" ;; + + -enable-* | --enable-*) +- ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` ++ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then +- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } +- fi +- ac_feature=`echo $ac_feature| sed 's/-/_/g'` +- case "$ac_option" in +- *=*) ;; ++ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ { echo "$as_me: error: invalid feature name: $ac_feature" >&2 ++ { (exit 1); exit 1; }; } ++ ac_feature=`echo $ac_feature | sed 's/-/_/g'` ++ case $ac_option in ++ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; + *) ac_optarg=yes ;; + esac +- eval "enable_${ac_feature}='$ac_optarg'" ;; ++ eval "enable_$ac_feature='$ac_optarg'" ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ +@@ -127,95 +422,47 @@ + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) +- exec_prefix="$ac_optarg" ;; ++ exec_prefix=$ac_optarg ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + +- -help | --help | --hel | --he) +- # Omit some internal or obsolete options to make the list less imposing. +- # This message is too long to be a string in the A/UX 3.1 sh. +- cat << EOF +-Usage: configure [options] [host] +-Options: [defaults in brackets after descriptions] +-Configuration: +- --cache-file=FILE cache test results in FILE +- --help print this message +- --no-create do not create output files +- --quiet, --silent do not print \`checking...' messages +- --version print the version of autoconf that created configure +-Directory and file names: +- --prefix=PREFIX install architecture-independent files in PREFIX +- [$ac_default_prefix] +- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX +- [same as prefix] +- --bindir=DIR user executables in DIR [EPREFIX/bin] +- --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] +- --libexecdir=DIR program executables in DIR [EPREFIX/libexec] +- --datadir=DIR read-only architecture-independent data in DIR +- [PREFIX/share] +- --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] +- --sharedstatedir=DIR modifiable architecture-independent data in DIR +- [PREFIX/com] +- --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] +- --libdir=DIR object code libraries in DIR [EPREFIX/lib] +- --includedir=DIR C header files in DIR [PREFIX/include] +- --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] +- --infodir=DIR info documentation in DIR [PREFIX/info] +- --mandir=DIR man documentation in DIR [PREFIX/man] +- --srcdir=DIR find the sources in DIR [configure dir or ..] +- --program-prefix=PREFIX prepend PREFIX to installed program names +- --program-suffix=SUFFIX append SUFFIX to installed program names +- --program-transform-name=PROGRAM +- run sed PROGRAM on installed program names +-EOF +- cat << EOF +-Host type: +- --build=BUILD configure for building on BUILD [BUILD=HOST] +- --host=HOST configure for HOST [guessed] +- --target=TARGET configure for TARGET [TARGET=HOST] +-Features and packages: +- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) +- --enable-FEATURE[=ARG] include FEATURE [ARG=yes] +- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) +- --x-includes=DIR X include files are in DIR +- --x-libraries=DIR X library files are in DIR +-EOF +- if test -n "$ac_help"; then +- echo "--enable and --with options recognized:$ac_help" +- fi +- exit 0 ;; ++ -help | --help | --hel | --he | -h) ++ ac_init_help=long ;; ++ -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) ++ ac_init_help=recursive ;; ++ -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) ++ ac_init_help=short ;; + + -host | --host | --hos | --ho) +- ac_prev=host ;; ++ ac_prev=host_alias ;; + -host=* | --host=* | --hos=* | --ho=*) +- host="$ac_optarg" ;; ++ host_alias=$ac_optarg ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) +- includedir="$ac_optarg" ;; ++ includedir=$ac_optarg ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) +- infodir="$ac_optarg" ;; ++ infodir=$ac_optarg ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) +- libdir="$ac_optarg" ;; ++ libdir=$ac_optarg ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) +- libexecdir="$ac_optarg" ;; ++ libexecdir=$ac_optarg ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst \ +@@ -224,19 +471,19 @@ + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* \ + | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) +- localstatedir="$ac_optarg" ;; ++ localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) +- mandir="$ac_optarg" ;; ++ mandir=$ac_optarg ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ +- | --no-cr | --no-c) ++ | --no-cr | --no-c | -n) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ +@@ -250,26 +497,26 @@ + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) +- oldincludedir="$ac_optarg" ;; ++ oldincludedir=$ac_optarg ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) +- prefix="$ac_optarg" ;; ++ prefix=$ac_optarg ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) +- program_prefix="$ac_optarg" ;; ++ program_prefix=$ac_optarg ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) +- program_suffix="$ac_optarg" ;; ++ program_suffix=$ac_optarg ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ +@@ -286,7 +533,7 @@ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) +- program_transform_name="$ac_optarg" ;; ++ program_transform_name=$ac_optarg ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) +@@ -296,7 +543,7 @@ + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) +- sbindir="$ac_optarg" ;; ++ sbindir=$ac_optarg ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ +@@ -307,58 +554,57 @@ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) +- sharedstatedir="$ac_optarg" ;; ++ sharedstatedir=$ac_optarg ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) +- site="$ac_optarg" ;; ++ site=$ac_optarg ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) +- srcdir="$ac_optarg" ;; ++ srcdir=$ac_optarg ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) +- sysconfdir="$ac_optarg" ;; ++ sysconfdir=$ac_optarg ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) +- ac_prev=target ;; ++ ac_prev=target_alias ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) +- target="$ac_optarg" ;; ++ target_alias=$ac_optarg ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + +- -version | --version | --versio | --versi | --vers) +- echo "configure generated by autoconf version 2.13" +- exit 0 ;; ++ -version | --version | --versio | --versi | --vers | -V) ++ ac_init_version=: ;; + + -with-* | --with-*) +- ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` ++ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then +- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } +- fi ++ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ { echo "$as_me: error: invalid package name: $ac_package" >&2 ++ { (exit 1); exit 1; }; } + ac_package=`echo $ac_package| sed 's/-/_/g'` +- case "$ac_option" in +- *=*) ;; ++ case $ac_option in ++ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; + *) ac_optarg=yes ;; + esac +- eval "with_${ac_package}='$ac_optarg'" ;; ++ eval "with_$ac_package='$ac_optarg'" ;; + + -without-* | --without-*) +- ac_package=`echo $ac_option|sed -e 's/-*without-//'` ++ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. +- if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then +- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } +- fi +- ac_package=`echo $ac_package| sed 's/-/_/g'` +- eval "with_${ac_package}=no" ;; ++ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ { echo "$as_me: error: invalid package name: $ac_package" >&2 ++ { (exit 1); exit 1; }; } ++ ac_package=`echo $ac_package | sed 's/-/_/g'` ++ eval "with_$ac_package=no" ;; + + --x) + # Obsolete; use --with-x. +@@ -369,99 +615,110 @@ + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) +- x_includes="$ac_optarg" ;; ++ x_includes=$ac_optarg ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) +- x_libraries="$ac_optarg" ;; ++ x_libraries=$ac_optarg ;; + +- -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } ++ -*) { echo "$as_me: error: unrecognized option: $ac_option ++Try \`$0 --help' for more information." >&2 ++ { (exit 1); exit 1; }; } + ;; + ++ *=*) ++ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` ++ # Reject names that are not valid shell variable names. ++ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && ++ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 ++ { (exit 1); exit 1; }; } ++ ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ++ eval "$ac_envvar='$ac_optarg'" ++ export $ac_envvar ;; ++ + *) +- if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then +- echo "configure: warning: $ac_option: invalid host type" 1>&2 +- fi +- if test "x$nonopt" != xNONE; then +- { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } +- fi +- nonopt="$ac_option" ++ # FIXME: should be removed in autoconf 3.0. ++ echo "$as_me: WARNING: you should use --build, --host, --target" >&2 ++ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && ++ echo "$as_me: WARNING: invalid host type: $ac_option" >&2 ++ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + ;; + + esac + done + + if test -n "$ac_prev"; then +- { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } +-fi +- +-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 +- +-# File descriptor usage: +-# 0 standard input +-# 1 file creation +-# 2 errors and warnings +-# 3 some systems may open it to /dev/tty +-# 4 used on the Kubota Titan +-# 6 checking for... messages and results +-# 5 compiler messages saved in config.log +-if test "$silent" = yes; then +- exec 6>/dev/null +-else +- exec 6>&1 ++ ac_option=--`echo $ac_prev | sed 's/_/-/g'` ++ { echo "$as_me: error: missing argument to $ac_option" >&2 ++ { (exit 1); exit 1; }; } + fi +-exec 5>./config.log + +-echo "\ +-This file contains any messages produced by compilers while +-running configure, to aid debugging if configure makes a mistake. +-" 1>&5 ++# Be sure to have absolute paths. ++for ac_var in exec_prefix prefix ++do ++ eval ac_val=$`echo $ac_var` ++ case $ac_val in ++ [\\/$]* | ?:[\\/]* | NONE | '' ) ;; ++ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 ++ { (exit 1); exit 1; }; };; ++ esac ++done + +-# Strip out --no-create and --no-recursion so they do not pile up. +-# Also quote any args containing shell metacharacters. +-ac_configure_args= +-for ac_arg ++# Be sure to have absolute paths. ++for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ ++ localstatedir libdir includedir oldincludedir infodir mandir + do +- case "$ac_arg" in +- -no-create | --no-create | --no-creat | --no-crea | --no-cre \ +- | --no-cr | --no-c) ;; +- -no-recursion | --no-recursion | --no-recursio | --no-recursi \ +- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; +- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) +- ac_configure_args="$ac_configure_args '$ac_arg'" ;; +- *) ac_configure_args="$ac_configure_args $ac_arg" ;; ++ eval ac_val=$`echo $ac_var` ++ case $ac_val in ++ [\\/$]* | ?:[\\/]* ) ;; ++ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 ++ { (exit 1); exit 1; }; };; + esac + done + +-# NLS nuisances. +-# Only set these to C if already set. These must not be set unconditionally +-# because not all systems understand e.g. LANG=C (notably SCO). +-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +-# Non-C LC_CTYPE values break the ctype check. +-if test "${LANG+set}" = set; then LANG=C; export LANG; fi +-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +-if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi ++# There might be people who depend on the old broken behavior: `$host' ++# used to hold the argument of --host etc. ++# FIXME: To remove some day. ++build=$build_alias ++host=$host_alias ++target=$target_alias + +-# confdefs.h avoids OS command line length limits that DEFS can exceed. +-rm -rf conftest* confdefs.h +-# AIX cpp loses on an empty file, so make sure it contains at least a newline. +-echo > confdefs.h ++# FIXME: To remove some day. ++if test "x$host_alias" != x; then ++ if test "x$build_alias" = x; then ++ cross_compiling=maybe ++ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. ++ If a cross compiler is detected then cross compile mode will be used." >&2 ++ elif test "x$build_alias" != "x$host_alias"; then ++ cross_compiling=yes ++ fi ++fi ++ ++ac_tool_prefix= ++test -n "$host_alias" && ac_tool_prefix=$host_alias- ++ ++test "$silent" = yes && exec 6>/dev/null + +-# A filename unique to this package, relative to the directory that +-# configure is in, which we can look for to find out if srcdir is correct. +-ac_unique_file=patch.c + + # Find the source files, if location was not specified. + if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then its parent. +- ac_prog=$0 +- ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` +- test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. ++ ac_confdir=`(dirname "$0") 2>/dev/null || ++$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$0" : 'X\(//\)[^/]' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)' \| \ ++ . : '\(.\)' 2>/dev/null || ++echo X"$0" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } ++ /^X\(\/\/\)[^/].*/{ s//\1/; q; } ++ /^X\(\/\/\)$/{ s//\1/; q; } ++ /^X\(\/\).*/{ s//\1/; q; } ++ s/.*/./; q'` + srcdir=$ac_confdir + if test ! -r $srcdir/$ac_unique_file; then + srcdir=.. +@@ -471,13 +728,437 @@ + fi + if test ! -r $srcdir/$ac_unique_file; then + if test "$ac_srcdir_defaulted" = yes; then +- { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } ++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 ++ { (exit 1); exit 1; }; } + else +- { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } ++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 ++ { (exit 1); exit 1; }; } + fi + fi +-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` ++(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || ++ { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 ++ { (exit 1); exit 1; }; } ++srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` ++ac_env_build_alias_set=${build_alias+set} ++ac_env_build_alias_value=$build_alias ++ac_cv_env_build_alias_set=${build_alias+set} ++ac_cv_env_build_alias_value=$build_alias ++ac_env_host_alias_set=${host_alias+set} ++ac_env_host_alias_value=$host_alias ++ac_cv_env_host_alias_set=${host_alias+set} ++ac_cv_env_host_alias_value=$host_alias ++ac_env_target_alias_set=${target_alias+set} ++ac_env_target_alias_value=$target_alias ++ac_cv_env_target_alias_set=${target_alias+set} ++ac_cv_env_target_alias_value=$target_alias ++ac_env_CC_set=${CC+set} ++ac_env_CC_value=$CC ++ac_cv_env_CC_set=${CC+set} ++ac_cv_env_CC_value=$CC ++ac_env_CFLAGS_set=${CFLAGS+set} ++ac_env_CFLAGS_value=$CFLAGS ++ac_cv_env_CFLAGS_set=${CFLAGS+set} ++ac_cv_env_CFLAGS_value=$CFLAGS ++ac_env_LDFLAGS_set=${LDFLAGS+set} ++ac_env_LDFLAGS_value=$LDFLAGS ++ac_cv_env_LDFLAGS_set=${LDFLAGS+set} ++ac_cv_env_LDFLAGS_value=$LDFLAGS ++ac_env_CPPFLAGS_set=${CPPFLAGS+set} ++ac_env_CPPFLAGS_value=$CPPFLAGS ++ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} ++ac_cv_env_CPPFLAGS_value=$CPPFLAGS ++ac_env_CPP_set=${CPP+set} ++ac_env_CPP_value=$CPP ++ac_cv_env_CPP_set=${CPP+set} ++ac_cv_env_CPP_value=$CPP ++ ++# ++# Report the --help message. ++# ++if test "$ac_init_help" = "long"; then ++ # Omit some internal or obsolete options to make the list less imposing. ++ # This message is too long to be a string in the A/UX 3.1 sh. ++ cat <<_ACEOF ++\`configure' configures patch 2.5.9 to adapt to many kinds of systems. ++ ++Usage: $0 [OPTION]... [VAR=VALUE]... ++ ++To assign environment variables (e.g., CC, CFLAGS...), specify them as ++VAR=VALUE. See below for descriptions of some of the useful variables. ++ ++Defaults for the options are specified in brackets. ++ ++Configuration: ++ -h, --help display this help and exit ++ --help=short display options specific to this package ++ --help=recursive display the short help of all the included packages ++ -V, --version display version information and exit ++ -q, --quiet, --silent do not print \`checking...' messages ++ --cache-file=FILE cache test results in FILE [disabled] ++ -C, --config-cache alias for \`--cache-file=config.cache' ++ -n, --no-create do not create output files ++ --srcdir=DIR find the sources in DIR [configure dir or \`..'] ++ ++_ACEOF ++ ++ cat <<_ACEOF ++Installation directories: ++ --prefix=PREFIX install architecture-independent files in PREFIX ++ [$ac_default_prefix] ++ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX ++ [PREFIX] ++ ++By default, \`make install' will install all the files in ++\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify ++an installation prefix other than \`$ac_default_prefix' using \`--prefix', ++for instance \`--prefix=\$HOME'. ++ ++For better control, use the options below. ++ ++Fine tuning of the installation directories: ++ --bindir=DIR user executables [EPREFIX/bin] ++ --sbindir=DIR system admin executables [EPREFIX/sbin] ++ --libexecdir=DIR program executables [EPREFIX/libexec] ++ --datadir=DIR read-only architecture-independent data [PREFIX/share] ++ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] ++ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] ++ --localstatedir=DIR modifiable single-machine data [PREFIX/var] ++ --libdir=DIR object code libraries [EPREFIX/lib] ++ --includedir=DIR C header files [PREFIX/include] ++ --oldincludedir=DIR C header files for non-gcc [/usr/include] ++ --infodir=DIR info documentation [PREFIX/info] ++ --mandir=DIR man documentation [PREFIX/man] ++_ACEOF ++ ++ cat <<\_ACEOF ++ ++Program names: ++ --program-prefix=PREFIX prepend PREFIX to installed program names ++ --program-suffix=SUFFIX append SUFFIX to installed program names ++ --program-transform-name=PROGRAM run sed PROGRAM on installed program names ++_ACEOF ++fi ++ ++if test -n "$ac_init_help"; then ++ case $ac_init_help in ++ short | recursive ) echo "Configuration of patch 2.5.9:";; ++ esac ++ cat <<\_ACEOF ++ ++Optional Features: ++ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) ++ --enable-FEATURE[=ARG] include FEATURE [ARG=yes] ++ --disable-largefile omit support for large files ++ ++Some influential environment variables: ++ CC C compiler command ++ CFLAGS C compiler flags ++ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a ++ nonstandard directory <lib dir> ++ CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have ++ headers in a nonstandard directory <include dir> ++ CPP C preprocessor ++ ++Use these variables to override the choices made by `configure' or to help ++it to find libraries and programs with nonstandard names/locations. ++ ++Report bugs to <bug-patch@gnu.org>. ++_ACEOF ++fi ++ ++if test "$ac_init_help" = "recursive"; then ++ # If there are subdirs, report their specific --help. ++ ac_popdir=`pwd` ++ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue ++ test -d $ac_dir || continue ++ ac_builddir=. ++ ++if test "$ac_dir" != .; then ++ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` ++ # A "../" for each directory in $ac_dir_suffix. ++ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` ++else ++ ac_dir_suffix= ac_top_builddir= ++fi ++ ++case $srcdir in ++ .) # No --srcdir option. We are building in place. ++ ac_srcdir=. ++ if test -z "$ac_top_builddir"; then ++ ac_top_srcdir=. ++ else ++ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` ++ fi ;; ++ [\\/]* | ?:[\\/]* ) # Absolute path. ++ ac_srcdir=$srcdir$ac_dir_suffix; ++ ac_top_srcdir=$srcdir ;; ++ *) # Relative path. ++ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ++ ac_top_srcdir=$ac_top_builddir$srcdir ;; ++esac ++# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be ++# absolute. ++ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` ++ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` ++ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ++ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` ++ ++ cd $ac_dir ++ # Check for guested configure; otherwise get Cygnus style configure. ++ if test -f $ac_srcdir/configure.gnu; then ++ echo ++ $SHELL $ac_srcdir/configure.gnu --help=recursive ++ elif test -f $ac_srcdir/configure; then ++ echo ++ $SHELL $ac_srcdir/configure --help=recursive ++ elif test -f $ac_srcdir/configure.ac || ++ test -f $ac_srcdir/configure.in; then ++ echo ++ $ac_configure --help ++ else ++ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 ++ fi ++ cd $ac_popdir ++ done ++fi ++ ++test -n "$ac_init_help" && exit 0 ++if $ac_init_version; then ++ cat <<\_ACEOF ++patch configure 2.5.9 ++generated by GNU Autoconf 2.57 ++ ++Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 ++Free Software Foundation, Inc. ++This configure script is free software; the Free Software Foundation ++gives unlimited permission to copy, distribute and modify it. ++_ACEOF ++ exit 0 ++fi ++exec 5>config.log ++cat >&5 <<_ACEOF ++This file contains any messages produced by compilers while ++running configure, to aid debugging if configure makes a mistake. ++ ++It was created by patch $as_me 2.5.9, which was ++generated by GNU Autoconf 2.57. Invocation command line was ++ ++ $ $0 $@ ++ ++_ACEOF ++{ ++cat <<_ASUNAME ++## --------- ## ++## Platform. ## ++## --------- ## ++ ++hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` ++uname -m = `(uname -m) 2>/dev/null || echo unknown` ++uname -r = `(uname -r) 2>/dev/null || echo unknown` ++uname -s = `(uname -s) 2>/dev/null || echo unknown` ++uname -v = `(uname -v) 2>/dev/null || echo unknown` ++ ++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` ++/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` ++ ++/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` ++/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` ++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` ++hostinfo = `(hostinfo) 2>/dev/null || echo unknown` ++/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` ++/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` ++/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` ++ ++_ASUNAME ++ ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ echo "PATH: $as_dir" ++done ++ ++} >&5 ++ ++cat >&5 <<_ACEOF ++ ++ ++## ----------- ## ++## Core tests. ## ++## ----------- ## ++ ++_ACEOF ++ ++ ++# Keep a trace of the command line. ++# Strip out --no-create and --no-recursion so they do not pile up. ++# Strip out --silent because we don't want to record it for future runs. ++# Also quote any args containing shell meta-characters. ++# Make two passes to allow for proper duplicate-argument suppression. ++ac_configure_args= ++ac_configure_args0= ++ac_configure_args1= ++ac_sep= ++ac_must_keep_next=false ++for ac_pass in 1 2 ++do ++ for ac_arg ++ do ++ case $ac_arg in ++ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; ++ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ ++ | -silent | --silent | --silen | --sile | --sil) ++ continue ;; ++ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) ++ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ esac ++ case $ac_pass in ++ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; ++ 2) ++ ac_configure_args1="$ac_configure_args1 '$ac_arg'" ++ if test $ac_must_keep_next = true; then ++ ac_must_keep_next=false # Got value, back to normal. ++ else ++ case $ac_arg in ++ *=* | --config-cache | -C | -disable-* | --disable-* \ ++ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ ++ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ ++ | -with-* | --with-* | -without-* | --without-* | --x) ++ case "$ac_configure_args0 " in ++ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; ++ esac ++ ;; ++ -* ) ac_must_keep_next=true ;; ++ esac ++ fi ++ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" ++ # Get rid of the leading space. ++ ac_sep=" " ++ ;; ++ esac ++ done ++done ++$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } ++$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } ++ ++# When interrupted or exit'd, cleanup temporary files, and complete ++# config.log. We remove comments because anyway the quotes in there ++# would cause problems or look ugly. ++# WARNING: Be sure not to use single quotes in there, as some shells, ++# such as our DU 5.0 friend, will then `close' the trap. ++trap 'exit_status=$? ++ # Save into config.log some information that might help in debugging. ++ { ++ echo ++ ++ cat <<\_ASBOX ++## ---------------- ## ++## Cache variables. ## ++## ---------------- ## ++_ASBOX ++ echo ++ # The following way of writing the cache mishandles newlines in values, ++{ ++ (set) 2>&1 | ++ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in ++ *ac_space=\ *) ++ sed -n \ ++ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; ++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" ++ ;; ++ *) ++ sed -n \ ++ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ++ ;; ++ esac; ++} ++ echo ++ ++ cat <<\_ASBOX ++## ----------------- ## ++## Output variables. ## ++## ----------------- ## ++_ASBOX ++ echo ++ for ac_var in $ac_subst_vars ++ do ++ eval ac_val=$`echo $ac_var` ++ echo "$ac_var='"'"'$ac_val'"'"'" ++ done | sort ++ echo ++ ++ if test -n "$ac_subst_files"; then ++ cat <<\_ASBOX ++## ------------- ## ++## Output files. ## ++## ------------- ## ++_ASBOX ++ echo ++ for ac_var in $ac_subst_files ++ do ++ eval ac_val=$`echo $ac_var` ++ echo "$ac_var='"'"'$ac_val'"'"'" ++ done | sort ++ echo ++ fi ++ ++ if test -s confdefs.h; then ++ cat <<\_ASBOX ++## ----------- ## ++## confdefs.h. ## ++## ----------- ## ++_ASBOX ++ echo ++ sed "/^$/d" confdefs.h | sort ++ echo ++ fi ++ test "$ac_signal" != 0 && ++ echo "$as_me: caught signal $ac_signal" ++ echo "$as_me: exit $exit_status" ++ } >&5 ++ rm -f core core.* *.core && ++ rm -rf conftest* confdefs* conf$$* $ac_clean_files && ++ exit $exit_status ++ ' 0 ++for ac_signal in 1 2 13 15; do ++ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal ++done ++ac_signal=0 ++ ++# confdefs.h avoids OS command line length limits that DEFS can exceed. ++rm -rf conftest* confdefs.h ++# AIX cpp loses on an empty file, so make sure it contains at least a newline. ++echo >confdefs.h ++ ++# Predefined preprocessor variables. ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_NAME "$PACKAGE_NAME" ++_ACEOF + ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_TARNAME "$PACKAGE_TARNAME" ++_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_VERSION "$PACKAGE_VERSION" ++_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_STRING "$PACKAGE_STRING" ++_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" ++_ACEOF ++ ++ ++# Let the site file select an alternate cache file if it wants to. + # Prefer explicitly selected file to automatically selected ones. + if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then +@@ -488,321 +1169,767 @@ + fi + for ac_site_file in $CONFIG_SITE; do + if test -r "$ac_site_file"; then +- echo "loading site script $ac_site_file" ++ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 ++echo "$as_me: loading site script $ac_site_file" >&6;} ++ sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" + fi + done + + if test -r "$cache_file"; then +- echo "loading cache $cache_file" +- . $cache_file ++ # Some versions of bash will fail to source /dev/null (special ++ # files actually), so we avoid doing that. ++ if test -f "$cache_file"; then ++ { echo "$as_me:$LINENO: loading cache $cache_file" >&5 ++echo "$as_me: loading cache $cache_file" >&6;} ++ case $cache_file in ++ [\\/]* | ?:[\\/]* ) . $cache_file;; ++ *) . ./$cache_file;; ++ esac ++ fi + else +- echo "creating cache $cache_file" +- > $cache_file ++ { echo "$as_me:$LINENO: creating cache $cache_file" >&5 ++echo "$as_me: creating cache $cache_file" >&6;} ++ >$cache_file ++fi ++ ++# Check that the precious variables saved in the cache have kept the same ++# value. ++ac_cache_corrupted=false ++for ac_var in `(set) 2>&1 | ++ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do ++ eval ac_old_set=\$ac_cv_env_${ac_var}_set ++ eval ac_new_set=\$ac_env_${ac_var}_set ++ eval ac_old_val="\$ac_cv_env_${ac_var}_value" ++ eval ac_new_val="\$ac_env_${ac_var}_value" ++ case $ac_old_set,$ac_new_set in ++ set,) ++ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ++ ac_cache_corrupted=: ;; ++ ,set) ++ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 ++echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ++ ac_cache_corrupted=: ;; ++ ,);; ++ *) ++ if test "x$ac_old_val" != "x$ac_new_val"; then ++ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 ++echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ++ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 ++echo "$as_me: former value: $ac_old_val" >&2;} ++ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 ++echo "$as_me: current value: $ac_new_val" >&2;} ++ ac_cache_corrupted=: ++ fi;; ++ esac ++ # Pass precious variables to config.status. ++ if test "$ac_new_set" = set; then ++ case $ac_new_val in ++ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) ++ ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; ++ *) ac_arg=$ac_var=$ac_new_val ;; ++ esac ++ case " $ac_configure_args " in ++ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. ++ *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; ++ esac ++ fi ++done ++if $ac_cache_corrupted; then ++ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 ++echo "$as_me: error: changes in the environment can compromise the build" >&2;} ++ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 ++echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} ++ { (exit 1); exit 1; }; } + fi + + ac_ext=c +-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. + ac_cpp='$CPP $CPPFLAGS' +-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +-cross_compiling=$ac_cv_prog_cc_cross ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu + +-ac_exeext= +-ac_objext=o +-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then +- # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. +- if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then +- ac_n= ac_c=' +-' ac_t=' ' +- else +- ac_n=-n ac_c= ac_t= +- fi +-else +- ac_n= ac_c='\c' ac_t= +-fi + + + +-if test "$program_transform_name" = s,x,x,; then +- program_transform_name= +-else +- # Double any \ or $. echo might interpret backslashes. +- cat <<\EOF_SED > conftestsed +-s,\\,\\\\,g; s,\$,$$,g +-EOF_SED +- program_transform_name="`echo $program_transform_name|sed -f conftestsed`" +- rm -f conftestsed +-fi +-test "$program_prefix" != NONE && +- program_transform_name="s,^,${program_prefix},; $program_transform_name" +-# Use a double $ so make ignores it. +-test "$program_suffix" != NONE && +- program_transform_name="s,\$\$,${program_suffix},; $program_transform_name" + +-# sed with no file args requires a program. +-test "$program_transform_name" = "" && program_transform_name="s,x,x," + +-ac_aux_dir= +-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do +- if test -f $ac_dir/install-sh; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/install-sh -c" +- break +- elif test -f $ac_dir/install.sh; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/install.sh -c" +- break +- fi +-done +-if test -z "$ac_aux_dir"; then +- { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } +-fi +-ac_config_guess=$ac_aux_dir/config.guess +-ac_config_sub=$ac_aux_dir/config.sub +-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + + +-# Make sure we can run config.sub. +-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : +-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } +-fi + +-echo $ac_n "checking host system type""... $ac_c" 1>&6 +-echo "configure:573: checking host system type" >&5 + +-host_alias=$host +-case "$host_alias" in +-NONE) +- case $nonopt in +- NONE) +- if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : +- else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } +- fi ;; +- *) host_alias=$nonopt ;; +- esac ;; +-esac + +-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` +-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +-echo "$ac_t""$host" 1>&6 + + +-PACKAGE=patch +-VERSION=2.5.4 + + + +-# Extract the first word of "gcc", so it can be a program name with args. ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ac_config_headers="$ac_config_headers config.h:config.hin" ++ ++test "$program_prefix" != NONE && ++ program_transform_name="s,^,$program_prefix,;$program_transform_name" ++# Use a double $ so make ignores it. ++test "$program_suffix" != NONE && ++ program_transform_name="s,\$,$program_suffix,;$program_transform_name" ++# Double any \ or $. echo might interpret backslashes. ++# By default was `s,x,x', remove it if useless. ++cat <<\_ACEOF >conftest.sed ++s/[\\$]/&&/g;s/;s,x,x,$// ++_ACEOF ++program_transform_name=`echo $program_transform_name | sed -f conftest.sed` ++rm conftest.sed ++ ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}gcc; ac_word=$2 ++echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_prog_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_prog_CC="${ac_tool_prefix}gcc" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6 ++else ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++fi ++ ++fi ++if test -z "$ac_cv_prog_CC"; then ++ ac_ct_CC=$CC ++ # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 +-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:602: checking for $ac_word" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_prog_ac_ct_CC="gcc" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++ ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6 ++else ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++fi ++ ++ CC=$ac_ct_CC ++else ++ CC="$ac_cv_prog_CC" ++fi ++ ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}cc; ac_word=$2 ++echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_prog_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +- ac_dummy="$PATH" +- for ac_dir in $ac_dummy; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- ac_cv_prog_CC="gcc" +- break +- fi +- done +- IFS="$ac_save_ifs" ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_prog_CC="${ac_tool_prefix}cc" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++ + fi + fi +-CC="$ac_cv_prog_CC" ++CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$ac_t""$CC" 1>&6 ++ echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6 + else +- echo "$ac_t""no" 1>&6 ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 + fi + ++fi ++if test -z "$ac_cv_prog_CC"; then ++ ac_ct_CC=$CC ++ # Extract the first word of "cc", so it can be a program name with args. ++set dummy cc; ac_word=$2 ++echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_prog_ac_ct_CC="cc" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++ ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6 ++else ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++fi ++ ++ CC=$ac_ct_CC ++else ++ CC="$ac_cv_prog_CC" ++fi ++ ++fi + if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 +-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:632: checking for $ac_word" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_prog_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_prog_rejected=no +- ac_dummy="$PATH" +- for ac_dir in $ac_dummy; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then +- ac_prog_rejected=yes +- continue +- fi +- ac_cv_prog_CC="cc" +- break +- fi +- done +- IFS="$ac_save_ifs" ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ++ ac_prog_rejected=yes ++ continue ++ fi ++ ac_cv_prog_CC="cc" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++ + if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift +- if test $# -gt 0; then ++ if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift +- set dummy "$ac_dir/$ac_word" "$@" +- shift +- ac_cv_prog_CC="$@" ++ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi + fi + fi + fi +-CC="$ac_cv_prog_CC" ++CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$ac_t""$CC" 1>&6 ++ echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6 + else +- echo "$ac_t""no" 1>&6 ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 + fi + +- if test -z "$CC"; then +- case "`uname -s`" in +- *win32* | *WIN32*) +- # Extract the first word of "cl", so it can be a program name with args. +-set dummy cl; ac_word=$2 +-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:683: checking for $ac_word" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++fi ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in cl ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_prog_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +- ac_dummy="$PATH" +- for ac_dir in $ac_dummy; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- ac_cv_prog_CC="cl" +- break +- fi +- done +- IFS="$ac_save_ifs" ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_prog_CC="$ac_tool_prefix$ac_prog" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++ + fi + fi +-CC="$ac_cv_prog_CC" ++CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$ac_t""$CC" 1>&6 ++ echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6 + else +- echo "$ac_t""no" 1>&6 ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 + fi +- ;; +- esac ++ ++ test -n "$CC" && break ++ done ++fi ++if test -z "$CC"; then ++ ac_ct_CC=$CC ++ for ac_prog in cl ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_prog_ac_ct_CC="$ac_prog" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 + fi +- test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } ++done ++done ++ ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6 ++else ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 + fi + +-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:715: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++ test -n "$ac_ct_CC" && break ++done + +-ac_ext=c +-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +-cross_compiling=$ac_cv_prog_cc_cross ++ CC=$ac_ct_CC ++fi + +-cat > conftest.$ac_ext << EOF ++fi + +-#line 726 "configure" +-#include "confdefs.h" + +-main(){return(0);} +-EOF +-if { (eval echo configure:731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- ac_cv_prog_cc_works=yes +- # If we can't run a trivial program, we are probably using a cross compiler. +- if (./conftest; exit) 2>/dev/null; then +- ac_cv_prog_cc_cross=no ++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH ++See \`config.log' for more details." >&5 ++echo "$as_me: error: no acceptable C compiler found in \$PATH ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++ ++# Provide some information about the compiler. ++echo "$as_me:$LINENO:" \ ++ "checking for C compiler version" >&5 ++ac_compiler=`set X $ac_compile; echo $2` ++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 ++ (eval $ac_compiler --version </dev/null >&5) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 ++ (eval $ac_compiler -v </dev/null >&5) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 ++ (eval $ac_compiler -V </dev/null >&5) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++ ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++ac_clean_files_save=$ac_clean_files ++ac_clean_files="$ac_clean_files a.out a.exe b.out" ++# Try to create an executable without -o first, disregard a.out. ++# It will help us diagnose broken compilers, and finding out an intuition ++# of exeext. ++echo "$as_me:$LINENO: checking for C compiler default output" >&5 ++echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ++ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` ++if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 ++ (eval $ac_link_default) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ # Find the output, starting from the most likely. This scheme is ++# not robust to junk in `.', hence go to wildcards (a.*) only as a last ++# resort. ++ ++# Be careful to initialize this variable, since it used to be cached. ++# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. ++ac_cv_exeext= ++# b.out is created by i960 compilers. ++for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out ++do ++ test -f "$ac_file" || continue ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ++ ;; ++ conftest.$ac_ext ) ++ # This is the source file. ++ ;; ++ [ab].out ) ++ # We found the default executable, but exeext='' is most ++ # certainly right. ++ break;; ++ *.* ) ++ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ++ # FIXME: I believe we export ac_cv_exeext for Libtool, ++ # but it would be cool to find out if it's true. Does anybody ++ # maintain Libtool? --akim. ++ export ac_cv_exeext ++ break;; ++ * ) ++ break;; ++ esac ++done ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++{ { echo "$as_me:$LINENO: error: C compiler cannot create executables ++See \`config.log' for more details." >&5 ++echo "$as_me: error: C compiler cannot create executables ++See \`config.log' for more details." >&2;} ++ { (exit 77); exit 77; }; } ++fi ++ ++ac_exeext=$ac_cv_exeext ++echo "$as_me:$LINENO: result: $ac_file" >&5 ++echo "${ECHO_T}$ac_file" >&6 ++ ++# Check the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++echo "$as_me:$LINENO: checking whether the C compiler works" >&5 ++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 ++# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 ++# If not cross compiling, check that we can run a simple program. ++if test "$cross_compiling" != yes; then ++ if { ac_try='./$ac_file' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cross_compiling=no + else +- ac_cv_prog_cc_cross=yes ++ if test "$cross_compiling" = maybe; then ++ cross_compiling=yes ++ else ++ { { echo "$as_me:$LINENO: error: cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details." >&5 ++echo "$as_me: error: cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++ fi + fi +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- ac_cv_prog_cc_works=no + fi +-rm -fr conftest* +-ac_ext=c +-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +-cross_compiling=$ac_cv_prog_cc_cross ++echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6 + +-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 +-if test $ac_cv_prog_cc_works = no; then +- { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } ++rm -f a.out a.exe conftest$ac_cv_exeext b.out ++ac_clean_files=$ac_clean_files_save ++# Check the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 ++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 ++echo "$as_me:$LINENO: result: $cross_compiling" >&5 ++echo "${ECHO_T}$cross_compiling" >&6 ++ ++echo "$as_me:$LINENO: checking for suffix of executables" >&5 ++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ # If both `conftest.exe' and `conftest' are `present' (well, observable) ++# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will ++# work properly (i.e., refer to `conftest.exe'), while it won't with ++# `rm'. ++for ac_file in conftest.exe conftest conftest.*; do ++ test -f "$ac_file" || continue ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; ++ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ++ export ac_cv_exeext ++ break;; ++ * ) break;; ++ esac ++done ++else ++ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details." >&5 ++echo "$as_me: error: cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } + fi +-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:757: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 +-cross_compiling=$ac_cv_prog_cc_cross + +-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +-echo "configure:762: checking whether we are using GNU C" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++rm -f conftest$ac_cv_exeext ++echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 ++echo "${ECHO_T}$ac_cv_exeext" >&6 ++ ++rm -f conftest.$ac_ext ++EXEEXT=$ac_cv_exeext ++ac_exeext=$EXEEXT ++echo "$as_me:$LINENO: checking for suffix of object files" >&5 ++echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 ++if test "${ac_cv_objext+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftest.c <<EOF +-#ifdef __GNUC__ +- yes; +-#endif +-EOF +-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:771: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +- ac_cv_prog_gcc=yes ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.o conftest.obj ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; ++ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` ++ break;; ++ esac ++done + else +- ac_cv_prog_gcc=no ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile ++See \`config.log' for more details." >&5 ++echo "$as_me: error: cannot compute suffix of object files: cannot compile ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } + fi ++ ++rm -f conftest.$ac_cv_objext conftest.$ac_ext + fi ++echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 ++echo "${ECHO_T}$ac_cv_objext" >&6 ++OBJEXT=$ac_cv_objext ++ac_objext=$OBJEXT ++echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 ++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 ++if test "${ac_cv_c_compiler_gnu+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + +-echo "$ac_t""$ac_cv_prog_gcc" 1>&6 ++int ++main () ++{ ++#ifndef __GNUC__ ++ choke me ++#endif + +-if test $ac_cv_prog_gcc = yes; then +- GCC=yes ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_compiler_gnu=yes + else +- GCC= ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_compiler_gnu=no + fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ac_cv_c_compiler_gnu=$ac_compiler_gnu + +-ac_test_CFLAGS="${CFLAGS+set}" +-ac_save_CFLAGS="$CFLAGS" +-CFLAGS= +-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +-echo "configure:790: checking whether ${CC-cc} accepts -g" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++fi ++echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 ++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 ++GCC=`test $ac_compiler_gnu = yes && echo yes` ++ac_test_CFLAGS=${CFLAGS+set} ++ac_save_CFLAGS=$CFLAGS ++CFLAGS="-g" ++echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 ++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 ++if test "${ac_cv_prog_cc_g+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- echo 'void f(){}' > conftest.c +-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + ac_cv_prog_cc_g=yes + else +- ac_cv_prog_cc_g=no +-fi +-rm -f conftest* ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++ac_cv_prog_cc_g=no + fi +- +-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 + if test "$ac_test_CFLAGS" = set; then +- CFLAGS="$ac_save_CFLAGS" ++ CFLAGS=$ac_save_CFLAGS + elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" +@@ -816,86 +1943,482 @@ + CFLAGS= + fi + fi ++echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 ++echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 ++if test "${ac_cv_prog_cc_stdc+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_prog_cc_stdc=no ++ac_save_CC=$CC ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#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; ++int ++main () ++{ ++return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; ++ ; ++ return 0; ++} ++_ACEOF ++# 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 10.20 and later -Ae ++# HP-UX older versions -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" ++ rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_prog_cc_stdc=$ac_arg ++break ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +-echo "configure:822: checking how to run the C preprocessor" >&5 ++fi ++rm -f conftest.$ac_objext ++done ++rm -f conftest.$ac_ext conftest.$ac_objext ++CC=$ac_save_CC ++ ++fi ++ ++case "x$ac_cv_prog_cc_stdc" in ++ x|xno) ++ echo "$as_me:$LINENO: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6 ;; ++ *) ++ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 ++ CC="$CC $ac_cv_prog_cc_stdc" ;; ++esac ++ ++# Some people use a C++ compiler to compile C. Since we use `exit', ++# in C++ we need to declare it. In case someone uses the same compiler ++# for both compiling C and C++ we need to have the C++ compiler decide ++# the declaration of exit, since it's the most demanding environment. ++cat >conftest.$ac_ext <<_ACEOF ++#ifndef __cplusplus ++ choke me ++#endif ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ for ac_declaration in \ ++ ''\ ++ '#include <stdlib.h>' \ ++ 'extern "C" void std::exit (int) throw (); using std::exit;' \ ++ 'extern "C" void std::exit (int); using std::exit;' \ ++ 'extern "C" void exit (int) throw ();' \ ++ 'extern "C" void exit (int);' \ ++ 'void exit (int);' ++do ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <stdlib.h> ++$ac_declaration ++int ++main () ++{ ++exit (42); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ : ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++continue ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_declaration ++int ++main () ++{ ++exit (42); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ break ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++done ++rm -f conftest* ++if test -n "$ac_declaration"; then ++ echo '#ifdef __cplusplus' >>confdefs.h ++ echo $ac_declaration >>confdefs.h ++ echo '#endif' >>confdefs.h ++fi ++ ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 ++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= + fi + if test -z "$CPP"; then +-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ if test "${ac_cv_prog_CPP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- # This must be in double quotes, not single quotes, because CPP may get +- # substituted into the Makefile and "${CC-cc}" will confuse make. +- CPP="${CC-cc} -E" ++ # Double quotes because CPP needs to be expanded ++ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" ++ do ++ ac_preproc_ok=false ++for ac_c_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ # <limits.h> exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, +- # not just through cpp. +- cat > conftest.$ac_ext <<EOF +-#line 837 "configure" +-#include "confdefs.h" +-#include <assert.h> +-Syntax Error +-EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +-if test -z "$ac_err"; then +- : ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++ Syntax error ++_ACEOF ++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ else ++ ac_cpp_err= ++ fi + else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- CPP="${CC-cc} -E -traditional-cpp" +- cat > conftest.$ac_ext <<EOF +-#line 854 "configure" +-#include "confdefs.h" +-#include <assert.h> +-Syntax Error +-EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +-if test -z "$ac_err"; then ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then + : + else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- CPP="${CC-cc} -nologo -E" +- cat > conftest.$ac_ext <<EOF +-#line 871 "configure" +-#include "confdefs.h" +-#include <assert.h> +-Syntax Error +-EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:877: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +-if test -z "$ac_err"; then +- : ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ # Broken: fails on valid input. ++continue ++fi ++rm -f conftest.err conftest.$ac_ext ++ ++ # OK, works on sane cases. Now check whether non-existent headers ++ # can be detected and how. ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <ac_nonexistent.h> ++_ACEOF ++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ else ++ ac_cpp_err= ++ fi + else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- CPP=/lib/cpp ++ ac_cpp_err=yes + fi +-rm -f conftest* ++if test -z "$ac_cpp_err"; then ++ # Broken: success on invalid input. ++continue ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ # Passes both tests. ++ac_preproc_ok=: ++break + fi +-rm -f conftest* ++rm -f conftest.err conftest.$ac_ext ++ ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then ++ break + fi +-rm -f conftest* +- ac_cv_prog_CPP="$CPP" ++ ++ done ++ ac_cv_prog_CPP=$CPP ++ + fi +- CPP="$ac_cv_prog_CPP" ++ CPP=$ac_cv_prog_CPP + else +- ac_cv_prog_CPP="$CPP" ++ ac_cv_prog_CPP=$CPP + fi +-echo "$ac_t""$CPP" 1>&6 ++echo "$as_me:$LINENO: result: $CPP" >&5 ++echo "${ECHO_T}$CPP" >&6 ++ac_preproc_ok=false ++for ac_c_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ # <limits.h> exists even on freestanding compilers. ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++ Syntax error ++_ACEOF ++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ : ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ # Broken: fails on valid input. ++continue ++fi ++rm -f conftest.err conftest.$ac_ext ++ ++ # OK, works on sane cases. Now check whether non-existent headers ++ # can be detected and how. ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <ac_nonexistent.h> ++_ACEOF ++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ # Broken: success on invalid input. ++continue ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ # Passes both tests. ++ac_preproc_ok=: ++break ++fi ++rm -f conftest.err conftest.$ac_ext ++ ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then ++ : ++else ++ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details." >&5 ++echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ac_aux_dir= ++for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do ++ if test -f $ac_dir/install-sh; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/install-sh -c" ++ break ++ elif test -f $ac_dir/install.sh; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/install.sh -c" ++ break ++ elif test -f $ac_dir/shtool; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/shtool install -c" ++ break ++ fi ++done ++if test -z "$ac_aux_dir"; then ++ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 ++echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ac_config_guess="$SHELL $ac_aux_dir/config.guess" ++ac_config_sub="$SHELL $ac_aux_dir/config.sub" ++ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. + + # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or +@@ -904,87 +2427,102 @@ + # SunOS /usr/etc/install + # IRIX /sbin/install + # AIX /bin/install ++# AmigaOS /C/install, which installs bootblocks on floppy discs + # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag + # AFS /usr/afsws/bin/install, which mishandles nonexistent args + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # ./install, which can be erroneously created by make from ./install.sh. +-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +-echo "configure:913: checking for a BSD compatible install" >&5 ++echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 ++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 + if test -z "$INSTALL"; then +-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++if test "${ac_cv_path_install+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" +- for ac_dir in $PATH; do +- # Account for people who put trailing slashes in PATH elements. +- case "$ac_dir/" in +- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; +- *) +- # OSF1 and SCO ODT 3.0 have their own names for install. +- # Don't use installbsd from OSF since it installs stuff as root +- # by default. +- for ac_prog in ginstall scoinst install; do +- if test -f $ac_dir/$ac_prog; then +- if test $ac_prog = install && +- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then +- # AIX install. It has an incompatible calling convention. +- : +- else +- ac_cv_path_install="$ac_dir/$ac_prog -c" +- break 2 +- fi +- fi ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ # Account for people who put trailing slashes in PATH elements. ++case $as_dir/ in ++ ./ | .// | /cC/* | \ ++ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ ++ /usr/ucb/* ) ;; ++ *) ++ # OSF1 and SCO ODT 3.0 have their own names for install. ++ # Don't use installbsd from OSF since it installs stuff as root ++ # by default. ++ for ac_prog in ginstall scoinst install; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then ++ if test $ac_prog = install && ++ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then ++ # AIX install. It has an incompatible calling convention. ++ : ++ elif test $ac_prog = install && ++ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then ++ # program-specific install script used by HP pwplus--don't use. ++ : ++ else ++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" ++ break 3 ++ fi ++ fi + done +- ;; +- esac +- done +- IFS="$ac_save_IFS" ++ done ++ ;; ++esac ++done ++ + + fi + if test "${ac_cv_path_install+set}" = set; then +- INSTALL="$ac_cv_path_install" ++ INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. We don't cache a + # path for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the path is relative. +- INSTALL="$ac_install_sh" ++ INSTALL=$ac_install_sh + fi + fi +-echo "$ac_t""$INSTALL" 1>&6 ++echo "$as_me:$LINENO: result: $INSTALL" >&5 ++echo "${ECHO_T}$INSTALL" >&6 + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. + # It thinks the first close brace ends the variable substitution. + test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' ++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 +-echo "configure:966: checking whether ${MAKE-make} sets \${MAKE}" >&5 +-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 ++set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` ++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftestmake <<\EOF ++ cat >conftest.make <<\_ACEOF + all: +- @echo 'ac_maketemp="${MAKE}"' +-EOF ++ @echo 'ac_maketemp="$(MAKE)"' ++_ACEOF + # GNU make sometimes prints "make[1]: Entering...", which would confuse us. +-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=` ++eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` + if test -n "$ac_maketemp"; then + eval ac_cv_prog_make_${ac_make}_set=yes + else + eval ac_cv_prog_make_${ac_make}_set=no + fi +-rm -f conftestmake ++rm -f conftest.make + fi + if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then +- echo "$ac_t""yes" 1>&6 ++ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6 + SET_MAKE= + else +- echo "$ac_t""no" 1>&6 ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 + SET_MAKE="MAKE=${MAKE-make}" + fi + +@@ -992,625 +2530,1355 @@ + # because <errno.h> reserves symbols starting with `E'. + # Extract the first word of "ed", so it can be a program name with args. + set dummy ed; ac_word=$2 +-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:997: checking for $ac_word" >&5 +-if eval "test \"`echo '$''{'ac_cv_path_ed_PROGRAM'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_path_ed_PROGRAM+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- case "$ed_PROGRAM" in +- /*) ++ case $ed_PROGRAM in ++ [\\/]* | ?:[\\/]*) + ac_cv_path_ed_PROGRAM="$ed_PROGRAM" # Let the user override the test with a path. + ;; +- ?:/*) +- ac_cv_path_ed_PROGRAM="$ed_PROGRAM" # Let the user override the test with a dos path. +- ;; + *) +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +- ac_dummy="$PATH" +- for ac_dir in $ac_dummy; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- ac_cv_path_ed_PROGRAM="$ac_dir/$ac_word" +- break +- fi +- done +- IFS="$ac_save_ifs" ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_path_ed_PROGRAM="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++ + test -z "$ac_cv_path_ed_PROGRAM" && ac_cv_path_ed_PROGRAM="ed" + ;; + esac + fi +-ed_PROGRAM="$ac_cv_path_ed_PROGRAM" ++ed_PROGRAM=$ac_cv_path_ed_PROGRAM ++ + if test -n "$ed_PROGRAM"; then +- echo "$ac_t""$ed_PROGRAM" 1>&6 ++ echo "$as_me:$LINENO: result: $ed_PROGRAM" >&5 ++echo "${ECHO_T}$ed_PROGRAM" >&6 + else +- echo "$ac_t""no" 1>&6 ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 + fi + + +-echo $ac_n "checking build system type""... $ac_c" 1>&6 +-echo "configure:1032: checking build system type" >&5 + +-build_alias=$build +-case "$build_alias" in +-NONE) +- case $nonopt in +- NONE) build_alias=$host_alias ;; +- *) build_alias=$nonopt ;; +- esac ;; +-esac ++cat >>confdefs.h <<\_ACEOF ++#define _GNU_SOURCE 1 ++_ACEOF + +-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` +-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +-echo "$ac_t""$build" 1>&6 + +-if test $host != $build; then +- ac_tool_prefix=${host_alias}- +-else +- ac_tool_prefix= +-fi + + +- # Check whether --enable-largefile or --disable-largefile was given. +-if test "${enable_largefile+set}" = set; then +- enableval="$enable_largefile" +- : +-fi +- +- if test "$enable_largefile" != no; then +- # Extract the first word of "${ac_tool_prefix}getconf", so it can be a program name with args. +-set dummy ${ac_tool_prefix}getconf; ac_word=$2 +-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1066: checking for $ac_word" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_GETCONF'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- if test -n "$GETCONF"; then +- ac_cv_prog_GETCONF="$GETCONF" # Let the user override the test. ++echo "$as_me:$LINENO: checking for egrep" >&5 ++echo $ECHO_N "checking for egrep... $ECHO_C" >&6 ++if test "${ac_cv_prog_egrep+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +- ac_dummy="$PATH" +- for ac_dir in $ac_dummy; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- ac_cv_prog_GETCONF="${ac_tool_prefix}getconf" +- break ++ if echo a | (grep -E '(a|b)') >/dev/null 2>&1 ++ then ac_cv_prog_egrep='grep -E' ++ else ac_cv_prog_egrep='egrep' + fi +- done +- IFS="$ac_save_ifs" +- test -z "$ac_cv_prog_GETCONF" && ac_cv_prog_GETCONF="getconf" + fi +-fi +-GETCONF="$ac_cv_prog_GETCONF" +-if test -n "$GETCONF"; then +- echo "$ac_t""$GETCONF" 1>&6 ++echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 ++echo "${ECHO_T}$ac_cv_prog_egrep" >&6 ++ EGREP=$ac_cv_prog_egrep ++ ++ ++ ++echo "$as_me:$LINENO: checking for AIX" >&5 ++echo $ECHO_N "checking for AIX... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#ifdef _AIX ++ yes ++#endif ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "yes" >/dev/null 2>&1; then ++ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6 ++cat >>confdefs.h <<\_ACEOF ++#define _ALL_SOURCE 1 ++_ACEOF ++ + else +- echo "$ac_t""no" 1>&6 ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 + fi ++rm -f conftest* + + ++echo "$as_me:$LINENO: checking for ANSI C header files" >&5 ++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 ++if test "${ac_cv_header_stdc+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <stdlib.h> ++#include <stdarg.h> ++#include <string.h> ++#include <float.h> + +- echo $ac_n "checking for CFLAGS value to request large file support""... $ac_c" 1>&6 +-echo "configure:1096: checking for CFLAGS value to request large file support" >&5 +-if eval "test \"`echo '$''{'ac_cv_sys_largefile_CFLAGS'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_header_stdc=yes + else +- ac_cv_sys_largefile_CFLAGS=`($GETCONF LFS_CFLAGS) 2>/dev/null` || { +- ac_cv_sys_largefile_CFLAGS=no +- case "$host_os" in +- # IRIX 6.2 and later require cc -n32. +- irix6.[2-9]* | irix6.1[0-9]* | irix[7-9].* | irix[1-9][0-9]*) +- if test "$GCC" != yes; then +- ac_cv_sys_largefile_CFLAGS=-n32 +- fi +- ac_save_CC="$CC" +- CC="$CC $ac_cv_sys_largefile_CFLAGS" +- cat > conftest.$ac_ext <<EOF +-#line 1111 "configure" +-#include "confdefs.h" ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-int main() { ++ac_cv_header_stdc=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext + +-; return 0; } +-EOF +-if { (eval echo configure:1118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if test $ac_cv_header_stdc = yes; then ++ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <string.h> ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "memchr" >/dev/null 2>&1; then + : + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- ac_cv_sys_largefile_CFLAGS=no ++ ac_cv_header_stdc=no + fi + rm -f conftest* +- CC="$ac_save_CC" +- esac +- } ++ + fi + +-echo "$ac_t""$ac_cv_sys_largefile_CFLAGS" 1>&6 +- echo $ac_n "checking for LDFLAGS value to request large file support""... $ac_c" 1>&6 +-echo "configure:1134: checking for LDFLAGS value to request large file support" >&5 +-if eval "test \"`echo '$''{'ac_cv_sys_largefile_LDFLAGS'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++if test $ac_cv_header_stdc = yes; then ++ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <stdlib.h> ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "free" >/dev/null 2>&1; then ++ : + else +- ac_cv_sys_largefile_LDFLAGS=`($GETCONF LFS_LDFLAGS) 2>/dev/null` || { +- ac_cv_sys_largefile_LDFLAGS=no +- +- } ++ ac_cv_header_stdc=no + fi ++rm -f conftest* + +-echo "$ac_t""$ac_cv_sys_largefile_LDFLAGS" 1>&6 +- echo $ac_n "checking for LIBS value to request large file support""... $ac_c" 1>&6 +-echo "configure:1146: checking for LIBS value to request large file support" >&5 +-if eval "test \"`echo '$''{'ac_cv_sys_largefile_LIBS'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_cv_sys_largefile_LIBS=`($GETCONF LFS_LIBS) 2>/dev/null` || { +- ac_cv_sys_largefile_LIBS=no +- +- } + fi + +-echo "$ac_t""$ac_cv_sys_largefile_LIBS" 1>&6 ++if test $ac_cv_header_stdc = yes; then ++ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. ++ if test "$cross_compiling" = yes; then ++ : ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <ctype.h> ++#if ((' ' & 0x0FF) == 0x020) ++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') ++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) ++#else ++# define ISLOWER(c) \ ++ (('a' <= (c) && (c) <= 'i') \ ++ || ('j' <= (c) && (c) <= 'r') \ ++ || ('s' <= (c) && (c) <= 'z')) ++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) ++#endif + +- 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?*) +- case "$ac_flag" in +- no) ;; +- ?*) +- case "$CPPFLAGS" in +- '') CPPFLAGS="$ac_flag" ;; +- *) CPPFLAGS=$CPPFLAGS' '"$ac_flag" ;; +- esac ;; +- esac ;; +- *) +- case "$ac_flag" in +- no) ;; +- ?*) +- case "$CFLAGS" in +- '') CFLAGS="$ac_flag" ;; +- *) CFLAGS=$CFLAGS' '"$ac_flag" ;; +- esac ;; +- esac ;; +- esac +- done +- case "$ac_cv_sys_largefile_LDFLAGS" in +- no) ;; +- ?*) +- case "$LDFLAGS" in +- '') LDFLAGS="$ac_cv_sys_largefile_LDFLAGS" ;; +- *) LDFLAGS=$LDFLAGS' '"$ac_cv_sys_largefile_LDFLAGS" ;; +- esac ;; +- esac +- case "$ac_cv_sys_largefile_LIBS" in +- no) ;; +- ?*) +- case "$LIBS" in +- '') LIBS="$ac_cv_sys_largefile_LIBS" ;; +- *) LIBS=$LIBS' '"$ac_cv_sys_largefile_LIBS" ;; +- esac ;; +- esac +- echo $ac_n "checking for _FILE_OFFSET_BITS""... $ac_c" 1>&6 +-echo "configure:1201: checking for _FILE_OFFSET_BITS" >&5 +-if eval "test \"`echo '$''{'ac_cv_sys_file_offset_bits'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) ++int ++main () ++{ ++ int i; ++ for (i = 0; i < 256; i++) ++ if (XOR (islower (i), ISLOWER (i)) ++ || toupper (i) != TOUPPER (i)) ++ exit(2); ++ exit (0); ++} ++_ACEOF ++rm -f conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ : + else +- ac_cv_sys_file_offset_bits=no +- 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 +- for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do +- case "$ac_flag" in +- -D_FILE_OFFSET_BITS) +- ac_cv_sys_file_offset_bits=1 ;; +- -D_FILE_OFFSET_BITS=*) +- ac_cv_sys_file_offset_bits=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;; +- esac +- done +- ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++ac_cv_header_stdc=no + fi ++rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++fi ++fi ++echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 ++echo "${ECHO_T}$ac_cv_header_stdc" >&6 ++if test $ac_cv_header_stdc = yes; then + +-echo "$ac_t""$ac_cv_sys_file_offset_bits" 1>&6 +- if test "$ac_cv_sys_file_offset_bits" != no; then +- cat >> confdefs.h <<EOF +-#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits +-EOF ++cat >>confdefs.h <<\_ACEOF ++#define STDC_HEADERS 1 ++_ACEOF + +- fi +- echo $ac_n "checking for _LARGEFILE_SOURCE""... $ac_c" 1>&6 +-echo "configure:1230: checking for _LARGEFILE_SOURCE" >&5 +-if eval "test \"`echo '$''{'ac_cv_sys_largefile_source'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_cv_sys_largefile_source=no +- 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 +- for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do +- case "$ac_flag" in +- -D_LARGEFILE_SOURCE) +- ac_cv_sys_largefile_source=1 ;; +- -D_LARGEFILE_SOURCE=*) +- ac_cv_sys_largefile_source=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;; +- esac +- done +- + fi + +-echo "$ac_t""$ac_cv_sys_largefile_source" 1>&6 +- if test "$ac_cv_sys_largefile_source" != no; then +- cat >> confdefs.h <<EOF +-#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source +-EOF ++# On IRIX 5.3, sys/types and inttypes.h are conflicting. ++ + +- fi +- echo $ac_n "checking for _LARGE_FILES""... $ac_c" 1>&6 +-echo "configure:1259: checking for _LARGE_FILES" >&5 +-if eval "test \"`echo '$''{'ac_cv_sys_large_files'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_cv_sys_large_files=no +- 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 +- for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do +- case "$ac_flag" in +- -D_LARGE_FILES) +- ac_cv_sys_large_files=1 ;; +- -D_LARGE_FILES=*) +- ac_cv_sys_large_files=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;; +- esac +- done +- +-fi + +-echo "$ac_t""$ac_cv_sys_large_files" 1>&6 +- if test "$ac_cv_sys_large_files" != no; then +- cat >> confdefs.h <<EOF +-#define _LARGE_FILES $ac_cv_sys_large_files +-EOF + +- fi +- fi +- + +-echo $ac_n "checking for AIX""... $ac_c" 1>&6 +-echo "configure:1291: checking for AIX" >&5 +-cat > conftest.$ac_ext <<EOF +-#line 1293 "configure" +-#include "confdefs.h" +-#ifdef _AIX +- yes +-#endif + +-EOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- egrep "yes" >/dev/null 2>&1; then +- rm -rf conftest* +- echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF +-#define _ALL_SOURCE 1 +-EOF + ++ ++ ++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ ++ inttypes.h stdint.h unistd.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- rm -rf conftest* +- echo "$ac_t""no" 1>&6 ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++ ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_Header=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++eval "$as_ac_Header=no" + fi +-rm -f conftest* ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF + ++fi + +-ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 +-echo "configure:1316: checking for minix/config.h" >&5 +-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++done ++ ++ ++if test "${ac_cv_header_minix_config_h+set}" = set; then ++ echo "$as_me:$LINENO: checking for minix/config.h" >&5 ++echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6 ++if test "${ac_cv_header_minix_config_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5 ++echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6 + else +- cat > conftest.$ac_ext <<EOF +-#line 1321 "configure" +-#include "confdefs.h" ++ # Is the header compilable? ++echo "$as_me:$LINENO: checking minix/config.h usability" >&5 ++echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default + #include <minix/config.h> +-EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1326: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +-if test -z "$ac_err"; then +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=yes" ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes + else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_header_compiler=no + fi +-rm -f conftest* ++rm -f conftest.$ac_objext conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++# Is the header present? ++echo "$as_me:$LINENO: checking minix/config.h presence" >&5 ++echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <minix/config.h> ++_ACEOF ++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes + fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++rm -f conftest.err conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6 ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc in ++ yes:no ) ++ { echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++ no:yes ) ++ { echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++echo "$as_me:$LINENO: checking for minix/config.h" >&5 ++echo $ECHO_N "checking for minix/config.h... $ECHO_C" >&6 ++if test "${ac_cv_header_minix_config_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_header_minix_config_h=$ac_header_preproc ++fi ++echo "$as_me:$LINENO: result: $ac_cv_header_minix_config_h" >&5 ++echo "${ECHO_T}$ac_cv_header_minix_config_h" >&6 ++ ++fi ++if test $ac_cv_header_minix_config_h = yes; then + MINIX=yes + else +- echo "$ac_t""no" 1>&6 +-MINIX= ++ MINIX= + fi + ++ + if test "$MINIX" = yes; then +- cat >> confdefs.h <<\EOF ++ ++cat >>confdefs.h <<\_ACEOF + #define _POSIX_SOURCE 1 +-EOF ++_ACEOF + +- cat >> confdefs.h <<\EOF ++ ++cat >>confdefs.h <<\_ACEOF + #define _POSIX_1_SOURCE 2 +-EOF ++_ACEOF + +- cat >> confdefs.h <<\EOF ++ ++cat >>confdefs.h <<\_ACEOF + #define _MINIX 1 +-EOF ++_ACEOF + + fi + +-echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 +-echo "configure:1364: checking for POSIXized ISC" >&5 +-if test -d /etc/conf/kconfig.d && +- grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 +-then +- echo "$ac_t""yes" 1>&6 +- ISC=yes # If later tests want to check for ISC. +- cat >> confdefs.h <<\EOF +-#define _POSIX_SOURCE 1 +-EOF + +- if test "$GCC" = yes; then +- CC="$CC -posix" +- else +- CC="$CC -Xp" +- fi ++echo "$as_me:$LINENO: checking for library containing strerror" >&5 ++echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6 ++if test "${ac_cv_search_strerror+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- echo "$ac_t""no" 1>&6 +- ISC= +-fi ++ ac_func_search_save_LIBS=$LIBS ++ac_cv_search_strerror=no ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + +-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 +-echo "configure:1385: checking for Cygwin environment" >&5 +-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char strerror (); ++int ++main () ++{ ++strerror (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_search_strerror="none required" + else +- cat > conftest.$ac_ext <<EOF +-#line 1390 "configure" +-#include "confdefs.h" ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-int main() { ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++if test "$ac_cv_search_strerror" = no; then ++ for ac_lib in cposix; do ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + +-#ifndef __CYGWIN__ +-#define __CYGWIN__ __CYGWIN32__ ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" + #endif +-return __CYGWIN__; +-; return 0; } +-EOF +-if { (eval echo configure:1401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- ac_cv_cygwin=yes ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char strerror (); ++int ++main () ++{ ++strerror (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_search_strerror="-l$ac_lib" ++break + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- ac_cv_cygwin=no ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ + fi +-rm -f conftest* +-rm -f conftest* ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++ done + fi ++LIBS=$ac_func_search_save_LIBS ++fi ++echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 ++echo "${ECHO_T}$ac_cv_search_strerror" >&6 ++if test "$ac_cv_search_strerror" != no; then ++ test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS" + +-echo "$ac_t""$ac_cv_cygwin" 1>&6 +-CYGWIN= +-test "$ac_cv_cygwin" = yes && CYGWIN=yes +-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 +-echo "configure:1418: checking for mingw32 environment" >&5 +-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++fi ++ ++# Check whether --enable-largefile or --disable-largefile was given. ++if test "${enable_largefile+set}" = set; then ++ enableval="$enable_largefile" ++ ++fi; ++if test "$enable_largefile" != no; then ++ ++ echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 ++echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 ++if test "${ac_cv_sys_largefile_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftest.$ac_ext <<EOF +-#line 1423 "configure" +-#include "confdefs.h" ++ ac_cv_sys_largefile_CC=no ++ if test "$GCC" != yes; then ++ ac_save_CC=$CC ++ while :; do ++ # IRIX 6.2 and later do not support large files by default, ++ # so use the C compiler's -n32 option if that helps. ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <sys/types.h> ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]; ++int ++main () ++{ + +-int main() { +-return __MINGW32__; +-; return 0; } +-EOF +-if { (eval echo configure:1430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- ac_cv_mingw32=yes ++ ; ++ return 0; ++} ++_ACEOF ++ rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ break + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- ac_cv_mingw32=no ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++fi ++rm -f conftest.$ac_objext ++ CC="$CC -n32" ++ rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_sys_largefile_CC=' -n32'; break ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++fi ++rm -f conftest.$ac_objext ++ break ++ done ++ CC=$ac_save_CC ++ rm -f conftest.$ac_ext ++ fi ++fi ++echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 ++echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 ++ if test "$ac_cv_sys_largefile_CC" != no; then ++ CC=$CC$ac_cv_sys_largefile_CC ++ fi ++ ++ echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 ++echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 ++if test "${ac_cv_sys_file_offset_bits+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ while :; do ++ ac_cv_sys_file_offset_bits=no ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <sys/types.h> ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]; ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ break ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#define _FILE_OFFSET_BITS 64 ++#include <sys/types.h> ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]; ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_sys_file_offset_bits=64; break ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ break ++done ++fi ++echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 ++echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 ++if test "$ac_cv_sys_file_offset_bits" != no; then ++ ++cat >>confdefs.h <<_ACEOF ++#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits ++_ACEOF ++ + fi + rm -f conftest* ++ echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 ++echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 ++if test "${ac_cv_sys_large_files+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ while :; do ++ ac_cv_sys_large_files=no ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <sys/types.h> ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]; ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ break ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#define _LARGE_FILES 1 ++#include <sys/types.h> ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]; ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_sys_large_files=1; break ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ break ++done ++fi ++echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 ++echo "${ECHO_T}$ac_cv_sys_large_files" >&6 ++if test "$ac_cv_sys_large_files" != no; then ++ ++cat >>confdefs.h <<_ACEOF ++#define _LARGE_FILES $ac_cv_sys_large_files ++_ACEOF ++ ++fi + rm -f conftest* + fi + +-echo "$ac_t""$ac_cv_mingw32" 1>&6 +-MINGW32= +-test "$ac_cv_mingw32" = yes && MINGW32=yes + + +-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 +-echo "configure:1449: checking for executable suffix" >&5 +-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++echo "$as_me:$LINENO: checking for function prototypes" >&5 ++echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6 ++if test "$ac_cv_prog_cc_stdc" != no; then ++ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6 ++ ++cat >>confdefs.h <<\_ACEOF ++#define PROTOTYPES 1 ++_ACEOF ++ ++ ++cat >>confdefs.h <<\_ACEOF ++#define __PROTOTYPES 1 ++_ACEOF ++ + else +- if test "$CYGWIN" = yes || test "$MINGW32" = yes; then +- ac_cv_exeext=.exe ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 ++fi ++ ++echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 ++echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 ++if test "${ac_cv_c_const+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- rm -f conftest* +- echo 'int main () { return 0; }' > conftest.$ac_ext +- ac_cv_exeext= +- if { (eval echo configure:1459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +- for file in conftest.*; do +- case $file in +- *.c | *.o | *.obj) ;; +- *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; +- esac +- done +- else +- { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } +- fi +- rm -f conftest* +- test x"${ac_cv_exeext}" = x && ac_cv_exeext=no ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++/* FIXME: Include the comments suggested by Paul. */ ++#ifndef __cplusplus ++ /* Ultrix mips cc rejects this. */ ++ typedef int charset[2]; ++ const charset x; ++ /* SunOS 4.1.1 cc rejects this. */ ++ char const *const *ccp; ++ char **p; ++ /* NEC SVR4.0.2 mips cc rejects this. */ ++ struct point {int x, y;}; ++ static struct point const zero = {0,0}; ++ /* AIX XL C 1.02.0.0 rejects this. ++ It does not let you subtract one const X* pointer from another in ++ an arm of an if-expression whose if-part is not a constant ++ expression */ ++ const char *g = "string"; ++ ccp = &g + (g ? g-g : 0); ++ /* HPUX 7.0 cc rejects these. */ ++ ++ccp; ++ p = (char**) ccp; ++ ccp = (char const *const *) p; ++ { /* SCO 3.2v4 cc rejects this. */ ++ char *t; ++ char const *s = 0 ? (char *) 0 : (char const *) 0; ++ ++ *t++ = 0; ++ } ++ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ ++ int x[] = {25, 17}; ++ const int *foo = &x[0]; ++ ++foo; ++ } ++ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ ++ typedef const int *iptr; ++ iptr p = 0; ++ ++p; ++ } ++ { /* AIX XL C 1.02.0.0 rejects this saying ++ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ ++ struct s { int j; const int *ap[3]; }; ++ struct s *b; b->j = 5; ++ } ++ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ ++ const int foo = 10; ++ } ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_c_const=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_c_const=no + fi ++rm -f conftest.$ac_objext conftest.$ac_ext + fi ++echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 ++echo "${ECHO_T}$ac_cv_c_const" >&6 ++if test $ac_cv_c_const = no; then + +-EXEEXT="" +-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} +-echo "$ac_t""${ac_cv_exeext}" 1>&6 +-ac_exeext=$EXEEXT ++cat >>confdefs.h <<\_ACEOF ++#define const ++_ACEOF + ++fi + + + + +-echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 +-echo "configure:1484: checking for ${CC-cc} option to accept ANSI C" >&5 +-if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++ ++ ++ac_header_dirent=no ++for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do ++ as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` ++echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 ++echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- 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" +- cat > conftest.$ac_ext <<EOF +-#line 1500 "configure" +-#include "confdefs.h" +-#include <stdarg.h> +-#include <stdio.h> ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.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; ++#include <$ac_hdr> ++ ++int ++main () + { +- return p[i]; ++if ((DIR *) 0) ++return 0; ++ ; ++ return 0; + } +-static char *f (char * (*g) (char **, int), char **p, ...) ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_Header=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++eval "$as_ac_Header=no" ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 ++_ACEOF ++ ++ac_header_dirent=$ac_hdr; break ++fi ++ ++done ++# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. ++if test $ac_header_dirent = dirent.h; then ++ echo "$as_me:$LINENO: checking for library containing opendir" >&5 ++echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 ++if test "${ac_cv_search_opendir+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_func_search_save_LIBS=$LIBS ++ac_cv_search_opendir=no ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char opendir (); ++int ++main () + { +- char *s; +- va_list v; +- va_start (v,p); +- s = g (p, va_arg (v,int)); +- va_end (v); +- return s; ++opendir (); ++ ; ++ return 0; + } +-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; +- +-int main() { ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_search_opendir="none required" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++if test "$ac_cv_search_opendir" = no; then ++ for ac_lib in dir; do ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + +-; return 0; } +-EOF +-if { (eval echo configure:1537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- am_cv_prog_cc_stdc="$ac_arg"; break ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char opendir (); ++int ++main () ++{ ++opendir (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_search_opendir="-l$ac_lib" ++break + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ + fi +-rm -f conftest* +-done +-CC="$ac_save_CC" ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++ done ++fi ++LIBS=$ac_func_search_save_LIBS ++fi ++echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 ++echo "${ECHO_T}$ac_cv_search_opendir" >&6 ++if test "$ac_cv_search_opendir" != no; then ++ test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" + + fi + +-if test -z "$am_cv_prog_cc_stdc"; then +- echo "$ac_t""none needed" 1>&6 + else +- echo "$ac_t""$am_cv_prog_cc_stdc" 1>&6 ++ echo "$as_me:$LINENO: checking for library containing opendir" >&5 ++echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 ++if test "${ac_cv_search_opendir+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_func_search_save_LIBS=$LIBS ++ac_cv_search_opendir=no ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char opendir (); ++int ++main () ++{ ++opendir (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_search_opendir="none required" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ + fi +-case "x$am_cv_prog_cc_stdc" in +- x|xno) ;; +- *) CC="$CC $am_cv_prog_cc_stdc" ;; +-esac ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++if test "$ac_cv_search_opendir" = no; then ++ for ac_lib in x; do ++ LIBS="-l$ac_lib $ac_func_search_save_LIBS" ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char opendir (); ++int ++main () ++{ ++opendir (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_search_opendir="-l$ac_lib" ++break ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++ done ++fi ++LIBS=$ac_func_search_save_LIBS ++fi ++echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 ++echo "${ECHO_T}$ac_cv_search_opendir" >&6 ++if test "$ac_cv_search_opendir" != no; then ++ test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" + +-echo $ac_n "checking for function prototypes""... $ac_c" 1>&6 +-echo "configure:1563: checking for function prototypes" >&5 +-if test "$am_cv_prog_cc_stdc" != no; then +- echo "$ac_t""yes" 1>&6 +- cat >> confdefs.h <<\EOF +-#define PROTOTYPES 1 +-EOF ++fi + +- U= ANSI2KNR= +-else +- echo "$ac_t""no" 1>&6 +- U=_ ANSI2KNR=./ansi2knr +- # Ensure some checks needed by ansi2knr itself. +- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +-echo "configure:1576: checking for ANSI C header files" >&5 +-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++fi ++ ++echo "$as_me:$LINENO: checking for ANSI C header files" >&5 ++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 ++if test "${ac_cv_header_stdc+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftest.$ac_ext <<EOF +-#line 1581 "configure" +-#include "confdefs.h" ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include <stdlib.h> + #include <stdarg.h> + #include <string.h> + #include <float.h> +-EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +-if test -z "$ac_err"; then +- rm -rf conftest* ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + ac_cv_header_stdc=yes + else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- ac_cv_header_stdc=no ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_header_stdc=no + fi +-rm -f conftest* ++rm -f conftest.$ac_objext conftest.$ac_ext + + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +-cat > conftest.$ac_ext <<EOF +-#line 1606 "configure" +-#include "confdefs.h" ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include <string.h> +-EOF ++ ++_ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- egrep "memchr" >/dev/null 2>&1; then ++ $EGREP "memchr" >/dev/null 2>&1; then + : + else +- rm -rf conftest* + ac_cv_header_stdc=no + fi + rm -f conftest* +@@ -1619,16 +3887,20 @@ + + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +-cat > conftest.$ac_ext <<EOF +-#line 1624 "configure" +-#include "confdefs.h" ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include <stdlib.h> +-EOF ++ ++_ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- egrep "free" >/dev/null 2>&1; then ++ $EGREP "free" >/dev/null 2>&1; then + : + else +- rm -rf conftest* + ac_cv_header_stdc=no + fi + rm -f conftest* +@@ -1637,1179 +3909,6855 @@ + + if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +-if test "$cross_compiling" = yes; then ++ if test "$cross_compiling" = yes; then + : + else +- cat > conftest.$ac_ext <<EOF +-#line 1645 "configure" +-#include "confdefs.h" ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include <ctype.h> +-#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +-#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +-int main () { int i; for (i = 0; i < 256; i++) +-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); +-exit (0); } ++#if ((' ' & 0x0FF) == 0x020) ++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') ++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) ++#else ++# define ISLOWER(c) \ ++ (('a' <= (c) && (c) <= 'i') \ ++ || ('j' <= (c) && (c) <= 'r') \ ++ || ('s' <= (c) && (c) <= 'z')) ++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) ++#endif + +-EOF +-if { (eval echo configure:1656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then ++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) ++int ++main () ++{ ++ int i; ++ for (i = 0; i < 256; i++) ++ if (XOR (islower (i), ISLOWER (i)) ++ || toupper (i) != TOUPPER (i)) ++ exit(2); ++ exit (0); ++} ++_ACEOF ++rm -f conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + : + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- ac_cv_header_stdc=no ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++ac_cv_header_stdc=no + fi +-rm -fr conftest* ++rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi +- + fi + fi +- +-echo "$ac_t""$ac_cv_header_stdc" 1>&6 ++echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 ++echo "${ECHO_T}$ac_cv_header_stdc" >&6 + if test $ac_cv_header_stdc = yes; then +- cat >> confdefs.h <<\EOF ++ ++cat >>confdefs.h <<\_ACEOF + #define STDC_HEADERS 1 +-EOF ++_ACEOF + + fi + +- for ac_hdr in string.h ++ ++ ++ ++ ++ ++ ++for ac_header in fcntl.h limits.h string.h unistd.h utime.h varargs.h + do +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:1683: checking for $ac_hdr" >&5 +-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + else +- cat > conftest.$ac_ext <<EOF +-#line 1688 "configure" +-#include "confdefs.h" +-#include <$ac_hdr> +-EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1693: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +-if test -z "$ac_err"; then +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=yes" ++ # Is the header compilable? ++echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes + else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_header_compiler=no + fi +-rm -f conftest* ++rm -f conftest.$ac_objext conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++# Is the header present? ++echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes + fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <<EOF +-#define $ac_tr_hdr 1 +-EOF +- ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes + else +- echo "$ac_t""no" 1>&6 ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++rm -f conftest.err conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6 ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc in ++ yes:no ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++ no:yes ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=$ac_header_preproc" ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ + fi ++ + done + ++ ++echo "$as_me:$LINENO: checking for mode_t" >&5 ++echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 ++if test "${ac_cv_type_mode_t+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++if ((mode_t *) 0) ++ return 0; ++if (sizeof (mode_t)) ++ return 0; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_type_mode_t=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_type_mode_t=no + fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5 ++echo "${ECHO_T}$ac_cv_type_mode_t" >&6 ++if test $ac_cv_type_mode_t = yes; then ++ : ++else + +-echo $ac_n "checking for working const""... $ac_c" 1>&6 +-echo "configure:1722: checking for working const" >&5 +-if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++cat >>confdefs.h <<_ACEOF ++#define mode_t int ++_ACEOF ++ ++fi ++ ++echo "$as_me:$LINENO: checking for off_t" >&5 ++echo $ECHO_N "checking for off_t... $ECHO_C" >&6 ++if test "${ac_cv_type_off_t+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftest.$ac_ext <<EOF +-#line 1727 "configure" +-#include "confdefs.h" ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++if ((off_t *) 0) ++ return 0; ++if (sizeof (off_t)) ++ return 0; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_type_off_t=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-int main() { ++ac_cv_type_off_t=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 ++echo "${ECHO_T}$ac_cv_type_off_t" >&6 ++if test $ac_cv_type_off_t = yes; then ++ : ++else + +-/* Ultrix mips cc rejects this. */ +-typedef int charset[2]; const charset x; +-/* SunOS 4.1.1 cc rejects this. */ +-char const *const *ccp; +-char **p; +-/* NEC SVR4.0.2 mips cc rejects this. */ +-struct point {int x, y;}; +-static struct point const zero = {0,0}; +-/* AIX XL C 1.02.0.0 rejects this. +- It does not let you subtract one const X* pointer from another in an arm +- of an if-expression whose if-part is not a constant expression */ +-const char *g = "string"; +-ccp = &g + (g ? g-g : 0); +-/* HPUX 7.0 cc rejects these. */ +-++ccp; +-p = (char**) ccp; +-ccp = (char const *const *) p; +-{ /* SCO 3.2v4 cc rejects this. */ +- char *t; +- char const *s = 0 ? (char *) 0 : (char const *) 0; ++cat >>confdefs.h <<_ACEOF ++#define off_t long ++_ACEOF + +- *t++ = 0; ++fi ++ ++echo "$as_me:$LINENO: checking for pid_t" >&5 ++echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 ++if test "${ac_cv_type_pid_t+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++if ((pid_t *) 0) ++ return 0; ++if (sizeof (pid_t)) ++ return 0; ++ ; ++ return 0; + } +-{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ +- int x[] = {25, 17}; +- const int *foo = &x[0]; +- ++foo; ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_type_pid_t=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_type_pid_t=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 ++echo "${ECHO_T}$ac_cv_type_pid_t" >&6 ++if test $ac_cv_type_pid_t = yes; then ++ : ++else ++ ++cat >>confdefs.h <<_ACEOF ++#define pid_t int ++_ACEOF ++ ++fi ++ ++echo "$as_me:$LINENO: checking return type of signal handlers" >&5 ++echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 ++if test "${ac_cv_type_signal+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <sys/types.h> ++#include <signal.h> ++#ifdef signal ++# undef signal ++#endif ++#ifdef __cplusplus ++extern "C" void (*signal (int, void (*)(int)))(int); ++#else ++void (*signal ()) (); ++#endif ++ ++int ++main () ++{ ++int i; ++ ; ++ return 0; + } +-{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ +- typedef const int *iptr; +- iptr p = 0; +- ++p; ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_type_signal=void ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_type_signal=int ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 ++echo "${ECHO_T}$ac_cv_type_signal" >&6 ++ ++cat >>confdefs.h <<_ACEOF ++#define RETSIGTYPE $ac_cv_type_signal ++_ACEOF ++ ++ ++echo "$as_me:$LINENO: checking for size_t" >&5 ++echo $ECHO_N "checking for size_t... $ECHO_C" >&6 ++if test "${ac_cv_type_size_t+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++if ((size_t *) 0) ++ return 0; ++if (sizeof (size_t)) ++ return 0; ++ ; ++ return 0; + } +-{ /* AIX XL C 1.02.0.0 rejects this saying +- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ +- struct s { int j; const int *ap[3]; }; +- struct s *b; b->j = 5; ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_type_size_t=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_type_size_t=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 ++echo "${ECHO_T}$ac_cv_type_size_t" >&6 ++if test $ac_cv_type_size_t = yes; then ++ : ++else ++ ++cat >>confdefs.h <<_ACEOF ++#define size_t unsigned ++_ACEOF ++ ++fi ++ ++echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5 ++echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6 ++if test "${ac_cv_header_stdbool_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++ #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]; ++ ++int ++main () ++{ ++ return !a + !b + !c + !d + !e + !f + !g + !h + !i; ++ ; ++ return 0; + } +-{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ +- const int foo = 10; ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_header_stdbool_h=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_header_stdbool_h=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5 ++echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6 ++ echo "$as_me:$LINENO: checking for _Bool" >&5 ++echo $ECHO_N "checking for _Bool... $ECHO_C" >&6 ++if test "${ac_cv_type__Bool+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++if ((_Bool *) 0) ++ return 0; ++if (sizeof (_Bool)) ++ return 0; ++ ; ++ return 0; + } ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_type__Bool=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-; return 0; } +-EOF +-if { (eval echo configure:1776: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- ac_cv_c_const=yes ++ac_cv_type__Bool=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5 ++echo "${ECHO_T}$ac_cv_type__Bool" >&6 ++if test $ac_cv_type__Bool = yes; then ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE__BOOL 1 ++_ACEOF ++ ++ ++fi ++ ++ if test $ac_cv_header_stdbool_h = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_STDBOOL_H 1 ++_ACEOF ++ ++ fi ++ ++ ++ ++ # 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 ++ ++ ++ if test "$ac_cv_type__Bool" = yes; then ++ HAVE__BOOL=1 ++ else ++ HAVE__BOOL=0 ++ fi ++ ++ ++ ++ ++for ac_header in sys/time.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- ac_cv_c_const=no ++ # Is the header compilable? ++echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_header_compiler=no + fi +-rm -f conftest* ++rm -f conftest.$ac_objext conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++# Is the header present? ++echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes + fi ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-echo "$ac_t""$ac_cv_c_const" 1>&6 +-if test $ac_cv_c_const = no; then +- cat >> confdefs.h <<\EOF +-#define const +-EOF ++ ac_header_preproc=no ++fi ++rm -f conftest.err conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6 ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc in ++ yes:no ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++ no:yes ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=$ac_header_preproc" ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF + + fi + ++done + +-ac_header_dirent=no +-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h ++ ++ ++ ++for ac_header in utime.h + do +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 +-echo "configure:1802: checking for $ac_hdr that defines DIR" >&5 +-if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + else +- cat > conftest.$ac_ext <<EOF +-#line 1807 "configure" +-#include "confdefs.h" +-#include <sys/types.h> +-#include <$ac_hdr> +-int main() { +-DIR *dirp = 0; +-; return 0; } +-EOF +-if { (eval echo configure:1815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- eval "ac_cv_header_dirent_$ac_safe=yes" ++ # Is the header compilable? ++echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_dirent_$ac_safe=no" ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_header_compiler=no + fi +-rm -f conftest* ++rm -f conftest.$ac_objext conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++# Is the header present? ++echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes + fi +-if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <<EOF +-#define $ac_tr_hdr 1 +-EOF +- ac_header_dirent=$ac_hdr; break ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes + else +- echo "$ac_t""no" 1>&6 ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++rm -f conftest.err conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6 ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc in ++ yes:no ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++ no:yes ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=$ac_header_preproc" + fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ + done +-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. +-if test $ac_header_dirent = dirent.h; then +-echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 +-echo "configure:1840: checking for opendir in -ldir" >&5 +-ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++ ++echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 ++echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 ++if test "${ac_cv_header_time+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" +-LIBS="-ldir $LIBS" +-cat > conftest.$ac_ext <<EOF +-#line 1848 "configure" +-#include "confdefs.h" +-/* Override any gcc2 internal prototype to avoid an error. */ +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char opendir(); ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <sys/types.h> ++#include <sys/time.h> ++#include <time.h> + +-int main() { +-opendir() +-; return 0; } +-EOF +-if { (eval echo configure:1859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" ++int ++main () ++{ ++if ((struct tm *) 0) ++return 0; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_header_time=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_header_time=no + fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 ++echo "${ECHO_T}$ac_cv_header_time" >&6 ++if test $ac_cv_header_time = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define TIME_WITH_SYS_TIME 1 ++_ACEOF + + fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- LIBS="$LIBS -ldir" ++ ++ ++ ++ : ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ echo "$as_me:$LINENO: checking for struct utimbuf" >&5 ++echo $ECHO_N "checking for struct utimbuf... $ECHO_C" >&6 ++if test "${fu_cv_sys_struct_utimbuf+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- echo "$ac_t""no" 1>&6 ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++#ifdef TIME_WITH_SYS_TIME ++# include <sys/time.h> ++# include <time.h> ++#else ++# ifdef HAVE_SYS_TIME_H ++# include <sys/time.h> ++# else ++# include <time.h> ++# endif ++#endif ++#ifdef HAVE_UTIME_H ++# include <utime.h> ++#endif ++ ++int ++main () ++{ ++static struct utimbuf x; x.actime = x.modtime; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ fu_cv_sys_struct_utimbuf=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++fu_cv_sys_struct_utimbuf=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ + fi ++echo "$as_me:$LINENO: result: $fu_cv_sys_struct_utimbuf" >&5 ++echo "${ECHO_T}$fu_cv_sys_struct_utimbuf" >&6 + ++ if test $fu_cv_sys_struct_utimbuf = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_STRUCT_UTIMBUF 1 ++_ACEOF ++ ++ fi ++ ++ ++echo "$as_me:$LINENO: checking whether closedir returns void" >&5 ++echo $ECHO_N "checking whether closedir returns void... $ECHO_C" >&6 ++if test "${ac_cv_func_closedir_void+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +-echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 +-echo "configure:1881: checking for opendir in -lx" >&5 +-ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ if test "$cross_compiling" = yes; then ++ ac_cv_func_closedir_void=yes + else +- ac_save_LIBS="$LIBS" +-LIBS="-lx $LIBS" +-cat > conftest.$ac_ext <<EOF +-#line 1889 "configure" +-#include "confdefs.h" +-/* Override any gcc2 internal prototype to avoid an error. */ +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char opendir(); ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header_dirent> ++#ifndef __cplusplus ++int closedir (); ++#endif + +-int main() { +-opendir() +-; return 0; } +-EOF +-if { (eval echo configure:1900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" ++int ++main () ++{ ++exit (closedir (opendir (".")) != 0); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_closedir_void=no + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++ac_cv_func_closedir_void=yes + fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" ++rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++fi ++echo "$as_me:$LINENO: result: $ac_cv_func_closedir_void" >&5 ++echo "${ECHO_T}$ac_cv_func_closedir_void" >&6 ++if test $ac_cv_func_closedir_void = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define CLOSEDIR_VOID 1 ++_ACEOF + + fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- LIBS="$LIBS -lx" ++ ++ ++ ++for ac_header in limits.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + else +- echo "$ac_t""no" 1>&6 ++ # Is the header compilable? ++echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_header_compiler=no + fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++# Is the header present? ++echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++ ac_header_preproc=no + fi ++rm -f conftest.err conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6 + +-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +-echo "configure:1923: checking for ANSI C header files" >&5 +-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc in ++ yes:no ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++ no:yes ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftest.$ac_ext <<EOF +-#line 1928 "configure" +-#include "confdefs.h" +-#include <stdlib.h> +-#include <stdarg.h> +-#include <string.h> +-#include <float.h> +-EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1936: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +-if test -z "$ac_err"; then +- rm -rf conftest* +- ac_cv_header_stdc=yes ++ eval "$as_ac_Header=$ac_header_preproc" ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++ ++ ++for ac_header in stdlib.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- ac_cv_header_stdc=no ++ # Is the header compilable? ++echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_header_compiler=no + fi +-rm -f conftest* ++rm -f conftest.$ac_objext conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6 + +-if test $ac_cv_header_stdc = yes; then +- # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +-cat > conftest.$ac_ext <<EOF +-#line 1953 "configure" +-#include "confdefs.h" +-#include <string.h> +-EOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- egrep "memchr" >/dev/null 2>&1; then +- : ++# Is the header present? ++echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ else ++ ac_cpp_err= ++ fi + else +- rm -rf conftest* +- ac_cv_header_stdc=no ++ ac_cpp_err=yes + fi +-rm -f conftest* ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++ ac_header_preproc=no + fi ++rm -f conftest.err conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6 + +-if test $ac_cv_header_stdc = yes; then +- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. +-cat > conftest.$ac_ext <<EOF +-#line 1971 "configure" +-#include "confdefs.h" +-#include <stdlib.h> +-EOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- egrep "free" >/dev/null 2>&1; then +- : ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc in ++ yes:no ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++ no:yes ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- rm -rf conftest* +- ac_cv_header_stdc=no ++ eval "$as_ac_Header=$ac_header_preproc" + fi +-rm -f conftest* ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + + fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF + +-if test $ac_cv_header_stdc = yes; then +- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +-if test "$cross_compiling" = yes; then +- : ++fi ++ ++done ++ ++ ++ ++ ++for ac_header in string.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + else +- cat > conftest.$ac_ext <<EOF +-#line 1992 "configure" +-#include "confdefs.h" +-#include <ctype.h> +-#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +-#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +-int main () { int i; for (i = 0; i < 256; i++) +-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); +-exit (0); } ++ # Is the header compilable? ++echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-EOF +-if { (eval echo configure:2003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then +- : ++ac_header_compiler=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++# Is the header present? ++echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ else ++ ac_cpp_err= ++ fi + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- ac_cv_header_stdc=no ++ ac_cpp_err=yes + fi +-rm -fr conftest* ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no + fi ++rm -f conftest.err conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6 + ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc in ++ yes:no ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++ no:yes ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=$ac_header_preproc" + fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ + fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ + +-echo "$ac_t""$ac_cv_header_stdc" 1>&6 +-if test $ac_cv_header_stdc = yes; then +- cat >> confdefs.h <<\EOF +-#define STDC_HEADERS 1 +-EOF + ++ echo "$as_me:$LINENO: checking whether getenv is declared" >&5 ++echo $ECHO_N "checking whether getenv is declared... $ECHO_C" >&6 ++if test "${ac_cv_have_decl_getenv+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++#ifndef getenv ++ char *p = (char *) getenv; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_have_decl_getenv=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_have_decl_getenv=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext + fi ++echo "$as_me:$LINENO: result: $ac_cv_have_decl_getenv" >&5 ++echo "${ECHO_T}$ac_cv_have_decl_getenv" >&6 ++if test $ac_cv_have_decl_getenv = yes; then + +-for ac_hdr in fcntl.h limits.h string.h unistd.h utime.h varargs.h ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_GETENV 1 ++_ACEOF ++ ++ ++else ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_GETENV 0 ++_ACEOF ++ ++ ++fi ++ ++ ++ ++ ++ echo "$as_me:$LINENO: checking whether malloc is declared" >&5 ++echo $ECHO_N "checking whether malloc is declared... $ECHO_C" >&6 ++if test "${ac_cv_have_decl_malloc+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++#ifndef malloc ++ char *p = (char *) malloc; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_have_decl_malloc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_have_decl_malloc=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_have_decl_malloc" >&5 ++echo "${ECHO_T}$ac_cv_have_decl_malloc" >&6 ++if test $ac_cv_have_decl_malloc = yes; then ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_MALLOC 1 ++_ACEOF ++ ++ ++else ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_MALLOC 0 ++_ACEOF ++ ++ ++fi ++ ++ ++ ++ ++ echo "$as_me:$LINENO: checking whether system is Windows or MSDOS" >&5 ++echo $ECHO_N "checking whether system is Windows or MSDOS... $ECHO_C" >&6 ++if test "${ac_cv_win_or_dos+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++#if !defined _WIN32 && !defined __WIN32__ && !defined __MSDOS__ ++neither MSDOS nor Windows ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_win_or_dos=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_win_or_dos=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ ++fi ++echo "$as_me:$LINENO: result: $ac_cv_win_or_dos" >&5 ++echo "${ECHO_T}$ac_cv_win_or_dos" >&6 ++ ++ 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 ++ ++ ++ ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define FILESYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX $ac_fs_accepts_drive_letter_prefix ++_ACEOF ++ ++ ++ ++ ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define FILESYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR $ac_fs_backslash_is_file_name_separator ++_ACEOF ++ ++ ++ ++ ++for ac_header in unistd.h + do +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:2030: checking for $ac_hdr" >&5 +-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + else +- cat > conftest.$ac_ext <<EOF +-#line 2035 "configure" +-#include "confdefs.h" +-#include <$ac_hdr> +-EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:2040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +-if test -z "$ac_err"; then +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=yes" ++ # Is the header compilable? ++echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes + else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_header_compiler=no + fi +-rm -f conftest* ++rm -f conftest.$ac_objext conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++# Is the header present? ++echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes + fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <<EOF +-#define $ac_tr_hdr 1 +-EOF +- ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes + else +- echo "$ac_t""no" 1>&6 ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++rm -f conftest.err conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6 ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc in ++ yes:no ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++ no:yes ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=$ac_header_preproc" ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ + fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ + done + + +- echo $ac_n "checking for inttypes.h""... $ac_c" 1>&6 +-echo "configure:2068: checking for inttypes.h" >&5 +-if eval "test \"`echo '$''{'jm_ac_cv_header_inttypes_h'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++ ++ ++ ++ : ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ : ++ ++ ++ ++ ++ ++ ++ ++ ++ echo "$as_me:$LINENO: checking for d_ino member in directory struct" >&5 ++echo $ECHO_N "checking for d_ino member in directory struct... $ECHO_C" >&6 ++if test "${jm_cv_struct_dirent_d_ino+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftest.$ac_ext <<EOF +-#line 2073 "configure" +-#include "confdefs.h" ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ + #include <sys/types.h> +-#include <inttypes.h> +-int main() { +-uintmax_t i = (uintmax_t) -1; +-; return 0; } +-EOF +-if { (eval echo configure:2081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- jm_ac_cv_header_inttypes_h=yes ++#ifdef HAVE_DIRENT_H ++# include <dirent.h> ++#else /* not HAVE_DIRENT_H */ ++# define dirent direct ++# ifdef HAVE_SYS_NDIR_H ++# include <sys/ndir.h> ++# endif /* HAVE_SYS_NDIR_H */ ++# ifdef HAVE_SYS_DIR_H ++# include <sys/dir.h> ++# endif /* HAVE_SYS_DIR_H */ ++# ifdef HAVE_NDIR_H ++# include <ndir.h> ++# endif /* HAVE_NDIR_H */ ++#endif /* HAVE_DIRENT_H */ ++ ++int ++main () ++{ ++struct dirent dp; dp.d_ino = 0; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ jm_cv_struct_dirent_d_ino=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- jm_ac_cv_header_inttypes_h=no ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++jm_cv_struct_dirent_d_ino=no + fi +-rm -f conftest* ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++ ++ + fi ++echo "$as_me:$LINENO: result: $jm_cv_struct_dirent_d_ino" >&5 ++echo "${ECHO_T}$jm_cv_struct_dirent_d_ino" >&6 ++ if test $jm_cv_struct_dirent_d_ino = yes; then + +-echo "$ac_t""$jm_ac_cv_header_inttypes_h" 1>&6 +- if test $jm_ac_cv_header_inttypes_h = yes; then +- cat >> confdefs.h <<EOF +-#define HAVE_INTTYPES_H 1 +-EOF ++cat >>confdefs.h <<\_ACEOF ++#define D_INO_IN_DIRENT 1 ++_ACEOF + ++ fi ++ ++ ++ ++ ++ echo "$as_me:$LINENO: checking for long file names" >&5 ++echo $ECHO_N "checking for long file names... $ECHO_C" >&6 ++if test "${ac_cv_sys_long_file_names+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_sys_long_file_names=yes ++# Test for long file names in all the places we know might matter: ++# . the current directory, where building will happen ++# $prefix/lib where we will be installing things ++# $exec_prefix/lib likewise ++# eval it to expand exec_prefix. ++# $TMPDIR if set, where it might want to write temporary files ++# if $TMPDIR is not set: ++# /tmp where it might want to write temporary files ++# /var/tmp likewise ++# /usr/tmp likewise ++if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then ++ ac_tmpdirs=$TMPDIR ++else ++ ac_tmpdirs='/tmp /var/tmp /usr/tmp' ++fi ++for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do ++ test -d $ac_dir || continue ++ test -w $ac_dir || continue # It is less confusing to not echo anything here. ++ ac_xdir=$ac_dir/cf$$ ++ (umask 077 && mkdir $ac_xdir 2>/dev/null) || continue ++ ac_tf1=$ac_xdir/conftest9012345 ++ ac_tf2=$ac_xdir/conftest9012346 ++ (echo 1 >$ac_tf1) 2>/dev/null ++ (echo 2 >$ac_tf2) 2>/dev/null ++ ac_val=`cat $ac_tf1 2>/dev/null` ++ if test ! -f $ac_tf1 || test "$ac_val" != 1; then ++ ac_cv_sys_long_file_names=no ++ rm -rf $ac_xdir 2>/dev/null ++ break + fi ++ rm -rf $ac_xdir 2>/dev/null ++done ++fi ++echo "$as_me:$LINENO: result: $ac_cv_sys_long_file_names" >&5 ++echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 ++if test $ac_cv_sys_long_file_names = yes; then + ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_LONG_FILE_NAMES 1 ++_ACEOF + +-echo $ac_n "checking for mode_t""... $ac_c" 1>&6 +-echo "configure:2103: checking for mode_t" >&5 +-if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++fi ++ ++ ++ : ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++for ac_func in pathconf ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_var+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftest.$ac_ext <<EOF +-#line 2108 "configure" +-#include "confdefs.h" +-#include <sys/types.h> +-#if STDC_HEADERS +-#include <stdlib.h> +-#include <stddef.h> ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> + #endif +-EOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then +- rm -rf conftest* +- ac_cv_type_mode_t=yes ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++{ ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++choke me ++#else ++char (*f) () = $ac_func; ++#endif ++#ifdef __cplusplus ++} ++#endif ++ ++int ++main () ++{ ++return f != $ac_func; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" + else +- rm -rf conftest* +- ac_cv_type_mode_t=no ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++eval "$as_ac_var=no" + fi +-rm -f conftest* ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF + + fi +-echo "$ac_t""$ac_cv_type_mode_t" 1>&6 +-if test $ac_cv_type_mode_t = no; then +- cat >> confdefs.h <<\EOF +-#define mode_t int +-EOF ++done ++ ++ ++ ++ ++ ++ ++ ++ : ++ ++ ++ ++ ++ ++ ++ ++ ++ : ++ ++ ++ ++ ++ ++ ++ ++ ++ : ++ ++ ++ ++ ++ ++ + ++for ac_func in vprintf ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_var+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++{ ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++choke me ++#else ++char (*f) () = $ac_func; ++#endif ++#ifdef __cplusplus ++} ++#endif ++ ++int ++main () ++{ ++return f != $ac_func; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++eval "$as_ac_var=no" + fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF + +-echo $ac_n "checking for off_t""... $ac_c" 1>&6 +-echo "configure:2136: checking for off_t" >&5 +-if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++echo "$as_me:$LINENO: checking for _doprnt" >&5 ++echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6 ++if test "${ac_cv_func__doprnt+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftest.$ac_ext <<EOF +-#line 2141 "configure" +-#include "confdefs.h" +-#include <sys/types.h> +-#if STDC_HEADERS +-#include <stdlib.h> +-#include <stddef.h> ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char _doprnt (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> + #endif +-EOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then +- rm -rf conftest* +- ac_cv_type_off_t=yes ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++{ ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char _doprnt (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub__doprnt) || defined (__stub____doprnt) ++choke me ++#else ++char (*f) () = _doprnt; ++#endif ++#ifdef __cplusplus ++} ++#endif ++ ++int ++main () ++{ ++return f != _doprnt; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func__doprnt=yes + else +- rm -rf conftest* +- ac_cv_type_off_t=no ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_func__doprnt=no + fi +-rm -f conftest* ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 ++echo "${ECHO_T}$ac_cv_func__doprnt" >&6 ++if test $ac_cv_func__doprnt = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_DOPRNT 1 ++_ACEOF + + fi +-echo "$ac_t""$ac_cv_type_off_t" 1>&6 +-if test $ac_cv_type_off_t = no; then +- cat >> confdefs.h <<\EOF +-#define off_t long +-EOF + + fi ++done + +-echo $ac_n "checking for pid_t""... $ac_c" 1>&6 +-echo "configure:2169: checking for pid_t" >&5 +-if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++ ++ echo "$as_me:$LINENO: checking for error_at_line" >&5 ++echo $ECHO_N "checking for error_at_line... $ECHO_C" >&6 ++if test "${ac_cv_lib_error_at_line+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftest.$ac_ext <<EOF +-#line 2174 "configure" +-#include "confdefs.h" +-#include <sys/types.h> +-#if STDC_HEADERS +-#include <stdlib.h> +-#include <stddef.h> ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++error_at_line (0, 0, "", 0, ""); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_error_at_line=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_lib_error_at_line=no ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_lib_error_at_line" >&5 ++echo "${ECHO_T}$ac_cv_lib_error_at_line" >&6 ++if test $ac_cv_lib_error_at_line = no; then ++ LIBOBJS="$LIBOBJS error.$ac_objext" ++fi ++ ++ ++ ++ ++ ++for ac_func in strerror ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_var+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> + #endif +-EOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then +- rm -rf conftest* +- ac_cv_type_pid_t=yes ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++{ ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++choke me ++#else ++char (*f) () = $ac_func; ++#endif ++#ifdef __cplusplus ++} ++#endif ++ ++int ++main () ++{ ++return f != $ac_func; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" + else +- rm -rf conftest* +- ac_cv_type_pid_t=no ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++eval "$as_ac_var=no" + fi +-rm -f conftest* ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF + + fi +-echo "$ac_t""$ac_cv_type_pid_t" 1>&6 +-if test $ac_cv_type_pid_t = no; then +- cat >> confdefs.h <<\EOF +-#define pid_t int +-EOF ++done + ++ echo "$as_me:$LINENO: checking whether strerror is declared" >&5 ++echo $ECHO_N "checking whether strerror is declared... $ECHO_C" >&6 ++if test "${ac_cv_have_decl_strerror+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++#ifndef strerror ++ char *p = (char *) strerror; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_have_decl_strerror=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_have_decl_strerror=no + fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_have_decl_strerror" >&5 ++echo "${ECHO_T}$ac_cv_have_decl_strerror" >&6 ++if test $ac_cv_have_decl_strerror = yes; then ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_STRERROR 1 ++_ACEOF ++ + +-echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 +-echo "configure:2202: checking return type of signal handlers" >&5 +-if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 + else +- cat > conftest.$ac_ext <<EOF +-#line 2207 "configure" +-#include "confdefs.h" +-#include <sys/types.h> +-#include <signal.h> +-#ifdef signal +-#undef signal ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_STRERROR 0 ++_ACEOF ++ ++ ++fi ++ ++ ++ echo "$as_me:$LINENO: checking whether strerror_r is declared" >&5 ++echo $ECHO_N "checking whether strerror_r is declared... $ECHO_C" >&6 ++if test "${ac_cv_have_decl_strerror_r+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++#ifndef strerror_r ++ char *p = (char *) strerror_r; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_have_decl_strerror_r=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_have_decl_strerror_r=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_have_decl_strerror_r" >&5 ++echo "${ECHO_T}$ac_cv_have_decl_strerror_r" >&6 ++if test $ac_cv_have_decl_strerror_r = yes; then ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_STRERROR_R 1 ++_ACEOF ++ ++ ++else ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_STRERROR_R 0 ++_ACEOF ++ ++ ++fi ++ ++ ++ ++for ac_func in strerror_r ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_var+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> + #endif ++/* Override any gcc2 internal prototype to avoid an error. */ + #ifdef __cplusplus +-extern "C" void (*signal (int, void (*)(int)))(int); ++extern "C" ++{ ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++choke me + #else +-void (*signal ()) (); ++char (*f) () = $ac_func; ++#endif ++#ifdef __cplusplus ++} + #endif + +-int main() { +-int i; +-; return 0; } +-EOF +-if { (eval echo configure:2224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- ac_cv_type_signal=void ++int ++main () ++{ ++return f != $ac_func; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- ac_cv_type_signal=int ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++eval "$as_ac_var=no" + fi +-rm -f conftest* ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF + +-echo "$ac_t""$ac_cv_type_signal" 1>&6 +-cat >> confdefs.h <<EOF +-#define RETSIGTYPE $ac_cv_type_signal +-EOF ++fi ++done ++ ++echo "$as_me:$LINENO: checking whether strerror_r returns char *" >&5 ++echo $ECHO_N "checking whether strerror_r returns char *... $ECHO_C" >&6 ++if test "${ac_cv_func_strerror_r_char_p+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++ ac_cv_func_strerror_r_char_p=no ++ if test $ac_cv_have_decl_strerror_r = yes; then ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ + ++ char buf[100]; ++ char x = *strerror_r (0, buf, sizeof buf); ++ char *p = strerror_r (0, buf, sizeof buf); + +-echo $ac_n "checking for size_t""... $ac_c" 1>&6 +-echo "configure:2243: checking for size_t" >&5 +-if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_strerror_r_char_p=yes + else +- cat > conftest.$ac_ext <<EOF +-#line 2248 "configure" +-#include "confdefs.h" +-#include <sys/types.h> +-#if STDC_HEADERS +-#include <stdlib.h> +-#include <stddef.h> ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ else ++ # strerror_r is not declared. Choose between ++ # systems that have relatively inaccessible declarations for the ++ # function. BeOS and DEC UNIX 4.0 fall in this category, but the ++ # former has a strerror_r that returns char*, while the latter ++ # has a strerror_r that returns `int'. ++ # This test should segfault on the DEC system. ++ if test "$cross_compiling" = yes; then ++ : ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++ extern char *strerror_r (); ++int ++main () ++{ ++char buf[100]; ++ char x = *strerror_r (0, buf, sizeof buf); ++ exit (!isalpha (x)); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_strerror_r_char_p=yes ++else ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++fi ++rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++ fi ++ ++fi ++echo "$as_me:$LINENO: result: $ac_cv_func_strerror_r_char_p" >&5 ++echo "${ECHO_T}$ac_cv_func_strerror_r_char_p" >&6 ++if test $ac_cv_func_strerror_r_char_p = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define STRERROR_R_CHAR_P 1 ++_ACEOF ++ ++fi ++ ++ ++ ++ ++ ++for ac_func in memchr ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_var+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> + #endif +-EOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then +- rm -rf conftest* +- ac_cv_type_size_t=yes ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++{ ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++choke me ++#else ++char (*f) () = $ac_func; ++#endif ++#ifdef __cplusplus ++} ++#endif ++ ++int ++main () ++{ ++return f != $ac_func; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" + else +- rm -rf conftest* +- ac_cv_type_size_t=no ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++eval "$as_ac_var=no" + fi +-rm -f conftest* ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF + ++else ++ LIBOBJS="$LIBOBJS $ac_func.$ac_objext" + fi +-echo "$ac_t""$ac_cv_type_size_t" 1>&6 +-if test $ac_cv_type_size_t = no; then +- cat >> confdefs.h <<\EOF +-#define size_t unsigned +-EOF ++done ++ ++ ++ if test $ac_cv_func_memchr = no; then ++ ++ ++ : ++ ++ ++ ++ ++ ++ ++ ++ ++ ++for ac_header in bp-sym.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++else ++ # Is the header compilable? ++echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++ac_header_compiler=no + fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6 + +-echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 +-echo "configure:2276: checking whether time.h and sys/time.h may both be included" >&5 +-if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++# Is the header present? ++echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ else ++ ac_cpp_err= ++ fi + else +- cat > conftest.$ac_ext <<EOF +-#line 2281 "configure" +-#include "confdefs.h" ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++rm -f conftest.err conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6 ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc in ++ yes:no ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++ no:yes ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=$ac_header_preproc" ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++ fi ++ ++echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5 ++echo $ECHO_N "checking whether stat file-mode macros are broken... $ECHO_C" >&6 ++if test "${ac_cv_header_stat_broken+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include <sys/types.h> +-#include <sys/time.h> +-#include <time.h> +-int main() { +-struct tm *tp; +-; return 0; } +-EOF +-if { (eval echo configure:2290: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- ac_cv_header_time=yes ++#include <sys/stat.h> ++ ++#if defined(S_ISBLK) && defined(S_IFDIR) ++# if S_ISBLK (S_IFDIR) ++You lose. ++# endif ++#endif ++ ++#if defined(S_ISBLK) && defined(S_IFCHR) ++# if S_ISBLK (S_IFCHR) ++You lose. ++# endif ++#endif ++ ++#if defined(S_ISLNK) && defined(S_IFREG) ++# if S_ISLNK (S_IFREG) ++You lose. ++# endif ++#endif ++ ++#if defined(S_ISSOCK) && defined(S_IFREG) ++# if S_ISSOCK (S_IFREG) ++You lose. ++# endif ++#endif ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "You lose" >/dev/null 2>&1; then ++ ac_cv_header_stat_broken=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- ac_cv_header_time=no ++ ac_cv_header_stat_broken=no + fi + rm -f conftest* ++ + fi ++echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5 ++echo "${ECHO_T}$ac_cv_header_stat_broken" >&6 ++if test $ac_cv_header_stat_broken = yes; then + +-echo "$ac_t""$ac_cv_header_time" 1>&6 +-if test $ac_cv_header_time = yes; then +- cat >> confdefs.h <<\EOF +-#define TIME_WITH_SYS_TIME 1 +-EOF ++cat >>confdefs.h <<\_ACEOF ++#define STAT_MACROS_BROKEN 1 ++_ACEOF + + fi + + +- for ac_hdr in utime.h ++ ++for ac_func in rmdir + do +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:2315: checking for $ac_hdr" >&5 +-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_var+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftest.$ac_ext <<EOF +-#line 2320 "configure" +-#include "confdefs.h" +-#include <$ac_hdr> +-EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:2325: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +-if test -z "$ac_err"; then +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=yes" ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++{ ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++choke me ++#else ++char (*f) () = $ac_func; ++#endif ++#ifdef __cplusplus ++} ++#endif ++ ++int ++main () ++{ ++return f != $ac_func; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" + else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++eval "$as_ac_var=no" + fi +-rm -f conftest* ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <<EOF +-#define $ac_tr_hdr 1 +-EOF +- ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ + else +- echo "$ac_t""no" 1>&6 ++ LIBOBJS="$LIBOBJS $ac_func.$ac_objext" + fi + done + +- +- echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6 +-echo "configure:2353: checking for struct utimbuf" >&5 +-if eval "test \"`echo '$''{'fu_cv_sys_struct_utimbuf'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++ if test $ac_cv_func_rmdir = no; then ++ ++ ++ : ++ ++ fi ++ ++ ++ ++ : ++ ++ ++ ++ ++ ++ ++ ++for ac_header in stdlib.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + else +- cat > conftest.$ac_ext <<EOF +-#line 2358 "configure" +-#include "confdefs.h" ++ # Is the header compilable? ++echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-#ifdef TIME_WITH_SYS_TIME +-# include <sys/time.h> +-# include <time.h> ++ac_header_compiler=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++# Is the header present? ++echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++rm -f conftest.err conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6 ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc in ++ yes:no ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++ no:yes ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=$ac_header_preproc" ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5 ++echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6 ++if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test "$cross_compiling" = yes; then ++ ac_cv_func_malloc_0_nonnull=no ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#if STDC_HEADERS || HAVE_STDLIB_H ++# include <stdlib.h> + #else +-# ifdef HAVE_SYS_TIME_H +-# include <sys/time.h> +-# else +-# include <time.h> +-# endif ++char *malloc (); + #endif +-#ifdef HAVE_UTIME_H +-# include <utime.h> ++ ++int ++main () ++{ ++exit (malloc (0) ? 0 : 1); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_malloc_0_nonnull=yes ++else ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++ac_cv_func_malloc_0_nonnull=no ++fi ++rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++fi ++echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5 ++echo "${ECHO_T}$ac_cv_func_malloc_0_nonnull" >&6 ++if test $ac_cv_func_malloc_0_nonnull = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_MALLOC 1 ++_ACEOF ++ ++else ++ cat >>confdefs.h <<\_ACEOF ++#define HAVE_MALLOC 0 ++_ACEOF ++ ++ LIBOBJS="$LIBOBJS malloc.$ac_objext" ++ ++cat >>confdefs.h <<\_ACEOF ++#define malloc rpl_malloc ++_ACEOF ++ ++fi ++ ++ ++ ++ ++ ++ if test X"$ac_cv_func_malloc_0_nonnull" = Xno || test X"$ac_cv_func_malloc_works" = Xno; then ++ ++ : ++ ++ fi ++ ++ ++for ac_header in stdlib.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++else ++ # Is the header compilable? ++echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_header_compiler=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++# Is the header present? ++echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++rm -f conftest.err conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6 ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc in ++ yes:no ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++ no:yes ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=$ac_header_preproc" ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++echo "$as_me:$LINENO: checking for GNU libc compatible realloc" >&5 ++echo $ECHO_N "checking for GNU libc compatible realloc... $ECHO_C" >&6 ++if test "${ac_cv_func_realloc_0_nonnull+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test "$cross_compiling" = yes; then ++ ac_cv_func_realloc_0_nonnull=no ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#if STDC_HEADERS || HAVE_STDLIB_H ++# include <stdlib.h> ++#else ++char *realloc (); + #endif +- +-int main() { +-static struct utimbuf x; x.actime = x.modtime; +-; return 0; } +-EOF +-if { (eval echo configure:2379: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- fu_cv_sys_struct_utimbuf=yes ++ ++int ++main () ++{ ++exit (realloc (0, 0) ? 0 : 1); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_realloc_0_nonnull=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- fu_cv_sys_struct_utimbuf=no ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++ac_cv_func_realloc_0_nonnull=no + fi +-rm -f conftest* +- ++rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++fi ++echo "$as_me:$LINENO: result: $ac_cv_func_realloc_0_nonnull" >&5 ++echo "${ECHO_T}$ac_cv_func_realloc_0_nonnull" >&6 ++if test $ac_cv_func_realloc_0_nonnull = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_REALLOC 1 ++_ACEOF ++ ++else ++ cat >>confdefs.h <<\_ACEOF ++#define HAVE_REALLOC 0 ++_ACEOF ++ ++ LIBOBJS="$LIBOBJS realloc.$ac_objext" ++ ++cat >>confdefs.h <<\_ACEOF ++#define realloc rpl_realloc ++_ACEOF ++ + fi + +-echo "$ac_t""$fu_cv_sys_struct_utimbuf" 1>&6 + +- if test $fu_cv_sys_struct_utimbuf = yes; then +- cat >> confdefs.h <<EOF +-#define HAVE_STRUCT_UTIMBUF 1 +-EOF ++ ++ ++ ++ if test X"$ac_cv_func_realloc_0_nonnull" = Xno || test X"$ac_cv_func_realloc_works" = Xno; then ++ ++ : + + fi + + +-echo $ac_n "checking for getopt_long""... $ac_c" 1>&6 +-echo "configure:2403: checking for getopt_long" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++ ++ ++ ++ ++ ++for ac_header in stddef.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + else +- cat > conftest.$ac_ext <<EOF +-#line 2408 "configure" +-#include "confdefs.h" ++ # Is the header compilable? ++echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_header_compiler=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++# Is the header present? ++echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++rm -f conftest.err conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6 ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc in ++ yes:no ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++ no:yes ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=$ac_header_preproc" ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++ ++ ++ : ++ ++ ++ ++ ++ ++ ++ ++ ++for ac_header in wchar.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++else ++ # Is the header compilable? ++echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_header_compiler=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++# Is the header present? ++echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++rm -f conftest.err conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6 ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc in ++ yes:no ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++ no:yes ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=$ac_header_preproc" ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++ ++ ++for ac_header in wctype.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++else ++ # Is the header compilable? ++echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_header_compiler=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++# Is the header present? ++echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++rm -f conftest.err conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6 ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc in ++ yes:no ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++ no:yes ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=$ac_header_preproc" ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++ ++ ++for ac_func in iswprint ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_var+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char getopt_long(); below. */ +-#include <assert.h> ++ which can conflict with char $ac_func (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif + /* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++{ ++#endif + /* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char getopt_long(); ++ builtin and then its argument prototype would still apply. */ ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++choke me ++#else ++char (*f) () = $ac_func; ++#endif ++#ifdef __cplusplus ++} ++#endif + +-int main() { ++int ++main () ++{ ++return f != $ac_func; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++eval "$as_ac_var=no" ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++done ++ ++ ++ ++ ++for ac_func in mbsinit ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_var+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++{ ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char $ac_func (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_getopt_long) || defined (__stub___getopt_long) ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) + choke me + #else +-getopt_long(); ++char (*f) () = $ac_func; ++#endif ++#ifdef __cplusplus ++} + #endif + +-; return 0; } +-EOF +-if { (eval echo configure:2431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_func_getopt_long=yes" ++int ++main () ++{ ++return f != $ac_func; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_func_getopt_long=no" ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++eval "$as_ac_var=no" + fi +-rm -f conftest* ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++done ++ ++ ++ ++ ++ : ++ ++ ++ ++ ++ ++ ++ ++ + +-if eval "test \"`echo '$ac_cv_func_'getopt_long`\" = yes"; then +- echo "$ac_t""yes" 1>&6 + : ++ ++ ++ ++ ++ ++ ++ ++ ++ echo "$as_me:$LINENO: checking for mbstate_t" >&5 ++echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6 ++if test "${ac_cv_type_mbstate_t+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- echo "$ac_t""no" 1>&6 +-LIBOBJS="$LIBOBJS getopt1\$U.o getopt\$U.o" ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++# include <wchar.h> ++int ++main () ++{ ++mbstate_t x; return sizeof x; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_type_mbstate_t=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_type_mbstate_t=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext + fi ++echo "$as_me:$LINENO: result: $ac_cv_type_mbstate_t" >&5 ++echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6 ++ if test $ac_cv_type_mbstate_t = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_MBSTATE_T 1 ++_ACEOF + ++ else + +-for ac_func in _doprintf isascii fseeko memcmp mktemp \ +- pathconf raise setmode sigaction sigprocmask sigsetmask strerror ++cat >>confdefs.h <<\_ACEOF ++#define mbstate_t int ++_ACEOF ++ ++ fi ++ ++ echo "$as_me:$LINENO: checking whether mbrtowc and mbstate_t are properly declared" >&5 ++echo $ECHO_N "checking whether mbrtowc and mbstate_t are properly declared... $ECHO_C" >&6 ++if test "${jm_cv_func_mbrtowc+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <wchar.h> ++int ++main () ++{ ++mbstate_t state; return ! (sizeof state && mbrtowc); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ jm_cv_func_mbrtowc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++jm_cv_func_mbrtowc=no ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $jm_cv_func_mbrtowc" >&5 ++echo "${ECHO_T}$jm_cv_func_mbrtowc" >&6 ++ if test $jm_cv_func_mbrtowc = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_MBRTOWC 1 ++_ACEOF ++ ++ fi ++ ++ ++ ++ ++ ++ ++ ++for ac_func in pathconf + do +-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:2456: checking for $ac_func" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_var+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftest.$ac_ext <<EOF +-#line 2461 "configure" +-#include "confdefs.h" ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func(); below. */ +-#include <assert.h> ++ which can conflict with char $ac_func (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif + /* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++{ ++#endif + /* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char $ac_func(); +- +-int main() { +- ++ builtin and then its argument prototype would still apply. */ ++char $ac_func (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ + #if defined (__stub_$ac_func) || defined (__stub___$ac_func) + choke me + #else +-$ac_func(); ++char (*f) () = $ac_func; ++#endif ++#ifdef __cplusplus ++} + #endif + +-; return 0; } +-EOF +-if { (eval echo configure:2484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_func_$ac_func=yes" ++int ++main () ++{ ++return f != $ac_func; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_func_$ac_func=no" ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++eval "$as_ac_var=no" + fi +-rm -f conftest* ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF + +-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` +- cat >> confdefs.h <<EOF +-#define $ac_tr_func 1 +-EOF +- ++fi ++done ++ ++ ++ ++ ++for ac_header in limits.h string.h unistd.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + else +- echo "$ac_t""no" 1>&6 ++ # Is the header compilable? ++echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_header_compiler=no + fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++# Is the header present? ++echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++rm -f conftest.err conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6 ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc in ++ yes:no ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++ no:yes ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=$ac_header_preproc" ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ + done + +-for ac_func in memchr mkdir rename rmdir ++ ++ ++echo "$as_me:$LINENO: checking whether free is declared" >&5 ++echo $ECHO_N "checking whether free is declared... $ECHO_C" >&6 ++if test "${ac_cv_have_decl_free+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++#ifndef free ++ char *p = (char *) free; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_have_decl_free=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_have_decl_free=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_have_decl_free" >&5 ++echo "${ECHO_T}$ac_cv_have_decl_free" >&6 ++if test $ac_cv_have_decl_free = yes; then ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_FREE 1 ++_ACEOF ++ ++ ++else ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_FREE 0 ++_ACEOF ++ ++ ++fi ++echo "$as_me:$LINENO: checking whether getenv is declared" >&5 ++echo $ECHO_N "checking whether getenv is declared... $ECHO_C" >&6 ++if test "${ac_cv_have_decl_getenv+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++#ifndef getenv ++ char *p = (char *) getenv; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_have_decl_getenv=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_have_decl_getenv=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_have_decl_getenv" >&5 ++echo "${ECHO_T}$ac_cv_have_decl_getenv" >&6 ++if test $ac_cv_have_decl_getenv = yes; then ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_GETENV 1 ++_ACEOF ++ ++ ++else ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_GETENV 0 ++_ACEOF ++ ++ ++fi ++echo "$as_me:$LINENO: checking whether malloc is declared" >&5 ++echo $ECHO_N "checking whether malloc is declared... $ECHO_C" >&6 ++if test "${ac_cv_have_decl_malloc+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++#ifndef malloc ++ char *p = (char *) malloc; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_have_decl_malloc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_have_decl_malloc=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_have_decl_malloc" >&5 ++echo "${ECHO_T}$ac_cv_have_decl_malloc" >&6 ++if test $ac_cv_have_decl_malloc = yes; then ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_MALLOC 1 ++_ACEOF ++ ++ ++else ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_MALLOC 0 ++_ACEOF ++ ++ ++fi ++echo "$as_me:$LINENO: checking whether mktemp is declared" >&5 ++echo $ECHO_N "checking whether mktemp is declared... $ECHO_C" >&6 ++if test "${ac_cv_have_decl_mktemp+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++#ifndef mktemp ++ char *p = (char *) mktemp; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_have_decl_mktemp=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_have_decl_mktemp=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_have_decl_mktemp" >&5 ++echo "${ECHO_T}$ac_cv_have_decl_mktemp" >&6 ++if test $ac_cv_have_decl_mktemp = yes; then ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_MKTEMP 1 ++_ACEOF ++ ++ ++else ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_MKTEMP 0 ++_ACEOF ++ ++ ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++for ac_func in _doprintf geteuid getuid isascii memcmp mktemp \ ++ pathconf raise sigaction sigprocmask sigsetmask strerror + do +-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:2511: checking for $ac_func" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_var+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftest.$ac_ext <<EOF +-#line 2516 "configure" +-#include "confdefs.h" ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func(); below. */ +-#include <assert.h> ++ which can conflict with char $ac_func (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif + /* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++{ ++#endif + /* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char $ac_func(); ++ builtin and then its argument prototype would still apply. */ ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++choke me ++#else ++char (*f) () = $ac_func; ++#endif ++#ifdef __cplusplus ++} ++#endif + +-int main() { ++int ++main () ++{ ++return f != $ac_func; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++eval "$as_ac_var=no" ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++done ++ ++ ++ ++for ac_func in mkdir strncasecmp ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_var+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++{ ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char $ac_func (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ + #if defined (__stub_$ac_func) || defined (__stub___$ac_func) + choke me + #else +-$ac_func(); ++char (*f) () = $ac_func; ++#endif ++#ifdef __cplusplus ++} + #endif + +-; return 0; } +-EOF +-if { (eval echo configure:2539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_func_$ac_func=yes" ++int ++main () ++{ ++return f != $ac_func; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_func_$ac_func=no" ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++eval "$as_ac_var=no" + fi +-rm -f conftest* ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF + +-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` +- cat >> confdefs.h <<EOF +-#define $ac_tr_func 1 +-EOF +- + else +- echo "$ac_t""no" 1>&6 +-LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}" ++ LIBOBJS="$LIBOBJS $ac_func.$ac_objext" + fi + done + + ++echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5 ++echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 ++if test "${ac_cv_sys_largefile_source+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ while :; do ++ ac_cv_sys_largefile_source=no ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <stdio.h> ++int ++main () ++{ ++return !fseeko; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ break ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +- cat >> confdefs.h <<EOF +-#define HAVE_DONE_WORKING_MALLOC_CHECK 1 +-EOF ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#define _LARGEFILE_SOURCE 1 ++#include <stdio.h> ++int ++main () ++{ ++return !fseeko; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_sys_largefile_source=1; break ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ break ++done ++fi ++echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5 ++echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 ++if test "$ac_cv_sys_largefile_source" != no; then + +- echo $ac_n "checking for working malloc""... $ac_c" 1>&6 +-echo "configure:2572: checking for working malloc" >&5 +-if eval "test \"`echo '$''{'jm_cv_func_working_malloc'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++cat >>confdefs.h <<_ACEOF ++#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source ++_ACEOF ++ ++fi ++rm -f conftest* ++ ++# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug ++# in glibc 2.1.3, but that breaks too many other things. ++# If you want fseeko and ftello with glibc, upgrade to a fixed glibc. ++echo "$as_me:$LINENO: checking for fseeko" >&5 ++echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 ++if test "${ac_cv_func_fseeko+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- if test "$cross_compiling" = yes; then +- jm_cv_func_working_malloc=no ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <stdio.h> ++int ++main () ++{ ++return fseeko && fseeko (stdin, 0, 0); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_fseeko=yes + else +- cat > conftest.$ac_ext <<EOF +-#line 2580 "configure" +-#include "confdefs.h" ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +- char *malloc (); +- int +- main () +- { +- exit (malloc (0) ? 0 : 1); +- } +- +-EOF +-if { (eval echo configure:2591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then +- jm_cv_func_working_malloc=yes ++ac_cv_func_fseeko=no ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_func_fseeko" >&5 ++echo "${ECHO_T}$ac_cv_func_fseeko" >&6 ++if test $ac_cv_func_fseeko = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_FSEEKO 1 ++_ACEOF ++ ++fi ++ ++ ++ echo "$as_me:$LINENO: checking whether clearerr_unlocked is declared" >&5 ++echo $ECHO_N "checking whether clearerr_unlocked is declared... $ECHO_C" >&6 ++if test "${ac_cv_have_decl_clearerr_unlocked+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- jm_cv_func_working_malloc=no ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++#ifndef clearerr_unlocked ++ char *p = (char *) clearerr_unlocked; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_have_decl_clearerr_unlocked=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_have_decl_clearerr_unlocked=no + fi +-rm -fr conftest* ++rm -f conftest.$ac_objext conftest.$ac_ext + fi ++echo "$as_me:$LINENO: result: $ac_cv_have_decl_clearerr_unlocked" >&5 ++echo "${ECHO_T}$ac_cv_have_decl_clearerr_unlocked" >&6 ++if test $ac_cv_have_decl_clearerr_unlocked = yes; then ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_CLEARERR_UNLOCKED 1 ++_ACEOF ++ ++ ++else ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_CLEARERR_UNLOCKED 0 ++_ACEOF ++ + +- + fi + +-echo "$ac_t""$jm_cv_func_working_malloc" 1>&6 +- if test $jm_cv_func_working_malloc = no; then +- +- LIBOBJS="$LIBOBJS malloc.$ac_objext" +- cat >> confdefs.h <<EOF +-#define malloc rpl_malloc +-EOF + +- fi + + +- cat >> confdefs.h <<EOF +-#define HAVE_DONE_WORKING_REALLOC_CHECK 1 +-EOF ++ echo "$as_me:$LINENO: checking whether feof_unlocked is declared" >&5 ++echo $ECHO_N "checking whether feof_unlocked is declared... $ECHO_C" >&6 ++if test "${ac_cv_have_decl_feof_unlocked+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++#ifndef feof_unlocked ++ char *p = (char *) feof_unlocked; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_have_decl_feof_unlocked=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_have_decl_feof_unlocked=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_have_decl_feof_unlocked" >&5 ++echo "${ECHO_T}$ac_cv_have_decl_feof_unlocked" >&6 ++if test $ac_cv_have_decl_feof_unlocked = yes; then ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_FEOF_UNLOCKED 1 ++_ACEOF + + +- echo $ac_n "checking for working realloc""... $ac_c" 1>&6 +-echo "configure:2623: checking for working realloc" >&5 +-if eval "test \"`echo '$''{'jm_cv_func_working_realloc'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 + else +- if test "$cross_compiling" = yes; then +- jm_cv_func_working_realloc=no ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_FEOF_UNLOCKED 0 ++_ACEOF ++ ++ ++fi ++ ++ ++ ++ ++ echo "$as_me:$LINENO: checking whether ferror_unlocked is declared" >&5 ++echo $ECHO_N "checking whether ferror_unlocked is declared... $ECHO_C" >&6 ++if test "${ac_cv_have_decl_ferror_unlocked+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftest.$ac_ext <<EOF +-#line 2631 "configure" +-#include "confdefs.h" ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++#ifndef ferror_unlocked ++ char *p = (char *) ferror_unlocked; ++#endif + +- char *realloc (); +- int +- main () +- { +- exit (realloc (0, 0) ? 0 : 1); +- } +- +-EOF +-if { (eval echo configure:2642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then +- jm_cv_func_working_realloc=yes ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_have_decl_ferror_unlocked=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- jm_cv_func_working_realloc=no ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_have_decl_ferror_unlocked=no + fi +-rm -fr conftest* ++rm -f conftest.$ac_objext conftest.$ac_ext + fi ++echo "$as_me:$LINENO: result: $ac_cv_have_decl_ferror_unlocked" >&5 ++echo "${ECHO_T}$ac_cv_have_decl_ferror_unlocked" >&6 ++if test $ac_cv_have_decl_ferror_unlocked = yes; then ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_FERROR_UNLOCKED 1 ++_ACEOF ++ ++ ++else ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_FERROR_UNLOCKED 0 ++_ACEOF ++ + +- + fi + +-echo "$ac_t""$jm_cv_func_working_realloc" 1>&6 +- if test $jm_cv_func_working_realloc = no; then +- +- LIBOBJS="$LIBOBJS realloc.$ac_objext" +- cat >> confdefs.h <<EOF +-#define realloc rpl_realloc +-EOF ++ ++ ++ ++ echo "$as_me:$LINENO: checking whether fflush_unlocked is declared" >&5 ++echo $ECHO_N "checking whether fflush_unlocked is declared... $ECHO_C" >&6 ++if test "${ac_cv_have_decl_fflush_unlocked+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++#ifndef fflush_unlocked ++ char *p = (char *) fflush_unlocked; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_have_decl_fflush_unlocked=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_have_decl_fflush_unlocked=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_have_decl_fflush_unlocked" >&5 ++echo "${ECHO_T}$ac_cv_have_decl_fflush_unlocked" >&6 ++if test $ac_cv_have_decl_fflush_unlocked = yes; then ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_FFLUSH_UNLOCKED 1 ++_ACEOF ++ ++ ++else ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_FFLUSH_UNLOCKED 0 ++_ACEOF ++ ++ ++fi ++ ++ ++ ++ ++ echo "$as_me:$LINENO: checking whether fgets_unlocked is declared" >&5 ++echo $ECHO_N "checking whether fgets_unlocked is declared... $ECHO_C" >&6 ++if test "${ac_cv_have_decl_fgets_unlocked+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++#ifndef fgets_unlocked ++ char *p = (char *) fgets_unlocked; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_have_decl_fgets_unlocked=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_have_decl_fgets_unlocked=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_have_decl_fgets_unlocked" >&5 ++echo "${ECHO_T}$ac_cv_have_decl_fgets_unlocked" >&6 ++if test $ac_cv_have_decl_fgets_unlocked = yes; then ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_FGETS_UNLOCKED 1 ++_ACEOF ++ ++ ++else ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_FGETS_UNLOCKED 0 ++_ACEOF ++ ++ ++fi ++ ++ ++ ++ ++ echo "$as_me:$LINENO: checking whether fputc_unlocked is declared" >&5 ++echo $ECHO_N "checking whether fputc_unlocked is declared... $ECHO_C" >&6 ++if test "${ac_cv_have_decl_fputc_unlocked+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++#ifndef fputc_unlocked ++ char *p = (char *) fputc_unlocked; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_have_decl_fputc_unlocked=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_have_decl_fputc_unlocked=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_have_decl_fputc_unlocked" >&5 ++echo "${ECHO_T}$ac_cv_have_decl_fputc_unlocked" >&6 ++if test $ac_cv_have_decl_fputc_unlocked = yes; then ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_FPUTC_UNLOCKED 1 ++_ACEOF ++ ++ ++else ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_FPUTC_UNLOCKED 0 ++_ACEOF ++ ++ ++fi ++ ++ ++ ++ ++ echo "$as_me:$LINENO: checking whether fputs_unlocked is declared" >&5 ++echo $ECHO_N "checking whether fputs_unlocked is declared... $ECHO_C" >&6 ++if test "${ac_cv_have_decl_fputs_unlocked+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++#ifndef fputs_unlocked ++ char *p = (char *) fputs_unlocked; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_have_decl_fputs_unlocked=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_have_decl_fputs_unlocked=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_have_decl_fputs_unlocked" >&5 ++echo "${ECHO_T}$ac_cv_have_decl_fputs_unlocked" >&6 ++if test $ac_cv_have_decl_fputs_unlocked = yes; then ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_FPUTS_UNLOCKED 1 ++_ACEOF ++ ++ ++else ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_FPUTS_UNLOCKED 0 ++_ACEOF ++ ++ ++fi ++ ++ ++ ++ ++ echo "$as_me:$LINENO: checking whether fread_unlocked is declared" >&5 ++echo $ECHO_N "checking whether fread_unlocked is declared... $ECHO_C" >&6 ++if test "${ac_cv_have_decl_fread_unlocked+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++#ifndef fread_unlocked ++ char *p = (char *) fread_unlocked; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_have_decl_fread_unlocked=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_have_decl_fread_unlocked=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_have_decl_fread_unlocked" >&5 ++echo "${ECHO_T}$ac_cv_have_decl_fread_unlocked" >&6 ++if test $ac_cv_have_decl_fread_unlocked = yes; then ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_FREAD_UNLOCKED 1 ++_ACEOF ++ ++ ++else ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_FREAD_UNLOCKED 0 ++_ACEOF ++ ++ ++fi ++ ++ ++ ++ ++ echo "$as_me:$LINENO: checking whether fwrite_unlocked is declared" >&5 ++echo $ECHO_N "checking whether fwrite_unlocked is declared... $ECHO_C" >&6 ++if test "${ac_cv_have_decl_fwrite_unlocked+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++#ifndef fwrite_unlocked ++ char *p = (char *) fwrite_unlocked; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_have_decl_fwrite_unlocked=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_have_decl_fwrite_unlocked=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_have_decl_fwrite_unlocked" >&5 ++echo "${ECHO_T}$ac_cv_have_decl_fwrite_unlocked" >&6 ++if test $ac_cv_have_decl_fwrite_unlocked = yes; then ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_FWRITE_UNLOCKED 1 ++_ACEOF ++ ++ ++else ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_FWRITE_UNLOCKED 0 ++_ACEOF ++ ++ ++fi ++ ++ ++ ++ ++ echo "$as_me:$LINENO: checking whether getc_unlocked is declared" >&5 ++echo $ECHO_N "checking whether getc_unlocked is declared... $ECHO_C" >&6 ++if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++#ifndef getc_unlocked ++ char *p = (char *) getc_unlocked; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_have_decl_getc_unlocked=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_have_decl_getc_unlocked=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_have_decl_getc_unlocked" >&5 ++echo "${ECHO_T}$ac_cv_have_decl_getc_unlocked" >&6 ++if test $ac_cv_have_decl_getc_unlocked = yes; then ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_GETC_UNLOCKED 1 ++_ACEOF ++ ++ ++else ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_GETC_UNLOCKED 0 ++_ACEOF ++ ++ ++fi ++ ++ ++ ++ ++ echo "$as_me:$LINENO: checking whether getchar_unlocked is declared" >&5 ++echo $ECHO_N "checking whether getchar_unlocked is declared... $ECHO_C" >&6 ++if test "${ac_cv_have_decl_getchar_unlocked+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++#ifndef getchar_unlocked ++ char *p = (char *) getchar_unlocked; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_have_decl_getchar_unlocked=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_have_decl_getchar_unlocked=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_have_decl_getchar_unlocked" >&5 ++echo "${ECHO_T}$ac_cv_have_decl_getchar_unlocked" >&6 ++if test $ac_cv_have_decl_getchar_unlocked = yes; then ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_GETCHAR_UNLOCKED 1 ++_ACEOF ++ ++ ++else ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_GETCHAR_UNLOCKED 0 ++_ACEOF ++ ++ ++fi ++ ++ ++ ++ ++ echo "$as_me:$LINENO: checking whether putc_unlocked is declared" >&5 ++echo $ECHO_N "checking whether putc_unlocked is declared... $ECHO_C" >&6 ++if test "${ac_cv_have_decl_putc_unlocked+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++#ifndef putc_unlocked ++ char *p = (char *) putc_unlocked; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_have_decl_putc_unlocked=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_have_decl_putc_unlocked=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_have_decl_putc_unlocked" >&5 ++echo "${ECHO_T}$ac_cv_have_decl_putc_unlocked" >&6 ++if test $ac_cv_have_decl_putc_unlocked = yes; then ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_PUTC_UNLOCKED 1 ++_ACEOF ++ ++ ++else ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_PUTC_UNLOCKED 0 ++_ACEOF ++ ++ ++fi ++ ++ ++ ++ ++ echo "$as_me:$LINENO: checking whether putchar_unlocked is declared" >&5 ++echo $ECHO_N "checking whether putchar_unlocked is declared... $ECHO_C" >&6 ++if test "${ac_cv_have_decl_putchar_unlocked+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++#ifndef putchar_unlocked ++ char *p = (char *) putchar_unlocked; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_have_decl_putchar_unlocked=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_have_decl_putchar_unlocked=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_have_decl_putchar_unlocked" >&5 ++echo "${ECHO_T}$ac_cv_have_decl_putchar_unlocked" >&6 ++if test $ac_cv_have_decl_putchar_unlocked = yes; then ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_PUTCHAR_UNLOCKED 1 ++_ACEOF ++ ++ ++else ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_PUTCHAR_UNLOCKED 0 ++_ACEOF ++ ++ ++fi ++ ++ ++ ++ ++ ++ ++ ++ : ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ if test X"$ac_cv_func_malloc_0_nonnull" = Xno || test X"$ac_cv_func_malloc_works" = Xno; then ++ ++ : + + fi + +-echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6 +-echo "configure:2668: checking whether closedir returns void" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_closedir_void'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++ ++ if test X"$ac_cv_func_realloc_0_nonnull" = Xno || test X"$ac_cv_func_realloc_works" = Xno; then ++ ++ : ++ ++ fi ++ ++echo "$as_me:$LINENO: checking whether closedir returns void" >&5 ++echo $ECHO_N "checking whether closedir returns void... $ECHO_C" >&6 ++if test "${ac_cv_func_closedir_void+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then + ac_cv_func_closedir_void=yes + else +- cat > conftest.$ac_ext <<EOF +-#line 2676 "configure" +-#include "confdefs.h" +-#include <sys/types.h> ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default + #include <$ac_header_dirent> +-int closedir(); main() { exit(closedir(opendir(".")) != 0); } +-EOF +-if { (eval echo configure:2682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then ++#ifndef __cplusplus ++int closedir (); ++#endif ++ ++int ++main () ++{ ++exit (closedir (opendir (".")) != 0); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + ac_cv_func_closedir_void=no + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- ac_cv_func_closedir_void=yes ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++ac_cv_func_closedir_void=yes + fi +-rm -fr conftest* ++rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi +- + fi +- +-echo "$ac_t""$ac_cv_func_closedir_void" 1>&6 ++echo "$as_me:$LINENO: result: $ac_cv_func_closedir_void" >&5 ++echo "${ECHO_T}$ac_cv_func_closedir_void" >&6 + if test $ac_cv_func_closedir_void = yes; then +- cat >> confdefs.h <<\EOF ++ ++cat >>confdefs.h <<\_ACEOF + #define CLOSEDIR_VOID 1 +-EOF ++_ACEOF + + fi + +-echo $ac_n "checking for vprintf""... $ac_c" 1>&6 +-echo "configure:2705: checking for vprintf" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++ ++for ac_header in fcntl.h unistd.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + else +- cat > conftest.$ac_ext <<EOF +-#line 2710 "configure" +-#include "confdefs.h" ++ # Is the header compilable? ++echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_header_compiler=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6 ++ ++# Is the header present? ++echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 ++ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++rm -f conftest.err conftest.$ac_ext ++echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6 ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc in ++ yes:no ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++ no:yes ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ ( ++ cat <<\_ASBOX ++## ------------------------------------ ## ++## Report this to bug-autoconf@gnu.org. ## ++## ------------------------------------ ## ++_ASBOX ++ ) | ++ sed "s/^/$as_me: WARNING: /" >&2 ++ ;; ++esac ++echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_Header+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=$ac_header_preproc" ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ echo "$as_me:$LINENO: checking for DOS-style setmode" >&5 ++echo $ECHO_N "checking for DOS-style setmode... $ECHO_C" >&6 ++if test "${ac_cv_func_setmode_dos+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <io.h> ++ #if HAVE_FCNTL_H ++ # include <fcntl.h> ++ #endif ++ #if HAVE_UNISTD_H ++ # include <unistd.h> ++ #endif ++int ++main () ++{ ++int ret = setmode && setmode (1, O_BINARY); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_setmode_dos=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_func_setmode_dos=no ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: $ac_cv_func_setmode_dos" >&5 ++echo "${ECHO_T}$ac_cv_func_setmode_dos" >&6 ++ if test $ac_cv_func_setmode_dos = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_SETMODE_DOS 1 ++_ACEOF ++ ++ fi ++ ++for ac_func in vprintf ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_var+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char vprintf(); below. */ +-#include <assert.h> ++ which can conflict with char $ac_func (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif + /* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++{ ++#endif + /* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char vprintf(); ++ builtin and then its argument prototype would still apply. */ ++char $ac_func (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++choke me ++#else ++char (*f) () = $ac_func; ++#endif ++#ifdef __cplusplus ++} ++#endif + +-int main() { ++int ++main () ++{ ++return f != $ac_func; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++eval "$as_ac_var=no" ++fi ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ++fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ ++echo "$as_me:$LINENO: checking for _doprnt" >&5 ++echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6 ++if test "${ac_cv_func__doprnt+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char _doprnt (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++{ ++#endif ++/* We use char because int might match the return type of a gcc2 ++ builtin and then its argument prototype would still apply. */ ++char _doprnt (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub_vprintf) || defined (__stub___vprintf) ++#if defined (__stub__doprnt) || defined (__stub____doprnt) + choke me + #else +-vprintf(); ++char (*f) () = _doprnt; ++#endif ++#ifdef __cplusplus ++} + #endif + +-; return 0; } +-EOF +-if { (eval echo configure:2733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_func_vprintf=yes" ++int ++main () ++{ ++return f != _doprnt; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func__doprnt=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_func_vprintf=no" ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_func__doprnt=no + fi +-rm -f conftest* ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi ++echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 ++echo "${ECHO_T}$ac_cv_func__doprnt" >&6 ++if test $ac_cv_func__doprnt = yes; then + +-if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- cat >> confdefs.h <<\EOF +-#define HAVE_VPRINTF 1 +-EOF ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_DOPRNT 1 ++_ACEOF + +-else +- echo "$ac_t""no" 1>&6 + fi + +-if test "$ac_cv_func_vprintf" != yes; then +-echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 +-echo "configure:2757: checking for _doprnt" >&5 +-if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++fi ++done ++ ++ ++ ++for ac_func in mkdir ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 ++if eval "test \"\${$as_ac_var+set}\" = set"; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftest.$ac_ext <<EOF +-#line 2762 "configure" +-#include "confdefs.h" ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char _doprnt(); below. */ +-#include <assert.h> ++ which can conflict with char $ac_func (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif + /* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++{ ++#endif + /* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char _doprnt(); +- +-int main() { +- ++ builtin and then its argument prototype would still apply. */ ++char $ac_func (); + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +-#if defined (__stub__doprnt) || defined (__stub____doprnt) ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) + choke me + #else +-_doprnt(); ++char (*f) () = $ac_func; ++#endif ++#ifdef __cplusplus ++} + #endif + +-; return 0; } +-EOF +-if { (eval echo configure:2785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_func__doprnt=yes" ++int ++main () ++{ ++return f != $ac_func; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_func__doprnt=no" ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++eval "$as_ac_var=no" + fi +-rm -f conftest* ++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + fi ++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 ++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF + +-if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- cat >> confdefs.h <<\EOF +-#define HAVE_DOPRNT 1 +-EOF ++fi ++done + ++ echo "$as_me:$LINENO: checking whether mkdir takes only one argument" >&5 ++echo $ECHO_N "checking whether mkdir takes only one argument... $ECHO_C" >&6 ++if test "${patch_cv_mkdir_takes_one_arg+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- echo "$ac_t""no" 1>&6 ++ patch_cv_mkdir_takes_one_arg=no ++ if test $ac_cv_func_mkdir = yes; then ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++#include <sys/types.h> ++#include <sys/stat.h> ++ ++int ++main () ++{ ++mkdir (".", 0); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ : ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++#include <sys/types.h> ++#include <sys/stat.h> ++ ++int ++main () ++{ ++mkdir ("."); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ patch_cv_mkdir_takes_one_arg=yes ++ ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ + fi ++rm -f conftest.$ac_objext conftest.$ac_ext + + fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ fi + + +-echo $ac_n "checking for long file names""... $ac_c" 1>&6 +-echo "configure:2811: checking for long file names" >&5 +-if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++fi ++echo "$as_me:$LINENO: result: $patch_cv_mkdir_takes_one_arg" >&5 ++echo "${ECHO_T}$patch_cv_mkdir_takes_one_arg" >&6 ++ if test $patch_cv_mkdir_takes_one_arg = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define MKDIR_TAKES_ONE_ARG 1 ++_ACEOF ++ ++ fi ++ ++ ++ ++ ++ echo "$as_me:$LINENO: checking whether system is Windows or MSDOS" >&5 ++echo $ECHO_N "checking whether system is Windows or MSDOS... $ECHO_C" >&6 ++if test "${ac_cv_win_or_dos+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ++ cat >conftest.$ac_ext <<_ACEOF ++#line $LINENO "configure" ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++#if !defined _WIN32 && !defined __WIN32__ && !defined __MSDOS__ ++neither MSDOS nor Windows ++#endif ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_win_or_dos=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ac_cv_win_or_dos=no ++fi ++rm -f conftest.$ac_objext conftest.$ac_ext ++ ++fi ++echo "$as_me:$LINENO: result: $ac_cv_win_or_dos" >&5 ++echo "${ECHO_T}$ac_cv_win_or_dos" >&6 ++ ++ 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 ++ ++ ++ ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define FILESYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX $ac_fs_accepts_drive_letter_prefix ++_ACEOF ++ ++ ++ ++ ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define FILESYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR $ac_fs_backslash_is_file_name_separator ++_ACEOF ++ ++ ++echo "$as_me:$LINENO: checking for long file names" >&5 ++echo $ECHO_N "checking for long file names... $ECHO_C" >&6 ++if test "${ac_cv_sys_long_file_names+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_sys_long_file_names=yes + # Test for long file names in all the places we know might matter: +@@ -2823,459 +10771,1123 @@ + # /var/tmp likewise + # /usr/tmp likewise + if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then +- ac_tmpdirs="$TMPDIR" ++ ac_tmpdirs=$TMPDIR + else + ac_tmpdirs='/tmp /var/tmp /usr/tmp' + fi + for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do + test -d $ac_dir || continue + test -w $ac_dir || continue # It is less confusing to not echo anything here. +- (echo 1 > $ac_dir/conftest9012345) 2>/dev/null +- (echo 2 > $ac_dir/conftest9012346) 2>/dev/null +- val=`cat $ac_dir/conftest9012345 2>/dev/null` +- if test ! -f $ac_dir/conftest9012345 || test "$val" != 1; then ++ ac_xdir=$ac_dir/cf$$ ++ (umask 077 && mkdir $ac_xdir 2>/dev/null) || continue ++ ac_tf1=$ac_xdir/conftest9012345 ++ ac_tf2=$ac_xdir/conftest9012346 ++ (echo 1 >$ac_tf1) 2>/dev/null ++ (echo 2 >$ac_tf2) 2>/dev/null ++ ac_val=`cat $ac_tf1 2>/dev/null` ++ if test ! -f $ac_tf1 || test "$ac_val" != 1; then + ac_cv_sys_long_file_names=no +- rm -f $ac_dir/conftest9012345 $ac_dir/conftest9012346 2>/dev/null ++ rm -rf $ac_xdir 2>/dev/null + break + fi +- rm -f $ac_dir/conftest9012345 $ac_dir/conftest9012346 2>/dev/null ++ rm -rf $ac_xdir 2>/dev/null + done + fi +- +-echo "$ac_t""$ac_cv_sys_long_file_names" 1>&6 ++echo "$as_me:$LINENO: result: $ac_cv_sys_long_file_names" >&5 ++echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 + if test $ac_cv_sys_long_file_names = yes; then +- cat >> confdefs.h <<\EOF ++ ++cat >>confdefs.h <<\_ACEOF + #define HAVE_LONG_FILE_NAMES 1 +-EOF ++_ACEOF + + fi + +- echo $ac_n "checking for d_ino member in directory struct""... $ac_c" 1>&6 +-echo "configure:2855: checking for d_ino member in directory struct" >&5 +-if eval "test \"`echo '$''{'jm_cv_struct_dirent_d_ino'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext <<EOF +-#line 2860 "configure" +-#include "confdefs.h" +- +-#include <sys/types.h> +-#ifdef HAVE_DIRENT_H +-# include <dirent.h> +-#else /* not HAVE_DIRENT_H */ +-# define dirent direct +-# ifdef HAVE_SYS_NDIR_H +-# include <sys/ndir.h> +-# endif /* HAVE_SYS_NDIR_H */ +-# ifdef HAVE_SYS_DIR_H +-# include <sys/dir.h> +-# endif /* HAVE_SYS_DIR_H */ +-# ifdef HAVE_NDIR_H +-# include <ndir.h> +-# endif /* HAVE_NDIR_H */ +-#endif /* HAVE_DIRENT_H */ +- +-int main() { +-struct dirent dp; dp.d_ino = 0; +-; return 0; } +-EOF +-if { (eval echo configure:2883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- jm_cv_struct_dirent_d_ino=yes +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- jm_cv_struct_dirent_d_ino=no +-fi +-rm -f conftest* +- +- +-fi +- +-echo "$ac_t""$jm_cv_struct_dirent_d_ino" 1>&6 +- if test $jm_cv_struct_dirent_d_ino = yes; then +- cat >> confdefs.h <<\EOF +-#define D_INO_IN_DIRENT 1 +-EOF +- +- fi +- + ++ ac_config_files="$ac_config_files Makefile" + +-trap '' 1 2 15 +-cat > confcache <<\EOF ++cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure + # tests run on this system so they can be shared between configure +-# scripts and configure runs. It is not useful on other systems. +-# If it contains results you don't want to keep, you may remove or edit it. ++# scripts and configure runs, see configure's option --config-cache. ++# It is not useful on other systems. If it contains results you don't ++# want to keep, you may remove or edit it. + # +-# By default, configure uses ./config.cache as the cache file, +-# creating it if it does not exist already. You can give configure +-# the --cache-file=FILE option to use a different cache file; that is +-# what configure does when it calls configure scripts in +-# subdirectories, so they share the cache. +-# Giving --cache-file=/dev/null disables caching, for debugging configure. +-# config.status only pays attention to the cache file if you give it the +-# --recheck option to rerun configure. ++# config.status only pays attention to the cache file if you give it ++# the --recheck option to rerun configure. + # +-EOF ++# `ac_cv_env_foo' variables (set or unset) will be overridden when ++# loading this file, other *unset* `ac_cv_foo' will be assigned the ++# following values. ++ ++_ACEOF ++ + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. + # So, don't put newlines in cache variables' values. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-(set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote substitution +- # turns \\\\ into \\, and sed turns \\ into \). +- sed -n \ +- -e "s/'/'\\\\''/g" \ +- -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" +- ;; +- *) +- # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' +- ;; +- esac >> confcache +-if cmp -s $cache_file confcache; then +- : +-else ++{ ++ (set) 2>&1 | ++ case `(ac_space=' '; set | grep ac_space) 2>&1` in ++ *ac_space=\ *) ++ # `set' does not quote correctly, so add quotes (double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \). ++ sed -n \ ++ "s/'/'\\\\''/g; ++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ++ ;; ++ *) ++ # `set' quotes correctly as required by POSIX, so do not add quotes. ++ sed -n \ ++ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ++ ;; ++ esac; ++} | ++ sed ' ++ t clear ++ : clear ++ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ ++ t end ++ /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ : end' >>confcache ++if diff $cache_file confcache >/dev/null 2>&1; then :; else + if test -w $cache_file; then +- echo "updating cache $cache_file" +- cat confcache > $cache_file ++ test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" ++ cat confcache >$cache_file + else + echo "not updating unwritable cache $cache_file" + fi + fi + rm -f confcache + +-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 +- + test "x$prefix" = xNONE && prefix=$ac_default_prefix + # Let make expand exec_prefix. + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +-# Any assignment to VPATH causes Sun make to only execute +-# the first set of double-colon rules, so remove it if not needed. +-# If there is a colon in the path, we need to keep it. ++# VPATH may cause trouble with some makes, so we remove $(srcdir), ++# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and ++# trailing colons and then remove the whole line if VPATH becomes empty ++# (actually we leave an empty line to preserve line numbers). + if test "x$srcdir" = x.; then +- ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' ++ ac_vpsub='/^[ ]*VPATH[ ]*=/{ ++s/:*\$(srcdir):*/:/; ++s/:*\${srcdir}:*/:/; ++s/:*@srcdir@:*/:/; ++s/^\([^=]*=[ ]*\):*/\1/; ++s/:*$//; ++s/^[^=]*=[ ]*$//; ++}' + fi + +-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 +- + DEFS=-DHAVE_CONFIG_H + +-# Without the "./", some shells look in PATH for config.status. +-: ${CONFIG_STATUS=./config.status} ++ac_libobjs= ++ac_ltlibobjs= ++for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue ++ # 1. Remove the extension, and $U if already installed. ++ ac_i=`echo "$ac_i" | ++ sed 's/\$U\././;s/\.o$//;s/\.obj$//'` ++ # 2. Add them. ++ ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" ++ ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' ++done ++LIBOBJS=$ac_libobjs + +-echo creating $CONFIG_STATUS +-rm -f $CONFIG_STATUS +-cat > $CONFIG_STATUS <<EOF +-#! /bin/sh +-# Generated automatically by configure. ++LTLIBOBJS=$ac_ltlibobjs ++ ++ ++ ++: ${CONFIG_STATUS=./config.status} ++ac_clean_files_save=$ac_clean_files ++ac_clean_files="$ac_clean_files $CONFIG_STATUS" ++{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 ++echo "$as_me: creating $CONFIG_STATUS" >&6;} ++cat >$CONFIG_STATUS <<_ACEOF ++#! $SHELL ++# Generated by $as_me. + # Run this file to recreate the current configuration. +-# This directory was configured as follows, +-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +-# +-# $0 $ac_configure_args +-# + # Compiler output produced by configure, useful for debugging +-# configure, is in ./config.log if it exists. ++# configure, is in config.log if it exists. + +-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" +-for ac_option ++debug=false ++ac_cs_recheck=false ++ac_cs_silent=false ++SHELL=\${CONFIG_SHELL-$SHELL} ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<\_ACEOF ++## --------------------- ## ++## M4sh Initialization. ## ++## --------------------- ## ++ ++# Be Bourne compatible ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '${1+"$@"}'='"$@"' ++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then ++ set -o posix ++fi ++ ++# Support unset when possible. ++if (FOO=FOO; unset FOO) >/dev/null 2>&1; then ++ as_unset=unset ++else ++ as_unset=false ++fi ++ ++ ++# Work around bugs in pre-3.0 UWIN ksh. ++$as_unset ENV MAIL MAILPATH ++PS1='$ ' ++PS2='> ' ++PS4='+ ' ++ ++# NLS nuisances. ++for as_var in \ ++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ++ LC_TELEPHONE LC_TIME + do +- case "\$ac_option" in +- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) +- echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" +- exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; +- -version | --version | --versio | --versi | --vers | --ver | --ve | --v) +- echo "$CONFIG_STATUS generated by autoconf version 2.13" +- exit 0 ;; +- -help | --help | --hel | --he | --h) +- echo "\$ac_cs_usage"; exit 0 ;; +- *) echo "\$ac_cs_usage"; exit 1 ;; +- esac ++ if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then ++ eval $as_var=C; export $as_var ++ else ++ $as_unset $as_var ++ fi + done + +-ac_given_srcdir=$srcdir +-ac_given_INSTALL="$INSTALL" ++# Required to use basename. ++if expr a : '\(a\)' >/dev/null 2>&1; then ++ as_expr=expr ++else ++ as_expr=false ++fi + +-trap 'rm -fr `echo "Makefile config.h:config.hin" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +-EOF +-cat >> $CONFIG_STATUS <<EOF ++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then ++ as_basename=basename ++else ++ as_basename=false ++fi + +-# Protect against being on the right side of a sed subst in config.status. +-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; +- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF +-$ac_vpsub +-$extrasub +-s%@SHELL@%$SHELL%g +-s%@CFLAGS@%$CFLAGS%g +-s%@CPPFLAGS@%$CPPFLAGS%g +-s%@CXXFLAGS@%$CXXFLAGS%g +-s%@FFLAGS@%$FFLAGS%g +-s%@DEFS@%$DEFS%g +-s%@LDFLAGS@%$LDFLAGS%g +-s%@LIBS@%$LIBS%g +-s%@exec_prefix@%$exec_prefix%g +-s%@prefix@%$prefix%g +-s%@program_transform_name@%$program_transform_name%g +-s%@bindir@%$bindir%g +-s%@sbindir@%$sbindir%g +-s%@libexecdir@%$libexecdir%g +-s%@datadir@%$datadir%g +-s%@sysconfdir@%$sysconfdir%g +-s%@sharedstatedir@%$sharedstatedir%g +-s%@localstatedir@%$localstatedir%g +-s%@libdir@%$libdir%g +-s%@includedir@%$includedir%g +-s%@oldincludedir@%$oldincludedir%g +-s%@infodir@%$infodir%g +-s%@mandir@%$mandir%g +-s%@host@%$host%g +-s%@host_alias@%$host_alias%g +-s%@host_cpu@%$host_cpu%g +-s%@host_vendor@%$host_vendor%g +-s%@host_os@%$host_os%g +-s%@PACKAGE@%$PACKAGE%g +-s%@VERSION@%$VERSION%g +-s%@CC@%$CC%g +-s%@CPP@%$CPP%g +-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g +-s%@INSTALL_DATA@%$INSTALL_DATA%g +-s%@SET_MAKE@%$SET_MAKE%g +-s%@ed_PROGRAM@%$ed_PROGRAM%g +-s%@build@%$build%g +-s%@build_alias@%$build_alias%g +-s%@build_cpu@%$build_cpu%g +-s%@build_vendor@%$build_vendor%g +-s%@build_os@%$build_os%g +-s%@GETCONF@%$GETCONF%g +-s%@EXEEXT@%$EXEEXT%g +-s%@U@%$U%g +-s%@ANSI2KNR@%$ANSI2KNR%g +-s%@LIBOBJS@%$LIBOBJS%g + +-CEOF +-EOF ++# Name of the executable. ++as_me=`$as_basename "$0" || ++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)$' \| \ ++ . : '\(.\)' 2>/dev/null || ++echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } ++ /^X\/\(\/\/\)$/{ s//\1/; q; } ++ /^X\/\(\/\).*/{ s//\1/; q; } ++ s/.*/./; q'` + +-cat >> $CONFIG_STATUS <<\EOF + +-# Split the substitutions into bite-sized pieces for seds with +-# small command number limits, like on Digital OSF/1 and HP-UX. +-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. +-ac_file=1 # Number of current file. +-ac_beg=1 # First line for current file. +-ac_end=$ac_max_sed_cmds # Line after last line for current file. +-ac_more_lines=: +-ac_sed_cmds="" +-while $ac_more_lines; do +- if test $ac_beg -gt 1; then +- sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file ++# PATH needs CR, and LINENO needs CR and PATH. ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits ++ ++# 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 +- sed "${ac_end}q" conftest.subs > conftest.s$ac_file ++ PATH_SEPARATOR=: + fi +- if test ! -s conftest.s$ac_file; then +- ac_more_lines=false +- rm -f conftest.s$ac_file ++ rm -f conf$$.sh ++fi ++ ++ ++ as_lineno_1=$LINENO ++ as_lineno_2=$LINENO ++ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` ++ test "x$as_lineno_1" != "x$as_lineno_2" && ++ test "x$as_lineno_3" = "x$as_lineno_2" || { ++ # Find who we are. Look in the path if we contain no path at all ++ # relative or not. ++ case $0 in ++ *[\\/]* ) as_myself=$0 ;; ++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++done ++ ++ ;; ++ esac ++ # We did not find ourselves, most probably we were run as `sh COMMAND' ++ # in which case we are not to be found in the path. ++ if test "x$as_myself" = x; then ++ as_myself=$0 ++ fi ++ if test ! -f "$as_myself"; then ++ { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 ++echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++ case $CONFIG_SHELL in ++ '') ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for as_base in sh bash ksh sh5; do ++ case $as_dir in ++ /*) ++ if ("$as_dir/$as_base" -c ' ++ as_lineno_1=$LINENO ++ as_lineno_2=$LINENO ++ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` ++ test "x$as_lineno_1" != "x$as_lineno_2" && ++ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then ++ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } ++ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } ++ CONFIG_SHELL=$as_dir/$as_base ++ export CONFIG_SHELL ++ exec "$CONFIG_SHELL" "$0" ${1+"$@"} ++ fi;; ++ esac ++ done ++done ++;; ++ esac ++ ++ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO ++ # uniformly replaced by the line number. The first 'sed' inserts a ++ # line-number line before each line; the second 'sed' does the real ++ # work. The second script uses 'N' to pair each line-number line ++ # with the numbered line, and appends trailing '-' during ++ # substitution so that $LINENO is not a special case at line end. ++ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the ++ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) ++ sed '=' <$as_myself | ++ sed ' ++ N ++ s,$,-, ++ : loop ++ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, ++ t loop ++ s,-$,, ++ s,^['$as_cr_digits']*\n,, ++ ' >$as_me.lineno && ++ chmod +x $as_me.lineno || ++ { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 ++echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} ++ { (exit 1); exit 1; }; } ++ ++ # Don't try to exec as it changes $[0], causing all sort of problems ++ # (the dirname of $[0] is not the place where we might find the ++ # original and so on. Autoconf is especially sensible to this). ++ . ./$as_me.lineno ++ # Exit status is that of the last command. ++ exit ++} ++ ++ ++case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in ++ *c*,-n*) ECHO_N= ECHO_C=' ++' ECHO_T=' ' ;; ++ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; ++ *) ECHO_N= ECHO_C='\c' ECHO_T= ;; ++esac ++ ++if expr a : '\(a\)' >/dev/null 2>&1; then ++ as_expr=expr ++else ++ as_expr=false ++fi ++ ++rm -f conf$$ conf$$.exe conf$$.file ++echo >conf$$.file ++if ln -s conf$$.file conf$$ 2>/dev/null; then ++ # We could just check for DJGPP; but this test a) works b) is more generic ++ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). ++ if test -f conf$$.exe; then ++ # Don't use ln at all; we don't have any links ++ as_ln_s='cp -p' + else +- if test -z "$ac_sed_cmds"; then +- ac_sed_cmds="sed -f conftest.s$ac_file" +- else +- ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" +- fi +- ac_file=`expr $ac_file + 1` +- ac_beg=$ac_end +- ac_end=`expr $ac_end + $ac_max_sed_cmds` ++ as_ln_s='ln -s' + fi ++elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln ++else ++ as_ln_s='cp -p' ++fi ++rm -f conf$$ conf$$.exe conf$$.file ++ ++if mkdir -p . 2>/dev/null; then ++ as_mkdir_p=: ++else ++ as_mkdir_p=false ++fi ++ ++as_executable_p="test -f" ++ ++# Sed expression to map a string onto a valid CPP name. ++as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" ++ ++# Sed expression to map a string onto a valid variable name. ++as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" ++ ++ ++# IFS ++# We need space, tab and new line, in precisely that order. ++as_nl=' ++' ++IFS=" $as_nl" ++ ++# CDPATH. ++$as_unset CDPATH ++ ++exec 6>&1 ++ ++# Open the log real soon, to keep \$[0] and so on meaningful, and to ++# report actual input values of CONFIG_FILES etc. instead of their ++# values after options handling. Logging --version etc. is OK. ++exec 5>>config.log ++{ ++ echo ++ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ++## Running $as_me. ## ++_ASBOX ++} >&5 ++cat >&5 <<_CSEOF ++ ++This file was extended by patch $as_me 2.5.9, which was ++generated by GNU Autoconf 2.57. Invocation command line was ++ ++ CONFIG_FILES = $CONFIG_FILES ++ CONFIG_HEADERS = $CONFIG_HEADERS ++ CONFIG_LINKS = $CONFIG_LINKS ++ CONFIG_COMMANDS = $CONFIG_COMMANDS ++ $ $0 $@ ++ ++_CSEOF ++echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 ++echo >&5 ++_ACEOF ++ ++# Files that config.status was made for. ++if test -n "$ac_config_files"; then ++ echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS ++fi ++ ++if test -n "$ac_config_headers"; then ++ echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS ++fi ++ ++if test -n "$ac_config_links"; then ++ echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS ++fi ++ ++if test -n "$ac_config_commands"; then ++ echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS ++fi ++ ++cat >>$CONFIG_STATUS <<\_ACEOF ++ ++ac_cs_usage="\ ++\`$as_me' instantiates files from templates according to the ++current configuration. ++ ++Usage: $0 [OPTIONS] [FILE]... ++ ++ -h, --help print this help, then exit ++ -V, --version print version number, then exit ++ -q, --quiet do not print progress messages ++ -d, --debug don't remove temporary files ++ --recheck update $as_me by reconfiguring in the same conditions ++ --file=FILE[:TEMPLATE] ++ instantiate the configuration file FILE ++ --header=FILE[:TEMPLATE] ++ instantiate the configuration header FILE ++ ++Configuration files: ++$config_files ++ ++Configuration headers: ++$config_headers ++ ++Report bugs to <bug-autoconf@gnu.org>." ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<_ACEOF ++ac_cs_version="\\ ++patch config.status 2.5.9 ++configured by $0, generated by GNU Autoconf 2.57, ++ with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" ++ ++Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 ++Free Software Foundation, Inc. ++This config.status script is free software; the Free Software Foundation ++gives unlimited permission to copy, distribute and modify it." ++srcdir=$srcdir ++INSTALL="$INSTALL" ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<\_ACEOF ++# If no file are specified by the user, then we need to provide default ++# value. By we need to know if files were specified by the user. ++ac_need_defaults=: ++while test $# != 0 ++do ++ case $1 in ++ --*=*) ++ ac_option=`expr "x$1" : 'x\([^=]*\)='` ++ ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` ++ ac_shift=: ++ ;; ++ -*) ++ ac_option=$1 ++ ac_optarg=$2 ++ ac_shift=shift ++ ;; ++ *) # This is not an option, so the user has probably given explicit ++ # arguments. ++ ac_option=$1 ++ ac_need_defaults=false;; ++ esac ++ ++ case $ac_option in ++ # Handling of the options. ++_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF ++ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ++ ac_cs_recheck=: ;; ++ --version | --vers* | -V ) ++ echo "$ac_cs_version"; exit 0 ;; ++ --he | --h) ++ # Conflict between --help and --header ++ { { echo "$as_me:$LINENO: error: ambiguous option: $1 ++Try \`$0 --help' for more information." >&5 ++echo "$as_me: error: ambiguous option: $1 ++Try \`$0 --help' for more information." >&2;} ++ { (exit 1); exit 1; }; };; ++ --help | --hel | -h ) ++ echo "$ac_cs_usage"; exit 0 ;; ++ --debug | --d* | -d ) ++ debug=: ;; ++ --file | --fil | --fi | --f ) ++ $ac_shift ++ CONFIG_FILES="$CONFIG_FILES $ac_optarg" ++ ac_need_defaults=false;; ++ --header | --heade | --head | --hea ) ++ $ac_shift ++ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ++ ac_need_defaults=false;; ++ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ ++ | -silent | --silent | --silen | --sile | --sil | --si | --s) ++ ac_cs_silent=: ;; ++ ++ # This is an error. ++ -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 ++Try \`$0 --help' for more information." >&5 ++echo "$as_me: error: unrecognized option: $1 ++Try \`$0 --help' for more information." >&2;} ++ { (exit 1); exit 1; }; } ;; ++ ++ *) ac_config_targets="$ac_config_targets $1" ;; ++ ++ esac ++ shift + done +-if test -z "$ac_sed_cmds"; then +- ac_sed_cmds=cat ++ ++ac_configure_extra_args= ++ ++if $ac_cs_silent; then ++ exec 6>/dev/null ++ ac_configure_extra_args="$ac_configure_extra_args --silent" + fi +-EOF + +-cat >> $CONFIG_STATUS <<EOF ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF ++if \$ac_cs_recheck; then ++ echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 ++ exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion ++fi + +-CONFIG_FILES=\${CONFIG_FILES-"Makefile"} +-EOF +-cat >> $CONFIG_STATUS <<\EOF +-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then +- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". +- case "$ac_file" in +- *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` +- ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; +- *) ac_file_in="${ac_file}.in" ;; ++_ACEOF ++ ++ ++ ++ ++ ++cat >>$CONFIG_STATUS <<\_ACEOF ++for ac_config_target in $ac_config_targets ++do ++ case "$ac_config_target" in ++ # Handling of arguments. ++ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; ++ "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.hin" ;; ++ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 ++echo "$as_me: error: invalid argument: $ac_config_target" >&2;} ++ { (exit 1); exit 1; }; };; + esac ++done + +- # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. ++# If the user did not use the arguments to specify the items to instantiate, ++# then the envvar interface is used. Set only those that are not. ++# We use the long form for the default assignment because of an extremely ++# bizarre bug on SunOS 4.1.3. ++if $ac_need_defaults; then ++ test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files ++ test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers ++fi + +- # Remove last slash and all that follows it. Not all systems have dirname. +- ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` +- if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then +- # The file is in a subdirectory. +- test ! -d "$ac_dir" && mkdir "$ac_dir" +- ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" +- # A "../" for each directory in $ac_dir_suffix. +- ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` +- else +- ac_dir_suffix= ac_dots= ++# Have a temporary directory for convenience. Make it in the build tree ++# simply because there is no reason to put it here, and in addition, ++# creating and moving files from /tmp can sometimes cause problems. ++# Create a temporary directory, and hook for its removal unless debugging. ++$debug || ++{ ++ trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 ++ trap '{ (exit 1); exit 1; }' 1 2 13 15 ++} ++ ++# Create a (secure) tmp directory for tmp files. ++ ++{ ++ tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && ++ test -n "$tmp" && test -d "$tmp" ++} || ++{ ++ tmp=./confstat$$-$RANDOM ++ (umask 077 && mkdir $tmp) ++} || ++{ ++ echo "$me: cannot create a temporary directory in ." >&2 ++ { (exit 1); exit 1; } ++} ++ ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<_ACEOF ++ ++# ++# CONFIG_FILES section. ++# ++ ++# No need to generate the scripts if there are no CONFIG_FILES. ++# This happens for instance when ./config.status config.h ++if test -n "\$CONFIG_FILES"; then ++ # Protect against being on the right side of a sed subst in config.status. ++ sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; ++ s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF ++s,@SHELL@,$SHELL,;t t ++s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t ++s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t ++s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t ++s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t ++s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t ++s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t ++s,@exec_prefix@,$exec_prefix,;t t ++s,@prefix@,$prefix,;t t ++s,@program_transform_name@,$program_transform_name,;t t ++s,@bindir@,$bindir,;t t ++s,@sbindir@,$sbindir,;t t ++s,@libexecdir@,$libexecdir,;t t ++s,@datadir@,$datadir,;t t ++s,@sysconfdir@,$sysconfdir,;t t ++s,@sharedstatedir@,$sharedstatedir,;t t ++s,@localstatedir@,$localstatedir,;t t ++s,@libdir@,$libdir,;t t ++s,@includedir@,$includedir,;t t ++s,@oldincludedir@,$oldincludedir,;t t ++s,@infodir@,$infodir,;t t ++s,@mandir@,$mandir,;t t ++s,@build_alias@,$build_alias,;t t ++s,@host_alias@,$host_alias,;t t ++s,@target_alias@,$target_alias,;t t ++s,@DEFS@,$DEFS,;t t ++s,@ECHO_C@,$ECHO_C,;t t ++s,@ECHO_N@,$ECHO_N,;t t ++s,@ECHO_T@,$ECHO_T,;t t ++s,@LIBS@,$LIBS,;t t ++s,@CC@,$CC,;t t ++s,@CFLAGS@,$CFLAGS,;t t ++s,@LDFLAGS@,$LDFLAGS,;t t ++s,@CPPFLAGS@,$CPPFLAGS,;t t ++s,@ac_ct_CC@,$ac_ct_CC,;t t ++s,@EXEEXT@,$EXEEXT,;t t ++s,@OBJEXT@,$OBJEXT,;t t ++s,@CPP@,$CPP,;t t ++s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t ++s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t ++s,@INSTALL_DATA@,$INSTALL_DATA,;t t ++s,@SET_MAKE@,$SET_MAKE,;t t ++s,@ed_PROGRAM@,$ed_PROGRAM,;t t ++s,@EGREP@,$EGREP,;t t ++s,@STDBOOL_H@,$STDBOOL_H,;t t ++s,@HAVE__BOOL@,$HAVE__BOOL,;t t ++s,@LIBOBJS@,$LIBOBJS,;t t ++s,@LTLIBOBJS@,$LTLIBOBJS,;t t ++CEOF ++ ++_ACEOF ++ ++ cat >>$CONFIG_STATUS <<\_ACEOF ++ # Split the substitutions into bite-sized pieces for seds with ++ # small command number limits, like on Digital OSF/1 and HP-UX. ++ ac_max_sed_lines=48 ++ ac_sed_frag=1 # Number of current file. ++ ac_beg=1 # First line for current file. ++ ac_end=$ac_max_sed_lines # Line after last line for current file. ++ ac_more_lines=: ++ ac_sed_cmds= ++ while $ac_more_lines; do ++ if test $ac_beg -gt 1; then ++ sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag ++ else ++ sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag ++ fi ++ if test ! -s $tmp/subs.frag; then ++ ac_more_lines=false ++ else ++ # The purpose of the label and of the branching condition is to ++ # speed up the sed processing (if there are no `@' at all, there ++ # is no need to browse any of the substitutions). ++ # These are the two extra sed commands mentioned above. ++ (echo ':t ++ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed ++ if test -z "$ac_sed_cmds"; then ++ ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" ++ else ++ ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" ++ fi ++ ac_sed_frag=`expr $ac_sed_frag + 1` ++ ac_beg=$ac_end ++ ac_end=`expr $ac_end + $ac_max_sed_lines` ++ fi ++ done ++ if test -z "$ac_sed_cmds"; then ++ ac_sed_cmds=cat + fi ++fi # test -n "$CONFIG_FILES" + +- case "$ac_given_srcdir" in +- .) srcdir=. +- if test -z "$ac_dots"; then top_srcdir=. +- else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; +- /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; +- *) # Relative path. +- srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" +- top_srcdir="$ac_dots$ac_given_srcdir" ;; ++_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF ++for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue ++ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". ++ case $ac_file in ++ - | *:- | *:-:* ) # input from stdin ++ cat >$tmp/stdin ++ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` ++ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; ++ *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` ++ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; ++ * ) ac_file_in=$ac_file.in ;; + esac + +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; +- esac ++ # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. ++ ac_dir=`(dirname "$ac_file") 2>/dev/null || ++$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$ac_file" : 'X\(//\)[^/]' \| \ ++ X"$ac_file" : 'X\(//\)$' \| \ ++ X"$ac_file" : 'X\(/\)' \| \ ++ . : '\(.\)' 2>/dev/null || ++echo X"$ac_file" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } ++ /^X\(\/\/\)[^/].*/{ s//\1/; q; } ++ /^X\(\/\/\)$/{ s//\1/; q; } ++ /^X\(\/\).*/{ s//\1/; q; } ++ s/.*/./; q'` ++ { if $as_mkdir_p; then ++ mkdir -p "$ac_dir" ++ else ++ as_dir="$ac_dir" ++ as_dirs= ++ while test ! -d "$as_dir"; do ++ as_dirs="$as_dir $as_dirs" ++ as_dir=`(dirname "$as_dir") 2>/dev/null || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| \ ++ . : '\(.\)' 2>/dev/null || ++echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } ++ /^X\(\/\/\)[^/].*/{ s//\1/; q; } ++ /^X\(\/\/\)$/{ s//\1/; q; } ++ /^X\(\/\).*/{ s//\1/; q; } ++ s/.*/./; q'` ++ done ++ test ! -n "$as_dirs" || mkdir $as_dirs ++ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 ++echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} ++ { (exit 1); exit 1; }; }; } + +- echo creating "$ac_file" +- rm -f "$ac_file" +- configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." +- case "$ac_file" in +- *Makefile*) ac_comsub="1i\\ +-# $configure_input" ;; +- *) ac_comsub= ;; ++ ac_builddir=. ++ ++if test "$ac_dir" != .; then ++ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` ++ # A "../" for each directory in $ac_dir_suffix. ++ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` ++else ++ ac_dir_suffix= ac_top_builddir= ++fi ++ ++case $srcdir in ++ .) # No --srcdir option. We are building in place. ++ ac_srcdir=. ++ if test -z "$ac_top_builddir"; then ++ ac_top_srcdir=. ++ else ++ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` ++ fi ;; ++ [\\/]* | ?:[\\/]* ) # Absolute path. ++ ac_srcdir=$srcdir$ac_dir_suffix; ++ ac_top_srcdir=$srcdir ;; ++ *) # Relative path. ++ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ++ ac_top_srcdir=$ac_top_builddir$srcdir ;; ++esac ++# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be ++# absolute. ++ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` ++ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` ++ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ++ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` ++ ++ ++ case $INSTALL in ++ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; ++ *) ac_INSTALL=$ac_top_builddir$INSTALL ;; + esac + +- ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` +- sed -e "$ac_comsub +-s%@configure_input@%$configure_input%g +-s%@srcdir@%$srcdir%g +-s%@top_srcdir@%$top_srcdir%g +-s%@INSTALL@%$INSTALL%g +-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file +-fi; done +-rm -f conftest.s* ++ if test x"$ac_file" != x-; then ++ { echo "$as_me:$LINENO: creating $ac_file" >&5 ++echo "$as_me: creating $ac_file" >&6;} ++ rm -f "$ac_file" ++ fi ++ # Let's still pretend it is `configure' which instantiates (i.e., don't ++ # use $as_me), people would be surprised to read: ++ # /* config.h. Generated by config.status. */ ++ if test x"$ac_file" = x-; then ++ configure_input= ++ else ++ configure_input="$ac_file. " ++ fi ++ configure_input=$configure_input"Generated from `echo $ac_file_in | ++ sed 's,.*/,,'` by configure." ++ ++ # First look for the input files in the build tree, otherwise in the ++ # src tree. ++ ac_file_inputs=`IFS=: ++ for f in $ac_file_in; do ++ case $f in ++ -) echo $tmp/stdin ;; ++ [\\/$]*) ++ # Absolute (can't be DOS-style, as IFS=:) ++ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 ++echo "$as_me: error: cannot find input file: $f" >&2;} ++ { (exit 1); exit 1; }; } ++ echo $f;; ++ *) # Relative ++ if test -f "$f"; then ++ # Build tree ++ echo $f ++ elif test -f "$srcdir/$f"; then ++ # Source tree ++ echo $srcdir/$f ++ else ++ # /dev/null tree ++ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 ++echo "$as_me: error: cannot find input file: $f" >&2;} ++ { (exit 1); exit 1; }; } ++ fi;; ++ esac ++ done` || { (exit 1); exit 1; } ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF ++ sed "$ac_vpsub ++$extrasub ++_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF ++:t ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b ++s,@configure_input@,$configure_input,;t t ++s,@srcdir@,$ac_srcdir,;t t ++s,@abs_srcdir@,$ac_abs_srcdir,;t t ++s,@top_srcdir@,$ac_top_srcdir,;t t ++s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t ++s,@builddir@,$ac_builddir,;t t ++s,@abs_builddir@,$ac_abs_builddir,;t t ++s,@top_builddir@,$ac_top_builddir,;t t ++s,@abs_top_builddir@,$ac_abs_top_builddir,;t t ++s,@INSTALL@,$ac_INSTALL,;t t ++" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out ++ rm -f $tmp/stdin ++ if test x"$ac_file" != x-; then ++ mv $tmp/out $ac_file ++ else ++ cat $tmp/out ++ rm -f $tmp/out ++ fi ++ ++done ++_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF ++ ++# ++# CONFIG_HEADER section. ++# + + # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where + # NAME is the cpp macro being defined and VALUE is the value it is being given. + # + # ac_d sets the value in "#define NAME VALUE" lines. +-ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' +-ac_dB='\([ ][ ]*\)[^ ]*%\1#\2' +-ac_dC='\3' +-ac_dD='%g' +-# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". +-ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +-ac_uB='\([ ]\)%\1#\2define\3' ++ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' ++ac_dB='[ ].*$,\1#\2' ++ac_dC=' ' ++ac_dD=',;t' ++# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". ++ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' ++ac_uB='$,\1#\2define\3' + ac_uC=' ' +-ac_uD='\4%g' +-# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". +-ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +-ac_eB='$%\1#\2define\3' +-ac_eC=' ' +-ac_eD='%g' ++ac_uD=',;t' + +-if test "${CONFIG_HEADERS+set}" != set; then +-EOF +-cat >> $CONFIG_STATUS <<EOF +- CONFIG_HEADERS="config.h:config.hin" +-EOF +-cat >> $CONFIG_STATUS <<\EOF +-fi +-for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then ++for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". +- case "$ac_file" in +- *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` +- ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; +- *) ac_file_in="${ac_file}.in" ;; ++ case $ac_file in ++ - | *:- | *:-:* ) # input from stdin ++ cat >$tmp/stdin ++ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` ++ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; ++ *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` ++ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; ++ * ) ac_file_in=$ac_file.in ;; + esac + +- echo creating $ac_file ++ test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 ++echo "$as_me: creating $ac_file" >&6;} + +- rm -f conftest.frag conftest.in conftest.out +- ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` +- cat $ac_file_inputs > conftest.in ++ # First look for the input files in the build tree, otherwise in the ++ # src tree. ++ ac_file_inputs=`IFS=: ++ for f in $ac_file_in; do ++ case $f in ++ -) echo $tmp/stdin ;; ++ [\\/$]*) ++ # Absolute (can't be DOS-style, as IFS=:) ++ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 ++echo "$as_me: error: cannot find input file: $f" >&2;} ++ { (exit 1); exit 1; }; } ++ echo $f;; ++ *) # Relative ++ if test -f "$f"; then ++ # Build tree ++ echo $f ++ elif test -f "$srcdir/$f"; then ++ # Source tree ++ echo $srcdir/$f ++ else ++ # /dev/null tree ++ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 ++echo "$as_me: error: cannot find input file: $f" >&2;} ++ { (exit 1); exit 1; }; } ++ fi;; ++ esac ++ done` || { (exit 1); exit 1; } ++ # Remove the trailing spaces. ++ sed 's/[ ]*$//' $ac_file_inputs >$tmp/in + +-EOF ++_ACEOF + +-# Transform confdefs.h into a sed script conftest.vals that substitutes +-# the proper values into config.h.in to produce config.h. And first: +-# Protect against being on the right side of a sed subst in config.status. +-# Protect against being in an unquoted here document in config.status. +-rm -f conftest.vals +-cat > conftest.hdr <<\EOF +-s/[\\&%]/\\&/g +-s%[\\$`]%\\&%g +-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp +-s%ac_d%ac_u%gp +-s%ac_u%ac_e%gp +-EOF +-sed -n -f conftest.hdr confdefs.h > conftest.vals +-rm -f conftest.hdr ++# Transform confdefs.h into two sed scripts, `conftest.defines' and ++# `conftest.undefs', that substitutes the proper values into ++# config.h.in to produce config.h. The first handles `#define' ++# templates, and the second `#undef' templates. ++# And first: Protect against being on the right side of a sed subst in ++# config.status. Protect against being in an unquoted here document ++# in config.status. ++rm -f conftest.defines conftest.undefs ++# Using a here document instead of a string reduces the quoting nightmare. ++# Putting comments in sed scripts is not portable. ++# ++# `end' is used to avoid that the second main sed command (meant for ++# 0-ary CPP macros) applies to n-ary macro definitions. ++# See the Autoconf documentation for `clear'. ++cat >confdef2sed.sed <<\_ACEOF ++s/[\\&,]/\\&/g ++s,[\\$`],\\&,g ++t clear ++: clear ++s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp ++t end ++s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp ++: end ++_ACEOF ++# If some macros were called several times there might be several times ++# the same #defines, which is useless. Nevertheless, we may not want to ++# sort them, since we want the *last* AC-DEFINE to be honored. ++uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines ++sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs ++rm -f confdef2sed.sed + + # This sed command replaces #undef with comments. This is necessary, for + # example, in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. +-cat >> conftest.vals <<\EOF +-s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% +-EOF ++cat >>conftest.undefs <<\_ACEOF ++s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, ++_ACEOF + +-# Break up conftest.vals because some shells have a limit on +-# the size of here documents, and old seds have small limits too. ++# Break up conftest.defines because some shells have a limit on the size ++# of here documents, and old seds have small limits too (100 cmds). ++echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS ++echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS ++echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS ++echo ' :' >>$CONFIG_STATUS ++rm -f conftest.tail ++while grep . conftest.defines >/dev/null ++do ++ # Write a limited-size here document to $tmp/defines.sed. ++ echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS ++ # Speed up: don't consider the non `#define' lines. ++ echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS ++ # Work around the forget-to-reset-the-flag bug. ++ echo 't clr' >>$CONFIG_STATUS ++ echo ': clr' >>$CONFIG_STATUS ++ sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS ++ echo 'CEOF ++ sed -f $tmp/defines.sed $tmp/in >$tmp/out ++ rm -f $tmp/in ++ mv $tmp/out $tmp/in ++' >>$CONFIG_STATUS ++ sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail ++ rm -f conftest.defines ++ mv conftest.tail conftest.defines ++done ++rm -f conftest.defines ++echo ' fi # grep' >>$CONFIG_STATUS ++echo >>$CONFIG_STATUS + ++# Break up conftest.undefs because some shells have a limit on the size ++# of here documents, and old seds have small limits too (100 cmds). ++echo ' # Handle all the #undef templates' >>$CONFIG_STATUS + rm -f conftest.tail +-while : ++while grep . conftest.undefs >/dev/null + do +- ac_lines=`grep -c . conftest.vals` +- # grep -c gives empty output for an empty file on some AIX systems. +- if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi +- # Write a limited-size here document to conftest.frag. +- echo ' cat > conftest.frag <<CEOF' >> $CONFIG_STATUS +- sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS ++ # Write a limited-size here document to $tmp/undefs.sed. ++ echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS ++ # Speed up: don't consider the non `#undef' ++ echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS ++ # Work around the forget-to-reset-the-flag bug. ++ echo 't clr' >>$CONFIG_STATUS ++ echo ': clr' >>$CONFIG_STATUS ++ sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS + echo 'CEOF +- sed -f conftest.frag conftest.in > conftest.out +- rm -f conftest.in +- mv conftest.out conftest.in +-' >> $CONFIG_STATUS +- sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail +- rm -f conftest.vals +- mv conftest.tail conftest.vals ++ sed -f $tmp/undefs.sed $tmp/in >$tmp/out ++ rm -f $tmp/in ++ mv $tmp/out $tmp/in ++' >>$CONFIG_STATUS ++ sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail ++ rm -f conftest.undefs ++ mv conftest.tail conftest.undefs + done +-rm -f conftest.vals ++rm -f conftest.undefs + +-cat >> $CONFIG_STATUS <<\EOF +- rm -f conftest.frag conftest.h +- echo "/* $ac_file. Generated automatically by configure. */" > conftest.h +- cat conftest.in >> conftest.h +- rm -f conftest.in +- if cmp -s $ac_file conftest.h 2>/dev/null; then +- echo "$ac_file is unchanged" +- rm -f conftest.h ++cat >>$CONFIG_STATUS <<\_ACEOF ++ # Let's still pretend it is `configure' which instantiates (i.e., don't ++ # use $as_me), people would be surprised to read: ++ # /* config.h. Generated by config.status. */ ++ if test x"$ac_file" = x-; then ++ echo "/* Generated by configure. */" >$tmp/config.h + else +- # Remove last slash and all that follows it. Not all systems have dirname. +- ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` +- if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then +- # The file is in a subdirectory. +- test ! -d "$ac_dir" && mkdir "$ac_dir" +- fi +- rm -f $ac_file +- mv conftest.h $ac_file ++ echo "/* $ac_file. Generated by configure. */" >$tmp/config.h + fi +-fi; done ++ cat $tmp/in >>$tmp/config.h ++ rm -f $tmp/in ++ if test x"$ac_file" != x-; then ++ if diff $ac_file $tmp/config.h >/dev/null 2>&1; then ++ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 ++echo "$as_me: $ac_file is unchanged" >&6;} ++ else ++ ac_dir=`(dirname "$ac_file") 2>/dev/null || ++$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$ac_file" : 'X\(//\)[^/]' \| \ ++ X"$ac_file" : 'X\(//\)$' \| \ ++ X"$ac_file" : 'X\(/\)' \| \ ++ . : '\(.\)' 2>/dev/null || ++echo X"$ac_file" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } ++ /^X\(\/\/\)[^/].*/{ s//\1/; q; } ++ /^X\(\/\/\)$/{ s//\1/; q; } ++ /^X\(\/\).*/{ s//\1/; q; } ++ s/.*/./; q'` ++ { if $as_mkdir_p; then ++ mkdir -p "$ac_dir" ++ else ++ as_dir="$ac_dir" ++ as_dirs= ++ while test ! -d "$as_dir"; do ++ as_dirs="$as_dir $as_dirs" ++ as_dir=`(dirname "$as_dir") 2>/dev/null || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| \ ++ . : '\(.\)' 2>/dev/null || ++echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } ++ /^X\(\/\/\)[^/].*/{ s//\1/; q; } ++ /^X\(\/\/\)$/{ s//\1/; q; } ++ /^X\(\/\).*/{ s//\1/; q; } ++ s/.*/./; q'` ++ done ++ test ! -n "$as_dirs" || mkdir $as_dirs ++ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 ++echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} ++ { (exit 1); exit 1; }; }; } + +-EOF +-cat >> $CONFIG_STATUS <<EOF ++ rm -f $ac_file ++ mv $tmp/config.h $ac_file ++ fi ++ else ++ cat $tmp/config.h ++ rm -f $tmp/config.h ++ fi ++done ++_ACEOF + +-EOF +-cat >> $CONFIG_STATUS <<\EOF ++cat >>$CONFIG_STATUS <<\_ACEOF + +-exit 0 +-EOF ++{ (exit 0); exit 0; } ++_ACEOF + chmod +x $CONFIG_STATUS +-rm -fr confdefs* $ac_clean_files +-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 ++ac_clean_files=$ac_clean_files_save ++ ++ ++# configure is writing to config.log, and then calls config.status. ++# config.status does its own redirection, appending to config.log. ++# Unfortunately, on DOS this fails, as config.log is still kept open ++# by configure, so config.status won't be able to write to it; its ++# output is simply discarded. So we exec the FD to /dev/null, ++# effectively closing config.log, so it can be properly (re)opened and ++# appended to by config.status. When coming back to configure, we ++# need to make the FD available again. ++if test "$no_create" != yes; then ++ ac_cs_success=: ++ ac_config_status_args= ++ test "$silent" = yes && ++ ac_config_status_args="$ac_config_status_args --quiet" ++ exec 5>/dev/null ++ $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false ++ exec 5>>config.log ++ # Use ||, not &&, to avoid exiting from the if with $? = 1, which ++ # would make configure fail if this is the last instruction. ++ $ac_cs_success || { (exit 1); exit 1; } ++fi + +diff -urNd -urNd patch-2.5.4/configure.ac patch-2.5.9/configure.ac +--- patch-2.5.4/configure.ac 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/configure.ac 2003-05-19 02:44:57.000000000 -0400 +@@ -0,0 +1,95 @@ ++# Configure `patch'. ++ ++# Copyright (C) 1993, 1997, 1998, 1999, 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. ++ ++AC_PREREQ(2.57) ++AC_INIT(patch, 2.5.9, bug-patch@gnu.org) ++AC_CONFIG_SRCDIR(patch.c) ++AC_CONFIG_HEADER(config.h:config.hin) ++AC_ARG_PROGRAM ++ ++AC_PROG_CC ++AC_PROG_CPP ++AC_PROG_INSTALL ++AC_PROG_MAKE_SET ++# Use ed_PROGRAM, not ED_PROGRAM, ++# because <errno.h> reserves symbols starting with `E'. ++AC_PATH_PROG(ed_PROGRAM, ed, ed) ++ ++AC_GNU_SOURCE ++AC_AIX ++AC_MINIX ++AC_PROG_CC_STDC ++AC_ISC_POSIX ++AC_SYS_LARGEFILE ++AC_EXEEXT ++ ++AC_C_PROTOTYPES ++AC_C_CONST ++ ++AC_HEADER_DIRENT ++AC_HEADER_STDC ++AC_CHECK_HEADERS(fcntl.h limits.h string.h unistd.h utime.h varargs.h) ++ ++AC_TYPE_MODE_T ++AC_TYPE_OFF_T ++AC_TYPE_PID_T ++AC_TYPE_SIGNAL ++AC_TYPE_SIZE_T ++AM_STDBOOL_H ++jm_CHECK_TYPE_STRUCT_UTIMBUF ++ ++gl_BACKUPFILE ++gl_DIRNAME ++gl_ERROR ++gl_FUNC_MEMCHR ++gl_FUNC_RMDIR ++gl_GETOPT ++gl_PREREQ_XMALLOC ++gl_QUOTE ++gl_QUOTEARG ++ ++dnl This should be in gnulib, but isn't for some reason. ++AC_DEFUN([jm_PREREQ_ADDEXT], ++[ ++ dnl For addext.c. ++ AC_REQUIRE([AC_SYS_LONG_FILE_NAMES]) ++ AC_CHECK_FUNCS(pathconf) ++ AC_CHECK_HEADERS(limits.h string.h unistd.h) ++]) ++jm_PREREQ_ADDEXT ++ ++AC_CHECK_DECLS([free, getenv, malloc, mktemp]) ++AC_CHECK_FUNCS(_doprintf geteuid getuid isascii memcmp mktemp \ ++ pathconf raise sigaction sigprocmask sigsetmask strerror) ++AC_REPLACE_FUNCS(mkdir strncasecmp) ++AC_FUNC_FSEEKO ++jm_FUNC_GLIBC_UNLOCKED_IO ++jm_FUNC_MALLOC ++jm_FUNC_REALLOC ++AC_FUNC_CLOSEDIR_VOID ++AC_FUNC_SETMODE_DOS ++AC_FUNC_VPRINTF ++PATCH_FUNC_MKDIR_TAKES_ONE_ARG ++ ++jm_AC_DOS ++AC_SYS_LONG_FILE_NAMES ++ ++AC_CONFIG_FILES([Makefile]) ++AC_OUTPUT +diff -urNd -urNd patch-2.5.4/configure.in patch-2.5.9/configure.in +--- patch-2.5.4/configure.in 1999-08-30 02:20:08.000000000 -0400 ++++ patch-2.5.9/configure.in 1969-12-31 19:00:00.000000000 -0500 +@@ -1,59 +0,0 @@ +-# Configure `patch'. +-# Copyright 1993, 1997-1998, 1999 Free Software Foundation, Inc. +-dnl Process this file with autoconf to produce a configure script. +- +-AC_PREREQ(2.12) +-AC_INIT(patch.c) +-AC_CONFIG_HEADER(config.h:config.hin) +-AC_ARG_PROGRAM +-AC_CANONICAL_HOST +- +-PACKAGE=patch +-VERSION=2.5.4 +-AC_SUBST(PACKAGE) +-AC_SUBST(VERSION) +- +-AC_PROG_CC +-AC_PROG_CPP +-AC_PROG_INSTALL +-AC_PROG_MAKE_SET +-# Use ed_PROGRAM, not ED_PROGRAM, +-# because <errno.h> reserves symbols starting with `E'. +-AC_PATH_PROG(ed_PROGRAM, ed, ed) +- +-AC_SYS_LARGEFILE +- +-AC_AIX +-AC_MINIX +-AC_ISC_POSIX +-AC_EXEEXT +- +-AM_C_PROTOTYPES +-AC_C_CONST +- +-AC_HEADER_DIRENT +-AC_HEADER_STDC +-AC_CHECK_HEADERS(fcntl.h limits.h string.h unistd.h utime.h varargs.h) +-jm_AC_HEADER_INTTYPES_H +- +-AC_TYPE_MODE_T +-AC_TYPE_OFF_T +-AC_TYPE_PID_T +-AC_TYPE_SIGNAL +-AC_TYPE_SIZE_T +-jm_STRUCT_UTIMBUF +- +-AC_CHECK_FUNC(getopt_long, , [LIBOBJS="$LIBOBJS getopt1\$U.o getopt\$U.o"]) +-AC_SUBST(LIBOBJS) +-AC_CHECK_FUNCS(_doprintf isascii fseeko memcmp mktemp \ +- pathconf raise setmode sigaction sigprocmask sigsetmask strerror) +-AC_REPLACE_FUNCS(memchr mkdir rename rmdir) +-jm_FUNC_MALLOC +-jm_FUNC_REALLOC +-AC_FUNC_CLOSEDIR_VOID +-AC_FUNC_VPRINTF +- +-AC_SYS_LONG_FILE_NAMES +-jm_STRUCT_DIRENT_D_INO +- +-AC_OUTPUT(Makefile) +diff -urNd -urNd patch-2.5.4/COPYING patch-2.5.9/COPYING +--- patch-2.5.4/COPYING 1998-02-28 20:21:09.000000000 -0500 ++++ patch-2.5.9/COPYING 1999-02-10 00:47:30.000000000 -0500 +@@ -2,7 +2,7 @@ + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. +- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +@@ -291,7 +291,7 @@ + the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> +- Copyright (C) 19yy <name of author> ++ Copyright (C) <year> <name of author> + + 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 +@@ -313,7 +313,7 @@ + If the program is interactive, make it output a short notice like this + when it starts in an interactive mode: + +- Gnomovision version 69, Copyright (C) 19yy name of author ++ Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. +diff -urNd -urNd patch-2.5.4/debian.patch patch-2.5.9/debian.patch +diff -urNd -urNd patch-2.5.4/dirname.c patch-2.5.9/dirname.c +--- patch-2.5.4/dirname.c 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/dirname.c 2003-04-05 01:49:44.000000000 -0500 +@@ -0,0 +1,121 @@ ++/* dirname.c -- return all but the last element in a path ++ Copyright 1990, 1998, 2000, 2001, 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. */ ++ ++#if HAVE_CONFIG_H ++# include <config.h> ++#endif ++ ++#if STDC_HEADERS || HAVE_STRING_H ++# include <string.h> ++#endif ++ ++#include "dirname.h" ++#include "xalloc.h" ++ ++/* Return the length of `dirname (PATH)', or zero if PATH is ++ in the working directory. Works properly even if ++ there are trailing slashes (by effectively ignoring them). */ ++size_t ++dir_len (char const *path) ++{ ++ size_t prefix_length = FILESYSTEM_PREFIX_LEN (path); ++ size_t length; ++ ++ /* Strip the basename and any redundant slashes before it. */ ++ for (length = base_name (path) - path; prefix_length < length; length--) ++ if (! ISSLASH (path[length - 1])) ++ return length; ++ ++ /* But don't strip the only slash from "/". */ ++ return prefix_length + ISSLASH (path[prefix_length]); ++} ++ ++/* Return the leading directories part of PATH, ++ allocated with xmalloc. ++ Works properly even if there are trailing slashes ++ (by effectively ignoring them). */ ++ ++char * ++dir_name (char const *path) ++{ ++ size_t length = dir_len (path); ++ int append_dot = (length == FILESYSTEM_PREFIX_LEN (path)); ++ char *newpath = xmalloc (length + append_dot + 1); ++ memcpy (newpath, path, length); ++ if (append_dot) ++ newpath[length++] = '.'; ++ newpath[length] = 0; ++ return newpath; ++} ++ ++#ifdef TEST_DIRNAME ++/* ++ ++Run the test like this (expect no output): ++ gcc -DHAVE_CONFIG_H -DTEST_DIRNAME -I.. -O -Wall \ ++ basename.c dirname.c xmalloc.c error.c ++ sed -n '/^BEGIN-DATA$/,/^END-DATA$/p' dirname.c|grep -v DATA|./a.out ++ ++If it's been built on a DOS or Windows platforms, run another test like ++this (again, expect no output): ++ sed -n '/^BEGIN-DOS-DATA$/,/^END-DOS-DATA$/p' dirname.c|grep -v DATA|./a.out ++ ++BEGIN-DATA ++foo//// . ++bar/foo//// bar ++foo/ . ++/ / ++. . ++a . ++END-DATA ++ ++BEGIN-DOS-DATA ++c:///// c:/ ++c:/ c:/ ++c:/. c:/ ++c:foo c:. ++c:foo/bar c:foo ++END-DOS-DATA ++ ++*/ ++ ++# define MAX_BUFF_LEN 1024 ++# include <stdio.h> ++ ++char *program_name; ++ ++int ++main (int argc, char *argv[]) ++{ ++ char buff[MAX_BUFF_LEN + 1]; ++ ++ program_name = argv[0]; ++ ++ buff[MAX_BUFF_LEN] = 0; ++ while (fgets (buff, MAX_BUFF_LEN, stdin) && buff[0]) ++ { ++ char path[MAX_BUFF_LEN]; ++ char expected_result[MAX_BUFF_LEN]; ++ char const *result; ++ sscanf (buff, "%s %s", path, expected_result); ++ result = dir_name (path); ++ if (strcmp (result, expected_result)) ++ printf ("%s: got %s, expected %s\n", path, result, expected_result); ++ } ++ return 0; ++} ++#endif +diff -urNd -urNd patch-2.5.4/dirname.h patch-2.5.9/dirname.h +--- patch-2.5.4/dirname.h 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/dirname.h 2001-05-12 11:46:36.000000000 -0400 +@@ -0,0 +1,47 @@ ++/* Copyright (C) 1998, 2001 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. */ ++ ++#ifndef DIRNAME_H_ ++# define DIRNAME_H_ 1 ++ ++# ifndef PARAMS ++# if defined PROTOTYPES || (defined __STDC__ && __STDC__) ++# define PARAMS(Args) Args ++# else ++# define PARAMS(Args) () ++# endif ++# endif ++ ++# ifndef DIRECTORY_SEPARATOR ++# define DIRECTORY_SEPARATOR '/' ++# endif ++ ++# ifndef ISSLASH ++# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR) ++# endif ++ ++# ifndef FILESYSTEM_PREFIX_LEN ++# define FILESYSTEM_PREFIX_LEN(Filename) 0 ++# endif ++ ++char *base_name PARAMS ((char const *path)); ++char *dir_name PARAMS ((char const *path)); ++size_t base_len PARAMS ((char const *path)); ++size_t dir_len PARAMS ((char const *path)); ++ ++int strip_trailing_slashes PARAMS ((char *path)); ++ ++#endif /* not DIRNAME_H_ */ +diff -urNd -urNd patch-2.5.4/error.c patch-2.5.9/error.c +--- patch-2.5.4/error.c 1998-11-15 12:35:34.000000000 -0500 ++++ patch-2.5.9/error.c 2002-12-06 03:08:13.000000000 -0500 +@@ -1,23 +1,18 @@ + /* Error handler for noninteractive utilities +- Copyright (C) 1990,91,92,93,94,95,96,97,98 Free Software Foundation, Inc. +- +- This file is part of the GNU C Library. Its master source is NOT part of +- the C library, however. The master source lives in /gd/gnu/lib. +- +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Library General Public License as +- published by the Free Software Foundation; either version 2 of the +- License, or (at your option) any later version. ++ Copyright (C) 1990-1998, 2000, 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. + +- The GNU C Library is distributed in the hope that it will be useful, ++ 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 +- Library General Public License for more details. ++ 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 Library General Public +- License along with the GNU C Library; see the file COPYING.LIB. If not, +- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +- Boston, MA 02111-1307, USA. */ ++ 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. */ + + /* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */ + +@@ -27,6 +22,17 @@ + + #include <stdio.h> + ++#ifdef _LIBC ++# include <libintl.h> ++#else ++# include "gettext.h" ++#endif ++ ++#ifdef _LIBC ++# include <wchar.h> ++# define mbsrtowcs __mbsrtowcs ++#endif ++ + #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC + # if __STDC__ + # include <stdarg.h> +@@ -49,6 +55,10 @@ + + #include "error.h" + ++#if !_LIBC ++# include "unlocked-io.h" ++#endif ++ + #ifndef _ + # define _(String) String + #endif +@@ -70,29 +80,52 @@ + + # define program_name program_invocation_name + # include <errno.h> ++# include <libio/libioP.h> + + /* In GNU libc we want do not want to use the common name `error' directly. + Instead make it a weak alias. */ ++extern void __error (int status, int errnum, const char *message, ...) ++ __attribute__ ((__format__ (__printf__, 3, 4))); ++extern void __error_at_line (int status, int errnum, const char *file_name, ++ unsigned int line_number, const char *message, ++ ...) ++ __attribute__ ((__format__ (__printf__, 5, 6)));; + # define error __error + # define error_at_line __error_at_line + ++# ifdef USE_IN_LIBIO ++# include <libio/iolibio.h> ++# define fflush(s) INTUSE(_IO_fflush) (s) ++# undef putc ++# define putc(c, fp) INTUSE(_IO_putc) (c, fp) ++# endif ++ + #else /* not _LIBC */ + ++# if !HAVE_DECL_STRERROR_R && STRERROR_R_CHAR_P ++# ifndef HAVE_DECL_STRERROR_R ++"this configure-time declaration test was not run" ++# endif ++char *strerror_r (); ++# endif ++ + /* The calling program should define program_name and set it to the + name of the executing program. */ + extern char *program_name; + +-# ifdef HAVE_STRERROR_R ++# if HAVE_STRERROR_R || defined strerror_r + # define __strerror_r strerror_r + # else + # if HAVE_STRERROR +-# ifndef strerror /* On some systems, strerror is a macro */ ++# ifndef HAVE_DECL_STRERROR ++"this configure-time declaration test was not run" ++# endif ++# if !HAVE_DECL_STRERROR + char *strerror (); + # endif + # else + static char * +-private_strerror (errnum) +- int errnum; ++private_strerror (int errnum) + { + extern char *sys_errlist[]; + extern int sys_nerr; +@@ -103,15 +136,118 @@ + } + # define strerror private_strerror + # endif /* HAVE_STRERROR */ +-# endif /* HAVE_STRERROR_R */ ++# endif /* HAVE_STRERROR_R || defined strerror_r */ + #endif /* not _LIBC */ + ++static void ++print_errno_message (int errnum) ++{ ++ char const *s; ++ ++#if defined HAVE_STRERROR_R || _LIBC ++ char errbuf[1024]; ++# if STRERROR_R_CHAR_P || _LIBC ++ s = __strerror_r (errnum, errbuf, sizeof errbuf); ++# else ++ if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0) ++ s = errbuf; ++ else ++ s = 0; ++# endif ++#else ++ s = strerror (errnum); ++#endif ++ ++#if !_LIBC ++ if (! s) ++ s = _("Unknown system error"); ++#endif ++ ++#if _LIBC && USE_IN_LIBIO ++ if (_IO_fwide (stderr, 0) > 0) ++ { ++ __fwprintf (stderr, L": %s", s); ++ return; ++ } ++#endif ++ ++ fprintf (stderr, ": %s", s); ++} ++ ++#ifdef VA_START ++static void ++error_tail (int status, int errnum, const char *message, va_list args) ++{ ++# if HAVE_VPRINTF || _LIBC ++# if _LIBC && USE_IN_LIBIO ++ if (_IO_fwide (stderr, 0) > 0) ++ { ++# define ALLOCA_LIMIT 2000 ++ size_t len = strlen (message) + 1; ++ wchar_t *wmessage = NULL; ++ mbstate_t st; ++ size_t res; ++ const char *tmp; ++ ++ do ++ { ++ if (len < ALLOCA_LIMIT) ++ wmessage = (wchar_t *) alloca (len * sizeof (wchar_t)); ++ else ++ { ++ if (wmessage != NULL && len / 2 < ALLOCA_LIMIT) ++ wmessage = NULL; ++ ++ wmessage = (wchar_t *) realloc (wmessage, ++ len * sizeof (wchar_t)); ++ ++ if (wmessage == NULL) ++ { ++ fputws_unlocked (L"out of memory\n", stderr); ++ return; ++ } ++ } ++ ++ memset (&st, '\0', sizeof (st)); ++ tmp =message; ++ } ++ while ((res = mbsrtowcs (wmessage, &tmp, len, &st)) == len); ++ ++ if (res == (size_t) -1) ++ /* The string cannot be converted. */ ++ wmessage = (wchar_t *) L"???"; ++ ++ __vfwprintf (stderr, wmessage, args); ++ } ++ else ++# endif ++ vfprintf (stderr, message, args); ++# else ++ _doprnt (message, args, stderr); ++# endif ++ va_end (args); ++ ++ ++error_message_count; ++ if (errnum) ++ print_errno_message (errnum); ++# if _LIBC && USE_IN_LIBIO ++ if (_IO_fwide (stderr, 0) > 0) ++ putwc (L'\n', stderr); ++ else ++# endif ++ putc ('\n', stderr); ++ fflush (stderr); ++ if (status) ++ exit (status); ++} ++#endif ++ ++ + /* Print the program name and error message MESSAGE, which is a printf-style + format string with optional args. + If ERRNUM is nonzero, print its corresponding system error message. + Exit with status STATUS if it is nonzero. */ + /* VARARGS */ +- + void + #if defined VA_START && __STDC__ + error (int status, int errnum, const char *message, ...) +@@ -127,43 +263,48 @@ + va_list args; + #endif + ++ fflush (stdout); ++#ifdef _LIBC ++# ifdef USE_IN_LIBIO ++ _IO_flockfile (stderr); ++# else ++ __flockfile (stderr); ++# endif ++#endif + if (error_print_progname) + (*error_print_progname) (); + else + { +- fflush (stdout); +- fprintf (stderr, "%s: ", program_name); ++#if _LIBC && USE_IN_LIBIO ++ if (_IO_fwide (stderr, 0) > 0) ++ __fwprintf (stderr, L"%s: ", program_name); ++ else ++#endif ++ fprintf (stderr, "%s: ", program_name); + } + + #ifdef VA_START + VA_START (args, message); +-# if HAVE_VPRINTF || _LIBC +- vfprintf (stderr, message, args); +-# else +- _doprnt (message, args, stderr); +-# endif +- va_end (args); ++ error_tail (status, errnum, message, args); + #else + fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8); +-#endif + + ++error_message_count; + if (errnum) +- { +-#if defined HAVE_STRERROR_R || defined _LIBC +- char errbuf[1024]; +- /* Don't use __strerror_r's return value because on some systems +- (at least DEC UNIX 4.0[A-D]) strerror_r returns `int'. */ +- __strerror_r (errnum, errbuf, sizeof errbuf); +- fprintf (stderr, ": %s", errbuf); +-#else +- fprintf (stderr, ": %s", strerror (errnum)); +-#endif +- } ++ print_errno_message (errnum); + putc ('\n', stderr); + fflush (stderr); + if (status) + exit (status); ++#endif ++ ++#ifdef _LIBC ++# ifdef USE_IN_LIBIO ++ _IO_funlockfile (stderr); ++# else ++ __funlockfile (stderr); ++# endif ++#endif + } + + /* Sometimes we want to have at most one error per line. This +@@ -193,8 +334,9 @@ + static const char *old_file_name; + static unsigned int old_line_number; + +- if (old_line_number == line_number && +- (file_name == old_file_name || !strcmp (old_file_name, file_name))) ++ if (old_line_number == line_number ++ && (file_name == old_file_name ++ || strcmp (old_file_name, file_name) == 0)) + /* Simply return and print nothing. */ + return; + +@@ -202,43 +344,58 @@ + old_line_number = line_number; + } + ++ fflush (stdout); ++#ifdef _LIBC ++# ifdef USE_IN_LIBIO ++ _IO_flockfile (stderr); ++# else ++ __flockfile (stderr); ++# endif ++#endif + if (error_print_progname) + (*error_print_progname) (); + else + { +- fflush (stdout); +- fprintf (stderr, "%s:", program_name); ++#if _LIBC && USE_IN_LIBIO ++ if (_IO_fwide (stderr, 0) > 0) ++ __fwprintf (stderr, L"%s: ", program_name); ++ else ++#endif ++ fprintf (stderr, "%s:", program_name); + } + + if (file_name != NULL) +- fprintf (stderr, "%s:%d: ", file_name, line_number); ++ { ++#if _LIBC && USE_IN_LIBIO ++ if (_IO_fwide (stderr, 0) > 0) ++ __fwprintf (stderr, L"%s:%d: ", file_name, line_number); ++ else ++#endif ++ fprintf (stderr, "%s:%d: ", file_name, line_number); ++ } + + #ifdef VA_START + VA_START (args, message); +-# if HAVE_VPRINTF || _LIBC +- vfprintf (stderr, message, args); +-# else +- _doprnt (message, args, stderr); +-# endif +- va_end (args); ++ error_tail (status, errnum, message, args); + #else + fprintf (stderr, message, a1, a2, a3, a4, a5, a6, a7, a8); +-#endif + + ++error_message_count; + if (errnum) +- { +-#if defined HAVE_STRERROR_R || defined _LIBC +- char errbuf[1024]; +- fprintf (stderr, ": %s", __strerror_r (errnum, errbuf, sizeof errbuf)); +-#else +- fprintf (stderr, ": %s", strerror (errnum)); +-#endif +- } ++ print_errno_message (errnum); + putc ('\n', stderr); + fflush (stderr); + if (status) + exit (status); ++#endif ++ ++#ifdef _LIBC ++# ifdef USE_IN_LIBIO ++ _IO_funlockfile (stderr); ++# else ++ __funlockfile (stderr); ++# endif ++#endif + } + + #ifdef _LIBC +diff -urNd -urNd patch-2.5.4/error.h patch-2.5.9/error.h +--- patch-2.5.4/error.h 1997-06-21 00:29:28.000000000 -0400 ++++ patch-2.5.9/error.h 2001-08-23 13:25:08.000000000 -0400 +@@ -25,7 +25,7 @@ + + #ifndef __attribute__ + /* This feature is available in gcc versions 2.5 and later. */ +-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__ ++# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) + # define __attribute__(Spec) /* empty */ + # endif + /* The __-protected variants of `format' and `printf' attributes +diff -urNd -urNd patch-2.5.4/getopt1.c patch-2.5.9/getopt1.c +--- patch-2.5.4/getopt1.c 1999-01-13 00:36:45.000000000 -0500 ++++ patch-2.5.9/getopt1.c 2002-11-24 19:17:33.000000000 -0500 +@@ -3,26 +3,29 @@ + Free Software Foundation, Inc. + This file is part of the GNU C Library. + +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Library General Public License as +- published by the Free Software Foundation; either version 2 of the +- License, or (at your option) any later version. ++ 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. + +- The GNU C Library is distributed in the hope that it will be useful, ++ 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 +- Library General Public License for more details. ++ 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 Library General Public +- License along with the GNU C Library; see the file COPYING.LIB. If not, +- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +- Boston, MA 02111-1307, USA. */ ++ 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. */ + + #ifdef HAVE_CONFIG_H + #include <config.h> + #endif + +-#include "getopt.h" ++#ifdef _LIBC ++# include <getopt.h> ++#else ++# include "getopt.h" ++#endif + + #if !defined __STDC__ || !__STDC__ + /* This is a separate conditional since some stdc systems +@@ -90,6 +93,10 @@ + return _getopt_internal (argc, argv, options, long_options, opt_index, 1); + } + ++# ifdef _LIBC ++libc_hidden_def (getopt_long) ++libc_hidden_def (getopt_long_only) ++# endif + + #endif /* Not ELIDE_CODE. */ + +diff -urNd -urNd patch-2.5.4/getopt.c patch-2.5.9/getopt.c +--- patch-2.5.4/getopt.c 1999-01-13 00:36:45.000000000 -0500 ++++ patch-2.5.9/getopt.c 2002-11-24 19:17:33.000000000 -0500 +@@ -2,24 +2,23 @@ + NOTE: getopt is now part of the C library, so if you don't know what + "Keep this file name-space clean" means, talk to drepper@gnu.org + before changing it! +- +- Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98 ++ Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002 + Free Software Foundation, Inc. ++ This file is part of the GNU C Library. + +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Library General Public License as +- published by the Free Software Foundation; either version 2 of the +- License, or (at your option) any later version. ++ 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. + +- The GNU C Library is distributed in the hope that it will be useful, ++ 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 +- Library General Public License for more details. ++ 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 Library General Public +- License along with the GNU C Library; see the file COPYING.LIB. If not, +- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +- Boston, MA 02111-1307, USA. */ ++ 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. */ + + /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>. + Ditto for AIX 3.2 and <stdlib.h>. */ +@@ -76,15 +75,20 @@ + # endif + #endif + +-#ifndef _ +-/* This is for other GNU distributions with internationalized messages. +- When compiling libc, the _ macro is predefined. */ +-# ifdef HAVE_LIBINTL_H +-# include <libintl.h> +-# define _(msgid) gettext (msgid) +-# else +-# define _(msgid) (msgid) +-# endif ++#ifdef _LIBC ++# include <libintl.h> ++#else ++/* This is for other GNU distributions with internationalized messages. */ ++# include "gettext.h" ++#endif ++#define _(msgid) gettext (msgid) ++ ++#if defined _LIBC && defined USE_IN_LIBIO ++# include <wchar.h> ++#endif ++ ++#ifndef attribute_hidden ++# define attribute_hidden + #endif + + /* This version of `getopt' appears to the caller like standard Unix `getopt' +@@ -109,7 +113,7 @@ + Also, when `ordering' is RETURN_IN_ORDER, + each non-option ARGV-element is returned here. */ + +-char *optarg = NULL; ++char *optarg; + + /* Index in ARGV of the next element to be scanned. + This is used for communication to and from the caller +@@ -130,7 +134,7 @@ + causes problems with re-calling getopt as programs generally don't + know that. */ + +-int __getopt_initialized = 0; ++int __getopt_initialized attribute_hidden; + + /* The next char to be scanned in the option-element + in which the last option character we returned was found. +@@ -249,41 +253,34 @@ + static int last_nonopt; + + #ifdef _LIBC ++/* Stored original parameters. ++ XXX This is no good solution. We should rather copy the args so ++ that we can compare them later. But we must not use malloc(3). */ ++extern int __libc_argc; ++extern char **__libc_argv; ++ + /* Bash 2.0 gives us an environment variable containing flags + indicating ARGV elements that should not be considered arguments. */ + ++# ifdef USE_NONOPTION_FLAGS + /* Defined in getopt_init.c */ + extern char *__getopt_nonoption_flags; + + static int nonoption_flags_max_len; + static int nonoption_flags_len; ++# endif + +-static int original_argc; +-static char *const *original_argv; +- +-/* Make sure the environment variable bash 2.0 puts in the environment +- is valid for the getopt call we must make sure that the ARGV passed +- to getopt is that one passed to the process. */ +-static void +-__attribute__ ((unused)) +-store_args_and_env (int argc, char *const *argv) +-{ +- /* XXX This is no good solution. We should rather copy the args so +- that we can compare them later. But we must not use malloc(3). */ +- original_argc = argc; +- original_argv = argv; +-} +-# ifdef text_set_element +-text_set_element (__libc_subinit, store_args_and_env); +-# endif /* text_set_element */ +- +-# define SWAP_FLAGS(ch1, ch2) \ ++# ifdef USE_NONOPTION_FLAGS ++# define SWAP_FLAGS(ch1, ch2) \ + if (nonoption_flags_len > 0) \ + { \ + char __tmp = __getopt_nonoption_flags[ch1]; \ + __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \ + __getopt_nonoption_flags[ch2] = __tmp; \ + } ++# else ++# define SWAP_FLAGS(ch1, ch2) ++# endif + #else /* !_LIBC */ + # define SWAP_FLAGS(ch1, ch2) + #endif /* _LIBC */ +@@ -315,7 +312,7 @@ + It leaves the longer segment in the right place overall, + but it consists of two parts that need to be swapped next. */ + +-#ifdef _LIBC ++#if defined _LIBC && defined USE_NONOPTION_FLAGS + /* First make sure the handling of the `__getopt_nonoption_flags' + string can work normally. Our top argument must be in the range + of the string. */ +@@ -419,9 +416,9 @@ + else + ordering = PERMUTE; + +-#ifdef _LIBC ++#if defined _LIBC && defined USE_NONOPTION_FLAGS + if (posixly_correct == NULL +- && argc == original_argc && argv == original_argv) ++ && argc == __libc_argc && argv == __libc_argv) + { + if (nonoption_flags_max_len == 0) + { +@@ -517,6 +514,13 @@ + int *longind; + int long_only; + { ++ int print_errors = opterr; ++ if (optstring[0] == ':') ++ print_errors = 0; ++ ++ if (argc < 1) ++ return -1; ++ + optarg = NULL; + + if (optind == 0 || !__getopt_initialized) +@@ -531,7 +535,7 @@ + Either it does not have option syntax, or there is an environment flag + from the shell indicating it is not an option. The later information + is only used when the used in the GNU libc. */ +-#ifdef _LIBC ++#if defined _LIBC && defined USE_NONOPTION_FLAGS + # define NONOPTION_P (argv[optind][0] != '-' || argv[optind][1] == '\0' \ + || (optind < nonoption_flags_len \ + && __getopt_nonoption_flags[optind] == '1')) +@@ -666,16 +670,37 @@ + pfound = p; + indfound = option_index; + } +- else ++ else if (long_only ++ || pfound->has_arg != p->has_arg ++ || pfound->flag != p->flag ++ || pfound->val != p->val) + /* Second or later nonexact match found. */ + ambig = 1; + } + + if (ambig && !exact) + { +- if (opterr) +- fprintf (stderr, _("%s: option `%s' is ambiguous\n"), +- argv[0], argv[optind]); ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, _("%s: option `%s' is ambiguous\n"), ++ argv[0], argv[optind]) >= 0) ++ { ++ ++ if (_IO_fwide (stderr, 0) > 0) ++ __fwprintf (stderr, L"%s", buf); ++ else ++ fputs (buf, stderr); ++ ++ free (buf); ++ } ++#else ++ fprintf (stderr, _("%s: option `%s' is ambiguous\n"), ++ argv[0], argv[optind]); ++#endif ++ } + nextchar += strlen (nextchar); + optind++; + optopt = 0; +@@ -694,18 +719,52 @@ + optarg = nameend + 1; + else + { +- if (opterr) ++ if (print_errors) + { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ int n; ++#endif ++ + if (argv[optind - 1][1] == '-') +- /* --option */ +- fprintf (stderr, +- _("%s: option `--%s' doesn't allow an argument\n"), +- argv[0], pfound->name); ++ { ++ /* --option */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ n = __asprintf (&buf, _("\ ++%s: option `--%s' doesn't allow an argument\n"), ++ argv[0], pfound->name); ++#else ++ fprintf (stderr, _("\ ++%s: option `--%s' doesn't allow an argument\n"), ++ argv[0], pfound->name); ++#endif ++ } + else +- /* +option or -option */ +- fprintf (stderr, +- _("%s: option `%c%s' doesn't allow an argument\n"), +- argv[0], argv[optind - 1][0], pfound->name); ++ { ++ /* +option or -option */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ n = __asprintf (&buf, _("\ ++%s: option `%c%s' doesn't allow an argument\n"), ++ argv[0], argv[optind - 1][0], ++ pfound->name); ++#else ++ fprintf (stderr, _("\ ++%s: option `%c%s' doesn't allow an argument\n"), ++ argv[0], argv[optind - 1][0], pfound->name); ++#endif ++ } ++ ++#if defined _LIBC && defined USE_IN_LIBIO ++ if (n >= 0) ++ { ++ if (_IO_fwide (stderr, 0) > 0) ++ __fwprintf (stderr, L"%s", buf); ++ else ++ fputs (buf, stderr); ++ ++ free (buf); ++ } ++#endif + } + + nextchar += strlen (nextchar); +@@ -720,10 +779,28 @@ + optarg = argv[optind++]; + else + { +- if (opterr) +- fprintf (stderr, +- _("%s: option `%s' requires an argument\n"), +- argv[0], argv[optind - 1]); ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, _("\ ++%s: option `%s' requires an argument\n"), ++ argv[0], argv[optind - 1]) >= 0) ++ { ++ if (_IO_fwide (stderr, 0) > 0) ++ __fwprintf (stderr, L"%s", buf); ++ else ++ fputs (buf, stderr); ++ ++ free (buf); ++ } ++#else ++ fprintf (stderr, ++ _("%s: option `%s' requires an argument\n"), ++ argv[0], argv[optind - 1]); ++#endif ++ } + nextchar += strlen (nextchar); + optopt = pfound->val; + return optstring[0] == ':' ? ':' : '?'; +@@ -747,16 +824,47 @@ + if (!long_only || argv[optind][1] == '-' + || my_index (optstring, *nextchar) == NULL) + { +- if (opterr) ++ if (print_errors) + { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ int n; ++#endif ++ + if (argv[optind][1] == '-') +- /* --option */ +- fprintf (stderr, _("%s: unrecognized option `--%s'\n"), +- argv[0], nextchar); ++ { ++ /* --option */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ n = __asprintf (&buf, _("%s: unrecognized option `--%s'\n"), ++ argv[0], nextchar); ++#else ++ fprintf (stderr, _("%s: unrecognized option `--%s'\n"), ++ argv[0], nextchar); ++#endif ++ } + else +- /* +option or -option */ +- fprintf (stderr, _("%s: unrecognized option `%c%s'\n"), +- argv[0], argv[optind][0], nextchar); ++ { ++ /* +option or -option */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ n = __asprintf (&buf, _("%s: unrecognized option `%c%s'\n"), ++ argv[0], argv[optind][0], nextchar); ++#else ++ fprintf (stderr, _("%s: unrecognized option `%c%s'\n"), ++ argv[0], argv[optind][0], nextchar); ++#endif ++ } ++ ++#if defined _LIBC && defined USE_IN_LIBIO ++ if (n >= 0) ++ { ++ if (_IO_fwide (stderr, 0) > 0) ++ __fwprintf (stderr, L"%s", buf); ++ else ++ fputs (buf, stderr); ++ ++ free (buf); ++ } ++#endif + } + nextchar = (char *) ""; + optind++; +@@ -777,15 +885,44 @@ + + if (temp == NULL || c == ':') + { +- if (opterr) ++ if (print_errors) + { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ int n; ++#endif ++ + if (posixly_correct) +- /* 1003.2 specifies the format of this message. */ +- fprintf (stderr, _("%s: illegal option -- %c\n"), +- argv[0], c); ++ { ++ /* 1003.2 specifies the format of this message. */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ n = __asprintf (&buf, _("%s: illegal option -- %c\n"), ++ argv[0], c); ++#else ++ fprintf (stderr, _("%s: illegal option -- %c\n"), argv[0], c); ++#endif ++ } + else +- fprintf (stderr, _("%s: invalid option -- %c\n"), +- argv[0], c); ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ n = __asprintf (&buf, _("%s: invalid option -- %c\n"), ++ argv[0], c); ++#else ++ fprintf (stderr, _("%s: invalid option -- %c\n"), argv[0], c); ++#endif ++ } ++ ++#if defined _LIBC && defined USE_IN_LIBIO ++ if (n >= 0) ++ { ++ if (_IO_fwide (stderr, 0) > 0) ++ __fwprintf (stderr, L"%s", buf); ++ else ++ fputs (buf, stderr); ++ ++ free (buf); ++ } ++#endif + } + optopt = c; + return '?'; +@@ -811,11 +948,27 @@ + } + else if (optind == argc) + { +- if (opterr) ++ if (print_errors) + { + /* 1003.2 specifies the format of this message. */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, ++ _("%s: option requires an argument -- %c\n"), ++ argv[0], c) >= 0) ++ { ++ if (_IO_fwide (stderr, 0) > 0) ++ __fwprintf (stderr, L"%s", buf); ++ else ++ fputs (buf, stderr); ++ ++ free (buf); ++ } ++#else + fprintf (stderr, _("%s: option requires an argument -- %c\n"), + argv[0], c); ++#endif + } + optopt = c; + if (optstring[0] == ':') +@@ -860,9 +1013,26 @@ + } + if (ambig && !exact) + { +- if (opterr) +- fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"), +- argv[0], argv[optind]); ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, _("%s: option `-W %s' is ambiguous\n"), ++ argv[0], argv[optind]) >= 0) ++ { ++ if (_IO_fwide (stderr, 0) > 0) ++ __fwprintf (stderr, L"%s", buf); ++ else ++ fputs (buf, stderr); ++ ++ free (buf); ++ } ++#else ++ fprintf (stderr, _("%s: option `-W %s' is ambiguous\n"), ++ argv[0], argv[optind]); ++#endif ++ } + nextchar += strlen (nextchar); + optind++; + return '?'; +@@ -878,10 +1048,28 @@ + optarg = nameend + 1; + else + { +- if (opterr) +- fprintf (stderr, _("\ ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, _("\ + %s: option `-W %s' doesn't allow an argument\n"), +- argv[0], pfound->name); ++ argv[0], pfound->name) >= 0) ++ { ++ if (_IO_fwide (stderr, 0) > 0) ++ __fwprintf (stderr, L"%s", buf); ++ else ++ fputs (buf, stderr); ++ ++ free (buf); ++ } ++#else ++ fprintf (stderr, _("\ ++%s: option `-W %s' doesn't allow an argument\n"), ++ argv[0], pfound->name); ++#endif ++ } + + nextchar += strlen (nextchar); + return '?'; +@@ -893,10 +1081,28 @@ + optarg = argv[optind++]; + else + { +- if (opterr) +- fprintf (stderr, +- _("%s: option `%s' requires an argument\n"), +- argv[0], argv[optind - 1]); ++ if (print_errors) ++ { ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, _("\ ++%s: option `%s' requires an argument\n"), ++ argv[0], argv[optind - 1]) >= 0) ++ { ++ if (_IO_fwide (stderr, 0) > 0) ++ __fwprintf (stderr, L"%s", buf); ++ else ++ fputs (buf, stderr); ++ ++ free (buf); ++ } ++#else ++ fprintf (stderr, ++ _("%s: option `%s' requires an argument\n"), ++ argv[0], argv[optind - 1]); ++#endif ++ } + nextchar += strlen (nextchar); + return optstring[0] == ':' ? ':' : '?'; + } +@@ -940,12 +1146,28 @@ + } + else if (optind == argc) + { +- if (opterr) ++ if (print_errors) + { + /* 1003.2 specifies the format of this message. */ ++#if defined _LIBC && defined USE_IN_LIBIO ++ char *buf; ++ ++ if (__asprintf (&buf, _("\ ++%s: option requires an argument -- %c\n"), ++ argv[0], c) >= 0) ++ { ++ if (_IO_fwide (stderr, 0) > 0) ++ __fwprintf (stderr, L"%s", buf); ++ else ++ fputs (buf, stderr); ++ ++ free (buf); ++ } ++#else + fprintf (stderr, +- _("%s: option requires an argument -- %c\n"), +- argv[0], c); ++ _("%s: option requires an argument -- %c\n"), ++ argv[0], c); ++#endif + } + optopt = c; + if (optstring[0] == ':') +diff -urNd -urNd patch-2.5.4/getopt.h patch-2.5.9/getopt.h +--- patch-2.5.4/getopt.h 1999-01-13 00:36:45.000000000 -0500 ++++ patch-2.5.9/getopt.h 2002-11-24 19:17:33.000000000 -0500 +@@ -1,21 +1,20 @@ + /* Declarations for getopt. +- Copyright (C) 1989,90,91,92,93,94,96,97,98 Free Software Foundation, Inc. ++ Copyright (C) 1989-1994, 1996-1999, 2001 Free Software Foundation, Inc. + This file is part of the GNU C Library. + +- The GNU C Library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Library General Public License as +- published by the Free Software Foundation; either version 2 of the +- License, or (at your option) any later version. ++ 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. + +- The GNU C Library is distributed in the hope that it will be useful, ++ 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 +- Library General Public License for more details. ++ 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 Library General Public +- License along with the GNU C Library; see the file COPYING.LIB. If not, +- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +- Boston, MA 02111-1307, USA. */ ++ 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. */ + + #ifndef _GETOPT_H + +@@ -23,6 +22,17 @@ + # define _GETOPT_H 1 + #endif + ++/* If __GNU_LIBRARY__ is not already defined, either we are being used ++ standalone, or this is the first header included in the source file. ++ If we are being used with glibc, we need to include <features.h>, but ++ that does not exist if we are standalone. So: if __GNU_LIBRARY__ is ++ not defined, include <ctype.h>, which will pull in <features.h> for us ++ if it's from glibc. (Why ctype.h? It's guaranteed to exist and it ++ doesn't flood the namespace with stuff the way some other headers do.) */ ++#if !defined __GNU_LIBRARY__ ++# include <ctype.h> ++#endif ++ + #ifdef __cplusplus + extern "C" { + #endif +@@ -82,7 +92,7 @@ + + struct option + { +-# if defined __STDC__ && __STDC__ ++# if (defined __STDC__ && __STDC__) || defined __cplusplus + const char *name; + # else + char *name; +@@ -126,25 +136,26 @@ + arguments to the option '\0'. This behavior is specific to the GNU + `getopt'. */ + +-#if defined __STDC__ && __STDC__ ++#if (defined __STDC__ && __STDC__) || defined __cplusplus + # ifdef __GNU_LIBRARY__ + /* Many other libraries have conflicting prototypes for getopt, with + differences in the consts, in stdlib.h. To avoid compilation + errors, only prototype getopt for the GNU C library. */ +-extern int getopt (int __argc, char *const *__argv, const char *__shortopts); ++extern int getopt (int ___argc, char *const *___argv, const char *__shortopts); + # else /* not __GNU_LIBRARY__ */ + extern int getopt (); + # endif /* __GNU_LIBRARY__ */ + + # ifndef __need_getopt +-extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts, ++extern int getopt_long (int ___argc, char *const *___argv, ++ const char *__shortopts, + const struct option *__longopts, int *__longind); +-extern int getopt_long_only (int __argc, char *const *__argv, ++extern int getopt_long_only (int ___argc, char *const *___argv, + const char *__shortopts, + const struct option *__longopts, int *__longind); + + /* Internal only. Users should not call this directly. */ +-extern int _getopt_internal (int __argc, char *const *__argv, ++extern int _getopt_internal (int ___argc, char *const *___argv, + const char *__shortopts, + const struct option *__longopts, int *__longind, + int __long_only); +diff -urNd -urNd patch-2.5.4/gettext.h patch-2.5.9/gettext.h +--- patch-2.5.4/gettext.h 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/gettext.h 2002-05-10 07:20:06.000000000 -0400 +@@ -0,0 +1,69 @@ ++/* Convenience header for conditional use of GNU <libintl.h>. ++ Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc. ++ ++ This program is free software; you can redistribute it and/or modify it ++ under the terms of the GNU Library 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 ++ Library General Public License for more details. ++ ++ You should have received a copy of the GNU Library 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. */ ++ ++#ifndef _LIBGETTEXT_H ++#define _LIBGETTEXT_H 1 ++ ++/* NLS can be disabled through the configure --disable-nls option. */ ++#if ENABLE_NLS ++ ++/* Get declarations of GNU message catalog functions. */ ++# include <libintl.h> ++ ++#else ++ ++/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which ++ chokes if dcgettext is defined as a macro. So include it now, to make ++ later inclusions of <locale.h> a NOP. We don't include <libintl.h> ++ as well because people using "gettext.h" will not include <libintl.h>, ++ and also including <libintl.h> would fail on SunOS 4, whereas <locale.h> ++ is OK. */ ++#if defined(__sun) ++# include <locale.h> ++#endif ++ ++/* Disabled NLS. ++ The casts to 'const char *' serve the purpose of producing warnings ++ for invalid uses of the value returned from these functions. ++ On pre-ANSI systems without 'const', the config.h file is supposed to ++ contain "#define const". */ ++# define gettext(Msgid) ((const char *) (Msgid)) ++# define dgettext(Domainname, Msgid) ((const char *) (Msgid)) ++# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid)) ++# define ngettext(Msgid1, Msgid2, N) \ ++ ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) ++# define dngettext(Domainname, Msgid1, Msgid2, N) \ ++ ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) ++# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \ ++ ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) ++# define textdomain(Domainname) ((const char *) (Domainname)) ++# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname)) ++# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset)) ++ ++#endif ++ ++/* A pseudo function call that serves as a marker for the automated ++ extraction of messages, but does not call gettext(). The run-time ++ translation is done at a different place in the code. ++ The argument, String, should be a literal string. Concatenated strings ++ and other string expressions won't work. ++ The macro's expansion is not parenthesized, so that it is suitable as ++ initializer for static 'char[]' or 'const char[]' variables. */ ++#define gettext_noop(String) String ++ ++#endif /* _LIBGETTEXT_H */ +diff -urNd -urNd patch-2.5.4/inp.c patch-2.5.9/inp.c +--- patch-2.5.4/inp.c 1999-08-30 02:20:08.000000000 -0400 ++++ patch-2.5.9/inp.c 2003-05-20 09:58:02.000000000 -0400 +@@ -1,9 +1,10 @@ + /* inputting files to be patched */ + +-/* $Id: inp.c,v 1.21 1999/08/30 06:20:08 eggert Exp $ */ ++/* $Id: inp.c,v 1.25 2003/05/20 13:58:02 eggert Exp $ */ + +-/* Copyright 1986, 1988 Larry Wall +- Copyright 1991, 1992-1993, 1997-1998, 1999 Free Software Foundation, Inc. ++/* Copyright (C) 1986, 1988 Larry Wall ++ Copyright (C) 1991, 1992, 1993, 1997, 1998, 1999, 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 +@@ -47,10 +48,10 @@ + static size_t tireclen; /* length of records in tmp file */ + static size_t last_line_size; /* size of last input line */ + +-static bool plan_a PARAMS ((char const *));/* yield FALSE if memory runs out */ +-static void plan_b PARAMS ((char const *)); +-static void report_revision PARAMS ((int)); +-static void too_many_lines PARAMS ((char const *)) __attribute__((noreturn)); ++static bool plan_a (char const *); /* yield false if memory runs out */ ++static void plan_b (char const *); ++static void report_revision (bool); ++static void too_many_lines (char const *) __attribute__((noreturn)); + + /* New patch--prepare to edit another file. */ + +@@ -102,28 +103,28 @@ + /* Report whether a desired revision was found. */ + + static void +-report_revision (int found_revision) ++report_revision (bool found_revision) + { +- revision = quotearg (revision); ++ char const *rev = quotearg (revision); + + if (found_revision) + { + if (verbosity == VERBOSE) +- say ("Good. This file appears to be the %s version.\n", revision); ++ say ("Good. This file appears to be the %s version.\n", rev); + } + else if (force) + { + if (verbosity != SILENT) + say ("Warning: this file doesn't appear to be the %s version -- patching anyway.\n", +- revision); ++ rev); + } + else if (batch) + fatal ("This file doesn't appear to be the %s version -- aborting.", +- revision); ++ rev); + else + { + ask ("This file doesn't appear to be the %s version -- patch anyway? [n] ", +- revision); ++ rev); + if (*buf != 'y') + fatal ("aborted"); + } +@@ -140,7 +141,7 @@ + void + get_input_file (char const *filename, char const *outname) + { +- int elsewhere = strcmp (filename, outname); ++ bool elsewhere = strcmp (filename, outname) != 0; + char const *cs; + char *diffbuf; + char *getbuf; +@@ -228,7 +229,7 @@ + or if storage isn't available. */ + if (! (size == instat.st_size + && (buffer = malloc (size ? size : (size_t) 1)))) +- return FALSE; ++ return false; + + /* Read the input file, but don't bother reading it if it's empty. + When creating files, the files do not actually exist. */ +@@ -254,7 +255,7 @@ + /* Perhaps size is too large for this host. */ + close (ifd); + free (buffer); +- return FALSE; ++ return false; + } + buffered += n; + } +@@ -274,7 +275,7 @@ + && (ptr = (char const **) malloc ((size_t) iline * sizeof *ptr)))) + { + free (buffer); +- return FALSE; ++ return false; + } + iline = 0; + for (s = buffer; ; s++) +@@ -291,7 +292,7 @@ + { + char const *rev = revision; + int rev0 = rev[0]; +- int found_revision = 0; ++ bool found_revision = false; + size_t revlen = strlen (rev); + + if (revlen <= size) +@@ -303,7 +304,7 @@ + && (s == buffer || ISSPACE ((unsigned char) s[-1])) + && (s + 1 == limrev || ISSPACE ((unsigned char) s[revlen]))) + { +- found_revision = 1; ++ found_revision = true; + break; + } + } +@@ -314,7 +315,7 @@ + /* Plan A will work. */ + i_buffer = buffer; + i_ptr = ptr; +- return TRUE; ++ return true; + } + + /* Keep (virtually) nothing in memory. */ +@@ -326,7 +327,7 @@ + register int c; + register size_t len; + register size_t maxlen; +- register int found_revision; ++ register bool found_revision; + register size_t i; + register char const *rev; + register size_t revlen; +@@ -426,7 +427,7 @@ + WHICHBUF is ignored when the file is in memory. */ + + char const * +-ifetch (LINENUM line, int whichbuf, size_t *psize) ++ifetch (LINENUM line, bool whichbuf, size_t *psize) + { + register char const *q; + register char const *p; +@@ -444,9 +445,9 @@ + LINENUM baseline = line - offline; + + if (tiline[0] == baseline) +- whichbuf = 0; ++ whichbuf = false; + else if (tiline[1] == baseline) +- whichbuf = 1; ++ whichbuf = true; + else { + tiline[whichbuf] = baseline; + if (lseek (tifd, (off_t) (baseline/lines_per_buf * tibufsize), +diff -urNd -urNd patch-2.5.4/inp.h patch-2.5.9/inp.h +--- patch-2.5.4/inp.h 1997-04-06 21:07:00.000000000 -0400 ++++ patch-2.5.9/inp.h 2003-05-20 10:05:22.000000000 -0400 +@@ -1,10 +1,29 @@ + /* inputting files to be patched */ + +-/* $Id: inp.h,v 1.4 1997/04/07 01:07:00 eggert Exp $ */ ++/* $Id: inp.h,v 1.7 2003/05/20 14:05:22 eggert Exp $ */ ++ ++/* Copyright (C) 1986, 1988 Larry Wall ++ Copyright (C) 1991, 1992, 1993, 1997, 1998, 1999, 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; see the file COPYING. ++ If not, write to the Free Software Foundation, ++ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + + XTERN LINENUM input_lines; /* how long is input file in lines */ + +-char const *ifetch PARAMS ((LINENUM, int, size_t *)); +-void get_input_file PARAMS ((char const *, char const *)); +-void re_input PARAMS ((void)); +-void scan_input PARAMS ((char *)); ++char const *ifetch (LINENUM, bool, size_t *); ++void get_input_file (char const *, char const *); ++void re_input (void); ++void scan_input (char *); +diff -urNd -urNd patch-2.5.4/INSTALL patch-2.5.9/INSTALL +--- patch-2.5.4/INSTALL 1997-06-23 07:40:27.000000000 -0400 ++++ patch-2.5.9/INSTALL 2002-03-08 07:48:54.000000000 -0500 +@@ -1,3 +1,9 @@ ++Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software ++Foundation, Inc. ++ ++ This file is free documentation; the Free Software Foundation gives ++unlimited permission to copy, distribute and modify it. ++ + Basic Installation + ================== + +@@ -8,20 +14,27 @@ + those values to create a `Makefile' in each directory of the package. + It may also create one or more `.h' files containing system-dependent + definitions. Finally, it creates a shell script `config.status' that +-you can run in the future to recreate the current configuration, a file +-`config.cache' that saves the results of its tests to speed up +-reconfiguring, and a file `config.log' containing compiler output +-(useful mainly for debugging `configure'). ++you can run in the future to recreate the current configuration, and a ++file `config.log' containing compiler output (useful mainly for ++debugging `configure'). ++ ++ It can also use an optional file (typically called `config.cache' ++and enabled with `--cache-file=config.cache' or simply `-C') that saves ++the results of its tests to speed up reconfiguring. (Caching is ++disabled by default to prevent problems with accidental use of stale ++cache files.) + + If you need to do unusual things to compile the package, please try + to figure out how `configure' could check whether to do them, and mail + diffs or instructions to the address given in the `README' so they can +-be considered for the next release. If at some point `config.cache' +-contains results you don't want to keep, you may remove or edit it. ++be considered for the next release. If you are using the cache, and at ++some point `config.cache' contains results you don't want to keep, you ++may remove or edit it. + +- The file `configure.in' is used to create `configure' by a program +-called `autoconf'. You only need `configure.in' if you want to change +-it or regenerate `configure' using a newer version of `autoconf'. ++ The file `configure.ac' (or `configure.in') is used to create ++`configure' by a program called `autoconf'. You only need ++`configure.ac' if you want to change it or regenerate `configure' using ++a newer version of `autoconf'. + + The simplest way to compile this package is: + +@@ -55,14 +68,15 @@ + ===================== + + Some systems require unusual options for compilation or linking that +-the `configure' script does not know about. You can give `configure' +-initial values for variables by setting them in the environment. Using +-a Bourne-compatible shell, you can do that on the command line like +-this: +- CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure ++the `configure' script does not know about. Run `./configure --help' ++for details on some of the pertinent environment variables. + +-Or on systems that have the `env' program, you can do it like this: +- env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure ++ You can give `configure' initial values for variables by setting ++them in the environment. You can do that on the command line like this: ++ ++ ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix ++ ++ *Note Defining Variables::, for more details. + + Compiling For Multiple Architectures + ==================================== +@@ -75,11 +89,11 @@ + the `configure' script. `configure' automatically checks for the + source code in the directory that `configure' is in and in `..'. + +- If you have to use a `make' that does not supports the `VPATH' +-variable, you have to compile the package for one architecture at a time +-in the source code directory. After you have installed the package for +-one architecture, use `make distclean' before reconfiguring for another +-architecture. ++ If you have to use a `make' that does not support the `VPATH' ++variable, you have to compile the package for one architecture at a ++time in the source code directory. After you have installed the ++package for one architecture, use `make distclean' before reconfiguring ++for another architecture. + + Installation Names + ================== +@@ -122,22 +136,32 @@ + Specifying the System Type + ========================== + +- There may be some features `configure' can not figure out +-automatically, but needs to determine by the type of host the package +-will run on. Usually `configure' can figure that out, but if it prints +-a message saying it can not guess the host type, give it the +-`--host=TYPE' option. TYPE can either be a short name for the system +-type, such as `sun4', or a canonical name with three fields: ++ There may be some features `configure' cannot figure out ++automatically, but needs to determine by the type of machine the package ++will run on. Usually, assuming the package is built to be run on the ++_same_ architectures, `configure' can figure that out, but if it prints ++a message saying it cannot guess the machine type, give it the ++`--build=TYPE' option. TYPE can either be a short name for the system ++type, such as `sun4', or a canonical name which has the form: ++ + CPU-COMPANY-SYSTEM + +-See the file `config.sub' for the possible values of each field. If ++where SYSTEM can have one of these forms: ++ ++ OS KERNEL-OS ++ ++ See the file `config.sub' for the possible values of each field. If + `config.sub' isn't included in this package, then this package doesn't +-need to know the host type. ++need to know the machine type. + +- If you are building compiler tools for cross-compiling, you can also ++ If you are _building_ compiler tools for cross-compiling, you should + use the `--target=TYPE' option to select the type of system they will +-produce code for and the `--build=TYPE' option to select the type of +-system on which you are compiling the package. ++produce code for. ++ ++ If you want to _use_ a cross compiler, that generates code for a ++platform different from the build platform, you should specify the ++"host" platform (i.e., that on which the generated programs will ++eventually be run) with `--host=TYPE'. + + Sharing Defaults + ================ +@@ -150,20 +174,44 @@ + `CONFIG_SITE' environment variable to the location of the site script. + A warning: not all `configure' scripts look for a site script. + +-Operation Controls ++Defining Variables + ================== + ++ Variables not defined in a site shell script can be set in the ++environment passed to `configure'. However, some packages may run ++configure again during the build, and the customized values of these ++variables may be lost. In order to avoid this problem, you should set ++them in the `configure' command line, using `VAR=value'. For example: ++ ++ ./configure CC=/usr/local2/bin/gcc ++ ++will cause the specified gcc to be used as the C compiler (unless it is ++overridden in the site shell script). ++ ++`configure' Invocation ++====================== ++ + `configure' recognizes the following options to control how it + operates. + +-`--cache-file=FILE' +- Use and save the results of the tests in FILE instead of +- `./config.cache'. Set FILE to `/dev/null' to disable caching, for +- debugging `configure'. +- + `--help' ++`-h' + Print a summary of the options to `configure', and exit. + ++`--version' ++`-V' ++ Print the version of Autoconf used to generate the `configure' ++ script, and exit. ++ ++`--cache-file=FILE' ++ Enable the cache: use and save the results of the tests in FILE, ++ traditionally `config.cache'. FILE defaults to `/dev/null' to ++ disable caching. ++ ++`--config-cache' ++`-C' ++ Alias for `--cache-file=config.cache'. ++ + `--quiet' + `--silent' + `-q' +@@ -175,8 +223,6 @@ + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +-`--version' +- Print the version of Autoconf used to generate the `configure' +- script, and exit. ++`configure' also accepts some other, not widely useful, options. Run ++`configure --help' for more details. + +-`configure' also accepts some other, not widely useful, options. +diff -urNd -urNd patch-2.5.4/install-sh patch-2.5.9/install-sh +--- patch-2.5.4/install-sh 1999-03-02 08:44:48.000000000 -0500 ++++ patch-2.5.9/install-sh 2003-05-09 13:22:21.000000000 -0400 +@@ -1,19 +1,37 @@ + #!/bin/sh + # + # install - install a program, script, or datafile +-# This comes from X11R5 (mit/util/scripts/install.sh). + # +-# Copyright 1991 by the Massachusetts Institute of Technology ++# This originates from X11R5 (mit/util/scripts/install.sh), which was ++# later released in X11R6 (xc/config/util/install.sh) with the ++# following copyright and license. + # +-# Permission to use, copy, modify, distribute, and sell this software and its +-# documentation for any purpose is hereby granted without fee, provided that +-# the above copyright notice appear in all copies and that both that +-# copyright notice and this permission notice appear in supporting +-# documentation, and that the name of M.I.T. not be used in advertising or +-# publicity pertaining to distribution of the software without specific, +-# written prior permission. M.I.T. makes no representations about the +-# suitability of this software for any purpose. It is provided "as is" +-# without express or implied warranty. ++# Copyright (C) 1994 X Consortium ++# ++# Permission is hereby granted, free of charge, to any person obtaining a copy ++# of this software and associated documentation files (the "Software"), to ++# deal in the Software without restriction, including without limitation the ++# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or ++# sell copies of the Software, and to permit persons to whom the Software is ++# furnished to do so, subject to the following conditions: ++# ++# The above copyright notice and this permission notice shall be included in ++# all copies or substantial portions of the Software. ++# ++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- ++# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++# ++# Except as contained in this notice, the name of the X Consortium shall not ++# be used in advertising or otherwise to promote the sale, use or other deal- ++# ings in this Software without prior written authorization from the X Consor- ++# tium. ++# ++# ++# FSF changes to this file are in the public domain. + # + # Calling this script install-sh is preferred over install.sh, to prevent + # `make' implicit rules from creating a file called install from it +@@ -56,7 +74,7 @@ + + while [ x"$1" != x ]; do + case $1 in +- -c) instcmd="$cpprog" ++ -c) instcmd=$cpprog + shift + continue;; + +@@ -79,7 +97,7 @@ + shift + continue;; + +- -s) stripcmd="$stripprog" ++ -s) stripcmd=$stripprog + shift + continue;; + +@@ -106,17 +124,17 @@ + + if [ x"$src" = x ] + then +- echo "install: no input file specified" ++ echo "$0: no input file specified" >&2 + exit 1 + else +- true ++ : + fi + + if [ x"$dir_arg" != x ]; then + dst=$src + src="" +- +- if [ -d $dst ]; then ++ ++ if [ -d "$dst" ]; then + instcmd=: + chmodcmd="" + else +@@ -125,38 +143,38 @@ + else + + # Waiting for this to be detected by the "$instcmd $src $dsttmp" command +-# might cause directories to be created, which would be especially bad ++# might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + +- if [ -f $src -o -d $src ] ++ if [ -f "$src" ] || [ -d "$src" ] + then +- true ++ : + else +- echo "install: $src does not exist" ++ echo "$0: $src does not exist" >&2 + exit 1 + fi +- ++ + if [ x"$dst" = x ] + then +- echo "install: no destination specified" ++ echo "$0: no destination specified" >&2 + exit 1 + else +- true ++ : + fi + + # If destination is a directory, append the input filename; if your system + # does not like double slashes in filenames, you may need to add some logic + +- if [ -d $dst ] ++ if [ -d "$dst" ] + then +- dst="$dst"/`basename $src` ++ dst=$dst/`basename "$src"` + else +- true ++ : + fi + fi + + ## this sed command emulates the dirname command +-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` ++dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + # this part is taken from Noah Friedman's mkinstalldirs script +@@ -165,69 +183,73 @@ + if [ ! -d "$dstdir" ]; then + defaultIFS=' + ' +-IFS="${IFS-${defaultIFS}}" ++IFS="${IFS-$defaultIFS}" + +-oIFS="${IFS}" ++oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' +-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` +-IFS="${oIFS}" ++set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` ++IFS=$oIFS + + pathcomp='' + + while [ $# -ne 0 ] ; do +- pathcomp="${pathcomp}${1}" ++ pathcomp=$pathcomp$1 + shift + +- if [ ! -d "${pathcomp}" ] ; ++ if [ ! -d "$pathcomp" ] ; + then +- $mkdirprog "${pathcomp}" ++ $mkdirprog "$pathcomp" + else +- true ++ : + fi + +- pathcomp="${pathcomp}/" ++ pathcomp=$pathcomp/ + done + fi + + if [ x"$dir_arg" != x ] + then +- $doit $instcmd $dst && ++ $doit $instcmd "$dst" && + +- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && +- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && +- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && +- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi ++ if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi && ++ if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi && ++ if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi && ++ if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi + else + + # If we're going to rename the final executable, determine the name now. + +- if [ x"$transformarg" = x ] ++ if [ x"$transformarg" = x ] + then +- dstfile=`basename $dst` ++ dstfile=`basename "$dst"` + else +- dstfile=`basename $dst $transformbasename | ++ dstfile=`basename "$dst" $transformbasename | + sed $transformarg`$transformbasename + fi + + # don't allow the sed command to completely eliminate the filename + +- if [ x"$dstfile" = x ] ++ if [ x"$dstfile" = x ] + then +- dstfile=`basename $dst` ++ dstfile=`basename "$dst"` + else +- true ++ : + fi + +-# Make a temp file name in the proper directory. ++# Make a couple of temp file names in the proper directory. + + dsttmp=$dstdir/#inst.$$# ++ rmtmp=$dstdir/#rm.$$# + +-# Move or copy the file name to the temp name ++# Trap to clean up temp files at exit. + +- $doit $instcmd $src $dsttmp && ++ trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 ++ trap '(exit $?); exit' 1 2 13 15 + +- trap "rm -f ${dsttmp}" 0 && ++# Move or copy the file name to the temp name ++ ++ $doit $instcmd "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits + +@@ -235,17 +257,38 @@ + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $instcmd $src $dsttmp" command. + +- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && +- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && +- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && +- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && ++ if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi && ++ if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi && ++ if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi && ++ if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi && ++ ++# Now remove or move aside any old file at destination location. We try this ++# two ways since rm can't unlink itself on some systems and the destination ++# file might be busy for other reasons. In this case, the final cleanup ++# might fail but the new file should still install successfully. ++ ++{ ++ if [ -f "$dstdir/$dstfile" ] ++ then ++ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null || ++ $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null || ++ { ++ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 ++ (exit 1); exit ++ } ++ else ++ : ++ fi ++} && + + # Now rename the file to the real destination. + +- $doit $rmcmd -f $dstdir/$dstfile && +- $doit $mvcmd $dsttmp $dstdir/$dstfile ++ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + + fi && + ++# The final little trick to "correctly" pass the exit status to the exit trap. + +-exit 0 ++{ ++ (exit 0); exit ++} +diff -urNd -urNd patch-2.5.4/m4/backupfile.m4 patch-2.5.9/m4/backupfile.m4 +--- patch-2.5.4/m4/backupfile.m4 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/m4/backupfile.m4 2002-12-31 08:42:06.000000000 -0500 +@@ -0,0 +1,23 @@ ++# 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. ++ ++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 ++ ++ 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) ++]) +diff -urNd -urNd patch-2.5.4/m4/ccstdc.m4 patch-2.5.9/m4/ccstdc.m4 +--- patch-2.5.4/m4/ccstdc.m4 1999-06-16 07:11:07.000000000 -0400 ++++ patch-2.5.9/m4/ccstdc.m4 1969-12-31 19:00:00.000000000 -0500 +@@ -1,95 +0,0 @@ +-# 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 +- +-# @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(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 +-]) +diff -urNd -urNd patch-2.5.4/m4/d-ino.m4 patch-2.5.9/m4/d-ino.m4 +--- patch-2.5.4/m4/d-ino.m4 1999-01-26 23:51:43.000000000 -0500 ++++ patch-2.5.9/m4/d-ino.m4 2002-12-31 08:43:06.000000000 -0500 +@@ -1,11 +1,11 @@ +-#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, +@@ -35,8 +35,8 @@ + ) + 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 + ] + ) +diff -urNd -urNd patch-2.5.4/m4/dirname.m4 patch-2.5.9/m4/dirname.m4 +--- patch-2.5.4/m4/dirname.m4 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/m4/dirname.m4 2002-12-31 08:42:06.000000000 -0500 +@@ -0,0 +1,25 @@ ++# 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. ++ ++AC_DEFUN([gl_DIRNAME], ++[ ++ dnl Prerequisites of lib/dirname.h. ++ AC_REQUIRE([jm_AC_DOS]) ++ ++ dnl Prerequisites of lib/dirname.c. ++ AC_REQUIRE([AC_HEADER_STDC]) ++ AC_CHECK_HEADERS_ONCE(string.h) ++ ++ 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) ++]) +diff -urNd -urNd patch-2.5.4/m4/dos.m4 patch-2.5.9/m4/dos.m4 +--- patch-2.5.4/m4/dos.m4 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/m4/dos.m4 2001-08-12 09:26:00.000000000 -0400 +@@ -0,0 +1,53 @@ ++#serial 5 ++ ++# Define some macros required for proper operation of code in lib/*.c ++# on MSDOS/Windows systems. ++ ++# From Jim Meyering. ++ ++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]) ++ ]) ++ ++ 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 ++ ++ 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_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.]) ++ ++ 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.]) ++ ]) +diff -urNd -urNd patch-2.5.4/m4/error.m4 patch-2.5.9/m4/error.m4 +--- patch-2.5.4/m4/error.m4 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/m4/error.m4 2003-04-21 23:28:22.000000000 -0400 +@@ -0,0 +1,18 @@ ++#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 ++]) +diff -urNd -urNd patch-2.5.4/m4/getopt.m4 patch-2.5.9/m4/getopt.m4 +--- patch-2.5.4/m4/getopt.m4 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/m4/getopt.m4 2002-12-31 08:42:06.000000000 -0500 +@@ -0,0 +1,13 @@ ++# 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) ++]) +diff -urNd -urNd patch-2.5.4/m4/inttypes_h.m4 patch-2.5.9/m4/inttypes_h.m4 +--- patch-2.5.4/m4/inttypes_h.m4 1999-01-10 17:47:01.000000000 -0500 ++++ patch-2.5.9/m4/inttypes_h.m4 1969-12-31 19:00:00.000000000 -0500 +@@ -1,22 +0,0 @@ +-#serial 3 +- +-dnl From Paul Eggert. +- +-# Define HAVE_INTTYPES_H if <inttypes.h> exists, +-# doesn't clash with <sys/types.h>, and declares uintmax_t. +- +-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 +-]) +diff -urNd -urNd patch-2.5.4/m4/largefile.m4 patch-2.5.9/m4/largefile.m4 +--- patch-2.5.4/m4/largefile.m4 1999-08-17 15:56:44.000000000 -0400 ++++ patch-2.5.9/m4/largefile.m4 1969-12-31 19:00:00.000000000 -0500 +@@ -1,115 +0,0 @@ +-#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 +- +-dnl Written by Paul Eggert <eggert@twinsun.com>. +- +-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]) +- }])]) +- +-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]) +- +-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]) +- +-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) +- +- 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 +- ]) +diff -urNd -urNd patch-2.5.4/m4/malloc.m4 patch-2.5.9/m4/malloc.m4 +--- patch-2.5.4/m4/malloc.m4 1999-02-07 00:35:28.000000000 -0500 ++++ patch-2.5.9/m4/malloc.m4 2002-12-31 08:43:06.000000000 -0500 +@@ -1,35 +1,25 @@ +-#serial 3 ++# 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_CACHE_CHECK([for working malloc], jm_cv_func_working_malloc, +- [AC_TRY_RUN([ +- char *malloc (); +- int +- main () +- { +- exit (malloc (0) ? 0 : 1); +- } +- ], +- 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) +- ]) +- 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.]) ++ 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 + ]) ++ ++# Prerequisites of lib/malloc.c. ++AC_DEFUN([gl_PREREQ_MALLOC], [ ++ : ++]) +diff -urNd -urNd patch-2.5.4/m4/mbrtowc.m4 patch-2.5.9/m4/mbrtowc.m4 +--- patch-2.5.4/m4/mbrtowc.m4 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/m4/mbrtowc.m4 2002-12-31 08:43:06.000000000 -0500 +@@ -0,0 +1,27 @@ ++# 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 ++]) +diff -urNd -urNd patch-2.5.4/m4/mbstate_t.m4 patch-2.5.9/m4/mbstate_t.m4 +--- patch-2.5.4/m4/mbstate_t.m4 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/m4/mbstate_t.m4 2002-06-21 13:38:30.000000000 -0400 +@@ -0,0 +1,32 @@ ++# 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]) +diff -urNd -urNd patch-2.5.4/m4/memchr.m4 patch-2.5.9/m4/memchr.m4 +--- patch-2.5.4/m4/memchr.m4 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/m4/memchr.m4 2002-12-31 08:42:07.000000000 -0500 +@@ -0,0 +1,21 @@ ++# 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) ++]) +diff -urNd -urNd patch-2.5.4/m4/mkdir.m4 patch-2.5.9/m4/mkdir.m4 +--- patch-2.5.4/m4/mkdir.m4 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/m4/mkdir.m4 2002-05-24 14:47:37.000000000 -0400 +@@ -0,0 +1,34 @@ ++#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> ++ ], ++ [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 ++ ] ++) +diff -urNd -urNd patch-2.5.4/m4/onceonly.m4 patch-2.5.9/m4/onceonly.m4 +--- patch-2.5.4/m4/onceonly.m4 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/m4/onceonly.m4 2003-03-18 05:08:34.000000000 -0500 +@@ -0,0 +1,63 @@ ++# 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, ++ [-./], [___]))) ++ ]) ++]) ++ ++# 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_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])) ++ ]) ++]) +diff -urNd -urNd patch-2.5.4/m4/protos.m4 patch-2.5.9/m4/protos.m4 +--- patch-2.5.4/m4/protos.m4 1998-10-05 00:29:36.000000000 -0400 ++++ patch-2.5.9/m4/protos.m4 1969-12-31 19:00:00.000000000 -0500 +@@ -1,25 +0,0 @@ +-## ------------------------------- ## +-## Check for function prototypes. ## +-## From Franc,ois Pinard ## +-## ------------------------------- ## +- +-# serial 1 +- +-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 +-]) +diff -urNd -urNd patch-2.5.4/m4/quotearg.m4 patch-2.5.9/m4/quotearg.m4 +--- patch-2.5.4/m4/quotearg.m4 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/m4/quotearg.m4 2002-12-31 08:42:07.000000000 -0500 +@@ -0,0 +1,16 @@ ++# 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 ++]) +diff -urNd -urNd patch-2.5.4/m4/quote.m4 patch-2.5.9/m4/quote.m4 +--- patch-2.5.4/m4/quote.m4 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/m4/quote.m4 2002-12-31 08:42:07.000000000 -0500 +@@ -0,0 +1,13 @@ ++# 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) ++]) +diff -urNd -urNd patch-2.5.4/m4/realloc.m4 patch-2.5.9/m4/realloc.m4 +--- patch-2.5.4/m4/realloc.m4 1999-02-07 00:36:21.000000000 -0500 ++++ patch-2.5.9/m4/realloc.m4 2002-12-31 08:43:06.000000000 -0500 +@@ -1,35 +1,25 @@ +-#serial 3 ++# 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_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.]) ++ 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 + ]) ++ ++# Prerequisites of lib/realloc.c. ++AC_DEFUN([gl_PREREQ_REALLOC], [ ++ : ++]) +diff -urNd -urNd patch-2.5.4/m4/rmdir.m4 patch-2.5.9/m4/rmdir.m4 +--- patch-2.5.4/m4/rmdir.m4 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/m4/rmdir.m4 2002-12-31 08:42:07.000000000 -0500 +@@ -0,0 +1,22 @@ ++# 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 ++]) ++ ++# Prerequisites of lib/rmdir.c. ++AC_DEFUN([gl_PREREQ_RMDIR], [ ++ AC_REQUIRE([AC_HEADER_STAT]) ++ : ++]) ++ +diff -urNd -urNd patch-2.5.4/m4/setmode.m4 patch-2.5.9/m4/setmode.m4 +--- patch-2.5.4/m4/setmode.m4 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/m4/setmode.m4 2002-02-27 23:22:13.000000000 -0500 +@@ -0,0 +1,38 @@ ++# 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]) +diff -urNd -urNd patch-2.5.4/m4/stdbool.m4 patch-2.5.9/m4/stdbool.m4 +--- patch-2.5.4/m4/stdbool.m4 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/m4/stdbool.m4 2003-01-09 08:35:14.000000000 -0500 +@@ -0,0 +1,89 @@ ++# 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]) +diff -urNd -urNd patch-2.5.4/m4/unlocked-io.m4 patch-2.5.9/m4/unlocked-io.m4 +--- patch-2.5.4/m4/unlocked-io.m4 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/m4/unlocked-io.m4 2002-12-31 08:42:07.000000000 -0500 +@@ -0,0 +1,22 @@ ++#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]) ++]) +diff -urNd -urNd patch-2.5.4/m4/utimbuf.m4 patch-2.5.9/m4/utimbuf.m4 +--- patch-2.5.4/m4/utimbuf.m4 1999-01-10 17:51:01.000000000 -0500 ++++ patch-2.5.9/m4/utimbuf.m4 2002-12-31 08:43:06.000000000 -0500 +@@ -1,4 +1,4 @@ +-#serial 2 ++#serial 5 + + dnl From Jim Meyering + +@@ -6,9 +6,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( +@@ -33,8 +33,8 @@ + ]) + + 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 + ]) +diff -urNd -urNd patch-2.5.4/m4/xalloc.m4 patch-2.5.9/m4/xalloc.m4 +--- patch-2.5.4/m4/xalloc.m4 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/m4/xalloc.m4 2002-12-31 08:42:07.000000000 -0500 +@@ -0,0 +1,26 @@ ++# 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/Makefile.in patch-2.5.9/Makefile.in +--- patch-2.5.4/Makefile.in 1999-08-30 02:37:54.000000000 -0400 ++++ patch-2.5.9/Makefile.in 2003-05-20 12:15:48.000000000 -0400 +@@ -1,5 +1,7 @@ + # Makefile for GNU patch. +-# Copyright 1993, 1997-1998, 1999 Free Software Foundation, Inc. ++ ++# Copyright (C) 1993, 1997, 1998, 1999, 2001, 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 +@@ -37,9 +39,9 @@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +-PACKAGE = @PACKAGE@ +-U = @U@ +-VERSION = @VERSION@ ++OBJEXT = @OBJEXT@ ++PACKAGE_NAME = @PACKAGE_NAME@ ++PACKAGE_VERSION = @PACKAGE_VERSION@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ +@@ -59,20 +61,33 @@ + + SHELL = /bin/sh + +-LIBSRCS = getopt.c getopt1.c malloc.c memchr.c realloc.c rename.c +-SRCS = addext.c argmatch.c backupfile.c basename.c error.c inp.c maketime.c \ +- mkdir.c partime.c patch.c pch.c quotearg.c quotesys.c \ +- rmdir.c util.c version.c xmalloc.c $(LIBSRCS) +-OBJS = addext$U.o argmatch$U.o backupfile$U.o basename$U.o error$U.o inp$U.o \ +- maketime.o partime.o patch$U.o pch$U.o quotearg$U.o quotesys.o \ +- util$U.o version$U.o xmalloc$U.o $(LIBOBJS) +-HDRS = argmatch.h backupfile.h basename.h common.h error.h getopt.h \ +- inp.h maketime.h partime.h patchlevel.h pch.h quotearg.h quotesys.h \ +- util.h version.h xalloc.h ++LIBSRCS = error.c malloc.c memchr.c mkdir.c \ ++ realloc.c rmdir.c strcasecmp.c strncasecmp.c ++SRCS = $(LIBSRCS) \ ++ addext.c argmatch.c backupfile.c \ ++ basename.c dirname.c \ ++ getopt.c getopt1.c inp.c \ ++ maketime.c partime.c \ ++ patch.c pch.c \ ++ quote.c quotearg.c quotesys.c \ ++ util.c version.c xmalloc.c ++OBJS = $(LIBOBJS) \ ++ addext.$(OBJEXT) argmatch.$(OBJEXT) backupfile.$(OBJEXT) \ ++ basename.$(OBJEXT) dirname.$(OBJEXT) \ ++ getopt.$(OBJEXT) getopt1.$(OBJEXT) inp.$(OBJEXT) \ ++ maketime.$(OBJEXT) partime.$(OBJEXT) \ ++ patch.$(OBJEXT) pch.$(OBJEXT) \ ++ quote.$(OBJEXT) quotearg.$(OBJEXT) quotesys.$(OBJEXT) \ ++ util.$(OBJEXT) version.$(OBJEXT) xmalloc.$(OBJEXT) ++HDRS = argmatch.h backupfile.h common.h dirname.h \ ++ error.h getopt.h gettext.h \ ++ inp.h maketime.h partime.h pch.h \ ++ quote.h quotearg.h quotesys.h \ ++ unlocked-io.h util.h version.h xalloc.h + MISC = AUTHORS COPYING ChangeLog INSTALL Makefile.in NEWS README \ +- aclocal.m4 ansi2knr.1 ansi2knr.c \ +- config.guess config.hin config.sub configure configure.in \ +- install-sh mkinstalldirs patch.man ++ aclocal.m4 \ ++ config.hin configure configure.ac \ ++ install-sh mkinstalldirs patch.man stdbool.h.in + DISTFILES = $(MISC) $(SRCS) $(HDRS) + DISTFILES_M4 = $(ACINCLUDE_INPUTS) + DISTFILES_PC = pc/chdirsaf.c +@@ -90,7 +105,7 @@ + COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) -Ded_PROGRAM=\"$(ed_PROGRAM)\" \ + -I. -I$(srcdir) $(CFLAGS) + +-.c.o: ++.c.$(OBJEXT): + $(COMPILE) $< + + patch$(EXEEXT): $(OBJS) +@@ -114,27 +129,46 @@ + $(SHELL) $(CONFIG_STATUS) + config.status: configure + $(SHELL) $(CONFIG_STATUS) --recheck +-configure: configure.in $(srcdir)/aclocal.m4 ++configure: configure.ac $(srcdir)/aclocal.m4 + cd $(srcdir) && autoconf +-config.hin: configure.in ++config.hin: configure.ac $(srcdir)/aclocal.m4 + cd $(srcdir) && rm -f config.hin && autoheader ++stdbool.h: stdbool.h.in ++ sed -e 's/@''HAVE__BOOL''@/@HAVE__BOOL@/g' \ ++ <$(srcdir)/stdbool.h.in >stdbool.h + + M4DIR = $(srcdir)/m4 +-ACINCLUDE_INPUTS = $(M4DIR)/ccstdc.m4 $(M4DIR)/d-ino.m4 \ +- $(M4DIR)/inttypes_h.m4 $(M4DIR)/largefile.m4 $(M4DIR)/malloc.m4 \ +- $(M4DIR)/protos.m4 $(M4DIR)/realloc.m4 $(M4DIR)/utimbuf.m4 ++ACINCLUDE_INPUTS = \ ++ $(M4DIR)/backupfile.m4 \ ++ $(M4DIR)/d-ino.m4 \ ++ $(M4DIR)/dirname.m4 \ ++ $(M4DIR)/dos.m4 \ ++ $(M4DIR)/error.m4 \ ++ $(M4DIR)/getopt.m4 \ ++ $(M4DIR)/malloc.m4 \ ++ $(M4DIR)/mbrtowc.m4 \ ++ $(M4DIR)/mbstate_t.m4 \ ++ $(M4DIR)/memchr.m4 \ ++ $(M4DIR)/mkdir.m4 \ ++ $(M4DIR)/onceonly.m4 \ ++ $(M4DIR)/quote.m4 \ ++ $(M4DIR)/quotearg.m4 \ ++ $(M4DIR)/realloc.m4 \ ++ $(M4DIR)/rmdir.m4 \ ++ $(M4DIR)/setmode.m4 \ ++ $(M4DIR)/stdbool.m4 \ ++ $(M4DIR)/unlocked-io.m4 \ ++ $(M4DIR)/utimbuf.m4 \ ++ $(M4DIR)/xalloc.m4 + + $(srcdir)/aclocal.m4: $(ACINCLUDE_INPUTS) + cat $(ACINCLUDE_INPUTS) >$(srcdir)/aclocal.m4 + +-patchlevel.h: configure.in +- echo '#define PATCH_VERSION "$(VERSION)"' >patchlevel.h +- +-TAGS: $(HDRS) patchlevel.h $(SRCS) +- etags $(HDRS) patchlevel.h $(SRCS) ++TAGS: $(HDRS) $(SRCS) ++ etags $(HDRS) $(SRCS) + + mostlyclean:: +- rm -f ansi2knr core* *core *.o *_.c ++ rm -f core* *core *.$(OBJEXT) *_.c stdbool.h + + clean:: mostlyclean + rm -f patch$(EXEEXT) +@@ -148,7 +182,7 @@ + $(MAKE) distclean + rm -f TAGS + +-PV = $(PACKAGE)-$(VERSION) ++PV = $(PACKAGE_NAME)-$(PACKAGE_VERSION) + + dist:: $(DISTFILES) $(DISTFILES_M4) $(DISTFILES_PC) $(DISTFILES_PC_DJGPP) + rm -rf $(PV) +@@ -160,31 +194,28 @@ + tar -chf - $(PV) | gzip -9 >$(PV).tar.gz + rm -rf $(PV) + +-ansi2knr.o: config.h +-ansi2knr: ansi2knr.o +- $(CC) -o $@ $(CFLAGS) $(LDFLAGS) ansi2knr.o $(LIBS) +-addext_.c argmatch_.c backupfile_.c basename_.c error_.c \ +-getopt_.c getopt1_.c inp_.c malloc_.c mkdir_.c patch_.c pch_.c quotearg_.c \ +-rename_.c util_.c version_.c xmalloc_.c: ansi2knr +-.SUFFIXES: _.c +-.c_.c: +- ./ansi2knr $< $@ +- + $(OBJS): config.h +-addext$U.o: backupfile.h +-argmatch$U.o: argmatch.h error.h quotearg.h +-backupfile$U.o: argmatch.h backupfile.h +-error$U.o: error.h +-getopt$U.o getopt1$U.o: getopt.h +-inp$U.o: backupfile.h common.h inp.h pch.h quotearg.h util.h xalloc.h +-maketime.o: maketime.h partime.h +-partime.o: partime.h +-patch$U.o: argmatch.h backupfile.h common.h getopt.h inp.h \ ++COMMON = common.h @STDBOOL_H@ ++addext.$(OBJEXT): backupfile.h dirname.h ++argmatch.$(OBJEXT): argmatch.h gettext.h error.h \ ++ quote.h quotearg.h unlocked-io.h ++backupfile.$(OBJEXT): argmatch.h backupfile.h dirname.h ++basename.$(OBJEXT): dirname.h ++dirname.$(OBJEXT): dirname.h xalloc.h ++error.$(OBJEXT): error.h gettext.h unlocked-io.h ++getopt.$(OBJEXT) getopt1.$(OBJEXT): getopt.h ++inp.$(OBJEXT): backupfile.h $(COMMON) inp.h pch.h quotearg.h util.h xalloc.h ++maketime.$(OBJEXT): maketime.h partime.h ++mkdir.$(OBJEXT): dirname.h xalloc.h ++partime.$(OBJEXT): partime.h ++patch.$(OBJEXT): argmatch.h backupfile.h $(COMMON) getopt.h inp.h \ + pch.h quotearg.h util.h version.h xalloc.h +-pch$U.o: backupfile.h basename.h common.h inp.h pch.h quotearg.h util.h +-quotearg$U.o: quotearg.h xalloc.h +-quotesys.o: quotesys.h +-util$U.o: backupfile.h basename.h common.h maketime.h \ ++pch.$(OBJEXT): backupfile.h $(COMMON) dirname.h inp.h pch.h quotearg.h util.h ++quote.$(OBJECT): quote.h quotearg.h ++quotearg.$(OBJEXT): gettext.h quotearg.h xalloc.h ++quotesys.$(OBJEXT): quotesys.h ++strncasecmp.$(OBJEXT): strcasecmp.c ++util.$(OBJEXT): backupfile.h $(COMMON) dirname.h maketime.h \ + partime.h quotearg.h quotesys.h util.h version.h xalloc.h +-version$U.o: common.h patchlevel.h util.h version.h +-xmalloc$U.o: xalloc.h ++version.$(OBJEXT): $(COMMON) version.h ++xmalloc.$(OBJEXT): error.h gettext.h xalloc.h +diff -urNd -urNd patch-2.5.4/memchr.c patch-2.5.9/memchr.c +--- patch-2.5.4/memchr.c 1999-07-10 12:44:10.000000000 -0400 ++++ patch-2.5.9/memchr.c 2000-10-28 04:22:11.000000000 -0400 +@@ -1,4 +1,4 @@ +-/* Copyright (C) 1991, 1993, 1997, 1999 Free Software Foundation, Inc. ++/* Copyright (C) 1991,93,96,97,99,2000 Free Software Foundation, Inc. + Based on strlen implementation by Torbjorn Granlund (tege@sics.se), + with help from Dan Sahlin (dan@sics.se) and + commentary by Jim Blandy (jimb@ai.mit.edu); +@@ -34,11 +34,18 @@ + # define __ptr_t char * + #endif /* C++ or ANSI C. */ + +-#if defined (_LIBC) ++#if defined _LIBC + # include <string.h> ++# include <memcopy.h> ++#else ++# define reg_char char + #endif + +-#if defined (HAVE_LIMITS_H) || defined (_LIBC) ++#if HAVE_STDLIB_H || defined _LIBC ++# include <stdlib.h> ++#endif ++ ++#if HAVE_LIMITS_H || defined _LIBC + # include <limits.h> + #endif + +@@ -49,21 +56,28 @@ + #endif + + #include <sys/types.h> ++#if HAVE_BP_SYM_H || defined _LIBC ++# include <bp-sym.h> ++#else ++# define BP_SYM(sym) sym ++#endif + ++#undef memchr ++#undef __memchr + + /* Search no more than N bytes of S for C. */ +- + __ptr_t +-memchr (s, c, n) ++__memchr (s, c_in, n) + const __ptr_t s; +- int c; ++ int c_in; + size_t n; + { + const unsigned char *char_ptr; + const unsigned long int *longword_ptr; + unsigned long int longword, magic_bits, charmask; ++ unsigned reg_char c; + +- c = (unsigned char) c; ++ c = (unsigned char) c_in; + + /* Handle the first few characters by reading one character at a time. + Do this until CHAR_PTR is aligned on a longword boundary. */ +@@ -197,3 +211,6 @@ + + return 0; + } ++#ifdef weak_alias ++weak_alias (__memchr, BP_SYM (memchr)) ++#endif +diff -urNd -urNd patch-2.5.4/mkdir.c patch-2.5.9/mkdir.c +--- patch-2.5.4/mkdir.c 1999-04-26 08:16:14.000000000 -0400 ++++ patch-2.5.9/mkdir.c 2001-09-16 08:42:14.000000000 -0400 +@@ -1,5 +1,6 @@ +-/* BSD compatible make directory function for System V +- Copyright (C) 1988, 1990, 1998 Free Software Foundation, Inc. ++/* On some systems, mkdir ("foo/", 0700) fails because of the trailing ++ slash. On those systems, this wrapper removes the trailing slash. ++ Copyright (C) 2001 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 +@@ -15,94 +16,61 @@ + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +-#if HAVE_CONFIG_H +-# include <config.h> +-#endif ++/* written by Jim Meyering */ ++ ++#include <config.h> ++ ++/* Disable the definition of mkdir to rpl_mkdir (from config.h) in this ++ file. Otherwise, we'd get conflicting prototypes for rpl_mkdir on ++ most systems. */ ++#undef mkdir + + #include <sys/types.h> + #include <sys/stat.h> +-#include <errno.h> +-#ifndef errno +-extern int errno; ++#include <stdio.h> ++#if HAVE_STDLIB_H ++# include <stdlib.h> + #endif + +-#if STAT_MACROS_BROKEN +-# undef S_ISDIR ++#if HAVE_STRING_H ++# include <string.h> ++#else ++# include <strings.h> + #endif + +-#if !defined(S_ISDIR) && defined(S_IFDIR) +-# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) +-#endif ++#include "dirname.h" ++#include "xalloc.h" + +-#ifndef S_IRWXU +-# define S_IRWXU 0700 +-#endif +-#ifndef S_IRWXG +-# define S_IRWXG 0070 ++#ifndef HAVE_DECL_FREE ++"this configure-time declaration test was not run" + #endif +-#ifndef S_IRWXO +-# define S_IRWXO 0007 ++#if !HAVE_DECL_FREE ++void free (); + #endif + +-/* mkdir adapted from GNU tar. */ +- +-/* Make directory DPATH, with permission mode DMODE. +- +- Written by Robert Rother, Mariah Corporation, August 1985 +- (sdcsvax!rmr or rmr@uscd). If you want it, it's yours. +- +- Severely hacked over by John Gilmore to make a 4.2BSD compatible +- subroutine. 11Mar86; hoptoad!gnu +- +- Modified by rmtodd@uokmax 6-28-87 -- when making an already existing dir, +- subroutine didn't return EEXIST. It does now. */ ++/* This function is required at least for NetBSD 1.5.2. */ + + int +-mkdir (const char *dpath, mode_t dmode) ++rpl_mkdir (char const *dir, mode_t mode) + { +- pid_t cpid; +- mode_t mode; +- int status; +- struct stat statbuf; ++ int ret_val; ++ char *tmp_dir; ++ size_t len = strlen (dir); + +- if (stat (dpath, &statbuf) == 0) ++ if (len && dir[len - 1] == '/') + { +- errno = EEXIST; /* stat worked, so it already exists. */ +- return -1; ++ tmp_dir = xstrdup (dir); ++ strip_trailing_slashes (tmp_dir); + } +- +- /* If stat fails for a reason other than non-existence, return error. */ +- if (errno != ENOENT) +- return -1; +- +- cpid = fork (); +- switch (cpid) ++ else + { +- case -1: /* Cannot fork. */ +- return -1; /* errno is already set. */ ++ tmp_dir = (char *) dir; ++ } + +- case 0: /* Child process. */ +- /* Cheap hack to set mode of new directory. Since this child +- process is going away anyway, we zap its umask. +- This won't suffice to set SUID, SGID, etc. on this +- directory, so the parent process calls chmod afterward. */ +- mode = umask (0); /* Get current umask. */ +- /* Set for mkdir. */ +- umask (mode | ((S_IRWXU | S_IRWXG | S_IRWXO) & ~dmode)); +- execl ("/bin/mkdir", "mkdir", dpath, (char *) 0); +- _exit (1); ++ ret_val = mkdir (tmp_dir, mode); + +- default: /* Parent process. */ +- /* Wait for kid to finish. */ +- while (wait (&status) != cpid) +- /* Do nothing. */ ; ++ if (tmp_dir != dir) ++ free (tmp_dir); + +- if (status) +- { +- /* /bin/mkdir failed. */ +- errno = EIO; +- return -1; +- } +- return chmod (dpath, dmode); +- } ++ return ret_val; + } +diff -urNd -urNd patch-2.5.4/mkinstalldirs patch-2.5.9/mkinstalldirs +--- patch-2.5.4/mkinstalldirs 1999-01-05 08:29:06.000000000 -0500 ++++ patch-2.5.9/mkinstalldirs 2002-09-02 11:10:52.000000000 -0400 +@@ -4,9 +4,53 @@ + # Created: 1993-05-16 + # Public domain + +-# $Id: mkinstalldirs,v 1.12.2.1 1998/12/26 17:32:14 bje Exp $ +- + errstatus=0 ++dirmode="" ++ ++usage="\ ++Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." ++ ++# process command line arguments ++while test $# -gt 0 ; do ++ case "${1}" in ++ -h | --help | --h* ) # -h for help ++ echo "${usage}" 1>&2; exit 0 ;; ++ -m ) # -m PERM arg ++ shift ++ test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } ++ dirmode="${1}" ++ shift ;; ++ -- ) shift; break ;; # stop option processing ++ -* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option ++ * ) break ;; # first non-opt arg ++ esac ++done ++ ++for file ++do ++ if test -d "$file"; then ++ shift ++ else ++ break ++ fi ++done ++ ++case $# in ++0) exit 0 ;; ++esac ++ ++case $dirmode in ++'') ++ if mkdir -p -- . 2>/dev/null; then ++ echo "mkdir -p -- $*" ++ exec mkdir -p -- "$@" ++ fi ;; ++*) ++ if mkdir -m "$dirmode" -p -- . 2>/dev/null; then ++ echo "mkdir -m $dirmode -p -- $*" ++ exec mkdir -m "$dirmode" -p -- "$@" ++ fi ;; ++esac + + for file + do +@@ -22,13 +66,24 @@ + esac + + if test ! -d "$pathcomp"; then +- echo "mkdir $pathcomp" ++ echo "mkdir $pathcomp" + +- mkdir "$pathcomp" || lasterr=$? ++ mkdir "$pathcomp" || lasterr=$? + +- if test ! -d "$pathcomp"; then +- errstatus=$lasterr +- fi ++ if test ! -d "$pathcomp"; then ++ errstatus=$lasterr ++ else ++ if test ! -z "$dirmode"; then ++ echo "chmod $dirmode $pathcomp" ++ ++ lasterr="" ++ chmod "$dirmode" "$pathcomp" || lasterr=$? ++ ++ if test ! -z "$lasterr"; then ++ errstatus=$lasterr ++ fi ++ fi ++ fi + fi + + pathcomp="$pathcomp/" +@@ -37,4 +92,8 @@ + + exit $errstatus + ++# Local Variables: ++# mode: shell-script ++# sh-indentation: 3 ++# End: + # mkinstalldirs ends here +diff -urNd -urNd patch-2.5.4/NEWS patch-2.5.9/NEWS +--- patch-2.5.4/NEWS 1998-03-20 21:51:32.000000000 -0500 ++++ patch-2.5.9/NEWS 2003-05-18 04:40:54.000000000 -0400 +@@ -1,9 +1,23 @@ +-Known problems: ++Changes in versions 2.5.8 and 2.5.9: bug fixes only. + +-* The diffutils 2.7 documentation for `patch' is obsolete; this should be +- fixed in diffutils 2.8. Until then, see `patch --help' or `man patch'. +- +-Changes since version 2.5: ++Changes in version 2.5.7: ++ ++* patch -D now outputs preprocessor lines without comments, as required ++ by POSIX 1003.1-2001. ++ ++Changes in version 2.5.6: ++ ++* File names in context patches may now contain spaces, so long ++ as the context patch headers use a tab to separate the file name ++ from the time stamp. ++* Perforce is now supported. ++* Patch lines beginning with "#" are comments and are ignored. ++ ++Changes in version 2.5.5: ++ ++* The bug reporting address is now <bug-patch@gnu.org>. ++ ++Changes in version 2.5.4: + + * A security hole has been closed. + It involved race conditions with temporary files. +@@ -19,6 +33,9 @@ + * `patch' now ignores trailing carriage returns in lines of context diffs + if the context diff headers end in carriage return. + ++* `patch' now ignores context diff header file names that have fewer slashes ++ than the count specified by the -p or --strip option. ++ + * New options: + --posix + --quoting-style=WORD +@@ -196,3 +213,25 @@ + being patched. + * Print the system error message when system calls fail. + * Fixed various bugs and portability problems. ++ ++ ++ ++Copyright (C) 1992, 1993, 1997, 1998, 1999, 2000, 2001, 2002, 2003 ++Free Software Foundation, Inc. ++ ++This file is part of GNU Patch. ++ ++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 they 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; see the file COPYING. If not, write to ++the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++Boston, MA 02111-1307, USA. +diff -urNd -urNd patch-2.5.4/partime.c patch-2.5.9/partime.c +--- patch-2.5.4/partime.c 1998-03-15 10:48:53.000000000 -0500 ++++ patch-2.5.9/partime.c 2002-02-18 02:42:58.000000000 -0500 +@@ -1,6 +1,6 @@ + /* Parse a string, yielding a struct partime that describes it. */ + +-/* Copyright 1993, 1994, 1995, 1997 Paul Eggert ++/* Copyright (C) 1993, 1994, 1995, 1997, 2002 Paul Eggert + Distributed under license by the Free Software Foundation, Inc. + + This file is part of RCS. +@@ -75,7 +75,7 @@ + #include <partime.h> + + char const partime_id[] = +- "$Id: partime.c,v 5.18 1998/03/15 15:48:53 eggert Exp $"; ++ "$Id: partime.c,v 1.2 2002/02/18 07:42:58 eggert Exp $"; + + + /* Lookup tables for names of months, weekdays, time zones. */ +@@ -791,7 +791,7 @@ + return 0; + if (negative) + n = -n; +- while (!ISALNUM ((unsigned char) *s)) ++ while (! ISALNUM ((unsigned char) *s) && *s) + s++; + i = lookup (s, relative_units); + if (!TM_DEFINED (i)) +diff -urNd -urNd patch-2.5.4/patch.c patch-2.5.9/patch.c +--- patch-2.5.4/patch.c 1999-08-30 02:20:08.000000000 -0400 ++++ patch-2.5.9/patch.c 2003-05-20 09:55:03.000000000 -0400 +@@ -1,9 +1,11 @@ + /* patch - a program to apply diffs to original files */ + +-/* $Id: patch.c,v 1.28 1999/08/30 06:20:08 eggert Exp $ */ ++/* $Id: patch.c,v 1.44 2003/05/20 13:55:03 eggert Exp $ */ + +-/* Copyright 1984, 1985-1987, 1988 Larry Wall +- Copyright 1989, 1990-1993, 1997-1998, 1999 Free Software Foundation, Inc. ++/* Copyright (C) 1984, 1985, 1986, 1987, 1988 Larry Wall ++ ++ Copyright (C) 1989, 1990, 1991, 1992, 1993, 1997, 1998, 1999, 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 +@@ -50,47 +52,47 @@ + struct outstate + { + FILE *ofp; +- int after_newline; +- int zero_output; ++ bool after_newline; ++ bool zero_output; + }; + + /* procedures */ + +-static FILE *create_output_file PARAMS ((char const *, int)); +-static LINENUM locate_hunk PARAMS ((LINENUM)); +-static bool apply_hunk PARAMS ((struct outstate *, LINENUM)); +-static bool copy_till PARAMS ((struct outstate *, LINENUM)); +-static bool patch_match PARAMS ((LINENUM, LINENUM, LINENUM, LINENUM)); +-static bool similar PARAMS ((char const *, size_t, char const *, size_t)); +-static bool spew_output PARAMS ((struct outstate *)); +-static char const *make_temp PARAMS ((int)); +-static int numeric_string PARAMS ((char const *, int, char const *)); +-static void abort_hunk PARAMS ((void)); +-static void cleanup PARAMS ((void)); +-static void get_some_switches PARAMS ((void)); +-static void init_output PARAMS ((char const *, int, struct outstate *)); +-static void init_reject PARAMS ((void)); +-static void reinitialize_almost_everything PARAMS ((void)); +-static void remove_if_needed PARAMS ((char const *, int volatile *)); +-static void usage PARAMS ((FILE *, int)) __attribute__((noreturn)); ++static FILE *create_output_file (char const *, int); ++static LINENUM locate_hunk (LINENUM); ++static bool apply_hunk (struct outstate *, LINENUM); ++static bool copy_till (struct outstate *, LINENUM); ++static bool patch_match (LINENUM, LINENUM, LINENUM, LINENUM); ++static bool similar (char const *, size_t, char const *, size_t); ++static bool spew_output (struct outstate *); ++static char const *make_temp (char); ++static int numeric_string (char const *, bool, char const *); ++static void abort_hunk (void); ++static void cleanup (void); ++static void get_some_switches (void); ++static void init_output (char const *, int, struct outstate *); ++static void init_reject (void); ++static void reinitialize_almost_everything (void); ++static void remove_if_needed (char const *, int volatile *); ++static void usage (FILE *, int) __attribute__((noreturn)); + +-static int make_backups; +-static int backup_if_mismatch; ++static bool make_backups; ++static bool backup_if_mismatch; + static char const *version_control; + static char const *version_control_context; +-static int remove_empty_files; ++static bool remove_empty_files; + +-/* TRUE if -R was specified on command line. */ +-static int reverse_flag_specified; ++/* true if -R was specified on command line. */ ++static bool reverse_flag_specified; + + /* how many input lines have been irretractably output */ + static LINENUM last_frozen_line; + + static char const *do_defines; /* symbol to patch using ifdef, ifndef, etc. */ + static char const if_defined[] = "\n#ifdef %s\n"; +-static char const not_defined[] = "#ifndef %s\n"; ++static char const not_defined[] = "\n#ifndef %s\n"; + static char const else_defined[] = "\n#else\n"; +-static char const end_defined[] = "\n#endif /* %s */\n"; ++static char const end_defined[] = "\n#endif\n"; + + static int Argc; + static char * const *Argv; +@@ -107,20 +109,18 @@ + + static char serrbuf[BUFSIZ]; + +-char const program_name[] = "patch"; +- + /* Apply a set of diffs as appropriate. */ + +-int main PARAMS ((int, char **)); +- + int + main (int argc, char **argv) + { + char const *val; +- bool somefailed = FALSE; ++ bool somefailed = false; + struct outstate outstate; + char numbuf[LINENUM_LENGTH_BOUND + 1]; + ++ xalloc_exit_failure = 2; ++ program_name = argv[0]; + init_time (); + + setbuf(stderr, serrbuf); +@@ -141,12 +141,11 @@ + posixly_correct = getenv ("POSIXLY_CORRECT") != 0; + backup_if_mismatch = ! posixly_correct; + patch_get = ((val = getenv ("PATCH_GET")) +- ? numeric_string (val, 1, "PATCH_GET value") ++ ? numeric_string (val, true, "PATCH_GET value") + : posixly_correct - 1); + + val = getenv ("SIMPLE_BACKUP_SUFFIX"); +- if (val && *val) +- simple_backup_suffix = val; ++ simple_backup_suffix = val && *val ? val : ".orig"; + + if ((version_control = getenv ("PATCH_VERSION_CONTROL"))) + version_control_context = "$PATCH_VERSION_CONTROL"; +@@ -171,7 +170,7 @@ + init_output (outfile, 0, &outstate); + + /* Make sure we clean up in case of disaster. */ +- set_signals(0); ++ set_signals (false); + + for ( + open_patch_file (patchname); +@@ -180,28 +179,26 @@ + ) { /* for each patch in patch file */ + int hunk = 0; + int failed = 0; +- int mismatch = 0; ++ bool mismatch = false; + char *outname = outfile ? outfile : inname; + + if (!skip_rest_of_patch) + get_input_file (inname, outname); + + if (diff_type == ED_DIFF) { +- outstate.zero_output = 0; +- if (! dry_run) ++ outstate.zero_output = false; ++ somefailed |= skip_rest_of_patch; ++ do_ed_script (outstate.ofp); ++ if (! dry_run && ! outfile && ! skip_rest_of_patch) + { +- do_ed_script (outstate.ofp); +- if (! outfile) +- { +- struct stat statbuf; +- if (stat (TMPOUTNAME, &statbuf) != 0) +- pfatal ("%s", TMPOUTNAME); +- outstate.zero_output = statbuf.st_size == 0; +- } ++ struct stat statbuf; ++ if (stat (TMPOUTNAME, &statbuf) != 0) ++ pfatal ("%s", TMPOUTNAME); ++ outstate.zero_output = statbuf.st_size == 0; + } + } else { + int got_hunk; +- int apply_anyway = 0; ++ bool apply_anyway = false; + + /* initialize the patched file */ + if (! skip_rest_of_patch && ! outfile) +@@ -236,7 +233,7 @@ + do { + where = locate_hunk(fuzz); + if (! where || fuzz || last_offset) +- mismatch = 1; ++ mismatch = true; + if (hunk == 1 && ! where && ! (force | apply_anyway) + && reverse == reverse_flag_specified) { + /* dwim for reversed patch? */ +@@ -253,7 +250,7 @@ + (reverse + ? "Unreversed" + : "Reversed (or previously applied)")))) +- reverse ^= 1; ++ reverse = ! reverse; + else + { + /* Put it back to normal. */ +@@ -261,7 +258,7 @@ + fatal ("lost hunk on alloc error!"); + if (where) + { +- apply_anyway = 1; ++ apply_anyway = true; + fuzz--; /* Undo `++fuzz' below. */ + where = 0; + } +@@ -344,7 +341,7 @@ + if (! spew_output (&outstate)) + { + say ("Skipping patch.\n"); +- skip_rest_of_patch = TRUE; ++ skip_rest_of_patch = true; + } + } + } +@@ -354,7 +351,7 @@ + if (! skip_rest_of_patch && ! outfile) { + if (outstate.zero_output + && (remove_empty_files +- || (pch_says_nonexistent (reverse ^ 1) == 2 ++ || (pch_says_nonexistent (! reverse) == 2 + && ! posixly_correct))) + { + if (verbosity == VERBOSE) +@@ -371,9 +368,9 @@ + else + { + if (! outstate.zero_output +- && pch_says_nonexistent (reverse ^ 1)) ++ && pch_says_nonexistent (! reverse)) + { +- mismatch = 1; ++ mismatch = true; + if (verbosity != SILENT) + say ("File %s is not empty after patch, as expected\n", + quotearg (outname)); +@@ -389,7 +386,7 @@ + || (backup_if_mismatch && (mismatch | failed)))); + + if ((set_time | set_utc) +- && (t = pch_timestamp (reverse ^ 1)) != (time_t) -1) ++ && (t = pch_timestamp (! reverse)) != (time_t) -1) + { + struct utimbuf utimbuf; + utimbuf.actime = utimbuf.modtime = t; +@@ -418,7 +415,7 @@ + if (fclose (rejfp) != 0) + write_fatal (); + if (failed) { +- somefailed = TRUE; ++ somefailed = true; + say ("%d out of %d hunk%s %s", failed, hunk, "s" + (hunk == 1), + skip_rest_of_patch ? "ignored" : "FAILED"); + if (outname) { +@@ -432,7 +429,7 @@ + if (! dry_run) + { + move_file (TMPREJNAME, &TMPREJNAME_needs_removal, +- rej, instat.st_mode, FALSE); ++ rej, instat.st_mode, false); + if (! inerrno + && (chmod (rej, (instat.st_mode + & ~(S_IXUSR|S_IXGRP|S_IXOTH))) +@@ -446,7 +443,7 @@ + say ("\n"); + } + } +- set_signals (1); ++ set_signals (true); + } + if (outstate.ofp && (ferror (outstate.ofp) || fclose (outstate.ofp) != 0)) + write_fatal (); +@@ -482,7 +479,7 @@ + } + + reverse = reverse_flag_specified; +- skip_rest_of_patch = FALSE; ++ skip_rest_of_patch = false; + } + + static char const shortopts[] = "bB:cd:D:eEfF:g:i:lnNo:p:r:RstTuvV:x:Y:z:Z"; +@@ -585,7 +582,7 @@ + " --posix Conform to the POSIX standard.", + "", + " -d DIR --directory=DIR Change the working directory to DIR first.", +-#if HAVE_SETMODE ++#if HAVE_SETMODE_DOS + " --binary Read and write data in binary mode.", + #else + " --binary Read and write data in binary mode (no effect on this platform).", +@@ -594,7 +591,7 @@ + " -v --version Output version info.", + " --help Output this help.", + "", +-"Report bugs to <bug-gnu-utils@gnu.org>.", ++"Report bugs to <" PACKAGE_BUGREPORT ">.", + 0 + }; + +@@ -635,7 +632,7 @@ + != -1) { + switch (optc) { + case 'b': +- make_backups = 1; ++ make_backups = true; + /* Special hack for backward compatibility with CVS 1.9. + If the last 4 args are `-b SUFFIX ORIGFILE PATCHFILE', + treat `-b' as if it were `-b -z'. */ +@@ -671,28 +668,28 @@ + diff_type = ED_DIFF; + break; + case 'E': +- remove_empty_files = TRUE; ++ remove_empty_files = true; + break; + case 'f': +- force = TRUE; ++ force = true; + break; + case 'F': +- maxfuzz = numeric_string (optarg, 0, "fuzz factor"); ++ maxfuzz = numeric_string (optarg, false, "fuzz factor"); + break; + case 'g': +- patch_get = numeric_string (optarg, 1, "get option value"); ++ patch_get = numeric_string (optarg, true, "get option value"); + break; + case 'i': + patchname = savestr (optarg); + break; + case 'l': +- canonicalize = TRUE; ++ canonicalize = true; + break; + case 'n': + diff_type = NORMAL_DIFF; + break; + case 'N': +- noreverse = TRUE; ++ noreverse = true; + break; + case 'o': + if (strcmp (optarg, "-") == 0) +@@ -700,23 +697,23 @@ + outfile = savestr (optarg); + break; + case 'p': +- strippath = numeric_string (optarg, 0, "strip count"); ++ strippath = numeric_string (optarg, false, "strip count"); + break; + case 'r': + rejname = savestr (optarg); + break; + case 'R': +- reverse = 1; +- reverse_flag_specified = 1; ++ reverse = true; ++ reverse_flag_specified = true; + break; + case 's': + verbosity = SILENT; + break; + case 't': +- batch = TRUE; ++ batch = true; + break; + case 'T': +- set_time = 1; ++ set_time = true; + break; + case 'u': + diff_type = UNI_DIFF; +@@ -731,7 +728,7 @@ + break; + #if DEBUGGING + case 'x': +- debug = numeric_string (optarg, 1, "debugging option"); ++ debug = numeric_string (optarg, true, "debugging option"); + break; + #endif + case 'Y': +@@ -746,29 +743,29 @@ + simple_backup_suffix = savestr (optarg); + break; + case 'Z': +- set_utc = 1; ++ set_utc = true; + break; + case CHAR_MAX + 1: +- dry_run = TRUE; ++ dry_run = true; + break; + case CHAR_MAX + 2: + verbosity = VERBOSE; + break; + case CHAR_MAX + 3: +-#if HAVE_SETMODE ++#if HAVE_SETMODE_DOS + binary_transput = O_BINARY; + #endif + break; + case CHAR_MAX + 4: + usage (stdout, 0); + case CHAR_MAX + 5: +- backup_if_mismatch = 1; ++ backup_if_mismatch = true; + break; + case CHAR_MAX + 6: +- backup_if_mismatch = 0; ++ backup_if_mismatch = false; + break; + case CHAR_MAX + 7: +- posixly_correct = 1; ++ posixly_correct = true; + break; + case CHAR_MAX + 8: + { +@@ -810,7 +807,7 @@ + returning the result. */ + static int + numeric_string (char const *string, +- int negative_allowed, ++ bool negative_allowed, + char const *argtype_msgid) + { + int value = 0; +@@ -884,7 +881,7 @@ + && offset <= max_pos_offset + && patch_match (first_guess, offset, (LINENUM) 0, suffix_fuzz)) + { +- last_offset = offset; ++ last_offset += offset; + return first_guess + offset; + } + else +@@ -898,7 +895,7 @@ + if (offset <= max_neg_offset + && patch_match (first_guess, -offset, prefix_fuzz, (LINENUM) 0)) + { +- last_offset = - offset; ++ last_offset -= offset; + return first_guess - offset; + } + else +@@ -913,8 +910,8 @@ + if (debug & 1) + say ("Offset changing from %s to %s\n", + format_linenum (numbuf0, last_offset), +- format_linenum (numbuf1, offset)); +- last_offset = offset; ++ format_linenum (numbuf1, last_offset + offset)); ++ last_offset += offset; + return first_guess+offset; + } + if (0 < offset && offset <= max_neg_offset +@@ -922,8 +919,8 @@ + if (debug & 1) + say ("Offset changing from %s to %s\n", + format_linenum (numbuf0, last_offset), +- format_linenum (numbuf1, -offset)); +- last_offset = -offset; ++ format_linenum (numbuf1, last_offset - offset)); ++ last_offset -= offset; + return first_guess-offset; + } + } +@@ -1009,10 +1006,10 @@ + if (pch_char(old) == '-') { + assert (outstate->after_newline); + if (! copy_till (outstate, where + old - 1)) +- return FALSE; ++ return false; + if (R_do_defines) { + if (def_state == OUTSIDE) { +- fprintf (fp, outstate->after_newline + if_defined, ++ fprintf (fp, outstate->after_newline + not_defined, + R_do_defines); + def_state = IN_IFNDEF; + } +@@ -1023,7 +1020,7 @@ + if (ferror (fp)) + write_fatal (); + outstate->after_newline = pch_write_line (old, fp); +- outstate->zero_output = 0; ++ outstate->zero_output = false; + } + last_frozen_line++; + old++; +@@ -1033,7 +1030,7 @@ + } + else if (pch_char(new) == '+') { + if (! copy_till (outstate, where + old - 1)) +- return FALSE; ++ return false; + if (R_do_defines) { + if (def_state == IN_IFNDEF) { + fprintf (fp, outstate->after_newline + else_defined); +@@ -1048,7 +1045,7 @@ + write_fatal (); + } + outstate->after_newline = pch_write_line (new, fp); +- outstate->zero_output = 0; ++ outstate->zero_output = false; + new++; + } + else if (pch_char(new) != pch_char(old)) { +@@ -1064,10 +1061,10 @@ + else if (pch_char(new) == '!') { + assert (outstate->after_newline); + if (! copy_till (outstate, where + old - 1)) +- return FALSE; ++ return false; + assert (outstate->after_newline); + if (R_do_defines) { +- fprintf (fp, not_defined, R_do_defines); ++ fprintf (fp, 1 + not_defined, R_do_defines); + if (ferror (fp)) + write_fatal (); + def_state = IN_IFNDEF; +@@ -1096,25 +1093,24 @@ + new++; + } + while (pch_char (new) == '!'); +- outstate->zero_output = 0; ++ outstate->zero_output = false; + } + else { + assert(pch_char(new) == ' '); + old++; + new++; + if (R_do_defines && def_state != OUTSIDE) { +- fprintf (fp, outstate->after_newline + end_defined, +- R_do_defines); ++ fprintf (fp, outstate->after_newline + end_defined); + if (ferror (fp)) + write_fatal (); +- outstate->after_newline = 1; ++ outstate->after_newline = true; + def_state = OUTSIDE; + } + } + } + if (new <= pat_end && pch_char(new) == '+') { + if (! copy_till (outstate, where + old - 1)) +- return FALSE; ++ return false; + if (R_do_defines) { + if (def_state == OUTSIDE) { + fprintf (fp, outstate->after_newline + if_defined, +@@ -1127,7 +1123,7 @@ + } + if (ferror (fp)) + write_fatal (); +- outstate->zero_output = 0; ++ outstate->zero_output = false; + } + + do +@@ -1135,18 +1131,18 @@ + if (! outstate->after_newline && putc ('\n', fp) == EOF) + write_fatal (); + outstate->after_newline = pch_write_line (new, fp); +- outstate->zero_output = 0; ++ outstate->zero_output = false; + new++; + } + while (new <= pat_end && pch_char (new) == '+'); + } + if (R_do_defines && def_state != OUTSIDE) { +- fprintf (fp, outstate->after_newline + end_defined, R_do_defines); ++ fprintf (fp, outstate->after_newline + end_defined); + if (ferror (fp)) + write_fatal (); +- outstate->after_newline = 1; ++ outstate->after_newline = true; + } +- return TRUE; ++ return true; + } + + /* Create an output file. */ +@@ -1168,8 +1164,8 @@ + init_output (char const *name, int open_flags, struct outstate *outstate) + { + outstate->ofp = name ? create_output_file (name, open_flags) : (FILE *) 0; +- outstate->after_newline = 1; +- outstate->zero_output = 1; ++ outstate->after_newline = true; ++ outstate->zero_output = true; + } + + /* Open a file to put hunks we can't locate. */ +@@ -1195,22 +1191,22 @@ + if (R_last_frozen_line > lastline) + { + say ("misordered hunks! output would be garbled\n"); +- return FALSE; ++ return false; + } + while (R_last_frozen_line < lastline) + { +- s = ifetch (++R_last_frozen_line, 0, &size); ++ s = ifetch (++R_last_frozen_line, false, &size); + if (size) + { + if ((! outstate->after_newline && putc ('\n', fp) == EOF) + || ! fwrite (s, sizeof *s, size, fp)) + write_fatal (); + outstate->after_newline = s[size - 1] == '\n'; +- outstate->zero_output = 0; ++ outstate->zero_output = false; + } + } + last_frozen_line = R_last_frozen_line; +- return TRUE; ++ return true; + } + + /* Finish copying the input file to the output file. */ +@@ -1229,7 +1225,7 @@ + + if (last_frozen_line < input_lines) + if (! copy_till (outstate, input_lines)) +- return FALSE; ++ return false; + + if (outstate->ofp && ! outfile) + { +@@ -1238,7 +1234,7 @@ + outstate->ofp = 0; + } + +- return TRUE; ++ return true; + } + + /* Does the patch pattern match at line base+offset? */ +@@ -1259,13 +1255,13 @@ + if (!similar(p, size, + pfetch(pline), + pch_line_len(pline) )) +- return FALSE; ++ return false; + } + else if (size != pch_line_len (pline) + || memcmp (p, pfetch (pline), size) != 0) +- return FALSE; ++ return false; + } +- return TRUE; ++ return true; + } + + /* Do two lines match with canonicalized white space? */ +@@ -1287,7 +1283,7 @@ + if (alen) + { + if (!(*a == ' ' || *a == '\t')) +- return FALSE; ++ return false; + do a++, alen--; + while (alen && (*a == ' ' || *a == '\t')); + } +@@ -1295,7 +1291,7 @@ + return alen == blen; + } + else if (!alen || *a++ != *b++) +- return FALSE; ++ return false; + else + alen--, blen--; + } +@@ -1303,8 +1299,8 @@ + + /* Make a temporary file. */ + +-#if HAVE_MKTEMP +-char *mktemp PARAMS ((char *)); ++#if HAVE_MKTEMP && ! HAVE_DECL_MKTEMP && ! defined mktemp ++char *mktemp (char *); + #endif + + #ifndef TMPDIR +@@ -1312,7 +1308,7 @@ + #endif + + static char const * +-make_temp (int letter) ++make_temp (char letter) + { + char *r; + #if HAVE_MKTEMP +@@ -1322,7 +1318,14 @@ + if (!tmpdir) tmpdir = TMPDIR; + r = xmalloc (strlen (tmpdir) + 10); + sprintf (r, "%s/p%cXXXXXX", tmpdir, letter); ++ ++ /* It is OK to use mktemp here, since the rest of the code always ++ opens temp files with O_EXCL. It might be better to use mkstemp ++ to avoid some DoS problems, but simply substituting mkstemp for ++ mktemp here will not fix the DoS problems; a more extensive ++ change would be needed. */ + mktemp (r); ++ + if (!*r) + pfatal ("mktemp"); + #else +diff -urNd -urNd patch-2.5.4/patchlevel.h patch-2.5.9/patchlevel.h +--- patch-2.5.4/patchlevel.h 1999-08-30 02:48:14.000000000 -0400 ++++ patch-2.5.9/patchlevel.h 1969-12-31 19:00:00.000000000 -0500 +@@ -1 +0,0 @@ +-#define PATCH_VERSION "2.5.4" +diff -urNd -urNd patch-2.5.4/patch.man patch-2.5.9/patch.man +--- patch-2.5.4/patch.man 1998-03-21 10:48:43.000000000 -0500 ++++ patch-2.5.9/patch.man 2002-05-25 06:36:44.000000000 -0400 +@@ -2,7 +2,7 @@ + .de Id + .ds Dt \\$4 + .. +-.Id $Id: patch.man,v 1.26 1998/03/21 15:48:43 eggert Exp $ ++.Id $Id: patch.man,v 1.31 2002/05/25 10:36:44 eggert Exp $ + .ds = \-\^\- + .de Sp + .if t .sp .3 +@@ -70,6 +70,10 @@ + or is encapsulated one or more times by prepending + "\fB\- \fP" to lines starting with "\fB\-\fP" as specified by Internet RFC 934, + this is taken into account. ++After removing indenting or encapsulation, ++lines beginning with ++.B # ++are ignored, as they are considered to be comments. + .PP + With context diffs, and to a lesser extent with normal diffs, + .B patch +@@ -185,19 +189,19 @@ + .B " \(bu" + If + .B patch +-is not ignoring \s-1RCS\s0, ClearCase, and \s-1SCCS\s0 (see the ++is not ignoring \s-1RCS\s0, ClearCase, Perforce, and \s-1SCCS\s0 (see the + .BI "\-g\ " num + or + .BI \*=get= num + option), and no named files exist +-but an \s-1RCS\s0, ClearCase, or \s-1SCCS\s0 master is found, ++but an \s-1RCS\s0, ClearCase, Perforce, or \s-1SCCS\s0 master is found, + .B patch + selects the first named file +-with an \s-1RCS\s0, ClearCase, or \s-1SCCS\s0 master. ++with an \s-1RCS\s0, ClearCase, Perforce, or \s-1SCCS\s0 master. + .TP + .B " \(bu" + If no named files exist, +-no \s-1RCS\s0, ClearCase, or \s-1SCCS\s0 master was found, ++no \s-1RCS\s0, ClearCase, Perforce, or \s-1SCCS\s0 master was found, + some names are given, + .B patch + is not conforming to \s-1POSIX\s0, +@@ -362,14 +366,14 @@ + .BR patch 's + actions when a file is under \s-1RCS\s0 or \s-1SCCS\s0 control, + and does not exist or is read-only and matches the default version, +-or when a file is under ClearCase control and does not exist. ++or when a file is under ClearCase or Perforce control and does not exist. + If + .I num + is positive, + .B patch + gets (or checks out) the file from the revision control system; if zero, + .B patch +-ignores \s-1RCS\s0, ClearCase, and \s-1SCCS\s0 ++ignores \s-1RCS\s0, ClearCase, Perforce, and \s-1SCCS\s0 + and does not get the file; and if negative, + .B patch + asks the user whether to get the file. +@@ -411,6 +415,9 @@ + Send output to + .I outfile + instead of patching files in place. ++Do not use this option if ++.I outfile ++is one of the files to be patched. + .TP + \fB\-p\fP\fInum\fP or \fB\*=strip\fP\fB=\fP\fInum\fP + Strip the smallest prefix containing +@@ -458,7 +465,8 @@ + Do not remove files that are empty after patching. + .TP + .B " \(bu" +-Do not ask whether to get files from \s-1RCS\s0, ClearCase, or \s-1SCCS\s0. ++Do not ask whether to get files from \s-1RCS\s0, ClearCase, Perforce, ++or \s-1SCCS\s0. + .TP + .B " \(bu" + Require that all options precede the files in the command line. +@@ -715,7 +723,8 @@ + .B PATCH_GET + This specifies whether + .B patch +-gets missing or read-only files from \s-1RCS\s0, ClearCase, or \s-1SCCS\s0 ++gets missing or read-only files from \s-1RCS\s0, ClearCase, Perforce, ++or \s-1SCCS\s0 + by default; see the + .B \-g + or +@@ -1097,7 +1106,7 @@ + .fi + .SH BUGS + Please report bugs via email to +-.BR <bug-gnu-utils@gnu.org> . ++.BR <bug-patch@gnu.org> . + .PP + .B patch + could be smarter about partial matches, excessively deviant offsets and +@@ -1115,13 +1124,15 @@ + This could be construed as a feature. + .SH COPYING + Copyright +-.if t \(co ++.ie t \(co ++.el (C) + 1984, 1985, 1986, 1988 Larry Wall. + .br + Copyright +-.if t \(co +-1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998 +-Free Software Foundation, Inc. ++.ie t \(co ++.el (C) ++1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ++2000, 2001, 2002 Free Software Foundation, Inc. + .PP + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission notice +diff -urNd -urNd patch-2.5.4/pch.c patch-2.5.9/pch.c +--- patch-2.5.4/pch.c 1999-08-30 02:20:08.000000000 -0400 ++++ patch-2.5.9/pch.c 2003-05-20 10:03:17.000000000 -0400 +@@ -1,9 +1,11 @@ + /* reading patches */ + +-/* $Id: pch.c,v 1.29 1999/08/30 06:20:08 eggert Exp $ */ ++/* $Id: pch.c,v 1.44 2003/05/20 14:03:17 eggert Exp $ */ + +-/* Copyright 1986, 1987, 1988 Larry Wall +- Copyright 1990, 1991-1993, 1997-1998, 1999 Free Software Foundation, Inc. ++/* Copyright (C) 1986, 1987, 1988 Larry Wall ++ ++ Copyright (C) 1990, 1991, 1992, 1993, 1997, 1998, 1999, 2000, 2001, ++ 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 +@@ -23,7 +25,7 @@ + #define XTERN extern + #include <common.h> + #include <backupfile.h> +-#include <basename.h> ++#include <dirname.h> + #include <inp.h> + #include <quotearg.h> + #include <util.h> +@@ -57,7 +59,8 @@ + static char *p_Char; /* +, -, and ! */ + static LINENUM hunkmax = INITHUNKMAX; /* size of above arrays */ + static int p_indent; /* indent to patch */ +-static int p_strip_trailing_cr; /* nonzero if stripping trailing \r */ ++static bool p_strip_trailing_cr; /* true if stripping trailing \r */ ++static bool p_pass_comments_through; /* true if not ignoring # lines */ + static file_offset p_base; /* where to intuit this time */ + static LINENUM p_bline; /* line # of p_base */ + static file_offset p_start; /* where intuit found a patch */ +@@ -68,17 +71,18 @@ + + enum nametype { OLD, NEW, INDEX, NONE }; + +-static char *scan_linenum PARAMS ((char *, LINENUM *)); +-static enum diff intuit_diff_type PARAMS ((void)); +-static enum nametype best_name PARAMS ((char * const *, int const *)); +-static int prefix_components PARAMS ((char *, int)); +-static size_t pget_line PARAMS ((int, int, int)); +-static size_t get_line PARAMS ((void)); +-static bool incomplete_line PARAMS ((void)); +-static bool grow_hunkmax PARAMS ((void)); +-static void malformed PARAMS ((void)) __attribute__ ((noreturn)); +-static void next_intuit_at PARAMS ((file_offset, LINENUM)); +-static void skip_to PARAMS ((file_offset, LINENUM)); ++static char *scan_linenum (char *, LINENUM *); ++static enum diff intuit_diff_type (void); ++static enum nametype best_name (char * const *, int const *); ++static int prefix_components (char *, bool); ++static size_t pget_line (int, int, bool, bool); ++static size_t get_line (void); ++static bool incomplete_line (void); ++static bool grow_hunkmax (void); ++static void malformed (void) __attribute__ ((noreturn)); ++static void next_intuit_at (file_offset, LINENUM); ++static void skip_to (file_offset, LINENUM); ++static char get_ed_command_letter (char const *); + + /* Prepare to look for the next patch in the patch file. */ + +@@ -92,7 +96,7 @@ + p_end = -1; + p_max = 0; + p_indent = 0; +- p_strip_trailing_cr = 0; ++ p_strip_trailing_cr = false; + } + + /* Open the patch file at the beginning of time. */ +@@ -105,7 +109,7 @@ + if (!filename || !*filename || strEQ (filename, "-")) + { + file_offset stdin_pos; +-#if HAVE_SETMODE ++#if HAVE_SETMODE_DOS + if (binary_transput) + { + if (isatty (STDIN_FILENO)) +@@ -181,14 +185,14 @@ + if ((p_line = (char **) realloc (p_line, hunkmax * sizeof (*p_line))) + && (p_len = (size_t *) realloc (p_len, hunkmax * sizeof (*p_len))) + && (p_Char = realloc (p_Char, hunkmax * sizeof (*p_Char)))) +- return TRUE; ++ return true; + if (!using_plan_a) + memory_fatal (); + /* Don't free previous values of p_line etc., + since some broken implementations free them for us. + Whatever is null will be allocated again from within plan_a (), + of all places. */ +- return FALSE; ++ return false; + } + + /* True if the remainder of the patch file contains a diff of some sort. */ +@@ -199,7 +203,7 @@ + if (p_base != 0 && p_base >= p_filesize) { + if (verbosity == VERBOSE) + say ("done\n"); +- return FALSE; ++ return false; + } + if (verbosity == VERBOSE) + say ("Hmm..."); +@@ -211,13 +215,13 @@ + : " I can't seem to find a patch in there anywhere.\n"); + if (! p_base && p_filesize) + fatal ("Only garbage was found in the patch input."); +- return FALSE; ++ return false; + } + if (skip_rest_of_patch) + { + Fseek (pfp, p_start, SEEK_SET); + p_input_line = p_sline - 1; +- return TRUE; ++ return true; + } + if (verbosity == VERBOSE) + say (" %sooks like %s to me...\n", +@@ -239,18 +243,19 @@ + char numbuf[LINENUM_LENGTH_BOUND + 1]; + say ("can't find file to patch at input line %s\n", + format_linenum (numbuf, p_sline)); +- say (strippath == -1 +- ? "Perhaps you should have used the -p or --strip option?\n" +- : "Perhaps you used the wrong -p or --strip option?\n"); ++ if (diff_type != ED_DIFF) ++ say (strippath == -1 ++ ? "Perhaps you should have used the -p or --strip option?\n" ++ : "Perhaps you used the wrong -p or --strip option?\n"); + } + } + + skip_to(p_start,p_sline); + while (!inname) { +- if (force || batch) { ++ if (force | batch) { + say ("No file to patch. Skipping patch.\n"); +- skip_rest_of_patch = TRUE; +- return TRUE; ++ skip_rest_of_patch = true; ++ return true; + } + ask ("File to patch: "); + inname = fetchname (buf, 0, (time_t *) 0); +@@ -264,6 +269,7 @@ + else + { + perror (inname); ++ fflush (stderr); + free (inname); + inname = 0; + } +@@ -273,12 +279,12 @@ + if (*buf != 'n') { + if (verbosity != SILENT) + say ("Skipping patch.\n"); +- skip_rest_of_patch = TRUE; +- return TRUE; ++ skip_rest_of_patch = true; ++ return true; + } + } + } +- return TRUE; ++ return true; + } + + /* Determine what kind of diff is in the remaining part of the patch file. */ +@@ -288,9 +294,10 @@ + { + register file_offset this_line = 0; + register file_offset first_command_line = -1; ++ char first_ed_command_letter = 0; + LINENUM fcl_line = 0; /* Pacify `gcc -W'. */ +- register bool this_is_a_command = FALSE; +- register bool stars_this_line = FALSE; ++ register bool this_is_a_command = false; ++ register bool stars_this_line = false; + enum nametype i; + char *name[3]; + struct stat st[3]; +@@ -314,15 +321,16 @@ + register bool last_line_was_command = this_is_a_command; + register bool stars_last_line = stars_this_line; + register int indent = 0; +- int strip_trailing_cr; ++ char ed_command_letter; ++ bool strip_trailing_cr; + size_t chars_read; + + this_line = file_tell (pfp); +- chars_read = pget_line (0, 0, 0); ++ chars_read = pget_line (0, 0, false, false); + if (chars_read == (size_t) -1) + memory_fatal (); + if (! chars_read) { +- if (first_command_line >= 0) { ++ if (first_ed_command_letter) { + /* nothing but deletes!? */ + p_start = first_command_line; + p_sline = fcl_line; +@@ -346,8 +354,11 @@ + continue; + this_is_a_command = (ISDIGIT (*s) && + (*t == 'd' || *t == 'c' || *t == 'a') ); +- if (first_command_line < 0 && this_is_a_command) { ++ if (first_command_line < 0 ++ && ((ed_command_letter = get_ed_command_letter (s)) ++ || this_is_a_command)) { + first_command_line = this_line; ++ first_ed_command_letter = ed_command_letter; + fcl_line = p_input_line; + p_indent = indent; /* assume this for now */ + p_strip_trailing_cr = strip_trailing_cr; +@@ -363,8 +374,20 @@ + for (t = s + 7; ISSPACE ((unsigned char) *t); t++) + continue; + revision = t; +- for (t = revision; *t && !ISSPACE ((unsigned char) *t); t++) +- continue; ++ for (t = revision; *t; t++) ++ if (ISSPACE ((unsigned char) *t)) ++ { ++ char const *u; ++ for (u = t + 1; ISSPACE ((unsigned char) *u); u++) ++ continue; ++ if (*u) ++ { ++ char numbuf[LINENUM_LENGTH_BOUND + 1]; ++ say ("Prereq: with multiple words at line %s of patch\n", ++ format_linenum (numbuf, this_line)); ++ } ++ break; ++ } + if (t == revision) + revision = 0; + else { +@@ -391,8 +414,6 @@ + if ((diff_type == NO_DIFF || diff_type == ED_DIFF) && + first_command_line >= 0 && + strEQ(s, ".\n") ) { +- p_indent = indent; +- p_strip_trailing_cr = strip_trailing_cr; + p_start = first_command_line; + p_sline = fcl_line; + retval = ED_DIFF; +@@ -419,12 +440,12 @@ + if (s[0] == '+' && s[1] == '0' && !ISDIGIT (s[2])) + p_says_nonexistent[NEW] = 1 + ! p_timestamp[NEW]; + p_indent = indent; +- p_strip_trailing_cr = strip_trailing_cr; + p_start = this_line; + p_sline = p_input_line; + retval = UNI_DIFF; + if (! ((name[OLD] || ! p_timestamp[OLD]) +- && (name[NEW] || ! p_timestamp[NEW]))) ++ && (name[NEW] || ! p_timestamp[NEW])) ++ && ! name[INDEX]) + { + char numbuf[LINENUM_LENGTH_BOUND + 1]; + say ("missing header for unified diff at line %s of patch\n", +@@ -457,14 +478,15 @@ + LINENUM saved_p_bline = p_bline; + Fseek (pfp, previous_line, SEEK_SET); + p_input_line -= 2; +- if (another_hunk (retval, 0) ++ if (another_hunk (retval, false) + && ! p_repl_lines && p_newfirst == 1) + p_says_nonexistent[NEW] = 1 + ! p_timestamp[NEW]; + next_intuit_at (saved_p_base, saved_p_bline); + } + + if (! ((name[OLD] || ! p_timestamp[OLD]) +- && (name[NEW] || ! p_timestamp[NEW]))) ++ && (name[NEW] || ! p_timestamp[NEW])) ++ && ! name[INDEX]) + { + char numbuf[LINENUM_LENGTH_BOUND + 1]; + say ("missing header for context diff at line %s of patch\n", +@@ -487,7 +509,7 @@ + scan_exit: + + /* To intuit `inname', the name of the file to patch, +- use the algorithm specified by POSIX 1003.2b/D11 section 5.22.7.2 ++ use the algorithm specified by POSIX 1003.1-2001 XCU lines 25680-26599 + (with some modifications if posixly_correct is zero): + + - Take the old and new names from the context header if present, +@@ -542,7 +564,7 @@ + + if (! posixly_correct) + { +- int is_empty; ++ bool is_empty; + + i = best_name (name, stat_errno); + +@@ -556,7 +578,8 @@ + char const *cs; + char *getbuf; + char *diffbuf; +- int readonly = outfile && strcmp (outfile, name[i]) != 0; ++ bool readonly = (outfile ++ && strcmp (outfile, name[i]) != 0); + + if (nope == NONE || strcmp (name[nope], name[i]) != 0) + { +@@ -566,7 +589,7 @@ + version_controlled[i] = !! cs; + if (cs) + { +- if (version_get (name[i], cs, 0, readonly, ++ if (version_get (name[i], cs, false, readonly, + getbuf, &st[i])) + stat_errno[i] = 0; + else +@@ -589,7 +612,8 @@ + if ((! is_empty) < p_says_nonexistent[reverse ^ is_empty]) + { + assert (i0 != NONE); +- if (ok_to_reverse ++ reverse ^= ++ ok_to_reverse + ("The next patch%s would %s the file %s,\nwhich %s!", + reverse ? ", when reversed," : "", + (i == NONE ? "delete" +@@ -598,8 +622,7 @@ + quotearg (name[i == NONE || st[i].st_size == 0 ? i0 : i]), + (i == NONE ? "does not exist" + : st[i].st_size == 0 ? "is already empty" +- : "already exists"))) +- reverse ^= 1; ++ : "already exists")); + } + + if (i == NONE && p_says_nonexistent[reverse]) +@@ -611,8 +634,8 @@ + for (i = OLD; i <= INDEX; i++) + if (name[i]) + { +- newdirs[i] = (prefix_components (name[i], 0) +- - prefix_components (name[i], 1)); ++ newdirs[i] = (prefix_components (name[i], false) ++ - prefix_components (name[i], true)); + if (newdirs[i] < newdirs_min) + newdirs_min = newdirs[i]; + } +@@ -645,9 +668,9 @@ + } + + /* Count the path name components in FILENAME's prefix. +- If CHECKDIRS is nonzero, count only existing directories. */ ++ If CHECKDIRS is true, count only existing directories. */ + static int +-prefix_components (char *filename, int checkdirs) ++prefix_components (char *filename, bool checkdirs) + { + int count = 0; + struct stat stat_buf; +@@ -691,7 +714,7 @@ + if (name[i] && !ignore[i]) + { + /* Take the names with the fewest prefix components. */ +- components[i] = prefix_components (name[i], 0); ++ components[i] = prefix_components (name[i], false); + if (components_min < components[i]) + continue; + components_min = components[i]; +@@ -779,7 +802,7 @@ + { + char *s; + LINENUM n = 0; +- int overflow = 0; ++ bool overflow = false; + char numbuf[LINENUM_LENGTH_BOUND + 1]; + + for (s = s0; ISDIGIT (*s); s++) +@@ -788,11 +811,11 @@ + overflow |= new_n / 10 != n; + n = new_n; + } +- ++ + if (s == s0) + fatal ("missing line number at line %s: %s", + format_linenum (numbuf, p_input_line), buf); +- ++ + if (overflow) + fatal ("line number %.*s is too large at line %s: %s", + (int) (s - s0), s0, format_linenum (numbuf, p_input_line), buf); +@@ -805,7 +828,7 @@ + 0 if not; -1 if ran out of memory. */ + + int +-another_hunk (enum diff difftype, int rev) ++another_hunk (enum diff difftype, bool rev) + { + register char *s; + register LINENUM context = 0; +@@ -833,10 +856,11 @@ + register LINENUM fillcnt = 0; /* #lines of missing ptrn or repl */ + register LINENUM fillsrc; /* index of first line to copy */ + register LINENUM filldst; /* index of first missing line */ +- bool ptrn_spaces_eaten = FALSE; /* ptrn was slightly misformed */ +- bool some_context = FALSE; /* (perhaps internal) context seen */ +- register bool repl_could_be_missing = TRUE; +- bool repl_missing = FALSE; /* we are now backtracking */ ++ bool ptrn_spaces_eaten = false; /* ptrn was slightly misformed */ ++ bool some_context = false; /* (perhaps internal) context seen */ ++ register bool repl_could_be_missing = true; ++ bool ptrn_missing = false; /* The pattern was missing. */ ++ bool repl_missing = false; /* Likewise for replacement. */ + file_offset repl_backtrack_position = 0; + /* file pos of first repl line */ + LINENUM repl_patch_line; /* input line number for same */ +@@ -844,8 +868,8 @@ + LINENUM ptrn_prefix_context = -1; /* lines in pattern prefix context */ + LINENUM ptrn_suffix_context = -1; /* lines in pattern suffix context */ + LINENUM repl_prefix_context = -1; /* lines in replac. prefix context */ +- register LINENUM ptrn_copiable = 0; +- /* # of copiable lines in ptrn */ ++ LINENUM ptrn_copiable = 0; /* # of copiable lines in ptrn */ ++ LINENUM repl_copiable = 0; /* Likewise for replacement. */ + + /* Pacify `gcc -Wall'. */ + fillsrc = filldst = repl_patch_line = repl_context = 0; +@@ -864,7 +888,7 @@ + return -1; + if (!chars_read) { + if (repl_beginning && repl_could_be_missing) { +- repl_missing = TRUE; ++ repl_missing = true; + goto hunk_done; + } + if (p_max - p_end < 4) { +@@ -887,7 +911,7 @@ + case '*': + if (strnEQ(buf, "********", 8)) { + if (repl_beginning && repl_could_be_missing) { +- repl_missing = TRUE; ++ repl_missing = true; + goto hunk_done; + } + else +@@ -896,7 +920,7 @@ + } + if (p_end != 0) { + if (repl_beginning && repl_could_be_missing) { +- repl_missing = TRUE; ++ repl_missing = true; + goto hunk_done; + } + fatal ("unexpected `***' at line %s: %s", +@@ -945,6 +969,7 @@ + { + /* `Old' lines were omitted. Set up to fill + them in from `new' context lines. */ ++ ptrn_missing = true; + p_end = p_ptrn_lines + 1; + ptrn_prefix_context = ptrn_suffix_context = -1; + fillsrc = p_end + 1; +@@ -965,7 +990,7 @@ + p_hunk_beg + repl_beginning)); + else + { +- repl_missing = TRUE; ++ repl_missing = true; + goto hunk_done; + } + } +@@ -1009,11 +1034,11 @@ + && (p_prefix_context != 0 + || context != 0 + || p_repl_lines != 1)) +- repl_could_be_missing = FALSE; ++ repl_could_be_missing = false; + context = 0; + break; + case '+': case '!': +- repl_could_be_missing = FALSE; ++ repl_could_be_missing = false; + change_line: + s = buf + 1; + chars_read--; +@@ -1025,7 +1050,7 @@ + s++; + chars_read--; + } else if (repl_beginning && repl_could_be_missing) { +- repl_missing = TRUE; ++ repl_missing = true; + goto hunk_done; + } + if (! repl_beginning) +@@ -1057,7 +1082,7 @@ + } + if (repl_beginning && repl_could_be_missing && + (!ptrn_spaces_eaten || difftype == NEW_CONTEXT_DIFF) ) { +- repl_missing = TRUE; ++ repl_missing = true; + goto hunk_done; + } + chars_read -= +@@ -1071,9 +1096,11 @@ + } + if (p_end != p_ptrn_lines + 1) { + ptrn_spaces_eaten |= (repl_beginning != 0); +- some_context = TRUE; ++ some_context = true; + context++; +- if (!repl_beginning) ++ if (repl_beginning) ++ repl_copiable++; ++ else + ptrn_copiable++; + p_Char[p_end] = ' '; + } +@@ -1089,12 +1116,14 @@ + s++; + chars_read--; + } else if (repl_beginning && repl_could_be_missing) { +- repl_missing = TRUE; ++ repl_missing = true; + goto hunk_done; + } +- some_context = TRUE; ++ some_context = true; + context++; +- if (!repl_beginning) ++ if (repl_beginning) ++ repl_copiable++; ++ else + ptrn_copiable++; + chars_read -= + (1 < chars_read +@@ -1108,7 +1137,7 @@ + break; + default: + if (repl_beginning && repl_could_be_missing) { +- repl_missing = TRUE; ++ repl_missing = true; + goto hunk_done; + } + malformed (); +@@ -1136,6 +1165,9 @@ + fillcnt = p_repl_lines; + p_end = p_max; + } ++ else if (! ptrn_missing && ptrn_copiable != repl_copiable) ++ fatal ("context mangled in hunk at line %s", ++ format_linenum (numbuf0, p_hunk_beg)); + else if (!some_context && fillcnt == 1) { + /* the first hunk was a null hunk with no context */ + /* and we were expecting one line -- fix it up. */ +@@ -1499,94 +1531,104 @@ + static size_t + get_line (void) + { +- return pget_line (p_indent, p_rfc934_nesting, p_strip_trailing_cr); ++ return pget_line (p_indent, p_rfc934_nesting, p_strip_trailing_cr, ++ p_pass_comments_through); + } + + /* Input a line from the patch file, worrying about indentation. + Strip up to INDENT characters' worth of leading indentation. + Then remove up to RFC934_NESTING instances of leading "- ". +- If STRIP_TRAILING_CR is nonzero, remove any trailing carriage-return. ++ If STRIP_TRAILING_CR is true, remove any trailing carriage-return. ++ Unless PASS_COMMENTS_THROUGH is true, ignore any resulting lines ++ that begin with '#'; they're comments. + Ignore any partial lines at end of input, but warn about them. + Succeed if a line was read; it is terminated by "\n\0" for convenience. + Return the number of characters read, including '\n' but not '\0'. + Return -1 if we ran out of memory. */ + + static size_t +-pget_line (int indent, int rfc934_nesting, int strip_trailing_cr) ++pget_line (int indent, int rfc934_nesting, bool strip_trailing_cr, ++ bool pass_comments_through) + { + register FILE *fp = pfp; + register int c; +- register int i = 0; ++ register int i; + register char *b; + register size_t s; + +- for (;;) ++ do + { +- c = getc (fp); +- if (c == EOF) ++ i = 0; ++ for (;;) + { +- if (ferror (fp)) +- read_fatal (); +- return 0; ++ c = getc (fp); ++ if (c == EOF) ++ { ++ if (ferror (fp)) ++ read_fatal (); ++ return 0; ++ } ++ if (indent <= i) ++ break; ++ if (c == ' ' || c == 'X') ++ i++; ++ else if (c == '\t') ++ i = (i + 8) & ~7; ++ else ++ break; + } +- if (indent <= i) +- break; +- if (c == ' ' || c == 'X') +- i++; +- else if (c == '\t') +- i = (i + 8) & ~7; +- else +- break; +- } + +- i = 0; +- b = buf; ++ i = 0; ++ b = buf; + +- while (c == '-' && 0 <= --rfc934_nesting) +- { +- c = getc (fp); +- if (c == EOF) +- goto patch_ends_in_middle_of_line; +- if (c != ' ') ++ while (c == '-' && 0 <= --rfc934_nesting) + { +- i = 1; +- b[0] = '-'; +- break; ++ c = getc (fp); ++ if (c == EOF) ++ goto patch_ends_in_middle_of_line; ++ if (c != ' ') ++ { ++ i = 1; ++ b[0] = '-'; ++ break; ++ } ++ c = getc (fp); ++ if (c == EOF) ++ goto patch_ends_in_middle_of_line; + } +- c = getc (fp); +- if (c == EOF) +- goto patch_ends_in_middle_of_line; +- } + +- s = bufsize; ++ s = bufsize; + +- for (;;) +- { +- if (i == s - 1) ++ for (;;) + { +- s *= 2; +- b = realloc (b, s); +- if (!b) ++ if (i == s - 1) + { +- if (!using_plan_a) +- memory_fatal (); +- return (size_t) -1; ++ s *= 2; ++ b = realloc (b, s); ++ if (!b) ++ { ++ if (!using_plan_a) ++ memory_fatal (); ++ return (size_t) -1; ++ } ++ buf = b; ++ bufsize = s; + } +- buf = b; +- bufsize = s; ++ b[i++] = c; ++ if (c == '\n') ++ break; ++ c = getc (fp); ++ if (c == EOF) ++ goto patch_ends_in_middle_of_line; + } +- b[i++] = c; +- if (c == '\n') +- break; +- c = getc (fp); +- if (c == EOF) +- goto patch_ends_in_middle_of_line; ++ ++ p_input_line++; + } ++ while (*b == '#' && !pass_comments_through); + + if (strip_trailing_cr && 2 <= i && b[i - 2] == '\r') + b[i-- - 2] = '\n'; + b[i] = '\0'; +- p_input_line++; + return i; + + patch_ends_in_middle_of_line: +@@ -1607,13 +1649,13 @@ + { + while ((c = getc (fp)) != '\n' && c != EOF) + continue; +- return TRUE; ++ return true; + } + else + { + /* We don't trust ungetc. */ + Fseek (pfp, line_beginning, SEEK_SET); +- return FALSE; ++ return false; + } + } + +@@ -1627,7 +1669,7 @@ + char *tp_char; /* +, -, and ! */ + register LINENUM i; + register LINENUM n; +- bool blankline = FALSE; ++ bool blankline = false; + register char *s; + + i = p_first; +@@ -1653,14 +1695,14 @@ + if (p_Char) + free (p_Char); + p_Char = tp_char; +- return FALSE; /* not enough memory to swap hunk! */ ++ return false; /* not enough memory to swap hunk! */ + } + + /* now turn the new into the old */ + + i = p_ptrn_lines + 1; + if (tp_char[i] == '\n') { /* account for possible blank line */ +- blankline = TRUE; ++ blankline = true; + i++; + } + if (p_efake >= 0) { /* fix non-freeable ptr range */ +@@ -1715,23 +1757,23 @@ + free (tp_len); + if (tp_char) + free (tp_char); +- return TRUE; ++ return true; + } + +-/* Return whether file WHICH (0 = old, 1 = new) appears to nonexistent. ++/* Return whether file WHICH (false = old, true = new) appears to nonexistent. + Return 1 for empty, 2 for nonexistent. */ + +-bool +-pch_says_nonexistent (int which) ++int ++pch_says_nonexistent (bool which) + { + return p_says_nonexistent[which]; + } + +-/* Return timestamp of patch header for file WHICH (0 = old, 1 = new), ++/* Return timestamp of patch header for file WHICH (false = old, true = new), + or -1 if there was no timestamp or an error in the timestamp. */ + + time_t +-pch_timestamp (int which) ++pch_timestamp (bool which) + { + return p_timestamp[which]; + } +@@ -1835,6 +1877,60 @@ + return p_hunk_beg; + } + ++/* Is the newline-terminated line a valid `ed' command for patch ++ input? If so, return the command character; if not, return 0. ++ This accepts accepts just a subset of the valid commands, but it's ++ good enough in practice. */ ++ ++static char ++get_ed_command_letter (char const *line) ++{ ++ char const *p = line; ++ char letter; ++ bool pair = false; ++ if (! ISDIGIT (*p)) ++ return 0; ++ while (ISDIGIT (*++p)) ++ continue; ++ if (*p == ',') ++ { ++ if (! ISDIGIT (*++p)) ++ return 0; ++ while (ISDIGIT (*++p)) ++ continue; ++ pair = true; ++ } ++ letter = *p++; ++ ++ switch (letter) ++ { ++ case 'a': ++ case 'i': ++ if (pair) ++ return 0; ++ break; ++ ++ case 'c': ++ case 'd': ++ break; ++ ++ case 's': ++ if (strncmp (p, "/.//", 4) != 0) ++ return 0; ++ p += 4; ++ break; ++ ++ default: ++ return 0; ++ } ++ ++ while (*p == ' ' || *p == '\t') ++ p++; ++ if (*p == '\n') ++ return letter; ++ return 0; ++} ++ + /* Apply an ed script by feeding ed itself. */ + + void +@@ -1842,13 +1938,11 @@ + { + static char const ed_program[] = ed_PROGRAM; + +- register char *t; + register file_offset beginning_of_this_line; +- register bool this_line_is_command = FALSE; + register FILE *pipefp = 0; + register size_t chars_read; + +- if (!skip_rest_of_patch) { ++ if (! dry_run && ! skip_rest_of_patch) { + int exclusive = TMPOUTNAME_needs_removal ? 0 : O_EXCL; + assert (! inerrno); + TMPOUTNAME_needs_removal = 1; +@@ -1861,21 +1955,20 @@ + pfatal ("Can't open pipe to %s", quotearg (buf)); + } + for (;;) { ++ char ed_command_letter; + beginning_of_this_line = file_tell (pfp); + chars_read = get_line (); + if (! chars_read) { + next_intuit_at(beginning_of_this_line,p_input_line); + break; + } +- for (t = buf; ISDIGIT (*t) || *t == ','; t++) +- continue; +- this_line_is_command = (ISDIGIT (*buf) && +- (*t == 'd' || *t == 'c' || *t == 'a' || *t == 'i' || *t == 's') ); +- if (this_line_is_command) { ++ ed_command_letter = get_ed_command_letter (buf); ++ if (ed_command_letter) { + if (pipefp) + if (! fwrite (buf, sizeof *buf, chars_read, pipefp)) + write_fatal (); +- if (*t != 'd' && *t != 's') { ++ if (ed_command_letter != 'd' && ed_command_letter != 's') { ++ p_pass_comments_through = true; + while ((chars_read = get_line ()) != 0) { + if (pipefp) + if (! fwrite (buf, sizeof *buf, chars_read, pipefp)) +@@ -1883,6 +1976,7 @@ + if (chars_read == 2 && strEQ (buf, ".\n")) + break; + } ++ p_pass_comments_through = false; + } + } + else { +diff -urNd -urNd patch-2.5.4/pch.h patch-2.5.9/pch.h +--- patch-2.5.4/pch.h 1997-06-13 02:28:37.000000000 -0400 ++++ patch-2.5.9/pch.h 2003-05-20 09:56:02.000000000 -0400 +@@ -1,25 +1,45 @@ + /* reading patches */ + +-/* $Id: pch.h,v 1.8 1997/06/13 06:28:37 eggert Exp $ */ ++/* $Id: pch.h,v 1.11 2003/05/20 13:56:03 eggert Exp $ */ + +-LINENUM pch_end PARAMS ((void)); +-LINENUM pch_first PARAMS ((void)); +-LINENUM pch_hunk_beg PARAMS ((void)); +-LINENUM pch_newfirst PARAMS ((void)); +-LINENUM pch_prefix_context PARAMS ((void)); +-LINENUM pch_ptrn_lines PARAMS ((void)); +-LINENUM pch_repl_lines PARAMS ((void)); +-LINENUM pch_suffix_context PARAMS ((void)); +-bool pch_swap PARAMS ((void)); +-bool pch_write_line PARAMS ((LINENUM, FILE *)); +-bool there_is_another_patch PARAMS ((void)); +-char *pfetch PARAMS ((LINENUM)); +-char pch_char PARAMS ((LINENUM)); +-int another_hunk PARAMS ((enum diff, int)); +-int pch_says_nonexistent PARAMS ((int)); +-size_t pch_line_len PARAMS ((LINENUM)); +-time_t pch_timestamp PARAMS ((int)); +-void do_ed_script PARAMS ((FILE *)); +-void open_patch_file PARAMS ((char const *)); +-void re_patch PARAMS ((void)); +-void set_hunkmax PARAMS ((void)); ++/* Copyright (C) 1986, 1987, 1988 Larry Wall ++ ++ Copyright (C) 1990, 1991, 1992, 1993, 1997, 1998, 1999, 2000, 2001, ++ 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; see the file COPYING. ++ If not, write to the Free Software Foundation, ++ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ++ ++LINENUM pch_end (void); ++LINENUM pch_first (void); ++LINENUM pch_hunk_beg (void); ++LINENUM pch_newfirst (void); ++LINENUM pch_prefix_context (void); ++LINENUM pch_ptrn_lines (void); ++LINENUM pch_repl_lines (void); ++LINENUM pch_suffix_context (void); ++bool pch_swap (void); ++bool pch_write_line (LINENUM, FILE *); ++bool there_is_another_patch (void); ++char *pfetch (LINENUM); ++char pch_char (LINENUM); ++int another_hunk (enum diff, bool); ++int pch_says_nonexistent (bool); ++size_t pch_line_len (LINENUM); ++time_t pch_timestamp (bool); ++void do_ed_script (FILE *); ++void open_patch_file (char const *); ++void re_patch (void); ++void set_hunkmax (void); +diff -urNd -urNd patch-2.5.4/quotearg.c patch-2.5.9/quotearg.c +--- patch-2.5.4/quotearg.c 1999-08-23 05:55:55.000000000 -0400 ++++ patch-2.5.9/quotearg.c 2002-11-23 01:45:49.000000000 -0500 +@@ -1,5 +1,5 @@ + /* quotearg.c - quote arguments for output +- Copyright (C) 1998, 1999 Free Software Foundation, Inc. ++ Copyright (C) 1998, 1999, 2000, 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 +@@ -17,51 +17,59 @@ + + /* Written by Paul Eggert <eggert@twinsun.com> */ + +-/* FIXME: Multibyte characters are not supported yet. */ +- + #if HAVE_CONFIG_H + # include <config.h> + #endif + +-#include <sys/types.h> +-#include <quotearg.h> +-#include <xalloc.h> ++#include "quotearg.h" ++ ++#include "xalloc.h" + + #include <ctype.h> +-#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII)) +-# define ISASCII(c) 1 +-#else +-# define ISASCII(c) isascii (c) +-#endif +-#ifdef isgraph +-# define ISGRAPH(c) (ISASCII (c) && isgraph (c)) +-#else +-# define ISGRAPH(c) (ISASCII (c) && isprint (c) && !isspace (c)) +-#endif ++#include <errno.h> ++#include <limits.h> ++#include <stdlib.h> ++#include <string.h> + +-#if ENABLE_NLS +-# include <libintl.h> +-# define _(text) gettext (text) +-#else +-# define _(text) text +-#endif ++#include "gettext.h" ++#define _(msgid) gettext (msgid) ++#define N_(msgid) msgid + +-#if HAVE_LIMITS_H +-# include <limits.h> ++#if HAVE_WCHAR_H ++ ++/* BSD/OS 4.1 wchar.h requires FILE and struct tm to be declared. */ ++# include <stdio.h> ++# include <time.h> ++ ++# include <wchar.h> + #endif +-#ifndef CHAR_BIT +-# define CHAR_BIT 8 ++ ++#if !HAVE_MBRTOWC ++/* Disable multibyte processing entirely. Since MB_CUR_MAX is 1, the ++ other macros are defined only for documentation and to satisfy C ++ syntax. */ ++# undef MB_CUR_MAX ++# define MB_CUR_MAX 1 ++# define mbrtowc(pwc, s, n, ps) ((*(pwc) = *(s)) != 0) ++# define iswprint(wc) isprint ((unsigned char) (wc)) ++# undef HAVE_MBSINIT + #endif +-#ifndef UCHAR_MAX +-# define UCHAR_MAX ((unsigned char) -1) ++ ++#if !defined mbsinit && !HAVE_MBSINIT ++# define mbsinit(ps) 1 + #endif + +-#if HAVE_STDLIB_H +-# include <stdlib.h> ++#ifndef iswprint ++# if HAVE_WCTYPE_H ++# include <wctype.h> ++# endif ++# if !defined iswprint && !HAVE_ISWPRINT ++# define iswprint(wc) 1 ++# endif + #endif + +-#if HAVE_STRING_H +-# include <string.h> ++#ifndef SIZE_MAX ++# define SIZE_MAX ((size_t) -1) + #endif + + #define INT_BITS (sizeof (int) * CHAR_BIT) +@@ -73,8 +81,7 @@ + + /* Quote the characters indicated by this bit vector even if the + quoting style would not normally require them to be quoted. */ +- int quote_these_too[((UCHAR_MAX + 1) / INT_BITS +- + ((UCHAR_MAX + 1) % INT_BITS != 0))]; ++ int quote_these_too[(UCHAR_MAX / INT_BITS) + 1]; + }; + + /* Names of quoting styles. */ +@@ -86,6 +93,7 @@ + "c", + "escape", + "locale", ++ "clocale", + 0 + }; + +@@ -97,7 +105,8 @@ + shell_always_quoting_style, + c_quoting_style, + escape_quoting_style, +- locale_quoting_style ++ locale_quoting_style, ++ clocale_quoting_style + }; + + /* The default quoting options. */ +@@ -109,9 +118,10 @@ + struct quoting_options * + clone_quoting_options (struct quoting_options *o) + { +- struct quoting_options *p +- = (struct quoting_options *) xmalloc (sizeof (struct quoting_options)); ++ int e = errno; ++ struct quoting_options *p = xmalloc (sizeof *p); + *p = *(o ? o : &default_quoting_options); ++ errno = e; + return p; + } + +@@ -146,77 +156,92 @@ + return r; + } + ++/* MSGID approximates a quotation mark. Return its translation if it ++ has one; otherwise, return either it or "\"", depending on S. */ ++static char const * ++gettext_quote (char const *msgid, enum quoting_style s) ++{ ++ char const *translation = _(msgid); ++ if (translation == msgid && s == clocale_quoting_style) ++ translation = "\""; ++ return translation; ++} ++ + /* Place into buffer BUFFER (of size BUFFERSIZE) a quoted version of +- argument ARG (of size ARGSIZE), using O to control quoting. +- If O is null, use the default. ++ argument ARG (of size ARGSIZE), using QUOTING_STYLE and the ++ non-quoting-style part of O to control quoting. + Terminate the output with a null character, and return the written + size of the output, not counting the terminating null. + If BUFFERSIZE is too small to store the output string, return the + value that would have been returned had BUFFERSIZE been large enough. +- If ARGSIZE is -1, use the string length of the argument for ARGSIZE. */ +-size_t +-quotearg_buffer (char *buffer, size_t buffersize, +- char const *arg, size_t argsize, +- struct quoting_options const *o) ++ If ARGSIZE is -1, use the string length of the argument for ARGSIZE. ++ ++ This function acts like quotearg_buffer (BUFFER, BUFFERSIZE, ARG, ++ ARGSIZE, O), except it uses QUOTING_STYLE instead of the quoting ++ style specified by O, and O may not be null. */ ++ ++static size_t ++quotearg_buffer_restyled (char *buffer, size_t buffersize, ++ char const *arg, size_t argsize, ++ enum quoting_style quoting_style, ++ struct quoting_options const *o) + { +- unsigned char c; + size_t i; + size_t len = 0; +- char const *quote_string; +- size_t quote_string_len; +- struct quoting_options const *p = o ? o : &default_quoting_options; +- enum quoting_style quoting_style = p->style; ++ char const *quote_string = 0; ++ size_t quote_string_len = 0; ++ int backslash_escapes = 0; ++ int unibyte_locale = MB_CUR_MAX == 1; ++ + #define STORE(c) \ + do \ + { \ + if (len < buffersize) \ + buffer[len] = (c); \ +- len++; \ ++ len++; \ + } \ + while (0) + + switch (quoting_style) + { +- case shell_quoting_style: +- if (! (argsize == (size_t) -1 ? arg[0] == '\0' : argsize == 0)) +- { +- switch (arg[0]) +- { +- case '#': case '~': +- break; +- +- default: +- for (i = 0; ; i++) +- { +- if (argsize == (size_t) -1 ? arg[i] == '\0' : i == argsize) +- goto done; ++ case c_quoting_style: ++ STORE ('"'); ++ backslash_escapes = 1; ++ quote_string = "\""; ++ quote_string_len = 1; ++ break; + +- c = arg[i]; ++ case escape_quoting_style: ++ backslash_escapes = 1; ++ break; + +- switch (c) +- { +- case '\t': case '\n': case ' ': +- case '!': /* special in csh */ +- case '"': case '$': case '&': case '\'': +- case '(': case ')': case '*': case ';': +- case '<': case '>': case '?': case '[': case '\\': +- case '^': /* special in old /bin/sh, e.g. SunOS 4.1.4 */ +- case '`': case '|': +- goto needs_quoting; +- } ++ case locale_quoting_style: ++ case clocale_quoting_style: ++ { ++ /* Get translations for open and closing quotation marks. + +- if (p->quote_these_too[c / INT_BITS] & (1 << (c % INT_BITS))) +- goto needs_quoting; ++ The message catalog should translate "`" to a left ++ quotation mark suitable for the locale, and similarly for ++ "'". If the catalog has no translation, ++ locale_quoting_style quotes `like this', and ++ clocale_quoting_style quotes "like this". + +- STORE (c); +- } +- needs_quoting:; ++ For example, an American English Unicode locale should ++ translate "`" to U+201C (LEFT DOUBLE QUOTATION MARK), and ++ should translate "'" to U+201D (RIGHT DOUBLE QUOTATION ++ MARK). A British English Unicode locale should instead ++ translate these to U+2018 (LEFT SINGLE QUOTATION MARK) and ++ U+2019 (RIGHT SINGLE QUOTATION MARK), respectively. */ + +- len = 0; +- break; +- } +- } +- /* Fall through. */ ++ char const *left = gettext_quote (N_("`"), quoting_style); ++ char const *right = gettext_quote (N_("'"), quoting_style); ++ for (quote_string = left; *quote_string; quote_string++) ++ STORE (*quote_string); ++ backslash_escapes = 1; ++ quote_string = right; ++ quote_string_len = strlen (quote_string); ++ } ++ break; + + case shell_always_quoting_style: + STORE ('\''); +@@ -224,84 +249,225 @@ + quote_string_len = 1; + break; + +- case c_quoting_style: +- STORE ('"'); +- quote_string = "\""; +- quote_string_len = 1; +- break; +- +- case locale_quoting_style: +- for (quote_string = _("`"); *quote_string; quote_string++) +- STORE (*quote_string); +- quote_string = _("'"); +- quote_string_len = strlen (quote_string); +- break; +- + default: +- quote_string = 0; +- quote_string_len = 0; + break; + } + +- for (i = 0; ! (argsize == (size_t) -1 ? arg[i] == '\0' : i == argsize); i++) ++ for (i = 0; ! (argsize == SIZE_MAX ? arg[i] == '\0' : i == argsize); i++) + { +- c = arg[i]; ++ unsigned char c; ++ unsigned char esc; + +- switch (quoting_style) ++ if (backslash_escapes ++ && quote_string_len ++ && i + quote_string_len <= argsize ++ && memcmp (arg + i, quote_string, quote_string_len) == 0) ++ STORE ('\\'); ++ ++ c = arg[i]; ++ switch (c) + { +- case literal_quoting_style: ++ case '\0': ++ if (backslash_escapes) ++ { ++ STORE ('\\'); ++ STORE ('0'); ++ STORE ('0'); ++ c = '0'; ++ } + break; + +- case shell_quoting_style: +- case shell_always_quoting_style: +- if (c == '\'') ++ case '?': ++ switch (quoting_style) + { +- STORE ('\''); +- STORE ('\\'); +- STORE ('\''); ++ case shell_quoting_style: ++ goto use_shell_always_quoting_style; ++ ++ case c_quoting_style: ++ if (i + 2 < argsize && arg[i + 1] == '?') ++ switch (arg[i + 2]) ++ { ++ case '!': case '\'': ++ case '(': case ')': case '-': case '/': ++ case '<': case '=': case '>': ++ /* Escape the second '?' in what would otherwise be ++ a trigraph. */ ++ c = arg[i + 2]; ++ i += 2; ++ STORE ('?'); ++ STORE ('\\'); ++ STORE ('?'); ++ break; ++ } ++ break; ++ ++ default: ++ break; + } + break; + +- case c_quoting_style: +- case escape_quoting_style: +- case locale_quoting_style: +- switch (c) ++ case '\a': esc = 'a'; goto c_escape; ++ case '\b': esc = 'b'; goto c_escape; ++ case '\f': esc = 'f'; goto c_escape; ++ case '\n': esc = 'n'; goto c_and_shell_escape; ++ case '\r': esc = 'r'; goto c_and_shell_escape; ++ case '\t': esc = 't'; goto c_and_shell_escape; ++ case '\v': esc = 'v'; goto c_escape; ++ case '\\': esc = c; goto c_and_shell_escape; ++ ++ c_and_shell_escape: ++ if (quoting_style == shell_quoting_style) ++ goto use_shell_always_quoting_style; ++ c_escape: ++ if (backslash_escapes) + { +- case '?': /* Do not generate trigraphs. */ +- case '\\': goto store_escape; +- /* Not all C compilers know what \a means. */ +- case 7 : c = 'a'; goto store_escape; +- case '\b': c = 'b'; goto store_escape; +- case '\f': c = 'f'; goto store_escape; +- case '\n': c = 'n'; goto store_escape; +- case '\r': c = 'r'; goto store_escape; +- case '\t': c = 't'; goto store_escape; +- case '\v': c = 'v'; goto store_escape; ++ c = esc; ++ goto store_escape; ++ } ++ break; + +- case ' ': break; ++ case '#': case '~': ++ if (i != 0) ++ break; ++ /* Fall through. */ ++ case ' ': ++ case '!': /* special in bash */ ++ case '"': case '$': case '&': ++ case '(': case ')': case '*': case ';': ++ case '<': case '>': case '[': ++ case '^': /* special in old /bin/sh, e.g. SunOS 4.1.4 */ ++ case '`': case '|': ++ /* A shell special character. In theory, '$' and '`' could ++ be the first bytes of multibyte characters, which means ++ we should check them with mbrtowc, but in practice this ++ doesn't happen so it's not worth worrying about. */ ++ if (quoting_style == shell_quoting_style) ++ goto use_shell_always_quoting_style; ++ break; ++ ++ case '\'': ++ switch (quoting_style) ++ { ++ case shell_quoting_style: ++ goto use_shell_always_quoting_style; ++ ++ case shell_always_quoting_style: ++ STORE ('\''); ++ STORE ('\\'); ++ STORE ('\''); ++ break; + + default: +- if (quote_string_len +- && strncmp (arg + i, quote_string, quote_string_len) == 0) +- goto store_escape; +- if (!ISGRAPH (c)) +- { +- STORE ('\\'); +- STORE ('0' + (c >> 6)); +- STORE ('0' + ((c >> 3) & 7)); +- c = '0' + (c & 7); +- goto store_c; +- } + break; + } ++ break; + +- if (! (p->quote_these_too[c / INT_BITS] & (1 << (c % INT_BITS)))) +- goto store_c; ++ case '%': case '+': case ',': case '-': case '.': case '/': ++ case '0': case '1': case '2': case '3': case '4': case '5': ++ case '6': case '7': case '8': case '9': case ':': case '=': ++ case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': ++ case 'G': case 'H': case 'I': case 'J': case 'K': case 'L': ++ case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R': ++ case 'S': case 'T': case 'U': case 'V': case 'W': case 'X': ++ case 'Y': case 'Z': case ']': case '_': case 'a': case 'b': ++ case 'c': case 'd': case 'e': case 'f': case 'g': case 'h': ++ case 'i': case 'j': case 'k': case 'l': case 'm': case 'n': ++ case 'o': case 'p': case 'q': case 'r': case 's': case 't': ++ case 'u': case 'v': case 'w': case 'x': case 'y': case 'z': ++ case '{': case '}': ++ /* These characters don't cause problems, no matter what the ++ quoting style is. They cannot start multibyte sequences. */ ++ break; + +- store_escape: +- STORE ('\\'); ++ default: ++ /* If we have a multibyte sequence, copy it until we reach ++ its end, find an error, or come back to the initial shift ++ state. For C-like styles, if the sequence has ++ unprintable characters, escape the whole sequence, since ++ we can't easily escape single characters within it. */ ++ { ++ /* Length of multibyte sequence found so far. */ ++ size_t m; ++ ++ int printable; ++ ++ if (unibyte_locale) ++ { ++ m = 1; ++ printable = isprint (c); ++ } ++ else ++ { ++ mbstate_t mbstate; ++ memset (&mbstate, 0, sizeof mbstate); ++ ++ m = 0; ++ printable = 1; ++ if (argsize == SIZE_MAX) ++ argsize = strlen (arg); ++ ++ do ++ { ++ wchar_t w; ++ size_t bytes = mbrtowc (&w, &arg[i + m], ++ argsize - (i + m), &mbstate); ++ if (bytes == 0) ++ break; ++ else if (bytes == (size_t) -1) ++ { ++ printable = 0; ++ break; ++ } ++ else if (bytes == (size_t) -2) ++ { ++ printable = 0; ++ while (i + m < argsize && arg[i + m]) ++ m++; ++ break; ++ } ++ else ++ { ++ if (! iswprint (w)) ++ printable = 0; ++ m += bytes; ++ } ++ } ++ while (! mbsinit (&mbstate)); ++ } ++ ++ if (1 < m || (backslash_escapes && ! printable)) ++ { ++ /* Output a multibyte sequence, or an escaped ++ unprintable unibyte character. */ ++ size_t ilim = i + m; ++ ++ for (;;) ++ { ++ if (backslash_escapes && ! printable) ++ { ++ STORE ('\\'); ++ STORE ('0' + (c >> 6)); ++ STORE ('0' + ((c >> 3) & 7)); ++ c = '0' + (c & 7); ++ } ++ if (ilim <= i + 1) ++ break; ++ STORE (c); ++ c = arg[++i]; ++ } ++ ++ goto store_c; ++ } ++ } + } + ++ if (! (backslash_escapes ++ && o->quote_these_too[c / INT_BITS] & (1 << (c % INT_BITS)))) ++ goto store_c; ++ ++ store_escape: ++ STORE ('\\'); ++ + store_c: + STORE (c); + } +@@ -310,60 +476,105 @@ + for (; *quote_string; quote_string++) + STORE (*quote_string); + +- done: + if (len < buffersize) + buffer[len] = '\0'; + return len; ++ ++ use_shell_always_quoting_style: ++ return quotearg_buffer_restyled (buffer, buffersize, arg, argsize, ++ shell_always_quoting_style, o); + } + +-/* Use storage slot N to return a quoted version of the string ARG. ++/* Place into buffer BUFFER (of size BUFFERSIZE) a quoted version of ++ argument ARG (of size ARGSIZE), using O to control quoting. ++ If O is null, use the default. ++ Terminate the output with a null character, and return the written ++ size of the output, not counting the terminating null. ++ If BUFFERSIZE is too small to store the output string, return the ++ value that would have been returned had BUFFERSIZE been large enough. ++ If ARGSIZE is -1, use the string length of the argument for ARGSIZE. */ ++size_t ++quotearg_buffer (char *buffer, size_t buffersize, ++ char const *arg, size_t argsize, ++ struct quoting_options const *o) ++{ ++ struct quoting_options const *p = o ? o : &default_quoting_options; ++ int e = errno; ++ size_t r = quotearg_buffer_restyled (buffer, buffersize, arg, argsize, ++ p->style, p); ++ errno = e; ++ return r; ++} ++ ++/* Use storage slot N to return a quoted version of argument ARG. ++ ARG is of size ARGSIZE, but if that is -1, ARG is a null-terminated string. + OPTIONS specifies the quoting options. + The returned value points to static storage that can be + reused by the next call to this function with the same value of N. +- N must be nonnegative. N is deliberately declared with type `int' ++ N must be nonnegative. N is deliberately declared with type "int" + to allow for future extensions (using negative values). */ + static char * +-quotearg_n_options (int n, char const *arg, ++quotearg_n_options (int n, char const *arg, size_t argsize, + struct quoting_options const *options) + { +- static unsigned int nslots; +- static struct slotvec ++ int e = errno; ++ ++ /* Preallocate a slot 0 buffer, so that the caller can always quote ++ one small component of a "memory exhausted" message in slot 0. */ ++ static char slot0[256]; ++ static unsigned int nslots = 1; ++ unsigned int n0 = n; ++ struct slotvec + { + size_t size; + char *val; +- } *slotvec; ++ }; ++ static struct slotvec slotvec0 = {sizeof slot0, slot0}; ++ static struct slotvec *slotvec = &slotvec0; + +- if (nslots <= n) ++ if (n < 0) ++ abort (); ++ ++ if (nslots <= n0) + { +- int n1 = n + 1; +- size_t s = n1 * sizeof (struct slotvec); +- if (! (0 < n1 && n1 == s / sizeof (struct slotvec))) +- abort (); +- slotvec = (struct slotvec *) xrealloc (slotvec, s); +- memset (slotvec + nslots, 0, (n1 - nslots) * sizeof (struct slotvec)); +- nslots = n; ++ unsigned int n1 = n0 + 1; ++ size_t s = n1 * sizeof *slotvec; ++ ++ if (SIZE_MAX / UINT_MAX <= sizeof *slotvec ++ && n1 != s / sizeof *slotvec) ++ xalloc_die (); ++ ++ if (slotvec == &slotvec0) ++ { ++ slotvec = xmalloc (sizeof *slotvec); ++ *slotvec = slotvec0; ++ } ++ slotvec = xrealloc (slotvec, s); ++ memset (slotvec + nslots, 0, (n1 - nslots) * sizeof *slotvec); ++ nslots = n1; + } + + { + size_t size = slotvec[n].size; + char *val = slotvec[n].val; +- size_t qsize = quotearg_buffer (val, size, arg, (size_t) -1, options); ++ size_t qsize = quotearg_buffer (val, size, arg, argsize, options); + + if (size <= qsize) + { + slotvec[n].size = size = qsize + 1; +- slotvec[n].val = val = xrealloc (val, size); +- quotearg_buffer (val, size, arg, (size_t) -1, options); ++ slotvec[n].val = val = xrealloc (val == slot0 ? 0 : val, size); ++ quotearg_buffer (val, size, arg, argsize, options); + } + ++ errno = e; + return val; + } + } + + char * +-quotearg_n (unsigned int n, char const *arg) ++quotearg_n (int n, char const *arg) + { +- return quotearg_n_options (n, arg, &default_quoting_options); ++ return quotearg_n_options (n, arg, SIZE_MAX, &default_quoting_options); + } + + char * +@@ -372,13 +583,29 @@ + return quotearg_n (0, arg); + } + +-char * +-quotearg_n_style (unsigned int n, enum quoting_style s, char const *arg) ++/* Return quoting options for STYLE, with no extra quoting. */ ++static struct quoting_options ++quoting_options_from_style (enum quoting_style style) + { + struct quoting_options o; +- o.style = s; ++ o.style = style; + memset (o.quote_these_too, 0, sizeof o.quote_these_too); +- return quotearg_n_options (n, arg, &o); ++ return o; ++} ++ ++char * ++quotearg_n_style (int n, enum quoting_style s, char const *arg) ++{ ++ struct quoting_options const o = quoting_options_from_style (s); ++ return quotearg_n_options (n, arg, SIZE_MAX, &o); ++} ++ ++char * ++quotearg_n_style_mem (int n, enum quoting_style s, ++ char const *arg, size_t argsize) ++{ ++ struct quoting_options const o = quoting_options_from_style (s); ++ return quotearg_n_options (n, arg, argsize, &o); + } + + char * +@@ -393,7 +620,7 @@ + struct quoting_options options; + options = default_quoting_options; + set_char_quoting (&options, ch, 1); +- return quotearg_n_options (0, arg, &options); ++ return quotearg_n_options (0, arg, SIZE_MAX, &options); + } + + char * +diff -urNd -urNd patch-2.5.4/quotearg.h patch-2.5.9/quotearg.h +--- patch-2.5.4/quotearg.h 1999-08-09 19:09:13.000000000 -0400 ++++ patch-2.5.9/quotearg.h 2002-11-23 01:45:22.000000000 -0500 +@@ -1,5 +1,7 @@ + /* quotearg.h - quote arguments for output +- Copyright (C) 1998, 1999 Free Software Foundation, Inc. ++ ++ Copyright (C) 1998, 1999, 2000, 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 +@@ -17,6 +19,11 @@ + + /* Written by Paul Eggert <eggert@twinsun.com> */ + ++#ifndef QUOTEARG_H_ ++# define QUOTEARG_H_ 1 ++ ++# include <stddef.h> ++ + /* Basic quoting styles. */ + enum quoting_style + { +@@ -25,13 +32,14 @@ + shell_always_quoting_style, /* --quoting-style=shell-always */ + c_quoting_style, /* --quoting-style=c */ + escape_quoting_style, /* --quoting-style=escape */ +- locale_quoting_style /* --quoting-style=locale */ ++ locale_quoting_style, /* --quoting-style=locale */ ++ clocale_quoting_style /* --quoting-style=clocale */ + }; + + /* For now, --quoting-style=literal is the default, but this may change. */ +-#ifndef DEFAULT_QUOTING_STYLE +-# define DEFAULT_QUOTING_STYLE literal_quoting_style +-#endif ++# ifndef DEFAULT_QUOTING_STYLE ++# define DEFAULT_QUOTING_STYLE literal_quoting_style ++# endif + + /* Names of quoting styles and their corresponding values. */ + extern char const *const quoting_style_args[]; +@@ -39,37 +47,27 @@ + + struct quoting_options; + +-#ifndef PARAMS +-# if defined PROTOTYPES || defined __STDC__ +-# define PARAMS(Args) Args +-# else +-# define PARAMS(Args) () +-# endif +-#endif +- + /* The functions listed below set and use a hidden variable + that contains the default quoting style options. */ + + /* Allocate a new set of quoting options, with contents initially identical + to O if O is not null, or to the default if O is null. + It is the caller's responsibility to free the result. */ +-struct quoting_options *clone_quoting_options +- PARAMS ((struct quoting_options *o)); ++struct quoting_options *clone_quoting_options (struct quoting_options *o); + + /* Get the value of O's quoting style. If O is null, use the default. */ +-enum quoting_style get_quoting_style PARAMS ((struct quoting_options *o)); ++enum quoting_style get_quoting_style (struct quoting_options *o); + + /* In O (or in the default if O is null), + set the value of the quoting style to S. */ +-void set_quoting_style PARAMS ((struct quoting_options *o, +- enum quoting_style s)); ++void set_quoting_style (struct quoting_options *o, enum quoting_style s); + + /* In O (or in the default if O is null), + set the value of the quoting options for character C to I. + Return the old value. Currently, the only values defined for I are + 0 (the default) and 1 (which means to quote the character even if + it would not otherwise be quoted). */ +-int set_char_quoting PARAMS ((struct quoting_options *o, char c, int i)); ++int set_char_quoting (struct quoting_options *o, char c, int i); + + /* Place into buffer BUFFER (of size BUFFERSIZE) a quoted version of + argument ARG (of size ARGSIZE), using O to control quoting. +@@ -79,31 +77,38 @@ + If BUFFERSIZE is too small to store the output string, return the + value that would have been returned had BUFFERSIZE been large enough. + If ARGSIZE is -1, use the string length of the argument for ARGSIZE. */ +-size_t quotearg_buffer PARAMS ((char *buffer, size_t buffersize, +- char const *arg, size_t argsize, +- struct quoting_options const *o)); ++size_t quotearg_buffer (char *buffer, size_t buffersize, ++ char const *arg, size_t argsize, ++ struct quoting_options const *o); + + /* Use storage slot N to return a quoted version of the string ARG. + Use the default quoting options. + The returned value points to static storage that can be + reused by the next call to this function with the same value of N. + N must be nonnegative. */ +-char *quotearg_n PARAMS ((unsigned int n, char const *arg)); ++char *quotearg_n (int n, char const *arg); + + /* Equivalent to quotearg_n (0, ARG). */ +-char *quotearg PARAMS ((char const *arg)); ++char *quotearg (char const *arg); + + /* Use style S and storage slot N to return a quoted version of the string ARG. + This is like quotearg_n (N, ARG), except that it uses S with no other + options to specify the quoting method. */ +-char *quotearg_n_style PARAMS ((unsigned int n, enum quoting_style s, +- char const *arg)); ++char *quotearg_n_style (int n, enum quoting_style s, char const *arg); ++ ++/* Use style S and storage slot N to return a quoted version of the ++ argument ARG of size ARGSIZE. This is like quotearg_n_style ++ (N, S, ARG), except it can quote null bytes. */ ++char *quotearg_n_style_mem (int n, enum quoting_style s, ++ char const *arg, size_t argsize); + + /* Equivalent to quotearg_n_style (0, S, ARG). */ +-char *quotearg_style PARAMS ((enum quoting_style s, char const *arg)); ++char *quotearg_style (enum quoting_style s, char const *arg); + + /* Like quotearg (ARG), except also quote any instances of CH. */ +-char *quotearg_char PARAMS ((char const *arg, char ch)); ++char *quotearg_char (char const *arg, char ch); + + /* Equivalent to quotearg_char (ARG, ':'). */ +-char *quotearg_colon PARAMS ((char const *arg)); ++char *quotearg_colon (char const *arg); ++ ++#endif /* !QUOTEARG_H_ */ +diff -urNd -urNd patch-2.5.4/quote.c patch-2.5.9/quote.c +--- patch-2.5.4/quote.c 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/quote.c 2003-03-18 03:50:56.000000000 -0500 +@@ -0,0 +1,45 @@ ++/* quote.c - quote arguments for output ++ Copyright (C) 1998, 1999, 2000, 2001, 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. */ ++ ++/* Written by Paul Eggert <eggert@twinsun.com> */ ++ ++#if HAVE_CONFIG_H ++# include <config.h> ++#endif ++ ++#if HAVE_STDDEF_H ++# include <stddef.h> /* For the definition of size_t on windows w/MSVC. */ ++#endif ++#include <sys/types.h> ++#include "quotearg.h" ++#include "quote.h" ++ ++/* Return an unambiguous printable representation of NAME, ++ allocated in slot N, suitable for diagnostics. */ ++char const * ++quote_n (int n, char const *name) ++{ ++ return quotearg_n_style (n, locale_quoting_style, name); ++} ++ ++/* Return an unambiguous printable representation of NAME, ++ suitable for diagnostics. */ ++char const * ++quote (char const *name) ++{ ++ return quote_n (0, name); ++} +diff -urNd -urNd patch-2.5.4/quote.h patch-2.5.9/quote.h +--- patch-2.5.4/quote.h 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/quote.h 2002-11-23 02:23:50.000000000 -0500 +@@ -0,0 +1,28 @@ ++/* quote.h - prototypes for quote.c ++ Copyright (C) 1998, 1999, 2000, 2001 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. */ ++ ++ ++#ifndef PARAMS ++# if defined PROTOTYPES || (defined __STDC__ && __STDC__) ++# define PARAMS(Args) Args ++# else ++# define PARAMS(Args) () ++# endif ++#endif ++ ++char const *quote_n PARAMS ((int n, char const *name)); ++char const *quote PARAMS ((char const *name)); +diff -urNd -urNd patch-2.5.4/README patch-2.5.9/README +--- patch-2.5.4/README 1997-05-26 01:34:43.000000000 -0400 ++++ patch-2.5.9/README 2002-06-03 00:51:09.000000000 -0400 +@@ -5,16 +5,16 @@ + * making GNU Emacs-style backup files + * improved interaction with RCS and SCCS + * the GNU conventions for option parsing and configuring and compilation. +- * better POSIX.2 compliance ++ * better POSIX compliance + They also fix some bugs. See the NEWS and ChangeLog files for details. + + Tutorial-style documentation for patch is included in the GNU +-diffutils package. Unfortunately, the diffutils 2.7 documentation +-for `patch' is obsolete; this should be fixed in diffutils 2.8. +-In the mean time, see `patch --help', or consult the man page +-in this distribution. ++Diffutils package; get GNU Diffutils 2.8 or later for up-to-date ++documentation for patch. + + For GNU and Unix build and installation instructions, see the file INSTALL. ++Use `configure --disable-largefile' to disable large file support; ++this is reportedly necessary on Red Hat GNU/Linux 6.0 to avoid a C library bug. + For MS-DOS using DJGPP tools, see the file pc/djgpp/README. + For other systems, copy config.hin to config.h and change + #undef statements in it to #define as appropriate for your system, +@@ -22,7 +22,7 @@ + enclosed in @ signs as appropriate for your system. + + Please send bug reports for this version of patch to +-bug-gnu-utils@prep.ai.mit.edu. ++<bug-patch@gnu.org>. + + The Free Software Foundation is distributing this version of patch + independently because as of this writing, Larry Wall has not released a +@@ -33,8 +33,10 @@ + + ------ + +-Copyright 1984, 1985, 1986, 1987, 1988 Larry Wall +-Copyright 1989, 1990, 1991, 1992, 1993, 1997 Free Software Foundation, Inc. ++Copyright (C) 1984, 1985, 1986, 1987, 1988 Larry Wall ++ ++Copyright (C) 1989, 1990, 1991, 1992, 1993, 1997, 1999, 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 +diff -urNd -urNd patch-2.5.4/rename.c patch-2.5.9/rename.c +--- patch-2.5.4/rename.c 1999-03-29 18:56:19.000000000 -0500 ++++ patch-2.5.9/rename.c 1969-12-31 19:00:00.000000000 -0500 +@@ -1,113 +0,0 @@ +-/* BSD compatible rename and directory rename function for System V. +- Copyright (C) 1988, 1990 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. */ +- +-#if HAVE_CONFIG_H +-# include <config.h> +-#endif +- +-#include <sys/types.h> +-#include <sys/stat.h> +-#include <errno.h> +-#ifndef errno +-extern int errno; +-#endif +- +-#if STAT_MACROS_BROKEN +-# undef S_ISDIR +-#endif +- +-#if !defined(S_ISDIR) && defined(S_IFDIR) +-# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) +-#endif +- +-/* Rename file FROM to file TO. +- Return 0 if successful, -1 if not. */ +- +-int +-rename (char *from, char *to) +-{ +- struct stat from_stats, to_stats; +- +- if (stat (from, &from_stats)) +- return -1; +- +- /* Be careful not to unlink `from' if it happens to be equal to `to' or +- (on filesystems that silently truncate filenames after 14 characters) +- if `from' and `to' share the significant characters. */ +- if (stat (to, &to_stats)) +- { +- if (errno != ENOENT) +- return -1; +- } +- else +- { +- if ((from_stats.st_dev == to_stats.st_dev) +- && (from_stats.st_ino == to_stats.st_ino)) +- /* `from' and `to' designate the same file on that filesystem. */ +- return 0; +- +- if (unlink (to) && errno != ENOENT) +- return -1; +- } +- +-#ifdef MVDIR +- +-/* If MVDIR is defined, it should be the full filename of a setuid root +- program able to link and unlink directories. If MVDIR is not defined, +- then the capability of renaming directories may be missing. */ +- +- if (S_ISDIR (from_stats.st_mode)) +- { +- /* Need a setuid root process to link and unlink directories. */ +- int status; +- pid_t pid = fork (); +- switch (pid) +- { +- case -1: /* Error. */ +- return -1; /* errno already set */ +- +- case 0: /* Child. */ +- execl (MVDIR, "mvdir", from, to, (char *) 0); +- _exit (1); +- +- default: /* Parent. */ +- while (wait (&status) != pid) +- /* Do nothing. */ ; +- +- if (status) +- { +- /* MVDIR failed. */ +- errno = EIO; +- return -1; +- } +- } +- } +- else +- +-#endif /* MVDIR */ +- +- { +- if (link (from, to)) +- return -1; +- if (unlink (from) && errno != ENOENT) +- { +- unlink (to); +- return -1; +- } +- } +- return 0; +-} +diff -urNd -urNd patch-2.5.4/stdbool.h.in patch-2.5.9/stdbool.h.in +--- patch-2.5.4/stdbool.h.in 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/stdbool.h.in 2003-01-09 08:35:14.000000000 -0500 +@@ -0,0 +1,47 @@ ++/* Copyright (C) 2001-2002 Free Software Foundation, Inc. ++ Written by Bruno Haible <haible@clisp.cons.org>, 2001. ++ ++ 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. */ ++ ++#ifndef _STDBOOL_H ++#define _STDBOOL_H ++ ++/* ISO C 99 <stdbool.h> for platforms that lack it. */ ++ ++/* 7.16. Boolean type and values */ ++ ++/* BeOS <sys/socket.h> already #defines false 0, true 1. We use the same ++ definitions below, but temporarily we have to #undef them. */ ++#ifdef __BEOS__ ++# undef false ++# undef true ++#endif ++ ++/* For the sake of symbolic names in gdb, define _Bool as an enum type. */ ++#ifndef __cplusplus ++# if !@HAVE__BOOL@ ++typedef enum { false = 0, true = 1 } _Bool; ++# endif ++#else ++typedef bool _Bool; ++#endif ++#define bool _Bool ++ ++/* The other macros must be usable in preprocessor directives. */ ++#define false 0 ++#define true 1 ++#define __bool_true_false_are_defined 1 ++ ++#endif /* _STDBOOL_H */ +diff -urNd -urNd patch-2.5.4/strcasecmp.c patch-2.5.9/strcasecmp.c +--- patch-2.5.4/strcasecmp.c 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/strcasecmp.c 2000-08-07 11:48:18.000000000 -0400 +@@ -0,0 +1,66 @@ ++/* strcasecmp.c -- case insensitive string comparator ++ Copyright (C) 1998, 1999 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. */ ++ ++#if HAVE_CONFIG_H ++# include <config.h> ++#endif ++ ++#ifdef LENGTH_LIMIT ++# define STRXCASECMP_FUNCTION strncasecmp ++# define STRXCASECMP_DECLARE_N , size_t n ++# define LENGTH_LIMIT_EXPR(Expr) Expr ++#else ++# define STRXCASECMP_FUNCTION strcasecmp ++# define STRXCASECMP_DECLARE_N /* empty */ ++# define LENGTH_LIMIT_EXPR(Expr) 0 ++#endif ++ ++#include <sys/types.h> ++#include <ctype.h> ++ ++#define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch)) ++ ++/* Compare {{no more than N characters of }}strings S1 and S2, ++ ignoring case, returning less than, equal to or ++ greater than zero if S1 is lexicographically less ++ than, equal to or greater than S2. */ ++ ++int ++STRXCASECMP_FUNCTION (const char *s1, const char *s2 STRXCASECMP_DECLARE_N) ++{ ++ register const unsigned char *p1 = (const unsigned char *) s1; ++ register const unsigned char *p2 = (const unsigned char *) s2; ++ unsigned char c1, c2; ++ ++ if (p1 == p2 || LENGTH_LIMIT_EXPR (n == 0)) ++ return 0; ++ ++ do ++ { ++ c1 = TOLOWER (*p1); ++ c2 = TOLOWER (*p2); ++ ++ if (LENGTH_LIMIT_EXPR (--n == 0) || c1 == '\0') ++ break; ++ ++ ++p1; ++ ++p2; ++ } ++ while (c1 == c2); ++ ++ return c1 - c2; ++} +diff -urNd -urNd patch-2.5.4/strncasecmp.c patch-2.5.9/strncasecmp.c +--- patch-2.5.4/strncasecmp.c 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/strncasecmp.c 1999-01-02 10:55:44.000000000 -0500 +@@ -0,0 +1,2 @@ ++#define LENGTH_LIMIT ++#include "strcasecmp.c" +diff -urNd -urNd patch-2.5.4/unlocked-io.h patch-2.5.9/unlocked-io.h +--- patch-2.5.4/unlocked-io.h 1969-12-31 19:00:00.000000000 -0500 ++++ patch-2.5.9/unlocked-io.h 2002-12-04 15:51:07.000000000 -0500 +@@ -0,0 +1,90 @@ ++/* Prefer faster, non-thread-safe stdio functions if available. ++ ++ 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 Library 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 ++ Library General Public License for more details. ++ ++ You should have received a copy of the GNU Library 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. */ ++ ++/* Written by Jim Meyering. */ ++ ++#ifndef UNLOCKED_IO_H ++# define UNLOCKED_IO_H 1 ++ ++# ifndef USE_UNLOCKED_IO ++# define USE_UNLOCKED_IO 1 ++# endif ++ ++# if USE_UNLOCKED_IO ++ ++/* These are wrappers for functions/macros from GNU libc. ++ The standard I/O functions are thread-safe. These *_unlocked ones are ++ more efficient but not thread-safe. That they're not thread-safe is ++ fine since all of the applications in this package are single threaded. */ ++ ++# if HAVE_DECL_CLEARERR_UNLOCKED ++# undef clearerr ++# define clearerr(x) clearerr_unlocked (x) ++# endif ++# if HAVE_DECL_FEOF_UNLOCKED ++# undef feof ++# define feof(x) feof_unlocked (x) ++# endif ++# if HAVE_DECL_FERROR_UNLOCKED ++# undef ferror ++# define ferror(x) ferror_unlocked (x) ++# endif ++# if HAVE_DECL_FFLUSH_UNLOCKED ++# undef fflush ++# define fflush(x) fflush_unlocked (x) ++# endif ++# if HAVE_DECL_FGETS_UNLOCKED ++# undef fgets ++# define fgets(x,y,z) fgets_unlocked (x,y,z) ++# endif ++# if HAVE_DECL_FPUTC_UNLOCKED ++# undef fputc ++# define fputc(x,y) fputc_unlocked (x,y) ++# endif ++# if HAVE_DECL_FPUTS_UNLOCKED ++# undef fputs ++# define fputs(x,y) fputs_unlocked (x,y) ++# endif ++# if HAVE_DECL_FREAD_UNLOCKED ++# undef fread ++# define fread(w,x,y,z) fread_unlocked (w,x,y,z) ++# endif ++# if HAVE_DECL_FWRITE_UNLOCKED ++# undef fwrite ++# define fwrite(w,x,y,z) fwrite_unlocked (w,x,y,z) ++# endif ++# if HAVE_DECL_GETC_UNLOCKED ++# undef getc ++# define getc(x) getc_unlocked (x) ++# endif ++# if HAVE_DECL_GETCHAR_UNLOCKED ++# undef getchar ++# define getchar() getchar_unlocked () ++# endif ++# if HAVE_DECL_PUTC_UNLOCKED ++# undef putc ++# define putc(x,y) putc_unlocked (x,y) ++# endif ++# if HAVE_DECL_PUTCHAR_UNLOCKED ++# undef putchar ++# define putchar(x) putchar_unlocked (x) ++# endif ++ ++# endif /* USE_UNLOCKED_IO */ ++#endif /* UNLOCKED_IO_H */ +diff -urNd -urNd patch-2.5.4/util.c patch-2.5.9/util.c +--- patch-2.5.4/util.c 1999-08-30 02:20:08.000000000 -0400 ++++ patch-2.5.9/util.c 2003-05-20 10:04:53.000000000 -0400 +@@ -1,9 +1,11 @@ + /* utility functions for `patch' */ + +-/* $Id: util.c,v 1.27 1999/08/30 06:20:08 eggert Exp $ */ ++/* $Id: util.c,v 1.36 2003/05/20 14:04:53 eggert Exp $ */ + +-/* Copyright 1986 Larry Wall +- Copyright 1992, 1993, 1997-1998, 1999 Free Software Foundation, Inc. ++/* Copyright (C) 1986 Larry Wall ++ ++ Copyright (C) 1992, 1993, 1997, 1998, 1999, 2001, 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 +@@ -23,7 +25,7 @@ + #define XTERN extern + #include <common.h> + #include <backupfile.h> +-#include <basename.h> ++#include <dirname.h> + #include <quotearg.h> + #include <quotesys.h> + #include <version.h> +@@ -43,23 +45,9 @@ + # define raise(sig) kill (getpid (), sig) + #endif + +-#ifdef __STDC__ +-# include <stdarg.h> +-# define vararg_start va_start +-#else +-# define vararg_start(ap,p) va_start (ap) +-# if HAVE_VARARGS_H +-# include <varargs.h> +-# else +- typedef char *va_list; +-# define va_dcl int va_alist; +-# define va_start(ap) ((ap) = (va_list) &va_alist) +-# define va_arg(ap, t) (((t *) ((ap) += sizeof (t))) [-1]) +-# define va_end(ap) +-# endif +-#endif ++#include <stdarg.h> + +-static void makedirs PARAMS ((char *)); ++static void makedirs (char *); + + /* Move a file FROM (where *FROM_NEEDS_REMOVAL is nonzero if FROM + needs removal when cleaning up at the end of execution) +@@ -67,11 +55,11 @@ + If we must create TO, use MODE to create it. + If FROM is null, remove TO (ignoring FROMSTAT). + FROM_NEEDS_REMOVAL must be nonnull if FROM is nonnull. +- Back up TO if BACKUP is nonzero. */ ++ Back up TO if BACKUP is true. */ + + void + move_file (char const *from, int volatile *from_needs_removal, +- char *to, mode_t mode, int backup) ++ char *to, mode_t mode, bool backup) + { + struct stat to_st; + int to_errno = ! backup ? -1 : stat (to, &to_st) == 0 ? 0 : errno; +@@ -152,11 +140,9 @@ + say ("Renaming file %s to %s\n", + quotearg_n (0, from), quotearg_n (1, to)); + +- if (rename (from, to) == 0) +- *from_needs_removal = 0; +- else ++ if (rename (from, to) != 0) + { +- int to_dir_known_to_exist = 0; ++ bool to_dir_known_to_exist = false; + + if (errno == ENOENT + && (to_errno == -1 || to_errno == ENOENT)) +@@ -164,10 +150,7 @@ + makedirs (to); + to_dir_known_to_exist = 1; + if (rename (from, to) == 0) +- { +- *from_needs_removal = 0; +- return; +- } ++ goto rename_succeeded; + } + + if (errno == EXDEV) +@@ -175,7 +158,7 @@ + if (! backup) + { + if (unlink (to) == 0) +- to_dir_known_to_exist = 1; ++ to_dir_known_to_exist = true; + else if (errno != ENOENT) + pfatal ("Can't remove file %s", quotearg (to)); + } +@@ -188,6 +171,14 @@ + pfatal ("Can't rename file %s to %s", + quotearg_n (0, from), quotearg_n (1, to)); + } ++ ++ rename_succeeded: ++ /* Do not clear *FROM_NEEDS_REMOVAL if it's possible that the ++ rename returned zero because FROM and TO are hard links to ++ the same file. */ ++ if (0 < to_errno ++ || (to_errno == 0 && to_st.st_nlink <= 1)) ++ *from_needs_removal = 0; + } + else if (! backup) + { +@@ -255,23 +246,27 @@ + + static char const CLEARTOOL_CO[] = "cleartool co -unr -nc "; + ++static char const PERFORCE_CO[] = "p4 edit "; ++ + /* Return "RCS" if FILENAME is controlled by RCS, + "SCCS" if it is controlled by SCCS, +- "ClearCase" if it is controlled by Clearcase, and 0 otherwise. +- READONLY is nonzero if we desire only readonly access to FILENAME. ++ "ClearCase" if it is controlled by Clearcase, ++ "Perforce" if it is controlled by Perforce, ++ and 0 otherwise. ++ READONLY is true if we desire only readonly access to FILENAME. + FILESTAT describes FILENAME's status or is 0 if FILENAME does not exist. + If successful and if GETBUF is nonzero, set *GETBUF to a command + that gets the file; similarly for DIFFBUF and a command to diff the file + (but set *DIFFBUF to 0 if the diff operation is meaningless). + *GETBUF and *DIFFBUF must be freed by the caller. */ + char const * +-version_controller (char const *filename, int readonly, ++version_controller (char const *filename, bool readonly, + struct stat const *filestat, char **getbuf, char **diffbuf) + { + struct stat cstat; + char const *filebase = base_name (filename); + char const *dotslash = *filename == '-' ? "./" : ""; +- size_t dir_len = filebase - filename; ++ size_t dirlen = filebase - filename; + size_t filenamelen = strlen (filename); + size_t maxfixlen = sizeof "SCCS/" - 1 + sizeof SCCSPREFIX - 1; + size_t maxtrysize = filenamelen + maxfixlen + 1; +@@ -285,8 +280,8 @@ + + strcpy (trybuf, filename); + +-#define try1(f,a1) (sprintf (trybuf + dir_len, f, a1), stat (trybuf, &cstat) == 0) +-#define try2(f,a1,a2) (sprintf (trybuf + dir_len, f, a1,a2), stat (trybuf, &cstat) == 0) ++#define try1(f,a1) (sprintf (trybuf + dirlen, f, a1), stat (trybuf, &cstat) == 0) ++#define try2(f,a1,a2) (sprintf (trybuf + dirlen, f, a1,a2), stat (trybuf, &cstat) == 0) + + /* Check that RCS file is not working file. + Some hosts don't report file name length errors. */ +@@ -362,6 +357,23 @@ + *diffbuf = 0; + + r = "ClearCase"; ++ } ++ else if (!readonly && filestat && ++ (getenv("P4PORT") || getenv("P4USER") || getenv("P4CONFIG"))) ++ { ++ if (getbuf) ++ { ++ char *p = *getbuf = xmalloc (maxgetsize); ++ strcpy (p, PERFORCE_CO); ++ p += sizeof PERFORCE_CO - 1; ++ p += quote_system_arg (p, filename); ++ *p = '\0'; ++ } ++ ++ if (diffbuf) ++ *diffbuf = 0; ++ ++ r = "Perforce"; + } + + free (trybuf); +@@ -369,12 +381,12 @@ + } + + /* Get FILENAME from version control system CS. The file already exists if +- EXISTS is nonzero. Only readonly access is needed if READONLY is nonzero. ++ EXISTS. Only readonly access is needed if READONLY. + Use the command GETBUF to actually get the named file. + Store the resulting file status into *FILESTAT. +- Return nonzero if successful. */ +-int +-version_get (char const *filename, char const *cs, int exists, int readonly, ++ Return true if successful. */ ++bool ++version_get (char const *filename, char const *cs, bool exists, bool readonly, + char const *getbuf, struct stat *filestat) + { + if (patch_get < 0) +@@ -460,7 +472,7 @@ + *--p = '0' + (int) (n % 10); + while ((n /= 10) != 0); + } +- ++ + return p; + } + +@@ -490,7 +502,7 @@ + { + va_list args; + fprintf (stderr, "%s: **** ", program_name); +- vararg_start (args, format); ++ va_start (args, format); + vfprintf (stderr, format, args); + va_end (args); + putc ('\n', stderr); +@@ -524,7 +536,7 @@ + int errnum = errno; + va_list args; + fprintf (stderr, "%s: **** ", program_name); +- vararg_start (args, format); ++ va_start (args, format); + vfprintf (stderr, format, args); + va_end (args); + fflush (stderr); /* perror bypasses stdio on some hosts. */ +@@ -540,7 +552,7 @@ + say (char const *format, ...) + { + va_list args; +- vararg_start (args, format); ++ va_start (args, format); + vfprintf (stdout, format, args); + va_end (args); + fflush (stdout); +@@ -555,7 +567,7 @@ + int r; + va_list args; + +- vararg_start (args, format); ++ va_start (args, format); + vfprintf (stdout, format, args); + va_end (args); + fflush (stdout); +@@ -566,7 +578,8 @@ + since it's unlikely that stdout will be seen by the tty user. + The isatty test also works around a bug in GNU Emacs 19.34 under Linux + which makes a call-process `patch' hang when it reads from /dev/tty. +- POSIX.2 requires that we read /dev/tty, though. */ ++ POSIX.1-2001 XCU line 26599 requires that we read /dev/tty, ++ though. */ + ttyfd = (posixly_correct || isatty (STDOUT_FILENO) + ? open (TTY_DEVICE, O_RDONLY) + : -1); +@@ -607,15 +620,15 @@ + + /* Return nonzero if it OK to reverse a patch. */ + +-int ++bool + ok_to_reverse (char const *format, ...) + { +- int r = 0; ++ bool r = false; + + if (noreverse || ! (force && verbosity == SILENT)) + { + va_list args; +- vararg_start (args, format); ++ va_start (args, format); + vfprintf (stdout, format, args); + va_end (args); + } +@@ -623,19 +636,17 @@ + if (noreverse) + { + printf (" Skipping patch.\n"); +- skip_rest_of_patch = TRUE; +- r = 0; ++ skip_rest_of_patch = true; + } + else if (force) + { + if (verbosity != SILENT) + printf (" Applying it anyway.\n"); +- r = 0; + } + else if (batch) + { + say (reverse ? " Ignoring -R.\n" : " Assuming -R.\n"); +- r = 1; ++ r = true; + } + else + { +@@ -648,7 +659,7 @@ + { + if (verbosity != SILENT) + say ("Skipping patch.\n"); +- skip_rest_of_patch = TRUE; ++ skip_rest_of_patch = true; + } + } + } +@@ -711,7 +722,7 @@ + static sigset_t signals_to_block; + + #if ! HAVE_SIGACTION +-static RETSIGTYPE fatal_exit_handler PARAMS ((int)) __attribute__ ((noreturn)); ++static RETSIGTYPE fatal_exit_handler (int) __attribute__ ((noreturn)); + static RETSIGTYPE + fatal_exit_handler (int sig) + { +@@ -721,7 +732,7 @@ + #endif + + void +-set_signals (int reset) ++set_signals (bool reset) + { + int i; + #if HAVE_SIGACTION +@@ -743,7 +754,7 @@ + sigemptyset (&signals_to_block); + for (i = 0; i < NUM_SIGS; i++) + { +- int ignoring_signal; ++ bool ignoring_signal; + #if HAVE_SIGACTION + if (sigaction (sigs[i], (struct sigaction *) 0, &initial_act) != 0) + continue; +@@ -939,7 +950,13 @@ + } + else if (ISSPACE ((unsigned char) *t)) + { ++ /* Allow file names with internal spaces, ++ but only if a tab separates the file name from the date. */ + char const *u = t; ++ while (*u != '\t' && ISSPACE ((unsigned char) u[1])) ++ u++; ++ if (*u != '\t' && strchr (u + 1, '\t')) ++ continue; + + if (set_time | set_utc) + stamp = str2time (&u, initial_time, +diff -urNd -urNd patch-2.5.4/util.h patch-2.5.9/util.h +--- patch-2.5.4/util.h 1999-08-30 02:20:08.000000000 -0400 ++++ patch-2.5.9/util.h 2003-05-20 09:56:48.000000000 -0400 +@@ -1,6 +1,26 @@ + /* utility functions for `patch' */ + +-/* $Id: util.h,v 1.17 1999/08/30 06:20:08 eggert Exp $ */ ++/* $Id: util.h,v 1.20 2003/05/20 13:56:48 eggert Exp $ */ ++ ++/* Copyright (C) 1986 Larry Wall ++ ++ Copyright (C) 1992, 1993, 1997, 1998, 1999, 2001, 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; see the file COPYING. ++ If not, write to the Free Software Foundation, ++ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + + /* An upper bound on the print length of a signed decimal line number. + Add one for the sign. */ +@@ -8,32 +28,32 @@ + + XTERN enum backup_type backup_type; + +-int ok_to_reverse PARAMS ((char const *, ...)) __attribute__ ((format (printf, 1, 2))); +-void ask PARAMS ((char const *, ...)) __attribute__ ((format (printf, 1, 2))); +-void say PARAMS ((char const *, ...)) __attribute__ ((format (printf, 1, 2))); ++bool ok_to_reverse (char const *, ...) __attribute__ ((format (printf, 1, 2))); ++void ask (char const *, ...) __attribute__ ((format (printf, 1, 2))); ++void say (char const *, ...) __attribute__ ((format (printf, 1, 2))); + +-void fatal PARAMS ((char const *, ...)) ++void fatal (char const *, ...) + __attribute__ ((noreturn, format (printf, 1, 2))); +-void pfatal PARAMS ((char const *, ...)) ++void pfatal (char const *, ...) + __attribute__ ((noreturn, format (printf, 1, 2))); + +-char *fetchname PARAMS ((char *, int, time_t *)); +-char *savebuf PARAMS ((char const *, size_t)); +-char *savestr PARAMS ((char const *)); +-char const *version_controller PARAMS ((char const *, int, struct stat const *, char **, char **)); +-int version_get PARAMS ((char const *, char const *, int, int, char const *, struct stat *)); +-int create_file PARAMS ((char const *, int, mode_t)); +-int systemic PARAMS ((char const *)); +-char *format_linenum PARAMS ((char[LINENUM_LENGTH_BOUND + 1], LINENUM)); +-void Fseek PARAMS ((FILE *, file_offset, int)); +-void copy_file PARAMS ((char const *, char const *, int, mode_t)); +-void exit_with_signal PARAMS ((int)) __attribute__ ((noreturn)); +-void ignore_signals PARAMS ((void)); +-void init_time PARAMS ((void)); +-void memory_fatal PARAMS ((void)) __attribute__ ((noreturn)); +-void move_file PARAMS ((char const *, int volatile *, char *, mode_t, int)); +-void read_fatal PARAMS ((void)) __attribute__ ((noreturn)); +-void remove_prefix PARAMS ((char *, size_t)); +-void removedirs PARAMS ((char *)); +-void set_signals PARAMS ((int)); +-void write_fatal PARAMS ((void)) __attribute__ ((noreturn)); ++char *fetchname (char *, int, time_t *); ++char *savebuf (char const *, size_t); ++char *savestr (char const *); ++char const *version_controller (char const *, bool, struct stat const *, char **, char **); ++bool version_get (char const *, char const *, bool, bool, char const *, struct stat *); ++int create_file (char const *, int, mode_t); ++int systemic (char const *); ++char *format_linenum (char[LINENUM_LENGTH_BOUND + 1], LINENUM); ++void Fseek (FILE *, file_offset, int); ++void copy_file (char const *, char const *, int, mode_t); ++void exit_with_signal (int) __attribute__ ((noreturn)); ++void ignore_signals (void); ++void init_time (void); ++void memory_fatal (void) __attribute__ ((noreturn)); ++void move_file (char const *, int volatile *, char *, mode_t, bool); ++void read_fatal (void) __attribute__ ((noreturn)); ++void remove_prefix (char *, size_t); ++void removedirs (char *); ++void set_signals (bool); ++void write_fatal (void) __attribute__ ((noreturn)); +diff -urNd -urNd patch-2.5.4/version.c patch-2.5.9/version.c +--- patch-2.5.4/version.c 1999-08-30 02:20:08.000000000 -0400 ++++ patch-2.5.9/version.c 2003-05-18 04:25:17.000000000 -0400 +@@ -1,17 +1,16 @@ + /* Print the version number. */ + +-/* $Id: version.c,v 1.7 1999/08/30 06:20:08 eggert Exp $ */ ++/* $Id: version.c,v 1.13 2003/05/18 08:25:17 eggert Exp $ */ + + #define XTERN extern + #include <common.h> + #undef XTERN + #define XTERN +-#include <patchlevel.h> + #include <version.h> + + static char const copyright_string[] = "\ +-Copyright 1984-1988 Larry Wall\n\ +-Copyright 1989-1999 Free Software Foundation, Inc."; ++Copyright (C) 1988 Larry Wall\n\ ++Copyright (C) 2003 Free Software Foundation, Inc."; + + static char const free_software_msgid[] = "\ + This program comes with NO WARRANTY, to the extent permitted by law.\n\ +@@ -25,6 +24,6 @@ + void + version (void) + { +- printf ("%s %s\n%s\n\n%s\n\n%s\n", program_name, PATCH_VERSION, ++ printf ("%s %s\n%s\n\n%s\n\n%s\n", PACKAGE_NAME, PACKAGE_VERSION, + copyright_string, free_software_msgid, authorship_msgid); + } +diff -urNd -urNd patch-2.5.4/version.h patch-2.5.9/version.h +--- patch-2.5.4/version.h 1997-04-06 21:07:00.000000000 -0400 ++++ patch-2.5.9/version.h 2002-05-28 03:24:05.000000000 -0400 +@@ -1,5 +1,5 @@ + /* Print the version number. */ + +-/* $Id: version.h,v 1.3 1997/04/07 01:07:00 eggert Exp $ */ ++/* $Id: version.h,v 1.5 2002/05/28 07:24:05 eggert Exp $ */ + +-void version PARAMS ((void)); ++void version (void); +diff -urNd -urNd patch-2.5.4/xalloc.h patch-2.5.9/xalloc.h +--- patch-2.5.4/xalloc.h 1999-01-01 12:36:43.000000000 -0500 ++++ patch-2.5.9/xalloc.h 2000-10-31 02:09:56.000000000 -0500 +@@ -1,5 +1,5 @@ + /* xalloc.h -- malloc with out-of-memory checking +- Copyright (C) 1990-1998, 1999 Free Software Foundation, Inc. ++ Copyright (C) 1990-1998, 1999, 2000 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 +@@ -26,6 +26,16 @@ + # endif + # endif + ++# ifndef __attribute__ ++# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__ ++# define __attribute__(x) ++# endif ++# endif ++ ++# ifndef ATTRIBUTE_NORETURN ++# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) ++# endif ++ + /* Exit value when the requested amount of memory is not available. + It is initialized to EXIT_FAILURE, but the caller may set it to + some other value. */ +@@ -33,20 +43,45 @@ + + /* If this pointer is non-zero, run the specified function upon each + allocation failure. It is initialized to zero. */ +-extern void (*xalloc_fail_func) (); ++extern void (*xalloc_fail_func) PARAMS ((void)); + + /* If XALLOC_FAIL_FUNC is undefined or a function that returns, this +- message must be non-NULL. It is translated via gettext. +- The default value is "Memory exhausted". */ +-extern char *const xalloc_msg_memory_exhausted; ++ message is output. It is translated via gettext. ++ Its value is "memory exhausted". */ ++extern char const xalloc_msg_memory_exhausted[]; ++ ++/* This function is always triggered when memory is exhausted. It is ++ in charge of honoring the three previous items. This is the ++ function to call when one wants the program to die because of a ++ memory allocation failure. */ ++extern void xalloc_die PARAMS ((void)) ATTRIBUTE_NORETURN; + + void *xmalloc PARAMS ((size_t n)); + void *xcalloc PARAMS ((size_t n, size_t s)); + void *xrealloc PARAMS ((void *p, size_t n)); ++char *xstrdup PARAMS ((const char *str)); ++ ++# define XMALLOC(Type, N_items) ((Type *) xmalloc (sizeof (Type) * (N_items))) ++# define XCALLOC(Type, N_items) ((Type *) xcalloc (sizeof (Type), (N_items))) ++# define XREALLOC(Ptr, Type, N_items) \ ++ ((Type *) xrealloc ((void *) (Ptr), sizeof (Type) * (N_items))) ++ ++/* Declare and alloc memory for VAR of type TYPE. */ ++# define NEW(Type, Var) Type *(Var) = XMALLOC (Type, 1) ++ ++/* Free VAR only if non NULL. */ ++# define XFREE(Var) \ ++ do { \ ++ if (Var) \ ++ free (Var); \ ++ } while (0) ++ ++/* Return a pointer to a malloc'ed copy of the array SRC of NUM elements. */ ++# define CCLONE(Src, Num) \ ++ (memcpy (xmalloc (sizeof (*Src) * (Num)), (Src), sizeof (*Src) * (Num))) ++ ++/* Return a malloc'ed copy of SRC. */ ++# define CLONE(Src) CCLONE (Src, 1) + +-# define XMALLOC(Type, N_bytes) ((Type *) xmalloc (sizeof (Type) * (N_bytes))) +-# define XCALLOC(Type, N_bytes) ((Type *) xcalloc (sizeof (Type), (N_bytes))) +-# define XREALLOC(Ptr, Type, N_bytes) \ +- ((Type *) xrealloc ((void *) (Ptr), sizeof (Type) * (N_bytes))) + + #endif /* !XALLOC_H_ */ +diff -urNd -urNd patch-2.5.4/xmalloc.c patch-2.5.9/xmalloc.c +--- patch-2.5.4/xmalloc.c 1999-04-18 22:43:16.000000000 -0400 ++++ patch-2.5.9/xmalloc.c 2002-11-21 14:16:29.000000000 -0500 +@@ -1,5 +1,5 @@ + /* xmalloc.c -- malloc with out of memory checking +- Copyright (C) 1990-1997, 98, 99 Free Software Foundation, Inc. ++ Copyright (C) 1990-1999, 2000, 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 +@@ -30,14 +30,9 @@ + void free (); + #endif + +-#if ENABLE_NLS +-# include <libintl.h> +-# define _(Text) gettext (Text) +-#else +-# define textdomain(Domain) +-# define _(Text) Text +-#endif +-#define N_(Text) Text ++#include "gettext.h" ++#define _(msgid) gettext (msgid) ++#define N_(msgid) msgid + + #include "error.h" + #include "xalloc.h" +@@ -46,12 +41,14 @@ + # define EXIT_FAILURE 1 + #endif + +-#ifndef HAVE_DONE_WORKING_MALLOC_CHECK +-you must run the autoconf test for a properly working malloc -- see malloc.m4 ++/* The following tests require AC_PREREQ(2.54). */ ++ ++#ifndef HAVE_MALLOC ++"you must run the autoconf test for a GNU libc compatible malloc" + #endif + +-#ifndef HAVE_DONE_WORKING_REALLOC_CHECK +-you must run the autoconf test for a properly working realloc -- see realloc.m4 ++#ifndef HAVE_REALLOC ++"you must run the autoconf test for a GNU libc compatible realloc" + #endif + + /* Exit value when the requested amount of memory is not available. +@@ -59,18 +56,22 @@ + int xalloc_exit_failure = EXIT_FAILURE; + + /* If non NULL, call this function when memory is exhausted. */ +-void (*xalloc_fail_func) () = 0; ++void (*xalloc_fail_func) PARAMS ((void)) = 0; + + /* If XALLOC_FAIL_FUNC is NULL, or does return, display this message + before exiting when memory is exhausted. Goes through gettext. */ +-char *const xalloc_msg_memory_exhausted = N_("Memory exhausted"); ++char const xalloc_msg_memory_exhausted[] = N_("memory exhausted"); + +-static void +-xalloc_fail (void) ++void ++xalloc_die (void) + { + if (xalloc_fail_func) + (*xalloc_fail_func) (); + error (xalloc_exit_failure, 0, "%s", _(xalloc_msg_memory_exhausted)); ++ /* The `noreturn' cannot be given to error, since it may return if ++ its first argument is 0. To help compilers understand the ++ xalloc_die does terminate, call exit. */ ++ exit (EXIT_FAILURE); + } + + /* Allocate N bytes of memory dynamically, with error checking. */ +@@ -82,20 +83,19 @@ + + p = malloc (n); + if (p == 0) +- xalloc_fail (); ++ xalloc_die (); + return p; + } + + /* Change the size of an allocated block of memory P to N bytes, +- with error checking. +- If P is NULL, run xmalloc. */ ++ with error checking. */ + + void * + xrealloc (void *p, size_t n) + { + p = realloc (p, n); + if (p == 0) +- xalloc_fail (); ++ xalloc_die (); + return p; + } + +@@ -108,6 +108,6 @@ + + p = calloc (n, s); + if (p == 0) +- xalloc_fail (); ++ xalloc_die (); + return p; + } |