Add wxUSE_TARSTREAM and wxUSE_FS_ARCHIVE.

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

diff --git a/configure b/configure
index 3cdc5dc7d829253da49c9c4dc4f5ecbae305737b..e2af5464c2e3d7089f7ccc7d63c04fe0ffa53083 100755 (executable)
--- a/configure
+++ b/configure
@@ -995,6 +995,7 @@ Optional Features:
   --enable-file           use wxFile class
   --enable-filesystem     use virtual file systems classes
   --enable-fontmap        use font encodings conversion classes
   --enable-file           use wxFile class
   --enable-filesystem     use virtual file systems classes
   --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-geometry       use geometry class
   --enable-fs_inet        use virtual HTTP/FTP filesystems
   --enable-fs_zip         use virtual ZIP filesystems
   --enable-geometry       use geometry class


@@ -1009,6 +1010,7 @@ Optional Features:
   --enable-stopwatch      use wxStopWatch class
   --enable-streams        use wxStream etc classes
   --enable-sysoptions     use wxSystemOptions
   --enable-stopwatch      use wxStopWatch class
   --enable-streams        use wxStream etc classes
   --enable-sysoptions     use wxSystemOptions

+  --enable-tarstream      use wxTar streams

   --enable-textbuf        use wxTextBuffer class
   --enable-textfile       use wxTextFile class
   --enable-timer          use wxTimer class
   --enable-textbuf        use wxTextBuffer class
   --enable-textfile       use wxTextFile class
   --enable-timer          use wxTimer class


@@ -2314,9 +2316,11 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_FILESYSTEM=no
   DEFAULT_wxUSE_FS_INET=no
   DEFAULT_wxUSE_FS_ZIP=no
   DEFAULT_wxUSE_FILESYSTEM=no
   DEFAULT_wxUSE_FS_INET=no
   DEFAULT_wxUSE_FS_ZIP=no

+  DEFAULT_wxUSE_FS_ARCHIVE=no

   DEFAULT_wxUSE_BUSYINFO=no
   DEFAULT_wxUSE_ARCHIVE_STREAMS=no
   DEFAULT_wxUSE_ZIPSTREAM=no
   DEFAULT_wxUSE_BUSYINFO=no
   DEFAULT_wxUSE_ARCHIVE_STREAMS=no
   DEFAULT_wxUSE_ZIPSTREAM=no

+  DEFAULT_wxUSE_TARSTREAM=no

   DEFAULT_wxUSE_BACKINGFILE=no
   DEFAULT_wxUSE_VALIDATORS=no
 
   DEFAULT_wxUSE_BACKINGFILE=no
   DEFAULT_wxUSE_VALIDATORS=no
 


@@ -2533,9 +2537,11 @@ else
   DEFAULT_wxUSE_FILESYSTEM=yes
   DEFAULT_wxUSE_FS_INET=yes
   DEFAULT_wxUSE_FS_ZIP=yes
   DEFAULT_wxUSE_FILESYSTEM=yes
   DEFAULT_wxUSE_FS_INET=yes
   DEFAULT_wxUSE_FS_ZIP=yes

+  DEFAULT_wxUSE_FS_ARCHIVE=yes

   DEFAULT_wxUSE_BUSYINFO=yes
   DEFAULT_wxUSE_ARCHIVE_STREAMS=yes
   DEFAULT_wxUSE_ZIPSTREAM=yes
   DEFAULT_wxUSE_BUSYINFO=yes
   DEFAULT_wxUSE_ARCHIVE_STREAMS=yes
   DEFAULT_wxUSE_ZIPSTREAM=yes

+  DEFAULT_wxUSE_TARSTREAM=yes

   DEFAULT_wxUSE_BACKINGFILE=yes
   DEFAULT_wxUSE_VALIDATORS=yes
 
   DEFAULT_wxUSE_BACKINGFILE=yes
   DEFAULT_wxUSE_VALIDATORS=yes
 


@@ -5636,6 +5642,47 @@ echo "${ECHO_T}no" >&6
           fi
 
 
           fi
 
 

+         enablestring=
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_archive" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-fs_archive... $ECHO_C" >&6
+          no_cache=0
+          # Check whether --enable-fs_archive or --disable-fs_archive was given.
+if test "${enable_fs_archive+set}" = set; then
+  enableval="$enable_fs_archive"
+
+                          if test "$enableval" = yes; then
+                            ac_cv_use_fs_archive='wxUSE_FS_ARCHIVE=yes'
+                          else
+                            ac_cv_use_fs_archive='wxUSE_FS_ARCHIVE=no'
+                          fi
+
+else
+
+                          LINE=`grep "wxUSE_FS_ARCHIVE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_fs_archive='wxUSE_FS_ARCHIVE='$DEFAULT_wxUSE_FS_ARCHIVE
+
+fi;
+
+          eval "$ac_cv_use_fs_archive"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_fs_archive >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_FS_ARCHIVE" = 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}-fs_inet" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-fs_inet... $ECHO_C" >&6
          enablestring=
           echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_inet" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-fs_inet... $ECHO_C" >&6


@@ -6210,6 +6257,47 @@ echo "${ECHO_T}no" >&6
           fi
 
 
           fi
 
 

+         enablestring=
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tarstream" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-tarstream... $ECHO_C" >&6
+          no_cache=0
+          # Check whether --enable-tarstream or --disable-tarstream was given.
+if test "${enable_tarstream+set}" = set; then
+  enableval="$enable_tarstream"
+
+                          if test "$enableval" = yes; then
+                            ac_cv_use_tarstream='wxUSE_TARSTREAM=yes'
+                          else
+                            ac_cv_use_tarstream='wxUSE_TARSTREAM=no'
+                          fi
+
+else
+
+                          LINE=`grep "wxUSE_TARSTREAM" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_tarstream='wxUSE_TARSTREAM='$DEFAULT_wxUSE_TARSTREAM
+
+fi;
+
+          eval "$ac_cv_use_tarstream"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_tarstream >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_TARSTREAM" = 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}-textbuf" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-textbuf... $ECHO_C" >&6
          enablestring=
           echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textbuf" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-textbuf... $ECHO_C" >&6


@@ -43122,10 +43210,15 @@ _ACEOF
 fi
 
 if test "$wxUSE_ARCHIVE_STREAMS" = "yes"; then
 fi
 
 if test "$wxUSE_ARCHIVE_STREAMS" = "yes"; then

-  cat >>confdefs.h <<\_ACEOF
+  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;}
+  else
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_ARCHIVE_STREAMS 1
 _ACEOF
 
 #define wxUSE_ARCHIVE_STREAMS 1
 _ACEOF
 

+  fi

 fi
 
 if test "$wxUSE_ZIPSTREAM" = "yes"; then
 fi
 
 if test "$wxUSE_ZIPSTREAM" = "yes"; then


@@ -43143,6 +43236,18 @@ _ACEOF
   fi
 fi
 
   fi
 fi
 

+if test "$wxUSE_TARSTREAM" = "yes"; then
+  if test "$wxUSE_ARCHIVE_STREAMS" != "yes"; then
+    { echo "$as_me:$LINENO: WARNING: wxTar requires wxArchive... disabled" >&5
+echo "$as_me: WARNING: wxTar requires wxArchive... disabled" >&2;}
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_TARSTREAM 1
+_ACEOF
+
+  fi
+fi
+

 if test "$wxUSE_BACKINGFILE" = "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
 if test "$wxUSE_BACKINGFILE" = "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


@@ -43155,6 +43260,18 @@ _ACEOF
   fi
 fi
 
   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;}
+  else
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_FS_ARCHIVE 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
 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

diff --git a/configure.in b/configure.in
index 1dfe34170f937659ca4ee55c1348c9fd79a730ba..ab9af906133f0f528f0322dcd5e1e8f76ed66fb9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -503,9 +503,11 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_FILESYSTEM=no
   DEFAULT_wxUSE_FS_INET=no
   DEFAULT_wxUSE_FS_ZIP=no
   DEFAULT_wxUSE_FILESYSTEM=no
   DEFAULT_wxUSE_FS_INET=no
   DEFAULT_wxUSE_FS_ZIP=no

+  DEFAULT_wxUSE_FS_ARCHIVE=no

   DEFAULT_wxUSE_BUSYINFO=no
   DEFAULT_wxUSE_ARCHIVE_STREAMS=no
   DEFAULT_wxUSE_ZIPSTREAM=no
   DEFAULT_wxUSE_BUSYINFO=no
   DEFAULT_wxUSE_ARCHIVE_STREAMS=no
   DEFAULT_wxUSE_ZIPSTREAM=no

+  DEFAULT_wxUSE_TARSTREAM=no

   DEFAULT_wxUSE_BACKINGFILE=no
   DEFAULT_wxUSE_VALIDATORS=no
 
   DEFAULT_wxUSE_BACKINGFILE=no
   DEFAULT_wxUSE_VALIDATORS=no
 


@@ -722,9 +724,11 @@ else
   DEFAULT_wxUSE_FILESYSTEM=yes
   DEFAULT_wxUSE_FS_INET=yes
   DEFAULT_wxUSE_FS_ZIP=yes
   DEFAULT_wxUSE_FILESYSTEM=yes
   DEFAULT_wxUSE_FS_INET=yes
   DEFAULT_wxUSE_FS_ZIP=yes

+  DEFAULT_wxUSE_FS_ARCHIVE=yes

   DEFAULT_wxUSE_BUSYINFO=yes
   DEFAULT_wxUSE_ARCHIVE_STREAMS=yes
   DEFAULT_wxUSE_ZIPSTREAM=yes
   DEFAULT_wxUSE_BUSYINFO=yes
   DEFAULT_wxUSE_ARCHIVE_STREAMS=yes
   DEFAULT_wxUSE_ZIPSTREAM=yes

+  DEFAULT_wxUSE_TARSTREAM=yes

   DEFAULT_wxUSE_BACKINGFILE=yes
   DEFAULT_wxUSE_VALIDATORS=yes
 
   DEFAULT_wxUSE_BACKINGFILE=yes
   DEFAULT_wxUSE_VALIDATORS=yes
 


@@ -961,6 +965,7 @@ WX_ARG_ENABLE(ffile,         [  --enable-ffile          use wxFFile class], wxUS
 WX_ARG_ENABLE(file,          [  --enable-file           use wxFile class], wxUSE_FILE)
 WX_ARG_ENABLE(filesystem,    [  --enable-filesystem     use virtual file systems classes], wxUSE_FILESYSTEM)
 WX_ARG_ENABLE(fontmap,       [  --enable-fontmap        use font encodings conversion classes], wxUSE_FONTMAP)
 WX_ARG_ENABLE(file,          [  --enable-file           use wxFile class], wxUSE_FILE)
 WX_ARG_ENABLE(filesystem,    [  --enable-filesystem     use virtual file systems classes], wxUSE_FILESYSTEM)
 WX_ARG_ENABLE(fontmap,       [  --enable-fontmap        use font encodings conversion classes], wxUSE_FONTMAP)

+WX_ARG_ENABLE(fs_archive,    [  --enable-fs_archive     use virtual archive filesystems], wxUSE_FS_ARCHIVE)

 WX_ARG_ENABLE(fs_inet,       [  --enable-fs_inet        use virtual HTTP/FTP filesystems], wxUSE_FS_INET)
 WX_ARG_ENABLE(fs_zip,        [  --enable-fs_zip         use virtual ZIP filesystems], wxUSE_FS_ZIP)
 WX_ARG_ENABLE(geometry,      [  --enable-geometry       use geometry class], wxUSE_GEOMETRY)
 WX_ARG_ENABLE(fs_inet,       [  --enable-fs_inet        use virtual HTTP/FTP filesystems], wxUSE_FS_INET)
 WX_ARG_ENABLE(fs_zip,        [  --enable-fs_zip         use virtual ZIP filesystems], wxUSE_FS_ZIP)
 WX_ARG_ENABLE(geometry,      [  --enable-geometry       use geometry class], wxUSE_GEOMETRY)


@@ -975,6 +980,7 @@ WX_ARG_ENABLE(stdpaths,      [  --enable-stdpaths       use wxStandardPaths clas
 WX_ARG_ENABLE(stopwatch,     [  --enable-stopwatch      use wxStopWatch class], wxUSE_STOPWATCH)
 WX_ARG_ENABLE(streams,       [  --enable-streams        use wxStream etc classes], wxUSE_STREAMS)
 WX_ARG_ENABLE(system_options,[  --enable-sysoptions     use wxSystemOptions], wxUSE_SYSTEM_OPTIONS)
 WX_ARG_ENABLE(stopwatch,     [  --enable-stopwatch      use wxStopWatch class], wxUSE_STOPWATCH)
 WX_ARG_ENABLE(streams,       [  --enable-streams        use wxStream etc classes], wxUSE_STREAMS)
 WX_ARG_ENABLE(system_options,[  --enable-sysoptions     use wxSystemOptions], wxUSE_SYSTEM_OPTIONS)

+WX_ARG_ENABLE(tarstream,     [  --enable-tarstream      use wxTar streams], wxUSE_TARSTREAM)

 WX_ARG_ENABLE(textbuf,       [  --enable-textbuf        use wxTextBuffer class], wxUSE_TEXTBUFFER)
 WX_ARG_ENABLE(textfile,      [  --enable-textfile       use wxTextFile class], wxUSE_TEXTFILE)
 WX_ARG_ENABLE(timer,         [  --enable-timer          use wxTimer class], wxUSE_TIMER)
 WX_ARG_ENABLE(textbuf,       [  --enable-textbuf        use wxTextBuffer class], wxUSE_TEXTBUFFER)
 WX_ARG_ENABLE(textfile,      [  --enable-textfile       use wxTextFile class], wxUSE_TEXTFILE)
 WX_ARG_ENABLE(timer,         [  --enable-timer          use wxTimer class], wxUSE_TIMER)


@@ -5712,7 +5718,11 @@ if test "$wxUSE_FS_ZIP" = "yes"; then
 fi
 
 if test "$wxUSE_ARCHIVE_STREAMS" = "yes"; then
 fi
 
 if test "$wxUSE_ARCHIVE_STREAMS" = "yes"; then

-  AC_DEFINE(wxUSE_ARCHIVE_STREAMS)
+  if test "$wxUSE_STREAMS" != yes; then
+    AC_MSG_WARN(wxArchive requires wxStreams... disabled)
+  else
+    AC_DEFINE(wxUSE_ARCHIVE_STREAMS)
+  fi

 fi
 
 if test "$wxUSE_ZIPSTREAM" = "yes"; then
 fi
 
 if test "$wxUSE_ZIPSTREAM" = "yes"; then


@@ -5725,6 +5735,14 @@ if test "$wxUSE_ZIPSTREAM" = "yes"; then
   fi
 fi
 
   fi
 fi
 

+if test "$wxUSE_TARSTREAM" = "yes"; then
+  if test "$wxUSE_ARCHIVE_STREAMS" != "yes"; then
+    AC_MSG_WARN(wxTar requires wxArchive... disabled)
+  else
+    AC_DEFINE(wxUSE_TARSTREAM)
+  fi
+fi
+

 if test "$wxUSE_BACKINGFILE" = "yes"; then
   if test "$wxUSE_STREAMS" != yes -o \( "$wxUSE_FILE" != yes -a "$wxUSE_FFILE" != yes \); then
     AC_MSG_WARN(wxBackingFile requires wxStreams and wxFile or wxFFile... disabled)
 if test "$wxUSE_BACKINGFILE" = "yes"; then
   if test "$wxUSE_STREAMS" != yes -o \( "$wxUSE_FILE" != yes -a "$wxUSE_FFILE" != yes \); then
     AC_MSG_WARN(wxBackingFile requires wxStreams and wxFile or wxFFile... disabled)


@@ -5733,6 +5751,14 @@ if test "$wxUSE_BACKINGFILE" = "yes"; then
   fi
 fi
 
   fi
 fi
 

+if test "$wxUSE_FS_ARCHIVE" = "yes"; then
+  if test "$wxUSE_ARCHIVE_STREAMS" != yes -o "$wxUSE_BACKINGFILE" != yes; then
+    AC_MSG_WARN(wxArchiveFSHandler requires wxArchive and wxBackingFile... disabled)
+  else
+    AC_DEFINE(wxUSE_FS_ARCHIVE)
+  fi
+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])
 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])

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 34ee4789e97edea85e466450b113f9cd6d4795ef..20ff0d93ecc3fb216cd279c53723acd87fc43d8e 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -125,6 +125,14 @@
 #   endif
 #endif /* !defined(wxUSE_FILESYSTEM) */
 
 #   endif
 #endif /* !defined(wxUSE_FILESYSTEM) */
 

+#ifndef wxUSE_FS_ARCHIVE
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_FS_ARCHIVE must be defined."
+#   else
+#       define wxUSE_FS_ARCHIVE 0
+#   endif
+#endif /* !defined(wxUSE_FS_ARCHIVE) */
+

 /* don't give an error about this one yet, it's not fully implemented */
 #ifndef wxUSE_FSVOLUME
 #   define wxUSE_FSVOLUME 0
 /* don't give an error about this one yet, it's not fully implemented */
 #ifndef wxUSE_FSVOLUME
 #   define wxUSE_FSVOLUME 0


@@ -1168,17 +1176,49 @@
 #   endif
 #endif /* wxUSE_ZIPSTREAM */
 
 #   endif
 #endif /* wxUSE_ZIPSTREAM */
 

-#if wxUSE_BACKINGFILE
-#   if !wxUSE_STREAMS || (!wxUSE_FILE && !wxUSE_FFILE)
+#if wxUSE_FS_ARCHIVE
+#   if !wxUSE_ARCHIVE_STREAMS

 #       ifdef wxABORT_ON_CONFIG_ERROR
 #       ifdef wxABORT_ON_CONFIG_ERROR

-#           error "wxBackingFile requires wxStream and wxFile or wxFFile"
+#           error "wxArchiveFSHandler requires wxArchive and wxBackingFile"

 #       else
 #       else

+#           undef wxUSE_ARCHIVE_STREAMS
+#           define wxUSE_ARCHIVE_STREAMS 1

 #           undef wxUSE_BACKINGFILE
 #           undef wxUSE_BACKINGFILE

-#           define wxUSE_BACKINGFILE 0
+#           define wxUSE_BACKINGFILE 1
+#       endif
+#   endif
+#endif /* wxUSE_FS_ARCHIVE */
+
+#if wxUSE_BACKINGFILE
+#   if !wxUSE_STREAMS
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxBackingFile requires wxStream"
+#       else
+#           undef wxUSE_STREAMS
+#           define wxUSE_STREAMS 1
+#       endif
+#   endif
+#   if !wxUSE_FILE && !wxUSE_FFILE
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxBackingFile requires wxFile or wxFFile"
+#       else
+#           undef wxUSE_FFILE
+#           define wxUSE_FFILE 1

 #       endif
 #   endif
 #endif /* wxUSE_BACKINGFILE */
 
 #       endif
 #   endif
 #endif /* wxUSE_BACKINGFILE */
 

+#if wxUSE_TARSTREAM
+#   if !wxUSE_ARCHIVE_STREAMS
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxTar requires wxArchive"
+#       else
+#           undef wxUSE_ARCHIVE_STREAMS
+#           define wxUSE_ARCHIVE_STREAMS 1
+#       endif
+#   endif
+#endif /* wxUSE_TARSTREAM */
+

 /* the rest of the tests is for the GUI settings only */
 #if wxUSE_GUI
 
 /* the rest of the tests is for the GUI settings only */
 #if wxUSE_GUI
 

diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h
index c14e3db4378dd50cbb15263ac502386f8a152d3b..18226a4cba2e37439cfc8e47dd7396c2e9ab3d55 100644 (file)
--- a/include/wx/mac/setup0.h
+++ b/include/wx/mac/setup0.h
@@ -427,6 +427,9 @@
 // Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_ZIP        1
 
 // Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_ZIP        1
 

+// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM)
+#define wxUSE_FS_ARCHIVE    1
+

 // Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_INET       1
 
 // Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_INET       1
 


@@ -439,6 +442,9 @@
 // Set to 1 to compile wxBackingFile and wxBackedInputStream
 #define wxUSE_BACKINGFILE   1
 
 // Set to 1 to compile wxBackingFile and wxBackedInputStream
 #define wxUSE_BACKINGFILE   1
 

+// Set to 1 to compile wxTarInput/OutputStream classes.
+#define wxUSE_TARSTREAM     1
+

 // Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
 // wxUSE_LIBPNG
 #define wxUSE_ZLIB          1
 // Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
 // wxUSE_LIBPNG
 #define wxUSE_ZLIB          1

diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h
index 5954b58b2007800a8de0d96596cf08e979be85fe..89a3eca8513dd95c25d1acfabcb4c0077113596a 100644 (file)
--- a/include/wx/motif/setup0.h
+++ b/include/wx/motif/setup0.h
@@ -426,6 +426,9 @@
 // Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_ZIP        1
 
 // Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_ZIP        1
 

+// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM)
+#define wxUSE_FS_ARCHIVE    1
+

 // Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_INET       1
 
 // Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_INET       1
 


@@ -438,6 +441,9 @@
 // Set to 1 to compile wxBackingFile and wxBackedInputStream
 #define wxUSE_BACKINGFILE   1
 
 // Set to 1 to compile wxBackingFile and wxBackedInputStream
 #define wxUSE_BACKINGFILE   1
 

+// Set to 1 to compile wxTarInput/OutputStream classes.
+#define wxUSE_TARSTREAM     1
+

 // Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
 // wxUSE_LIBPNG
 #define wxUSE_ZLIB          1
 // Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
 // wxUSE_LIBPNG
 #define wxUSE_ZLIB          1

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 1fa92913e776f651ba9de19b5e10743d76c4c216..2383426435e2042b8c66faf6537faeb4de5ca820 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -426,6 +426,9 @@
 // Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_ZIP        1
 
 // Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_ZIP        1
 

+// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM)
+#define wxUSE_FS_ARCHIVE    1
+

 // Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_INET       1
 
 // Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_INET       1
 


@@ -438,6 +441,9 @@
 // Set to 1 to compile wxBackingFile and wxBackedInputStream
 #define wxUSE_BACKINGFILE   1
 
 // Set to 1 to compile wxBackingFile and wxBackedInputStream
 #define wxUSE_BACKINGFILE   1
 

+// Set to 1 to compile wxTarInput/OutputStream classes.
+#define wxUSE_TARSTREAM     1
+

 // Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
 // wxUSE_LIBPNG
 #define wxUSE_ZLIB          1
 // Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
 // wxUSE_LIBPNG
 #define wxUSE_ZLIB          1

diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index 7c74cdd3ed08d6b2b53828d91176126f9e73bae7..537fe75ca992459069ef3c60653294fb48cfc514 100644 (file)
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -426,6 +426,9 @@
 // Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_ZIP        1
 
 // Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_ZIP        1
 

+// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM)
+#define wxUSE_FS_ARCHIVE    1
+

 // Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_INET       1
 
 // Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_INET       1
 


@@ -438,6 +441,9 @@
 // Set to 1 to compile wxBackingFile and wxBackedInputStream
 #define wxUSE_BACKINGFILE   1
 
 // Set to 1 to compile wxBackingFile and wxBackedInputStream
 #define wxUSE_BACKINGFILE   1
 

+// Set to 1 to compile wxTarInput/OutputStream classes.
+#define wxUSE_TARSTREAM     1
+

 // Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
 // wxUSE_LIBPNG
 #define wxUSE_ZLIB          1
 // Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
 // wxUSE_LIBPNG
 #define wxUSE_ZLIB          1

diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index 575d59d0914ba5f175a9344db6ac4d0dc1ad606f..3ea2bfebb72afebc2e30935a8905e59452e31701 100644 (file)
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -426,6 +426,9 @@
 // Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_ZIP        1
 
 // Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_ZIP        1
 

+// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM)
+#define wxUSE_FS_ARCHIVE    1
+

 // Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_INET       1
 
 // Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_INET       1
 


@@ -438,6 +441,9 @@
 // Set to 1 to compile wxBackingFile and wxBackedInputStream
 #define wxUSE_BACKINGFILE   1
 
 // Set to 1 to compile wxBackingFile and wxBackedInputStream
 #define wxUSE_BACKINGFILE   1
 

+// Set to 1 to compile wxTarInput/OutputStream classes.
+#define wxUSE_TARSTREAM     1
+

 // Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
 // wxUSE_LIBPNG
 #define wxUSE_ZLIB          1
 // Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
 // wxUSE_LIBPNG
 #define wxUSE_ZLIB          1

diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h
index 4d601eebbb073d84eedd4b9a76c9d72489026a0e..125e771ba2c4d1ec61984cff181f574b5126c902 100644 (file)
--- a/include/wx/palmos/setup0.h
+++ b/include/wx/palmos/setup0.h
@@ -426,6 +426,9 @@
 // Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_ZIP        1
 
 // Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_ZIP        1
 

+// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM)
+#define wxUSE_FS_ARCHIVE    1
+

 // Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_INET       1
 
 // Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_INET       1
 


@@ -438,6 +441,9 @@
 // Set to 1 to compile wxBackingFile and wxBackedInputStream
 #define wxUSE_BACKINGFILE   1
 
 // Set to 1 to compile wxBackingFile and wxBackedInputStream
 #define wxUSE_BACKINGFILE   1
 

+// Set to 1 to compile wxTarInput/OutputStream classes.
+#define wxUSE_TARSTREAM     1
+

 // Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
 // wxUSE_LIBPNG
 #define wxUSE_ZLIB          1
 // Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
 // wxUSE_LIBPNG
 #define wxUSE_ZLIB          1

diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index de7d95be3b61e98e27203041e201a43b25b2c76f..8eb5b31ee3f1d4e481c3c0ed8ef994c803c15e9f 100644 (file)
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -422,6 +422,9 @@
 // Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_ZIP        1
 
 // Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_ZIP        1
 

+// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM)
+#define wxUSE_FS_ARCHIVE    1
+

 // Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_INET       1
 
 // Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_INET       1
 


@@ -434,6 +437,9 @@
 // Set to 1 to compile wxBackingFile and wxBackedInputStream
 #define wxUSE_BACKINGFILE   1
 
 // Set to 1 to compile wxBackingFile and wxBackedInputStream
 #define wxUSE_BACKINGFILE   1
 

+// Set to 1 to compile wxTarInput/OutputStream classes.
+#define wxUSE_TARSTREAM     1
+

 // Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
 // wxUSE_LIBPNG
 #define wxUSE_ZLIB          1
 // Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
 // wxUSE_LIBPNG
 #define wxUSE_ZLIB          1

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index 282f444ef20ab4bc2f703f221b04a58019cd685a..6cce0426f29c3d2c7bf75e0e9c04475316d2f648 100644 (file)
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -435,6 +435,9 @@
 // Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_ZIP 1
 
 // Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
 #define wxUSE_FS_ZIP 1
 

+// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM)
+#define wxUSE_FS_ARCHIVE    1
+

 // wxArchive classes for accessing archives such as zip and tar
 #define wxUSE_ARCHIVE_STREAMS 1
 
 // wxArchive classes for accessing archives such as zip and tar
 #define wxUSE_ARCHIVE_STREAMS 1
 


@@ -444,6 +447,9 @@
 // Set to 1 to compile wxBackingFile and wxBackedInputStream
 #define wxUSE_BACKINGFILE   1
 
 // Set to 1 to compile wxBackingFile and wxBackedInputStream
 #define wxUSE_BACKINGFILE   1
 

+// Set to 1 to compile wxTarInput/OutputStream classes.
+#define wxUSE_TARSTREAM     1
+

 // Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
 // wxUSE_LIBPNG
 #define wxUSE_ZLIB          1
 // Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
 // wxUSE_LIBPNG
 #define wxUSE_ZLIB          1

diff --git a/setup.h.in b/setup.h.in
index 5dd6edd484f62b71b74d4dd64eeed68337e5e788..5e9fb1159b2931d154d000c1af08864539e61dc4 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -245,6 +245,8 @@
 
 #define wxUSE_FS_ZIP        0
 
 
 #define wxUSE_FS_ZIP        0
 

+#define wxUSE_FS_ARCHIVE    0
+

 #define wxUSE_FS_INET       0
 
 #define wxUSE_ARCHIVE_STREAMS     0
 #define wxUSE_FS_INET       0
 
 #define wxUSE_ARCHIVE_STREAMS     0


@@ -253,6 +255,8 @@
 
 #define wxUSE_BACKINGFILE   0
 
 
 #define wxUSE_BACKINGFILE   0
 

+#define wxUSE_TARSTREAM     0
+

 #define wxUSE_ZLIB          0
 
 #define wxUSE_APPLE_IEEE          0
 #define wxUSE_ZLIB          0
 
 #define wxUSE_APPLE_IEEE          0

diff --git a/setup.h_vms b/setup.h_vms
index 617ef1e52b07553abec1078a18ec295218cd7959..25f9f287caf35a70d8b38bac558c1b10d4705075 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -260,12 +260,16 @@ typedef pid_t GPid;
 
 #define wxUSE_FS_ZIP        1
 
 
 #define wxUSE_FS_ZIP        1
 

+#define wxUSE_FS_ARCHIVE    1
+

 #define wxUSE_FS_INET       1
 
 #define wxUSE_ARCHIVE_STREAMS     1
 
 #define wxUSE_ZIPSTREAM     1
 
 #define wxUSE_FS_INET       1
 
 #define wxUSE_ARCHIVE_STREAMS     1
 
 #define wxUSE_ZIPSTREAM     1
 

+#define wxUSE_TARSTREAM     1
+

 #define wxUSE_BACKINGFILE   1
 
 #define wxUSE_ZLIB          1
 #define wxUSE_BACKINGFILE   1
 
 #define wxUSE_ZLIB          1