AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only automatically switch off --enable-std_string or --enable-std_iostreams

Browse Source 
if they are not on the command line, fail with an error otherwise.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell 2005-05-10 13:29:20 +00:00
parent f56c22b4b2
commit 4b9918c5ae
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure vendored
View File

@ -21315,8 +21315,12 @@ sed 's/^/| /' conftest.$ac_ext >&5
echo "$as_me:$LINENO: result: no" >&5 echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6 echo "${ECHO_T}no" >&6
if test "$wxUSE_STL" = "yes"; then if test "$wxUSE_STL" = "yes"; then
{ { echo "$as_me:$LINENO: error: Can't compile with --enable-stl without $std_string or std::basic_string<$char_type>" >&5 { { echo "$as_me:$LINENO: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&5
echo "$as_me: error: Can't compile with --enable-stl without $std_string or std::basic_string<$char_type>" >&2;} echo "$as_me: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&2;}
{ (exit 1); exit 1; }; }
elif grep wxUSE_STD_STRING $wx_arg_cache_file >/dev/null; then
{ { echo "$as_me:$LINENO: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&5
echo "$as_me: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
else else
{ echo "$as_me:$LINENO: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&5 { echo "$as_me:$LINENO: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&5
@ -21482,8 +21486,14 @@ fi
if test "$wxUSE_STD_IOSTREAM" != "yes"; then if test "$wxUSE_STD_IOSTREAM" != "yes"; then
{ echo "$as_me:$LINENO: WARNING: No std::iostreams, switching to --disable-std_iostreams" >&5 if grep wxUSE_STD_IOSTREAM $wx_arg_cache_file >/dev/null; then
{ { echo "$as_me:$LINENO: error: Can't use --enable-std_iostreams without std::istream and std::ostream" >&5
echo "$as_me: error: Can't use --enable-std_iostreams without std::istream and std::ostream" >&2;}
{ (exit 1); exit 1; }; }
else
{ echo "$as_me:$LINENO: WARNING: No std::iostreams, switching to --disable-std_iostreams" >&5
echo "$as_me: WARNING: No std::iostreams, switching to --disable-std_iostreams" >&2;} echo "$as_me: WARNING: No std::iostreams, switching to --disable-std_iostreams" >&2;}
fi
fi fi
ac_ext=c ac_ext=c

10
configure.in
View File

@ -1960,7 +1960,9 @@ if test "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then
[AC_MSG_RESULT(yes)], [AC_MSG_RESULT(yes)],
[AC_MSG_RESULT([no]) [AC_MSG_RESULT([no])
if test "$wxUSE_STL" = "yes"; then if test "$wxUSE_STL" = "yes"; then
AC_MSG_ERROR([Can't compile with --enable-stl without $std_string or std::basic_string<$char_type>]) AC_MSG_ERROR([Can't use --enable-stl without $std_string or std::basic_string<$char_type>])
elif grep wxUSE_STD_STRING $wx_arg_cache_file >/dev/null; then
AC_MSG_ERROR([Can't use --enable-std_string without $std_string or std::basic_string<$char_type>])
else else
AC_MSG_WARN([No $std_string or std::basic_string<$char_type>, switching to --disable-std_string]) AC_MSG_WARN([No $std_string or std::basic_string<$char_type>, switching to --disable-std_string])
wxUSE_STD_STRING=no wxUSE_STD_STRING=no
@ -1980,7 +1982,11 @@ if test "$wxUSE_STD_IOSTREAM" = "yes"; then
[#include <iostream>]) [#include <iostream>])
if test "$wxUSE_STD_IOSTREAM" != "yes"; then if test "$wxUSE_STD_IOSTREAM" != "yes"; then
AC_MSG_WARN([No std::iostreams, switching to --disable-std_iostreams]) if grep wxUSE_STD_IOSTREAM $wx_arg_cache_file >/dev/null; then
AC_MSG_ERROR([Can't use --enable-std_iostreams without std::istream and std::ostream])
else
AC_MSG_WARN([No std::iostreams, switching to --disable-std_iostreams])
fi
fi fi
AC_LANG_POP AC_LANG_POP