Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
26114bc0
Commit
26114bc0
authored
May 20, 2007
by
Jan Djärv
Browse files
Move GPM check outside HAVE_X_WINDOWS.
parent
4a364c5e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
9 deletions
+14
-9
src/ChangeLog
src/ChangeLog
+4
-0
src/Makefile.in
src/Makefile.in
+10
-9
No files found.
src/ChangeLog
View file @
26114bc0
2007-05-20 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* Makefile.in: Move GPM check outside HAVE_X_WINDOWS.
2007-05-20 Nick Roberts <nickrob@snap.net.nz>
* config.in, keyboard.c, Makefile.in, sysdep.c, term.c,
...
...
src/Makefile.in
View file @
26114bc0
...
...
@@ -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)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment