Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 803-805)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-227

3 files changed, 64 insertions, 5 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index c1f5293059b..65f3bc7b622 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-25  Jason Rumney  <jasonr@gnu.org>
+
+	* cmdproxy.c (main): Set console codepages to "ANSI".
+
+2007-06-20  Jason Rumney  <jasonr@gnu.org>
+
+	* configure.bat: Complain if image libraries are missing.
+
 2007-06-15  Jason Rumney  <jasonr@gnu.org>
 
 	* emacs.manifest: New file.
diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c
index 4e4f1ef5c91..d01e7f39724 100644
--- a/nt/cmdproxy.c
+++ b/nt/cmdproxy.c
@@ -466,6 +466,12 @@ main (int argc, char ** argv)
   SetCurrentDirectory (modname);
   *progname = '\\';
 
+  /* Due to problems with interaction between API functions that use "OEM"
+     codepage vs API functions that use the "ANSI" codepage, we need to
+     make things consistent by choosing one and sticking with it.  */
+  SetConsoleCP (GetACP());
+  SetConsoleOutputCP (GetACP());
+
   /* Although Emacs always sets argv[0] to an absolute pathname, we
      might get run in other ways as well, so convert argv[0] to an
      absolute name before comparing to the module name.  Don't get
diff --git a/nt/configure.bat b/nt/configure.bat
index 123da0b21cd..3979065ab96 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -119,11 +119,11 @@ echo.   --no-opt                disable optimization
 echo.   --no-cygwin             use -mno-cygwin option with GCC

 echo.   --cflags FLAG           pass FLAG to compiler

 echo.   --ldflags FLAG          pass FLAG to compiler when linking

-echo.   --without-png           do not use libpng even if it is installed

-echo.   --without-jpeg          do not use jpeg-6b even if it is installed

-echo.   --without-gif           do not use libungif even if it is installed

-echo.   --without-tiff          do not use libtiff even if it is installed

-echo.   --without-xpm           do not use libXpm even if it is installed

+echo.   --without-png           do not use libpng

+echo.   --without-jpeg          do not use jpeg-6b

+echo.   --without-gif           do not use giflib or libungif

+echo.   --without-tiff          do not use libtiff

+echo.   --without-xpm           do not use libXpm

 echo.   --enable-font-backend   build with font backend support

 goto end

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

@@ -542,6 +542,51 @@ copy subdirs.el ..\site-lisp\subdirs.el
 

 :dontUpdateSubdirs

 echo.

+

+rem check that we have all the libraries we need.

+set libsOK=1

+

+if not "(%HAVE_XPM%)" == "()" goto checkpng

+if (%xpmsupport%) == (N) goto checkpng

+ set libsOK=0

+ echo XPM support is missing. It is required for color icons in the toolbar.

+ echo   Install libXpm development files or use --without-xpm

+

+:checkpng

+if not "(%HAVE_PNG%)" == "()" goto checkjpeg

+if (%pngsupport%) == (N) goto checkjpeg

+ set libsOK=0

+ echo PNG support is missing.

+ echo   Install libpng development files or use --without-png

+

+:checkjpeg

+if not "(%HAVE_JPEG%)" == "()" goto checktiff

+if (%jpegsupport%) == (N) goto checktiff

+ set libsOK=0

+ echo JPEG support is missing.

+ echo   Install jpeg development files or use --without-jpeg

+

+:checktiff

+if not "(%HAVE_TIFF%)" == "()" goto checkgif

+if (%tiffsupport%) == (N) goto checkgif

+ set libsOK=0

+ echo TIFF support is missing.

+ echo   Install libtiff development files or use --without-tiff

+

+:checkgif

+if not "(%HAVE_GIF%)" == "()" goto donelibchecks

+if (%gifsupport%) == (N) goto donelibchecks

+ set libsOK=0

+ echo GIF support is missing.

+ echo   Install giflib or libungif development files or use --without-gif

+

+:donelibchecks

+if (%libsOK%) == (1) goto success

+echo.

+echo Important libraries are missing. Fix these issues before running make.

+goto end

+

+:success

 echo Emacs successfully configured.

 echo Emacs successfully configured. >>config.log

 echo Run `%MAKECMD%' to build, then run `%MAKECMD% install' to install.