Re: Import slang-1.4.9 patch

[Nerijus Baliunas <nerijus users sourceforge net>]

On Tue, 26 Oct 2004 12:49:04 +0200 Pavel Tsekov <ptsekov gmx net> wrote:

> Maybe you should raise the issue on the S-Lang dedicated mailing list. It
> would be much better if this is fixed by the upstream maintainer.

As I didn't have such problem with mc-4.6.0, I did some investigation.
Included slang in mc-4.6.0 used extraconf.h:

diff -ur mc-4.6.0/slang/.deps/sldisply.Po mc-2004-10-22-21/slang/.deps/sldisply.Po
--- mc-4.6.0/slang/.deps/sldisply.Po    2004-10-26 16:14:32.000000000 +0300
+++ mc-2004-10-22-21/slang/.deps/sldisply.Po    2004-10-25 16:48:59.000000000 +0300
@@ -1,5 +1,5 @@
 sldisply.o : \
- sldisply.c include/slinclud.h ../config.h ../extraconf.h \
+ sldisply.c include/slinclud.h ../config.h \
...
@@ -36,7 +36,6 @@
 sldisply.c :
 include/slinclud.h :
 ../config.h :
-../extraconf.h :


Now mc does not have extraconf.h anymore. And in 4.6.0 it contained:

/*
This file is included directly from config.h.
Don't include it from any other files.

The only code that belongs here is preprocessor directives that:

1) change the configuration setting defined in config.h if they
there is a conflict between them.

2) define symbols that fully depend on those in config.h to eliminate
the need to embed this logic into configure.in.
*/

#ifdef HAVE_LIBPT
#    define HAVE_GRANTPT
#endif
...
#ifndef NATIVE_WIN32
/* some Unices do not define this, and slang requires it: */
#ifndef unix
#    define unix
#endif
#endif

Regards,
Nerijus