* 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.

ChangeLog

@@ -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>
 
-        * syntax/assembler.syntax: Add syntax file for the x86 assembler.
-        * syntax/povray.syntax: Add syntax file for the POVRay.
-        * syntax/Syntax: Add syntax file for x86 assembler and POVRay.
-        * syntax/Makefile.am: Likewise.
-        * mc.qpg.in: Likewise.
-        * NEWS: Likewise.
+	* syntax/assembler.syntax: Add syntax file for the x86 assembler.
+	* syntax/povray.syntax: Add syntax file for the POVRay.
+	* syntax/Syntax: Add syntax file for x86 assembler and POVRay.
+	* syntax/Makefile.am: Likewise.
+	* mc.qpg.in: Likewise.
+	* NEWS: Likewise.
 
 2005-03-14  Leonard den Ottolander  <leonard * den ottolander nl>
 

acinclude.m4

@@ -698,8 +698,6 @@ AC_DEFUN([MC_WITH_SLANG], [
     if test x$with_screen = xslang; then
 	screen_type=slang
 	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"
 	LIBS="$LIBS -lslang"
 	AC_TRY_LINK([
@@ -734,6 +732,11 @@ it doesn't work well])
 	)
     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
 ])
 

configure.ac

@@ -553,10 +553,6 @@ if test "$GLIBC21" != yes; then
     AC_DEFINE(USE_INCLUDED_REGEX, 1, [Use the regex included here])
 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"${enable_gcc_warnings+set}" != x"set"; then
         if test x"${GCC}" = x"yes"; then

src/myslang.h

@@ -1,7 +1,7 @@
 #ifndef 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"
 #else
 #ifdef HAVE_SLANG_SLANG_H