- updated to 2.5.0

[packages/Firebird.git] / Firebird-editline.patch

diff --git a/Firebird-editline.patch b/Firebird-editline.patch
index e4cd27e7489f0021526d32fc6c8ab8ba851b547c..6078bb3211507b2d5735d17d342b5596812f46f0 100644 (file)
--- a/Firebird-editline.patch
+++ b/Firebird-editline.patch
@@ -1,16 +1,7 @@
---- 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
- LIBS=$saveLIBS
- 
-@@ -566,10 +566,10 @@
- dnl AC_CHECK_LIB(c, main)
+--- Firebird-2.5.0.26074-0/configure.in.orig   2010-09-08 10:44:05.000000000 +0200
++++ Firebird-2.5.0.26074-0/configure.in        2010-10-27 22:32:38.567739367 +0200
+@@ -652,10 +652,10 @@
+ AC_SEARCH_LIBS(dlopen, dl)
  AC_CHECK_LIB(m, main)
  if test "$EDITLINE_FLG" = "Y"; then
 +      AC_CHECK_LIB(tinfo, tgetent, TERMLIB=tinfo, \
@@ -18,17 +9,6 @@
                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_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 @@
- 
- ifeq ($(EDITLINE_FLG),Y)
-   ifeq ($(STD_EDITLINE), true)
--      LIBEDITLINE := -leditline
-+      LIBEDITLINE := -ledit
-   else
-       LIBEDITLINE := $(LIB)/libeditline.a
-   endif