diff options
| author | Nick Roberts | 2007-05-20 05:13:28 +0000 |
|---|---|---|
| committer | Nick Roberts | 2007-05-20 05:13:28 +0000 |
| commit | 7e5a23bd93d600f719b3b6db4cfbb925d7ea8c8f (patch) | |
| tree | dd382d8493d1c892047eaf1ad657be173e691488 /src/Makefile.in | |
| parent | a8099827a4c6c243b57dcfee9d17f3b7475670e4 (diff) | |
| download | emacs-7e5a23bd93d600f719b3b6db4cfbb925d7ea8c8f.tar.gz emacs-7e5a23bd93d600f719b3b6db4cfbb925d7ea8c8f.zip | |
Use HAVE_GPM instead of HAVE_GPM_H.
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 216e6a420c1..09b85b4f2e2 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -446,6 +446,14 @@ XFT_LIBS=@XFT_LIBS@ | |||
| 446 | #define LIBGIF | 446 | #define LIBGIF |
| 447 | #endif /* not HAVE_GIF */ | 447 | #endif /* not HAVE_GIF */ |
| 448 | 448 | ||
| 449 | #if HAVE_GPM | ||
| 450 | #ifndef LIBGPM | ||
| 451 | #define LIBGPM -lgpm | ||
| 452 | #endif /* not defined LIBGPM */ | ||
| 453 | #else /* not HAVE_GPM */ | ||
| 454 | #define LIBGPM | ||
| 455 | #endif /* not HAVE_GPM */ | ||
| 456 | |||
| 449 | #ifdef HAVE_X11 | 457 | #ifdef HAVE_X11 |
| 450 | /* LD_SWITCH_X_DEFAULT comes after everything else that specifies | 458 | /* LD_SWITCH_X_DEFAULT comes after everything else that specifies |
| 451 | options for where to find X libraries, but before those libraries. */ | 459 | options for where to find X libraries, but before those libraries. */ |
| @@ -460,8 +468,6 @@ LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM | |||
| 460 | LIBSOUND= @LIBSOUND@ | 468 | LIBSOUND= @LIBSOUND@ |
| 461 | CFLAGS_SOUND= @CFLAGS_SOUND@ | 469 | CFLAGS_SOUND= @CFLAGS_SOUND@ |
| 462 | 470 | ||
| 463 | LIBGPM= @LIBGPM@ | ||
| 464 | |||
| 465 | #ifndef ORDINARY_LINK | 471 | #ifndef ORDINARY_LINK |
| 466 | /* Fix linking if compiled with GCC. */ | 472 | /* Fix linking if compiled with GCC. */ |
| 467 | #ifdef __GNUC__ | 473 | #ifdef __GNUC__ |
| @@ -935,7 +941,7 @@ SOME_MACHINE_LISP = ${dotdot}/lisp/mouse.elc \ | |||
| 935 | Note that SunOS needs -lm to come before -lc; otherwise, you get | 941 | Note that SunOS needs -lm to come before -lc; otherwise, you get |
| 936 | duplicated symbols. If the standard libraries were compiled | 942 | duplicated symbols. If the standard libraries were compiled |
| 937 | with GCC, we might need gnulib again after them. */ | 943 | with GCC, we might need gnulib again after them. */ |
| 938 | LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) $(LIBGPM)\ | 944 | LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) LIBGPM\ |
| 939 | LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \ | 945 | LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \ |
| 940 | LIBS_DEBUG $(GETLOADAVG_LIBS) $(GNULIB_VAR) LIB_MATH LIB_STANDARD \ | 946 | LIBS_DEBUG $(GETLOADAVG_LIBS) $(GNULIB_VAR) LIB_MATH LIB_STANDARD \ |
| 941 | $(GNULIB_VAR) | 947 | $(GNULIB_VAR) |