Sync up with r21-4-14-chise-0_21-2.

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

diff --git a/src/config.h.in b/src/config.h.in
index c9cb723..eb0f45e 100644 (file)
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -32,12 +32,7 @@ Boston, MA 02111-1307, USA.  */
 #undef HAVE_ALLOCA_H
 
 #ifndef NOT_C_CODE
-#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__)
+#ifdef __GNUC__
 #define alloca __builtin_alloca
 #elif defined __DECC
 #include <alloca.h>
@@ -170,16 +165,8 @@ 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_GTK) || defined (HAVE_X_WINDOWS) || defined(HAVE_MS_WINDOWS) /* || defined (HAVE_NEXTSTEP) */
+#if defined (HAVE_X_WINDOWS) || defined(HAVE_MS_WINDOWS) /* || defined (HAVE_NEXTSTEP) */
 #define HAVE_WINDOW_SYSTEM
 #endif
 
@@ -235,6 +222,7 @@ 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
@@ -265,6 +253,9 @@ 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
 
@@ -338,7 +329,6 @@ void *alloca ();
 #undef HAVE_TZSET
 #undef HAVE_ULIMIT
 #undef HAVE_USLEEP
-#undef HAVE_UTIME
 #undef HAVE_UTIMES
 #undef HAVE_WAITPID
 #undef HAVE_VSNPRINTF
@@ -379,9 +369,6 @@ void *alloca ();
 
 #undef NLIST_STRUCT
 
-/* Do IPv6 hostname canonicalization before IPv4 in getaddrinfo()? */
-#undef IPV6_CANONICALIZE
-
 /* Compile in support for SOCKS? */
 #undef HAVE_SOCKS
 
@@ -510,12 +497,12 @@ void *alloca ();
    determine where XEmacs' memory is going. */
 #undef MEMORY_USAGE_STATS
 
-/* Define QUANTIFY if using Quantify from Rational Software.
+/* Define QUANTIFY if using Quantify from Rational/Pure/Atria Software.
    This adds some additional calls to control data collection.
    It is only intended for use by the developers. */
 #undef QUANTIFY
 
-/* Define PURIFY if using Purify from Rational Software.
+/* Define QUANTIFY if using Purify from Rational/Pure/Atria Software.
    It is only intended for use by the developers. */
 #undef PURIFY
 
@@ -563,15 +550,10 @@ 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