use C compiler for tests again, it's useless to use the C++ one for AC_CHECK_FUNCS...

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index d9642d465a5662febbc08b48e0d56df6217d74fc..78bc597c6bd7120b361c7b099b0e663a01e41f67 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -203,7 +203,12 @@
 
 #define wxUSE_STD_IOSTREAM  0
 
 
 #define wxUSE_STD_IOSTREAM  0
 

-#define wxUSE_STD_STRING  0
+#if defined(__DMC__) || defined(__WATCOMC__) \
+        || (defined(_MSC_VER) && _MSC_VER < 1200)
+    #define wxUSE_STD_STRING  0
+#else
+    #define wxUSE_STD_STRING  0
+#endif

 
 #define wxUSE_PRINTF_POS_PARAMS      0
 
 
 #define wxUSE_PRINTF_POS_PARAMS      0
 


@@ -245,12 +250,16 @@
 
 #define wxUSE_FS_ZIP        0
 
 
 #define wxUSE_FS_ZIP        0
 

+#define wxUSE_FS_ARCHIVE    0
+

 #define wxUSE_FS_INET       0
 
 #define wxUSE_ARCHIVE_STREAMS     0
 
 #define wxUSE_ZIPSTREAM     0
 
 #define wxUSE_FS_INET       0
 
 #define wxUSE_ARCHIVE_STREAMS     0
 
 #define wxUSE_ZIPSTREAM     0
 

+#define wxUSE_TARSTREAM     0
+

 #define wxUSE_ZLIB          0
 
 #define wxUSE_APPLE_IEEE          0
 #define wxUSE_ZLIB          0
 
 #define wxUSE_APPLE_IEEE          0


@@ -285,11 +294,7 @@
 
 #define wxUSE_XRC       0
 
 
 #define wxUSE_XRC       0
 

-#if wxUSE_XRC
-#define wxUSE_XML       0
-#else
-#  define wxUSE_XML       0
-#endif
+#define wxUSE_XML       wxUSE_XRC

 
 #define wxUSE_AUI       0
 
 
 #define wxUSE_AUI       0
 


@@ -305,12 +310,14 @@
 
 #define wxUSE_TIPWINDOW    0
 
 
 #define wxUSE_TIPWINDOW    0
 

+#define wxUSE_ANIMATIONCTRL 0

 #define wxUSE_BUTTON        0
 #define wxUSE_BMPBUTTON     0
 #define wxUSE_CALENDARCTRL  0
 #define wxUSE_CHECKBOX      0
 #define wxUSE_CHECKLISTBOX  0
 #define wxUSE_CHOICE        0
 #define wxUSE_BUTTON        0
 #define wxUSE_BMPBUTTON     0
 #define wxUSE_CALENDARCTRL  0
 #define wxUSE_CHECKBOX      0
 #define wxUSE_CHECKLISTBOX  0
 #define wxUSE_CHOICE        0

+#define wxUSE_COLLPANE      0

 #define wxUSE_COLOURPICKERCTRL 0
 #define wxUSE_COMBOBOX      0
 #define wxUSE_DATAVIEWCTRL  0
 #define wxUSE_COLOURPICKERCTRL 0
 #define wxUSE_COMBOBOX      0
 #define wxUSE_DATAVIEWCTRL  0


@@ -420,6 +427,8 @@
 
 #define wxUSE_WIZARDDLG 0
 
 
 #define wxUSE_WIZARDDLG 0
 

+#define wxUSE_ABOUTDLG 0
+

 
 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0
 
 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0


@@ -459,6 +468,9 @@
 #define wxUSE_HELP        0
 
 
 #define wxUSE_HELP        0
 
 

+#define wxUSE_MS_HTML_HELP 0
+
+

 #define wxUSE_WXHTML_HELP 0
 
 #define wxUSE_RESOURCES   0
 #define wxUSE_WXHTML_HELP 0
 
 #define wxUSE_RESOURCES   0


@@ -499,6 +511,8 @@
 
 #define wxUSE_LIBTIFF       0
 
 
 #define wxUSE_LIBTIFF       0
 

+#define wxUSE_TGA           0
+

 #define wxUSE_GIF           0
 
 #define wxUSE_PNM           0
 #define wxUSE_GIF           0
 
 #define wxUSE_PNM           0


@@ -746,6 +760,12 @@
  */
 #define CONST_COMPATIBILITY 0
 
  */
 #define CONST_COMPATIBILITY 0
 

+/*
+ * use the session manager to detect KDE/GNOME
+ */
+#define wxUSE_DETECT_SM     0
+
+

 /* define with the name of timezone variable */
 #undef WX_TIMEZONE
 
 /* define with the name of timezone variable */
 #undef WX_TIMEZONE
 


@@ -854,6 +874,9 @@
 /* Define if strptime() is declared in headers */
 #undef HAVE_STRPTIME_DECL
 
 /* Define if strptime() is declared in headers */
 #undef HAVE_STRPTIME_DECL
 

+/* Define if you have strtoull() and strtoll() */
+#undef HAVE_STRTOULL
+

 /* Define if you have all functions to set thread priority */
 #undef HAVE_THREAD_PRIORITY_FUNCTIONS
 
 /* Define if you have all functions to set thread priority */
 #undef HAVE_THREAD_PRIORITY_FUNCTIONS
 


@@ -876,6 +899,9 @@
 /* Define if you have wcslen function  */
 #undef HAVE_WCSLEN
 
 /* Define if you have wcslen function  */
 #undef HAVE_WCSLEN
 

+/* Define if you have wcstoull() and wcstoll() */
+#undef HAVE_WCSTOULL
+

 /* define if you have vsscanf function */
 #undef HAVE_VSSCANF
 
 /* define if you have vsscanf function */
 #undef HAVE_VSSCANF
 


@@ -1114,6 +1140,9 @@
 /* Define if you have the <sys/select.h> header file.  */
 #undef HAVE_SYS_SELECT_H
 
 /* Define if you have the <sys/select.h> header file.  */
 #undef HAVE_SYS_SELECT_H
 

+/* Define if fdopen is available.  */
+#undef HAVE_FDOPEN
+

 /* -------------------------------------------------------------------------
    Win32 adjustments section
    ------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------
    Win32 adjustments section
    ------------------------------------------------------------------------- */