X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fconfig.h.in;h=a3048e31325e006420e51a8508de0db996710fb3;hb=7b5c3f09c1be148f3d174d94d6edc124f9e557c0;hp=1c31170d2f05a2bf79dacb6b1ce3ffbb803b31a3;hpb=82f6d62ee211b1d36e8f45fed3ee3edde82b6916;p=chise%2Fxemacs-chise.git.1

diff --git a/src/config.h.in b/src/config.h.in
index 1c31170..a3048e3 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -32,7 +32,12 @@ Boston, MA 02111-1307, USA.  */
 #undef HAVE_ALLOCA_H
 
 #ifndef NOT_C_CODE
-#ifdef __GNUC__
+#if defined (__CYGWIN__)
+/* We get complaints about redefinitions if we just use the __GNUC__
+   definition: stdlib.h also includes alloca.h, which defines it slightly
+   differently */
+#include <alloca.h>
+#elif defined (__GNUC__)
 #define alloca __builtin_alloca
 #elif defined __DECC
 #include <alloca.h>
@@ -165,8 +170,16 @@ void *alloca ();
 #endif
 #endif /* HAVE_X_WINDOWS */
 
+/* Defines for building Gtk applications */
+#undef HAVE_GNOME
+#undef HAVE_GTK
+#undef HAVE_GDK_IMLIB_INIT
+#undef HAVE_GLADE_GLADE_H
+#undef HAVE_GLADE_H
+#undef LIBGLADE_XML_TXTDOMAIN
+
 /* Define HAVE_WINDOW_SYSTEM if any windowing system is available. */
-#if defined (HAVE_X_WINDOWS) || defined(HAVE_MS_WINDOWS) /* || defined (HAVE_NEXTSTEP) */
+#if defined (HAVE_GTK) || defined (HAVE_X_WINDOWS) || defined(HAVE_MS_WINDOWS) /* || defined (HAVE_NEXTSTEP) */
 #define HAVE_WINDOW_SYSTEM
 #endif
 
@@ -222,7 +235,6 @@ void *alloca ();
 #undef HAVE_SYS_UN_H
 #undef HAVE_ULIMIT_H
 #undef HAVE_UNISTD_H
-#undef HAVE_UTIME_H
 
 #undef HAVE_SYS_WAIT_H
 #undef HAVE_LIBINTL_H
@@ -245,7 +257,6 @@ void *alloca ();
 #undef HAVE_SHL_LOAD
 #undef HAVE_DLD_INIT
 #undef HAVE_SHLIB
-#undef HAVE_DLFCN_H
 
 #undef HAVE_LIBINTL
 #undef HAVE_LIBDNET
@@ -254,9 +265,6 @@ void *alloca ();
 /* Is `sys_siglist' declared by <signal.h>? */
 #undef SYS_SIGLIST_DECLARED
 
-/* Is `struct utimbuf' declared by <utime.h>? */
-#undef HAVE_STRUCT_UTIMBUF
-
 /* Is `struct timeval' declared by <sys/time.h>? */
 #undef HAVE_TIMEVAL
 
@@ -330,6 +338,7 @@ void *alloca ();
 #undef HAVE_TZSET
 #undef HAVE_ULIMIT
 #undef HAVE_USLEEP
+#undef HAVE_UTIME
 #undef HAVE_UTIMES
 #undef HAVE_WAITPID
 #undef HAVE_VSNPRINTF
@@ -346,6 +355,7 @@ void *alloca ();
 #undef HAVE_ISASTREAM	/* SysV streams */
 #undef HAVE_PTY_H	/* Linux, Tru64 openpty */
 #undef HAVE_LIBUTIL_H	/* BSD openpty */
+#undef HAVE_UTIL_H	/* NetBSD openpty */
 #undef HAVE_STROPTS_H	/* SysV streams */
 #undef HAVE_STRTIO_H	/* SysV streams TIOCSIGNAL */
 
@@ -369,6 +379,9 @@ void *alloca ();
 
 #undef NLIST_STRUCT
 
+/* Do IPv6 hostname canonicalization before IPv4 in getaddrinfo()? */
+#undef IPV6_CANONICALIZE
+
 /* Compile in support for SOCKS? */
 #undef HAVE_SOCKS
 
@@ -497,12 +510,12 @@ void *alloca ();
    determine where XEmacs' memory is going. */
 #undef MEMORY_USAGE_STATS
 
-/* Define QUANTIFY if using Quantify from Rational/Pure/Atria Software.
+/* Define QUANTIFY if using Quantify from Rational Software.
    This adds some additional calls to control data collection.
    It is only intended for use by the developers. */
 #undef QUANTIFY
 
-/* Define QUANTIFY if using Purify from Rational/Pure/Atria Software.
+/* Define PURIFY if using Purify from Rational Software.
    It is only intended for use by the developers. */
 #undef PURIFY
 
@@ -550,6 +563,19 @@ 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
 
@@ -832,7 +858,6 @@ on various systems. */
 #  define new   c_new
 #  define this  c_this
 #  define catch c_catch
-#  define not   c_not
 
 #  define EXTERN_C extern "C"
 # else /* C code */