[Pkg-jed-commit] [SCM] Debian packaging of JED branch, jo-upstream-fixes, updated. 7067e34ff233dc4deb3d352dc2c063c2504c7309

[Jörg Sommer]

The following commit has been merged in the jo-upstream-fixes branch:
commit 41a39513fab2f5875543967adc9a2b326f080b0e
Author: Jörg Sommer <joerg at alea.gnuu.de>
Date:   Fri May 30 00:47:52 2008 +0200

    Support for gpm in configure

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index e4ecc63..273dec5 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -92,6 +92,23 @@ else
      fi])
 fi
 
+AC_ARG_ENABLE(gpm,
+  AS_HELP_STRING([--disable-gpm], [disable gpm mouse support]),
+  [enable_gpm=$enableval], [enable_gpm=default])
+if test X"$enable_gpm" = Xno
+then
+  AC_MSG_NOTICE(checking for gpm disabled)
+else
+  AC_CHECK_LIB(gpm, Gpm_Open,
+    [MOUSELIB="-lgpm"
+     AC_SUBST(MOUSELIB)
+     AC_DEFINE(USE_GPM_MOUSE)],
+    [if test X"$enable_xft" = Xyes
+     then
+       AC_MSG_FAILURE([libgpm not found])
+     fi])
+fi
+
 dnl #------------------------------------------------------------------------
 dnl JD_CHECK_FOR_LIBRARY(pcre)
 dnl if test $jd_with_pcre_library = yes
@@ -136,8 +153,6 @@ echo "    CFLAGS =" "$CFLAGS"
 echo "   LDFLAGS =" "$LDFLAGS"
 echo "  JED_ROOT =" "$JED_ROOT"
 echo ""
-echo "Also edit src/Makefile to enable:"
-echo "  GPM Mouse support (Linux)"
 echo "You may also want to edit src/jed-feat.h to enable or disable some features."
 echo ""
 echo "Before typing 'make', type 'make clean' first."
diff --git a/src/Makefile.in b/src/Makefile.in
index 0e529dd..ba7fcbf 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -50,15 +50,12 @@ SRCDIR = @SRCDIR@
 # Location of compiled object code (absolute path)
 OBJDIR = @OBJDIR@
 
-#---------------------------------------------------------------------------
-# Special features (See also features.h)
-#---------------------------------------------------------------------------
-# 1. Linux GPM Mouse support
-#    Uncomment next FOUR lines for GPM mouse support
-#MOUSEFLAGS = -DUSE_GPM_MOUSE
-#MOUSELIB = -lgpm
-#GPMMOUSEO = gpmmouse.o
-#OBJGPMMOUSEO = $(OBJDIR)/$(GPMMOUSEO)
+# Linux GPM Mouse support
+MOUSELIB = @MOUSELIB@
+ifneq (,$(MOUSELIB))
+    GPMMOUSEO = gpmmouse.o
+    OBJGPMMOUSEO = $(OBJDIR)/$(GPMMOUSEO)
+endif
 
 #---------------------------------------------------------------------------
 # S-Lang library location
@@ -96,7 +93,7 @@ MAX_SLANG_VERSION =
 XLIB = $(X_XTRA_LIBS) $(XLIBDIR) -lX11 $(TERMCAP_LIB) $(OTHERLIBS)
 MISCLIBS = $(MOUSELIB) $(TERMCAP_LIB) $(OTHERLIBS)
 
-ALL_CFLAGS = $(CFLAGS) -Dunix -DJED $(MOUSEFLAGS) $(SLANG_INC)
+ALL_CFLAGS = $(CFLAGS) -Dunix -DJED $(SLANG_INC)
 COMPILE_CMD = \
  $(CC) -c $(ALL_CFLAGS) $(XINCLUDE) -DJED_ROOT='"$(JED_ROOT)"'
 
diff --git a/src/config.hin b/src/config.hin
index b1ad074..1f0e8a1 100644
--- a/src/config.hin
+++ b/src/config.hin
@@ -135,6 +135,8 @@
 
 #define HAS_MOUSE 1
 
+#undef USE_GPM_MOUSE
+
 /* Set this to 1 if the filesystem is case-sensitive */
 #define JED_FILE_PRESERVE_CASE 1
 

-- 
Debian packaging of JED