From c7f3eecc5223ecc42c1ff3145e03470dbf34c831 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 1 May 2002 16:15:01 +0000
Subject: [PATCH] added a few more consistency tests which used to be in
 wx\msw\setup.h

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/chkconf.h | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 1f4d44c86d..3276d23fe2 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -50,6 +50,14 @@
 #   endif
 #endif /* !defined(wxUSE_DYNLIB_CLASS) */
 
+#ifndef wxUSE_FILESYSTEM
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_FILESYSTEM must be defined."
+#   else
+#       define wxUSE_FILESYSTEM 0
+#   endif
+#endif /* !defined(wxUSE_FILESYSTEM) */
+
 /* don't give an error about this one yet, it's not fully implemented */
 #ifndef wxUSE_FSVOLUME
 #   define wxUSE_FSVOLUME 0
@@ -725,11 +733,33 @@
 #   endif
 #endif /* wxUSE_PROTOCOL */
 
-/* non GUI settings */
-#if wxUSE_STOPWATCH
+/* have to test for wxUSE_HTML before wxUSE_FILESYSTEM */
+#if wxUSE_HTML
+#   if !wxUSE_FILESYSTEM
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxHTML requires wxFileSystem"
+#       else
+#           undef wxUSE_FILESYSTEM
+#           define wxUSE_FILESYSTEM 1
+#       endif
+#   endif
+#endif /* wxUSE_HTML */
+
+#if wxUSE_FILESYSTEM
+#   if !wxUSE_STREAMS
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxUSE_FILESYSTEM requires wxUSE_STREAMS"
+#       else
+#           undef wxUSE_STREAMS
+#           define wxUSE_STREAMS 1
+#       endif
+#   endif
+#endif /* wxUSE_FILESYSTEM */
+
+#if wxUSE_STOPWATCH || wxUSE_DATETIME
 #    if !wxUSE_LONGLONG
 #        ifdef wxABORT_ON_CONFIG_ERROR
-#            error "wxUSE_STOPWATCH requires wxUSE_LONGLONG"
+#            error "wxUSE_STOPWATCH and wxUSE_DATETIME require wxUSE_LONGLONG"
 #        else
 #            undef wxUSE_LONGLONG
 #            define wxUSE_LONGLONG 1