- updated to 6.4.3

[packages/grass.git] / ncurses.patch

diff --git a/ncurses.patch b/ncurses.patch
index 2d1c0503e78c7f121d4e42e6dbdfacbbfca073e8..148c823a7890cd182eaed39757f0004c3c6abbc2 100644 (file)
--- a/ncurses.patch
+++ b/ncurses.patch
@@ -14,51 +14,39 @@ also as regeneration fails, we change also configure
      AC_MSG_ERROR([*** Unable to locate curses library.])
      CURSESLIB=
  ])])
---- grass-6.4.0/configure~     2010-08-15 23:34:39.000000000 +0300
-+++ grass-6.4.0/configure      2010-12-26 23:34:45.961470697 +0200
-@@ -5702,12 +5702,12 @@
+--- grass-6.4.3/configure.orig 2013-07-27 20:44:57.000000000 +0200
++++ grass-6.4.3/configure      2014-05-18 18:30:25.673456894 +0200
+@@ -5718,12 +5718,12 @@
  
  echo "$ac_t""$CURSES_MAXY" 1>&6
  
 -echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
--echo "configure:5707: checking for initscr in -lncurses" >&5
+-echo "configure:5723: checking for initscr in -lncurses" >&5
 +echo $ac_n "checking for initscr in -lncursesw""... $ac_c" 1>&6
-+echo "configure:5707: checking for initscr in -lncursesw" >&5
++echo "configure:5723: checking for initscr in -lncursesw" >&5
  ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'`
  
  ac_save_LIBS="$LIBS"
 -LIBS="-lncurses  $LIBS"
 +LIBS="-lncursesw  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 5713 "configure"
+ #line 5729 "configure"
  #include "confdefs.h"
-@@ -5734,16 +5734,16 @@
+@@ -5750,7 +5750,7 @@
  
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  CURSESLIB=-lncurses
-+  CURSESLIB="-lncursesw -ltinfo"
++  CURSESLIB=-lncursesw
  else
    echo "$ac_t""no" 1>&6
  
--echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6
--echo "configure:5743: checking for initscr in -lcurses" >&5
-+echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
-+echo "configure:5743: checking for initscr in -lncurses" >&5
- ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'`
- 
- ac_save_LIBS="$LIBS"
--LIBS="-lcurses  $LIBS"
-+LIBS="-lncurses  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 5749 "configure"
- #include "confdefs.h"
-@@ -5770,7 +5770,7 @@
+@@ -5786,7 +5786,7 @@
  
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  CURSESLIB=-lcurses
-+  CURSESLIB="-lncurses -ltinfo"
++  CURSESLIB=-lncurses
  else
    echo "$ac_t""no" 1>&6