Hopefully fixed library names generated by wx-config for OS/2's PM port.

[wxWidgets.git] / include / wx / chkconf.h

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index eb95a01b3d32faabc3d6a7c12c798e2775e4b406..8ae71dcf156296f9ae14a5f3c3ae5642a815228a 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -70,7 +70,9 @@
  */
 
 #ifndef wxUSE_CRASHREPORT
  */
 
 #ifndef wxUSE_CRASHREPORT

-#   ifdef wxABORT_ON_CONFIG_ERROR
+    /* this one is special: as currently it is Windows-only, don't force it
+       to be defined on other platforms */
+#   if defined(wxABORT_ON_CONFIG_ERROR) && defined(__WXMSW__)

 #       error "wxUSE_CRASHREPORT must be defined."
 #   else
 #       define wxUSE_CRASHREPORT 0
 #       error "wxUSE_CRASHREPORT must be defined."
 #   else
 #       define wxUSE_CRASHREPORT 0


@@ -950,15 +952,6 @@
 #   endif
 #endif /* wxUSE_TEXTFILE */
 
 #   endif
 #endif /* wxUSE_TEXTFILE */
 

-#if wxUSE_UNICODE_MSLU && !wxUSE_UNICODE
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_UNICODE_MSLU requires wxUSE_UNICODE"
-#   else
-#       undef wxUSE_UNICODE
-#       define wxUSE_UNICODE 1
-#   endif
-#endif /* wxUSE_UNICODE_MSLU */
-

 #if wxUSE_XML && !wxUSE_WCHAR_T
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_XML requires wxUSE_WCHAR_T"
 #if wxUSE_XML && !wxUSE_WCHAR_T
 #   ifdef wxABORT_ON_CONFIG_ERROR
 #       error "wxUSE_XML requires wxUSE_WCHAR_T"


@@ -966,7 +959,7 @@
 #       undef wxUSE_XML
 #       define wxUSE_XML 0
 #   endif
 #       undef wxUSE_XML
 #       define wxUSE_XML 0
 #   endif

-#endif /* wxUSE_UNICODE_MSLU */
+#endif /* wxUSE_XML */

 
 #if !wxUSE_DYNLIB_CLASS
 #   if wxUSE_DYNAMIC_LOADER
 
 #if !wxUSE_DYNLIB_CLASS
 #   if wxUSE_DYNAMIC_LOADER