]>
Commit | Line | Data |
---|---|---|
bd5a66ac JB |
1 | --- less-394/configure.ac.orig 2005-10-21 18:21:55.000000000 +0200 |
2 | +++ less-394/configure.ac 2006-02-25 19:02:39.151141750 +0100 | |
3 | @@ -23,10 +23,12 @@ | |
0939e511 | 4 | AC_SYS_LARGEFILE |
69d6be73 | 5 | |
0939e511 | 6 | # Checks for general libraries. |
69d6be73 | 7 | -AC_CHECK_LIB(xcurses, initscr, [have_xcurses=yes], [have_xcurses=no]) |
ddb29dad | 8 | -AC_CHECK_LIB(ncursesw, initscr, [have_ncursesw=yes], [have_ncursesw=no]) |
69d6be73 | 9 | -AC_CHECK_LIB(ncurses, initscr, [have_ncurses=yes], [have_ncurses=no]) |
10 | -AC_CHECK_LIB(curses, initscr, [have_curses=yes], [have_curses=no]) | |
11 | +AC_CHECK_LIB(xcurses, tgetent, [have_xcurses=yes], [have_xcurses=no]) | |
bd5a66ac | 12 | +AC_CHECK_LIB(tinfow, tgetent, [have_tinfow=yes], [have_tinfow=no]) |
ddb29dad | 13 | +AC_CHECK_LIB(ncursesw, tgetent, [have_ncursesw=yes], [have_ncursesw=no]) |
bd5a66ac | 14 | +AC_CHECK_LIB(tinfo, tgetent, [have_tinfo=yes], [have_tinfo=no]) |
0939e511 | 15 | +AC_CHECK_LIB(ncurses, tgetent, [have_ncurses=yes], [have_ncurses=no]) |
69d6be73 | 16 | +AC_CHECK_LIB(curses, tgetent, [have_curses=yes], [have_curses=no]) |
17 | AC_CHECK_LIB(termcap, tgetent, [have_termcap=yes], [have_termcap=no]) | |
18 | AC_CHECK_LIB(termlib, tgetent, [have_termlib=yes], [have_termlib=no]) | |
0939e511 | 19 | # Regular expressions (regcmp) are in -lgen on Solaris 2, |
bd5a66ac JB |
20 | @@ -51,10 +53,10 @@ |
21 | fi | |
22 | ||
23 | if test $curses_broken = 0; then | |
24 | -# -- Try xcurses. | |
25 | +dnl -- Try tinfow. | |
26 | if test "x$TERMLIBS" = x; then | |
27 | - if test $have_xcurses = yes; then | |
28 | - TERMLIBS="-lxcurses" | |
29 | + if test $have_tinfow = yes; then | |
30 | + TERMLIBS="-ltinfow" | |
31 | SAVE_LIBS=$LIBS | |
32 | LIBS="$LIBS $TERMLIBS" | |
33 | AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], | |
34 | @@ -77,6 +79,19 @@ | |
35 | fi | |
36 | fi | |
37 | ||
38 | +dnl -- Try tinfo. | |
39 | +if test "x$TERMLIBS" = x; then | |
40 | + if test $have_tinfo = yes; then | |
41 | + TERMLIBS="-ltinfo" | |
42 | + SAVE_LIBS=$LIBS | |
43 | + LIBS="$LIBS $TERMLIBS" | |
44 | + AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], | |
45 | + [termok=yes], [termok=no]) | |
46 | + LIBS=$SAVE_LIBS | |
47 | + if test $termok = no; then TERMLIBS=""; fi | |
48 | + fi | |
49 | +fi | |
50 | + | |
51 | # -- Try ncurses. | |
52 | if test "x$TERMLIBS" = x; then | |
53 | if test $have_ncurses = yes; then | |
54 | @@ -90,6 +105,19 @@ | |
55 | fi | |
56 | fi | |
57 | ||
58 | +# -- Try xcurses. | |
59 | +if test "x$TERMLIBS" = x; then | |
60 | + if test $have_xcurses = yes; then | |
61 | + TERMLIBS="-lxcurses" | |
62 | + SAVE_LIBS=$LIBS | |
63 | + LIBS="$LIBS $TERMLIBS" | |
64 | + AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], | |
65 | + [termok=yes], [termok=no]) | |
66 | + LIBS=$SAVE_LIBS | |
67 | + if test $termok = no; then TERMLIBS=""; fi | |
68 | + fi | |
69 | +fi | |
70 | + | |
71 | # -- Try curses. | |
72 | if test "x$TERMLIBS" = x; then | |
73 | if test $have_curses = yes; then |