[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108399: Fix the MSDOS build after gnulib update.

[Eli Zaretskii]

------------------------------------------------------------
revno: 108399 [merge]
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sun 2012-05-27 16:44:06 +0300
message:
  Fix the MSDOS build after gnulib update.
  
   config.bat (lib): Create/update lib/stdalign.in-h and
   lib/sys_types.in-h.
   msdos/sedlibmk.inp (GNULIB_GL_UNISTD_H_GETOPT, GNULIB_POSIX_OPENPT)
   (GNULIB_ISATTY, GNULIB_PTSNAME_R, GNULIB_RANDOM)
   (GNULIB_SETHOSTNAME, HAVE_POSIX_OPENPT, HAVE_PTSNAME_R)
   (HAVE_RANDOM, HAVE_SETHOSTNAME, NEXT_SYS_TYPES_H)
   (NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H, REPLACE_FTRUNCATE)
   (REPLACE_ISATTY, REPLACE_PTSNAME_R, REPLACE_RANDOM_R)
   (REPLACE_STRTOIMAX, STDALIGN_H, WINDOWS_64_BIT_OFF_T)
   (WINDOWS_64_BIT_ST_SIZE, GL_GENERATE_STDALIGN_H_TRUE)
   (GL_GENERATE_STDALIGN_H_FALSE): Edit as appropriate for DJGPP.
   (cat FOO): Edit into "sed -e '' FOO >>".
modified:
  ChangeLog
  config.bat
  msdos/ChangeLog
  msdos/sedlibmk.inp

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-27 12:11:23 +0000
+++ b/ChangeLog 2012-05-27 13:42:13 +0000
@@ -1,5 +1,8 @@
 2012-05-27  Eli Zaretskii  <address@hidden>
 
+       * config.bat (lib): Create/update lib/stdalign.in-h and
+       lib/sys_types.in-h.
+
        * lib/makefile.w32-in ($(BLD)/md5.$(O)): 
        ($(BLD)/sha1.$(O)): 
        ($(BLD)/sha256.$(O)): 

=== modified file 'config.bat'
--- a/config.bat        2012-01-19 07:21:25 +0000
+++ b/config.bat        2012-05-27 13:42:13 +0000
@@ -283,11 +283,13 @@
 If Exist getopt.in.h update getopt.in.h getopt.in-h
 If Exist stdbool.in.h update stdbool.in.h stdbool.in-h
 If Exist signal.in.h update signal.in.h signal.in-h
+If Exist stdalign.in.h update stdalign.in.h  stdalign.in-h
 If Exist stddef.in.h update stddef.in.h  stddef.in-h
 If Exist stdint.in.h update stdint.in.h  stdint.in-h
 If Exist stdio.in.h update stdio.in.h stdio.in-h
 If Exist stdlib.in.h update stdlib.in.h stdlib.in-h
 If Exist sys_stat.in.h update sys_stat.in.h sys_stat.in-h
+If Exist sys_types.in.h update sys_types.in.h sys_types.in-h
 If Exist time.in.h update time.in.h time.in-h
 If Exist unistd.in.h update unistd.in.h unistd.in-h
 If Exist Makefile.in sed -f ../msdos/sedlibcf.inp < Makefile.in > makefile.tmp

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2012-05-25 10:21:30 +0000
+++ b/msdos/ChangeLog   2012-05-27 13:42:13 +0000
@@ -1,3 +1,16 @@
+2012-05-27  Eli Zaretskii  <address@hidden>
+
+       * sedlibmk.inp (GNULIB_GL_UNISTD_H_GETOPT, GNULIB_POSIX_OPENPT)
+       (GNULIB_ISATTY, GNULIB_PTSNAME_R, GNULIB_RANDOM)
+       (GNULIB_SETHOSTNAME, HAVE_POSIX_OPENPT, HAVE_PTSNAME_R)
+       (HAVE_RANDOM, HAVE_SETHOSTNAME, NEXT_SYS_TYPES_H)
+       (NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H, REPLACE_FTRUNCATE)
+       (REPLACE_ISATTY, REPLACE_PTSNAME_R, REPLACE_RANDOM_R)
+       (REPLACE_STRTOIMAX, STDALIGN_H, WINDOWS_64_BIT_OFF_T)
+       (WINDOWS_64_BIT_ST_SIZE, GL_GENERATE_STDALIGN_H_TRUE)
+       (GL_GENERATE_STDALIGN_H_FALSE): Edit as appropriate for DJGPP.
+       (cat FOO): Edit into "sed -e '' FOO >>".
+
 2012-05-25  Eli Zaretskii  <address@hidden>
 
        * sed6.inp (INFO_EXT): Edit to .info.

=== modified file 'msdos/sedlibmk.inp'
--- a/msdos/sedlibmk.inp        2012-04-14 05:04:54 +0000
+++ b/msdos/sedlibmk.inp        2012-05-27 13:42:13 +0000
@@ -93,6 +93,13 @@
 #       s/'\; \\ *$/' >> address@hidden/
 #     }
 #
+#  . If the recipe for generating a header file uses 'cat', replace it with
+#
+#      sed -e ''
+#
+#    (if needed; there's already an edit command that should take care of
+#     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
@@ -202,11 +209,12 @@
 /^GNULIB_GETLOGIN *=/s/@GNULIB_GETLOGIN@/0/
 /^GNULIB_GETLOGIN_R *=/s/@GNULIB_GETLOGIN_R@/0/
 /^GNULIB_GETPAGESIZE *=/s/@GNULIB_GETPAGESIZE@/0/
-/^GNULIB_GETS *=/s/@GNULIB_GETS@/0/
+/^GNULIB_GL_UNISTD_H_GETOPT *=/s/@GNULIB_GL_UNISTD_H_GETOPT@/1/
 /^GNULIB_GETSUBOPT *=/s/@GNULIB_GETSUBOPT@/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/
@@ -234,17 +242,20 @@
 /^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_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/
@@ -258,6 +269,7 @@
 /^GNULIB_RPMATCH *=/s/@GNULIB_RPMATCH@/0/
 /^GNULIB_SCANF *=/s/@GNULIB_SCANF@/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/
@@ -278,7 +290,6 @@
 /^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_GETOPT *=/s/@GNULIB_UNISTD_H_GETOPT@/1/
 /^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/
@@ -320,6 +331,7 @@
 /^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/
@@ -374,12 +386,15 @@
 /^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/
@@ -387,6 +402,7 @@
 /^HAVE_RENAMEAT *=/s/@HAVE_RENAMEAT@/0/
 /^HAVE_RPMATCH *=/s/@HAVE_RPMATCH@/0/
 /^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/
@@ -442,6 +458,7 @@
 /^NEXT_AS_FIRST_DIRECTIVE_STDIO_H *=/s/@address@hidden@/<stdio.h>/
 /^NEXT_AS_FIRST_DIRECTIVE_STDLIB_H *=/s/@address@hidden@/<stdlib.h>/
 /^NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H 
*=/address@hidden@address@hidden<sys/stat.h>!
+/^NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H 
*=/address@hidden@address@hidden<sys/types.h>!
 /^NEXT_AS_FIRST_DIRECTIVE_TIME_H *=/s/@address@hidden@/<time.h>/
 /^NEXT_AS_FIRST_DIRECTIVE_UNISTD_H *=/s/@address@hidden@/<unistd.h>/
 /^NEXT_GETOPT_H *=/s/@address@hidden@/<getopt.h>/
@@ -452,6 +469,7 @@
 /^NEXT_STDINT_H *=/s/@address@hidden@/<stdint.h>/
 /^NEXT_STDLIB_H *=/s/@address@hidden@/<stdlib.h>/
 /^NEXT_SYS_STAT_H *=/address@hidden@address@hidden<sys/stat.h>!
+/^NEXT_SYS_TYPES_H *=/address@hidden@address@hidden<sys/types.h>!
 /^NEXT_TIME_H *=/s/@address@hidden@/<time.h>/
 /^NEXT_UNISTD_H *=/s/@address@hidden@/<unistd.h>/
 /^OBJEXT *=/s/@address@hidden@/o/
@@ -481,6 +499,7 @@
 /^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/
@@ -488,6 +507,7 @@
 /^REPLACE_GETLINE *=/s/@REPLACE_GETLINE@/0/
 /^REPLACE_GETLOGIN_R *=/s/@REPLACE_GETLOGIN_R@/0/
 /^REPLACE_GETPAGESIZE *=/s/@REPLACE_GETPAGESIZE@/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/
@@ -509,8 +529,10 @@
 /^REPLACE_PREAD *=/s/@REPLACE_PREAD@/0/
 /^REPLACE_PRINTF *=/s/@REPLACE_PRINTF@/0/
 /^REPLACE_PTHREAD_SIGMASK *=/s/@REPLACE_PTHREAD_SIGMASK@/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/
@@ -528,6 +550,7 @@
 /^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_SYMLINK *=/s/@REPLACE_SYMLINK@/0/
 /^REPLACE_TIMEGM *=/s/@REPLACE_TIMEGM@/0/
 /^REPLACE_TMPFILE *=/s/@REPLACE_TMPFILE@/0/
@@ -549,6 +572,7 @@
 /^SIZE_T_SUFFIX *=/s/@SIZE_T_SUFFIX@/u/
 /^ALLOCA_H *=/s/@address@hidden@/alloca.h/
 /^STDBOOL_H *=/s/@address@hidden@//
+/^STDALIGN_H *=/s/@address@hidden@/stdalign.h/
 /^STDARG_H *=/s/@address@hidden@//
 /^STDDEF_H *=/s/@address@hidden@//
 /^STDINT_H *=/s/@address@hidden@/stdint.h/
@@ -558,6 +582,8 @@
 /^UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS *=/s/@address@hidden@/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/@address@hidden@/\#/
 /am__append_2 *=.*verify\.h/s/@address@hidden@//
 /^gl_LIBOBJS *=/s/@address@hidden@/getopt.o getopt1.o strftime.o time_r.o 
getloadavg.o pthread_sigmask.o/
@@ -608,6 +634,8 @@
 s/address@hidden@/\#/
 s/address@hidden@//
 s/address@hidden@/\#/
+s/address@hidden@//
+s/address@hidden@/\#/
 /^arg-nonnull\.h:/,/^[         ][      ]*mv /c\
 arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h\
        sed -n -e '/GL_ARG_NONNULL/,$$p' < 
$(top_srcdir)/build-aux/snippet/arg-nonnull.h > $@
@@ -619,6 +647,7 @@
        sed -n -e '/^.ifndef/,$$p' < 
$(top_srcdir)/build-aux/snippet/warn-on-use.h > $@
 s/^    [       ]*{ echo \(.*\); \\/     djecho \1 > address@hidden/
 s/^    [       ]*{ echo \(.*\) && \\/   djecho \1 > address@hidden/
+s/^    [       ]*cat \(.*\); \\/        sed -e '' \1 >> address@hidden/
 s/ \&\& \\ *$//
 s/\.in-h\;  *\\$/.in-h >> address@hidden/
 /^     [       ]*} /d