[SF#777752] Applied a slight variation of this patch, pulling out the code that ...

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index c2c766de60e091b6c975aadb9bcfe2f79d514c65..892a6aaca2fe51844cb328252b4c9a44a653e448 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -1,4 +1,4 @@
-/* This define (__WX_SETUP_H__) is used both to insure setup.h is included
+/* This define (__WX_SETUP_H__) is used both to ensure setup.h is included

  * only once and to indicate that we are building using configure. */
 #ifndef __WX_SETUP_H__
 #define __WX_SETUP_H__
  * only once and to indicate that we are building using configure. */
 #ifndef __WX_SETUP_H__
 #define __WX_SETUP_H__


@@ -21,15 +21,12 @@
 /* fill in with the string wxGetOsDescription() will return */
 #undef WXWIN_OS_DESCRIPTION
 
 /* fill in with the string wxGetOsDescription() will return */
 #undef WXWIN_OS_DESCRIPTION
 

+/* the installation location prefix from configure */
+#undef wxINSTALL_PREFIX
+

 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef gid_t
 
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef gid_t
 

-/* Define if you don't have vprintf but do have _doprnt.  */
-#undef HAVE_DOPRNT
-
-/* Define if you have the vprintf function.  */
-#undef HAVE_VPRINTF
-

 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef mode_t
 
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef mode_t
 


@@ -45,6 +42,9 @@
 /* Define if you have the ANSI C header files.  */
 #undef STDC_HEADERS
 
 /* Define if you have the ANSI C header files.  */
 #undef STDC_HEADERS
 

+/* Define this to get extra features from GNU libc. */
+#undef _GNU_SOURCE
+

 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef uid_t
 
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef uid_t
 


@@ -52,12 +52,6 @@
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 #undef WORDS_BIGENDIAN
 
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 #undef WORDS_BIGENDIAN
 

-/* Define if the X Window System is missing or not being used.  */
-#undef X_DISPLAY_MISSING
-
-/* Define if lex declares yytext as a char * by default, not a char[].  */
-#undef YYTEXT_POINTER
-

 /* Define this if your version of GTK+ is greater than 1.2 */
 #undef __WXGTK12__
 
 /* Define this if your version of GTK+ is greater than 1.2 */
 #undef __WXGTK12__
 


@@ -67,49 +61,88 @@
 /* Define this if your version of GTK+ is greater than 1.3 */
 #undef __WXGTK20__
 
 /* Define this if your version of GTK+ is greater than 1.3 */
 #undef __WXGTK20__
 

+/* Define this if you want to use GPE features */
+#undef __WXGPE__
+
+/* Define this if your version of Motif is greater than 2.0 */
+#undef __WXMOTIF20__
+

 /*
  * Define to 1 for Unix[-like] system
  */
 #define wxUSE_UNIX 0
 
 #undef __UNIX__
 /*
  * Define to 1 for Unix[-like] system
  */
 #define wxUSE_UNIX 0
 
 #undef __UNIX__

-#undef __LINUX__
-#undef __SGI__
-#undef __HPUX__
-#undef __SYSV__
-#undef __SVR4__
+

 #undef __AIX__
 #undef __AIX__

-#undef __SUN__
-#undef __SOLARIS__
-#undef __SUNOS__
-#undef __ALPHA__
-#undef __OSF__

 #undef __BSD__
 #undef __BSD__

+#undef __DARWIN__
+#undef __EMX__

 #undef __FREEBSD__
 #undef __FREEBSD__

+#undef __HPUX__
+#undef __LINUX__

 #undef __NETBSD__
 #undef __NETBSD__

-#undef __VMS__
+#undef __OPENBSD__
+#undef __OSF__
+#undef __SGI__
+#undef __SOLARIS__
+#undef __SUN__
+#undef __SUNOS__
+#undef __SVR4__
+#undef __SYSV__

 #undef __ULTRIX__
 #undef __ULTRIX__

-#undef __DATA_GENERAL__
-#undef __EMX__
+#undef __UNIXWARE__
+#undef __VMS__
+
+#undef __IA64__
+#undef __ALPHA__
+
+/* NanoX (with wxX11) */
+#define wxUSE_NANOX 0
+
+/* PowerPC Darwin & Mac OS X */
+#undef __POWERPC__
+#undef TARGET_CARBON
+
+/* MS-DOS with DJGPP */
+#undef __DOS__

 
 /* Stupid hack; __WINDOWS__ clashes with wx/defs.h */
 #ifndef __WINDOWS__
 #undef __WINDOWS__
 #endif
 
 
 /* Stupid hack; __WINDOWS__ clashes with wx/defs.h */
 #ifndef __WINDOWS__
 #undef __WINDOWS__
 #endif
 

+#ifndef __WIN95__

 #undef __WIN95__
 #undef __WIN95__

+#endif
+#ifndef __WIN32__

 #undef __WIN32__
 #undef __WIN32__

+#endif
+#ifndef __GNUWIN32__

 #undef __GNUWIN32__
 #undef __GNUWIN32__

+#endif
+#ifndef STRICT

 #undef STRICT
 #undef STRICT

+#endif
+#ifndef WINVER

 #undef WINVER
 #undef WINVER

+#endif
+
+/* OS/2 with EMX */
+#undef __OS2__

 
 /* enable native status bar under Win32 */
 
 /* enable native status bar under Win32 */

-#ifdef __WIN95__
+#if defined(__WIN95__) && !defined(__WXUNIVERSAL__)

 #define wxUSE_NATIVE_STATUSBAR 1
 #define wxUSE_NATIVE_STATUSBAR 1

+#define wxUSE_OWNER_DRAWN 1
+#endif
+
+#if defined(__WXPM__)
+#define wxUSE_OWNER_DRAWN 1

 #endif
 
 /* enable rich edit under Win32 */
 #endif
 
 /* enable rich edit under Win32 */

-#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
+#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)

 #define wxUSE_RICHEDIT 1
 #else
 #define wxUSE_RICHEDIT 0
 #define wxUSE_RICHEDIT 1
 #else
 #define wxUSE_RICHEDIT 0


@@ -120,6 +153,64 @@
  */
 #undef HAVE_BOOL
 
  */
 #undef HAVE_BOOL
 

+/*
+ * Define if your compiler supports the explicit keyword
+ */
+#undef HAVE_EXPLICIT
+
+/*
+ * Define if your compiler supports const_cast<>()
+ */
+#undef HAVE_CONST_CAST
+
+/*
+ * Define if your compiler supports static_cast<>()
+ */
+#undef HAVE_STATIC_CAST
+
+/*
+ * Define if your compiler has std::wstring
+ */
+#undef HAVE_STD_WSTRING
+/*
+ * Define if your compiler has compliant std::string::compare
+ */
+#undef HAVE_STD_STRING_COMPARE
+/*
+ * Define if your compiler has <hash_map>
+ */
+#undef HAVE_HASH_MAP
+/*
+ * Define if your compiler has <ext/hash_map>
+ */
+#undef HAVE_EXT_HASH_MAP
+/*
+ * Define if your compiler has std::hash_map/hash_set
+ */
+#undef HAVE_STD_HASH_MAP
+/*
+ * Define if your compiler has __gnu_cxx::hash_map/hash_set
+ */
+#undef HAVE_GNU_CXX_HASH_MAP
+
+/*
+ * use STL for containers and wxString
+ */
+#define wxUSE_STL 0
+/*
+ * Use regex support
+ */
+#define wxUSE_REGEX 0
+/*
+ * The built-in regex supports advanced REs in additional to POSIX's basic
+ * and extended. Your system regex probably won't support this, and in this
+ * case WX_NO_REGEX_ADVANCED should be defined.
+ */
+#undef WX_NO_REGEX_ADVANCED
+/*
+ * Use XML support
+ */
+#define wxUSE_XML 0

 /*
  * Use zlib
  */
 /*
  * Use zlib
  */


@@ -136,10 +227,15 @@
  * Use libtiff
  */
 #define wxUSE_LIBTIFF 0
  * Use libtiff
  */
 #define wxUSE_LIBTIFF 0

+/*
+ * Use SDL for audio (Unix)
+ */
+#define wxUSE_LIBSDL 0

 /*
  * Use iODBC
  */
 #define wxUSE_ODBC 0
 /*
  * Use iODBC
  */
 #define wxUSE_ODBC 0

+#define wxUSE_BUILTIN_IODBC 0

 #define wxODBC_FWD_ONLY_CURSORS 1
 #define wxODBC_BACKWARD_COMPATABILITY 0
 /*
 #define wxODBC_FWD_ONLY_CURSORS 1
 #define wxODBC_BACKWARD_COMPATABILITY 0
 /*


@@ -167,7 +263,9 @@
 /*
  * Use GUI
  */
 /*
  * Use GUI
  */

+#ifndef wxUSE_GUI

 #define wxUSE_GUI 0
 #define wxUSE_GUI 0

+#endif

 /*
  * Don't use GUI (defined to 1 when compiling/using base only)
  */
 /*
  * Don't use GUI (defined to 1 when compiling/using base only)
  */


@@ -203,6 +301,11 @@
 */
 #define wxUSE_POPUPWIN 0
 
 */
 #define wxUSE_POPUPWIN 0
 

+/*
+   Use wxTipWindow
+ */
+#define wxUSE_TIPWINDOW 0
+

 /*
  * Use accelerators
  */
 /*
  * Use accelerators
  */


@@ -218,6 +321,11 @@
  */
 #define wxUSE_FILEDLG 0
 
  */
 #define wxUSE_FILEDLG 0
 

+/*
+ * Use wxFindReplaceDialog
+ */
+#define wxUSE_FINDREPLDLG 0
+

 /*
  * Use wxFontDialog
  */
 /*
  * Use wxFontDialog
  */


@@ -228,6 +336,11 @@
  */
 #define wxUSE_MIMETYPE 0
 
  */
 #define wxUSE_MIMETYPE 0
 

+/*
+ * Use wxSystemOptions
+ */
+#define wxUSE_SYSTEM_OPTIONS 0
+

 /*
  * Use wxMessageDialog (and wxMessageBox)
  */
 /*
  * Use wxMessageDialog (and wxMessageBox)
  */


@@ -273,6 +386,11 @@
  */
 #define wxUSE_DRAGIMAGE 0
 
  */
 #define wxUSE_DRAGIMAGE 0
 

+/*
+ * Enable accessibility support
+ */
+#define wxUSE_ACCESSIBILITY 0
+

 /*
  * Use property sheet classes
  */
 /*
  * Use property sheet classes
  */


@@ -321,6 +439,10 @@
  * Use this control
  */
 #define wxUSE_CHOICE 0
  * Use this control
  */
 #define wxUSE_CHOICE 0

+/*
+ * Use wxDisplay class
+ */
+#define wxUSE_DISPLAY 0

 /*
  * Use this control
  */
 /*
  * Use this control
  */


@@ -330,12 +452,12 @@
  */
 #define wxUSE_GRID 0
 /*
  */
 #define wxUSE_GRID 0
 /*

- * Use this control
+ * Use the new prototype wxGrid classes
+ * (wxUSE_GRID must also be defined)

  */
 #define wxUSE_NEW_GRID 0
 /*
  */
 #define wxUSE_NEW_GRID 0
 /*

- * Use the new prototype wxGrid classes
- * (wxUSE_GRID must also be defined)
+ * Use wxImageList class

  */
 #define wxUSE_IMAGLIST 0
 /*
  */
 #define wxUSE_IMAGLIST 0
 /*


@@ -354,6 +476,7 @@
  * Use this control
  */
 #define wxUSE_NOTEBOOK 0
  * Use this control
  */
 #define wxUSE_NOTEBOOK 0

+#define wxUSE_LISTBOOK 0

 /*
  * Use this control
  */
 /*
  * Use this control
  */


@@ -401,7 +524,6 @@
 /*
  * Use this control
  */
 /*
  * Use this control
  */

-#define wxUSE_STATUSBAR 0

 #define wxUSE_STATTEXT 0
 /*
  * Use this control
 #define wxUSE_STATTEXT 0
 /*
  * Use this control


@@ -435,16 +557,9 @@
 #define wxUSE_TOOLBAR_NATIVE 0
 
 /*
 #define wxUSE_TOOLBAR_NATIVE 0
 
 /*

- * Use generic wxToolBar instead of/together with the native one?
+ * Use wxTreeLayout class

  */
  */

-#define wxUSE_TOOLBAR_SIMPLE 0
-
-#if defined(__WXWINE__) || defined(__GNUWIN32__) || defined(__WXPM__)
-#define wxUSE_OWNER_DRAWN 1
-  #if wxUSE_TOOLBAR
-    #define wxUSE_BUTTONBAR 1
-  #endif
-#endif
+#define wxUSE_TREELAYOUT 0

 
 /*
  * Use this control
 
 /*
  * Use this control


@@ -477,11 +592,22 @@
  * Use wxFFile class
  */
 #define wxUSE_FFILE 0
  * Use wxFFile class
  */
 #define wxUSE_FFILE 0

+/*
+ * Use wxFSVolume class
+ */
+#define wxUSE_FSVOLUME 1
+
+/*
+ * Use wxTextBuffer class
+ */
+#define wxUSE_TEXTBUFFER 0

 /*
  * Use wxTextFile class
  */
 #define wxUSE_TEXTFILE 0
 
 /*
  * Use wxTextFile class
  */
 #define wxUSE_TEXTFILE 0
 

+#define wxUSE_EXCEPTIONS 0
+

 /*
  * Use log classes and logging functions
  */
 /*
  * Use log classes and logging functions
  */


@@ -494,6 +620,10 @@
  * Use standard GUI logger
  */
 #define wxUSE_LOGGUI 0
  * Use standard GUI logger
  */
 #define wxUSE_LOGGUI 0

+/*
+ * Use old log dialog instead of new wxLogGui
+ */
+#define wxUSE_LOG_DIALOG 0

 /*
  * Use wxStopWatch
  */
 /*
  * Use wxStopWatch
  */


@@ -505,7 +635,7 @@
 /*
  * Use wave class
  */
 /*
  * Use wave class
  */

-#define wxUSE_WAVE 0
+#define wxUSE_SOUND 0

 /*
  * Use config system
  */
 /*
  * Use config system
  */


@@ -519,13 +649,16 @@
  */
 #define wxUSE_INTL 0
 /*
  */
 #define wxUSE_INTL 0
 /*

- * Use streams
+ * Use wxProtocol and related classes

  */
  */

-#define wxUSE_STREAMS 0
+#define wxUSE_PROTOCOL 0
+#define wxUSE_PROTOCOL_FILE 0
+#define wxUSE_PROTOCOL_FTP 0
+#define wxUSE_PROTOCOL_HTTP 0

 /*
 /*

- * Use class serialization
+ * Use streams

  */
  */

-#define wxUSE_SERIAL 0
+#define wxUSE_STREAMS 0

 /*
  * Use sockets
  */
 /*
  * Use sockets
  */


@@ -543,6 +676,10 @@
  * wxLibrary class
  */
 #define wxUSE_DYNLIB_CLASS 0
  * wxLibrary class
  */
 #define wxUSE_DYNLIB_CLASS 0

+/*
+ * Use wxObjectLoader
+ */
+#define wxUSE_DYNAMIC_LOADER 0

 
 /*
  * Use wxTimer
 
 /*
  * Use wxTimer


@@ -570,10 +707,41 @@
 #define wxUSE_WCHAR_T 0
 
 /*
 #define wxUSE_WCHAR_T 0
 
 /*

- * Compile wxWindows in Unicode mode (Win32 only for now)?
+ * Compile wxWindows in Unicode mode?

  */
 #define wxUSE_UNICODE 0
 
  */
 #define wxUSE_UNICODE 0
 

+/*
+ * Use MS Layer for Unicode on Win9X (Win32 only)?
+ */
+#define wxUSE_UNICODE_MSLU 0
+
+/*
+ * Set to 1 to compile MS Windows XP theme engine support
+ */
+#define wxUSE_UXTHEME 1
+
+/*
+ *  Set to 1 to auto-adapt to MS Windows XP themes where possible
+ * (notably, wxNotebook pages)
+ */
+#define wxUSE_UXTHEME_AUTO 1
+
+/*
+ *  Set to 1 to use mousewheel events on Windows
+ */
+#define wxUSE_MOUSEWHEEL 1
+
+/*
+ * Hotkey support (Windows)
+ */
+#define wxUSE_HOTKEY 1
+
+/*
+ * Use wxURL class
+ */
+#define wxUSE_URL 0
+

 /*
  * Work around a bug in GNU libc 5.x wcstombs() implementation.
  *
 /*
  * Work around a bug in GNU libc 5.x wcstombs() implementation.
  *


@@ -614,15 +782,19 @@
  * Use dnd
  */
 #define wxUSE_DRAG_AND_DROP 0
  * Use dnd
  */
 #define wxUSE_DRAG_AND_DROP 0

+/*
+ * Use OLE (MSW only)
+ */
+#define wxUSE_OLE 0

 /*
  * Use spline
  */
 #define wxUSE_SPLINES 0
 /*
  * Use spline
  */
 #define wxUSE_SPLINES 0

+

 /*
 /*

- * Use wxLibrary class
+ * Use MDI.

  */
  */

-#define wxUSE_DYNLIB_CLASS 0
-
+#define wxUSE_MDI 0

 /*
  * Use the mdi architecture
  */
 /*
  * Use the mdi architecture
  */


@@ -656,6 +828,14 @@
  * Use built-in HTML-based help controller
  */
 #define wxUSE_WXHTML_HELP 0
  * Use built-in HTML-based help controller
  */
 #define wxUSE_WXHTML_HELP 0

+/*
+ * Use MS HTML Help controller (win32)
+ */
+#define wxUSE_MS_HTML_HELP 0
+/*
+ * Use MS HTML Help via libmspack (Unix)
+ */
+#define wxUSE_LIBMSPACK 0

 
 /*
  * Use iostream.h rather than iostream
 
 /*
  * Use iostream.h rather than iostream


@@ -665,14 +845,14 @@
  * Use Apple Ieee-double converter
  */
 #define wxUSE_APPLE_IEEE 0
  * Use Apple Ieee-double converter
  */
 #define wxUSE_APPLE_IEEE 0

-/*
- * Compatibility with 2.0 API.
- */
-#define WXWIN_COMPATIBILITY_2 0

 /*
  * Compatibility with 2.2 API
  */
 #define WXWIN_COMPATIBILITY_2_2 0
 /*
  * Compatibility with 2.2 API
  */
 #define WXWIN_COMPATIBILITY_2_2 0

+/*
+ * Compatibility with 2.4 API
+ */
+#define WXWIN_COMPATIBILITY_2_4 0

 /*
  * Enables debugging: memory tracing, assert, etc., contains debug level
  */
 /*
  * Enables debugging: memory tracing, assert, etc., contains debug level
  */


@@ -745,6 +925,11 @@
  */
 #define wxUSE_ZIPSTREAM 0
 
  */
 #define wxUSE_ZIPSTREAM 0
 

+/*
+ * wxPalette class
+ */
+#define wxUSE_PALETTE 0
+

 /*
  * wxImage support
  */
 /*
  * wxImage support
  */


@@ -760,6 +945,11 @@
  */
 #define wxUSE_PCX 0
 
  */
 #define wxUSE_PCX 0
 

+/*
+ * IFF image format support
+ */
+#define wxUSE_IFF 0
+

 /*
  * PNM image format support
  */
 /*
  * PNM image format support
  */


@@ -770,6 +960,16 @@
  */
 #define wxUSE_XPM 0
 
  */
 #define wxUSE_XPM 0
 

+/*
+ * MS ICO (and CUR,ANI derivatives) image format support (on any platform)
+ */
+#define wxUSE_ICO_CUR 0
+
+/*
+ * Set to 1 if for dynamically loadable plugins support
+ */
+#define wxUSE_PLUGINS 0
+

 /*
  * Disable this if your compiler can't cope
  * with omission of prototype parameters.
 /*
  * Disable this if your compiler can't cope
  * with omission of prototype parameters.


@@ -792,6 +992,9 @@
 /* The type of 3rd argument to getsockname() - usually size_t or int */
 #undef SOCKLEN_T
 
 /* The type of 3rd argument to getsockname() - usually size_t or int */
 #undef SOCKLEN_T
 

+/* The type of statvfs(2) argument */
+#undef WX_STATFS_T
+

 /* The signal handler prototype */
 #undef wxTYPE_SA_HANDLER
 
 /* The signal handler prototype */
 #undef wxTYPE_SA_HANDLER
 


@@ -802,8 +1005,8 @@
 /* struct tm doesn't always have the tm_gmtoff field, define this if it does */
 #undef WX_GMTOFF_IN_TM
 
 /* struct tm doesn't always have the tm_gmtoff field, define this if it does */
 #undef WX_GMTOFF_IN_TM
 

-/* iconv()'s 2nd argument is char ** and not const char ** */
-#undef WX_ICONV_TAKES_CHAR
+/* Define if you have poll(2) function */
+#undef HAVE_POLL

 
 /* Define if you have pw_gecos field in struct passwd */
 #undef HAVE_PW_GECOS
 
 /* Define if you have pw_gecos field in struct passwd */
 #undef HAVE_PW_GECOS


@@ -817,6 +1020,9 @@
 /* Define if you have ftime() */
 #undef HAVE_FTIME
 
 /* Define if you have ftime() */
 #undef HAVE_FTIME
 

+/* Define if you have support for large (64 bit size) files */
+#undef HAVE_LARGEFILE_SUPPORT
+

 /* Define if you have localtime() */
 #undef HAVE_LOCALTIME
 
 /* Define if you have localtime() */
 #undef HAVE_LOCALTIME
 


@@ -844,6 +1050,12 @@
 /* Define if you have shl_load() */
 #undef HAVE_SHL_LOAD
 
 /* Define if you have shl_load() */
 #undef HAVE_SHL_LOAD
 

+/* define if you have statfs function */
+#undef HAVE_STATFS
+
+/* define if you have statvfs function */
+#undef HAVE_STATVFS
+

 /* Define if you have strptime() */
 #undef HAVE_STRPTIME
 
 /* Define if you have strptime() */
 #undef HAVE_STRPTIME
 


@@ -859,6 +1071,9 @@
 /* Define if you have vsnprintf() */
 #undef HAVE_VSNPRINTF
 
 /* Define if you have vsnprintf() */
 #undef HAVE_VSNPRINTF
 

+/* Define if you have vsnprintf() declaration in the header */
+#undef HAVE_VSNPRINTF_DECL
+

 /* Define if you have usleep() */
 #undef HAVE_USLEEP
 
 /* Define if you have usleep() */
 #undef HAVE_USLEEP
 


@@ -877,8 +1092,8 @@
 /* The number of bytes in a int.  */
 #undef SIZEOF_INT
 
 /* The number of bytes in a int.  */
 #undef SIZEOF_INT
 

-/* The number of bytes in a int *.  */
-#undef SIZEOF_INT_P
+/* The number of bytes in a pointer.  */
+#undef SIZEOF_VOID_P

 
 /* The number of bytes in a long.  */
 #undef SIZEOF_LONG
 
 /* The number of bytes in a long.  */
 #undef SIZEOF_LONG


@@ -889,6 +1104,9 @@
 /* The number of bytes in a short.  */
 #undef SIZEOF_SHORT
 
 /* The number of bytes in a short.  */
 #undef SIZEOF_SHORT
 

+/* The number of bytes in a size_t.  */
+#undef SIZEOF_SIZE_T
+

 /* Define if size_t on your machine is the same type as unsigned int. */
 #undef wxSIZE_T_IS_UINT
 
 /* Define if size_t on your machine is the same type as unsigned int. */
 #undef wxSIZE_T_IS_UINT
 


@@ -916,6 +1134,12 @@
 /* Define if you have the inet_aton function.  */
 #undef HAVE_INET_ATON
 
 /* Define if you have the inet_aton function.  */
 #undef HAVE_INET_ATON
 

+/* Define if you have the mktemp function.  */
+#undef HAVE_MKTEMP
+
+/* Define if you have the mkstemp function.  */
+#undef HAVE_MKSTEMP
+

 /* Define if you have the nanosleep function.  */
 #undef HAVE_NANOSLEEP
 
 /* Define if you have the nanosleep function.  */
 #undef HAVE_NANOSLEEP
 


@@ -940,12 +1164,15 @@
 /* Define if you have the usleep function.  */
 #undef HAVE_USLEEP
 
 /* Define if you have the usleep function.  */
 #undef HAVE_USLEEP
 

-/* Define if you have the vfork function.  */
-#undef HAVE_VFORK
-

 /* Define if you have the <X11/XKBlib.h> header file.  */
 #undef HAVE_X11_XKBLIB_H
 
 /* Define if you have the <X11/XKBlib.h> header file.  */
 #undef HAVE_X11_XKBLIB_H
 

+/* Define if you have the <X11/extensions/xf86vmode.h> header file.  */
+#undef HAVE_X11_EXTENSIONS_XF86VMODE_H
+
+/* Define if you have the fnmatch() function */
+#undef HAVE_FNMATCH
+

 /* Define if you have the <fnmatch.h> header file.  */
 #undef HAVE_FNMATCH_H
 
 /* Define if you have the <fnmatch.h> header file.  */
 #undef HAVE_FNMATCH_H
 


@@ -958,9 +1185,6 @@
 /* Define if you have the <sched.h> header file.  */
 #undef HAVE_SCHED_H
 
 /* Define if you have the <sched.h> header file.  */
 #undef HAVE_SCHED_H
 

-/* Define if you have the <strings.h> header file.  */
-#undef HAVE_STRINGS_H
-

 /* Define if you have the <unistd.h> header file.  */
 #undef HAVE_UNISTD_H
 
 /* Define if you have the <unistd.h> header file.  */
 #undef HAVE_UNISTD_H
 


@@ -973,19 +1197,87 @@
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 

-/* Define if you have the <iconv.h> header file.  */
-#undef HAVE_ICONV_H
+/* Define if you have the <wctype.h> header file.  */
+#undef HAVE_WCTYPE_H
+
+/* Define if you have the <iconv.h> header file and iconv() symbol.  */
+#undef HAVE_ICONV

 
 

-/* Test for GLIBC 2.2 iconv() */
-#undef WX_ICONV_TAKES_CHAR
+/* Define as "const" if the declaration of iconv() needs const.  */
+#undef ICONV_CONST

 
 /* Define if you have the <langinfo.h> header file.  */
 #undef HAVE_LANGINFO_H
 
 
 /* Define if you have the <langinfo.h> header file.  */
 #undef HAVE_LANGINFO_H
 

+/* Define if you have the <w32api.h> header file (mingw,cygwin).  */
+#undef HAVE_W32API_H
+
+/* Define if you have the <esd.h> header file.  */
+#undef HAVE_ESD_H
+
+/* Define if you have the <sys/soundcard.h> header file. */
+#undef HAVE_SYS_SOUNDCARD_H
+
+/* Define if you have a CD-ROM interface known to mmedia.  */
+#undef HAVE_KNOWN_CDROM_INTERFACE
+
+/* Define if you have wcsrtombs() function */
+#undef HAVE_WCSRTOMBS
+
+/* Define this if you have fputws() and putwc() */
+#undef HAVE_FPUTWC
+
+/* Define this if you have strcasecmp() function in <string.h> */
+#undef HAVE_STRCASECMP_IN_STRING_H
+
+/* Define this if you have strcasecmp() function in <strings.h> */
+#undef HAVE_STRCASECMP_IN_STRINGS_H
+
+/* Define this if you have wprintf() and related functions */
+#undef HAVE_WPRINTF
+
+/* Define this if you have wprintf() and related functions */
+#undef HAVE_VSWPRINTF
+
+/* Define this if you have _vsnwprintf */
+#undef HAVE__VSNWPRINTF
+

 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
 #undef HAVE_XIM
 
 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
 #undef HAVE_XIM
 

-/* now check the settings self consistency */
+/* Define this is you have X11/extensions/shape.h */
+#undef HAVE_XSHAPE
+
+/* -------------------------------------------------------------------------
+   Win32 adjustments section
+   ------------------------------------------------------------------------- */
+
+#ifdef __WIN32__
+
+/* we need to define wxUSE_XPM_IN_MSW for MSW compilation for compatibility
+   with wx/msw/setup.h */
+#define wxUSE_XPM_IN_MSW wxUSE_XPM
+
+#endif /* __WIN32__ */
+
+/* --------------------------------------------------------*
+ *  This stuff is static, it doesn't get modified directly
+ *  by configure.
+*/
+

 #include "wx/chkconf.h"
 
 #include "wx/chkconf.h"
 

+/*
+   define some constants identifying wxWindows version in more details than
+   just the version number
+ */
+
+/* wxLogChain class available */
+#define wxHAS_LOG_CHAIN
+
+/* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
+#undef wxHAS_WORKING_GTK_DC_BLIT
+
+

 #endif /* __WX_SETUP_H__ */
 #endif /* __WX_SETUP_H__ */

+