* acconfig.h: Move constant parts ...

* extraconf.h: ... here.
[HAVE_X]: Disable subshell, s-lang and curses.
* Makefile.am: Add extraconf.h.
This commit is contained in:
Pavel Roskin 2001-05-29 05:04:58 +00:00
parent 8f851eea17
commit d888c7233e
4 changed files with 73 additions and 46 deletions

View File

@ -1,3 +1,10 @@
2001-05-29 Pavel Roskin <proski@gnu.org>
* acconfig.h: Move constant parts ...
* extraconf.h: ... here.
[HAVE_X]: Disable subshell, s-lang and curses.
* Makefile.am: Add extraconf.h.
2001-05-28 Pavel Roskin <proski@gnu.org>
* acconfig.h: Remove some useless entries. Eliminate OLD_TOOLS

View File

@ -14,6 +14,7 @@ ACLOCAL_M4_SOURCES = \
EXTRA_DIST = BUGS FAQ INSTALL.FAST MAINTAINERS \
README.PC README.QNX README.smbfs \
extraconf.h \
$(ACLOCAL_M4_SOURCES)
noinst_DATA = mc.spec

View File

@ -23,7 +23,6 @@
@TOP@
/* Always defined */
#undef D_INO_IN_DIRENT
#undef MOUNTED_FREAD
#undef MOUNTED_FREAD_FSTYP
@ -166,50 +165,8 @@
#undef WITH_SMBFS
@BOTTOM@
#ifdef HAVE_LIBPT
# define HAVE_GRANTPT
#endif
#if defined(HAVE_LIBCRYPT) || defined(HAVE_LIBCRYPT_I)
# define HAVE_CRYPT
#endif
#if defined(HAVE_SIGADDSET) && defined(HAVE_SIGEMPTYSET)
# if defined(HAVE_SIGACTION) && defined(HAVE_SIGPROCMASK)
# define SLANG_POSIX_SIGNALS
# endif
#endif
#ifdef __os2__
# define OS2_NT 1
# define S_ISFIFO(x) 0
# define NEEDS_IO_H
# define NEEDS_DRIVE_H
# define NEEDS_FCNTL_H
# define HAS_NO_GRP_PWD_H
# define HAS_NO_TERMIOS_H
# define HAS_NO_SYS_PARAM_H
# define HAS_NO_SYS_IOCTL_H
# define USE_O_TEXT
# define HAS_ACS_AS_PCCHARS
# define HAS_DIRECT_COLOR_ACCESS
# define NEEDS_CR_LF_TRANSLATION
#endif
#ifdef _OS_NT
# define OS2_NT 1
#endif
#ifndef OS2_NT
/* some Unices do not define this, and slang requires it: */
#ifndef unix
# define unix
#endif
#endif
#undef HAVE_GNOME_WINDOW_ICON
@BOTTOM@
#include <extraconf.h>

62
extraconf.h Normal file
View File

@ -0,0 +1,62 @@
/*
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
are inappropriate for the edition being compiled.
2) define symbols fully dependendent on those in config.h to eliminate
the need to embed this logic into configure.in.
*/
#ifdef HAVE_LIBPT
# define HAVE_GRANTPT
#endif
#if defined(HAVE_LIBCRYPT) || defined(HAVE_LIBCRYPT_I)
# define HAVE_CRYPT
#endif
#if defined(HAVE_SIGADDSET) && defined(HAVE_SIGEMPTYSET)
# if defined(HAVE_SIGACTION) && defined(HAVE_SIGPROCMASK)
# define SLANG_POSIX_SIGNALS
# endif
#endif
#ifdef __os2__
# define OS2_NT 1
# define S_ISFIFO(x) 0
# define NEEDS_IO_H
# define NEEDS_DRIVE_H
# define NEEDS_FCNTL_H
# define HAS_NO_GRP_PWD_H
# define HAS_NO_TERMIOS_H
# define HAS_NO_SYS_PARAM_H
# define HAS_NO_SYS_IOCTL_H
# define USE_O_TEXT
# define HAS_ACS_AS_PCCHARS
# define HAS_DIRECT_COLOR_ACCESS
# define NEEDS_CR_LF_TRANSLATION
#endif
#ifdef _OS_NT
# define OS2_NT 1
#endif
#ifndef OS2_NT
/* some Unices do not define this, and slang requires it: */
#ifndef unix
# define unix
#endif
#endif
#ifdef HAVE_X
# undef HAVE_SUBSHELL_SUPPORT
# undef HAVE_SLANG
# undef HAS_CURSES
# undef USE_NCURSES
#endif