Disable wxFileSystemWatcher in configure if threads are disabled.

wxFileSystemWatcher requires threads under MSW so disable it automatically in
configure if --disable-threads was used to avoid compilation errors in
wx/msw/chkconf.h later.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index 3bc2801cd3d05ed58f03452c70088b0e3a4c3c66..026622784e409fdcf9d21a37f8130bebf17a0335 100755 (executable)
--- a/configure
+++ b/configure
@@ -43755,6 +43755,12 @@ _ACEOF
         else
             wxUSE_FSWATCHER=no
         fi
+    else
+        if test "$wxUSE_THREADS" != "yes"; then
+            { echo "$as_me:$LINENO: WARNING: wxFileSystemWatcher disabled due to --disable-threads" >&5
+echo "$as_me: WARNING: wxFileSystemWatcher disabled due to --disable-threads" >&2;}
+            wxUSE_FSWATCHER=no
+        fi
     fi
 
     if test "$wxUSE_FSWATCHER" = "yes"; then

diff --git a/configure.in b/configure.in
index cc71b77be2d20b96f34e34396d88c2c8eb89a463..4b40489085c8cd75b7be2726221958bf8c5dd275 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5669,6 +5669,11 @@ if test "$wxUSE_FSWATCHER" = "yes"; then
         else
             wxUSE_FSWATCHER=no
         fi
+    else
+        if test "$wxUSE_THREADS" != "yes"; then
+            AC_MSG_WARN([wxFileSystemWatcher disabled due to --disable-threads])
+            wxUSE_FSWATCHER=no
+        fi
     fi
 
     if test "$wxUSE_FSWATCHER" = "yes"; then