X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=bacula-tinfo-readline.patch;h=fa2c31d587ccdc91f5b56755cf77879899ac07fb;hb=5ac6c43c938b307160fb80b460697f10146c4a7e;hp=52d040d07d84fea6d7d8326aac2aa581fb57b5ea;hpb=9f953f87c3d7ac12a35ffcd9c60d27a8c9d744b7;p=packages%2Fbacula.git

diff --git a/bacula-tinfo-readline.patch b/bacula-tinfo-readline.patch
index 52d040d..fa2c31d 100644
--- a/bacula-tinfo-readline.patch
+++ b/bacula-tinfo-readline.patch
@@ -1,42 +1,19 @@
-diff -urN bacula-2.2.6.org/autoconf/configure.in bacula-2.2.6/autoconf/configure.in
---- bacula-2.2.6.org/autoconf/configure.in	2007-10-24 20:37:02.000000000 +0200
-+++ bacula-2.2.6/autoconf/configure.in	2007-11-24 19:06:59.025825009 +0100
-@@ -574,9 +574,9 @@
+--- bacula-5.0.3/autoconf/configure.in~	2010-08-05 17:29:51.000000000 +0300
++++ bacula-5.0.3/autoconf/configure.in	2010-08-22 18:48:37.975555296 +0300
+@@ -813,11 +813,12 @@
+ fi
  
- got_conio="no"
- if test x$support_conio = xyes; then
--   AC_CHECK_HEADER(termcap.h, 
--     [ AC_CHECK_LIB(termcap, tgetent, 
--       [ CONS_LIBS="-ltermcap"
-+   AC_CHECK_HEADER(ncurses.h, 
-+     [ AC_CHECK_LIB(tinfo, tgetent, 
-+       [ CONS_LIBS="-ltinfo"
- 	 CONS_OBJ="conio.o"
- 	 CONS_SRC="conio.c"
- 	 got_conio="yes"
-@@ -646,7 +646,7 @@
- 	  fi
- 	  AC_CHECK_HEADER(${with_readline}/readline.h, 
- 	     [ AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support])
--	       CONS_LIBS="-lreadline -lhistory -ltermcap"
-+	       CONS_LIBS="-lreadline -lhistory"
- 	       got_readline="yes"   
- 	     ],
- 	     [ echo " "
-@@ -662,14 +662,14 @@
- 	 [ AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support])
- 	   got_readline="yes"
- 	   CONS_INC="-I/usr/include/readline"
--	   CONS_LIBS="-lreadline -ltermcap"
-+	   CONS_LIBS="-lreadline"
- 	 ], [
- 	   # Did not find standard library, so try Bacula's default
- 	    AC_CHECK_HEADER(${TOP_DIR}/depkgs/readline/readline.h, 
- 	      [ AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support])
- 		 got_readline="yes"   
- 		 CONS_INC="-I${TOP_DIR}/depkgs/readline"
--		 CONS_LIBS="-lreadline -lhistory -ltermcap"
-+		 CONS_LIBS="-lreadline -lhistory"
- 		 CONS_LDFLAGS="-L${TOP_DIR}/depkgs/readline"
- 		 PRTREADLINE_SRC="${TOP_DIR}/depkgs/readline"
- 	      ],
+ TERM_LIB=""
+-AC_CHECK_HEADER(curses.h, 
+-  [ AC_CHECK_LIB(ncurses, tgetent, 
+-    [ TERM_LIB="-lncurses" ],
+-    [ AC_CHECK_LIB(termcap, tgetent, [ TERM_LIB="-ltermcap" ])
++AC_CHECK_HEADER(curses.h, [
++  AC_CHECK_LIB(tinfo, tgetent, [ TERM_LIB="-ltinfo" ], [
++   AC_CHECK_LIB(ncurses, tgetent, [ TERM_LIB="-lncurses" ], [
++    AC_CHECK_LIB(termcap, tgetent, [ TERM_LIB="-ltermcap" ])
+     ])
++  ])
+   ],
+   [  AC_CHECK_HEADERS(curses.h)
+      AC_CHECK_HEADER(term.h,