diff options
| author | Miles Bader <miles@gnu.org> | 2007-05-15 07:17:13 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-05-15 07:17:13 +0000 |
| commit | 4ace64cc90e38c77c11546fead24782a60eb1d4d (patch) | |
| tree | efebad2b13253bfe060be37dccbbbf9603010b7a /nt | |
| parent | 06253b0e7aca3ca2deb2093f187bb52cee09ec5c (diff) | |
| parent | 9fff44d50016108a350c90c39b68e302277080d7 (diff) | |
| download | emacs-4ace64cc90e38c77c11546fead24782a60eb1d4d.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 726-750)
- Update from CVS
- Merge from emacs--rel--22
- Merge from gnus--rel--5.10
* emacs--rel--22 (patch 6-17)
- Update from CVS
- Update from CVS: src/xterm.c (XTread_socket): Revert last change.
* gnus--rel--5.10 (patch 218-221)
- Merge from emacs--devo--0, emacs--rel--22
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-205
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/INSTALL | 14 | ||||
| -rwxr-xr-x | nt/configure.bat | 14 |
2 files changed, 16 insertions, 12 deletions
diff --git a/nt/INSTALL b/nt/INSTALL index fe5381a6f21..c9afa8f5de3 100644 --- a/nt/INSTALL +++ b/nt/INSTALL @@ -157,11 +157,11 @@ cygwin compiled gmake 3.77: fails[1, 5] fails[2, 5] cygwin compiled make 3.78.1: fails[5] fails[2, 5] cygwin compiled make 3.79.1: fails[3, 5] fails[2?, 5] - cygwin compiled make 3.80: fails?[6] fails?[6] - cygwin compiled make 3.81: fails fails?[6] + cygwin compiled make 3.80: okay[6] fails?[7] + cygwin compiled make 3.81: fails fails?[7] mingw32 compiled make 3.79.1: okay okay - mingw32 compiled make 3.80: okay okay[6] - mingw32 compiled make 3.81: okay okay[7] + mingw32 compiled make 3.80: okay okay[7] + mingw32 compiled make 3.81: okay okay[8] Notes: @@ -173,8 +173,10 @@ [4] may fail on Windows 9X and Windows ME; if so, install Bash. [5] fails when building leim due to the use of cygwin style paths. May work if building emacs without leim. - [6] not recommended; please report if you try this combination. - [7] tested only on Windows XP. + [6] need to uncomment 3 lines in nt/gmake.defs that invoke `cygpath' + (look for "cygpath" near line 85 of gmake.defs). + [7] not recommended; please report if you try this combination. + [8] tested only on Windows XP. Other compilers may work, but specific reports from people that have tried suggest that the Intel C compiler (for example) may produce an diff --git a/nt/configure.bat b/nt/configure.bat index 1223f7e861d..2ff90186445 100755 --- a/nt/configure.bat +++ b/nt/configure.bat @@ -41,11 +41,11 @@ rem mingw32/gcc-2.92.2 make (3.77): okay okay[4] rem cygwin compiled gmake 3.77: fails[1,5] fails[2,5]
rem cygwin compiled gmake 3.78.1: fails[5] fails[2,5]
rem cygwin compiled gmake 3.79.1: fails[3,5] fails[2?,5]
-rem cygwin compiled make 3.80: fails?[6] fails?[6]
-rem cygwin compiled make 3.81: fails fails?[6]
+rem cygwin compiled make 3.80: okay[6] fails?[7]
+rem cygwin compiled make 3.81: fails fails?[7]
rem mingw32 compiled make 3.79.1: okay okay
-rem mingw32 compiled make 3.80: okay okay?[6]
-rem mingw32 compiled make 3.81: okay okay[7]
+rem mingw32 compiled make 3.80: okay okay?[7]
+rem mingw32 compiled make 3.81: okay okay[8]
rem
rem [1] doesn't cope with makefiles with DOS line endings, so must mount
rem emacs source with text!=binary.
@@ -55,8 +55,10 @@ rem versions of cygwin. rem [4] may fail on Windows 9X and Windows ME; if so, install Bash.
rem [5] fails when building leim due to the use of cygwin style paths.
rem May work if building emacs without leim.
-rem [6] not recommended; please report if you try this combination.
-rem [7] tested only on Windows XP.
+rem [6] need to uncomment 3 lines in nt/gmake.defs that invoke `cygpath';
+rem look for "cygpath" near line 85 of gmake.defs.
+rem [7] not recommended; please report if you try this combination.
+rem [8] tested only on Windows XP.
rem
if exist config.log del config.log
|