X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=src%2Fconfig.h.in;h=7d3ba75820a46d930831d1afee8ab803ef7a3645;hp=c9cb723b3a73b57d8bdb739b5b1082733589dedc;hb=d81014e89b5102527e5b50aac62edeed2955671d;hpb=a5812bf2ff9a9cf40f4ff78dcb83f5b4c295bd18

diff --git a/src/config.h.in b/src/config.h.in
index c9cb723..7d3ba75 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
@@ -257,6 +262,7 @@ void *alloca ();
 #undef HAVE_SHL_LOAD
 #undef HAVE_DLD_INIT
 #undef HAVE_SHLIB
+#undef DLSYM_NEEDS_UNDERSCORE
 
 #undef HAVE_LIBINTL
 #undef HAVE_LIBDNET
@@ -563,15 +569,6 @@ void *alloca ();
    if you're working with ASCII files. */
 #undef MULE
 
-/* 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
 
@@ -823,6 +820,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
@@ -912,4 +911,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_ */