From: Dave Love <fx@gnu.org>
Date: Mon, 20 Nov 2000 14:46:02 +0000 (+0000)
Subject: (LIBX): Reorder for -lX11 after -lXpm.
X-Git-Tag: emacs-pretest-21.0.92~272
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=81459ac9e28dd4597eac5ddf6f3ef28761457130;p=emacs.git

(LIBX): Reorder for -lX11 after -lXpm.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 179eb4dd3e2..e5ac53e1da2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-20  Dave Love  <fx@gnu.org>
+
+	* Makefile.in (LIBX): Reorder for -lX11 after -lXpm.
+
 2000-11-20  Gerd Moellmann  <gerd@gnu.org>
 
 	* s/sol2-5.h (USE_MMAP_FOR_BUFFERS): Undefine.
diff --git a/src/Makefile.in b/src/Makefile.in
index 5bbfe5f78af..3c32cdac0ca 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -411,7 +411,7 @@ LIBXT=
 /* 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) LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM LIBXPM LIBTIFF LIBJPEG LIBPNG LIBGIF
+LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM
 #else /* not HAVE_X11 */
 LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM
 #endif /* not HAVE_X11 */