diff options
author | Christopher Faylor <me+cygwin@cgf.cx> | 1999-02-04 05:21:55 +0000 |
---|---|---|
committer | Christopher Faylor <me+cygwin@cgf.cx> | 1999-02-04 05:21:55 +0000 |
commit | 2ab6ecfc96a414de49baca406475adf704b7a73c (patch) | |
tree | 2e7801b86e4abe2d6e9dd09f1f95d1111144f222 /gdb/configure.in | |
parent | a12bb0d8534863dc82c392f5367e4e85aca748df (diff) | |
download | gdb-2ab6ecfc96a414de49baca406475adf704b7a73c.zip gdb-2ab6ecfc96a414de49baca406475adf704b7a73c.tar.gz gdb-2ab6ecfc96a414de49baca406475adf704b7a73c.tar.bz2 |
* configure.in: Move termcap determination a later in the file to catch
setting of cygwin flag.
* configure: Regenerate.
Diffstat (limited to 'gdb/configure.in')
-rw-r--r-- | gdb/configure.in | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/gdb/configure.in b/gdb/configure.in index 4b292c8..226f093 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -121,23 +121,6 @@ dnl under Solaris 2.6 because it is some funky empty library. dnl So only link in libw if we have to. AC_CHECK_LIB(c, wctype,: ,AC_CHECK_LIB(w, wctype)) -dnl Figure out which term library to use. -if test x$gdb_cv_os_cygwin = xyes; then - TERM_LIB='`if test -r ../libtermcap/libtermcap.a; then echo ../libtermcap/libtermcap.a; else echo -ltermcap; fi`' -else - TERM_LIB= - AC_CHECK_LIB(ncurses, tgetent, TERM_LIB=-lncurses, - AC_CHECK_LIB(termlib, tgetent, TERM_LIB=-ltermlib, - AC_CHECK_LIB(termcap, tgetent, TERM_LIB=-ltermcap, - AC_CHECK_LIB(curses, tgetent, TERM_LIB=-lcurses, - AC_CHECK_LIB(terminfo, tgetent, TERM_LIB=-lterminfo))))) - - if test "x$TERM_LIB" = x - then - AC_MSG_ERROR(Could not find a term library, e.g. termcap or termlib!) - fi -fi - AC_SUBST(TERM_LIB) dnl See if compiler supports "long long" type. @@ -639,6 +622,23 @@ AC_CACHE_CHECK([for cygwin], gdb_cv_os_cygwin, lose #endif],[gdb_cv_os_cygwin=yes],[gdb_cv_os_cygwin=no])]) +dnl Figure out which term library to use. +if test x$gdb_cv_os_cygwin = xyes; then + TERM_LIB='`if test -r ../libtermcap/libtermcap.a; then echo ../libtermcap/libtermcap.a; else echo -ltermcap; fi`' +else + TERM_LIB= + AC_CHECK_LIB(ncurses, tgetent, TERM_LIB=-lncurses, + AC_CHECK_LIB(termlib, tgetent, TERM_LIB=-ltermlib, + AC_CHECK_LIB(termcap, tgetent, TERM_LIB=-ltermcap, + AC_CHECK_LIB(curses, tgetent, TERM_LIB=-lcurses, + AC_CHECK_LIB(terminfo, tgetent, TERM_LIB=-lterminfo))))) + + if test "x$TERM_LIB" = x + then + AC_MSG_ERROR(Could not find a term library, e.g. termcap or termlib!) + fi +fi + WIN32LIBS= WIN32LDAPP= AC_SUBST(WIN32LIBS) |