X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fconfig.h.in;h=bbeaf78af89665c8a1eaf11c8f453309ea45b708;hb=15a1545f4a8c666416f9ce60adf6c03c2b1d779f;hp=a3048e31325e006420e51a8508de0db996710fb3;hpb=2b54d314ea5b62570e591035f26c4d475f63581d;p=chise%2Fxemacs-chise.git

diff --git a/src/config.h.in b/src/config.h.in
index a3048e3..bbeaf78 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -42,6 +42,8 @@ Boston, MA 02111-1307, USA.  */
 #elif defined __DECC
 #include <alloca.h>
 #pragma intrinsic(alloca)
+#elif defined __INTEL_COMPILER && defined HAVE_ALLOCA_H
+/* defer #include to end of file */
 #elif defined HAVE_ALLOCA_H
 #include <alloca.h>
 #elif defined(_AIX)
@@ -91,7 +93,10 @@ void *alloca ();
 #undef _XOPEN_SOURCE_EXTENDED
 
 /* Make all functions available on AIX.  See AC_AIX. */
+/* Some AIX compilers (cc) pre-define _ALL_SOURCE, some (xlc) don't. */
+#ifndef _ALL_SOURCE
 #undef _ALL_SOURCE
+#endif
 
 /* Make all functions available on GNU libc systems.  See features.h. */
 #undef _GNU_SOURCE
@@ -138,6 +143,9 @@ void *alloca ();
 /* Use a debugging malloc? -- experimental */
 #undef USE_DEBUG_MALLOC
 
+/* Use malloc for regex failure stack? */
+#undef REGEX_MALLOC
+
 /* Compile in TTY support? */
 #undef HAVE_TTY
 
@@ -257,6 +265,8 @@ void *alloca ();
 #undef HAVE_SHL_LOAD
 #undef HAVE_DLD_INIT
 #undef HAVE_SHLIB
+#undef HAVE_DYLD
+#undef DLSYM_NEEDS_UNDERSCORE
 
 #undef HAVE_LIBINTL
 #undef HAVE_LIBDNET
@@ -563,19 +573,12 @@ void *alloca ();
    if you're working with ASCII files. */
 #undef MULE
 
-/* Define this if you want CHISE support
-   (CHaracter Information Service Environment) */
-#undef CHISE
-
 /* Define this if you want UTF-2000 support (character representation
    based on character object model). */
 #undef UTF2000
 
 #undef CHAR_IS_UCS4
 
-/* Compile in support for external character database. */
-#undef HAVE_CHISE_CLIENT
-
 /* Define this if you want file coding support */
 #undef FILE_CODING
 
@@ -827,6 +830,8 @@ on various systems. */
 #undef SIZEOF_LONG_LONG
 #undef SIZEOF_VOID_P
 
+#undef INTPTR_T_IN_CYGWIN_TYPES_H
+
 #ifndef BITS_PER_CHAR
 #define BITS_PER_CHAR 8
 #endif
@@ -916,4 +921,12 @@ on various systems. */
 
 #undef PDUMP
 
+#ifndef NOT_C_CODE
+#if defined __INTEL_COMPILER && defined HAVE_ALLOCA_H
+/* icc's alloca.h pulls in <features.h>,
+   but that must be done after _GNU_SOURCE and friends are defined */
+#include <alloca.h>
+#endif
+#endif /* C code */
+
 #endif /* _SRC_CONFIG_H_ */