X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c4839ccf58de31e405cba8835f81191c28d415f8..ae6c0ccf2625873446fd4fcfa2c447666a38b3be:/autoconf_inc.m4

diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index c4bc0adedf..5f43c171d3 100644
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -20,7 +20,6 @@ dnl Conditions:
 
 dnl ### begin block 10_AC_BAKEFILE_PRECOMP_HEADERS ###
 AC_BAKEFILE_PRECOMP_HEADERS
-
 dnl ### begin block 1_COND_BUILD_DEBUG ###
     COND_BUILD_DEBUG="#"
     if test "x$BUILD" = "xdebug" ; then
@@ -147,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
@@ -177,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
@@ -225,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
@@ -243,6 +260,18 @@ 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_TOOLKIT_MOTIF ###
+    COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMOTIF" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF=""
+    fi
+    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF)
+dnl ### begin block 1_COND_PLATFORM_MACOSX_1_TOOLKIT_X11 ###
+    COND_PLATFORM_MACOSX_1_TOOLKIT_X11="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xX11" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_X11=""
+    fi
+    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_X11)
 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
@@ -309,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
@@ -369,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
@@ -579,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
@@ -609,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
@@ -795,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
@@ -825,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
@@ -891,6 +968,18 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_MAC ###
         COND_PLATFORM_MACOSX_1_TOOLKIT_MAC=""
     fi
     AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_MAC)
+dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF ###
+    COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMOTIF" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF=""
+    fi
+    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF)
+dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_X11 ###
+    COND_PLATFORM_MACOSX_1_TOOLKIT_X11="#"
+    if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xX11" ; then
+        COND_PLATFORM_MACOSX_1_TOOLKIT_X11=""
+    fi
+    AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_X11)
 dnl ### begin block 20_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
@@ -1065,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
@@ -1113,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
@@ -1131,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