X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fconfig.h.in;h=3a1022148d0f66c6d8a61ee02dd5942bc96c7805;hb=1bbdeb3a4ec887b8a6bcacb0384a978cc3b1f6f5;hp=a3048e31325e006420e51a8508de0db996710fb3;hpb=2b54d314ea5b62570e591035f26c4d475f63581d;p=chise%2Fxemacs-chise.git

diff --git a/src/config.h.in b/src/config.h.in
index a3048e3..3a10221 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)
@@ -563,19 +565,6 @@ 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
 
@@ -916,4 +905,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_ */