- patch replaced with new one: some tinfo functions are used directly - link

[packages/ettercap.git] / ettercap-ncurses.patch

diff --git a/ettercap-ncurses.patch b/ettercap-ncurses.patch
index db7f306a84cb1c66f3cfbf936403d428ee496079..c42e63599397d261ffc13ff507b229b8ac5c07c8 100644 (file)
--- a/ettercap-ncurses.patch
+++ b/ettercap-ncurses.patch
@@ -1,29 +1,47 @@
---- configure.in.orig  Wed Jun  5 07:32:08 2002
-+++ configure.in       Wed Jun  5 07:33:42 2002
-@@ -444,7 +444,7 @@
-    AC_CHECK_LIB(ncurses,newpad,,ncurses_warn=1)
- 
-    if test $ncurses_warn -ne 1; then
--      AC_CHECK_HEADERS(ncurses.h,,ncurses_warn=2)
-+      AC_CHECK_HEADERS(ncurses/ncurses.h,,ncurses_warn=2)
-       if test $ncurses_warn -ne 2; then
-          AC_DEFINE(HAVE_NCURSES,1)
-          ac_cv_ec_ncurses=yes
-@@ -454,7 +454,7 @@
-       AC_CHECK_LIB(curses,mvwgetnstr,,curses_warn=1)
- 
-       if test $curses_warn -ne 1; then
--         AC_CHECK_HEADERS(curses.h,,curses_warn=2)
-+         AC_CHECK_HEADERS(ncurses/curses.h,,curses_warn=2)
-          if test $curses_warn -ne 2; then
-             AC_DEFINE(HAVE_NCURSES,1)
-             ac_cv_ec_ncurses=yes
-@@ -573,7 +573,7 @@
-       ac_cv_ec_debug=yes
-       ;;
-    no)  AC_MSG_RESULT(no.)
--      E_CFLAGS="-O2 -funroll-loops -fomit-frame-pointer -Wall"
-+      E_CFLAGS="${CFLAGS} -fomit-frame-pointer -Wall"
-       ac_cv_ec_debug=no
-       ;;
- esac ],
+--- ettercap-NG-0.7.3/configure.in~    2010-06-19 15:46:50.853044834 +0200
++++ ettercap-NG-0.7.3/configure.in     2010-06-19 15:49:05.153040338 +0200
+@@ -676,7 +676,7 @@
+         owd=`pwd`
+         if cd $withval; then withval=`pwd`; cd $owd; fi
+         NCURSINC="-I$withval"
+-        NCURSLIB="-L$withval -lpanel -lmenu -lform -lncurses"
++        NCURSLIB="-L$withval -lpanel -lmenu -lform -lncurses -ltinfo"
+         AC_DEFINE(HAVE_NCURSES, 1)
+         AM_CONDITIONAL(NCURSES, true)
+         ac_ec_libncurses=$withval
+@@ -688,7 +688,7 @@
+         owd=`pwd`
+         if cd $withval; then withval=`pwd`; cd $owd; fi
+         NCURSINC="-I$withval/include"
+-        NCURSLIB="-L$withval/lib -lpanel -lmenu -lform -lncurses"
++        NCURSLIB="-L$withval/lib -lpanel -lmenu -lform -lncurses -ltinfo"
+         AC_DEFINE(HAVE_NCURSES, 1)
+         AM_CONDITIONAL(NCURSES, true)
+         ac_ec_libncurses=$withval
+@@ -700,7 +700,7 @@
+         owd=`pwd`
+         if cd $withval; then withval=`pwd`; cd $owd; fi
+         NCURSINC="-I$withval/include/ncurses"
+-        NCURSLIB="-L$withval/lib -lpanel -lmenu -lform -lncurses"
++        NCURSLIB="-L$withval/lib -lpanel -lmenu -lform -lncurses -ltinfo"
+         AC_DEFINE(HAVE_NCURSES, 1)
+         AM_CONDITIONAL(NCURSES, true)
+         ac_ec_libncurses=$withval
+@@ -718,7 +718,7 @@
+          AC_MSG_RESULT(no)
+      else 
+          NCURSINC="-I/usr/include/ncurses"
+-         NCURSLIB="-lpanel -lmenu -lform -lncurses"
++         NCURSLIB="-lpanel -lmenu -lform -lncurses -ltinfo"
+          AC_DEFINE(HAVE_NCURSES, 1)
+          AM_CONDITIONAL(NCURSES, true)
+          ac_ec_libncurses=default
+@@ -730,7 +730,7 @@
+                -a -f /usr/include/panel.h; then
+          AC_MSG_RESULT(no)
+      else 
+-         NCURSLIB="-lpanel -lmenu -lform -lncurses"
++         NCURSLIB="-lpanel -lmenu -lform -lncurses -ltinfo"
+          AC_DEFINE(HAVE_NCURSES, 1)
+          AM_CONDITIONAL(NCURSES, true)
+          ac_ec_libncurses=default