From 658f86ca324cf730f343a6d87597df639282b53b Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Wed, 28 Apr 2010 00:15:10 -0700
Subject: [PATCH] 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.

---
 ChangeLog       |  2 ++
 configure.in    |  3 +++
 src/ChangeLog   |  3 +++
 src/Makefile.in | 10 +++++-----
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 639ba623e91..f3dff879491 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2010-04-28  Glenn Morris  <rgm@gnu.org>
 
+	* configure.in (GPM_MOUSE_SUPPORT): New output variable.
+
 	* configure.in (FONT_OBJ): New output variable.
 
 	* configure.in (LIBXMU): New output variable.
diff --git a/configure.in b/configure.in
index 89f2b47ff8f..f283290f580 100644
--- a/configure.in
+++ b/configure.in
@@ -2291,6 +2291,7 @@ fi
 ### 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 "${with_gpm}" != "no"; then
   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.])])
diff --git a/src/ChangeLog b/src/ChangeLog
index 53eab88cc39..4c974495a2f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2010-04-28  Glenn Morris  <rgm@gnu.org>
 
+	* 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.
 
diff --git a/src/Makefile.in b/src/Makefile.in
index a90b0ef862d..ca6a6acd955 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -112,6 +112,10 @@ NS_SUPPORT=@NS_SUPPORT@
 ## Only used if HAVE_X_WINDOWS and HAVE_WINDOW_SYSTEM.
 FONT_OBJ=@FONT_OBJ@
 
+## ${lispsource}mouse.elc if HAVE_GPM, otherwise empty.
+## Not used if HAVE_MOUSE.
+GPM_MOUSE_SUPPORT=@GPM_MOUSE_SUPPORT@
+
 LIBSELINUX_LIBS = @LIBSELINUX_LIBS@
 
 INTERVALS_H = dispextern.h intervals.h composite.h
@@ -452,11 +456,7 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(WIDGET_OBJ) $(LIBOBJS)
 #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
-- 
2.39.2