]>
Commit | Line | Data |
---|---|---|
08c264d4 JB |
1 | --- vte-0.14.1/configure.in.orig 2006-12-10 11:58:20.655981000 +0100 |
2 | +++ vte-0.14.1/configure.in 2006-12-10 12:10:32.397680585 +0100 | |
3 | @@ -31,7 +31,7 @@ | |
4 | if test -d "$ac_x_includes" ; then | |
5 | X_CFLAGS="-I$ac_x_includes $X_CFLAGS" | |
6 | fi | |
7 | - X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" | |
8 | + X_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS" | |
9 | if test -d "$ac_x_libraries" ; then | |
10 | X_LIBS="-L$ac_x_libraries $X_LIBS" | |
11 | fi | |
12 | @@ -266,9 +266,9 @@ | |
13 | AC_CHECK_FUNC(floor,,AC_CHECK_LIB(m,floor,LIBS=["$LIBS -lm"])) | |
14 | ||
15 | # Look for ncurses or curses or termcap. | |
16 | -AC_CHECK_HEADER(ncurses.h,[AC_CHECK_HEADER(term.h,[AC_CHECK_LIB(ncurses,tgetent,[LIBS="-lncurses $LIBS";AC_DEFINE(HAVE_NCURSES,1,[Define if you have ncurses.h and libncurses])])])]) | |
17 | -if test x$ac_cv_lib_ncurses_tgetent != xyes ; then | |
18 | - AC_CHECK_HEADER(ncurses/curses.h,[AC_CHECK_HEADER(ncurses/term.h,[AC_CHECK_LIB(ncurses,tgetent,[LIBS="-lncurses $LIBS";AC_DEFINE(HAVE_NCURSES_CURSES,1,[Define if you have ncurses/curses.h and libncurses])])])]) | |
19 | - if test x$ac_cv_lib_ncurses_tgetent != xyes ; then | |
20 | +AC_CHECK_HEADER(ncurses.h,[AC_CHECK_HEADER(term.h,[AC_CHECK_LIB(tinfo,tgetent,[LIBS="-ltinfo $LIBS";AC_DEFINE(HAVE_NCURSES,1,[Define if you have ncurses.h and libncurses])],[AC_CHECK_LIB(ncurses,tgetent,[LIBS="-lncurses $LIBS";AC_DEFINE(HAVE_NCURSES,1,[Define if you have ncurses.h and libncurses])])])])]) | |
21 | +if test x$ac_cv_lib_ncurses_tgetent != xyes -a x$ac_cv_lib_tinfo_tgetent != xyes ; then | |
22 | + AC_CHECK_HEADER(ncurses/curses.h,[AC_CHECK_HEADER(ncurses/term.h,[AC_CHECK_LIB(tinfo,tgetent,[LIBS="-ltinfo $LIBS";AC_DEFINE(HAVE_NCURSES_CURSES,1,[Define if you have ncurses/curses.h and libncurses])],[AC_CHECK_LIB(ncurses,tgetent,[LIBS="-lncurses $LIBS";AC_DEFINE(HAVE_NCURSES_CURSES,1,[Define if you have ncurses/curses.h and libncurses])])])])]) | |
23 | + if test x$ac_cv_lib_ncurses_tgetent != xyes -a x$ac_cv_lib_tinfo_tgetent != xyes ; then | |
24 | AC_CHECK_HEADER(curses.h,[AC_CHECK_HEADER(term.h,[AC_CHECK_LIB(curses,tgetent,[LIBS="-lcurses $LIBS";AC_DEFINE(HAVE_CURSES,1,[Define if you have curses.h and libcurses])])])]) | |
25 | if test x$ac_cv_lib_curses_tgetent != xyes ; then |