restored wxBuildOptions class, for backward compatibility with wx-2.4

[wxWidgets.git] / autoconf_inc.m4

diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index b56c782e4c0566843cd7af9246890ee9885c6680..f1dd45b9fce48c306c8269ebf3fdc89dc75eedef 100644 (file)
--- 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
@@ -238,6 +247,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