Rename wxUSE_ARCSTREAM to wxUSE_ARCHIVE_STREAMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
20
configure
vendored
20
configure
vendored
@@ -2155,7 +2155,7 @@ if test $DEBUG_CONFIGURE = 1; then
|
||||
DEFAULT_wxUSE_FS_INET=no
|
||||
DEFAULT_wxUSE_FS_ZIP=no
|
||||
DEFAULT_wxUSE_BUSYINFO=no
|
||||
DEFAULT_wxUSE_ARCSTREAM=no
|
||||
DEFAULT_wxUSE_ARCHIVE_STREAMS=no
|
||||
DEFAULT_wxUSE_ZIPSTREAM=no
|
||||
DEFAULT_wxUSE_VALIDATORS=no
|
||||
|
||||
@@ -2348,7 +2348,7 @@ else
|
||||
DEFAULT_wxUSE_FS_INET=yes
|
||||
DEFAULT_wxUSE_FS_ZIP=yes
|
||||
DEFAULT_wxUSE_BUSYINFO=yes
|
||||
DEFAULT_wxUSE_ARCSTREAM=yes
|
||||
DEFAULT_wxUSE_ARCHIVE_STREAMS=yes
|
||||
DEFAULT_wxUSE_ZIPSTREAM=yes
|
||||
DEFAULT_wxUSE_VALIDATORS=yes
|
||||
|
||||
@@ -4681,21 +4681,21 @@ if test "${enable_arcstream+set}" = set; then
|
||||
enableval="$enable_arcstream"
|
||||
|
||||
if test "$enableval" = yes; then
|
||||
ac_cv_use_arcstream='wxUSE_ARCSTREAM=yes'
|
||||
ac_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=yes'
|
||||
else
|
||||
ac_cv_use_arcstream='wxUSE_ARCSTREAM=no'
|
||||
ac_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=no'
|
||||
fi
|
||||
|
||||
else
|
||||
|
||||
LINE=`grep "wxUSE_ARCSTREAM" ${wx_arg_cache_file}`
|
||||
LINE=`grep "wxUSE_ARCHIVE_STREAMS" ${wx_arg_cache_file}`
|
||||
if test "x$LINE" != x ; then
|
||||
eval "DEFAULT_$LINE"
|
||||
else
|
||||
no_cache=1
|
||||
fi
|
||||
|
||||
ac_cv_use_arcstream='wxUSE_ARCSTREAM='$DEFAULT_wxUSE_ARCSTREAM
|
||||
ac_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS='$DEFAULT_wxUSE_ARCHIVE_STREAMS
|
||||
|
||||
fi;
|
||||
|
||||
@@ -4704,7 +4704,7 @@ fi;
|
||||
echo $ac_cv_use_arcstream >> ${wx_arg_cache_file}.tmp
|
||||
fi
|
||||
|
||||
if test "$wxUSE_ARCSTREAM" = yes; then
|
||||
if test "$wxUSE_ARCHIVE_STREAMS" = yes; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
else
|
||||
@@ -35472,15 +35472,15 @@ _ACEOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$wxUSE_ARCSTREAM" = "yes"; then
|
||||
if test "$wxUSE_ARCHIVE_STREAMS" = "yes"; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define wxUSE_ARCSTREAM 1
|
||||
#define wxUSE_ARCHIVE_STREAMS 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
|
||||
if test "$wxUSE_ZIPSTREAM" = "yes"; then
|
||||
if test "$wxUSE_ARCSTREAM" != "yes"; then
|
||||
if test "$wxUSE_ARCHIVE_STREAMS" != "yes"; then
|
||||
{ echo "$as_me:$LINENO: WARNING: wxZip requires wxArchive... disabled" >&5
|
||||
echo "$as_me: WARNING: wxZip requires wxArchive... disabled" >&2;}
|
||||
elif test "$wxUSE_ZLIB" = "no"; then
|
||||
|
Reference in New Issue
Block a user