* acinclude.m4: Put -lncurses to MCLIBS, not LIBS.
* configure.in: Likewise. Add MCLIBS to LIBS temporarily when testing for functions in ncurses.
Этот коммит содержится в:
родитель
5452cf366a
Коммит
eb67c01aef
@ -1,5 +1,9 @@
|
||||
2001-09-10 Pavel Roskin <proski@gnu.org>
|
||||
|
||||
* acinclude.m4: Put -lncurses to MCLIBS, not LIBS.
|
||||
* configure.in: Likewise. Add MCLIBS to LIBS temporarily when
|
||||
testing for functions in ncurses.
|
||||
|
||||
* acinclude.m4: Provide descriptions in all AC_DEFINE macros.
|
||||
* configure.in: Likewise. Use AH_BOTTOM to include extraconf.h.
|
||||
* acconfig.h: Remove.
|
||||
|
@ -740,7 +740,7 @@ AC_DEFUN([AC_NCURSES], [
|
||||
if test -f $1/$2
|
||||
then
|
||||
AC_MSG_RESULT([Found ncurses on $1/$2])
|
||||
LIBS="$LIBS $3"
|
||||
MCLIBS="$MCLIBS $3"
|
||||
CPPFLAGS="$CPPFLAGS $4"
|
||||
search_ncurses=false
|
||||
screen_manager=$5
|
||||
|
@ -320,7 +320,7 @@ AC_ARG_WITH(ncurses,
|
||||
then
|
||||
search_ncurses=true
|
||||
else
|
||||
LIBS="$LIBS -L$withval/lib -lncurses"
|
||||
MCLIBS="$MCLIBS -L$withval/lib -lncurses"
|
||||
CPPFLAGS="$CPPFLAGS -I$withval/include"
|
||||
search_ncurses=false
|
||||
screen_manager="ncurses"
|
||||
@ -692,6 +692,8 @@ dnl If ncurses exports the ESCDELAY variable it should be set to 0
|
||||
dnl or you'll have to press Esc three times to dismiss a dialog box.
|
||||
dnl
|
||||
if test -n "$ncurses_version"; then
|
||||
save_LIBS="$LIBS"
|
||||
LIBS="$MCLIBS $LIBS"
|
||||
AC_CACHE_CHECK([for ESCDELAY variable],
|
||||
[mc_cv_ncurses_escdelay],
|
||||
[AC_TRY_COMPILE([], [
|
||||
@ -711,6 +713,7 @@ if test -n "$ncurses_version"; then
|
||||
fi
|
||||
|
||||
AC_CHECK_FUNCS(resizeterm keyok)
|
||||
LIBS="$save_LIBS"
|
||||
fi
|
||||
|
||||
if test "x$screen_manager" = "xunknown"; then
|
||||
|
Загрузка…
Ссылка в новой задаче
Block a user