diff options
| author | Jan Djärv <[email protected]> | 2007-05-20 13:20:25 +0000 |
|---|---|---|
| committer | Jan Djärv <[email protected]> | 2007-05-20 13:20:25 +0000 |
| commit | 26114bc08f03789f30f0acca925955f2139df690 (patch) | |
| tree | 4f42a82cd70f17cc5ec9e7447a549cb96109995a /src | |
| parent | 4a364c5ef224b6f80de65cd1b45567b2a08f36cf (diff) | |
Move GPM check outside HAVE_X_WINDOWS.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 19 |
2 files changed, 14 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a5dad6a350..67f6bd282c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2007-05-20 Jan Dj,Ad(Brv <[email protected]> + + * Makefile.in: Move GPM check outside HAVE_X_WINDOWS. + 2007-05-20 Nick Roberts <[email protected]> * config.in, keyboard.c, Makefile.in, sysdep.c, term.c, diff --git a/src/Makefile.in b/src/Makefile.in index 09b85b4f2e..65a604bf78 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -446,14 +446,6 @@ XFT_LIBS=@XFT_LIBS@ #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 @@ LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM #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 @@ SOME_MACHINE_LISP = ${dotdot}/lisp/mouse.elc \ 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) |