diff options
| author | Richard M. Stallman <rms@gnu.org> | 1994-05-28 10:40:02 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1994-05-28 10:40:02 +0000 |
| commit | d2e75974f7c523b17df36c6f8f3c2fb652717a14 (patch) | |
| tree | 40a3d7851d81a4fb56ec9364c6ed7776796a2841 | |
| parent | 7fcf7f051866dbe7fa831076583d92e5904d4450 (diff) | |
| download | emacs-d2e75974f7c523b17df36c6f8f3c2fb652717a14.tar.gz | |
(LD_SWITCH_X_DEFAULT): Define if not defined.
(LIBX): Use LD_SWITCH_X_DEFAULT.
| -rw-r--r-- | src/Makefile.in | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index d5b1561efc0..a8acc3828c5 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -163,6 +163,10 @@ CC = C_COMPILER #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 @@ LIBXT= #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 */ |