7 files changed, 183 insertions, 40 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 33507ef581d..66e1ea15438 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,44 @@
+2005-06-11  Eli Zaretskii  <eliz@gnu.org>
+
+        * configure.bat: If their fc.exe returns a meaningful exit status,
+        don't overwrite src/config.h and src/epaths.h with identical
+        copies.
+
+        * INSTALL: Warn about using "cvs up -kb" if one intends to commit
+        changes.  Add a pointer to another site with detailed configure
+        and build instructions.  Suggest to look at config.log when
+        configure fails.  Add MinGW Make 3.80 to the list of successful
+        combinations.
+
+        * gmake.defs (ARCH_CFLAGS): Use $(MCPU_FLAG) instead of a literal
+        "-mcpu=i686".
+
+        * configure.bat: Update copyright years.
+        Delete config.log before doing anything else.
+        Write additional diagnostics to config.log in case of failures to
+        compile test programs, including the failed test program itself.
+        Add a test for support of -mtune=pentium4 switch to GCC; if it is
+        supported, set up MCPU_FLAG variable on the various Makefiles to
+        use that switch during compilations.  (This avoids GCC warning
+        about -mcpu being deprecated.)
+
+2005-06-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * addsection.c (copy_executable_and_add_section): Pass non-zero
+        `verbose' arg to COPY_CHUNK only if DEBUG_DUMP is defined in the
+        environment.  Print section names with %.8s.
+        (COPY_CHUNK): New 4th arg `verbose'; print diagnostic messages
+        only if non-zero.  All callers changed.
+
+2005-06-05  Eli Zaretskii  <eliz@gnu.org>
+
+        * inc/sys/socket.h: Change arg 4 of sys_setsockopt to
+        `const void *', for consistency with Posix.
+
+2005-06-04  Eli Zaretskii  <eliz@gnu.org>
+
+        * inc/pwd.h (getpwnam, getpwuid): Add prototypes.
+
 2005-05-24  Juanma Barranquero  <lekktu@gmail.com>
 
         * INSTALL: Add more pointers to ports of Unix tools to Windows,
diff --git a/nt/INSTALL b/nt/INSTALL
index e133d65e0d3..214caf7dd80 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -15,10 +15,20 @@
   (.bat files, nmake.defs and makefile.w32-in) may need the line-ends
   fixing first. The easiest way to do this and avoid future conflicts
   is to run the following command in this (emacs/nt) directory:
+
      cvs update -kb
+
+  (WARNING: Do NOT use this suggestion if you have write access to the
+  Emacs CVS tree and intend to commit changes to CVS.  This is because -kb
+  is sticky: it will be used in all future CVS operations on the files you
+  check out like this.)  Alternatively, use programs that convert
+  end-of-line format, such as dos2unix and unix2dos available from
+  GnuWin32 or dtou and utod from the DJGPP project.
+
   In addition to this file, you should also read INSTALL.CVS in the
-  parent directory, and make sure that you have a version of "touch.exe"
-  in your path, and that it will create files that do not yet exist.
+  parent directory, and make sure that you have a version of
+  "touch.exe" in your path, and that it will create files that do not
+  yet exist.
 
   To compile Emacs, you will need either Microsoft Visual C++ 2.0 or
   later and nmake, or a Windows port of GCC 2.95 or later with MinGW
@@ -51,6 +61,10 @@
 
   http://www.emacswiki.org/cgi-bin/wiki/WThirtyTwoInstallationKit
 
+  and at this URL:
+
+  http://ourcomments.org/Emacs/EmacsW32.html
+
   For reference, here is a list of which builds of GNU make are known
   to work or not, and whether they work in the presence and/or absence
   of sh.exe, the Cygwin port of Bash. Note that any version of make
@@ -77,6 +91,7 @@
     cygwin compiled make 3.78.1:         fails[5]      fails[2, 5]
     cygwin compiled make 3.79.1:         fails[3, 5]   fails[2?, 5]
     mingw32 compiled make 3.79.1:        okay          okay
+    mingw32 compiled make 3.80:          okay          unknown[6]
 
   Notes:
 
@@ -88,6 +103,7 @@
     [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] please report if you try this combination.
 
 * Configuring
 
@@ -105,6 +121,12 @@
   is running, when gcc support is being tested.  These cannot be
   surpressed because of limitations in the Windows 9x command.com shell.
 
+  You are encouraged to look at the file config.log which shows details
+  for failed tests, after configure.bat finishes.  Any unexplained failure
+  should be investigated and perhaps reported as a bug (see the section
+  about reporting bugs in the file README in this directory and in the
+  Emacs manual).
+
 * Optional image library support
 
   In addition to its "native" image formats (pbm and xbm), Emacs can
@@ -114,7 +136,11 @@
   configure script is run.  This can be setup using environment
   variables, or by specifying --cflags -I... options on the command-line
   to configure.bat.  The configure script will report whether it was
-  able to detect the headers.
+  able to detect the headers.  If the results of this testing appear to be
+  incorrect, please look for details in the file config.log: it will show
+  the failed test programs and compiler error messages that should explain
+  what is wrong.  (Usually, any such failures happen because some headers
+  are missing due to bad packaging of the image support libraries.)
 
   To use the external image support, the DLLs implementing the
   functionality must be found when Emacs first needs them, either on the
@@ -133,7 +159,9 @@
 
   Binaries for the image libraries (among many others) can be found at
   the GnuWin32 project.  These are built with MinGW, but they can be
-  used with both GCC/MinGW and MSVC builds of Emacs.
+  used with both GCC/MinGW and MSVC builds of Emacs.  See the info on
+  http://ourcomments.org/Emacs/EmacsW32.html for more details about
+  installing image support libraries.
 
 * Building
 
@@ -187,6 +215,12 @@
   addsection.c relies on.  Versions of w32api-xxx.zip from at least
   1999-11-18 onwards are okay.
 
+  When in doubt about correctness of what configure did, look at the file
+  config.log, which shows all the failed test programs and compiler
+  messages associated with the failures.  If that doesn't give a clue,
+  please report the problems, together with the relevant fragments from
+  config.log, as bugs.
+
   If configure succeeds, but make fails, install the Cygwin port of
   Bash, even if the table above indicates that Emacs should be able to
   build without sh.exe.  (Some versions of Windows shells are too dumb
diff --git a/nt/addsection.c b/nt/addsection.c
index ae44c7f943c..8fbe8c38050 100644
--- a/nt/addsection.c
+++ b/nt/addsection.c
@@ -1,5 +1,5 @@
 /* Add an uninitialized data section to an executable.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -283,15 +283,19 @@ copy_executable_and_add_section (file_data *p_infile,
   PIMAGE_SECTION_HEADER dst_section;
   DWORD offset;
   int i;
+  int be_verbose = GetEnvironmentVariable ("DEBUG_DUMP", NULL, 0) > 0;
 
-#define COPY_CHUNK(message, src, size)                                          \
+#define COPY_CHUNK(message, src, size, verbose)                                 \
   do {                                                                          \
     unsigned char *s = (void *)(src);                                           \
     unsigned long count = (size);                                               \
-    printf ("%s\n", (message));                                                 \
-    printf ("\t0x%08x Offset in input file.\n", s - p_infile->file_base);       \
-    printf ("\t0x%08x Offset in output file.\n", dst - p_outfile->file_base);   \
-    printf ("\t0x%08x Size in bytes.\n", count);                                \
+    if (verbose)                                                                \
+      {                                                                         \
+        printf ("%s\n", (message));                                             \
+        printf ("\t0x%08x Offset in input file.\n", s - p_infile->file_base);   \
+        printf ("\t0x%08x Offset in output file.\n", dst - p_outfile->file_base); \
+        printf ("\t0x%08x Size in bytes.\n", count);                            \
+      }                                                                         \
     memcpy (dst, s, count);                                                     \
     dst += count;                                                               \
   } while (0)
@@ -321,13 +325,14 @@ copy_executable_and_add_section (file_data *p_infile,
   dst = (unsigned char *) p_outfile->file_base;
 
   COPY_CHUNK ("Copying DOS header...", dos_header,
-              (DWORD) nt_header - (DWORD) dos_header);
+              (DWORD) nt_header - (DWORD) dos_header, be_verbose);
   dst_nt_header = (PIMAGE_NT_HEADERS) dst;
   COPY_CHUNK ("Copying NT header...", nt_header,
-              (DWORD) section - (DWORD) nt_header);
+              (DWORD) section - (DWORD) nt_header, be_verbose);
   dst_section = (PIMAGE_SECTION_HEADER) dst;
   COPY_CHUNK ("Copying section table...", section,
-              nt_header->FileHeader.NumberOfSections * sizeof (*section));
+              nt_header->FileHeader.NumberOfSections * sizeof (*section),
+              be_verbose);
 
   /* To improve the efficiency of demand loading, make the file
      alignment match the section alignment (VC++ 6.0 does this by
@@ -351,7 +356,9 @@ copy_executable_and_add_section (file_data *p_infile,
   for (i = 0; i < nt_header->FileHeader.NumberOfSections; i++)
     {
       char msg[100];
-      sprintf (msg, "Copying raw data for %s...", section->Name);
+      /* Windows section names are fixed 8-char strings, only
+         zero-terminated if the name is shorter than 8 characters.  */
+      sprintf (msg, "Copying raw data for %.8s...", section->Name);
 
       /* Update the file-relative offset for this section's raw data (if
          it has any) in case things have been relocated; we will update
@@ -362,7 +369,7 @@ copy_executable_and_add_section (file_data *p_infile,
       /* Can always copy the original raw data.  */
       COPY_CHUNK
         (msg, OFFSET_TO_PTR (section->PointerToRawData, p_infile),
-         section->SizeOfRawData);
+         section->SizeOfRawData, be_verbose);
 
       /* Round up the raw data size to the new alignment.  */
       dst_section->SizeOfRawData =
@@ -402,7 +409,7 @@ copy_executable_and_add_section (file_data *p_infile,
   COPY_CHUNK
     ("Copying remainder of executable...",
      OFFSET_TO_PTR (offset, p_infile),
-     p_infile->size - offset);
+     p_infile->size - offset, be_verbose);
 
   /* Final size for new image.  */
   p_outfile->size = DST_TO_OFFSET ();
diff --git a/nt/configure.bat b/nt/configure.bat
index 216420873c7..8433cacc317 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -1,7 +1,8 @@
 @echo off

 rem   ----------------------------------------------------------------------

 rem   Configuration script for MS Windows 95/98/Me and NT/2000/XP

-rem   Copyright (C) 1999-2003 Free Software Foundation, Inc.

+rem   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 

+rem      Free Software Foundation, Inc.

 

 rem   This file is part of GNU Emacs.

 

@@ -47,6 +48,8 @@ rem [3] requires LC_MESSAGES support to build; maybe 2.95.x update to
 rem     cygwin provides this?

 rem

 

+if exist config.log del config.log

+

 rem ----------------------------------------------------------------------

 rem   See if the environment is large enough.  We need 43 (?) bytes.

 set $foo$=123456789_123456789_123456789_123456789_123

@@ -236,13 +239,17 @@ if (%nocygwin%) == (Y) goto chkapi
 echo Checking whether gcc requires '-mno-cygwin'...

 echo #include "cygwin/version.h" >junk.c

 echo main(){} >>junk.c

-gcc -c junk.c

+echo gcc -c junk.c >>config.log

+gcc -c junk.c >>config.log 2>&1

 if not exist junk.o goto chkapi

-gcc -mno-cygwin -c junk.c

+echo gcc -mno-cygwin -c junk.c >>config.log

+gcc -mno-cygwin -c junk.c >>config.log 2>&1

 if exist junk.o set nocygwin=Y

 rm -f junk.c junk.o

 

 :chkapi

+echo The failed program was: >>config.log

+type junk.c >>config.log

 rem ----------------------------------------------------------------------

 rem   Older versions of the Windows API headers either don't have any of

 rem   the IMAGE_xxx definitions (the headers that come with Cygwin b20.1

@@ -263,9 +270,13 @@ set cf=%usercflags% -mno-cygwin
 :chkapi2

 echo on

 gcc %cf% -c junk.c

-echo off

+@echo off

+@echo gcc %cf% -c junk.c >>config.log

+gcc %cf% -c junk.c >>config.log 2>&1

 set cf=

 if exist junk.o goto gccOk

+echo The failed program was: >>config.log

+type junk.c >>config.log

 

 :nocompiler

 echo.

@@ -278,8 +289,23 @@ goto end
 

 :gccOk

 set COMPILER=gcc

-rm -f junk.c junk.o

 echo Using 'gcc'

+rm -f junk.c junk.o

+Rem It is not clear what GCC version began supporting -mtune

+Rem and pentium4 on x86, so check this explicitly.

+echo main(){} >junk.c

+echo gcc -c -O2 -mtune=pentium4 junk.c >>config.log

+gcc -c -O2 -mtune=pentium4 junk.c >>config.log 2>&1

+if not errorlevel 1 goto gccMtuneOk

+echo The failed program was: >>config.log

+type junk.c >>config.log

+set mf=-mcpu=i686

+rm -f junk.c junk.o

+goto compilercheckdone

+:gccMtuneOk

+echo GCC supports -mtune=pentium4 >>config.log

+set mf=-mtune=pentium4

+rm -f junk.c junk.o

 goto compilercheckdone

 

 :clOk

@@ -307,10 +333,13 @@ echo Checking for libpng...
 echo #include "png.h" >junk.c

 echo main (){} >>junk.c

 rem   -o option is ignored with cl, but allows result to be consistent.

-%COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>junk.err

+echo %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >>config.log

+%COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>>config.log

 if exist junk.obj goto havePng

 

 echo ...png.h not found, building without PNG support.

+echo The failed program was: >>config.log

+type junk.c >>config.log

 set HAVE_PNG=

 goto :pngDone

 

@@ -327,10 +356,13 @@ echo Checking for jpeg-6b...
 echo #include "jconfig.h" >junk.c

 echo main (){} >>junk.c

 rem   -o option is ignored with cl, but allows result to be consistent.

-%COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>junk.err

+echo %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >>config.log

+%COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>>config.log

 if exist junk.obj goto haveJpeg

 

 echo ...jconfig.h not found, building without JPEG support.

+echo The failed program was: >>config.log

+type junk.c >>config.log

 set HAVE_JPEG=

 goto :jpegDone

 

@@ -347,10 +379,13 @@ echo Checking for libgif...
 echo #include "gif_lib.h" >junk.c

 echo main (){} >>junk.c

 rem   -o option is ignored with cl, but allows result to be consistent.

-%COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>junk.err

+echo %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >>config.log

+%COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>>config.log

 if exist junk.obj goto haveGif

 

 echo ...gif_lib.h not found, building without GIF support.

+echo The failed program was: >>config.log

+type junk.c >>config.log

 set HAVE_GIF=

 goto :gifDone

 

@@ -367,10 +402,13 @@ echo Checking for tiff...
 echo #include "tiffio.h" >junk.c

 echo main (){} >>junk.c

 rem   -o option is ignored with cl, but allows result to be consistent.

-%COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>junk.err

+echo %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >>config.log

+%COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>>config.log

 if exist junk.obj goto haveTiff

 

 echo ...tiffio.h not found, building without TIFF support.

+echo The failed program was: >>config.log

+type junk.c >>config.log

 set HAVE_TIFF=

 goto :tiffDone

 

@@ -388,10 +426,13 @@ echo #define FOR_MSW 1 >junk.c
 echo #include "X11/xpm.h" >>junk.c

 echo main (){} >>junk.c

 rem   -o option is ignored with cl, but allows result to be consistent.

-%COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>junk.err

+echo %COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >>config.log

+%COMPILER% %usercflags% %mingwflag% -c junk.c -o junk.obj >junk.out 2>>config.log

 if exist junk.obj goto haveXpm

 

 echo ...X11/xpm.h not found, building without XPM support.

+echo The failed program was: >>config.log

+type junk.c >>config.log

 set HAVE_XPM=

 goto :xpmDone

 

@@ -414,6 +455,7 @@ rem   except when there is a preceding digit, when a space is required.
 rem

 echo # Start of settings from configure.bat >config.settings

 echo COMPILER=%COMPILER%>>config.settings

+if not "(%mf%)" == "()" echo MCPU_FLAG=%mf%>>config.settings

 if (%nodebug%) == (Y) echo NODEBUG=1 >>config.settings

 if (%noopt%) == (Y) echo NOOPT=1 >>config.settings

 if (%nocygwin%) == (Y) echo NOCYGWIN=1 >>config.settings

@@ -423,20 +465,34 @@ if not "(%userldflags%)" == "()" echo USER_LDFLAGS=%userldflags%>>config.setting
 echo # End of settings from configure.bat>>config.settings

 echo. >>config.settings

 

-copy config.nt ..\src\config.h

-echo. >>..\src\config.h

-echo /* Start of settings from configure.bat.  */ >>..\src\config.h

-if not "(%usercflags%)" == "()" echo #define USER_CFLAGS " %usercflags%">>..\src\config.h

-if not "(%userldflags%)" == "()" echo #define USER_LDFLAGS " %userldflags%">>..\src\config.h

-if not "(%HAVE_PNG%)" == "()" echo #define HAVE_PNG 1 >>..\src\config.h

-if not "(%HAVE_JPEG%)" == "()" echo #define HAVE_JPEG 1 >>..\src\config.h

-if not "(%HAVE_GIF%)" == "()" echo #define HAVE_GIF 1 >>..\src\config.h

-if not "(%HAVE_TIFF%)" == "()" echo #define HAVE_TIFF 1 >>..\src\config.h

-if not "(%HAVE_XPM%)" == "()" echo #define HAVE_XPM 1 >>..\src\config.h

-echo /* End of settings from configure.bat.  */ >>..\src\config.h

-

+copy config.nt config.tmp

+echo. >>config.tmp

+echo /* Start of settings from configure.bat.  */ >>config.tmp

+if not "(%usercflags%)" == "()" echo #define USER_CFLAGS " %usercflags%">>config.tmp

+if not "(%userldflags%)" == "()" echo #define USER_LDFLAGS " %userldflags%">>config.tmp

+if not "(%HAVE_PNG%)" == "()" echo #define HAVE_PNG 1 >>config.tmp

+if not "(%HAVE_JPEG%)" == "()" echo #define HAVE_JPEG 1 >>config.tmp

+if not "(%HAVE_GIF%)" == "()" echo #define HAVE_GIF 1 >>config.tmp

+if not "(%HAVE_TIFF%)" == "()" echo #define HAVE_TIFF 1 >>config.tmp

+if not "(%HAVE_XPM%)" == "()" echo #define HAVE_XPM 1 >>config.tmp

+echo /* End of settings from configure.bat.  */ >>config.tmp

+

+Rem See if fc.exe returns a meaningful exit status.  If it does, we

+Rem might as well avoid unnecessary overwriting of config.h and epaths.h,

+Rem since this forces recompilation of every source file.

+if exist foo.bar del foo.bar

+fc /b foo.bar foo.bar >nul 2>&1

+if not errorlevel 2 goto doCopy

+fc /b config.tmp ..\src\config.h >nul 2>&1

+if errorlevel 1 goto doCopy

+fc /b paths.h ..\src\epaths.h >nul 2>&1

+if errorlevel 0 goto dontCopy

+:doCopy

+copy config.tmp ..\src\config.h

 copy paths.h ..\src\epaths.h

 

+:dontCopy

+if exist config.tmp del config.tmp

 copy /b config.settings+%MAKECMD%.defs+..\nt\makefile.w32-in ..\nt\makefile

 copy /b config.settings+%MAKECMD%.defs+..\lib-src\makefile.w32-in ..\lib-src\makefile

 copy /b config.settings+%MAKECMD%.defs+..\src\makefile.w32-in ..\src\makefile

@@ -474,6 +530,7 @@ set MAKECMD=
 set usercflags=

 set userldflags=

 set mingwflag=

+set mf=

 

 goto skipArchTag

    arch-tag: 300d20a4-1675-4e75-b615-7ce1a8c5376c

diff --git a/nt/gmake.defs b/nt/gmake.defs
index bd201cd3314..23d3dac3719 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -253,7 +253,7 @@ ifeq "$(ARCH)" "i386"
 ifdef NOOPT
 ARCH_CFLAGS     = -D_X86_=1 -c $(DEBUG_FLAG) $(NOCYGWIN)
 else
-ARCH_CFLAGS     = -D_X86_=1 -c $(DEBUG_FLAG) $(NOCYGWIN) -mcpu=i686 -O2 \
+ARCH_CFLAGS     = -D_X86_=1 -c $(DEBUG_FLAG) $(NOCYGWIN) $(MCPU_FLAG) -O2 \
                   # -fbuiltin \
                   # -finline-functions \
                   # -fomit-frame-pointer
diff --git a/nt/inc/pwd.h b/nt/inc/pwd.h
index 11f5669b0f0..31c0df7ec30 100644
--- a/nt/inc/pwd.h
+++ b/nt/inc/pwd.h
@@ -18,6 +18,10 @@ struct passwd {
 typedef int uid_t;
 typedef uid_t gid_t;
 
+struct passwd * getpwnam (char *);
+struct passwd * getpwuid (int);
+
+
 #endif /* _PWD_H_ */
 
 /* arch-tag: 68308424-cb2b-49ed-bb52-b347fee416bf
diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h
index 422a27d1b52..d3936da2a4d 100644
--- a/nt/inc/sys/socket.h
+++ b/nt/inc/sys/socket.h
@@ -102,7 +102,7 @@ struct hostent * sys_gethostbyname (const char * name);
 struct servent * sys_getservbyname (const char * name, const char * proto);
 int sys_getpeername (int s, struct sockaddr *addr, int * namelen);
 int sys_shutdown (int socket, int how);
-int sys_setsockopt (int s, int level, int oname, const char * oval, int olen);
+int sys_setsockopt (int s, int level, int oname, const void * oval, int olen);
 int sys_listen (int s, int backlog);
 int sys_getsockname (int s, struct sockaddr * name, int * namelen);
 int sys_accept (int s, struct sockaddr *addr, int *addrlen);