X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9c49977bd6000bf7be7ed61e296dca41e2156c0e..b8f434e731d0f6153a87988777baa4c2fbe629c6:/configure

diff --git a/configure b/configure
index 08d853f7d2..b8c64f5e39 100755
--- a/configure
+++ b/configure
@@ -1626,7 +1626,8 @@ Optional Features:
   --disable-vararg_macros don't use vararg macros, even if they are supported
   --enable-universal_binary[=SDK] create Mac PowerPC and Intel Universal binary (not yet working)
   --enable-compat24       enable wxWidgets 2.4 compatibility
-  --disable-compat26      disable wxWidgets 2.6 compatibility
+  --enable-compat26       enable wxWidgets 2.6 compatibility
+  --disable-compat28      disable wxWidgets 2.8 compatibility
   --disable-rpath         disable use of rpath for uninstalled builds
   --enable-intl           use internationalization system
   --enable-config         use wxConfig (and derived) classes
@@ -5230,7 +5231,7 @@ echo "${ECHO_T}no" >&6; }
           fi
 
 
-          enablestring=disable
+          enablestring=enable
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-compat26" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-compat26... $ECHO_C" >&6; }
           no_cache=0
@@ -5271,6 +5272,47 @@ echo "${ECHO_T}no" >&6; }
           fi
 
 
+          enablestring=disable
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-compat28" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-compat28... $ECHO_C" >&6; }
+          no_cache=0
+          # Check whether --enable-compat28 was given.
+if test "${enable_compat28+set}" = set; then
+  enableval=$enable_compat28;
+                          if test "$enableval" = yes; then
+                            ac_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=yes'
+                          else
+                            ac_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=no'
+                          fi
+
+else
+
+                          LINE=`grep "WXWIN_COMPATIBILITY_2_8" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_compat28='WXWIN_COMPATIBILITY_2_8='$DEFAULT_WXWIN_COMPATIBILITY_2_8
+
+fi
+
+
+          eval "$ac_cv_use_compat28"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_compat28 >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$WXWIN_COMPATIBILITY_2_8" = 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}-rpath" >&5
@@ -47899,11 +47941,20 @@ _ACEOF
     WXWIN_COMPATIBILITY_2_6="yes"
 fi
 
-if test "x$WXWIN_COMPATIBILITY_2_6" != "xno"; then
+if test "x$WXWIN_COMPATIBILITY_2_6" = "xyes"; then
     cat >>confdefs.h <<\_ACEOF
 #define WXWIN_COMPATIBILITY_2_6 1
 _ACEOF
 
+
+    WXWIN_COMPATIBILITY_2_8="yes"
+fi
+
+if test "x$WXWIN_COMPATIBILITY_2_8" != "xno"; then
+    cat >>confdefs.h <<\_ACEOF
+#define WXWIN_COMPATIBILITY_2_8 1
+_ACEOF
+
 fi
 
 
@@ -55986,7 +56037,7 @@ fi
     BAKEFILE_BAKEFILE_M4_VERSION="0.2.1"
 
 
-BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.1"
+BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.2"
 
 
 
@@ -59151,7 +59202,8 @@ echo "  Should wxWidgets be compiled in Unicode mode?           ${wxUSE_UNICODE:
 
 echo "  What level of wxWidgets compatibility should be enabled?"
 echo "                                       wxWidgets 2.4      ${WXWIN_COMPATIBILITY_2_4:-no}"
-echo "                                       wxWidgets 2.6      ${WXWIN_COMPATIBILITY_2_6:-yes}"
+echo "                                       wxWidgets 2.6      ${WXWIN_COMPATIBILITY_2_6:-no}"
+echo "                                       wxWidgets 2.8      ${WXWIN_COMPATIBILITY_2_8:-yes}"
 
 echo "  Which libraries should wxWidgets use?"
 echo "                                       jpeg               ${wxUSE_LIBJPEG-none}"