mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 01:54:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

* acinclude.m4 (MC_WITH_SLANG): Define HAVE_SYSTEM_SLANG after

Browse Source 
all fallbacks so it shows whether we are using system S-Lang.
* configure.ac: Remove USE_INCLUDED_SLANG, since it's now fully
dependent on HAVE_SLANG and HAVE_SYSTEM_SLANG.
* src/myslang.h: Likewise.
This commit is contained in:
Pavel Roskin 2005-03-19 17:27:36 +00:00
parent bfc10386c3
commit 0074c885f2
4 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -1,11 +1,19 @@
2005-03-19 Pavel Roskin <proski@gnu.org>
* acinclude.m4 (MC_WITH_SLANG): Define HAVE_SYSTEM_SLANG after
all fallbacks so it shows whether we are using system S-Lang.
* configure.ac: Remove USE_INCLUDED_SLANG, since it's now fully
dependent on HAVE_SLANG and HAVE_SYSTEM_SLANG.
* src/myslang.h: Likewise.
2005-03-18 Mike Gorchak <mike@malva.ua> 2005-03-18 Mike Gorchak <mike@malva.ua>
* syntax/assembler.syntax: Add syntax file for the x86 assembler. * syntax/assembler.syntax: Add syntax file for the x86 assembler.
* syntax/povray.syntax: Add syntax file for the POVRay. * syntax/povray.syntax: Add syntax file for the POVRay.
* syntax/Syntax: Add syntax file for x86 assembler and POVRay. * syntax/Syntax: Add syntax file for x86 assembler and POVRay.
* syntax/Makefile.am: Likewise. * syntax/Makefile.am: Likewise.
* mc.qpg.in: Likewise. * mc.qpg.in: Likewise.
* NEWS: Likewise. * NEWS: Likewise.
2005-03-14 Leonard den Ottolander <leonard * den ottolander nl> 2005-03-14 Leonard den Ottolander <leonard * den ottolander nl>

7
acinclude.m4
View File

@ -698,8 +698,6 @@ AC_DEFUN([MC_WITH_SLANG], [
if test x$with_screen = xslang; then if test x$with_screen = xslang; then
screen_type=slang screen_type=slang
screen_msg="S-Lang library (installed on the system)" screen_msg="S-Lang library (installed on the system)"
AC_DEFINE(HAVE_SYSTEM_SLANG, 1,
[Define to use S-Lang library installed on the system])
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="$LIBS -lslang" LIBS="$LIBS -lslang"
AC_TRY_LINK([ AC_TRY_LINK([
@ -734,6 +732,11 @@ 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
]) ])

4
configure.ac
View File

@ -553,10 +553,6 @@ if test "$GLIBC21" != yes; then
AC_DEFINE(USE_INCLUDED_REGEX, 1, [Use the regex included here]) AC_DEFINE(USE_INCLUDED_REGEX, 1, [Use the regex included here])
fi fi
if test "x$with_screen" = xmcslang; then
AC_DEFINE(USE_INCLUDED_SLANG, 1, [Use the S-Lang included here])
fi
if test x"$USE_MAINTAINER_MODE" = x"yes"; then if test x"$USE_MAINTAINER_MODE" = x"yes"; then
if test x"${enable_gcc_warnings+set}" != x"set"; then if test x"${enable_gcc_warnings+set}" != x"set"; then
if test x"${GCC}" = x"yes"; then if test x"${GCC}" = x"yes"; then

2
src/myslang.h
View File

@ -1,7 +1,7 @@
#ifndef MC_MYSLANG_H #ifndef MC_MYSLANG_H
#define MC_MYSLANG_H #define MC_MYSLANG_H
#if defined(USE_INCLUDED_SLANG) || !defined (HAVE_SYSTEM_SLANG) #ifndef HAVE_SYSTEM_SLANG
# include "../slang/include/slang.h" # include "../slang/include/slang.h"
#else #else
#ifdef HAVE_SLANG_SLANG_H #ifdef HAVE_SLANG_SLANG_H