[Emacs-diffs] /srv/bzr/emacs/trunk r100067: Set GPM part of MOUSE_SUPPORT with configure, not cpp.

[Glenn Morris]

------------------------------------------------------------
revno: 100067
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2010-04-28 00:15:10 -0700
message:
  Set GPM part of MOUSE_SUPPORT with configure, not cpp.
  * configure.in (GPM_MOUSE_SUPPORT): New output variable.
  * src/Makefile.in (GPM_MOUSE_SUPPORT): New, set by configure.
  (MOUSE_SUPPORT) [!HAVE_MOUSE]: Use $GPM_MOUSE_SUPPORT.
modified:
  ChangeLog
  configure.in
  src/ChangeLog
  src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-04-28 07:08:53 +0000
+++ b/ChangeLog 2010-04-28 07:15:10 +0000
@@ -1,5 +1,7 @@
 2010-04-28  Glenn Morris  <address@hidden>
 
+       * configure.in (GPM_MOUSE_SUPPORT): New output variable.
+
        * configure.in (FONT_OBJ): New output variable.
 
        * configure.in (LIBXMU): New output variable.

=== modified file 'configure.in'
--- a/configure.in      2010-04-28 07:08:53 +0000
+++ b/configure.in      2010-04-28 07:15:10 +0000
@@ -2291,6 +2291,7 @@
 ### Use -lgpm if available, unless `--with-gpm=no'.
 HAVE_GPM=no
 LIBGPM=
+GPM_MOUSE_SUPPORT=
 if test "${with_gpm}" != "no"; then
   AC_CHECK_HEADER(gpm.h,
     [AC_CHECK_LIB(gpm, Gpm_Open, HAVE_GPM=yes)])
@@ -2298,9 +2299,11 @@
   if test "${HAVE_GPM}" = "yes"; then
     AC_DEFINE(HAVE_GPM, 1, [Define to 1 if you have the gpm library (-lgpm).])
     LIBGPM=-lgpm
+    GPM_MOUSE_SUPPORT="\${lispsource}mouse.elc"
   fi
 fi
 AC_SUBST(LIBGPM)
+AC_SUBST(GPM_MOUSE_SUPPORT)
 
 dnl Check for malloc/malloc.h on darwin
 AC_CHECK_HEADER(malloc/malloc.h, [AC_DEFINE(HAVE_MALLOC_MALLOC_H, 1, [Define 
to 1 if you have the <malloc/malloc.h> header file.])])

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-28 07:08:53 +0000
+++ b/src/ChangeLog     2010-04-28 07:15:10 +0000
@@ -1,5 +1,8 @@
 2010-04-28  Glenn Morris  <address@hidden>
 
+       * Makefile.in (GPM_MOUSE_SUPPORT): New, set by configure.
+       (MOUSE_SUPPORT) [!HAVE_MOUSE]: Use $GPM_MOUSE_SUPPORT.
+
        * Makefile.in (FONT_OBJ): New, set by configure.
        (FONT_DRIVERS): Use $FONT_OBJ.
 

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-04-28 07:08:53 +0000
+++ b/src/Makefile.in   2010-04-28 07:15:10 +0000
@@ -112,6 +112,10 @@
 ## Only used if HAVE_X_WINDOWS and HAVE_WINDOW_SYSTEM.
 address@hidden@
 
+## ${lispsource}mouse.elc if HAVE_GPM, otherwise empty.
+## Not used if HAVE_MOUSE.
address@hidden@
+
 LIBSELINUX_LIBS = @LIBSELINUX_LIBS@
 
 INTERVALS_H = dispextern.h intervals.h composite.h
@@ -452,11 +456,7 @@
 #define MOUSE_SUPPORT ${lispsource}mouse.elc \
   ${lispsource}select.elc ${lispsource}scroll-bar.elc
 #else
-#ifdef HAVE_GPM
-#define MOUSE_SUPPORT ${lispsource}mouse.elc
-#else
-#define MOUSE_SUPPORT
-#endif
+#define MOUSE_SUPPORT $(GPM_MOUSE_SUPPORT)
 #endif
 
 #ifdef MSDOS