Disable wxUSE_FSWATCHER under Unix if neither inotify nor kqueue is available.
Don't define wxUSE_FSWATCHER as 1 in configure if we can't implement it. Also add a check to wx/unix/chkconf.h to verify that we didn't end up with an inconsistent configuration somehow. Closes #11670. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
38
configure
vendored
38
configure
vendored
@@ -42595,13 +42595,8 @@ fi
|
||||
|
||||
|
||||
if test "$wxUSE_FSWATCHER" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_FSWATCHER 1
|
||||
_ACEOF
|
||||
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS fswatcher"
|
||||
|
||||
if test "$wxUSE_UNIX" = "yes"; then
|
||||
if test "$wxUSE_MSW" != "1"; then
|
||||
if test "$wxUSE_UNIX" = "yes"; then
|
||||
|
||||
for ac_header in sys/inotify.h
|
||||
do
|
||||
@@ -42660,12 +42655,12 @@ fi
|
||||
|
||||
done
|
||||
|
||||
if test "$ac_cv_header_sys_inotify_h" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
if test "$ac_cv_header_sys_inotify_h" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxHAS_INOTIFY 1
|
||||
_ACEOF
|
||||
|
||||
else
|
||||
else
|
||||
|
||||
for ac_header in sys/event.h
|
||||
do
|
||||
@@ -42724,17 +42719,30 @@ fi
|
||||
|
||||
done
|
||||
|
||||
if test "$ac_cv_header_sys_event_h" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
if test "$ac_cv_header_sys_event_h" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxHAS_KQUEUE 1
|
||||
_ACEOF
|
||||
|
||||
else
|
||||
{ echo "$as_me:$LINENO: WARNING: No native wxFileSystemWatcher implementation available for on this platform" >&5
|
||||
echo "$as_me: WARNING: No native wxFileSystemWatcher implementation available for on this platform" >&2;}
|
||||
else
|
||||
wxUSE_FSWATCHER=no
|
||||
fi
|
||||
fi
|
||||
else
|
||||
wxUSE_FSWATCHER=no
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_FSWATCHER" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_FSWATCHER 1
|
||||
_ACEOF
|
||||
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS fswatcher"
|
||||
else
|
||||
{ echo "$as_me:$LINENO: WARNING: wxFileSystemWatcher won't be available on this platform" >&5
|
||||
echo "$as_me: WARNING: wxFileSystemWatcher won't be available on this platform" >&2;}
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user