From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 16 Jun 2011 15:19:55 +0000 (+0000)
Subject: Disable wxFileSystemWatcher in configure if threads are disabled.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/dac2ee8dee32744293b32b4bd082466f35d8c587?ds=inline

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 3bc2801cd3..026622784e 100755
--- 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 cc71b77be2..4b40489085 100644
--- 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