]> git.saurik.com Git - wxWidgets.git/blobdiff - autoconf_inc.m4
Fixed an accidental name clash, and added back a wxCHECK
[wxWidgets.git] / autoconf_inc.m4
index 25765925aed2c76015dd0e543fa7e1be4c21894a..824bc1da33d6e1cde402a1d137faaab901e41484 100644 (file)
@@ -2,221 +2,584 @@ dnl This macro was generated by
 dnl Bakefile 0.1.1 (http://bakefile.sourceforge.net)
 dnl Do not modify, all changes will be overwritten!
 
-    dnl Conditions:
+dnl ### begin block 0_AC_BAKEFILE_PRECOMP_HEADERS ###
+AC_BAKEFILE_PRECOMP_HEADERS
 
-dnl ### begin block COND_WXUSE_ZLIBBUILTIN ###
-    COND_WXUSE_ZLIBBUILTIN="#"
-    if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
-        COND_WXUSE_ZLIBBUILTIN=
-    fi
-    AC_SUBST(COND_WXUSE_ZLIBBUILTIN)
-dnl ### begin block COND_UNICODE1 ###
-    COND_UNICODE1="#"
-    if test "x$UNICODE" = "x1" ; then
-        COND_UNICODE1=
-    fi
-    AC_SUBST(COND_UNICODE1)
-dnl ### begin block COND_BUILDDEBUG ###
-    COND_BUILDDEBUG="#"
+dnl Conditions:
+
+dnl ### begin block 1_COND_BUILD_DEBUG ###
+    COND_BUILD_DEBUG="#"
     if test "x$BUILD" = "xdebug" ; then
-        COND_BUILDDEBUG=
-    fi
-    AC_SUBST(COND_BUILDDEBUG)
-dnl ### begin block COND_WXUSE_REGEXBUILTIN ###
-    COND_WXUSE_REGEXBUILTIN="#"
-    if test "x$wxUSE_REGEX" = "xbuiltin" ; then
-        COND_WXUSE_REGEXBUILTIN=
+        COND_BUILD_DEBUG=""
+    fi
+    AC_SUBST(COND_BUILD_DEBUG)
+dnl ### begin block 1_COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT ###
+    COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT="#"
+    if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then
+        COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT=""
+    fi
+    AC_SUBST(COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT)
+dnl ### begin block 1_COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT ###
+    COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT="#"
+    if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then
+        COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT=""
+    fi
+    AC_SUBST(COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT)
+dnl ### begin block 1_COND_BUILD_RELEASE ###
+    COND_BUILD_RELEASE="#"
+    if test "x$BUILD" = "xrelease" ; then
+        COND_BUILD_RELEASE=""
+    fi
+    AC_SUBST(COND_BUILD_RELEASE)
+dnl ### begin block 1_COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT ###
+    COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT="#"
+    if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then
+        COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT=""
+    fi
+    AC_SUBST(COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT)
+dnl ### begin block 1_COND_DEBUG_FLAG_1 ###
+    COND_DEBUG_FLAG_1="#"
+    if test "x$DEBUG_FLAG" = "x1" ; then
+        COND_DEBUG_FLAG_1=""
+    fi
+    AC_SUBST(COND_DEBUG_FLAG_1)
+dnl ### begin block 1_COND_DEBUG_INFO_0 ###
+    COND_DEBUG_INFO_0="#"
+    if test "x$DEBUG_INFO" = "x0" ; then
+        COND_DEBUG_INFO_0=""
+    fi
+    AC_SUBST(COND_DEBUG_INFO_0)
+dnl ### begin block 1_COND_DEBUG_INFO_1 ###
+    COND_DEBUG_INFO_1="#"
+    if test "x$DEBUG_INFO" = "x1" ; then
+        COND_DEBUG_INFO_1=""
+    fi
+    AC_SUBST(COND_DEBUG_INFO_1)
+dnl ### begin block 1_COND_DEPS_TRACKING_0 ###
+    COND_DEPS_TRACKING_0="#"
+    if test "x$DEPS_TRACKING" = "x0" ; then
+        COND_DEPS_TRACKING_0=""
+    fi
+    AC_SUBST(COND_DEPS_TRACKING_0)
+dnl ### begin block 1_COND_DEPS_TRACKING_1 ###
+    COND_DEPS_TRACKING_1="#"
+    if test "x$DEPS_TRACKING" = "x1" ; then
+        COND_DEPS_TRACKING_1=""
+    fi
+    AC_SUBST(COND_DEPS_TRACKING_1)
+dnl ### begin block 1_COND_GCC_PCH_1 ###
+    COND_GCC_PCH_1="#"
+    if test "x$GCC_PCH" = "x1" ; then
+        COND_GCC_PCH_1=""
+    fi
+    AC_SUBST(COND_GCC_PCH_1)
+dnl ### begin block 1_COND_MONOLITHIC_0 ###
+    COND_MONOLITHIC_0="#"
+    if test "x$MONOLITHIC" = "x0" ; then
+        COND_MONOLITHIC_0=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0)
+dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_0 ###
+    COND_MONOLITHIC_0_SHARED_0="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" ; then
+        COND_MONOLITHIC_0_SHARED_0=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_SHARED_0)
+dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 ###
+    COND_MONOLITHIC_0_SHARED_0_USE_GUI_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_0_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1)
+dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 ###
+    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=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1)
+dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 ###
+    COND_MONOLITHIC_0_SHARED_0_USE_HTML_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_HTML" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_0_USE_HTML_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_HTML_1)
+dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1 ###
+    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 1_COND_MONOLITHIC_0_SHARED_1 ###
+    COND_MONOLITHIC_0_SHARED_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_SHARED_1)
+dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 ###
+    COND_MONOLITHIC_0_SHARED_1_USE_GUI_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_1_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1)
+dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 ###
+    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=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1)
+dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 ###
+    COND_MONOLITHIC_0_SHARED_1_USE_HTML_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_HTML" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_1_USE_HTML_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_HTML_1)
+dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1 ###
+    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 1_COND_MONOLITHIC_1 ###
+    COND_MONOLITHIC_1="#"
+    if test "x$MONOLITHIC" = "x1" ; then
+        COND_MONOLITHIC_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_1)
+dnl ### begin block 1_COND_MONOLITHIC_1_SHARED_0 ###
+    COND_MONOLITHIC_1_SHARED_0="#"
+    if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x0" ; then
+        COND_MONOLITHIC_1_SHARED_0=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_1_SHARED_0)
+dnl ### begin block 1_COND_MONOLITHIC_1_SHARED_1 ###
+    COND_MONOLITHIC_1_SHARED_1="#"
+    if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x1" ; then
+        COND_MONOLITHIC_1_SHARED_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_1_SHARED_1)
+dnl ### begin block 1_COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 ###
+    COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="#"
+    if test "x$OFFICIAL_BUILD" = "x0" -a "x$PLATFORM_WIN32" = "x1" ; then
+        COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1=""
+    fi
+    AC_SUBST(COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1)
+dnl ### begin block 1_COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 ###
+    COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1="#"
+    if test "x$OFFICIAL_BUILD" = "x1" -a "x$PLATFORM_WIN32" = "x1" ; then
+        COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1=""
+    fi
+    AC_SUBST(COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1)
+dnl ### begin block 1_COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 ###
+    COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="#"
+    if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERSION" = "x1" ; then
+        COND_PLATFORM_MACOSX_0_USE_SOVERSION_1=""
+    fi
+    AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERSION_1)
+dnl ### begin block 1_COND_PLATFORM_MACOSX_1 ###
+    COND_PLATFORM_MACOSX_1="#"
+    if test "x$PLATFORM_MACOSX" = "x1" ; then
+        COND_PLATFORM_MACOSX_1=""
+    fi
+    AC_SUBST(COND_PLATFORM_MACOSX_1)
+dnl ### begin block 1_COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA ###
+    COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xCOCOA" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA=""
+    fi
+    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA)
+dnl ### begin block 1_COND_PLATFORM_MACOSX_1_TOOLKIT_GTK ###
+    COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_GTK=""
+    fi
+    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_GTK)
+dnl ### begin block 1_COND_PLATFORM_MACOSX_1_TOOLKIT_MAC ###
+    COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_MAC=""
+    fi
+    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_MAC)
+dnl ### begin block 1_COND_PLATFORM_MACOSX_1_USE_GUI_1 ###
+    COND_PLATFORM_MACOSX_1_USE_GUI_1="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_GUI" = "x1" ; then
+        COND_PLATFORM_MACOSX_1_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_PLATFORM_MACOSX_1_USE_GUI_1)
+dnl ### begin block 1_COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 ###
+    COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then
+        COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
+    fi
+    AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1)
+dnl ### begin block 1_COND_PLATFORM_MAC_1 ###
+    COND_PLATFORM_MAC_1="#"
+    if test "x$PLATFORM_MAC" = "x1" ; then
+        COND_PLATFORM_MAC_1=""
+    fi
+    AC_SUBST(COND_PLATFORM_MAC_1)
+dnl ### begin block 1_COND_PLATFORM_OS2_1 ###
+    COND_PLATFORM_OS2_1="#"
+    if test "x$PLATFORM_OS2" = "x1" ; then
+        COND_PLATFORM_OS2_1=""
+    fi
+    AC_SUBST(COND_PLATFORM_OS2_1)
+dnl ### begin block 1_COND_PLATFORM_UNIX_0 ###
+    COND_PLATFORM_UNIX_0="#"
+    if test "x$PLATFORM_UNIX" = "x0" ; then
+        COND_PLATFORM_UNIX_0=""
+    fi
+    AC_SUBST(COND_PLATFORM_UNIX_0)
+dnl ### begin block 1_COND_PLATFORM_UNIX_1 ###
+    COND_PLATFORM_UNIX_1="#"
+    if test "x$PLATFORM_UNIX" = "x1" ; then
+        COND_PLATFORM_UNIX_1=""
     fi
-    AC_SUBST(COND_WXUSE_REGEXBUILTIN)
-dnl ### begin block COND_USE_SOSYMLINKS1 ###
-    COND_USE_SOSYMLINKS1="#"
-    if test "x$USE_SOSYMLINKS" = "x1" ; then
-        COND_USE_SOSYMLINKS1=
+    AC_SUBST(COND_PLATFORM_UNIX_1)
+dnl ### begin block 1_COND_PLATFORM_UNIX_1_USE_GUI_1 ###
+    COND_PLATFORM_UNIX_1_USE_GUI_1="#"
+    if test "x$PLATFORM_UNIX" = "x1" -a "x$USE_GUI" = "x1" ; then
+        COND_PLATFORM_UNIX_1_USE_GUI_1=""
     fi
-    AC_SUBST(COND_USE_SOSYMLINKS1)
-dnl ### begin block COND_WXUSE_LIBJPEGBUILTIN ###
-    COND_WXUSE_LIBJPEGBUILTIN="#"
-    if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
-        COND_WXUSE_LIBJPEGBUILTIN=
+    AC_SUBST(COND_PLATFORM_UNIX_1_USE_GUI_1)
+dnl ### begin block 1_COND_PLATFORM_WIN32_0 ###
+    COND_PLATFORM_WIN32_0="#"
+    if test "x$PLATFORM_WIN32" = "x0" ; then
+        COND_PLATFORM_WIN32_0=""
     fi
-    AC_SUBST(COND_WXUSE_LIBJPEGBUILTIN)
-dnl ### begin block COND_WXUSE_LIBPNGBUILTIN ###
-    COND_WXUSE_LIBPNGBUILTIN="#"
-    if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
-        COND_WXUSE_LIBPNGBUILTIN=
+    AC_SUBST(COND_PLATFORM_WIN32_0)
+dnl ### begin block 1_COND_PLATFORM_WIN32_1 ###
+    COND_PLATFORM_WIN32_1="#"
+    if test "x$PLATFORM_WIN32" = "x1" ; then
+        COND_PLATFORM_WIN32_1=""
+    fi
+    AC_SUBST(COND_PLATFORM_WIN32_1)
+dnl ### begin block 1_COND_SHARED_0 ###
+    COND_SHARED_0="#"
+    if test "x$SHARED" = "x0" ; then
+        COND_SHARED_0=""
+    fi
+    AC_SUBST(COND_SHARED_0)
+dnl ### begin block 1_COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 ###
+    COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#"
+    if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
+        COND_SHARED_0_USE_GUI_1_USE_OPENGL_1=""
+    fi
+    AC_SUBST(COND_SHARED_0_USE_GUI_1_USE_OPENGL_1)
+dnl ### begin block 1_COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN ###
+    COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#"
+    if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
+        COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN=""
+    fi
+    AC_SUBST(COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN)
+dnl ### begin block 1_COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN ###
+    COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#"
+    if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
+        COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN=""
+    fi
+    AC_SUBST(COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN)
+dnl ### begin block 1_COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN ###
+    COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#"
+    if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
+        COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
+    fi
+    AC_SUBST(COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN)
+dnl ### begin block 1_COND_SHARED_0_WXUSE_EXPAT_BUILTIN ###
+    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 1_COND_SHARED_0_WXUSE_ODBC_BUILTIN ###
+    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 1_COND_SHARED_0_WXUSE_REGEX_BUILTIN ###
+    COND_SHARED_0_WXUSE_REGEX_BUILTIN="#"
+    if test "x$SHARED" = "x0" -a "x$wxUSE_REGEX" = "xbuiltin" ; then
+        COND_SHARED_0_WXUSE_REGEX_BUILTIN=""
+    fi
+    AC_SUBST(COND_SHARED_0_WXUSE_REGEX_BUILTIN)
+dnl ### begin block 1_COND_SHARED_0_WXUSE_ZLIB_BUILTIN ###
+    COND_SHARED_0_WXUSE_ZLIB_BUILTIN="#"
+    if test "x$SHARED" = "x0" -a "x$wxUSE_ZLIB" = "xbuiltin" ; then
+        COND_SHARED_0_WXUSE_ZLIB_BUILTIN=""
+    fi
+    AC_SUBST(COND_SHARED_0_WXUSE_ZLIB_BUILTIN)
+dnl ### begin block 1_COND_SHARED_1 ###
+    COND_SHARED_1="#"
+    if test "x$SHARED" = "x1" ; then
+        COND_SHARED_1=""
+    fi
+    AC_SUBST(COND_SHARED_1)
+dnl ### begin block 1_COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 ###
+    COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="#"
+    if test "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
+        COND_SHARED_1_USE_GUI_1_USE_OPENGL_1=""
+    fi
+    AC_SUBST(COND_SHARED_1_USE_GUI_1_USE_OPENGL_1)
+dnl ### begin block 1_COND_TOOLKIT_COCOA ###
+    COND_TOOLKIT_COCOA="#"
+    if test "x$TOOLKIT" = "xCOCOA" ; then
+        COND_TOOLKIT_COCOA=""
     fi
-    AC_SUBST(COND_WXUSE_LIBPNGBUILTIN)
-dnl ### begin block COND_WXUSE_ODBCBUILTIN ###
-    COND_WXUSE_ODBCBUILTIN="#"
-    if test "x$wxUSE_ODBC" = "xbuiltin" ; then
-        COND_WXUSE_ODBCBUILTIN=
+    AC_SUBST(COND_TOOLKIT_COCOA)
+dnl ### begin block 1_COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 ###
+    COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0=""
     fi
-    AC_SUBST(COND_WXUSE_ODBCBUILTIN)
-dnl ### begin block COND_TOOLKITGTK ###
-    COND_TOOLKITGTK="#"
+    AC_SUBST(COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0)
+dnl ### begin block 1_COND_TOOLKIT_GTK ###
+    COND_TOOLKIT_GTK="#"
     if test "x$TOOLKIT" = "xGTK" ; then
-        COND_TOOLKITGTK=
+        COND_TOOLKIT_GTK=""
+    fi
+    AC_SUBST(COND_TOOLKIT_GTK)
+dnl ### begin block 1_COND_TOOLKIT_GTK_USE_GUI_1 ###
+    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 1_COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 ###
+    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 1_COND_TOOLKIT_MAC ###
+    COND_TOOLKIT_MAC="#"
+    if test "x$TOOLKIT" = "xMAC" ; then
+        COND_TOOLKIT_MAC=""
+    fi
+    AC_SUBST(COND_TOOLKIT_MAC)
+dnl ### begin block 1_COND_TOOLKIT_MAC_USE_GUI_1 ###
+    COND_TOOLKIT_MAC_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_MAC_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_TOOLKIT_MAC_USE_GUI_1)
+dnl ### begin block 1_COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 ###
+    COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0)
+dnl ### begin block 1_COND_TOOLKIT_MGL ###
+    COND_TOOLKIT_MGL="#"
+    if test "x$TOOLKIT" = "xMGL" ; then
+        COND_TOOLKIT_MGL=""
     fi
-    AC_SUBST(COND_TOOLKITGTK)
-dnl ### begin block COND_TOOLKITMOTIF ###
-    COND_TOOLKITMOTIF="#"
-    if test "x$TOOLKIT" = "xMOTIF" ; then
-        COND_TOOLKITMOTIF=
+    AC_SUBST(COND_TOOLKIT_MGL)
+dnl ### begin block 1_COND_TOOLKIT_MGL_USE_GUI_1 ###
+    COND_TOOLKIT_MGL_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_MGL_USE_GUI_1=""
     fi
-    AC_SUBST(COND_TOOLKITMOTIF)
-dnl ### begin block COND_TOOLKITMSW ###
-    COND_TOOLKITMSW="#"
+    AC_SUBST(COND_TOOLKIT_MGL_USE_GUI_1)
+dnl ### begin block 1_COND_TOOLKIT_MOTIF ###
+    COND_TOOLKIT_MOTIF="#"
+    if test "x$TOOLKIT" = "xMOTIF" ; then
+        COND_TOOLKIT_MOTIF=""
+    fi
+    AC_SUBST(COND_TOOLKIT_MOTIF)
+dnl ### begin block 1_COND_TOOLKIT_MOTIF_USE_GUI_1 ###
+    COND_TOOLKIT_MOTIF_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_MOTIF_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_TOOLKIT_MOTIF_USE_GUI_1)
+dnl ### begin block 1_COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 ###
+    COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0)
+dnl ### begin block 1_COND_TOOLKIT_MSW ###
+    COND_TOOLKIT_MSW="#"
     if test "x$TOOLKIT" = "xMSW" ; then
-        COND_TOOLKITMSW=
-    fi
-    AC_SUBST(COND_TOOLKITMSW)
-dnl ### begin block COND_TOOLKITMAC ###
-    COND_TOOLKITMAC="#"
-    if test "x$TOOLKIT" = "xMAC" ; then
-        COND_TOOLKITMAC=
+        COND_TOOLKIT_MSW=""
+    fi
+    AC_SUBST(COND_TOOLKIT_MSW)
+dnl ### begin block 1_COND_TOOLKIT_MSW_USE_GUI_1 ###
+    COND_TOOLKIT_MSW_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_MSW_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_TOOLKIT_MSW_USE_GUI_1)
+dnl ### begin block 1_COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 ###
+    COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0)
+dnl ### begin block 1_COND_TOOLKIT_PM ###
+    COND_TOOLKIT_PM="#"
+    if test "x$TOOLKIT" = "xPM" ; then
+        COND_TOOLKIT_PM=""
+    fi
+    AC_SUBST(COND_TOOLKIT_PM)
+dnl ### begin block 1_COND_TOOLKIT_PM_USE_GUI_1 ###
+    COND_TOOLKIT_PM_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xPM" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_PM_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_TOOLKIT_PM_USE_GUI_1)
+dnl ### begin block 1_COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 ###
+    COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xPM" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0)
+dnl ### begin block 1_COND_TOOLKIT_X11 ###
+    COND_TOOLKIT_X11="#"
+    if test "x$TOOLKIT" = "xX11" ; then
+        COND_TOOLKIT_X11=""
     fi
-    AC_SUBST(COND_TOOLKITMAC)
-dnl ### begin block COND_TOOLKITCOCOA ###
-    COND_TOOLKITCOCOA="#"
-    if test "x$TOOLKIT" = "xCOCOA" ; then
-        COND_TOOLKITCOCOA=
+    AC_SUBST(COND_TOOLKIT_X11)
+dnl ### begin block 1_COND_TOOLKIT_X11_USE_GUI_1 ###
+    COND_TOOLKIT_X11_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_X11_USE_GUI_1=""
     fi
-    AC_SUBST(COND_TOOLKITCOCOA)
-dnl ### begin block COND_TOOLKITOS2 ###
-    COND_TOOLKITOS2="#"
-    if test "x$TOOLKIT" = "xOS2" ; then
-        COND_TOOLKITOS2=
+    AC_SUBST(COND_TOOLKIT_X11_USE_GUI_1)
+dnl ### begin block 1_COND_UNICODE_1 ###
+    COND_UNICODE_1="#"
+    if test "x$UNICODE" = "x1" ; then
+        COND_UNICODE_1=""
+    fi
+    AC_SUBST(COND_UNICODE_1)
+dnl ### begin block 1_COND_USE_EXCEPTIONS_0 ###
+    COND_USE_EXCEPTIONS_0="#"
+    if test "x$USE_EXCEPTIONS" = "x0" ; then
+        COND_USE_EXCEPTIONS_0=""
+    fi
+    AC_SUBST(COND_USE_EXCEPTIONS_0)
+dnl ### begin block 1_COND_USE_EXCEPTIONS_1 ###
+    COND_USE_EXCEPTIONS_1="#"
+    if test "x$USE_EXCEPTIONS" = "x1" ; then
+        COND_USE_EXCEPTIONS_1=""
+    fi
+    AC_SUBST(COND_USE_EXCEPTIONS_1)
+dnl ### begin block 1_COND_USE_GUI_0 ###
+    COND_USE_GUI_0="#"
+    if test "x$USE_GUI" = "x0" ; then
+        COND_USE_GUI_0=""
     fi
-    AC_SUBST(COND_TOOLKITOS2)
-dnl ### begin block COND_TOOLKITX11 ###
-    COND_TOOLKITX11="#"
-    if test "x$TOOLKIT" = "xX11" ; then
-        COND_TOOLKITX11=
+    AC_SUBST(COND_USE_GUI_0)
+dnl ### begin block 1_COND_USE_GUI_1 ###
+    COND_USE_GUI_1="#"
+    if test "x$USE_GUI" = "x1" ; then
+        COND_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_USE_GUI_1)
+dnl ### begin block 1_COND_USE_GUI_1_WXUNIV_0 ###
+    COND_USE_GUI_1_WXUNIV_0="#"
+    if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_USE_GUI_1_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_USE_GUI_1_WXUNIV_0)
+dnl ### begin block 1_COND_USE_GUI_1_WXUNIV_1 ###
+    COND_USE_GUI_1_WXUNIV_1="#"
+    if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
+        COND_USE_GUI_1_WXUNIV_1=""
+    fi
+    AC_SUBST(COND_USE_GUI_1_WXUNIV_1)
+dnl ### begin block 1_COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN ###
+    COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#"
+    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
+        COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN=""
+    fi
+    AC_SUBST(COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN)
+dnl ### begin block 1_COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN ###
+    COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#"
+    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
+        COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN=""
+    fi
+    AC_SUBST(COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN)
+dnl ### begin block 1_COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN ###
+    COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#"
+    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
+        COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
+    fi
+    AC_SUBST(COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN)
+dnl ### begin block 1_COND_USE_ODBC_1 ###
+    COND_USE_ODBC_1="#"
+    if test "x$USE_ODBC" = "x1" ; then
+        COND_USE_ODBC_1=""
+    fi
+    AC_SUBST(COND_USE_ODBC_1)
+dnl ### begin block 1_COND_USE_SOSYMLINKS_1 ###
+    COND_USE_SOSYMLINKS_1="#"
+    if test "x$USE_SOSYMLINKS" = "x1" ; then
+        COND_USE_SOSYMLINKS_1=""
     fi
-    AC_SUBST(COND_TOOLKITX11)
-dnl ### begin block COND_TOOLKITMGL ###
-    COND_TOOLKITMGL="#"
-    if test "x$TOOLKIT" = "xMGL" ; then
-        COND_TOOLKITMGL=
+    AC_SUBST(COND_USE_SOSYMLINKS_1)
+dnl ### begin block 1_COND_USE_SOVERLINUX_1 ###
+    COND_USE_SOVERLINUX_1="#"
+    if test "x$USE_SOVERLINUX" = "x1" ; then
+        COND_USE_SOVERLINUX_1=""
     fi
-    AC_SUBST(COND_TOOLKITMGL)
-dnl ### begin block COND_WXUNIV1 ###
-    COND_WXUNIV1="#"
-    if test "x$WXUNIV" = "x1" ; then
-        COND_WXUNIV1=
-    fi
-    AC_SUBST(COND_WXUNIV1)
-dnl ### begin block COND_SHARED0_MONOLITHIC1 ###
-    COND_SHARED0_MONOLITHIC1="#"
-    if test "x$SHARED" = "x0" -a \
-            "x$MONOLITHIC" = "x1" ; then
-        COND_SHARED0_MONOLITHIC1=
-    fi
-    AC_SUBST(COND_SHARED0_MONOLITHIC1)
-dnl ### begin block COND_SHARED1_MONOLITHIC1 ###
-    COND_SHARED1_MONOLITHIC1="#"
-    if test "x$SHARED" = "x1" -a \
-            "x$MONOLITHIC" = "x1" ; then
-        COND_SHARED1_MONOLITHIC1=
-    fi
-    AC_SUBST(COND_SHARED1_MONOLITHIC1)
-dnl ### begin block COND_PLATFORM_UNIX1 ###
-    COND_PLATFORM_UNIX1="#"
-    if test "x$PLATFORM_UNIX" = "x1" ; then
-        COND_PLATFORM_UNIX1=
+    AC_SUBST(COND_USE_SOVERLINUX_1)
+dnl ### begin block 1_COND_USE_SOVERSION_0 ###
+    COND_USE_SOVERSION_0="#"
+    if test "x$USE_SOVERSION" = "x0" ; then
+        COND_USE_SOVERSION_0=""
     fi
-    AC_SUBST(COND_PLATFORM_UNIX1)
-dnl ### begin block COND_PLATFORM_MACOSX1 ###
-    COND_PLATFORM_MACOSX1="#"
-    if test "x$PLATFORM_MACOSX" = "x1" ; then
-        COND_PLATFORM_MACOSX1=
+    AC_SUBST(COND_USE_SOVERSION_0)
+dnl ### begin block 1_COND_USE_SOVERSOLARIS_1 ###
+    COND_USE_SOVERSOLARIS_1="#"
+    if test "x$USE_SOVERSOLARIS" = "x1" ; then
+        COND_USE_SOVERSOLARIS_1=""
     fi
-    AC_SUBST(COND_PLATFORM_MACOSX1)
-dnl ### begin block COND_PLATFORM_WIN321 ###
-    COND_PLATFORM_WIN321="#"
-    if test "x$PLATFORM_WIN32" = "x1" ; then
-        COND_PLATFORM_WIN321=
-    fi
-    AC_SUBST(COND_PLATFORM_WIN321)
-dnl ### begin block COND_USE_SOVERSION1_PLATFORM_MACOSX0 ###
-    COND_USE_SOVERSION1_PLATFORM_MACOSX0="#"
-    if test "x$USE_SOVERSION" = "x1" -a \
-            "x$PLATFORM_MACOSX" = "x0" ; then
-        COND_USE_SOVERSION1_PLATFORM_MACOSX0=
-    fi
-    AC_SUBST(COND_USE_SOVERSION1_PLATFORM_MACOSX0)
-dnl ### begin block COND_USE_SOVERSION1_PLATFORM_MACOSX1 ###
-    COND_USE_SOVERSION1_PLATFORM_MACOSX1="#"
-    if test "x$USE_SOVERSION" = "x1" -a \
-            "x$PLATFORM_MACOSX" = "x1" ; then
-        COND_USE_SOVERSION1_PLATFORM_MACOSX1=
-    fi
-    AC_SUBST(COND_USE_SOVERSION1_PLATFORM_MACOSX1)
-dnl ### begin block COND_WXUSE_LIBTIFFBUILTIN ###
-    COND_WXUSE_LIBTIFFBUILTIN="#"
-    if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
-        COND_WXUSE_LIBTIFFBUILTIN=
+    AC_SUBST(COND_USE_SOVERSOLARIS_1)
+dnl ### begin block 1_COND_WXUNIV_1 ###
+    COND_WXUNIV_1="#"
+    if test "x$WXUNIV" = "x1" ; then
+        COND_WXUNIV_1=""
     fi
-    AC_SUBST(COND_WXUSE_LIBTIFFBUILTIN)
-dnl ### begin block COND_PLATFORM_WIN320 ###
-    COND_PLATFORM_WIN320="#"
-    if test "x$PLATFORM_WIN32" = "x0" ; then
-        COND_PLATFORM_WIN320=
+    AC_SUBST(COND_WXUNIV_1)
+dnl ### begin block 1_COND_WXUSE_EXPAT_BUILTIN ###
+    COND_WXUSE_EXPAT_BUILTIN="#"
+    if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
+        COND_WXUSE_EXPAT_BUILTIN=""
     fi
-    AC_SUBST(COND_PLATFORM_WIN320)
-dnl ### begin block COND_MONOLITHIC1 ###
-    COND_MONOLITHIC1="#"
-    if test "x$MONOLITHIC" = "x1" ; then
-        COND_MONOLITHIC1=
+    AC_SUBST(COND_WXUSE_EXPAT_BUILTIN)
+dnl ### begin block 1_COND_WXUSE_LIBJPEG_BUILTIN ###
+    COND_WXUSE_LIBJPEG_BUILTIN="#"
+    if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
+        COND_WXUSE_LIBJPEG_BUILTIN=""
     fi
-    AC_SUBST(COND_MONOLITHIC1)
-dnl ### begin block COND_MONOLITHIC0 ###
-    COND_MONOLITHIC0="#"
-    if test "x$MONOLITHIC" = "x0" ; then
-        COND_MONOLITHIC0=
+    AC_SUBST(COND_WXUSE_LIBJPEG_BUILTIN)
+dnl ### begin block 1_COND_WXUSE_LIBPNG_BUILTIN ###
+    COND_WXUSE_LIBPNG_BUILTIN="#"
+    if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
+        COND_WXUSE_LIBPNG_BUILTIN=""
     fi
-    AC_SUBST(COND_MONOLITHIC0)
-dnl ### begin block COND_USE_GUI1 ###
-    COND_USE_GUI1="#"
-    if test "x$USE_GUI" = "x1" ; then
-        COND_USE_GUI1=
+    AC_SUBST(COND_WXUSE_LIBPNG_BUILTIN)
+dnl ### begin block 1_COND_WXUSE_LIBTIFF_BUILTIN ###
+    COND_WXUSE_LIBTIFF_BUILTIN="#"
+    if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
+        COND_WXUSE_LIBTIFF_BUILTIN=""
     fi
-    AC_SUBST(COND_USE_GUI1)
-dnl ### begin block COND_DEPS_TYPEGCC ###
-    COND_DEPS_TYPEGCC="#"
-    if test "x$DEPS_TYPE" = "xgcc" ; then
-        COND_DEPS_TYPEGCC=
+    AC_SUBST(COND_WXUSE_LIBTIFF_BUILTIN)
+dnl ### begin block 1_COND_WXUSE_ODBC_BUILTIN ###
+    COND_WXUSE_ODBC_BUILTIN="#"
+    if test "x$wxUSE_ODBC" = "xbuiltin" ; then
+        COND_WXUSE_ODBC_BUILTIN=""
     fi
-    AC_SUBST(COND_DEPS_TYPEGCC)
-dnl ### begin block COND_USE_GUI0 ###
-    COND_USE_GUI0="#"
-    if test "x$USE_GUI" = "x0" ; then
-        COND_USE_GUI0=
-    fi
-    AC_SUBST(COND_USE_GUI0)
-dnl ### begin block COND_USE_GUI1_WXUNIV0 ###
-    COND_USE_GUI1_WXUNIV0="#"
-    if test "x$USE_GUI" = "x1" -a \
-            "x$WXUNIV" = "x0" ; then
-        COND_USE_GUI1_WXUNIV0=
-    fi
-    AC_SUBST(COND_USE_GUI1_WXUNIV0)
-dnl ### begin block COND_USE_GUI1_WXUNIV1 ###
-    COND_USE_GUI1_WXUNIV1="#"
-    if test "x$USE_GUI" = "x1" -a \
-            "x$WXUNIV" = "x1" ; then
-        COND_USE_GUI1_WXUNIV1=
-    fi
-    AC_SUBST(COND_USE_GUI1_WXUNIV1)
-dnl ### begin block COND_USE_SOVERLINUX1 ###
-    COND_USE_SOVERLINUX1="#"
-    if test "x$USE_SOVERLINUX" = "x1" ; then
-        COND_USE_SOVERLINUX1=
+    AC_SUBST(COND_WXUSE_ODBC_BUILTIN)
+dnl ### begin block 1_COND_WXUSE_REGEX_BUILTIN ###
+    COND_WXUSE_REGEX_BUILTIN="#"
+    if test "x$wxUSE_REGEX" = "xbuiltin" ; then
+        COND_WXUSE_REGEX_BUILTIN=""
     fi
-    AC_SUBST(COND_USE_SOVERLINUX1)
-dnl ### begin block COND_USE_SOVERSOLARIS1 ###
-    COND_USE_SOVERSOLARIS1="#"
-    if test "x$USE_SOVERSOLARIS" = "x1" ; then
-        COND_USE_SOVERSOLARIS1=
+    AC_SUBST(COND_WXUSE_REGEX_BUILTIN)
+dnl ### begin block 1_COND_WXUSE_ZLIB_BUILTIN ###
+    COND_WXUSE_ZLIB_BUILTIN="#"
+    if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
+        COND_WXUSE_ZLIB_BUILTIN=""
     fi
-    AC_SUBST(COND_USE_SOVERSOLARIS1)
+    AC_SUBST(COND_WXUSE_ZLIB_BUILTIN)