diff options
| author | Dave Love | 2000-11-20 14:46:02 +0000 |
|---|---|---|
| committer | Dave Love | 2000-11-20 14:46:02 +0000 |
| commit | 81459ac9e28dd4597eac5ddf6f3ef28761457130 (patch) | |
| tree | a844d75bed8acb856f39867a46c6c33a6fc14232 /src | |
| parent | f1d6d1e875435c7342a2b503c8e1ecda8cd6ca96 (diff) | |
| download | emacs-81459ac9e28dd4597eac5ddf6f3ef28761457130.tar.gz emacs-81459ac9e28dd4597eac5ddf6f3ef28761457130.zip | |
(LIBX): Reorder for -lX11 after -lXpm.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 179eb4dd3e2..e5ac53e1da2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2000-11-20 Dave Love <fx@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (LIBX): Reorder for -lX11 after -lXpm. | ||
| 4 | |||
| 1 | 2000-11-20 Gerd Moellmann <gerd@gnu.org> | 5 | 2000-11-20 Gerd Moellmann <gerd@gnu.org> |
| 2 | 6 | ||
| 3 | * s/sol2-5.h (USE_MMAP_FOR_BUFFERS): Undefine. | 7 | * 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= | |||
| 411 | /* LD_SWITCH_X_DEFAULT comes after everything else that specifies | 411 | /* LD_SWITCH_X_DEFAULT comes after everything else that specifies |
| 412 | options for where to find X libraries, but before those libraries. */ | 412 | options for where to find X libraries, but before those libraries. */ |
| 413 | X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT | 413 | X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT |
| 414 | LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM LIBXPM LIBTIFF LIBJPEG LIBPNG LIBGIF | 414 | LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM |
| 415 | #else /* not HAVE_X11 */ | 415 | #else /* not HAVE_X11 */ |
| 416 | LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM | 416 | LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM |
| 417 | #endif /* not HAVE_X11 */ | 417 | #endif /* not HAVE_X11 */ |