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

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

diff --git a/configure b/configure
index aa52b951e1c26ebb8526c10cf70974f6219dd7f3..f1c98a384d30a0974a6705644127cbaff8153cd4 100755 (executable)
--- a/configure
+++ b/configure
@@ -21315,8 +21315,12 @@ sed 's/^/| /' conftest.$ac_ext >&5
 echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
                          if test "$wxUSE_STL" = "yes"; then
 echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
                          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: error: Can't compile with --enable-stl without $std_string or std::basic_string<$char_type>" >&2;}
+                             { { 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 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; }; }
                          else
                              { echo "$as_me:$LINENO: WARNING: No $std_string or std::basic_string<$char_type>, switching to --disable-std_string" >&5
    { (exit 1); exit 1; }; }
                          else
                              { 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
 
     ac_ext=c
     fi
 
     ac_ext=c

diff --git a/configure.in b/configure.in
index 053553cc901c7772241308201f3bad62525531ea..9e16b4e80aa2b6cb0237c333fb7b68a582c86b12 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1960,7 +1960,9 @@ if test "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then
                         [AC_MSG_RESULT(yes)],
                         [AC_MSG_RESULT([no])
                          if test "$wxUSE_STL" = "yes"; then
                         [AC_MSG_RESULT(yes)],
                         [AC_MSG_RESULT([no])
                          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
                              AC_MSG_WARN([No $std_string or std::basic_string<$char_type>, switching to --disable-std_string])
                              wxUSE_STD_STRING=no
                          else
                              AC_MSG_WARN([No $std_string or std::basic_string<$char_type>, switching to --disable-std_string])
                              wxUSE_STD_STRING=no


@@ -1980,7 +1982,11 @@ if test "$wxUSE_STD_IOSTREAM" = "yes"; then
                    [#include <iostream>])
 
     if test "$wxUSE_STD_IOSTREAM" != "yes"; then
                    [#include <iostream>])
 
     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
     
     AC_LANG_POP
     fi
     
     AC_LANG_POP