mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

System SLang and termcap

Browse Source 
Wed Feb 10 02:48:51 1999  Timur Bakeyev  <mc@bat.ru>

	* configure.in: Add check, which, in case of system-installed SLang
	library tries to run a test program, which determines, does we need
	linking with libtermcap.a. Also, set of if's for finding terminfo
	dir changed do for cycle - a bit nicer :)
This commit is contained in:
Timur Bakeyev 1999-02-09 23:50:57 +00:00
parent 50de059b75
commit 2af7ecb8fe
2 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Wed Feb 10 02:48:51 1999 Timur Bakeyev <mc@bat.ru>
* configure.in: Add check, which, in case of system-installed SLang
library tries to run a test program, which determines, does we need
linking with libtermcap.a. Also, set of if's for finding terminfo
dir changed do for cycle - a bit nicer :)
Tue Feb 9 20:52:19 1999 Norbert Warmuth <nwarmuth@privat.circular.de> Tue Feb 9 20:52:19 1999 Norbert Warmuth <nwarmuth@privat.circular.de>
* README.QNX: Deleted documention about mc.menu.qnx.diff. * README.QNX: Deleted documention about mc.menu.qnx.diff.

42
configure.in
View File

@ -818,9 +818,25 @@ AC_DEFUN(AC_WITH_SLANG,
then then
AC_DEFINE(HAVE_SYSTEM_SLANG) AC_DEFINE(HAVE_SYSTEM_SLANG)
LSLANG="-lslang" LSLANG="-lslang"
screen_manager="SLang (using system-installed library)" screen_manager="SLang (system-installed library)"
AC_MSG_RESULT(Using system installed SLang library) AC_MSG_RESULT(Using system installed SLang library)
rm slang/slang.h rm slang/slang.h
ac_save_LIBS="$LIBS"
LIBS="$LIBS $LSLANG"
AC_TRY_RUN(
[
#ifdef SLANG_H_INSIDE_SLANG_DIR
#include <slang/slang.h>
#else
#include <slang.h>
#endif
int main(void){
SLtt_initialize("");
SLtt_tgetflag("");
return 0;
} ],
[LIBS="$ac_save_LIBS"; AC_USE_TERMINFO],
[LIBS="$ac_save_LIBS"; AC_USE_TERMCAP])
else else
MCCPPFLAGS="$MCCPPFLAGS -I\$(slangdir)" MCCPPFLAGS="$MCCPPFLAGS -I\$(slangdir)"
LIBSLANG="libmcslang.a" LIBSLANG="libmcslang.a"
@ -834,24 +850,14 @@ AC_DEFUN(AC_WITH_SLANG,
if $slang_check_lib if $slang_check_lib
then then
use_terminfo=false use_terminfo=false
if test -d /usr/lib/terminfo; then for dir in /usr/lib /usr/share/lib /usr/local/lib /lib \
use_terminfo=true; /usr/local/share /usr/share
fi do
if test -d /usr/share/lib/terminfo; then if test -d $dir/terminfo; then
use_terminfo=true;
fi
if test -d /usr/local/lib/terminfo; then
use_terminfo=true;
fi
if test -d /lib/terminfo; then
use_terminfo=true;
fi
if test -d /usr/local/share/terminfo; then
use_terminfo=true;
fi
if test -d /usr/share/terminfo; then
use_terminfo=true; use_terminfo=true;
break
fi fi
done
if $use_terminfo; then if $use_terminfo; then
AC_USE_TERMINFO AC_USE_TERMINFO
else else
@ -1262,7 +1268,7 @@ if test x$srcdir != x; then
fi fi
fi fi
if test "x$screen_manager" = xSLang; then if echo "$screen_manager" | grep -q "SLang" ; then
screen_manager="${screen_manager}${slang_term}" screen_manager="${screen_manager}${slang_term}"
fi fi