# HG changeset patch # User Richard M. Stallman # Date 770121602 0 # Node ID 9f0f4acb409ca4d1b089f76716b7cb565e314593 # Parent e422f06592d36be8ddef8262290f791147956da3 (LD_SWITCH_X_DEFAULT): Define if not defined. (LIBX): Use LD_SWITCH_X_DEFAULT. diff -r e422f06592d3 -r 9f0f4acb409c src/Makefile.in --- a/src/Makefile.in Sat May 28 08:29:36 1994 +0000 +++ b/src/Makefile.in Sat May 28 10:40:02 1994 +0000 @@ -163,6 +163,10 @@ #define LD_SWITCH_X_SITE #endif +#ifndef LD_SWITCH_X_DEFAULT +#define LD_SWITCH_X_DEFAULT +#endif + /* These can be passed in from config.h to define special load and compile switches needed by individual sites */ #ifndef LD_SWITCH_SITE @@ -321,7 +325,9 @@ #endif #ifdef HAVE_X11 -LIBX= $(LIBXMENU) LD_SWITCH_X_SITE $(LIBXT) LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM +/* LD_SWITCH_X_DEFAULT comes after everything else that specifies + options for where to find X libraries, but before those libraries. */ +LIBX= $(LIBXMENU) LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT $(LIBXT) 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 */