X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e835546c7757b6c6c4f3fee7ca4dd6e3831ea715..ea787af19686a110bb83b23c9471b91db26190d1:/autoconf_inc.m4 diff --git a/autoconf_inc.m4 b/autoconf_inc.m4 index b5d38aaade..3a89613ee5 100644 --- a/autoconf_inc.m4 +++ b/autoconf_inc.m4 @@ -1,10 +1,3 @@ -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 @@ -20,7 +13,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 +139,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 +175,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 +229,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 +253,30 @@ 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_MAC_USE_GUI_1 ### + COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1="" + fi + AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1) +dnl ### begin block 1_COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 ### + COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="" + fi + AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0) +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 @@ -255,6 +289,12 @@ dnl ### begin block 1_COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 ### COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="" fi AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1) +dnl ### begin block 1_COND_PLATFORM_MACOS_1 ### + COND_PLATFORM_MACOS_1="#" + if test "x$PLATFORM_MACOS" = "x1" ; then + COND_PLATFORM_MACOS_1="" + fi + AC_SUBST(COND_PLATFORM_MACOS_1) dnl ### begin block 1_COND_PLATFORM_MAC_1 ### COND_PLATFORM_MAC_1="#" if test "x$PLATFORM_MAC" = "x1" ; then @@ -309,6 +349,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 +427,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 @@ -417,12 +487,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 @@ -471,12 +535,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 @@ -495,12 +553,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 @@ -597,6 +649,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 @@ -627,18 +685,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 +853,12 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 ### COND_MONOLITHIC_0_SHARED_0_USE_GUI_1="" fi AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1) +dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1 ### + COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_HTML" = "x1" ; then + COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1="" + fi + AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1) dnl ### begin block 20_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 @@ -813,6 +877,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 +895,12 @@ dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 ### COND_MONOLITHIC_0_SHARED_1_USE_GUI_1="" fi AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1) +dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1 ### + COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_HTML" = "x1" ; then + COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1="" + fi + AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1) dnl ### begin block 20_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 @@ -843,6 +919,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 +973,12 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_1 ### COND_PLATFORM_MACOSX_1="" fi AC_SUBST(COND_PLATFORM_MACOSX_1) +dnl ### begin block 20_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 20_COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA ### COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="#" if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xCOCOA" ; then @@ -909,6 +997,30 @@ 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_MAC_USE_GUI_1 ### + COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1="" + fi + AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1) +dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 ### + COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="" + fi + AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0) +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 @@ -921,6 +1033,12 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 ### COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="" fi AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1) +dnl ### begin block 20_COND_PLATFORM_MACOS_1 ### + COND_PLATFORM_MACOS_1="#" + if test "x$PLATFORM_MACOS" = "x1" ; then + COND_PLATFORM_MACOS_1="" + fi + AC_SUBST(COND_PLATFORM_MACOS_1) dnl ### begin block 20_COND_PLATFORM_MAC_1 ### COND_PLATFORM_MAC_1="#" if test "x$PLATFORM_MAC" = "x1" ; then @@ -1035,12 +1153,24 @@ dnl ### begin block 20_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 20_COND_TOOLKIT_ ### + COND_TOOLKIT_="#" + if test "x$TOOLKIT" = "x" ; then + COND_TOOLKIT_="" + fi + AC_SUBST(COND_TOOLKIT_) dnl ### begin block 20_COND_TOOLKIT_COCOA ### COND_TOOLKIT_COCOA="#" if test "x$TOOLKIT" = "xCOCOA" ; then COND_TOOLKIT_COCOA="" fi AC_SUBST(COND_TOOLKIT_COCOA) +dnl ### begin block 20_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 20_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 @@ -1083,6 +1213,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 @@ -1131,6 +1267,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 @@ -1149,6 +1291,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 @@ -1275,6 +1423,12 @@ dnl ### begin block 20_COND_USE_SOVERSOLARIS_1 ### COND_USE_SOVERSOLARIS_1="" fi AC_SUBST(COND_USE_SOVERSOLARIS_1) +dnl ### begin block 20_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 20_COND_WITH_PLUGIN_SDL_1 ### COND_WITH_PLUGIN_SDL_1="#" if test "x$WITH_PLUGIN_SDL" = "x1" ; then