diff options
| author | Jan Djärv | 2007-01-29 07:59:50 +0000 |
|---|---|---|
| committer | Jan Djärv | 2007-01-29 07:59:50 +0000 |
| commit | 106bfcaeab770b989ada669e6534548242238791 (patch) | |
| tree | b3cdf6bda693a0205fce3e2ec70d7850c2b9faaa /src | |
| parent | 4abaeb50c1072fe8b43df374081fa08cb2312621 (diff) | |
| download | emacs-106bfcaeab770b989ada669e6534548242238791.tar.gz emacs-106bfcaeab770b989ada669e6534548242238791.zip | |
Use a variable, XFT_LIBS, instead #define LIB_X11_LIB.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 8dd211c0fa2..cd2c15a636d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -403,8 +403,8 @@ LIBXT=$(LIBW) | |||
| 403 | #endif /* not USE_X_TOOLKIT */ | 403 | #endif /* not USE_X_TOOLKIT */ |
| 404 | 404 | ||
| 405 | #if HAVE_XFT | 405 | #if HAVE_XFT |
| 406 | #undef LIB_X11_LIB | 406 | #undef LIB_X11_LIB /* XFT_LIBS includes -lX11 */ |
| 407 | #define LIB_X11_LIB @XFT_LIBS@ | 407 | XFT_LIBS=@XFT_LIBS@" |
| 408 | #endif /* HAVE_XFT */ | 408 | #endif /* HAVE_XFT */ |
| 409 | 409 | ||
| 410 | #if HAVE_XPM | 410 | #if HAVE_XPM |
| @@ -451,7 +451,7 @@ LIBXT=$(LIBW) | |||
| 451 | /* LD_SWITCH_X_DEFAULT comes after everything else that specifies | 451 | /* LD_SWITCH_X_DEFAULT comes after everything else that specifies |
| 452 | options for where to find X libraries, but before those libraries. */ | 452 | options for where to find X libraries, but before those libraries. */ |
| 453 | X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT | 453 | X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT |
| 454 | LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM | 454 | LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM $(XFT_LIBS) |
| 455 | #else /* not HAVE_X11 */ | 455 | #else /* not HAVE_X11 */ |
| 456 | LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM | 456 | LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM |
| 457 | #endif /* not HAVE_X11 */ | 457 | #endif /* not HAVE_X11 */ |