Merge r21-4-12-chise-0_21-pre9-for-libchise-b1.

[chise/xemacs-chise.git.1] / src / config.h.in

diff --git a/src/config.h.in b/src/config.h.in
index a3048e3..fc7e553 100644 (file)
--- 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)
@@ -565,7 +567,10 @@ void *alloca ();
 
 /* Define this if you want CHISE support
    (CHaracter Information Service Environment) */
-#undef CHISE
+#undef HAVE_CHISE
+
+/* Define if you are using libchise */
+#undef HAVE_LIBCHISE
 
 /* Define this if you want UTF-2000 support (character representation
    based on character object model). */
@@ -573,9 +578,6 @@ void *alloca ();
 
 #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 +918,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_ */