Get shorter code with new wxRect constructor.

[wxWidgets.git] / autoconf_inc.m4

diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index 86b3889b9f47934061f01c08e54631acd7b91295..4d32b3c10f7ac416a6a007a7611cdabce080ee30 100644 (file)
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -236,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
@@ -278,6 +284,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
@@ -410,12 +422,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
@@ -620,6 +644,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
@@ -650,6 +680,12 @@ 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