Fixups for solaris; remove '-mt' from pkg-config output and add '-lX11' for a static...

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index 11e8240f11ca9d3e3622b1f0af182f6cb15e75cb..98533574f0ce91b1c94bfe12f212ffec8c93bb94 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -3,7 +3,7 @@
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.stm.tudelft.nl)                             *
- * Date : 9 November 1999                                                    *
+ * Date : 18 August 2005                                                     *
  *                                                                           *
  *****************************************************************************/
 
@@ -12,10 +12,6 @@
 #ifndef __WX_SETUP_H__
 #define __WX_SETUP_H__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include <wx/vms_x_fix.h>
 
 /* never undefine inline or const keywords for C++ compilation */
@@ -72,6 +68,9 @@
 /* Define this if your version of Motif is greater than 2.0 */
 /* #undef __WXMOTIF20__ */
 
+/* Define this if you are using Lesstif */
+/* #undef __WXLESSTIF__ */
+
 #ifdef __WXGTK__
 /* Define this if your version of GTK+ is greater than 1.2 */
 #define __WXGTK12__ 1
@@ -122,6 +121,9 @@
 /* PowerPC Darwin & Mac OS X */
 #undef __POWERPC__
 
+/* Hack to make IOGraphicsTypes.h not define Point conflicting with MacTypes */
+#undef __Point__
+
 /* MS-DOS with DJGPP */
 #undef __DOS__
 
@@ -164,18 +166,15 @@
 
 #define wxUSE_DEBUG_CONTEXT 0
 
+#define wxUSE_DEBUGREPORT 0
+
 #define wxUSE_MEMORY_TRACING 0
 
 #define wxUSE_GLOBAL_MEMORY_OPERATORS 0
 
 #define wxUSE_DEBUG_NEW_ALWAYS 0
 
-#if defined(_MSC_VER) || \
-    (defined(__BORLANDC__) && __BORLANDC__ >= 0x0550)
-    #define wxUSE_ON_FATAL_EXCEPTION 0
-#else
-    #define wxUSE_ON_FATAL_EXCEPTION 0
-#endif
+#define wxUSE_ON_FATAL_EXCEPTION 0
 
 #define wxUSE_STACKWALKER 0
 
@@ -184,8 +183,6 @@
     #define wxUSE_UNICODE 0
 #endif
 
-#define wxUSE_UNICODE_MSLU 0
-
 #define wxUSE_WCHAR_T 1
 
 
@@ -211,6 +208,7 @@
 
 #define wxUSE_STD_IOSTREAM  0
 
+#define wxUSE_STD_STRING  0
 
 #define wxUSE_LONGLONG      1
 
@@ -219,6 +217,8 @@
 
 #define wxUSE_FSVOLUME      1
 
+#define wxUSE_STDPATHS      1
+
 #define wxUSE_TEXTBUFFER    1
 
 #define wxUSE_TEXTFILE      1
@@ -281,10 +281,6 @@
 
 #define wxUSE_MEDIACTRL     1
 
-#define wxUSE_QUICKTIME     1
-
-#define wxUSE_DIRECTSHOW    1
-
 #define wxUSE_GSTREAMER     0
 
 #define wxUSE_XRC       1
@@ -337,11 +333,7 @@
 
 #define wxUSE_STATUSBAR    1
 
-#if defined(__WXMSW__) || defined(__WXMAC__)
-#define wxUSE_NATIVE_STATUSBAR        0
-#else
 #define wxUSE_NATIVE_STATUSBAR        0
-#endif
 
 #define wxUSE_TOOLBAR 1
 #define wxUSE_TOOLBAR_NATIVE 1
@@ -418,9 +410,9 @@
 #define wxUSE_WIZARDDLG 1
 
 
-#define wxUSE_METAFILE              1
-#define wxUSE_ENH_METAFILE          1
-#define wxUSE_WIN_METAFILES_ALWAYS  1
+#define wxUSE_METAFILE              0
+#define wxUSE_ENH_METAFILE          0
+#define wxUSE_WIN_METAFILES_ALWAYS  0
 
 
 #define wxUSE_MDI 1
@@ -483,9 +475,6 @@
 
 #define wxUSE_AFM_FOR_POSTSCRIPT 1
 
-#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
-
-
 #define wxUSE_ODBC          1
 
 #define wxODBC_FWD_ONLY_CURSORS         1
@@ -536,10 +525,18 @@
 /* enable rich edit under Win32 */
 #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 1
+
+#define wxUSE_GADGETS 1
+
 /*
  * Supports bool type
  */
@@ -630,6 +627,10 @@
  * Use libXpm
  */
 #define wxHAVE_LIB_XPM 1
+/*
+ * Define if you have pthread_cleanup_push/pop()
+ */
+#define wxHAVE_PTHREAD_CLEANUP 1
 /*
  * Use consistent PostScript fonts for AFM and printing (!)
  */
@@ -724,7 +725,7 @@
 #undef WX_TIMEZONE
  
 /* The type of 3rd argument to getsockname() - usually size_t or int */
-#define SOCKLEN_T size_t
+#define WX_SOCKLEN_T size_t
 
 /* The type of 5th argument to getsockopt() - usually size_t or int */
 #define SOCKOPTLEN_T size_t
@@ -757,6 +758,9 @@
 /* Define if you have gettimeofday() */
 #define HAVE_GETTIMEOFDAY
 
+/* Define if fsync() is available */
+#define HAVE_FSYNC 1
+
 /* Define if you have ftime() */
 #define HAVE_FTIME
 
@@ -781,6 +785,9 @@
 /* Define if you have pthread_cancel */
 #define HAVE_PTHREAD_CANCEL 1
 
+/* Define if you have pthread_attr_setstacksize */
+#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
+
 /* Define if you have sigaction() */
 #define HAVE_SIGACTION 1
 
@@ -796,9 +803,22 @@
 /* Define if you have shl_load() */
 #undef HAVE_SHL_LOAD
 
+/* Define if you have snprintf() */
+#undef HAVE_SNPRINTF
+
+/* Define if you have snprintf() declaration in the header */
+#undef HAVE_SNPRINTF_DECL
+
+/* Define if you have a _broken_ snprintf() declaration in the header,
+ * with 'char*' for the 3rd parameter instead of 'const char*' */
+#undef HAVE_BROKEN_SNPRINTF_DECL
+
 /* define if you have statfs function */
 #undef HAVE_STATFS
 
+/* define if you have statfs prototype */
+#undef HAVE_STATFS_DECL
+
 /* define if you have statvfs function */
 #undef HAVE_STATVFS
 
@@ -808,9 +828,6 @@
 /* Define if you have all functions to set thread priority */
 #define HAVE_THREAD_PRIORITY_FUNCTIONS 1
 
-/* Define if you can specify exit functions to a thread */
-#define HAVE_THREAD_CLEANUP_FUNCTIONS 1
-
 /* Define if you have timegm() function */
 #undef HAVE_TIMEGM
 
@@ -820,6 +837,10 @@
 /* Define if you have vsnprintf() declaration in the header */
 #undef HAVE_VSNPRINTF_DECL
 
+/* Define if you have a _broken_ vsnprintf() declaration in the header,
+ * with 'char*' for the 3rd parameter instead of 'const char*' */
+#undef HAVE_BROKEN_VSNPRINTF_DECL
+
 /* Define if you have usleep() */
 #define HAVE_USLEEP 1
 
@@ -1006,6 +1027,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
 
@@ -1020,6 +1044,8 @@
       with wx/msw/setup.h */
 #define wxUSE_XPM_IN_MSW wxUSE_XPM
 
+#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
+
 #endif /* __WIN32__ */
 
 /* --------------------------------------------------------*