X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c74dc1630d19759d7e9263f4be3fa806b0e90695..5109ae5d178fb4025c6b92bb2f840c07dae99a82:/configure

diff --git a/configure b/configure
index 4cfd59747e..0826106d8b 100755
--- a/configure
+++ b/configure
@@ -873,6 +873,7 @@ Optional Features:
   --enable-shared         create shared library code
   --enable-optimise       create optimised code
   --enable-debug          same as debug_flag and debug_info
+  --enable-stl            use STL for containers
   --enable-precomp        enable use of precompiled headers (Mac OS X/Darwin)
   --enable-debug_flag     set __WXDEBUG__ flag (recommended for developers!)
   --enable-debug_info     create code with debugging information
@@ -1937,6 +1938,7 @@ esac
 DEBUG_CONFIGURE=0
 if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_UNIVERSAL=no
+  DEFAULT_wxUSE_STL=no
 
   DEFAULT_wxUSE_NANOX=no
 
@@ -2111,6 +2113,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_MONOLITHIC=yes
 else
   DEFAULT_wxUSE_UNIVERSAL=no
+  DEFAULT_wxUSE_STL=no
 
   DEFAULT_wxUSE_NANOX=no
 
@@ -3131,6 +3134,47 @@ echo "${ECHO_T}no" >&6
           fi
 
 
+	  enablestring=
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-stl... $ECHO_C" >&6
+          no_cache=0
+          # Check whether --enable-stl or --disable-stl was given.
+if test "${enable_stl+set}" = set; then
+  enableval="$enable_stl"
+
+                          if test "$enableval" = yes; then
+                            ac_cv_use_stl='wxUSE_STL=yes'
+                          else
+                            ac_cv_use_stl='wxUSE_STL=no'
+                          fi
+
+else
+
+                          LINE=`grep "wxUSE_STL" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_stl='wxUSE_STL='$DEFAULT_wxUSE_STL
+
+fi;
+
+          eval "$ac_cv_use_stl"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_stl >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_STL" = 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}-precomp" >&5
@@ -6513,7 +6557,6 @@ if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then
   DEFAULT_wxUSE_FINDREPLDLG=no
   DEFAULT_wxUSE_FONTDLG=no
   DEFAULT_wxUSE_GRID=no
-  DEFAULT_wxUSE_NUMBERDLG=no
   DEFAULT_wxUSE_PROGRESSDLG=no
   DEFAULT_wxUSE_SASH=no
   DEFAULT_wxUSE_SPLITTER=no
@@ -29786,6 +29829,13 @@ _ACEOF
 fi
 
 
+if test "$wxUSE_STL" = "yes"; then
+  cat >>confdefs.h <<\_ACEOF
+#define wxUSE_STL 1
+_ACEOF
+
+fi
+
 if test "$wxUSE_APPLE_IEEE" = "yes"; then
   cat >>confdefs.h <<\_ACEOF
 #define wxUSE_APPLE_IEEE 1
@@ -33249,7 +33299,7 @@ if test "$GXX" = yes ; then
 
 EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"
 
-CPPFLAGS=`echo $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'`
+CPPFLAGS=`echo $WXDEBUG_DEFINE $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'`
 CFLAGS=`echo $CODE_GEN_FLAGS $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
 CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`