X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/5725bd2cc0e691dadc31bd958f210b1bbcf17c49..d43b5e84066afe4ee7100ab957438a1c41141492:/msdos/sedlibmk.inp diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp index 67719cffbd..badb30b0b6 100644 --- a/msdos/sedlibmk.inp +++ b/msdos/sedlibmk.inp @@ -2,7 +2,7 @@ # Configuration script for lib/Makefile under DJGPP v2.x # ---------------------------------------------------------------------- # -# Copyright (C) 2011-2012 Free Software Foundation, Inc. +# Copyright (C) 2011-2014 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # @@ -18,15 +18,25 @@ # # Checklist to add a new gnulib module: # -# . If the module includes source files that need to be compiled, add -# the corresponding .o file names to the list that gets assigned to -# the gl_LIBOBJS variable. +# . If the module includes source files that need to be compiled, and +# does not appear in the am_libgnu_a_OBJECTS list, add the +# corresponding .o file names to the list that gets assigned to the +# gl_LIBOBJS variable. +# +# . If a module appears in am_libgnu_a_OBJECTS that is not required +# for the MSDOS build, edit it out by adding an appropriate command +# to the set that edits the am_libgnu_a_OBJECTS block. # # . If the module defines functions that need to replace DJGPP -# functions, edit the appropriate REPLACE_foo variables to 1; -# otherwise edit them to zero: +# functions, edit the appropriate REPLACE_foo variables to 1: +# +# /^REPLACE_CALLOC *=/s/@REPLACE_CALLOC@/1/ # -# /^REPLACE_CALLOC *=/s/@REPLACE_CALLOC@/0/ +# Note that this file already has a command to edit all the +# REPLACE_foo variables to zero, so if some gnulib replacement +# function is ever needed, the corresponding editing command such +# as above should be placed before that catchall rule (search for +# "REPLACE_" below). # # . If the module is a header or adds headers, edit the corresponding # variable to either an empty value or to the name of the header. @@ -45,10 +55,10 @@ # s/^@GL_GENERATE_STDBOOL_H_TRUE@/\#/ # s/^@GL_GENERATE_STDBOOL_H_FALSE@// # -# . Also edit the NEXT_foo and NEXT_AS_FIRST_DIRECTIVE_foo_H variable -# as appropriately: to an empty value if the gnulib header is not -# used, and to the corresponding DJGPP header name otherwise. -# Examples: +# . Also edit the NEXT_foo_H and NEXT_AS_FIRST_DIRECTIVE_foo_H +# variables as appropriately: to an empty value if the gnulib +# header is not used, and to the corresponding DJGPP header name +# otherwise. Examples: # # /^NEXT_STDDEF_H *=/s/@[^@\n]*@// # /^NEXT_STDINT_H *=/s/@[^@\n]*@// @@ -57,7 +67,7 @@ # # . Note that some gnulib headers cannot be left unused: those for # which there's no corresponding foo_H variable in -# autogen/Makefile.in (example: stdio.h). For these the "not +# msdos/autogen/Makefile.in (example: stdio.h). For these the "not # needed" path is not applicable. # # . If the header is needed, edit all the variables it uses as @@ -68,12 +78,14 @@ # variable should be edited to zero and the corresponding # GNULIB_foo variable should be edited to 1 if the gnulib # replacement can work for DJGPP (a rare phenomenon), zero -# otherwise. +# otherwise. Note that by default all HAVE_foo and GNULIB_foo +# variables that don't have a specific editing rule will be edited +# to zero. # # . Some gnulib header files have more complex recipes in -# autogen/Makefile.in than others. The tell-tale sign of such a -# recipe is that the input redirection from the .in.h file is not -# present at the end of the command, like this: +# msdos/autogen/Makefile.in than others. The tell-tale sign of +# such a recipe is that the input redirection from the .in.h file +# is not present at the end of the command, like this: # # -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ # } > $@-t && \ @@ -93,6 +105,16 @@ # s/'\; \\ *$/' >> $@-t/ # } # +# There's also a 3rd variety of script, which ends like this: +# +# -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ +# < $(srcdir)/string.in.h; \ +# } > $@-t && \ +# mv $@-t $@ +# +# For these, you will need Sed commands like those used for +# string.h, see below. +# # . If the recipe for generating a header file uses 'cat', replace it with # # sed -e '' @@ -101,9 +123,9 @@ # this). # # The following Awk script is useful for editing portions of -# autogen/Makefile.in into Sed commands that define the corresponding -# variables to zero (which is what is required in the absolute -# majority of cases): +# msdos/autogen/Makefile.in into Sed commands that define the +# corresponding variables to zero (which is what is required in the +# absolute majority of cases): # # { printf "/^%s *=/s/%s/0/\n",$1,$3} # @@ -115,6 +137,8 @@ s/@PACKAGE@/emacs/ /^am__cd *=/c\ am__cd = cd +/^@BUILDING_FOR_WINDOWSNT_TRUE@/s/@[^@\n]*@/#/ +/^@BUILDING_FOR_WINDOWSNT_FALSE@/s/@[^@\n]*@// /^ALLOCA *=/s/@[^@\n]*@// /^ALSA_CFLAGS *=/s/@[^@\n]*@// /^ALSA_LIBS *=/s/@[^@\n]*@// @@ -133,6 +157,7 @@ am__cd = cd /^C_SWITCH_SYSTEM *=/s/@C_SWITCH_SYSTEM@// /^GNUSTEP_CFLAGS *=/s/@GNUSTEP_CFLAGS@// /^C_SWITCH_X_SITE *=/s/@C_SWITCH_X_SITE@// +/^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@// /^GNULIB_WARN_CFLAGS *=/s/@GNULIB_WARN_CFLAGS@// /^WARN_CFLAGS *=/s/@WARN_CFLAGS@// /^WERROR_CFLAGS *=/s/@WERROR_CFLAGS@// @@ -141,6 +166,7 @@ am__cd = cd /^DEPFLAGS *=/s/@[^@\n]*@/-MMD -MF ${DEPDIR}\/$*.d/ /^ECHO_N *=/s/@[^@\n]*@/-n/ /^EXEEXT *=/s/@[^@\n]*@/.exe/ +/^EXECINFO_H *=/s/@[^@\n]*@/execinfo.h/ /^GETOPT_H *=/s/@[^@\n]*@/getopt.h/ # # Gnulib stuff @@ -151,301 +177,86 @@ am__cd = cd /^BITSIZEOF_WINT_T *=/s/@BITSIZEOF_WINT_T@/32/ /^APPLE_UNIVERSAL_BUILD *=/s/@APPLE_UNIVERSAL_BUILD@/0/ # -# Some GNULIB_* are replaced with zero even though DJGPP does not have +# Most GNULIB_* are replaced with zero even though DJGPP does not have # these features. That's because the gnulib replacements cannot # possibly work for DJGPP, so we prefer to fail the link than have a -# subtly botched executable. +# subtly botched executable. Those replacements that _are_ needed +# should be before the last catch-all rule. /^GNULIB_ATOLL *=/s/@GNULIB_ATOLL@/1/ -/^GNULIB_CALLOC_POSIX *=/s/@GNULIB_CALLOC_POSIX@/0/ -/^GNULIB_CANONICALIZE_FILE_NAME *=/s/@GNULIB_CANONICALIZE_FILE_NAME@/0/ -/^GNULIB_CHDIR *=/s/@GNULIB_CHDIR@/0/ -/^GNULIB_CHOWN *=/s/@GNULIB_CHOWN@/0/ -/^GNULIB_CLOSE *=/s/@GNULIB_CLOSE@/0/ -/^GNULIB_DPRINTF *=/s/@GNULIB_DPRINTF@/0/ -/^GNULIB_DUP *=/s/@GNULIB_DUP@/0/ -/^GNULIB_DUP2 *=/s/@GNULIB_DUP2@/0/ /^GNULIB_DUP3 *=/s/@GNULIB_DUP3@/1/ -/^GNULIB_ENVIRON *=/s/@GNULIB_ENVIRON@/0/ -/^GNULIB_EUIDACCESS *=/s/@GNULIB_EUIDACCESS@/0/ -/^GNULIB_FACCESSAT *=/s/@GNULIB_FACCESSAT@/0/ -/^GNULIB_FCHDIR *=/s/@GNULIB_FCHDIR@/0/ -/^GNULIB_FCHOWNAT *=/s/@GNULIB_FCHOWNAT@/0/ -/^GNULIB_FCHMODAT *=/s/@GNULIB_FCHMODAT@/0/ -/^GNULIB_FCLOSE *=/s/@GNULIB_FCLOSE@/0/ -/^GNULIB_FDATASYNC *=/s/@GNULIB_FDATASYNC@/0/ -/^GNULIB_FDOPEN *=/s/@GNULIB_FDOPEN@/0/ -/^GNULIB_FFLUSH *=/s/@GNULIB_FFLUSH@/0/ -/^GNULIB_FGETC *=/s/@GNULIB_FGETC@/0/ -/^GNULIB_FGETS *=/s/@GNULIB_FGETS@/0/ -/^GNULIB_FOPEN *=/s/@GNULIB_FOPEN@/0/ -/^GNULIB_FPRINTF *=/s/@GNULIB_FPRINTF@/0/ -/^GNULIB_FPRINTF_POSIX *=/s/@GNULIB_FPRINTF_POSIX@/0/ -/^GNULIB_FPURGE *=/s/@GNULIB_FPURGE@/0/ -/^GNULIB_FPUTC *=/s/@GNULIB_FPUTC@/0/ -/^GNULIB_FPUTS *=/s/@GNULIB_FPUTS@/0/ -/^GNULIB_FREAD *=/s/@GNULIB_FREAD@/0/ -/^GNULIB_FREOPEN *=/s/@GNULIB_FREOPEN@/0/ -/^GNULIB_FSCANF *=/s/@GNULIB_FSCANF@/0/ -/^GNULIB_FSEEK *=/s/@GNULIB_FSEEK@/0/ -/^GNULIB_FSEEKO *=/s/@GNULIB_FSEEKO@/0/ -/^GNULIB_FSTAT *=/s/@GNULIB_FSTAT@/0/ -/^GNULIB_FSTATAT *=/s/@GNULIB_FSTATAT@/0/ -/^GNULIB_FSYNC *=/s/@GNULIB_FSYNC@/0/ -/^GNULIB_FTELL *=/s/@GNULIB_FTELL@/0/ -/^GNULIB_FTELLO *=/s/@GNULIB_FTELLO@/0/ -/^GNULIB_FTRUNCATE *=/s/@GNULIB_FTRUNCATE@/0/ -/^GNULIB_FUTIMENS *=/s/@GNULIB_FUTIMENS@/0/ -/^GNULIB_FWRITE *=/s/@GNULIB_FWRITE@/0/ -/^GNULIB_GETC *=/s/@GNULIB_GETC@/0/ -/^GNULIB_GETCHAR *=/s/@GNULIB_GETCHAR@/0/ -/^GNULIB_GETCWD *=/s/@GNULIB_GETCWD@/0/ -/^GNULIB_GETDELIM *=/s/@GNULIB_GETDELIM@/0/ -/^GNULIB_GETDOMAINNAME *=/s/@GNULIB_GETDOMAINNAME@/0/ -/^GNULIB_GETDTABLESIZE *=/s/@GNULIB_GETDTABLESIZE@/0/ -/^GNULIB_GETGROUPS *=/s/@GNULIB_GETGROUPS@/0/ -/^GNULIB_GETHOSTNAME *=/s/@GNULIB_GETHOSTNAME@/0/ -/^GNULIB_GETLINE *=/s/@GNULIB_GETLINE@/0/ +/^GNULIB_ENVIRON *=/s/@GNULIB_ENVIRON@/1/ +/^GNULIB_FDATASYNC *=/s/@GNULIB_FDATASYNC@/1/ /^GNULIB_GETLOADAVG *=/s/@GNULIB_GETLOADAVG@/1/ -/^GNULIB_GETLOGIN *=/s/@GNULIB_GETLOGIN@/0/ -/^GNULIB_GETLOGIN_R *=/s/@GNULIB_GETLOGIN_R@/0/ -/^GNULIB_GETPAGESIZE *=/s/@GNULIB_GETPAGESIZE@/0/ /^GNULIB_GL_UNISTD_H_GETOPT *=/s/@GNULIB_GL_UNISTD_H_GETOPT@/1/ -/^GNULIB_GETSUBOPT *=/s/@GNULIB_GETSUBOPT@/0/ -/^GNULIB_GETTIMEOFDAY *=/s/@GNULIB_GETTIMEOFDAY@/0/ -/^GNULIB_GETUSERSHELL *=/s/@GNULIB_GETUSERSHELL@/0/ -/^GNULIB_GRANTPT *=/s/@GNULIB_GRANTPT@/0/ -/^GNULIB_GROUP_MEMBER *=/s/@GNULIB_GROUP_MEMBER@/0/ -/^GNULIB_ISATTY *=/s/@GNULIB_ISATTY@/0/ -/^GNULIB_LCHMOD *=/s/@GNULIB_LCHMOD@/0/ -/^GNULIB_LCHOWN *=/s/@GNULIB_LCHOWN@/0/ -/^GNULIB_LINK *=/s/@GNULIB_LINK@/0/ -/^GNULIB_LINKAT *=/s/@GNULIB_LINKAT@/0/ -/^GNULIB_LSEEK *=/s/@GNULIB_LSEEK@/0/ -/^GNULIB_LSTAT *=/s/@GNULIB_LSTAT@/0/ -/^GNULIB_MALLOC_POSIX *=/s/@GNULIB_MALLOC_POSIX@/0/ -/^GNULIB_MBTOWC *=/s/@GNULIB_MBTOWC@/0/ -/^GNULIB_MKDIRAT *=/s/@GNULIB_MKDIRAT@/0/ -/^GNULIB_MKDTEMP *=/s/@GNULIB_MKDTEMP@/0/ -/^GNULIB_MKFIFO *=/s/@GNULIB_MKFIFO@/0/ -/^GNULIB_MKFIFOAT *=/s/@GNULIB_MKFIFOAT@/0/ -/^GNULIB_MKNOD *=/s/@GNULIB_MKNOD@/0/ -/^GNULIB_MKNODAT *=/s/@GNULIB_MKNODAT@/0/ -/^GNULIB_MKOSTEMP *=/s/@GNULIB_MKOSTEMP@/0/ -/^GNULIB_MKOSTEMPS *=/s/@GNULIB_MKOSTEMPS@/0/ -/^GNULIB_MKSTEMP *=/s/@GNULIB_MKSTEMP@/0/ -/^GNULIB_MKSTEMPS *=/s/@GNULIB_MKSTEMPS@/0/ -/^GNULIB_MKTIME *=/s/@GNULIB_MKTIME@/0/ -/^GNULIB_NANOSLEEP *=/s/@GNULIB_NANOSLEEP@/0/ -/^GNULIB_OBSTACK_PRINTF *=/s/@GNULIB_OBSTACK_PRINTF@/0/ -/^GNULIB_OBSTACK_PRINTF_POSIX *=/s/@GNULIB_OBSTACK_PRINTF_POSIX@/0/ -/^GNULIB_PCLOSE *=/s/@GNULIB_PCLOSE@/0/ -/^GNULIB_PERROR *=/s/@GNULIB_PERROR@/0/ -/^GNULIB_PIPE *=/s/@GNULIB_PIPE@/0/ -/^GNULIB_PIPE2 *=/s/@GNULIB_PIPE2@/0/ -/^GNULIB_POPEN *=/s/@GNULIB_POPEN@/0/ -/^GNULIB_POSIX_OPENPT *=/s/@GNULIB_POSIX_OPENPT@/0/ -/^GNULIB_PREAD *=/s/@GNULIB_PREAD@/0/ -/^GNULIB_PRINTF *=/s/@GNULIB_PRINTF@/0/ -/^GNULIB_PRINTF_POSIX *=/s/@GNULIB_PRINTF_POSIX@/0/ -/^GNULIB_PSELECT *=/s/@GNULIB_PSELECT@/0/ -/^GNULIB_PTHREAD_SIGMASK *=/s/@GNULIB_PTHREAD_SIGMASK@/0/ -/^GNULIB_PTSNAME *=/s/@GNULIB_PTSNAME@/0/ -/^GNULIB_PTSNAME_R *=/s/@GNULIB_PTSNAME_R@/0/ -/^GNULIB_PUTC *=/s/@GNULIB_PUTC@/0/ -/^GNULIB_PUTCHAR *=/s/@GNULIB_PUTCHAR@/0/ -/^GNULIB_PUTENV *=/s/@GNULIB_PUTENV@/0/ -/^GNULIB_PUTS *=/s/@GNULIB_PUTS@/0/ -/^GNULIB_PWRITE *=/s/@GNULIB_PWRITE@/0/ -/^GNULIB_RAISE *=/s/@GNULIB_RAISE@/0/ -/^GNULIB_RANDOM *=/s/@GNULIB_RANDOM@/0/ -/^GNULIB_RANDOM_R *=/s/@GNULIB_RANDOM_R@/0/ -/^GNULIB_READ *=/s/@GNULIB_READ@/0/ -/^GNULIB_READLINK *=/s/@GNULIB_READLINK@/0/ -/^GNULIB_READLINKAT *=/s/@GNULIB_READLINKAT@/0/ -/^GNULIB_REALLOC_POSIX *=/s/@GNULIB_REALLOC_POSIX@/0/ -/^GNULIB_REALPATH *=/s/@GNULIB_REALPATH@/0/ -/^GNULIB_REMOVE *=/s/@GNULIB_REMOVE@/0/ -/^GNULIB_RENAME *=/s/@GNULIB_RENAME@/0/ -/^GNULIB_RENAMEAT *=/s/@GNULIB_RENAMEAT@/0/ -/^GNULIB_RMDIR *=/s/@GNULIB_RMDIR@/0/ -/^GNULIB_RPMATCH *=/s/@GNULIB_RPMATCH@/0/ -/^GNULIB_SCANF *=/s/@GNULIB_SCANF@/0/ -/^GNULIB_SELECT *=/s/@GNULIB_SELECT@/0/ -/^GNULIB_SETENV *=/s/@GNULIB_SETENV@/0/ -/^GNULIB_SETHOSTNAME *=/s/@GNULIB_SETHOSTNAME@/0/ -/^GNULIB_SIGACTION *=/s/@GNULIB_SIGACTION@/0/ -/^GNULIB_SIGNAL_H_SIGPIPE *=/s/@GNULIB_SIGNAL_H_SIGPIPE@/0/ -/^GNULIB_SIGPROCMASK *=/s/@GNULIB_SIGPROCMASK@/0/ -/^GNULIB_SLEEP *=/s/@GNULIB_SLEEP@/0/ -/^GNULIB_SNPRINTF *=/s/@GNULIB_SNPRINTF@/0/ -/^GNULIB_SPRINTF_POSIX *=/s/@GNULIB_SPRINTF_POSIX@/0/ -/^GNULIB_STAT *=/s/@GNULIB_STAT@/0/ -/^GNULIB_STDIO_H_NONBLOCKING *=/s/@GNULIB_STDIO_H_NONBLOCKING@/0/ -/^GNULIB_STDIO_H_SIGPIPE *=/s/@GNULIB_STDIO_H_SIGPIPE@/0/ -/^GNULIB_STRPTIME *=/s/@GNULIB_STRPTIME@/0/ -/^GNULIB_STRTOD *=/s/@GNULIB_STRTOD@/0/ -/^GNULIB_STRTOLL *=/s/@GNULIB_STRTOLL@/0/ -/^GNULIB_STRTOULL *=/s/@GNULIB_STRTOULL@/0/ -/^GNULIB_SYMLINK *=/s/@GNULIB_SYMLINK@/0/ -/^GNULIB_SYMLINKAT *=/s/@GNULIB_SYMLINKAT@/0/ -/^GNULIB_SYSTEM_POSIX *=/s/@GNULIB_SYSTEM_POSIX@/0/ -/^GNULIB_TIMEGM *=/s/@GNULIB_TIMEGM@/0/ +/^GNULIB_MEMRCHR *=/s/@GNULIB_MEMRCHR@/1/ +/^GNULIB_MKOSTEMP *=/s/@GNULIB_MKOSTEMP@/1/ /^GNULIB_TIME_R *=/s/@GNULIB_TIME_R@/1/ -/^GNULIB_TMPFILE *=/s/@GNULIB_TMPFILE@/0/ -/^GNULIB_TTYNAME_R *=/s/@GNULIB_TTYNAME_R@/0/ -/^GNULIB_UNISTD_H_NONBLOCKING *=/s/@GNULIB_UNISTD_H_NONBLOCKING@/0/ -/^GNULIB_UNISTD_H_SIGPIPE *=/s/@GNULIB_UNISTD_H_SIGPIPE@/0/ -/^GNULIB_UNLINK *=/s/@GNULIB_UNLINK@/0/ -/^GNULIB_UNLINKAT *=/s/@GNULIB_UNLINKAT@/0/ -/^GNULIB_UNLOCKPT *=/s/@GNULIB_UNLOCKPT@/0/ /^GNULIB_UNSETENV *=/s/@GNULIB_UNSETENV@/1/ -/^GNULIB_USLEEP *=/s/@GNULIB_USLEEP@/0/ -/^GNULIB_UTIMENSAT *=/s/@GNULIB_UTIMENSAT@/0/ -/^GNULIB_VASPRINTF *=/s/@GNULIB_VASPRINTF@/0/ -/^GNULIB_VDPRINTF *=/s/@GNULIB_VDPRINTF@/0/ -/^GNULIB_VFPRINTF *=/s/@GNULIB_VFPRINTF@/0/ -/^GNULIB_VFPRINTF_POSIX *=/s/@GNULIB_VFPRINTF_POSIX@/0/ -/^GNULIB_VFSCANF *=/s/@GNULIB_VFSCANF@/0/ -/^GNULIB_VPRINTF *=/s/@GNULIB_VPRINTF@/0/ -/^GNULIB_VPRINTF_POSIX *=/s/@GNULIB_VPRINTF_POSIX@/0/ -/^GNULIB_VSCANF *=/s/@GNULIB_VSCANF@/0/ -/^GNULIB_VSNPRINTF *=/s/@GNULIB_VSNPRINTF@/0/ -/^GNULIB_VSPRINTF_POSIX *=/s/@GNULIB_VSPRINTF_POSIX@/0/ -/^GNULIB_WCTOMB *=/s/@GNULIB_WCTOMB@/0/ -/^GNULIB_WRITE *=/s/@GNULIB_WRITE@/0/ -/^GNULIB__EXIT *=/s/@GNULIB__EXIT@/0/ +/^GNULIB_[^ =]* *= *@/s/@[^@\n]*@/0/ /^GSETTINGS_CFLAGS *=/s/@[^@\n]*@// /^GSETTINGS_LIBS *=/s/@[^@\n]*@// +# +# Edit the HAVE_foo variables /^HAVE_ATOLL *=/s/@HAVE_ATOLL@/0/ -/^HAVE_CANONICALIZE_FILE_NAME *=/s/@HAVE_CANONICALIZE_FILE_NAME@/0/ /^HAVE_CHOWN *=/s/@HAVE_CHOWN@/1/ -/^HAVE_DECL_ENVIRON *=/s/@HAVE_DECL_ENVIRON@/1/ -/^HAVE_DECL_FCHDIR *=/s/@HAVE_DECL_FCHDIR@/0/ -/^HAVE_DECL_FDATASYNC *=/s/@HAVE_DECL_FDATASYNC@/0/ -/^HAVE_DECL_FPURGE *=/s/@HAVE_DECL_FPURGE@// -/^HAVE_DECL_FSEEKO *=/s/@HAVE_DECL_FSEEKO@/0/ -/^HAVE_DECL_FTELLO *=/s/@HAVE_DECL_FTELLO@/0/ -/^HAVE_DECL_GETDELIM *=/s/@HAVE_DECL_GETDELIM@/0/ -/^HAVE_DECL_GETDOMAINNAME *=/s/@HAVE_DECL_GETDOMAINNAME@/0/ -/^HAVE_DECL_GETLINE *=/s/@HAVE_DECL_GETLINE@/0/ -/^HAVE_DECL_GETLOADAVG *=/s/@HAVE_DECL_GETLOADAVG@/0/ -/^HAVE_DECL_GETLOGIN_R *=/s/@HAVE_DECL_GETLOGIN_R@/0/ +/^HAVE_CLOSEDIR *=/s/@HAVE_CLOSEDIR@/1/ /^HAVE_DECL_GETPAGESIZE *=/s/@HAVE_DECL_GETPAGESIZE@/1/ -/^HAVE_DECL_GETUSERSHELL *=/s/@HAVE_DECL_GETUSERSHELL@/0/ -/^HAVE_DECL_LOCALTIME_R *=/s/@HAVE_DECL_LOCALTIME_R@/0/ -/^HAVE_DECL_OBSTACK_PRINTF *=/s/@HAVE_DECL_OBSTACK_PRINTF@/0/ -/^HAVE_DECL_SETHOSTNAME *=/s/@HAVE_DECL_SETHOSTNAME@/0/ /^HAVE_DECL_SETENV *=/s/@HAVE_DECL_SETENV@/1/ -/^HAVE_DECL_SNPRINTF *=/s/@HAVE_DECL_SNPRINTF@/0/ -/^HAVE_DECL_TTYNAME_R *=/s/@HAVE_DECL_TTYNAME_R@/0/ -/^HAVE_DECL_UNSETENV *=/s/@HAVE_DECL_UNSETENV@/0/ -/^HAVE_DECL_VSNPRINTF *=/s/@HAVE_DECL_VSNPRINTF@/0/ -/^HAVE_DPRINTF *=/s/@HAVE_DPRINTF@/0/ +/^HAVE_DECL_STRDUP *=/s/@HAVE_DECL_STRDUP@/1/ +# The following two rely on msdos/inttypes.h redirections +/^HAVE_DECL_STRTOIMAX *=/s/@HAVE_DECL_STRTOIMAX@/1/ +/^HAVE_DECL_STRTOUMAX *=/s/@HAVE_DECL_STRTOUMAX@/1/ +/^HAVE_DIRENT_H *=/s/@HAVE_DIRENT_H@/1/ /^HAVE_DUP2 *=/s/@HAVE_DUP2@/1/ -/^HAVE_DUP3 *=/s/@HAVE_DUP3@/0/ -/^HAVE_EUIDACCESS *=/s/@HAVE_EUIDACCESS@/0/ -/^HAVE_FACCESSAT *=/s/@HAVE_FACCESSAT@/0/ -/^HAVE_FCHDIR *=/s/@HAVE_FCHDIR@/0/ -/^HAVE_FCHMODAT *=/s/@HAVE_FCHMODAT@/0/ -/^HAVE_FCHOWNAT *=/s/@HAVE_FCHOWNAT@/0/ -/^HAVE_FDATASYNC *=/s/@HAVE_FDATASYNC@/0/ -/^HAVE_FSEEKO *=/s/@HAVE_FSEEKO@/0/ -/^HAVE_FSTATAT *=/s/@HAVE_FSTATAT@/0/ /^HAVE_FSYNC *=/s/@HAVE_FSYNC@/1/ -/^HAVE_FTELLO *=/s/@HAVE_FTELLO@/0/ /^HAVE_FTRUNCATE *=/s/@HAVE_FTRUNCATE@/1/ -/^HAVE_FUTIMENS *=/s/@HAVE_FUTIMENS@/0/ -/^HAVE_GETDTABLESIZE *=/s/@HAVE_GETDTABLESIZE@/0/ -/^HAVE_GETGROUPS *=/s/@HAVE_GETGROUPS@/0/ /^HAVE_GETHOSTNAME *=/s/@HAVE_GETHOSTNAME@/1/ /^HAVE_GETLOGIN *=/s/@HAVE_GETLOGIN@/1/ -/^HAVE_GETOPT_H *=/s/@HAVE_GETOPT_H@/0/ /^HAVE_GETPAGESIZE *=/s/@HAVE_GETPAGESIZE@/1/ -/^HAVE_GETSUBOPT *=/s/@HAVE_GETSUBOPT@/0/ -/^HAVE_GRANTPT *=/s/@HAVE_GRANTPT@/0/ -/^HAVE_GROUP_MEMBER *=/s/@HAVE_GROUP_MEMBER@/0/ -/^HAVE_LCHOWN *=/s/@HAVE_LCHOWN@/0/ /^HAVE_INTTYPES_H *=/s/@HAVE_INTTYPES_H@/HAVE_INTTYPES_H/ -/^HAVE_LCHMOD *=/s/@HAVE_LCHMOD@/0/ /^HAVE_LINK *=/s/@HAVE_LINK@/1/ -/^HAVE_LINKAT *=/s/@HAVE_LINKAT@/0/ /^HAVE_LONG_LONG_INT *=/s/@HAVE_LONG_LONG_INT@/1/ /^HAVE_LSTAT *=/s/@HAVE_LSTAT@/HAVE_LSTAT/ /^HAVE_MAKEINFO *=/s/@HAVE_MAKEINFO@/yes/ -/^HAVE_MKDIRAT *=/s/@HAVE_MKDIRAT@/0/ -/^HAVE_MKDTEMP *=/s/@HAVE_MKDTEMP@/0/ +/^HAVE_MEMCHR *=/s/@HAVE_MEMCHR@/1/ /^HAVE_MKFIFO *=/s/@HAVE_MKFIFO@/1/ -/^HAVE_MKFIFOAT *=/s/@HAVE_MKFIFOAT@/0/ /^HAVE_MKNOD *=/s/@HAVE_MKNOD@/1/ -/^HAVE_MKNODAT *=/s/@HAVE_MKNODAT@/0/ -/^HAVE_MKOSTEMP *=/s/@HAVE_MKOSTEMP@/0/ -/^HAVE_MKOSTEMPS *=/s/@HAVE_MKOSTEMPS@/0/ /^HAVE_MKSTEMP *=/s/@HAVE_MKSTEMP@/1/ -/^HAVE_MKSTEMPS *=/s/@HAVE_MKSTEMPS@/0/ -/^HAVE_NANOSLEEP *=/s/@HAVE_NANOSLEEP@/0/ -/^HAVE_OS_H *=/s/@HAVE_OS_H@/0/ -/^HAVE_PIPE *=/s/@HAVE_PIPE@/0/ +/^HAVE_OPENDIR *=/s/@HAVE_OPENDIR@/1/ /^HAVE_PCLOSE *=/s/@HAVE_PCLOSE@/1/ -/^HAVE_PIPE2 *=/s/@HAVE_PIPE2@/0/ /^HAVE_POPEN *=/s/@HAVE_POPEN@/1/ /^HAVE_POSIX_SIGNALBLOCKING *=/s/@HAVE_POSIX_SIGNALBLOCKING@/1/ -/^HAVE_POSIX_OPENPT *=/s/@HAVE_POSIX_OPENPT@/0/ -/^HAVE_PREAD *=/s/@HAVE_PREAD@/0/ -/^HAVE_PTSNAME *=/s/@HAVE_PTSNAME@/0/ -/^HAVE_PTSNAME_R *=/s/@HAVE_PTSNAME_R@/0/ -/^HAVE_PTHREAD_SIGMASK *=/s/@HAVE_PTHREAD_SIGMASK@/0/ -/^HAVE_PWRITE *=/s/@HAVE_PWRITE@/0/ /^HAVE_RANDOM_H *=/s/@HAVE_RANDOM_H@/1/ /^HAVE_RAISE *=/s/@HAVE_RAISE@/1/ /^HAVE_RANDOM *=/s/@HAVE_RANDOM@/1/ -/^HAVE_RANDOM_R *=/s/@HAVE_RANDOM_R@/0/ -/^HAVE_READLINK *=/s/@HAVE_READLINK@/0/ -/^HAVE_READLINKAT *=/s/@HAVE_READLINKAT@/0/ -/^HAVE_REALPATH *=/s/@HAVE_REALPATH@/0/ -/^HAVE_RENAMEAT *=/s/@HAVE_RENAMEAT@/0/ -/^HAVE_RPMATCH *=/s/@HAVE_RPMATCH@/0/ +/^HAVE_READDIR *=/s/@HAVE_READDIR@/1/ +/^HAVE_REWINDDIR *=/s/@HAVE_REWINDDIR@/1/ /^HAVE_SETENV *=/s/@HAVE_SETENV@/1/ -/^HAVE_SETHOSTNAME *=/s/@HAVE_SETHOSTNAME@/0/ /^HAVE_SIGACTION *=/s/@HAVE_SIGACTION@/1/ -/^HAVE_SIGHANDLER_T *=/s/@HAVE_SIGHANDLER_T@/0/ -/^HAVE_SIGINFO_T *=/s/@HAVE_SIGINFO_T@/0/ /^HAVE_SIGNED_SIG_ATOMIC_T *=/s/@HAVE_SIGNED_SIG_ATOMIC_T@/1/ -/^HAVE_SIGNED_WCHAR_T *=/s/@HAVE_SIGNED_WCHAR_T@/0/ /^HAVE_SIGNED_WINT_T *=/s/@HAVE_SIGNED_WINT_T@/1/ /^HAVE_SIGSET_T *=/s/@HAVE_SIGSET_T@/1/ /^HAVE_SLEEP *=/s/@HAVE_SLEEP@/1/ /^HAVE_STDINT_H *=/s/@HAVE_STDINT_H@/HAVE_STDINT_H/ -/^HAVE_STRPTIME *=/s/@HAVE_STRPTIME@/0/ +/^HAVE_STRPBRK *=/s/@HAVE_STRPBRK@/1/ +/^HAVE_STRSEP *=/s/@HAVE_STRSEP@/1/ /^HAVE_STRTOD *=/s/@HAVE_STRTOD@/1/ /^HAVE_STRTOLL *=/s/@HAVE_STRTOLL@/1/ /^HAVE_STRTOULL *=/s/@HAVE_STRTOULL@/1/ -/^HAVE_STRUCT_SIGACTION_SA_SIGACTION *=/s/@HAVE_STRUCT_SIGACTION_SA_SIGACTION@/0/ -/^HAVE_STRUCT_RANDOM_DATA *=/s/@HAVE_STRUCT_RANDOM_DATA@/0/ /^HAVE_STRUCT_TIMEVAL *=/s/@HAVE_STRUCT_TIMEVAL@/1/ /^HAVE_SYMLINK *=/s/@HAVE_SYMLINK@/1/ -/^HAVE_SYMLINKAT *=/s/@HAVE_SYMLINKAT@/0/ -/^HAVE_SYS_BITYPES_H *=/s/@HAVE_SYS_BITYPES_H@/0/ -/^HAVE_SYS_INTTYPES_H *=/s/@HAVE_SYS_INTTYPES_H@/0/ -/^HAVE_SYS_LOADAVG_H *=/s/@HAVE_SYS_LOADAVG_H@/0/ /^HAVE_SYS_PARAM_H *=/s/@HAVE_SYS_PARAM_H@/1/ -/^HAVE_SYS_SELECT_H *=/s/@HAVE_SYS_SELECT_H@/0/ /^HAVE_SYS_TIME_H *=/s/@HAVE_SYS_TIME_H@/1/ /^HAVE_SYS_TYPES_H *=/s/@HAVE_SYS_TYPES_H@/1/ -/^HAVE_TIMEGM *=/s/@HAVE_TIMEGM@/0/ /^HAVE_TYPE_VOLATILE_SIG_ATOMIC_T *=/s/@HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@/1/ /^HAVE_UNISTD_H *=/s/@HAVE_UNISTD_H@/1/ -/^HAVE_UNLINKAT *=/s/@HAVE_UNLINKAT@/0/ -/^HAVE_UNLOCKPT *=/s/@HAVE_UNLOCKPT@/0/ /^HAVE_UNSIGNED_LONG_LONG_INT *=/s/@HAVE_UNSIGNED_LONG_LONG_INT@/1/ /^HAVE_USLEEP *=/s/@HAVE_USLEEP@/1/ -/^HAVE_UTIMENSAT *=/s/@HAVE_UTIMENSAT@/0/ -/^HAVE_VASPRINTF *=/s/@HAVE_VASPRINTF@/0/ -/^HAVE_VDPRINTF *=/s/@HAVE_VDPRINTF@/0/ /^HAVE_WCHAR_H *=/s/@HAVE_WCHAR_H@/1/ /^HAVE_WCHAR_T *=/s/@HAVE_WCHAR_T@/1/ -/^HAVE_XSERVER *=/s/@HAVE_XSERVER@/0/ /^HAVE__BOOL *=/s/@HAVE__BOOL@/1/ /^HAVE__EXIT *=/s/@HAVE__EXIT@/1/ +/^HAVE_[^ =]* *= *@/s/@[^@\n]*@/0/ /^INCLUDE_NEXT *=/s/@INCLUDE_NEXT@/include_next/ /^INCLUDE_NEXT_AS_FIRST_DIRECTIVE *=/s/@[^@\n]*@/include_next/ /^LDFLAGS *=/s/@[^@\n]*@// @@ -456,6 +267,9 @@ am__cd = cd /^MAKEINFO *=/s/@MAKEINFO@/makeinfo/ # MKDIR_P lines are edited further below /^MKDIR_P *=/s/@MKDIR_P@// +/^NEXT_AS_FIRST_DIRECTIVE_DIRENT_H *=/s/@[^@\n]*@// +/^NEXT_AS_FIRST_DIRECTIVE_ERRNO_H *=/s/@[^@\n]*@// +/^NEXT_AS_FIRST_DIRECTIVE_FCNTL_H *=/s/@[^@\n]*@// /^NEXT_AS_FIRST_DIRECTIVE_GETOPT_H *=/s/@[^@\n]*@// /^NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H *=/s/@[^@\n]*@// /^NEXT_AS_FIRST_DIRECTIVE_STDARG_H *=/s/@[^@\n]*@// @@ -463,12 +277,16 @@ am__cd = cd /^NEXT_AS_FIRST_DIRECTIVE_STDINT_H *=/s/@[^@\n]*@// /^NEXT_AS_FIRST_DIRECTIVE_STDIO_H *=/s/@[^@\n]*@// /^NEXT_AS_FIRST_DIRECTIVE_STDLIB_H *=/s/@[^@\n]*@// +/^NEXT_AS_FIRST_DIRECTIVE_STRING_H *=/s/@[^@\n]*@// /^NEXT_AS_FIRST_DIRECTIVE_SYS_SELECT_H *=/s/@[^@\n]*@// /^NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H *=/s!@[^@\n]*@!! /^NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H *=/s/@[^@\n]*@// /^NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H *=/s!@[^@\n]*@!! /^NEXT_AS_FIRST_DIRECTIVE_TIME_H *=/s/@[^@\n]*@// /^NEXT_AS_FIRST_DIRECTIVE_UNISTD_H *=/s/@[^@\n]*@// +/^NEXT_DIRENT_H *=/s/@[^@\n]*@// +/^NEXT_ERRNO_H *=/s/@[^@\n]*@// +/^NEXT_FCNTL_H *=/s/@[^@\n]*@// /^NEXT_GETOPT_H *=/s/@[^@\n]*@// /^NEXT_STDARG_H *=/s/@[^@\n]*@// /^NEXT_SIGNAL_H *=/s/@[^@\n]*@// @@ -476,6 +294,7 @@ am__cd = cd /^NEXT_STDIO_H *=/s/@[^@\n]*@// /^NEXT_STDINT_H *=/s/@[^@\n]*@// /^NEXT_STDLIB_H *=/s/@[^@\n]*@// +/^NEXT_STRING_H *=/s/@[^@\n]*@// /^NEXT_SYS_SELECT_H *=/s/@[^@\n]*@// /^NEXT_SYS_STAT_H *=/s!@[^@\n]*@!! /^NEXT_SYS_TIME_H *=/s/@[^@\n]*@// @@ -488,102 +307,14 @@ am__cd = cd /^PTHREAD_H_DEFINES_STRUCT_TIMESPEC *=/s/@[^@\n]*@/0/ /^PTRDIFF_T_SUFFIX *=/s/@[^@\n]*@// /^RANLIB *=/s/@[^@\n]*@/ranlib/ -/^REPLACE_CALLOC *=/s/@REPLACE_CALLOC@/0/ -/^REPLACE_CANONICALIZE_FILE_NAME *=/s/@REPLACE_CANONICALIZE_FILE_NAME@/0/ -/^REPLACE_CHOWN *=/s/@REPLACE_CHOWN@/0/ -/^REPLACE_CLOSE *=/s/@REPLACE_CLOSE@/0/ -/^REPLACE_DPRINTF *=/s/@REPLACE_DPRINTF@/0/ -/^REPLACE_DUP *=/s/@REPLACE_DUP@/0/ -/^REPLACE_DUP2 *=/s/@REPLACE_DUP2@/0/ -/^REPLACE_FCHOWNAT *=/s/@REPLACE_FCHOWNAT@/0/ -/^REPLACE_FCLOSE *=/s/@REPLACE_FCLOSE@/0/ -/^REPLACE_FDOPEN *=/s/@REPLACE_FDOPEN@/0/ -/^REPLACE_FFLUSH *=/s/@REPLACE_FFLUSH@/0/ -/^REPLACE_FOPEN *=/s/@REPLACE_FOPEN@/0/ -/^REPLACE_FPRINTF *=/s/@REPLACE_FPRINTF@/0/ -/^REPLACE_FPURGE *=/s/@REPLACE_FPURGE@/0/ -/^REPLACE_FREOPEN *=/s/@REPLACE_FREOPEN@/0/ -/^REPLACE_FSEEK *=/s/@REPLACE_FSEEK@/0/ -/^REPLACE_FSEEKO *=/s/@REPLACE_FSEEKO@/0/ -/^REPLACE_FSTAT *=/s/@REPLACE_FSTAT@/0/ -/^REPLACE_FSTATAT *=/s/@REPLACE_FSTATAT@/0/ -/^REPLACE_FTELL *=/s/@REPLACE_FTELL@/0/ -/^REPLACE_FTELLO *=/s/@REPLACE_FTELLO@/0/ -/^REPLACE_FTRUNCATE *=/s/@REPLACE_FTRUNCATE@/0/ -/^REPLACE_GETCWD *=/s/@REPLACE_GETCWD@/0/ -/^REPLACE_GETDELIM *=/s/@REPLACE_GETDELIM@/0/ -/^REPLACE_GETDOMAINNAME *=/s/@REPLACE_GETDOMAINNAME@/0/ -/^REPLACE_GETGROUPS *=/s/@REPLACE_GETGROUPS@/0/ -/^REPLACE_GETLINE *=/s/@REPLACE_GETLINE@/0/ -/^REPLACE_GETLOGIN_R *=/s/@REPLACE_GETLOGIN_R@/0/ -/^REPLACE_GETPAGESIZE *=/s/@REPLACE_GETPAGESIZE@/0/ -/^REPLACE_GETTIMEOFDAY *=/s/@REPLACE_GETTIMEOFDAY@/0/ -/^REPLACE_ISATTY *=/s/@REPLACE_ISATTY@/0/ -/^REPLACE_LCHOWN *=/s/@REPLACE_LCHOWN@/0/ -/^REPLACE_LINK *=/s/@REPLACE_LINK@/0/ -/^REPLACE_LINKAT *=/s/@REPLACE_LINKAT@/0/ -/^REPLACE_LOCALTIME_R *=/s/@REPLACE_LOCALTIME_R@/0/ -/^REPLACE_LSEEK *=/s/@REPLACE_LSEEK@/0/ -/^REPLACE_LSTAT *=/s/@REPLACE_LSTAT@/0/ -/^REPLACE_MALLOC *=/s/@REPLACE_MALLOC@/0/ -/^REPLACE_MBTOWC *=/s/@REPLACE_MBTOWC@/0/ -/^REPLACE_MKDIR *=/s/@REPLACE_MKDIR@/0/ -/^REPLACE_MKFIFO *=/s/@REPLACE_MKFIFO@/0/ -/^REPLACE_MKNOD *=/s/@REPLACE_MKNOD@/0/ -/^REPLACE_MKSTEMP *=/s/@REPLACE_MKSTEMP@/0/ -/^REPLACE_MKTIME *=/s/@REPLACE_MKTIME@/0/ -/^REPLACE_NANOSLEEP *=/s/@REPLACE_NANOSLEEP@/0/ -/^REPLACE_NULL *=/s/@REPLACE_NULL@/0/ -/^REPLACE_OBSTACK_PRINTF *=/s/@REPLACE_OBSTACK_PRINTF@/0/ -/^REPLACE_PERROR *=/s/@REPLACE_PERROR@/0/ -/^REPLACE_POPEN *=/s/@REPLACE_POPEN@/0/ -/^REPLACE_PREAD *=/s/@REPLACE_PREAD@/0/ -/^REPLACE_PRINTF *=/s/@REPLACE_PRINTF@/0/ -/^REPLACE_PTHREAD_SIGMASK *=/s/@REPLACE_PTHREAD_SIGMASK@/0/ -/^REPLACE_PSELECT *=/s/@REPLACE_PSELECT@/0/ -/^REPLACE_PTSNAME_R *=/s/@REPLACE_PTSNAME_R@/0/ -/^REPLACE_PUTENV *=/s/@REPLACE_PUTENV@/0/ -/^REPLACE_PWRITE *=/s/@REPLACE_PWRITE@/0/ -/^REPLACE_RANDOM_R *=/s/@REPLACE_RANDOM_R@/0/ -/^REPLACE_READ *=/s/@REPLACE_READ@/0/ -/^REPLACE_RAISE *=/s/@REPLACE_RAISE@/0/ -/^REPLACE_READLINK *=/s/@REPLACE_READLINK@/0/ -/^REPLACE_REALLOC *=/s/@REPLACE_REALLOC@/0/ -/^REPLACE_REALPATH *=/s/@REPLACE_REALPATH@/0/ -/^REPLACE_REMOVE *=/s/@REPLACE_REMOVE@/0/ -/^REPLACE_RENAME *=/s/@REPLACE_RENAME@/0/ -/^REPLACE_RENAMEAT *=/s/@REPLACE_RENAMEAT@/0/ -/^REPLACE_RMDIR *=/s/@REPLACE_RMDIR@/0/ -/^REPLACE_SETENV *=/s/@REPLACE_SETENV@/0/ -/^REPLACE_SLEEP *=/s/@REPLACE_SLEEP@/0/ -/^REPLACE_SNPRINTF *=/s/@REPLACE_SNPRINTF@/0/ -/^REPLACE_SPRINTF *=/s/@REPLACE_SPRINTF@/0/ -/^REPLACE_STAT *=/s/@REPLACE_STAT@/0/ -/^REPLACE_STDIO_READ_FUNCS *=/s/@REPLACE_STDIO_READ_FUNCS@/0/ -/^REPLACE_STDIO_WRITE_FUNCS *=/s/@REPLACE_STDIO_WRITE_FUNCS@/0/ -/^REPLACE_STRTOD *=/s/@REPLACE_STRTOD@/0/ -/^REPLACE_STRTOIMAX *=/s/@REPLACE_STRTOIMAX@/0/ -/^REPLACE_STRUCT_TIMEVAL *=/s/@REPLACE_STRUCT_TIMEVAL@/0/ -/^REPLACE_SYMLINK *=/s/@REPLACE_SYMLINK@/0/ -/^REPLACE_TIMEGM *=/s/@REPLACE_TIMEGM@/0/ -/^REPLACE_TMPFILE *=/s/@REPLACE_TMPFILE@/0/ -/^REPLACE_TTYNAME_R *=/s/@REPLACE_TTYNAME_R@/0/ -/^REPLACE_UNLINK *=/s/@REPLACE_UNLINK@/0/ -/^REPLACE_UNLINKAT *=/s/@REPLACE_UNLINKAT@/0/ -/^REPLACE_UNSETENV *=/s/@REPLACE_UNSETENV@/0/ -/^REPLACE_USLEEP *=/s/@REPLACE_USLEEP@/0/ -/^REPLACE_UTIMENSAT *=/s/@REPLACE_UTIMENSAT@/0/ -/^REPLACE_VASPRINTF *=/s/@REPLACE_VASPRINTF@/0/ -/^REPLACE_VDPRINTF *=/s/@REPLACE_VDPRINTF@/0/ -/^REPLACE_VFPRINTF *=/s/@REPLACE_VFPRINTF@/0/ -/^REPLACE_VPRINTF *=/s/@REPLACE_VPRINTF@/0/ -/^REPLACE_VSNPRINTF *=/s/@REPLACE_VSNPRINTF@/0/ -/^REPLACE_VSPRINTF *=/s/@REPLACE_VSPRINTF@/0/ -/^REPLACE_WCTOMB *=/s/@REPLACE_WCTOMB@/0/ -/^REPLACE_WRITE *=/s/@REPLACE_WRITE@/0/ +# We never want any gnulib replacement functions +/^REPLACE_[^ =]* *= *@/s/@[^@\n]*@/0/ /^SIG_ATOMIC_T_SUFFIX *=/s/@SIG_ATOMIC_T_SUFFIX@// /^SIZE_T_SUFFIX *=/s/@SIZE_T_SUFFIX@/u/ /^ALLOCA_H *=/s/@[^@\n]*@/alloca.h/ +/^BYTESWAP_H *=/s/@[^@\n]*@/byteswap.h/ +/^DIRENT_H *=/s/@[^@\n]*@// +/^ERRNO_H *=/s/@[^@\n]*@// /^STDBOOL_H *=/s/@[^@\n]*@// /^STDALIGN_H *=/s/@[^@\n]*@/stdalign.h/ /^STDARG_H *=/s/@[^@\n]*@// @@ -593,21 +324,32 @@ am__cd = cd /^TIME_H_DEFINES_STRUCT_TIMESPEC *=/s/@[^@\n]*@/0/ /^UNISTD_H_HAVE_WINSOCK2_H *=/s/@[^@\n]*@/0/ /^UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS *=/s/@[^@\n]*@/0/ +/^UNDEFINE_STRTOK_R *=/s/@UNDEFINE_STRTOK_R@/0/ /^WCHAR_T_SUFFIX *=/s/@WCHAR_T_SUFFIX@/h/ /^WINT_T_SUFFIX *=/s/@WINT_T_SUFFIX@// /^WINDOWS_64_BIT_OFF_T *=/s/@WINDOWS_64_BIT_OFF_T@/0/ /^WINDOWS_64_BIT_ST_SIZE *=/s/@WINDOWS_64_BIT_ST_SIZE@/0/ -/am__append_1 *=.*gettext\.h/s/@[^@\n]*@/\#/ +# Tailor lists of files to what we need +/am__append_[1-9][0-9]* *=.*gettext\.h/s/@[^@\n]*@/\#/ /am__append_2 *=.*verify\.h/s/@[^@\n]*@// -/^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o strftime.o time_r.o getloadavg.o pthread_sigmask.o/ -/^BUILT_SOURCES *=/s/ *inttypes\.h// -/^BUILT_SOURCES *=/,/^[^ ]/{ +/^@gl_GNULIB_ENABLED_tempname_TRUE@/s/@[^@\n]*@// +/^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o memrchr.o sig2str.o time_r.o getloadavg.o pthread_sigmask.o mkostemp.o fpending.o fdatasync.o/ +/^am__append_[1-9][0-9]* *=/,/^[^ ]/{ + s/ *inttypes\.h// s| *sys/select\.h|| s| *sys/time\.h|| } /^am_libgnu_a_OBJECTS *=/,/^[^ ]/{ s/allocator\.\$(OBJEXT) // + s/binary-io\.\$(OBJEXT) // s/careadlinkat\.\$(OBJEXT) // + s/pipe2\.\$(OBJEXT) // + s/acl-errno-valid\.\$(OBJEXT) // + s/file-has-acl\.\$(OBJEXT) // + s/qcopy-acl\.\$(OBJEXT) // + s/qset-acl\.\$(OBJEXT) // + s/openat-die\.\$(OBJEXT) // + s/save-cwd\.\$(OBJEXT) // } /^srcdir *=/s/@[^@\n]*@/./ /^top_srcdir *=/s/@[^@\n]*@/../ @@ -618,7 +360,7 @@ s/@PRAGMA_COLUMNS@// # Delete the recipes we don't want to get in our way. /^\$(srcdir)\/Makefile\.in:/,/^[ ][ ]*\$(AUTOMAKE)/d /^Makefile:/,/^[ ][ ]*esac/d -/^\$(top_srcdir)\/configure:/,/^\$(ACLOCAL_M4)/d +/^\$(top_srcdir)\/configure:/,/^\$(am__aclocal_m4_deps):/d /^\$(top_builddir)\/config.status:/,/^$/d # # Remove the dependencies on $(top_builddir)/config.status @@ -635,16 +377,24 @@ s/^@am__fastdepCC_FALSE@/\#/ # Fix the *-clean rules, to not use a Unixy `test' command. Empty # lists are replaced with a dummy file, to avoid an error message from # "rm -f" with no arguments. +/^CLEANFILES *= *$/c\ +CLEANFILES = xyzzy /^CONFIG_CLEAN_FILES *= *$/c\ CONFIG_CLEAN_FILES = xyzzy /^CONFIG_CLEAN_VPATH_FILES *= *$/c\ CONFIG_CLEAN_VPATH_FILES = xyzzy s/^ -*test -z.*|| rm/ -rm/ -s/@echo /@djecho/ +s/@echo /@djecho / # # Fix the recipes for header files s/^@GL_GENERATE_ALLOCA_H_TRUE@// s/^@GL_GENERATE_ALLOCA_H_FALSE@/\#/ +s/^@GL_GENERATE_BYTESWAP_H_TRUE@// +s/^@GL_GENERATE_BYTESWAP_H_FALSE@/\#/ +s/^@GL_GENERATE_ERRNO_H_TRUE@/\#/ +s/^@GL_GENERATE_ERRNO_H_FALSE@// +s/^@GL_GENERATE_EXECINFO_H_TRUE@// +s/^@GL_GENERATE_EXECINFO_H_FALSE@/\#/ s/^@GL_GENERATE_STDBOOL_H_TRUE@/\#/ s/^@GL_GENERATE_STDBOOL_H_FALSE@// s/^@GL_GENERATE_STDALIGN_H_TRUE@// @@ -681,7 +431,16 @@ s/\.in-h\; *\\$/.in-h >> $@-t/ /^unistd\.h:/,/^ [ ]*mv /{ s/'\; \\ *$/' >> $@-t/ } +/^string\.h:/,/^ [ ]*mv /{ + s/'\; \\ *$/' >> $@-t/ + /< \$(srcdir)\/string\.in-h >>/d +} s!\$(MKDIR_P)[ ][ ]*sys!command.com /c "if not exist sys\\stat.h md sys"! /^ @for dir in/,/^[^ ]/c\ -rm -rf $(MOSTLYCLEANDIRS) /^ *-test . /d +# +# Fix the Automake verbosity stuff +/^ *\$(AM_V_at)/s/\$(AM_V_at)// +/^ *\$(AM_V_AR)/s/\$(AM_V_AR)// +/^ *\$(AM_V_CC)/s/\$(AM_V_CC)//