Make std_string and std_iostreams default to disabled for MSW, Mac and OS2

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

diff --git a/configure b/configure
index 6b067aaf6c215ea7f7ee8eba074c1ea9f5ddb530..f90aa33c0df443763388c52b36a22735e705d31d 100755 (executable)
--- a/configure
+++ b/configure
@@ -1726,6 +1726,8 @@ SO_SUFFIX=so
 SAMPLES_RPATH_FLAG=
 SAMPLES_RPATH_POSTLINK=
 
 SAMPLES_RPATH_FLAG=
 SAMPLES_RPATH_POSTLINK=
 

+DEFAULT_STD_FLAG=yes
+

 case "${host}" in
   *-hp-hpux* )
     USE_HPUX=1
 case "${host}" in
   *-hp-hpux* )
     USE_HPUX=1


@@ -1929,6 +1931,7 @@ _ACEOF
     PROGRAM_EXT=".exe"
     RESCOMP=windres
     DEFAULT_DEFAULT_wxUSE_MSW=1
     PROGRAM_EXT=".exe"
     RESCOMP=windres
     DEFAULT_DEFAULT_wxUSE_MSW=1

+    DEFAULT_STD_FLAG=no

   ;;
 
   *-pc-msdosdjgpp )
   ;;
 
   *-pc-msdosdjgpp )


@@ -1972,6 +1975,7 @@ _ACEOF
     done
     export PATH="$ac_TEMP_PATH"
     unset ac_TEMP_PATH
     done
     export PATH="$ac_TEMP_PATH"
     unset ac_TEMP_PATH

+    DEFAULT_STD_FLAG=no

   ;;
 
   powerpc-*-darwin* )
   ;;
 
   powerpc-*-darwin* )


@@ -1991,12 +1995,14 @@ _ACEOF
 _ACEOF
 
     DEFAULT_DEFAULT_wxUSE_MAC=1
 _ACEOF
 
     DEFAULT_DEFAULT_wxUSE_MAC=1

+    DEFAULT_STD_FLAG=no

   ;;
   powerpc-apple-macos* )
         USE_UNIX=0
             ac_cv_c_bigendian=yes
     SO_SUFFIX=shlib
             DEFAULT_DEFAULT_wxUSE_MAC=1
   ;;
   powerpc-apple-macos* )
         USE_UNIX=0
             ac_cv_c_bigendian=yes
     SO_SUFFIX=shlib
             DEFAULT_DEFAULT_wxUSE_MAC=1

+    DEFAULT_STD_FLAG=no

   ;;
 
   *-*-beos* )
   ;;
 
   *-*-beos* )


@@ -2264,7 +2270,7 @@ else
   DEFAULT_wxUSE_LIBXPM=yes
   DEFAULT_wxUSE_LIBMSPACK=yes
   DEFAULT_wxUSE_LIBSDL=no
   DEFAULT_wxUSE_LIBXPM=yes
   DEFAULT_wxUSE_LIBMSPACK=yes
   DEFAULT_wxUSE_LIBSDL=no

-  DEFAULT_wxUSE_LIBGNOMEPRINT=yes
+  DEFAULT_wxUSE_LIBGNOMEPRINT=no

   DEFAULT_wxUSE_ODBC=no
   DEFAULT_wxUSE_OPENGL=no
 
   DEFAULT_wxUSE_ODBC=no
   DEFAULT_wxUSE_OPENGL=no
 


@@ -2272,8 +2278,8 @@ else
   DEFAULT_wxUSE_STACKWALKER=yes
   DEFAULT_wxUSE_DEBUGREPORT=yes
   DEFAULT_wxUSE_SNGLINST_CHECKER=yes
   DEFAULT_wxUSE_STACKWALKER=yes
   DEFAULT_wxUSE_DEBUGREPORT=yes
   DEFAULT_wxUSE_SNGLINST_CHECKER=yes

-  DEFAULT_wxUSE_STD_IOSTREAM=yes
-  DEFAULT_wxUSE_STD_STRING=yes
+  DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG
+  DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG

   DEFAULT_wxUSE_CMDLINE_PARSER=yes
   DEFAULT_wxUSE_DATETIME=yes
   DEFAULT_wxUSE_TIMER=yes
   DEFAULT_wxUSE_CMDLINE_PARSER=yes
   DEFAULT_wxUSE_DATETIME=yes
   DEFAULT_wxUSE_TIMER=yes

diff --git a/configure.in b/configure.in
index 19f67b737906c3846f9ae3347a6614850afd124c..04d62664524356b317bf7be15c5cc193a166fb15 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -146,6 +146,8 @@ SO_SUFFIX=so
 SAMPLES_RPATH_FLAG=
 SAMPLES_RPATH_POSTLINK=
 
 SAMPLES_RPATH_FLAG=
 SAMPLES_RPATH_POSTLINK=
 

+DEFAULT_STD_FLAG=yes
+

 dnl to support a new system, you need to add its canonical name (as determined
 dnl by config.sub or specified by the configure command line) to this "case"
 dnl and also define the shared library flags below - search for
 dnl to support a new system, you need to add its canonical name (as determined
 dnl by config.sub or specified by the configure command line) to this "case"
 dnl and also define the shared library flags below - search for


@@ -277,6 +279,7 @@ case "${host}" in
     PROGRAM_EXT=".exe"
     RESCOMP=windres
     DEFAULT_DEFAULT_wxUSE_MSW=1
     PROGRAM_EXT=".exe"
     RESCOMP=windres
     DEFAULT_DEFAULT_wxUSE_MSW=1

+    DEFAULT_STD_FLAG=no

   ;;
 
   *-pc-msdosdjgpp )
   ;;
 
   *-pc-msdosdjgpp )


@@ -320,6 +323,7 @@ case "${host}" in
     done
     export PATH="$ac_TEMP_PATH"
     unset ac_TEMP_PATH
     done
     export PATH="$ac_TEMP_PATH"
     unset ac_TEMP_PATH

+    DEFAULT_STD_FLAG=no

   ;;
 
   powerpc-*-darwin* )
   ;;
 
   powerpc-*-darwin* )


@@ -331,6 +335,7 @@ case "${host}" in
     AC_DEFINE(__DARWIN__)
     AC_DEFINE(TARGET_CARBON)
     DEFAULT_DEFAULT_wxUSE_MAC=1
     AC_DEFINE(__DARWIN__)
     AC_DEFINE(TARGET_CARBON)
     DEFAULT_DEFAULT_wxUSE_MAC=1

+    DEFAULT_STD_FLAG=no

   ;;
   powerpc-apple-macos* )
     dnl Classic Mac OS (< X)
   ;;
   powerpc-apple-macos* )
     dnl Classic Mac OS (< X)


@@ -342,6 +347,7 @@ case "${host}" in
     dnl AC_DEFINE(TARGET_CARBON)
     dnl platform.h needs TARGET_CARBON before setup.h, we'll add it to CPPFLAGS
     DEFAULT_DEFAULT_wxUSE_MAC=1
     dnl AC_DEFINE(TARGET_CARBON)
     dnl platform.h needs TARGET_CARBON before setup.h, we'll add it to CPPFLAGS
     DEFAULT_DEFAULT_wxUSE_MAC=1

+    DEFAULT_STD_FLAG=no

   ;;
 
   *-*-beos* )
   ;;
 
   *-*-beos* )


@@ -617,8 +623,8 @@ else
   DEFAULT_wxUSE_STACKWALKER=yes
   DEFAULT_wxUSE_DEBUGREPORT=yes
   DEFAULT_wxUSE_SNGLINST_CHECKER=yes
   DEFAULT_wxUSE_STACKWALKER=yes
   DEFAULT_wxUSE_DEBUGREPORT=yes
   DEFAULT_wxUSE_SNGLINST_CHECKER=yes

-  DEFAULT_wxUSE_STD_IOSTREAM=no
-  DEFAULT_wxUSE_STD_STRING=no
+  DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG
+  DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG

   DEFAULT_wxUSE_CMDLINE_PARSER=yes
   DEFAULT_wxUSE_DATETIME=yes
   DEFAULT_wxUSE_TIMER=yes
   DEFAULT_wxUSE_CMDLINE_PARSER=yes
   DEFAULT_wxUSE_DATETIME=yes
   DEFAULT_wxUSE_TIMER=yes