--- a/nt/config.inc.samp	Sun Sep 25 21:51:12 2005 +0000
+++ b/nt/config.inc.samp	Mon Sep 26 08:13:00 2005 +0000
@@ -35,34 +35,36 @@
 
 # Set this to enable XPM support (virtually mandatory), and specify
 # the directory containing xpm.  Get the library from
-# http://ftp.xemacs.org/aux/xpm-3.4k.tar.gz.
+# http://ftp.xemacs.org/pub/xemacs/aux/xpm-3.4k.tar.gz, or the latest
+# version (note that the library hasn't been updated in years) from
+# http://www.inria.fr/koala/lehors/xpm.html.
 HAVE_XPM=1
 XPM_DIR=$(OPTIONAL_LIBRARY_DIR)\xpm-3.4k
 
 # Set this to enable GIF support (built-in).
 HAVE_GIF=1
 
-# Set this to enable PNG support (virtually mandatory), and specify
-# the directories containing png and zlib.  Get the latest version from
-# ftp://ftp.uu.net/graphics/png/.  NOTE: In order to compile libpng,
-# you will have to rename the zlib directory to just `zlib'.  We don't
-# do that here so we can preserve the version number, like for the other
-# libraries.
+# Set this to enable PNG support (virtually mandatory), and specify the
+# directories containing png and zlib.  Get the latest version of PNG from
+# http://www.libpng.org/pub/png/libpng.html.  Get the latest version of ZLIB
+# from http://www.gzip.org/zlib/.  NOTE: In order to compile libpng, you will
+# have to rename the zlib directory to just `zlib'.  We don't do that here
+# so we can preserve the version number, like for the other libraries.
 HAVE_PNG=1
 PNG_DIR=$(OPTIONAL_LIBRARY_DIR)\libpng-1.2.8
-ZLIB_DIR=$(OPTIONAL_LIBRARY_DIR)\zlib-1.2.1
+ZLIB_DIR=$(OPTIONAL_LIBRARY_DIR)\zlib-1.2.3
 
 # Set this to enable JPEG support (useful, but not necessary), and specify
 # the directory containing jpeg.  Get the latest version from
-# ftp://ftp.uu.net/graphics/jpeg/.
+# http://www.ijg.org/ or ftp://ftp.uu.net/graphics/jpeg/.
 HAVE_JPEG=1
 JPEG_DIR=$(OPTIONAL_LIBRARY_DIR)\jpeg-6b
 
 # Set this to enable TIFF support (not very important), and specify the
 # directory containing tiff.  Get the latest version from
-# ftp://ftp.uu.net/graphics/tiff/.
+# http://www.remotesensing.org/libtiff/.
 HAVE_TIFF=1
-TIFF_DIR=$(OPTIONAL_LIBRARY_DIR)\tiff-v3.5.7
+TIFF_DIR=$(OPTIONAL_LIBRARY_DIR)\tiff-3.7.3
 
 # Set this to enable XFace support (not very important), and specify the
 # directory containing compface.  Get the library from
@@ -70,6 +72,39 @@
 HAVE_XFACE=1
 COMPFACE_DIR=$(OPTIONAL_LIBRARY_DIR)\compface-1.5.1
 
+# Set this to enable bignum support (useful, but not necessary), and specify
+# the directory containing GNU MP.  Get the latest version from
+# http://www.swox.com/gmp/.
+HAVE_BIGNUM=0
+BIGNUM_DIR=$(OPTIONAL_LIBRARY_DIR)\gmp-4.1.4
+
+# Set this to enable Berkeley DB support (not very important), and specify
+# the directory containing Sleepcat DB.  Get the latest version from
+# http://www.sleepycat.com/products/db.shtml.  If you want to use the
+# shared-library (DLL) version instead of the static library, set
+# BUILD_DATABASE_SHARED to 1.
+HAVE_DATABASE=0
+BUILD_DATABASE_SHARED=0
+DATABASE_DIR=$(OPTIONAL_LIBRARY_DIR)\db-4.3.28
+
+# Set this to enable PostgreSQL support (not very important), and specify
+# the directory containing PostgreSQL.  Get the latest version from
+# http://www.postgresql.org/.
+HAVE_POSTGRESQL=0
+POSTGRESQL_DIR=$(OPTIONAL_LIBRARY_DIR)\postgresql-8.0.3
+
+# Set this to enable LDAP support (not very important), and specify
+# the directory containing LDAP.  It is not easy to build OpenLDAP under
+# native MS Windows, as it is only experimentally supported.  However, there
+# is a mailing list for this, which contains postings of recent binaries and
+# build patches; see
+#
+# http://lucas.bergmans.us/hacks/openldap/
+#
+# Get the latest version of OpenLDAP from http://www.openldap.org/.
+HAVE_LDAP=0
+LDAP_DIR=$(OPTIONAL_LIBRARY_DIR)\openldap-2.3.4
+
 ############################################################################
 #                            Build settings                                #
 ############################################################################
@@ -116,8 +151,21 @@
 # the actual file system).
 MAKEINFO=c:\cygwin\bin\makeinfo.exe
 
-# Set this to turn on optimization when compiling.
+# Set this to enable debug code in XEmacs that doesn't slow things down,
+# and to add debugging information to the executable. (The code that's
+# enabled in XEmacs is primarily extra commands that aid in debugging
+# problems.  The kind of debugging code that slows things down --
+# i.e. internal error-checking -- is controlled by the ERROR_CHECK_ALL
+# variable, below.)
+DEBUG_XEMACS=1
+
+# Set this to turn on optimization when compiling.  Normally this should
+# be the opposite of DEBUG_XEMACS.
+!if $(DEBUG_XEMACS)
 OPTIMIZED_BUILD=0
+!else
+OPTIMIZED_BUILD=1
+!endif
 
 # Set this to build with the fastcall calling convention, which uses registers
 # instead of the stack and should speed things up a bit
@@ -132,14 +180,6 @@
 # profiling under VC++, you also need debugging turned on.
 PROFILE_SUPPORT=0
 
-# Set this to enable debug code in XEmacs that doesn't slow things down,
-# and to add debugging information to the executable. (The code that's
-# enabled in XEmacs is primarily extra commands that aid in debugging
-# problems.  The kind of debugging code that slows things down --
-# i.e. internal error-checking -- is controlled by the ERROR_CHECK_ALL
-# variable, below.)
-DEBUG_XEMACS=1
-
 # Set this to enable support for edit-and-continue under VC++.
 # WARNING: This turns on incremental linking, which is known to lead to
 # occasional weird crashes in pdump loading.  If that happens, do a