SOURCES: jed-ac_am.patch, jed-makefile.patch - up for new jed snap

[arekm]

Author: arekm                        Date: Fri Sep 16 07:59:39 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up for new jed snap

---- Files affected:
SOURCES:
   jed-ac_am.patch (1.2 -> 1.3) , jed-makefile.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/jed-ac_am.patch
diff -u SOURCES/jed-ac_am.patch:1.2 SOURCES/jed-ac_am.patch:1.3
--- SOURCES/jed-ac_am.patch:1.2	Wed Jul  7 13:17:30 2004
+++ SOURCES/jed-ac_am.patch	Fri Sep 16 09:59:33 2005
@@ -1,18 +1,20 @@
---- jed-0.99-16/autoconf/aclocal.m4.orig	2002-10-20 08:55:30.000000000 +0200
-+++ jed-0.99-16/autoconf/aclocal.m4	2004-07-07 13:16:19.944593232 +0200
-@@ -174,10 +174,7 @@
- test "x$exec_prefix" = "xNONE" && exec_prefix="$prefix"
- JD_Search_Dirs="$JD_Search_Dirs \
-                 $includedir,$libdir \
+diff -urN jed-B0.99-17.111.org/autoconf/aclocal.m4 jed-B0.99-17.111/autoconf/aclocal.m4
+--- jed-B0.99-17.111.org/autoconf/aclocal.m4	2005-07-25 06:37:22.000000000 +0200
++++ jed-B0.99-17.111/autoconf/aclocal.m4	2005-09-16 09:55:30.489122128 +0200
+@@ -207,11 +207,7 @@
+ # the other directories may have a better chance of containing a more recent
+ # version.
+ 
+-JD_Search_Dirs="$JD_Search_Dirs \
 -                /usr/local/include,/usr/local/lib \
 -		/usr/include,/usr/lib \
 -		/usr/include/$1,/usr/lib \
 -		/usr/include/$1,/usr/lib/$1"
-+		/usr/include/$1,$libdir"
++JD_Search_Dirs="/usr/include/$1,$libdir"
  
  echo looking for the JD_UP_NAME library
  
-@@ -187,21 +184,13 @@
+@@ -221,21 +217,13 @@
    generic_include=`echo $include_and_lib | tr ',' ' ' | awk '{print [$]1}'`
    generic_lib=`echo $include_and_lib | tr ',' ' ' | awk '{print [$]2}'`
    echo Looking for $1.h in $generic_include

================================================================
Index: SOURCES/jed-makefile.patch
diff -u SOURCES/jed-makefile.patch:1.5 SOURCES/jed-makefile.patch:1.6
--- SOURCES/jed-makefile.patch:1.5	Tue Nov 25 23:52:16 2003
+++ SOURCES/jed-makefile.patch	Fri Sep 16 09:59:34 2005
@@ -1,11 +1,11 @@
---- jed-0.99-16/src/Makefile.in.orig	2002-10-20 08:55:30.000000000 +0200
-+++ jed-0.99-16/src/Makefile.in	2003-11-25 23:48:06.000000000 +0100
-@@ -14,9 +14,11 @@
+diff -urN jed-B0.99-17.111.org/src/Makefile.in jed-B0.99-17.111/src/Makefile.in
+--- jed-B0.99-17.111.org/src/Makefile.in	2005-07-25 06:37:23.000000000 +0200
++++ jed-B0.99-17.111/src/Makefile.in	2005-09-16 09:53:34.576743488 +0200
+@@ -14,9 +14,10 @@
  exec_prefix = @exec_prefix@
  #JED_ROOT = $(HOME)/src/jed# <--- make sure # is at end of file!!
  #JED_ROOT = $(prefix)/jed# <--- make sure # is at end of file!!
 -JED_ROOT = @JED_ROOT@# <--- make sure # is at end of file!!
-+#JED_ROOT = @JED_ROOT@# <--- make sure # is at end of file!!
 +JED_ROOT = @datadir@/jed# <--- make sure # is at end of file!!
  BIN_DIR = @bindir@
  MAN_DIR = @mandir@/man1
@@ -13,15 +13,15 @@
  INSTALL		= @INSTALL@
  INSTALL_DATA	= @INSTALL_DATA@
  MKINSDIR = ../autoconf/mkinsdir.sh
-@@ -51,10 +53,10 @@
+@@ -51,10 +52,10 @@
  #---------------------------------------------------------------------------
  # 1. Linux GPM Mouse support
  #    Uncomment next FOUR lines for GPM mouse support
--#MOUSEFLAGS = -DHAS_GPM_MOUSE
+-#MOUSEFLAGS = -DUSE_GPM_MOUSE
 -#MOUSELIB = -lgpm
 -#GPMMOUSEO = gpmmouse.o
 -#OBJGPMMOUSEO = $(OBJDIR)/$(GPMMOUSEO)
-+MOUSEFLAGS = -DHAS_GPM_MOUSE
++MOUSEFLAGS = -DUSE_GPM_MOUSE
 +MOUSELIB = -lgpm
 +GPMMOUSEO = gpmmouse.o
 +OBJGPMMOUSEO = $(OBJDIR)/$(GPMMOUSEO)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/jed-ac_am.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/jed-makefile.patch?r1=1.5&r2=1.6&f=u