Mercurial > emacs
changeset 81006:dda232f60d06
Move GPM check outside HAVE_X_WINDOWS.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Sun, 20 May 2007 13:20:08 +0000 |
| parents | 6d4bdea33da9 |
| children | ba6af80ca869 |
| files | src/Makefile.in |
| diffstat | 1 files changed, 10 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile.in Sun May 20 08:32:16 2007 +0000 +++ b/src/Makefile.in Sun May 20 13:20:08 2007 +0000 @@ -446,14 +446,6 @@ #define LIBGIF #endif /* not HAVE_GIF */ -#if HAVE_GPM -#ifndef LIBGPM -#define LIBGPM -lgpm -#endif /* not defined LIBGPM */ -#else /* not HAVE_GPM */ -#define LIBGPM -#endif /* not HAVE_GPM */ - #ifdef HAVE_X11 /* LD_SWITCH_X_DEFAULT comes after everything else that specifies options for where to find X libraries, but before those libraries. */ @@ -465,6 +457,15 @@ #else /* not HAVE_X_WINDOWS */ #endif /* not HAVE_X_WINDOWS */ +#if HAVE_GPM +#ifndef LIBGPM +#define LIBGPM -lgpm +#endif /* not defined LIBGPM */ +#else /* not HAVE_GPM */ +#define LIBGPM +#endif /* not HAVE_GPM */ + + LIBSOUND= @LIBSOUND@ CFLAGS_SOUND= @CFLAGS_SOUND@ @@ -941,7 +942,7 @@ Note that SunOS needs -lm to come before -lc; otherwise, you get duplicated symbols. If the standard libraries were compiled with GCC, we might need gnulib again after them. */ -LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) LIBGPM\ +LIBES = $(LOADLIBES) $(LIBS) $(LIBX) $(LIBSOUND) LIBGPM \ LIBS_SYSTEM LIBS_MACHINE LIBS_TERMCAP \ LIBS_DEBUG $(GETLOADAVG_LIBS) $(GNULIB_VAR) LIB_MATH LIB_STANDARD \ $(GNULIB_VAR)