]>
Commit | Line | Data |
---|---|---|
6c760b77 ER |
1 | this is ugly, really these libs should be checked in order |
2 | also as regeneration fails, we change also configure | |
3 | ||
4 | --- grass-6.4.0/configure.in~ 2010-08-15 23:34:39.000000000 +0300 | |
5 | +++ grass-6.4.0/configure.in 2010-12-26 22:26:02.982445841 +0200 | |
6 | @@ -514,8 +514,8 @@ | |
7 | AC_SUBST(CURSES_MAXY) | |
8 | AC_MSG_RESULT($CURSES_MAXY) | |
9 | ||
10 | -AC_CHECK_LIB(ncurses, initscr, CURSESLIB=-lncurses, [ | |
11 | -AC_CHECK_LIB(curses, initscr, CURSESLIB=-lcurses, [ | |
12 | +AC_CHECK_LIB(ncursesw, initscr, CURSESLIB="-lncursesw -ltinfow", [ | |
13 | +AC_CHECK_LIB(ncurses, initscr, CURSESLIB="-lncurses -ltinfo", [ | |
14 | AC_MSG_ERROR([*** Unable to locate curses library.]) | |
15 | CURSESLIB= | |
16 | ])]) | |
1f82d375 TP |
17 | --- grass-6.4.0/configure.orig 2011-03-10 10:54:19.000000000 +0100 |
18 | +++ grass-6.4.0/configure 2011-07-05 12:50:33.000000000 +0200 | |
19 | @@ -5716,12 +5716,12 @@ EOF | |
6c760b77 ER |
20 | |
21 | echo "$ac_t""$CURSES_MAXY" 1>&6 | |
22 | ||
23 | -echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 | |
1f82d375 | 24 | -echo "configure:5721: checking for initscr in -lncurses" >&5 |
6c760b77 | 25 | +echo $ac_n "checking for initscr in -lncursesw""... $ac_c" 1>&6 |
1f82d375 | 26 | +echo "configure:5721: checking for initscr in -lncursesw" >&5 |
6c760b77 ER |
27 | ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'` |
28 | ||
29 | ac_save_LIBS="$LIBS" | |
30 | -LIBS="-lncurses $LIBS" | |
31 | +LIBS="-lncursesw $LIBS" | |
32 | cat > conftest.$ac_ext <<EOF | |
1f82d375 | 33 | #line 5727 "configure" |
6c760b77 | 34 | #include "confdefs.h" |
1f82d375 | 35 | @@ -5748,16 +5748,16 @@ LIBS="$ac_save_LIBS" |
6c760b77 ER |
36 | |
37 | if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then | |
38 | echo "$ac_t""yes" 1>&6 | |
39 | - CURSESLIB=-lncurses | |
40 | + CURSESLIB="-lncursesw -ltinfo" | |
41 | else | |
42 | echo "$ac_t""no" 1>&6 | |
43 | ||
44 | -echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6 | |
1f82d375 TP |
45 | -echo "configure:5757: checking for initscr in -lcurses" >&5 |
46 | -ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'` | |
6c760b77 | 47 | +echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 |
1f82d375 TP |
48 | +echo "configure:5757: checking for initscr in -lncurses" >&5 |
49 | +ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'` | |
6c760b77 ER |
50 | |
51 | ac_save_LIBS="$LIBS" | |
52 | -LIBS="-lcurses $LIBS" | |
53 | +LIBS="-lncurses $LIBS" | |
54 | cat > conftest.$ac_ext <<EOF | |
1f82d375 | 55 | #line 5763 "configure" |
6c760b77 | 56 | #include "confdefs.h" |
1f82d375 | 57 | @@ -5784,7 +5784,7 @@ LIBS="$ac_save_LIBS" |
6c760b77 ER |
58 | |
59 | if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then | |
60 | echo "$ac_t""yes" 1>&6 | |
61 | - CURSESLIB=-lcurses | |
62 | + CURSESLIB="-lncurses -ltinfo" | |
63 | else | |
64 | echo "$ac_t""no" 1>&6 | |
65 |