aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile.in
diff options
context:
space:
mode:
authorDan Nicolaescu2010-04-01 16:08:14 -0700
committerDan Nicolaescu2010-04-01 16:08:14 -0700
commit8224f93d18d7470f54d5894cb74da0168bddee44 (patch)
tree8461ab66e8609dff27e3d8fdf05bea657fa27592 /src/Makefile.in
parent796bb9364a5244a089769f4c92daab1835b618c7 (diff)
downloademacs-8224f93d18d7470f54d5894cb74da0168bddee44.tar.gz
emacs-8224f93d18d7470f54d5894cb74da0168bddee44.zip
Remove all uses of LIBX11_SYSTEM.
* Makefile.in (LIBX11_SYSTEM): Remove. * s/msdos.h (LIBX11_SYSTEM): Do not define, define LIBS_SYSTEM instead. * configure.in: Remove all references to LIBX11_SYSTEM.
Diffstat (limited to 'src/Makefile.in')
-rw-r--r--src/Makefile.in6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 53904a3992a..cd5027dc4d8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -284,10 +284,6 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@
284#endif 284#endif
285 $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $< 285 $(CC) -c $(CPPFLAGS) $(ALL_OBJC_CFLAGS) $<
286 286
287#ifndef LIBX11_SYSTEM
288#define LIBX11_SYSTEM
289#endif
290
291#ifndef LIB_X11_LIB 287#ifndef LIB_X11_LIB
292#define LIB_X11_LIB -lX11 288#define LIB_X11_LIB -lX11
293#endif 289#endif
@@ -376,7 +372,7 @@ LIBXT=$(LIBW)
376/* LD_SWITCH_X_DEFAULT comes after everything else that specifies 372/* LD_SWITCH_X_DEFAULT comes after everything else that specifies
377 options for where to find X libraries, but before those libraries. */ 373 options for where to find X libraries, but before those libraries. */
378X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT 374X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT
379LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) $(LIBTIFF) $(LIBJPEG) $(LIBPNG) $(LIBGIF) $(LIBXPM) LIB_X11_LIB LIBX11_SYSTEM $(XFT_LIBS) 375LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) $(LIBTIFF) $(LIBJPEG) $(LIBPNG) $(LIBGIF) $(LIBXPM) LIB_X11_LIB $(XFT_LIBS)
380#else /* not HAVE_X11 */ 376#else /* not HAVE_X11 */
381LIBX= $(LIBXMENU) LD_SWITCH_X_SITE 377LIBX= $(LIBXMENU) LD_SWITCH_X_SITE
382#endif /* not HAVE_X11 */ 378#endif /* not HAVE_X11 */