[PATCH] [21.4] Update config.inc.samp
nt/ChangeLog addition:
2005-01-28 Ben Wing <ben(a)xemacs.org>
* config.inc.samp:
* config.inc.samp (PNG_DIR):
* config.inc.samp (MAKEINFO):
Update directory locations to correspond to current optional-libs.exe
and Cygwin makeinfo.
latest-stable source patch:
Diff command: bash -ci "cvs-diff --show-c-function -no-changelog "
Files affected: nt/config.inc.samp
Index: nt/config.inc.samp
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/config.inc.samp,v
retrieving revision 1.2.2.2
diff -u -p -r1.2.2.2 config.inc.samp
--- nt/config.inc.samp 2002/08/20 11:36:14 1.2.2.2
+++ nt/config.inc.samp 2005/01/29 00:35:53
＠＠ -26,39 +26,58 ＠＠ HAVE_GTK=0
GTK_DIR=
############################################################################
+# Compiled-in features: graphics formats #
+############################################################################
+
+# Directory under which the optional libraries are placed. To make your
+# life easy, just grab http://ftp.xemacs.org/aux/optional-libs.exe
+# (a self-installing .ZIP) and unzip them into an appropriate directory
+# (by default, c:\src). This gets you precompiled versions of all of
+# the libraries below.
+OPTIONAL_LIBRARY_DIR=c:\src
# Set this to enable XPM support (virtually mandatory), and specify
-# the directory containing xpm.
+# the directory containing xpm. Get the library from
+# http://ftp.xemacs.org/aux/xpm-3.4k.tar.gz.
HAVE_XPM=1
-XPM_DIR=c:\src\xpm-3.4k
+XPM_DIR=$(OPTIONAL_LIBRARY_DIR)\xpm-3.4k
-# Set this to enable GIF support.
+# 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.
+# 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.
HAVE_PNG=1
-PNG_DIR=c:\src\libpng-1.0.9
-ZLIB_DIR=c:\src\zlib
-
-# Set this to enable TIFF support, and specify the directory containing tiff.
-HAVE_TIFF=0
-TIFF_DIR=
+PNG_DIR=$(OPTIONAL_LIBRARY_DIR)\libpng-1.2.8
+ZLIB_DIR=$(OPTIONAL_LIBRARY_DIR)\zlib-1.2.1
-# Set this to enable JPEG support, and specify the directory containing jpeg.
+# 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/.
HAVE_JPEG=1
-JPEG_DIR=c:\src\jpeg-6b
+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/.
+HAVE_TIFF=0
+TIFF_DIR=$(OPTIONAL_LIBRARY_DIR)\tiff-v3.5.7
-# Set this to enable XFace support, and specify the directory containing
-# compface.
+# Set this to enable XFace support (not very important), and specify the
+# directory containing compface. Get the library from
+# http://ftp.xemacs.org/aux/compface-1.5.tar.gz.
HAVE_XFACE=0
-COMPFACE_DIR=
+COMPFACE_DIR=$(OPTIONAL_LIBRARY_DIR)\compface-1.5.1
############################################################################
# Set this to specify the location of makeinfo. (If not set, XEmacs will
# attempt to use its built-in texinfo support when building info files.)
-MAKEINFO=c:\src\texinfo-4.0\makeinfo\makeinfo.exe
+MAKEINFO=c:\cygwin\bin\makeinfo.exe
############################################################################