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

* acinclude.m4 (MC_WITH_SLANG): Reorder checks. Move termcap

Browse Source 
checks ...
(MC_SLANG_TERMCAP): ... here.
(MC_SLANG_PRIVATE): Check if private functions are available.
It's not the case on Debian unstable.
This commit is contained in:
Pavel Roskin 2005-03-19 19:16:35 +00:00
parent a1781bc719
commit d89c5eb128
2 changed files with 94 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -1,13 +1,21 @@
2005-03-19 Pavel Roskin <proski@gnu.org>
* acinclude.m4 (MC_WITH_SLANG): Reorder checks. Move termcap
checks ...
(MC_SLANG_TERMCAP): ... here.
(MC_SLANG_PRIVATE): Check if private functions are available.
It's not the case on Debian unstable.
2005-03-19 Pavel S. Shirshov <me@pavelsh.pp.ru> 2005-03-19 Pavel S. Shirshov <me@pavelsh.pp.ru>
* syntax/idl.syntax: Add syntax file for the CORBA idl. * syntax/idl.syntax: Add syntax file for the CORBA idl.
From Ian Zagorskih <ianzag@megasignal.com> From Ian Zagorskih <ianzag@megasignal.com>
* syntax/lua.syntax: Add syntax file for the LUA programming language. * syntax/lua.syntax: Add syntax file for the LUA programming language.
From Mike Gorchak <mike@malva.ua> From Mike Gorchak <mike@malva.ua>
* syntax/Syntax: Add syntax file for CORBA idl and lua. * syntax/Syntax: Add syntax file for CORBA idl and lua.
* syntax/Makefile.am: Likewise. * syntax/Makefile.am: Likewise.
* mc.qpg.in: Likewise. * mc.qpg.in: Likewise.
* NEWS: Likewise. * NEWS: Likewise.
2005-03-19 Pavel Roskin <proski@gnu.org> 2005-03-19 Pavel Roskin <proski@gnu.org>

107
acinclude.m4
View File

@ -668,6 +668,69 @@ AC_DEFUN([MC_USE_TERMCAP], [
]) ])
dnl
dnl Check if private functions are available for linking
dnl
AC_DEFUN([MC_SLANG_PRIVATE], [
AC_CACHE_CHECK([if S-Lang exports private functions],
[mc_cv_slang_private], [
ac_save_LIBS="$LIBS"
LIBS="$LIBS -lslang"
AC_TRY_LINK([
#ifdef HAVE_SLANG_SLANG_H
#include <slang/slang.h>
#else
#include <slang.h>
#endif
#if SLANG_VERSION >= 10000
extern unsigned int SLsys_getkey (void);
#else
extern unsigned int _SLsys_getkey (void);
#endif
], [
#if SLANG_VERSION >= 10000
_SLsys_getkey ();
#else
SLsys_getkey ();
#endif
],
[mc_cv_slang_private=yes],
[mc_cv_slang_private=no])
LIBS="$ac_save_LIBS"
])
if test x$mc_cv_slang_private = xyes; then
AC_DEFINE(HAVE_SLANG_PRIVATE, 1,
[Define if private S-Lang functions are available])
fi
])
dnl
dnl Check if the installed S-Lang library uses termcap
dnl
AC_DEFUN([MC_SLANG_TERMCAP], [
AC_CACHE_CHECK([if S-Lang uses termcap], [mc_cv_slang_termcap], [
ac_save_LIBS="$LIBS"
LIBS="$LIBS -lslang"
AC_TRY_LINK([
#ifdef HAVE_SLANG_SLANG_H
#include <slang/slang.h>
#else
#include <slang.h>
#endif
],
[SLtt_get_terminfo(); SLtt_tgetflag("");],
[mc_cv_slang_termcap=no],
[mc_cv_slang_termcap=yes])
LIBS="$ac_save_LIBS"
])
if test x$mc_cv_slang_termcap = xyes; then
MC_USE_TERMCAP
fi
])
dnl dnl
dnl Common code for MC_WITH_SLANG and MC_WITH_MCSLANG dnl Common code for MC_WITH_SLANG and MC_WITH_MCSLANG
dnl dnl
@ -689,40 +752,33 @@ AC_DEFUN([MC_WITH_SLANG], [
slang_h_found= slang_h_found=
AC_CHECK_HEADERS([slang.h slang/slang.h], AC_CHECK_HEADERS([slang.h slang/slang.h],
[slang_h_found=yes; break]) [slang_h_found=yes; break])
if test -z "$slang_h_found"; then if test -z "$slang_h_found"; then
with_screen=mcslang with_screen=mcslang
fi fi
dnl Check if the installed S-Lang library uses termcap dnl Check the library
if test x$with_screen = xslang; then if test x$with_screen = xslang; then
screen_type=slang AC_CHECK_LIB([slang], [SLang_init_tty], [MCLIBS="$MCLIBS -lslang"],
screen_msg="S-Lang library (installed on the system)" [with_screen=mcslang], ["$MCLIBS"])
ac_save_LIBS="$LIBS" fi
LIBS="$LIBS -lslang"
AC_TRY_LINK([
#ifdef HAVE_SLANG_SLANG_H
#include <slang/slang.h>
#else
#include <slang.h>
#endif
],
[SLtt_get_terminfo(); SLtt_tgetflag("");],
[LIBS="$ac_save_LIBS"],
[LIBS="$ac_save_LIBS"; MC_USE_TERMCAP])
dnl Unless external S-Lang was requested, reject S-Lang with UTF-8 hacks dnl Unless external S-Lang was requested, reject S-Lang with UTF-8 hacks
if test x$with_screen = xslang; then
:
m4_if([$1], strict, , m4_if([$1], strict, ,
[AC_CHECK_LIB([slang], [SLsmg_write_nwchars], [AC_CHECK_LIB([slang], [SLsmg_write_nwchars],
[AC_MSG_WARN([Rejecting S-Lang with UTF-8 support, \ [AC_MSG_WARN([Rejecting S-Lang with UTF-8 support, \
it doesn't work well]) it's not fully supported yet])
with_screen=mcslang])]) with_screen=mcslang])])
fi
dnl Check the library if test x$with_screen = xslang; then
if test x$with_screen = xslang; then AC_DEFINE(HAVE_SYSTEM_SLANG, 1,
AC_CHECK_LIB([slang], [SLang_init_tty], [MCLIBS="$MCLIBS -lslang"], [Define to use S-Lang library installed on the system])
[with_screen=mcslang], ["$MCLIBS"]) MC_SLANG_PRIVATE
fi MC_SLANG_TERMCAP
screen_type=slang
screen_msg="S-Lang library (installed on the system)"
else else
m4_if([$1], strict, m4_if([$1], strict,
[if test $with_screen != slang; then [if test $with_screen != slang; then
@ -732,11 +788,6 @@ it doesn't work well])
) )
fi fi
if test x$with_screen = xslang; then
AC_DEFINE(HAVE_SYSTEM_SLANG, 1,
[Define to use S-Lang library installed on the system])
fi
_MC_WITH_XSLANG _MC_WITH_XSLANG
]) ])