X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef335a4fa83a83a23b2377b4da1c61c54ad830f9..b8387e0450b06ebda07d0c3680ae2e8aa5a7311e:/autoconf_inc.m4?ds=inline

diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index 7c4a8caf79..5f43c171d3 100644
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -1,3 +1,10 @@
+dnl This macro was generated by
+dnl Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+dnl Do not modify, all changes will be overwritten!
+
+
+dnl Conditions:
+
 dnl ### begin block 00_header ###
 dnl
 dnl This macro was generated by
@@ -139,6 +146,12 @@ dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1 ###
         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_0_USE_XRC_1 ###
+    COND_MONOLITHIC_0_SHARED_0_USE_XRC_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_XRC" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_0_USE_XRC_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_XRC_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
@@ -169,6 +182,12 @@ dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1 ###
         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_0_SHARED_1_USE_XRC_1 ###
+    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 1_COND_MONOLITHIC_0_USE_ODBC_1 ###
     COND_MONOLITHIC_0_USE_ODBC_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_ODBC" = "x1" ; then
@@ -217,6 +236,12 @@ dnl ### begin block 1_COND_PLATFORM_MACOSX_1 ###
         COND_PLATFORM_MACOSX_1=""
     fi
     AC_SUBST(COND_PLATFORM_MACOSX_1)
+dnl ### begin block 1_COND_PLATFORM_MACOSX_1_TOOLKIT_ ###
+    COND_PLATFORM_MACOSX_1_TOOLKIT_="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "x" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_=""
+    fi
+    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_)
 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
@@ -313,6 +338,24 @@ dnl ### begin block 1_COND_SHARED_0 ###
         COND_SHARED_0=""
     fi
     AC_SUBST(COND_SHARED_0)
+dnl ### begin block 1_COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0 ###
+    COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0="#"
+    if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xMAC" -a "x$WXUNIV" = "x0" ; then
+        COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0)
+dnl ### begin block 1_COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0 ###
+    COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0="#"
+    if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xMSW" -a "x$WXUNIV" = "x0" ; then
+        COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0)
+dnl ### begin block 1_COND_SHARED_0_TOOLKIT_PM_WXUNIV_0 ###
+    COND_SHARED_0_TOOLKIT_PM_WXUNIV_0="#"
+    if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xPM" -a "x$WXUNIV" = "x0" ; then
+        COND_SHARED_0_TOOLKIT_PM_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_SHARED_0_TOOLKIT_PM_WXUNIV_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
@@ -373,12 +416,24 @@ dnl ### begin block 1_COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 ###
         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_ ###
+    COND_TOOLKIT_="#"
+    if test "x$TOOLKIT" = "x" ; then
+        COND_TOOLKIT_=""
+    fi
+    AC_SUBST(COND_TOOLKIT_)
 dnl ### begin block 1_COND_TOOLKIT_COCOA ###
     COND_TOOLKIT_COCOA="#"
     if test "x$TOOLKIT" = "xCOCOA" ; then
         COND_TOOLKIT_COCOA=""
     fi
     AC_SUBST(COND_TOOLKIT_COCOA)
+dnl ### begin block 1_COND_TOOLKIT_COCOA_USE_GUI_1 ###
+    COND_TOOLKIT_COCOA_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_COCOA_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_TOOLKIT_COCOA_USE_GUI_1)
 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
@@ -421,12 +476,6 @@ dnl ### begin block 1_COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 ###
         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_MAC_WXUNIV_0 ###
-    COND_TOOLKIT_MAC_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xMAC" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_MAC_WXUNIV_0=""
-    fi
-    AC_SUBST(COND_TOOLKIT_MAC_WXUNIV_0)
 dnl ### begin block 1_COND_TOOLKIT_MGL ###
     COND_TOOLKIT_MGL="#"
     if test "x$TOOLKIT" = "xMGL" ; then
@@ -475,12 +524,6 @@ 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_MSW_WXUNIV_0 ###
-    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 1_COND_TOOLKIT_PM ###
     COND_TOOLKIT_PM="#"
     if test "x$TOOLKIT" = "xPM" ; then
@@ -499,12 +542,6 @@ dnl ### begin block 1_COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 ###
         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_PM_WXUNIV_0 ###
-    COND_TOOLKIT_PM_WXUNIV_0="#"
-    if test "x$TOOLKIT" = "xPM" -a "x$WXUNIV" = "x0" ; then
-        COND_TOOLKIT_PM_WXUNIV_0=""
-    fi
-    AC_SUBST(COND_TOOLKIT_PM_WXUNIV_0)
 dnl ### begin block 1_COND_TOOLKIT_WINCE ###
     COND_TOOLKIT_WINCE="#"
     if test "x$TOOLKIT" = "xWINCE" ; then
@@ -601,6 +638,12 @@ dnl ### begin block 1_COND_USE_ODBC_1 ###
         COND_USE_ODBC_1=""
     fi
     AC_SUBST(COND_USE_ODBC_1)
+dnl ### begin block 1_COND_USE_OPENGL_1 ###
+    COND_USE_OPENGL_1="#"
+    if test "x$USE_OPENGL" = "x1" ; then
+        COND_USE_OPENGL_1=""
+    fi
+    AC_SUBST(COND_USE_OPENGL_1)
 dnl ### begin block 1_COND_USE_PLUGINS_0 ###
     COND_USE_PLUGINS_0="#"
     if test "x$USE_PLUGINS" = "x0" ; then
@@ -631,18 +674,18 @@ dnl ### begin block 1_COND_USE_SOVERSOLARIS_1 ###
         COND_USE_SOVERSOLARIS_1=""
     fi
     AC_SUBST(COND_USE_SOVERSOLARIS_1)
+dnl ### begin block 1_COND_USE_XRC_1 ###
+    COND_USE_XRC_1="#"
+    if test "x$USE_XRC" = "x1" ; then
+        COND_USE_XRC_1=""
+    fi
+    AC_SUBST(COND_USE_XRC_1)
 dnl ### begin block 1_COND_WITH_PLUGIN_SDL_1 ###
     COND_WITH_PLUGIN_SDL_1="#"
     if test "x$WITH_PLUGIN_SDL" = "x1" ; then
         COND_WITH_PLUGIN_SDL_1=""
     fi
     AC_SUBST(COND_WITH_PLUGIN_SDL_1)
-dnl ### begin block 1_COND_WITH_SDL_1 ###
-    COND_WITH_SDL_1="#"
-    if test "x$WITH_SDL" = "x1" ; then
-        COND_WITH_SDL_1=""
-    fi
-    AC_SUBST(COND_WITH_SDL_1)
 dnl ### begin block 1_COND_WXUNIV_1 ###
     COND_WXUNIV_1="#"
     if test "x$WXUNIV" = "x1" ; then
@@ -817,6 +860,12 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1 ###
         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_XRC_1 ###
+    COND_MONOLITHIC_0_SHARED_0_USE_XRC_1="#"
+    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_XRC" = "x1" ; then
+        COND_MONOLITHIC_0_SHARED_0_USE_XRC_1=""
+    fi
+    AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_XRC_1)
 dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1 ###
     COND_MONOLITHIC_0_SHARED_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" ; then
@@ -847,6 +896,12 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1 ###
         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_XRC_1 ###
+    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 ###
     COND_MONOLITHIC_0_USE_ODBC_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$USE_ODBC" = "x1" ; then
@@ -1099,6 +1154,12 @@ dnl ### begin block 20_COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 ###
         COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0=""
     fi
     AC_SUBST(COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0)
+dnl ### begin block 20_COND_TOOLKIT_MAC_WXUNIV_0 ###
+    COND_TOOLKIT_MAC_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xMAC" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_MAC_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_TOOLKIT_MAC_WXUNIV_0)
 dnl ### begin block 20_COND_TOOLKIT_MGL ###
     COND_TOOLKIT_MGL="#"
     if test "x$TOOLKIT" = "xMGL" ; then
@@ -1147,6 +1208,12 @@ dnl ### begin block 20_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 20_COND_TOOLKIT_MSW_WXUNIV_0 ###
+    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 ###
     COND_TOOLKIT_PM="#"
     if test "x$TOOLKIT" = "xPM" ; then
@@ -1165,6 +1232,12 @@ dnl ### begin block 20_COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 ###
         COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0=""
     fi
     AC_SUBST(COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0)
+dnl ### begin block 20_COND_TOOLKIT_PM_WXUNIV_0 ###
+    COND_TOOLKIT_PM_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xPM" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_PM_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_TOOLKIT_PM_WXUNIV_0)
 dnl ### begin block 20_COND_TOOLKIT_WINCE ###
     COND_TOOLKIT_WINCE="#"
     if test "x$TOOLKIT" = "xWINCE" ; then