[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103429: Adapt the MS-DOS build to gn
|
From: |
Eli Zaretskii |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103429: Adapt the MS-DOS build to gnulib import of md5 and filemode. |
|
Date: |
Sat, 26 Feb 2011 15:48:14 +0200 |
|
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103429 [merge]
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2011-02-26 15:48:14 +0200
message:
Adapt the MS-DOS build to gnulib import of md5 and filemode.
msdos/sedlibmk.inp (BITSIZEOF_PTRDIFF_T, BITSIZEOF_SIG_ATOMIC_T)
(BITSIZEOF_SIZE_T, BITSIZEOF_WCHAR_T)
(BITSIZEOF_WINT_TGNULIB_FCHMODAT, GNULIB_FSTATAT, GNULIB_FUTIMENS)
(GNULIB_LCHMOD, GNULIB_LSTAT, GNULIB_MBTOWC, GNULIB_MKDIRAT)
(GNULIB_MKFIFO, GNULIB_MKFIFOAT, GNULIB_MKNOD, GNULIB_MKNODAT)
(GNULIB_STAT, GNULIB_UTIMENSAT, GNULIB_WCTOMB, HAVE_FCHMODAT)
(HAVE_FSTATAT, HAVE_FUTIMENS, HAVE_INTTYPES_H, HAVE_LCHMOD)
(HAVE_LONG_LONG_INT, HAVE_LSTAT, HAVE_MKDIRAT, HAVE_MKFIFO)
(HAVE_MKFIFOAT, HAVE_MKNOD, HAVE_MKNODAT)
(HAVE_SIGNED_SIG_ATOMIC_T, HAVE_SIGNED_WCHAR_T)
(HAVE_SIGNED_WINT_T, HAVE_STDINT_H, HAVE_SYS_BITYPES_H)
(HAVE_SYS_INTTYPES_H, HAVE_SYS_TYPES_H)
(HAVE_UNSIGNED_LONG_LONG_INT, HAVE_UTIMENSAT, HAVE_WCHAR_H)
(MKDIR_P, NEXT_AS_FIRST_DIRECTIVE_STDINT_H)
(NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H, NEXT_STDINT_H)
(NEXT_SYS_STAT_H, REPLACE_LSTAT, REPLACE_MBTOWC, REPLACE_MKDIR)
(REPLACE_MKFIFO, REPLACE_MKNOD, REPLACE_STAT, REPLACE_UTIMENSAT)
(REPLACE_WCTOMB, SIG_ATOMIC_T_SUFFIX, SIZE_T_SUFFIX, STDINT_H)
(WCHAR_T_SUFFIX, WINT_T_SUFFIX, APPLE_UNIVERSAL_BUILD): New edits.
($(MKDIR_P)): Replace with equivalent DOS command.
(gl_LIBOBJS): Add md5.o and filemode.o.
msdos/sed2v2.inp (BITSIZEOF_PTRDIFF_T, BITSIZEOF_SIG_ATOMIC_T)
(BITSIZEOF_SIZE_T, BITSIZEOF_WCHAR_T, BITSIZEOF_WINT_T)
(HAVE_LONG_LONG_INT, HAVE_SIGNED_SIG_ATOMIC_T, HAVE_SIGNED_WINT_T)
(HAVE_UNSIGNED_LONG_LONG_INT, HAVE_WCHAR_H, HAVE_INTTYPES_H): New
edits.
msdos/depfiles.bat: Create a dummy .Po file only if a file by the same
name does not already exist in the deps/ subdirectory.
.bzrignore: Ignore new lib/*.in-h files.
config.bat: Rename stdint.in.h and sys_stat.in.h. Call
depfiles.bat even if lib/deps already exist.
src/s/msdos.h (HAVE_LSTAT): Define for DJGPP >= 2.04.
(lstat): Define for DJGPP < 2.04.
modified:
.bzrignore
ChangeLog
config.bat
msdos/ChangeLog
msdos/depfiles.bat
msdos/sed2v2.inp
msdos/sedlibmk.inp
src/ChangeLog
src/s/msdos.h
=== modified file '.bzrignore'
--- a/.bzrignore 2011-02-20 10:51:50 +0000
+++ b/.bzrignore 2011-02-26 09:35:07 +0000
@@ -49,7 +49,9 @@
lib/getopt.in-h
lib/stdbool.in-h
lib/stddef.in-h
+lib/stdint.in-h
lib/stdlib.in-h
+lib/sys_stat.in-h
lib/time.in-h
lib/unistd.in-h
lib/cxxdefs.h
=== modified file 'ChangeLog'
--- a/ChangeLog 2011-02-25 10:03:28 +0000
+++ b/ChangeLog 2011-02-26 09:35:07 +0000
@@ -1,3 +1,10 @@
+2011-02-26 Eli Zaretskii <address@hidden>
+
+ * .bzrignore: Ignore new lib/*.in-h files.
+
+ * config.bat: Rename stdint.in.h and sys_stat.in.h. Call
+ depfiles.bat even if lib/deps already exist.
+
2011-02-25 Paul Eggert <address@hidden>
* configure, lib/Makefile.in, lib/getopt_int.h, lib/gnulib.mk:
=== modified file 'config.bat'
--- a/config.bat 2011-02-19 16:53:10 +0000
+++ b/config.bat 2011-02-26 09:27:05 +0000
@@ -280,17 +280,20 @@
Rem Rename files like djtar on plain DOS filesystem would.
If Exist c++defs.h update c++defs.h cxxdefs.h
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 stddef.in.h update stddef.in.h stddef.in-h
-If Exist stdbool.in.h update stdbool.in.h stdbool.in-h
+If Exist stdint.in.h update stdint.in.h stdint.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 time.in.h update time.in.h time.in-h
If Exist unistd.in.h update unistd.in.h unistd.in-h
sed -f ../msdos/sedlibcf.inp < Makefile.in > makefile.tmp
sed -f ../msdos/sedlibmk.inp < makefile.tmp > Makefile
rm -f makefile.tmp
+Rem Create .Po files for new files in lib/
If Not Exist deps\stamp mkdir deps
-If Not Exist deps\stamp for %%f in (*.c) do @call ..\msdos\depfiles.bat %%f
-If Not Exist deps\stamp echo deps-stamp > deps\stamp
+for %%f in (*.c) do @call ..\msdos\depfiles.bat %%f
+echo deps-stamp > deps\stamp
cd ..
rem ----------------------------------------------------------------------
Echo Configuring the lisp directory...
=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog 2011-02-19 19:56:29 +0000
+++ b/msdos/ChangeLog 2011-02-26 13:38:25 +0000
@@ -1,3 +1,36 @@
+2011-02-26 Eli Zaretskii <address@hidden>
+
+ * sedlibmk.inp (BITSIZEOF_PTRDIFF_T, BITSIZEOF_SIG_ATOMIC_T)
+ (BITSIZEOF_SIZE_T, BITSIZEOF_WCHAR_T)
+ (BITSIZEOF_WINT_TGNULIB_FCHMODAT, GNULIB_FSTATAT, GNULIB_FUTIMENS)
+ (GNULIB_LCHMOD, GNULIB_LSTAT, GNULIB_MBTOWC, GNULIB_MKDIRAT)
+ (GNULIB_MKFIFO, GNULIB_MKFIFOAT, GNULIB_MKNOD, GNULIB_MKNODAT)
+ (GNULIB_STAT, GNULIB_UTIMENSAT, GNULIB_WCTOMB, HAVE_FCHMODAT)
+ (HAVE_FSTATAT, HAVE_FUTIMENS, HAVE_INTTYPES_H, HAVE_LCHMOD)
+ (HAVE_LONG_LONG_INT, HAVE_LSTAT, HAVE_MKDIRAT, HAVE_MKFIFO)
+ (HAVE_MKFIFOAT, HAVE_MKNOD, HAVE_MKNODAT)
+ (HAVE_SIGNED_SIG_ATOMIC_T, HAVE_SIGNED_WCHAR_T)
+ (HAVE_SIGNED_WINT_T, HAVE_STDINT_H, HAVE_SYS_BITYPES_H)
+ (HAVE_SYS_INTTYPES_H, HAVE_SYS_TYPES_H)
+ (HAVE_UNSIGNED_LONG_LONG_INT, HAVE_UTIMENSAT, HAVE_WCHAR_H)
+ (MKDIR_P, NEXT_AS_FIRST_DIRECTIVE_STDINT_H)
+ (NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H, NEXT_STDINT_H)
+ (NEXT_SYS_STAT_H, REPLACE_LSTAT, REPLACE_MBTOWC, REPLACE_MKDIR)
+ (REPLACE_MKFIFO, REPLACE_MKNOD, REPLACE_STAT, REPLACE_UTIMENSAT)
+ (REPLACE_WCTOMB, SIG_ATOMIC_T_SUFFIX, SIZE_T_SUFFIX, STDINT_H)
+ (WCHAR_T_SUFFIX, WINT_T_SUFFIX, APPLE_UNIVERSAL_BUILD): New edits.
+ ($(MKDIR_P)): Replace with equivalent DOS command.
+ (gl_LIBOBJS): Add md5.o and filemode.o.
+
+ * sed2v2.inp (BITSIZEOF_PTRDIFF_T, BITSIZEOF_SIG_ATOMIC_T)
+ (BITSIZEOF_SIZE_T, BITSIZEOF_WCHAR_T, BITSIZEOF_WINT_T)
+ (HAVE_LONG_LONG_INT, HAVE_SIGNED_SIG_ATOMIC_T, HAVE_SIGNED_WINT_T)
+ (HAVE_UNSIGNED_LONG_LONG_INT, HAVE_WCHAR_H, HAVE_INTTYPES_H): New
+ edits.
+
+ * depfiles.bat: Create a dummy .Po file only if a file by the same
+ name does not already exist in the deps/ subdirectory.
+
2011-02-19 Eli Zaretskii <address@hidden>
* depfiles.bat: New file.
=== modified file 'msdos/depfiles.bat'
--- a/msdos/depfiles.bat 2011-02-19 16:53:10 +0000
+++ b/msdos/depfiles.bat 2011-02-26 09:27:05 +0000
@@ -20,6 +20,6 @@
rem ----------------------------------------------------------------------
-echo %1 | sed -e "s,^,@echo # dummy > deps\\," -e "s,\.c,.Po," > tdepfile.bat
+echo %1 | sed -e "s,\(.*\)\.c,@if not exist deps\\\1.Po echo # dummy >
deps\\\1.Po," > tdepfile.bat
call tdepfile
del tdepfile.bat
=== modified file 'msdos/sed2v2.inp'
--- a/msdos/sed2v2.inp 2011-02-19 19:41:00 +0000
+++ b/msdos/sed2v2.inp 2011-02-26 12:55:10 +0000
@@ -62,7 +62,18 @@
/^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/
/^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/
/^#undef HAVE_DIRENT_H/s/^.*$/#define HAVE_DIRENT_H 1/
+
+/^#undef BITSIZEOF_PTRDIFF_T *$/s/^.*$/#define BITSIZEOF_PTRDIFF_T 32/
+/^#undef BITSIZEOF_SIG_ATOMIC_T *$/s/^.*$/#define BITSIZEOF_SIG_ATOMIC_T 32/
+/^#undef BITSIZEOF_SIZE_T *$/s/^.*$/#define BITSIZEOF_SIZE_T 32/
+/^#undef BITSIZEOF_WCHAR_T *$/s/^.*$/#define BITSIZEOF_WCHAR_T 16/
+/^#undef BITSIZEOF_WINT_T *$/s/^.*$/#define BITSIZEOF_WINT_T 32/
/^#undef HAVE__BOOL/s/^.*$/#define HAVE__BOOL 1/
+/^#undef HAVE_LONG_LONG_INT *$/s/^.*$/#define HAVE_LONG_LONG_INT 1/
+/^#undef HAVE_SIGNED_SIG_ATOMIC_T *$/s/^.*$/#define HAVE_SIGNED_SIG_ATOMIC_T 1/
+/^#undef HAVE_SIGNED_WINT_T *$/s/^.*$/#define HAVE_SIGNED_WINT_T 1/
+/^#undef HAVE_UNSIGNED_LONG_LONG_INT *$/s/^.*$/#define
HAVE_UNSIGNED_LONG_LONG_INT 1/
+/^#under HAVE_WCHAR_H *$/s/^.*$/#define HAVE_WCHAR_H 1/
/^#undef inline/s/^.*$/#define inline __inline__/
/^#undef my_strftime/s/^.*$/#define my_strftime nstrftime/
/^#undef restrict/s/^.*$/#define restrict __restrict/
@@ -77,6 +88,12 @@
s!^#undef config_machfile *$!#define config_machfile "m/intel386.h"!
s/^#undef PROTOTYPES *$/#define PROTOTYPES 1/
s/^#undef POINTER_TYPE *$/#define POINTER_TYPE void/
+/^#undef HAVE_INTTYPES_H/c\
+#if __DJGPP__ > 2 || __DJGPP_MINOR__ > 3\
+#define HAVE_INTTYPES_H 1\
+#else\
+#undef HAVE_INTTYPES_H\
+#endif
/^#undef HAVE_STDINT_H/c\
#if __DJGPP__ > 2 || __DJGPP_MINOR__ > 3\
#define HAVE_STDINT_H 1\
=== modified file 'msdos/sedlibmk.inp'
--- a/msdos/sedlibmk.inp 2011-02-19 19:41:00 +0000
+++ b/msdos/sedlibmk.inp 2011-02-26 13:38:25 +0000
@@ -47,6 +47,14 @@
/^EXEEXT *=/s/@address@hidden@/.exe/
/^GETOPT_H *=/s/@address@hidden@/getopt.h/
#
+# Gnulib stuff
+/^BITSIZEOF_PTRDIFF_T *=/s/@BITSIZEOF_PTRDIFF_T@/32/
+/^BITSIZEOF_SIG_ATOMIC_T *=/s/@BITSIZEOF_SIG_ATOMIC_T@/32/
+/^BITSIZEOF_SIZE_T *=/s/@BITSIZEOF_SIZE_T@/32/
+/^BITSIZEOF_WCHAR_T *=/s/@BITSIZEOF_WCHAR_T@/16/
+/^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
# these features. That's because the gnulib replacements cannot
# possibly work for DJGPP, so we prefer to fail the link than have a
@@ -63,8 +71,11 @@
/^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_FSTATAT *=/s/@GNULIB_FSTATAT@/0/
/^GNULIB_FSYNC *=/s/@GNULIB_FSYNC@/0/
/^GNULIB_FTRUNCATE *=/s/@GNULIB_FTRUNCATE@/0/
+/^GNULIB_FUTIMENS *=/s/@GNULIB_FUTIMENS@/0/
/^GNULIB_GETCWD *=/s/@GNULIB_GETCWD@/0/
/^GNULIB_GETDOMAINNAME *=/s/@GNULIB_GETDOMAINNAME@/0/
/^GNULIB_GETDTABLESIZE *=/s/@GNULIB_GETDTABLESIZE@/0/
@@ -77,12 +88,20 @@
/^GNULIB_GETSUBOPT *=/s/@GNULIB_GETSUBOPT@/0/
/^GNULIB_GETUSERSHELL *=/s/@GNULIB_GETUSERSHELL@/0/
/^GNULIB_GRANTPT *=/s/@GNULIB_GRANTPT@/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/
@@ -104,6 +123,7 @@
/^GNULIB_RPMATCH *=/s/@GNULIB_RPMATCH@/0/
/^GNULIB_SETENV *=/s/@GNULIB_SETENV@/0/
/^GNULIB_SLEEP *=/s/@GNULIB_SLEEP@/0/
+/^GNULIB_STAT *=/s/@GNULIB_STAT@/0/
/^GNULIB_STRPTIME *=/s/@GNULIB_STRPTIME@/0/
/^GNULIB_STRTOD *=/s/@GNULIB_STRTOD@/0/
/^GNULIB_STRTOLL *=/s/@GNULIB_STRTOLL@/0/
@@ -121,6 +141,8 @@
/^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_WCTOMB *=/s/@GNULIB_WCTOMB@/0/
/^GNULIB_WRITE *=/s/@GNULIB_WRITE@/0/
/^GNULIB__EXIT *=/s/@GNULIB__EXIT@/0/
/^HAVE_ATOLL *=/s/@HAVE_ATOLL@/0/
@@ -142,9 +164,12 @@
/^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_FSTATAT *=/s/@HAVE_FSTATAT@/0/
/^HAVE_FSYNC *=/s/@HAVE_FSYNC@/1/
/^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/
@@ -154,10 +179,19 @@
/^HAVE_GETSUBOPT *=/s/@HAVE_GETSUBOPT@/0/
/^HAVE_GRANTPT *=/s/@HAVE_GRANTPT@/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_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/
@@ -176,7 +210,11 @@
/^HAVE_REALPATH *=/s/@HAVE_REALPATH@/0/
/^HAVE_RPMATCH *=/s/@HAVE_RPMATCH@/0/
/^HAVE_SETENV *=/s/@HAVE_SETENV@/1/
+/^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_SLEEP *=/s/@HAVE_SLEEP@/1/
+/^HAVE_STDINT_H *=/s/@HAVE_STDINT_H@/HAVE_STDINT_H/
/^HAVE_STRPTIME *=/s/@HAVE_STRPTIME@/0/
/^HAVE_STRTOD *=/s/@HAVE_STRTOD@/1/
/^HAVE_STRTOLL *=/s/@HAVE_STRTOLL@/1/
@@ -184,13 +222,19 @@
/^HAVE_STRUCT_RANDOM_DATA *=/s/@HAVE_STRUCT_RANDOM_DATA@/0/
/^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_TYPES_H *=/s/@HAVE_SYS_TYPES_H@/1/
/^HAVE_TIMEGM *=/s/@HAVE_TIMEGM@/0/
/^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_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/
@@ -201,14 +245,20 @@
/^LD_FIRSTFLAG *=/s/@address@hidden@//
/^LIBS *=/s/@address@hidden@//
/^MAKEINFO *=/s/@MAKEINFO@/makeinfo/
+# MKDIR_P lines are edited further below
+/^MKDIR_P *=/s/@MKDIR_P@//
/^NEXT_AS_FIRST_DIRECTIVE_GETOPT_H *=/s/@address@hidden@/<getopt.h>/
/^NEXT_AS_FIRST_DIRECTIVE_STDDEF_H *=/s/@address@hidden@//
+/^NEXT_AS_FIRST_DIRECTIVE_STDINT_H *=/s/@address@hidden@/<stdint.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_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>/
/^NEXT_STDDEF_H *=/s/@address@hidden@//
+/^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_TIME_H *=/s/@address@hidden@/<time.h>/
/^NEXT_UNISTD_H *=/s/@address@hidden@/<unistd.h>/
/^OBJEXT *=/s/@address@hidden@/o/
@@ -223,6 +273,7 @@
/^REPLACE_DUP *=/s/@REPLACE_DUP@/0/
/^REPLACE_DUP2 *=/s/@REPLACE_DUP2@/0/
/^REPLACE_FCHOWNAT *=/s/@REPLACE_FCHOWNAT@/0/
+/^REPLACE_FSTAT *=/s/@REPLACE_FSTAT@/0/
/^REPLACE_GETCWD *=/s/@REPLACE_GETCWD@/0/
/^REPLACE_GETDOMAINNAME *=/s/@REPLACE_GETDOMAINNAME@/0/
/^REPLACE_GETGROUPS *=/s/@REPLACE_GETGROUPS@/0/
@@ -233,7 +284,12 @@
/^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/
@@ -247,6 +303,7 @@
/^REPLACE_RMDIR *=/s/@REPLACE_RMDIR@/0/
/^REPLACE_SETENV *=/s/@REPLACE_SETENV@/0/
/^REPLACE_SLEEP *=/s/@REPLACE_SLEEP@/0/
+/^REPLACE_STAT *=/s/@REPLACE_STAT@/0/
/^REPLACE_STRTOD *=/s/@REPLACE_STRTOD@/0/
/^REPLACE_SYMLINK *=/s/@REPLACE_SYMLINK@/0/
/^REPLACE_TIMEGM *=/s/@REPLACE_TIMEGM@/0/
@@ -255,14 +312,21 @@
/^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_WCTOMB *=/s/@REPLACE_WCTOMB@/0/
/^REPLACE_WRITE *=/s/@REPLACE_WRITE@/0/
+/^SIG_ATOMIC_T_SUFFIX *=/s/@SIG_ATOMIC_T_SUFFIX@//
+/^SIZE_T_SUFFIX *=/s/@SIZE_T_SUFFIX@/u/
/^STDBOOL_H *=/s/@address@hidden@//
/^STDDEF_H *=/s/@address@hidden@//
+/^STDINT_H *=/s/@address@hidden@/stdint.h/
/^SYS_TIME_H_DEFINES_STRUCT_TIMESPEC *=/s/@address@hidden@/0/
/^TIME_H_DEFINES_STRUCT_TIMESPEC *=/s/@address@hidden@/0/
/^UNISTD_H_HAVE_WINSOCK2_H *=/s/@address@hidden@/0/
/^UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS *=/s/@address@hidden@/0/
-/^gl_LIBOBJS *=/s/@address@hidden@/getopt.o getopt1.o strftime.o time_r.o
getloadavg.o/
+/^WCHAR_T_SUFFIX *=/s/@WCHAR_T_SUFFIX@/h/
+/^WINT_T_SUFFIX *=/s/@WINT_T_SUFFIX@//
+/^gl_LIBOBJS *=/s/@address@hidden@/getopt.o getopt1.o strftime.o time_r.o
getloadavg.o md5.o filemode.o/
/^srcdir *=/s/@address@hidden@/./
/^top_srcdir *=/s/@address@hidden@/../
/^top_builddir *=/s/@address@hidden@/../
@@ -310,3 +374,4 @@
/^unistd\.h:/,/^ [ ]*mv /{
s/'\; \\ *$/' >> address@hidden/
}
+s!\$(MKDIR_P)[ ][ ]*sys!command.com /c "if not exist sys\stat.h
md sys"!
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-02-25 06:30:50 +0000
+++ b/src/ChangeLog 2011-02-26 12:55:10 +0000
@@ -1,3 +1,8 @@
+2011-02-26 Eli Zaretskii <address@hidden>
+
+ * s/msdos.h (HAVE_LSTAT): Define for DJGPP >= 2.04.
+ (lstat): Define for DJGPP < 2.04.
+
2011-02-25 Paul Eggert <address@hidden>
* dired.c (Ffile_attributes): Increase size of modes from 10 to 12
=== modified file 'src/s/msdos.h'
--- a/src/s/msdos.h 2011-02-19 15:57:35 +0000
+++ b/src/s/msdos.h 2011-02-26 12:55:10 +0000
@@ -80,6 +80,12 @@
strtold, so use _strtold in all versions. */
#define strtold _strtold
+#if __DJGPP__ > 2 || __DJGPP_MINOR__ > 3
+# define HAVE_LSTAT 1
+#else
+# define lstat stat
+#endif
+
/* End of gnulib-related stuff. */
/* When $TERM is "internal" then this is substituted: */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103429: Adapt the MS-DOS build to gnulib import of md5 and filemode.,
Eli Zaretskii <=