another DMC build fix

[wxWidgets.git] / autoconf_inc.m4

diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index 7f676d10414329665df5939394081e1bfddb8fa1..2409c744b31e4b293ae1e093fdfc52d9b708212b 100644 (file)
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -1,10 +1,10 @@
 dnl ### begin block 00_header[wx.bkl] ###
 dnl
 dnl This macro was generated by
-dnl Bakefile 0.1.9 (http://bakefile.sourceforge.net)
+dnl Bakefile 0.2.2 (http://bakefile.sourceforge.net)
 dnl Do not modify, all changes will be overwritten!
 
-BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.9"
+BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.2"
 
 dnl ### begin block 10_AC_BAKEFILE_PRECOMP_HEADERS[wx.bkl] ###
 AC_BAKEFILE_PRECOMP_HEADERS
@@ -98,6 +98,12 @@ dnl ### begin block 20_COND_GCC_PCH_1[wx.bkl] ###
         COND_GCC_PCH_1=""
     fi
     AC_SUBST(COND_GCC_PCH_1)
+dnl ### begin block 20_COND_ICC_PCH_1[wx.bkl] ###
+    COND_ICC_PCH_1="#"
+    if test "x$ICC_PCH" = "x1" ; then
+        COND_ICC_PCH_1=""
+    fi
+    AC_SUBST(COND_ICC_PCH_1)
 dnl ### begin block 20_COND_MONOLITHIC_0[wx.bkl] ###
     COND_MONOLITHIC_0="#"
     if test "x$MONOLITHIC" = "x0" ; then
@@ -110,6 +116,12 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0[wx.bkl] ###
         COND_MONOLITHIC_0_SHARED_0=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_SHARED_0)
+dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_AUI_1[wx.bkl] ###
+    COND_MONOLITHIC_0_SHARED_0_USE_AUI_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_AUI" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_0_USE_AUI_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_AUI_1)
 dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1[wx.bkl] ###
     COND_MONOLITHIC_0_SHARED_0_USE_GUI_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" ; then
@@ -122,24 +134,30 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1[wx.bkl] #
         COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1[wx.bkl] ###
-    COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1=""
+dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1[wx.bkl] ###
+    COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_MEDIA" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1=""
     fi
-    AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1)
+    AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1)
 dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1[wx.bkl] ###
     COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_QA" = "x1" ; then
         COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1[wx.bkl] ###
-    COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_ODBC" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1=""
-    fi
-    AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1)
+dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1[wx.bkl] ###
+    COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1)
+dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_STC_1[wx.bkl] ###
+    COND_MONOLITHIC_0_SHARED_0_USE_STC_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_STC" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_0_USE_STC_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_STC_1)
 dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_XRC_1[wx.bkl] ###
     COND_MONOLITHIC_0_SHARED_0_USE_XRC_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_XRC" = "x1" ; then
@@ -152,6 +170,12 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1[wx.bkl] ###
         COND_MONOLITHIC_0_SHARED_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_SHARED_1)
+dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_AUI_1[wx.bkl] ###
+    COND_MONOLITHIC_0_SHARED_1_USE_AUI_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_AUI" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_1_USE_AUI_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_AUI_1)
 dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1[wx.bkl] ###
     COND_MONOLITHIC_0_SHARED_1_USE_GUI_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" ; then
@@ -164,36 +188,90 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1[wx.bkl] #
         COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1[wx.bkl] ###
-    COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1=""
+dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1[wx.bkl] ###
+    COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_MEDIA" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1=""
     fi
-    AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1)
+    AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1)
 dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1[wx.bkl] ###
     COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_QA" = "x1" ; then
         COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1[wx.bkl] ###
-    COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_ODBC" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1=""
-    fi
-    AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1)
+dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1[wx.bkl] ###
+    COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RICHTEXT" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1)
+dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_STC_1[wx.bkl] ###
+    COND_MONOLITHIC_0_SHARED_1_USE_STC_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_STC" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_1_USE_STC_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_STC_1)
 dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_XRC_1[wx.bkl] ###
     COND_MONOLITHIC_0_SHARED_1_USE_XRC_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_XRC" = "x1" ; then
         COND_MONOLITHIC_0_SHARED_1_USE_XRC_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_XRC_1)
-dnl ### begin block 20_COND_MONOLITHIC_0_USE_ODBC_1[wx.bkl] ###
-    COND_MONOLITHIC_0_USE_ODBC_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$USE_ODBC" = "x1" ; then
-        COND_MONOLITHIC_0_USE_ODBC_1=""
-    fi
-    AC_SUBST(COND_MONOLITHIC_0_USE_ODBC_1)
+dnl ### begin block 20_COND_MONOLITHIC_0_USE_AUI_1[wx.bkl] ###
+    COND_MONOLITHIC_0_USE_AUI_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$USE_AUI" = "x1" ; then
+        COND_MONOLITHIC_0_USE_AUI_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_USE_AUI_1)
+dnl ### begin block 20_COND_MONOLITHIC_0_USE_GUI_1[wx.bkl] ###
+    COND_MONOLITHIC_0_USE_GUI_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$USE_GUI" = "x1" ; then
+        COND_MONOLITHIC_0_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_USE_GUI_1)
+dnl ### begin block 20_COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1[wx.bkl] ###
+    COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_MEDIA" = "x1" ; then
+        COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1)
+dnl ### begin block 20_COND_MONOLITHIC_0_USE_HTML_1[wx.bkl] ###
+    COND_MONOLITHIC_0_USE_HTML_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$USE_HTML" = "x1" ; then
+        COND_MONOLITHIC_0_USE_HTML_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_USE_HTML_1)
+dnl ### begin block 20_COND_MONOLITHIC_0_USE_MEDIA_1[wx.bkl] ###
+    COND_MONOLITHIC_0_USE_MEDIA_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$USE_MEDIA" = "x1" ; then
+        COND_MONOLITHIC_0_USE_MEDIA_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_USE_MEDIA_1)
+dnl ### begin block 20_COND_MONOLITHIC_0_USE_QA_1[wx.bkl] ###
+    COND_MONOLITHIC_0_USE_QA_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$USE_QA" = "x1" ; then
+        COND_MONOLITHIC_0_USE_QA_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_USE_QA_1)
+dnl ### begin block 20_COND_MONOLITHIC_0_USE_RICHTEXT_1[wx.bkl] ###
+    COND_MONOLITHIC_0_USE_RICHTEXT_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then
+        COND_MONOLITHIC_0_USE_RICHTEXT_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_USE_RICHTEXT_1)
+dnl ### begin block 20_COND_MONOLITHIC_0_USE_STC_1[wx.bkl] ###
+    COND_MONOLITHIC_0_USE_STC_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$USE_STC" = "x1" ; then
+        COND_MONOLITHIC_0_USE_STC_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_USE_STC_1)
+dnl ### begin block 20_COND_MONOLITHIC_0_USE_XRC_1[wx.bkl] ###
+    COND_MONOLITHIC_0_USE_XRC_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$USE_XRC" = "x1" ; then
+        COND_MONOLITHIC_0_USE_XRC_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_USE_XRC_1)
 dnl ### begin block 20_COND_MONOLITHIC_1[wx.bkl] ###
     COND_MONOLITHIC_1="#"
     if test "x$MONOLITHIC" = "x1" ; then
@@ -272,12 +350,6 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1[wx.bkl] ###
         COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1=""
     fi
     AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1)
-dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0[wx.bkl] ###
-    COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="#"
-    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
-        COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0=""
-    fi
-    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0)
 dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF[wx.bkl] ###
     COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF="#"
     if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMOTIF" ; then
@@ -332,6 +404,18 @@ dnl ### begin block 20_COND_PLATFORM_UNIX_1[wx.bkl] ###
         COND_PLATFORM_UNIX_1=""
     fi
     AC_SUBST(COND_PLATFORM_UNIX_1)
+dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_MGL[wx.bkl] ###
+    COND_PLATFORM_UNIX_1_TOOLKIT_MGL="#"
+    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xMGL" ; then
+        COND_PLATFORM_UNIX_1_TOOLKIT_MGL=""
+    fi
+    AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_MGL)
+dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1[wx.bkl] ###
+    COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1="#"
+    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then
+        COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1)
 dnl ### begin block 20_COND_PLATFORM_UNIX_1_USE_GUI_1[wx.bkl] ###
     COND_PLATFORM_UNIX_1_USE_GUI_1="#"
     if test "x$PLATFORM_UNIX" = "x1" -a "x$USE_GUI" = "x1" ; then
@@ -386,18 +470,18 @@ dnl ### begin block 20_COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN[wx.bkl] ###
         COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
     fi
     AC_SUBST(COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN)
+dnl ### begin block 20_COND_SHARED_0_USE_STC_1[wx.bkl] ###
+    COND_SHARED_0_USE_STC_1="#"
+    if test "x$SHARED" = "x0" -a "x$USE_STC" = "x1" ; then
+        COND_SHARED_0_USE_STC_1=""
+    fi
+    AC_SUBST(COND_SHARED_0_USE_STC_1)
 dnl ### begin block 20_COND_SHARED_0_WXUSE_EXPAT_BUILTIN[wx.bkl] ###
     COND_SHARED_0_WXUSE_EXPAT_BUILTIN="#"
     if test "x$SHARED" = "x0" -a "x$wxUSE_EXPAT" = "xbuiltin" ; then
         COND_SHARED_0_WXUSE_EXPAT_BUILTIN=""
     fi
     AC_SUBST(COND_SHARED_0_WXUSE_EXPAT_BUILTIN)
-dnl ### begin block 20_COND_SHARED_0_WXUSE_ODBC_BUILTIN[wx.bkl] ###
-    COND_SHARED_0_WXUSE_ODBC_BUILTIN="#"
-    if test "x$SHARED" = "x0" -a "x$wxUSE_ODBC" = "xbuiltin" ; then
-        COND_SHARED_0_WXUSE_ODBC_BUILTIN=""
-    fi
-    AC_SUBST(COND_SHARED_0_WXUSE_ODBC_BUILTIN)
 dnl ### begin block 20_COND_SHARED_0_WXUSE_REGEX_BUILTIN[wx.bkl] ###
     COND_SHARED_0_WXUSE_REGEX_BUILTIN="#"
     if test "x$SHARED" = "x0" -a "x$wxUSE_REGEX" = "xbuiltin" ; then
@@ -446,24 +530,66 @@ dnl ### begin block 20_COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0[wx.bkl] ###
         COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0=""
     fi
     AC_SUBST(COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0)
+dnl ### begin block 20_COND_TOOLKIT_DFB[wx.bkl] ###
+    COND_TOOLKIT_DFB="#"
+    if test "x$TOOLKIT" = "xDFB" ; then
+        COND_TOOLKIT_DFB=""
+    fi
+    AC_SUBST(COND_TOOLKIT_DFB)
+dnl ### begin block 20_COND_TOOLKIT_DFB_USE_GUI_1[wx.bkl] ###
+    COND_TOOLKIT_DFB_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xDFB" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_DFB_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_TOOLKIT_DFB_USE_GUI_1)
 dnl ### begin block 20_COND_TOOLKIT_GTK[wx.bkl] ###
     COND_TOOLKIT_GTK="#"
     if test "x$TOOLKIT" = "xGTK" ; then
         COND_TOOLKIT_GTK=""
     fi
     AC_SUBST(COND_TOOLKIT_GTK)
+dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_[wx.bkl] ###
+    COND_TOOLKIT_GTK_TOOLKIT_VERSION_="#"
+    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x" ; then
+        COND_TOOLKIT_GTK_TOOLKIT_VERSION_=""
+    fi
+    AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_)
+dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_2[wx.bkl] ###
+    COND_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
+    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
+        COND_TOOLKIT_GTK_TOOLKIT_VERSION_2=""
+    fi
+    AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2)
+dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1[wx.bkl] ###
+    COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1)
+dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0[wx.bkl] ###
+    COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0)
+dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1[wx.bkl] ###
+    COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1=""
+    fi
+    AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1)
+dnl ### begin block 20_COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0[wx.bkl] ###
+    COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0)
 dnl ### begin block 20_COND_TOOLKIT_GTK_USE_GUI_1[wx.bkl] ###
     COND_TOOLKIT_GTK_USE_GUI_1="#"
     if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" ; then
         COND_TOOLKIT_GTK_USE_GUI_1=""
     fi
     AC_SUBST(COND_TOOLKIT_GTK_USE_GUI_1)
-dnl ### begin block 20_COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0[wx.bkl] ###
-    COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0=""
-    fi
-    AC_SUBST(COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0)
 dnl ### begin block 20_COND_TOOLKIT_MAC[wx.bkl] ###
     COND_TOOLKIT_MAC="#"
     if test "x$TOOLKIT" = "xMAC" ; then
@@ -530,6 +656,12 @@ dnl ### begin block 20_COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0[wx.bkl] ###
         COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0=""
     fi
     AC_SUBST(COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0)
+dnl ### begin block 20_COND_TOOLKIT_MSW_WXUNIV_0[wx.bkl] ###
+    COND_TOOLKIT_MSW_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xMSW" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_MSW_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_TOOLKIT_MSW_WXUNIV_0)
 dnl ### begin block 20_COND_TOOLKIT_PM[wx.bkl] ###
     COND_TOOLKIT_PM="#"
     if test "x$TOOLKIT" = "xPM" ; then
@@ -566,6 +698,12 @@ dnl ### begin block 20_COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0[wx.bkl] ###
         COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0=""
     fi
     AC_SUBST(COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0)
+dnl ### begin block 20_COND_TOOLKIT_WINCE_WXUNIV_0[wx.bkl] ###
+    COND_TOOLKIT_WINCE_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xWINCE" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_WINCE_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_TOOLKIT_WINCE_WXUNIV_0)
 dnl ### begin block 20_COND_TOOLKIT_X11[wx.bkl] ###
     COND_TOOLKIT_X11="#"
     if test "x$TOOLKIT" = "xX11" ; then
@@ -608,6 +746,12 @@ dnl ### begin block 20_COND_USE_GUI_1[wx.bkl] ###
         COND_USE_GUI_1=""
     fi
     AC_SUBST(COND_USE_GUI_1)
+dnl ### begin block 20_COND_USE_GUI_1_USE_OPENGL_1[wx.bkl] ###
+    COND_USE_GUI_1_USE_OPENGL_1="#"
+    if test "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
+        COND_USE_GUI_1_USE_OPENGL_1=""
+    fi
+    AC_SUBST(COND_USE_GUI_1_USE_OPENGL_1)
 dnl ### begin block 20_COND_USE_GUI_1_WXUNIV_0[wx.bkl] ###
     COND_USE_GUI_1_WXUNIV_0="#"
     if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
@@ -638,6 +782,12 @@ dnl ### begin block 20_COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN[wx.bkl] ###
         COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
     fi
     AC_SUBST(COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN)
+dnl ### begin block 20_COND_USE_PCH_1[wx.bkl] ###
+    COND_USE_PCH_1="#"
+    if test "x$USE_PCH" = "x1" ; then
+        COND_USE_PCH_1=""
+    fi
+    AC_SUBST(COND_USE_PCH_1)
 dnl ### begin block 20_COND_USE_PLUGINS_0[wx.bkl] ###
     COND_USE_PLUGINS_0="#"
     if test "x$USE_PLUGINS" = "x0" ; then
@@ -686,6 +836,12 @@ dnl ### begin block 20_COND_USE_SOVERSOLARIS_1[wx.bkl] ###
         COND_USE_SOVERSOLARIS_1=""
     fi
     AC_SUBST(COND_USE_SOVERSOLARIS_1)
+dnl ### begin block 20_COND_USE_STC_1[wx.bkl] ###
+    COND_USE_STC_1="#"
+    if test "x$USE_STC" = "x1" ; then
+        COND_USE_STC_1=""
+    fi
+    AC_SUBST(COND_USE_STC_1)
 dnl ### begin block 20_COND_USE_THREADS_0[wx.bkl] ###
     COND_USE_THREADS_0="#"
     if test "x$USE_THREADS" = "x0" ; then
@@ -752,12 +908,6 @@ dnl ### begin block 20_COND_WXUSE_LIBTIFF_BUILTIN[wx.bkl] ###
         COND_WXUSE_LIBTIFF_BUILTIN=""
     fi
     AC_SUBST(COND_WXUSE_LIBTIFF_BUILTIN)
-dnl ### begin block 20_COND_WXUSE_ODBC_BUILTIN[wx.bkl] ###
-    COND_WXUSE_ODBC_BUILTIN="#"
-    if test "x$wxUSE_ODBC" = "xbuiltin" ; then
-        COND_WXUSE_ODBC_BUILTIN=""
-    fi
-    AC_SUBST(COND_WXUSE_ODBC_BUILTIN)
 dnl ### begin block 20_COND_WXUSE_REGEX_BUILTIN[wx.bkl] ###
     COND_WXUSE_REGEX_BUILTIN="#"
     if test "x$wxUSE_REGEX" = "xbuiltin" ; then