mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* acinclude.m4: Put -lncurses to MCLIBS, not LIBS. 

* configure.in: Likewise.  Add MCLIBS to LIBS temporarily when
testing for functions in ncurses.
This commit is contained in:
Pavel Roskin 2001-09-11 01:29:29 +00:00
parent 5452cf366a
commit eb67c01aef
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2001-09-10 Pavel Roskin <proski@gnu.org> 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. * acinclude.m4: Provide descriptions in all AC_DEFINE macros.
* configure.in: Likewise. Use AH_BOTTOM to include extraconf.h. * configure.in: Likewise. Use AH_BOTTOM to include extraconf.h.
* acconfig.h: Remove. * acconfig.h: Remove.

2
acinclude.m4
View File

@ -740,7 +740,7 @@ AC_DEFUN([AC_NCURSES], [
if test -f $1/$2 if test -f $1/$2
then then
AC_MSG_RESULT([Found ncurses on $1/$2]) AC_MSG_RESULT([Found ncurses on $1/$2])
LIBS="$LIBS $3" MCLIBS="$MCLIBS $3"
CPPFLAGS="$CPPFLAGS $4" CPPFLAGS="$CPPFLAGS $4"
search_ncurses=false search_ncurses=false
screen_manager=$5 screen_manager=$5

5
configure.in
View File

@ -320,7 +320,7 @@ AC_ARG_WITH(ncurses,
then then
search_ncurses=true search_ncurses=true
else else
LIBS="$LIBS -L$withval/lib -lncurses" MCLIBS="$MCLIBS -L$withval/lib -lncurses"
CPPFLAGS="$CPPFLAGS -I$withval/include" CPPFLAGS="$CPPFLAGS -I$withval/include"
search_ncurses=false search_ncurses=false
screen_manager="ncurses" 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 or you'll have to press Esc three times to dismiss a dialog box.
dnl dnl
if test -n "$ncurses_version"; then if test -n "$ncurses_version"; then
save_LIBS="$LIBS"
LIBS="$MCLIBS $LIBS"
AC_CACHE_CHECK([for ESCDELAY variable], AC_CACHE_CHECK([for ESCDELAY variable],
[mc_cv_ncurses_escdelay], [mc_cv_ncurses_escdelay],
[AC_TRY_COMPILE([], [ [AC_TRY_COMPILE([], [
@ -711,6 +713,7 @@ if test -n "$ncurses_version"; then
fi fi
AC_CHECK_FUNCS(resizeterm keyok) AC_CHECK_FUNCS(resizeterm keyok)
LIBS="$save_LIBS"
fi fi
if test "x$screen_manager" = "xunknown"; then if test "x$screen_manager" = "xunknown"; then