X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c4839ccf58de31e405cba8835f81191c28d415f8..42ef83fa71e14e4fcbb537dd0da7bd9ef9701f49:/autoconf_inc.m4 diff --git a/autoconf_inc.m4 b/autoconf_inc.m4 index c4bc0adedf..9b24276e87 100644 --- a/autoconf_inc.m4 +++ b/autoconf_inc.m4 @@ -243,6 +243,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 @@ -417,6 +429,12 @@ 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 @@ -465,6 +483,12 @@ 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 @@ -483,6 +507,12 @@ 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