Ticket #1423 ([FreeBSD] Fail to compile with option '--with-screen=slang' with already installed slang library)

Fixed error with termcap detecting.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
This commit is contained in:
Slava Zanko 2009-07-28 15:05:43 +03:00
parent b069c3b8bd
commit 24e81db0dc
2 changed files with 10 additions and 5 deletions

View File

@ -12,15 +12,17 @@ dnl
dnl Check if the installed S-Lang library uses termcap dnl Check if the installed S-Lang library uses termcap
dnl dnl
AC_DEFUN([MC_SLANG_TERMCAP], [ AC_DEFUN([MC_SLANG_TERMCAP], [
unset ac_cv_lib_termcap_tgoto
AC_CACHE_CHECK([if S-Lang uses termcap], [mc_cv_slang_termcap], [ AC_CACHE_CHECK([if S-Lang uses termcap], [mc_cv_slang_termcap], [
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="$LIBS -lslang" LIBS="$LIBS -lslang"
AC_TRY_LINK([ AC_TRY_LINK([
#ifdef HAVE_SLANG_SLANG_H #ifdef HAVE_SLANG_SLANG_H
#include <slang/slang.h> #include <slang/slang.h>
#else #else
#include <slang.h> #include <slang.h>
#endif #endif
], ],
[SLtt_get_terminfo(); SLtt_tgetflag("");], [SLtt_get_terminfo(); SLtt_tgetflag("");],
[mc_cv_slang_termcap=no], [mc_cv_slang_termcap=no],

View File

@ -75,6 +75,8 @@ AC_DEFUN([MC_CHECK_SLANG_BY_PATH], [
ac_slang_lib_path="-L/usr/lib" ac_slang_lib_path="-L/usr/lib"
fi fi
found_slang=yes found_slang=yes
AC_DEFINE(HAVE_SLANG_H, 1,[Define to use slang.h])
], ],
[ [
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
@ -92,6 +94,7 @@ AC_DEFUN([MC_CHECK_SLANG_BY_PATH], [
ac_slang_lib_path="-L/usr/lib" ac_slang_lib_path="-L/usr/lib"
fi fi
found_slang=yes found_slang=yes
AC_DEFINE(HAVE_SLANG_SLANG_H, 1,[Define to use slang.h])
], ],
[ [
AC_MSG_RESULT(no) AC_MSG_RESULT(no)