Enable wxUSE_FSVOLUME in configure builds.
This was never set to 1 when using configure, add a configure option for it and set it to 1 by default now. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
51
configure
vendored
51
configure
vendored
@@ -1215,6 +1215,7 @@ enable_fontmap
|
||||
enable_fs_archive
|
||||
enable_fs_inet
|
||||
enable_fs_zip
|
||||
enable_fsvolume
|
||||
enable_fswatcher
|
||||
enable_geometry
|
||||
enable_log
|
||||
@@ -2148,6 +2149,7 @@ Optional Features:
|
||||
--enable-fs_archive use virtual archive filesystems
|
||||
--enable-fs_inet use virtual HTTP/FTP filesystems
|
||||
--enable-fs_zip now replaced by fs_archive
|
||||
--enable-fsvolume use wxFSVolume class
|
||||
--enable-fswatcher use wxFileSystemWatcher class
|
||||
--enable-geometry use geometry class
|
||||
--enable-log use logging system
|
||||
@@ -8618,6 +8620,50 @@ fi
|
||||
$as_echo "$result" >&6; }
|
||||
|
||||
|
||||
enablestring=
|
||||
defaultval=$wxUSE_ALL_FEATURES
|
||||
if test -z "$defaultval"; then
|
||||
if test x"$enablestring" = xdisable; then
|
||||
defaultval=yes
|
||||
else
|
||||
defaultval=no
|
||||
fi
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-fsvolume" >&5
|
||||
$as_echo_n "checking for --${enablestring:-enable}-fsvolume... " >&6; }
|
||||
# Check whether --enable-fsvolume was given.
|
||||
if test "${enable_fsvolume+set}" = set; then :
|
||||
enableval=$enable_fsvolume;
|
||||
if test "$enableval" = yes; then
|
||||
wx_cv_use_fsvolume='wxUSE_FSVOLUME=yes'
|
||||
else
|
||||
wx_cv_use_fsvolume='wxUSE_FSVOLUME=no'
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
wx_cv_use_fsvolume='wxUSE_FSVOLUME=${'DEFAULT_wxUSE_FSVOLUME":-$defaultval}"
|
||||
|
||||
fi
|
||||
|
||||
|
||||
eval "$wx_cv_use_fsvolume"
|
||||
|
||||
if test x"$enablestring" = xdisable; then
|
||||
if test $wxUSE_FSVOLUME = no; then
|
||||
result=yes
|
||||
else
|
||||
result=no
|
||||
fi
|
||||
else
|
||||
result=$wxUSE_FSVOLUME
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
|
||||
$as_echo "$result" >&6; }
|
||||
|
||||
|
||||
enablestring=
|
||||
defaultval=$wxUSE_ALL_FEATURES
|
||||
if test -z "$defaultval"; then
|
||||
@@ -34691,6 +34737,11 @@ $as_echo "$as_me: WARNING: wxZipFSHandler requires wxArchiveFSHandler... disable
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_FSVOLUME" = "yes"; then
|
||||
$as_echo "#define wxUSE_FSVOLUME 1" >>confdefs.h
|
||||
|
||||
fi
|
||||
|
||||
if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
|
||||
if test "$USE_UNIX" != 1; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Catching fatal exceptions not currently supported on this system, wxApp::OnFatalException will not be called" >&5
|
||||
|
@@ -773,6 +773,7 @@ WX_ARG_FEATURE(fontmap, [ --enable-fontmap use font encodings conv
|
||||
WX_ARG_FEATURE(fs_archive, [ --enable-fs_archive use virtual archive filesystems], wxUSE_FS_ARCHIVE)
|
||||
WX_ARG_FEATURE(fs_inet, [ --enable-fs_inet use virtual HTTP/FTP filesystems], wxUSE_FS_INET)
|
||||
WX_ARG_FEATURE(fs_zip, [ --enable-fs_zip now replaced by fs_archive], wxUSE_FS_ZIP)
|
||||
WX_ARG_FEATURE(fsvolume, [ --enable-fsvolume use wxFSVolume class], wxUSE_FSVOLUME)
|
||||
WX_ARG_FEATURE(fswatcher, [ --enable-fswatcher use wxFileSystemWatcher class], wxUSE_FSWATCHER)
|
||||
WX_ARG_FEATURE(geometry, [ --enable-geometry use geometry class], wxUSE_GEOMETRY)
|
||||
WX_ARG_FEATURE(log, [ --enable-log use logging system], wxUSE_LOG)
|
||||
@@ -5838,6 +5839,10 @@ if test "$wxUSE_FS_ZIP" = "yes"; then
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_FSVOLUME" = "yes"; then
|
||||
AC_DEFINE(wxUSE_FSVOLUME)
|
||||
fi
|
||||
|
||||
if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
|
||||
if test "$USE_UNIX" != 1; then
|
||||
AC_MSG_WARN([Catching fatal exceptions not currently supported on this system, wxApp::OnFatalException will not be called])
|
||||
|
Reference in New Issue
Block a user