X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/458425003481da3dde531a9677014b07070b7095..d030c68a2f24286785c472ed04cc3609805ce596:/autoconf_inc.m4?ds=sidebyside

diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index b56c782e4c..824bc1da33 100644
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -2,9 +2,6 @@ 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
 
@@ -106,6 +103,12 @@ dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 ###
         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
@@ -130,6 +133,12 @@ dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 ###
         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
@@ -190,6 +199,12 @@ dnl ### begin block 1_COND_PLATFORM_MACOSX_1_TOOLKIT_MAC ###
         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
@@ -202,6 +217,12 @@ dnl ### begin block 1_COND_PLATFORM_MAC_1 ###
         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
@@ -214,6 +235,12 @@ dnl ### begin block 1_COND_PLATFORM_UNIX_1 ###
         COND_PLATFORM_UNIX_1=""
     fi
     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_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
@@ -238,6 +265,48 @@ dnl ### begin block 1_COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 ###
         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
@@ -346,24 +415,24 @@ dnl ### begin block 1_COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 ###
         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_OS2 ###
-    COND_TOOLKIT_OS2="#"
-    if test "x$TOOLKIT" = "xOS2" ; then
-        COND_TOOLKIT_OS2=""
-    fi
-    AC_SUBST(COND_TOOLKIT_OS2)
-dnl ### begin block 1_COND_TOOLKIT_OS2_USE_GUI_1 ###
-    COND_TOOLKIT_OS2_USE_GUI_1="#"
-    if test "x$TOOLKIT" = "xOS2" -a "x$USE_GUI" = "x1" ; then
-        COND_TOOLKIT_OS2_USE_GUI_1=""
-    fi
-    AC_SUBST(COND_TOOLKIT_OS2_USE_GUI_1)
-dnl ### begin block 1_COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0 ###
-    COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xOS2" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_OS2_USE_GUI_1_WXUNIV_0=""
-    fi
-    AC_SUBST(COND_TOOLKIT_OS2_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
@@ -382,6 +451,18 @@ dnl ### begin block 1_COND_UNICODE_1 ###
         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
@@ -424,6 +505,12 @@ dnl ### begin block 1_COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN ###
         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