- old one obsolete; try with system readline now

Changed files:
    Firebird-editline.patch -> 1.2

diff --git a/Firebird-editline.patch b/Firebird-editline.patch
index 8f2ea851b59f4018856f0c71c721a08f26fac924..e4cd27e7489f0021526d32fc6c8ab8ba851b547c 100644 (file)
--- a/Firebird-editline.patch
+++ b/Firebird-editline.patch
@@ -1,94 +1,34 @@
---- firebird-1.5.1.4500/src/extern/editline/configure.in.orig  2004-05-23 20:24:25.000000000 +0200
-+++ firebird-1.5.1.4500/src/extern/editline/configure.in       2004-08-08 02:29:06.390960872 +0200
-@@ -8,7 +8,11 @@
- CFLAGS=$CFLAGS
- AC_PROG_CC
- if test "x$CFLAGS" = "x" ; then
--  no_CFLAGS="yes"
-+  if test "x$OPTFLAGS" != "x"; then
-+    CFLAGS="$OPTFLAGS"
-+  else  
-+    no_CFLAGS="yes"
-+  fi
+--- Firebird-2.1.1.17910-0/configure.in.orig   2008-05-27 11:26:28.000000000 +0200
++++ Firebird-2.1.1.17910-0/configure.in        2008-07-18 22:28:11.790034707 +0200
+@@ -399,7 +399,7 @@
+ # not need editline in default libs, but need to test for its presence
+ saveLIBS=$LIBS
+ if test "$STD_EDITLINE" = "true"; then
+-  AC_CHECK_LIB(editline, readline, EDITLINE_FLG=Y, STD_EDITLINE=false)
++  AC_CHECK_LIB(edit, readline, EDITLINE_FLG=Y, STD_EDITLINE=false)

  fi
  fi

- if test "x$no_CFLAGS" = "xyes" -a "x$GCC" = "xyes" ; then
-       CFLAGS="-Wall -pipe -g3"
-@@ -18,6 +22,7 @@
- S_CFLAGS="-fPIC -DPIC"
- AC_SUBST(S_CFLAGS)
- AC_PROG_CPP
-+AC_PROG_EGREP
- dnl Must do this now, otherwise it is only done for NetBSD (see 'case' below)
+ LIBS=$saveLIBS

  
  

- dnl Platform-specific settings.  The ABI can probably be determined
-@@ -63,22 +68,25 @@
- AC_PROG_RANLIB
- AC_PATH_PROG(AR, ar, , $PATH)
+@@ -566,10 +566,10 @@
+ dnl AC_CHECK_LIB(c, main)
+ AC_CHECK_LIB(m, main)
+ if test "$EDITLINE_FLG" = "Y"; then
++      AC_CHECK_LIB(tinfo, tgetent, TERMLIB=tinfo, \
+       AC_CHECK_LIB(curses, tgetent, TERMLIB=curses, \
+               AC_CHECK_LIB(ncurses, tgetent, TERMLIB=ncurses, \
+                       AC_CHECK_LIB(termcap, tgetent, TERMLIB=termcap, \
+-                              AC_CHECK_LIB(tinfo, tgetent, TERMLIB=tinfo, \
+                                       AC_MSG_ERROR(termcap support not found)))))  
+       AC_SUBST(TERMLIB)
+       XE_APPEND(-l$TERMLIB, LIBS)
+--- Firebird-2.1.1.17910-0/builds/posix/make.defaults.orig     2008-07-18 21:24:32.538046000 +0200
++++ Firebird-2.1.1.17910-0/builds/posix/make.defaults  2008-07-18 22:29:07.222040573 +0200
+@@ -230,7 +230,7 @@

  
  

--dnl Search for termcap access routines in termcap, tinfo, curses, and ncurses.
--AC_CHECK_LIB(termcap, tgetent, , \
--  AC_CHECK_LIB(tinfo, tgetent, , \
--    AC_CHECK_LIB(curses, tgetent, , \
--      AC_CHECK_LIB(ncurses, tgetent, , \
--        AC_MSG_ERROR(termcap support not found)))))
--
--dnl Use termcap.h if it exists; otherwise we need both term.h and [n]curses.h.
--AC_CHECK_HEADERS(termcap.h, , \
--  AC_CHECK_HEADERS(term.h, , \
--    AC_MSG_RESULT(Need term.h since termcap.h is missing))
--  AC_CHECK_HEADERS(curses.h, , \
--    AC_CHECK_HEADERS(ncurses.h, , \
--      AC_MSG_RESULT(Need curses.h or ncurses.h))))
-+if test -d /usr/include/ncurses; then
-+      CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
-+fi
-+dnl Search for termcap access routines in tinfo, curses, and ncurses, termcap.
-+AC_CHECK_LIB(tinfo, tgetent, ,[
-+  AC_CHECK_LIB(curses, tgetent, ,[
-+    AC_CHECK_LIB(ncurses, tgetent, ,[
-+      AC_CHECK_LIB(termcap, tgetent, ,[
-+        AC_MSG_ERROR(termcap support not found)])])])])
-+
-+dnl Use term.h (and [n]curses.h) if it exists; otherwise use termcap.h
-+AC_CHECK_HEADERS(term.h,[
-+  AC_CHECK_HEADERS(curses.h, ,[
-+    AC_CHECK_HEADERS(ncurses.h, ,[
-+      AC_MSG_RESULT(Need curses.h or ncurses.h)])])],[
-+  AC_CHECK_HEADERS(termcap.h, ,[
-+    AC_MSG_RESULT(Need termcap.h since term.h is missing)])])
- 
--AC_CHECK_HEADERS(sys/cdefs.h vis.h alloca.h)
-+AC_CHECK_HEADERS(sys/cdefs.h alloca.h)
- 
- AC_CHECK_FUNCS(issetugid)
- AC_CHECK_FUNCS(strlcat, , CCSRCS="$CCSRCS np/strlcat.c")
-@@ -87,6 +95,10 @@
- AC_CHECK_FUNCS(strvis, , CCSRCS="$CCSRCS np/vis.c")
- AC_CHECK_FUNCS(strunvis, , CCSRCS="$CCSRCS np/unvis.c")
- 
-+if test "$ac_cv_func_strvis" = "yes" && test "$ac_cv_func_strunvis" = "yes" ; then
-+      AC_CHECK_HEADERS(vis.h)
-+fi
-+
- AC_EGREP_CPP(yes,
- [#include <sys/cdefs.h>
- #ifdef __RCSID
-@@ -135,7 +147,7 @@
- if test "x$enable_debug" = "xyes" ; then
-   CPPFLAGS="$CPPFLAGS -DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG"
-   CPPFLAGS="$CPPFLAGS -DDEBUG_REFRESH -DDEBUG_PASTE"
--else
-+elif test "x$no_CFLAGS" = "xyes"; then
-   CFLAGS="$CFLAGS -O"
- fi
- 
---- firebird-1.5.1.4500/src/extern/editline/term.c.orig        2004-05-23 20:24:25.000000000 +0200
-+++ firebird-1.5.1.4500/src/extern/editline/term.c     2004-08-08 02:49:13.258489120 +0200
-@@ -63,6 +63,7 @@
- /* Solaris's term.h does horrid things. */
- #if (defined(HAVE_TERM_H) && !defined(SUNOS))
- #include <term.h>
-+#undef key_clear
- #endif
- #include <sys/types.h>
- #include <sys/ioctl.h>
+ ifeq ($(EDITLINE_FLG),Y)
+   ifeq ($(STD_EDITLINE), true)
+-      LIBEDITLINE := -leditline
++      LIBEDITLINE := -ledit
+   else
+       LIBEDITLINE := $(LIB)/libeditline.a
+   endif