# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1270119175 0
# Node ID f449a4ebd49ff87e177f4dac641f195dfffdc784
# Parent  56e62ae17d17bafeb5074043ad6d16d37021d23e# Parent  cb51e74aafd24a2fd49223e451c37b4c6fe9a2ed
Merge from mainline.

diff -r 56e62ae17d17 -r f449a4ebd49f src/ChangeLog
--- a/src/ChangeLog	Thu Apr 01 00:00:14 2010 +0000
+++ b/src/ChangeLog	Thu Apr 01 10:52:55 2010 +0000
@@ -1,3 +1,9 @@
+2010-04-01  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (LIBTIFF, LIBJPEG, LIBPNG, LIBGIF, LIBXPM, XFT_LIBS):
+	Define as Makefile variables.
+	(LIBX): Use above variables rather than directly using autoconf.
+
 2010-03-31  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	Clean up BSD_SYSTEM use.
diff -r 56e62ae17d17 -r f449a4ebd49f src/Makefile.in
--- a/src/Makefile.in	Thu Apr 01 00:00:14 2010 +0000
+++ b/src/Makefile.in	Thu Apr 01 10:52:55 2010 +0000
@@ -68,6 +68,13 @@
 
 OTHER_FILES = @OTHER_FILES@
 
+LIBTIFF=@LIBTIFF@
+LIBJPEG=@LIBJPEG@
+LIBPNG=@LIBPNG@
+LIBGIF=@LIBGIF@
+LIBXPM=@LIBXPM@
+XFT_LIBS=@XFT_LIBS@
+
 # ========================== start of cpp stuff =======================
 /* From here on, comments must be done in C syntax.  */
 
@@ -369,7 +376,7 @@
 /* LD_SWITCH_X_DEFAULT comes after everything else that specifies
    options for where to find X libraries, but before those libraries.  */
 X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT
-LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) @LIBTIFF@ @LIBJPEG@ @LIBPNG@ @LIBGIF@ @LIBXPM@ LIB_X11_LIB LIBX11_SYSTEM @XFT_LIBS@
+LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) $(LIBTIFF) $(LIBJPEG) $(LIBPNG) $(LIBGIF) $(LIBXPM) LIB_X11_LIB LIBX11_SYSTEM $(XFT_LIBS)
 #else /* not HAVE_X11 */
 LIBX= $(LIBXMENU) LD_SWITCH_X_SITE
 #endif /* not HAVE_X11 */