Make wxBackingFile internal, and remove wxZipFSHander, add a typedef to
wxArchiveFSHandler for compatibilty. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
100
configure
vendored
100
configure
vendored
@@ -981,7 +981,6 @@ Optional Features:
|
||||
--enable-ipc use interprocess communication (wxSocket etc.)
|
||||
--enable-apple_ieee use the Apple IEEE codec
|
||||
--enable-arcstream use wxArchive streams
|
||||
--enable-backingfile use wxBackingFile
|
||||
--enable-backtrace use wxStackWalker class for getting backtraces
|
||||
--enable-catch_segvs catch signals in wxApp::OnFatalException (Unix only)
|
||||
--enable-cmdline use wxCmdLineParser class
|
||||
@@ -997,7 +996,7 @@ Optional Features:
|
||||
--enable-fontmap use font encodings conversion classes
|
||||
--enable-fs_archive use virtual archive filesystems
|
||||
--enable-fs_inet use virtual HTTP/FTP filesystems
|
||||
--enable-fs_zip use virtual ZIP filesystems
|
||||
--enable-fs_zip now replaced by fs_archive
|
||||
--enable-geometry use geometry class
|
||||
--enable-log use logging system
|
||||
--enable-longlong use wxLongLong class
|
||||
@@ -2321,7 +2320,6 @@ if test $DEBUG_CONFIGURE = 1; then
|
||||
DEFAULT_wxUSE_ARCHIVE_STREAMS=no
|
||||
DEFAULT_wxUSE_ZIPSTREAM=no
|
||||
DEFAULT_wxUSE_TARSTREAM=no
|
||||
DEFAULT_wxUSE_BACKINGFILE=no
|
||||
DEFAULT_wxUSE_VALIDATORS=no
|
||||
|
||||
DEFAULT_wxUSE_ACCEL=no
|
||||
@@ -2542,7 +2540,6 @@ else
|
||||
DEFAULT_wxUSE_ARCHIVE_STREAMS=yes
|
||||
DEFAULT_wxUSE_ZIPSTREAM=yes
|
||||
DEFAULT_wxUSE_TARSTREAM=yes
|
||||
DEFAULT_wxUSE_BACKINGFILE=yes
|
||||
DEFAULT_wxUSE_VALIDATORS=yes
|
||||
|
||||
DEFAULT_wxUSE_ACCEL=yes
|
||||
@@ -5068,47 +5065,6 @@ echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
|
||||
enablestring=
|
||||
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-backingfile" >&5
|
||||
echo $ECHO_N "checking for --${enablestring:-enable}-backingfile... $ECHO_C" >&6
|
||||
no_cache=0
|
||||
# Check whether --enable-backingfile or --disable-backingfile was given.
|
||||
if test "${enable_backingfile+set}" = set; then
|
||||
enableval="$enable_backingfile"
|
||||
|
||||
if test "$enableval" = yes; then
|
||||
ac_cv_use_backingfile='wxUSE_BACKINGFILE=yes'
|
||||
else
|
||||
ac_cv_use_backingfile='wxUSE_BACKINGFILE=no'
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
LINE=`grep "wxUSE_BACKINGFILE" ${wx_arg_cache_file}`
|
||||
if test "x$LINE" != x ; then
|
||||
eval "DEFAULT_$LINE"
|
||||
else
|
||||
no_cache=1
|
||||
fi
|
||||
|
||||
ac_cv_use_backingfile='wxUSE_BACKINGFILE='$DEFAULT_wxUSE_BACKINGFILE
|
||||
|
||||
fi;
|
||||
|
||||
eval "$ac_cv_use_backingfile"
|
||||
if test "$no_cache" != 1; then
|
||||
echo $ac_cv_use_backingfile >> ${wx_arg_cache_file}.tmp
|
||||
fi
|
||||
|
||||
if test "$wxUSE_BACKINGFILE" = yes; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
|
||||
enablestring=
|
||||
echo "$as_me:$LINENO: checking for --${enablestring:-enable}-backtrace" >&5
|
||||
echo $ECHO_N "checking for --${enablestring:-enable}-backtrace... $ECHO_C" >&6
|
||||
@@ -29861,7 +29817,7 @@ _ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Intrinsic.h>
|
||||
_ACEOF
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
|
||||
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
|
||||
@@ -29888,7 +29844,7 @@ else
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
for ac_dir in $ac_x_header_dirs; do
|
||||
if test -r "$ac_dir/X11/Xlib.h"; then
|
||||
if test -r "$ac_dir/X11/Intrinsic.h"; then
|
||||
ac_x_includes=$ac_dir
|
||||
break
|
||||
fi
|
||||
@@ -29902,18 +29858,18 @@ if test "$ac_x_libraries" = no; then
|
||||
# See if we find them without any special options.
|
||||
# Don't add to $LIBS permanently.
|
||||
ac_save_LIBS=$LIBS
|
||||
LIBS="-lX11 $LIBS"
|
||||
LIBS="-lXt $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Intrinsic.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
XrmInitialize ()
|
||||
XtMalloc (0)
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
@@ -29951,7 +29907,7 @@ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
|
||||
do
|
||||
# Don't even attempt the hair of trying to link an X program!
|
||||
for ac_extension in a so sl; do
|
||||
if test -r $ac_dir/libX11.$ac_extension; then
|
||||
if test -r $ac_dir/libXt.$ac_extension; then
|
||||
ac_x_libraries=$ac_dir
|
||||
break 2
|
||||
fi
|
||||
@@ -43401,24 +43357,11 @@ _ACEOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$wxUSE_FILESYSTEM" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_FILESYSTEM 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$wxUSE_FS_ZIP" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_FS_ZIP 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$wxUSE_ARCHIVE_STREAMS" = "yes"; then
|
||||
if test "$wxUSE_STREAMS" != yes; then
|
||||
{ echo "$as_me:$LINENO: WARNING: wxArchive requires wxStreams... disabled" >&5
|
||||
echo "$as_me: WARNING: wxArchive requires wxStreams... disabled" >&2;}
|
||||
wxUSE_ARCHIVE_STREAMS=no
|
||||
else
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_ARCHIVE_STREAMS 1
|
||||
@@ -43454,22 +43397,23 @@ _ACEOF
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_BACKINGFILE" = "yes"; then
|
||||
if test "$wxUSE_FILESYSTEM" = "yes"; then
|
||||
if test "$wxUSE_STREAMS" != yes -o \( "$wxUSE_FILE" != yes -a "$wxUSE_FFILE" != yes \); then
|
||||
{ echo "$as_me:$LINENO: WARNING: wxBackingFile requires wxStreams and wxFile or wxFFile... disabled" >&5
|
||||
echo "$as_me: WARNING: wxBackingFile requires wxStreams and wxFile or wxFFile... disabled" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: wxFileSystem requires wxStreams and wxFile or wxFFile... disabled" >&5
|
||||
echo "$as_me: WARNING: wxFileSystem requires wxStreams and wxFile or wxFFile... disabled" >&2;}
|
||||
wxUSE_FILESYSTEM=no
|
||||
else
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_BACKINGFILE 1
|
||||
#define wxUSE_FILESYSTEM 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_FS_ARCHIVE" = "yes"; then
|
||||
if test "$wxUSE_ARCHIVE_STREAMS" != yes -o "$wxUSE_BACKINGFILE" != yes; then
|
||||
{ echo "$as_me:$LINENO: WARNING: wxArchiveFSHandler requires wxArchive and wxBackingFile... disabled" >&5
|
||||
echo "$as_me: WARNING: wxArchiveFSHandler requires wxArchive and wxBackingFile... disabled" >&2;}
|
||||
if test "$wxUSE_FILESYSTEM" != yes -o "$wxUSE_ARCHIVE_STREAMS" != yes; then
|
||||
{ echo "$as_me:$LINENO: WARNING: wxArchiveFSHandler requires wxArchive and wxFileSystem... disabled" >&5
|
||||
echo "$as_me: WARNING: wxArchiveFSHandler requires wxArchive and wxFileSystem... disabled" >&2;}
|
||||
else
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_FS_ARCHIVE 1
|
||||
@@ -43478,6 +43422,18 @@ _ACEOF
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_FS_ZIP" = "yes"; then
|
||||
if test "$wxUSE_FS_ARCHIVE" != yes; then
|
||||
{ echo "$as_me:$LINENO: WARNING: wxZipFSHandler requires wxArchiveFSHandler... disabled" >&5
|
||||
echo "$as_me: WARNING: wxZipFSHandler requires wxArchiveFSHandler... disabled" >&2;}
|
||||
else
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_FS_ZIP 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
|
||||
if test "$USE_UNIX" != 1; then
|
||||
{ echo "$as_me:$LINENO: WARNING: Catching fatal exceptions not currently supported on this system, wxApp::OnFatalException will not be called" >&5
|
||||
|
||||
Reference in New Issue
Block a user