last commit accidentally used out of date aclocal.m4 and so overwrote some previous...

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 377dc3c1411a504fa8d22f7ccf72c17b776d19e9..3094b511cf19168ddf4b7c03ee6a9ecbba912446 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -46,7 +46,9 @@
 #undef STDC_HEADERS
 
 /* Define this to get extra features from GNU libc. */
+#ifndef _GNU_SOURCE
 #undef _GNU_SOURCE
+#endif
 
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef uid_t
@@ -73,6 +75,9 @@
 /* Define this if your version of Motif is greater than 2.0 */
 #undef __WXMOTIF20__
 
+/* Define this if you are using Lesstif */
+#undef __WXLESSTIF__
+
 /*
  * Define to 1 for Unix[-like] system
  */
@@ -110,6 +115,9 @@
 #undef __POWERPC__
 #undef TARGET_CARBON
 
+/* Hack to make IOGraphicsTypes.h not define Point conflicting with MacTypes */
+#undef __Point__
+
 /* MS-DOS with DJGPP */
 #undef __DOS__
 
@@ -139,7 +147,6 @@
 
 /* --- start common options --- */
 
-
 #ifndef wxUSE_GUI
     #define wxUSE_GUI            0
 #endif
@@ -172,8 +179,6 @@
     #define wxUSE_UNICODE 0
 #endif
 
-#define wxUSE_UNICODE_MSLU 0
-
 #define wxUSE_WCHAR_T 0
 
 
@@ -199,6 +204,8 @@
 
 #define wxUSE_STD_IOSTREAM  0
 
+#define wxUSE_STD_STRING  0
+
 
 #define wxUSE_LONGLONG      0
 
@@ -271,10 +278,6 @@
 
 #define wxUSE_MEDIACTRL     0
 
-#define wxUSE_QUICKTIME     0
-
-#define wxUSE_DIRECTSHOW    0
-
 #define wxUSE_GSTREAMER    0
 
 #define wxUSE_XRC       0
@@ -494,10 +497,18 @@
 
 #if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
 #define wxUSE_RICHEDIT 1
+#define wxUSE_RICHEDIT2 1
 #else
 #define wxUSE_RICHEDIT 0
+#define wxUSE_RICHEDIT2 0
 #endif
 
+#define wxUSE_UNICODE_MSLU 0
+
+#define wxUSE_DC_CACHEING 0
+
+#define wxUSE_GADGETS 0
+
 /*
  * Supports bool type
  */
@@ -568,6 +579,12 @@
  * Use SDL for audio (Unix)
  */
 #define wxUSE_LIBSDL 0
+
+/*
+ * Compile sound backends as plugins
+ */
+#define wxUSE_PLUGINS 0
+
 /*
  * Use GNOME print for printing under GTK+ 2.0
  */
@@ -588,6 +605,10 @@
  * Use libXpm
  */
 #define wxHAVE_LIB_XPM 0
+/*
+ * Define if you have pthread_cleanup_push/pop()
+ */
+#undef wxHAVE_PTHREAD_CLEANUP
 /*
  * Use consistent PostScript fonts for AFM and printing (!)
  */
@@ -703,6 +724,9 @@
 /* Define if you have gettimeofday() */
 #undef HAVE_GETTIMEOFDAY
 
+/* Define if fsync() is available */
+#undef HAVE_FSYNC
+
 /* Define if you have ftime() */
 #undef HAVE_FTIME
 
@@ -748,9 +772,6 @@
 /* Define if you have all functions to set thread priority */
 #undef HAVE_THREAD_PRIORITY_FUNCTIONS
 
-/* Define if you can specify exit functions to a thread */
-#undef HAVE_THREAD_CLEANUP_FUNCTIONS
-
 /* Define if you have timegm() function */
 #undef HAVE_TIMEGM
 
@@ -952,6 +973,9 @@
 /* Define if you have pango_font_family_is_monospace() (Pango >= 1.3.3) */
 #undef HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE
 
+/* Define if gtk_icon_size_lookup is missing from the GTK+ headers */
+#undef NEED_GTK_ICON_SIZE_LOOKUP
+
 /* Define if you have Pango xft support */
 #undef HAVE_PANGO_XFT