X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe0895cf82381b91113de34a32b0bcf9bdef98a7..a3b83a5137b3541ff70d73fef492ac1d0a6e93d9:/samples/autoconf_inc.m4

diff --git a/samples/autoconf_inc.m4 b/samples/autoconf_inc.m4
index 9a38a28e68..17a05b3285 100644
--- a/samples/autoconf_inc.m4
+++ b/samples/autoconf_inc.m4
@@ -4,111 +4,27 @@ dnl Do not modify, all changes will be overwritten!
 
     dnl Conditions:
 
-dnl ### begin block COND_PLATFORM_WIN321 ###
-    COND_PLATFORM_WIN321="#"
+dnl ### begin block COND_PLATFORM_WIN32_1 ###
+    COND_PLATFORM_WIN32_1="#"
     if test "x$PLATFORM_WIN32" = "x1" ; then
-        COND_PLATFORM_WIN321=
+        COND_PLATFORM_WIN32_1=
     fi
-    AC_SUBST(COND_PLATFORM_WIN321)
-dnl ### begin block COND_PLATFORM_WIN320 ###
-    COND_PLATFORM_WIN320="#"
+    AC_SUBST(COND_PLATFORM_WIN32_1)
+dnl ### begin block COND_PLATFORM_WIN32_0 ###
+    COND_PLATFORM_WIN32_0="#"
     if test "x$PLATFORM_WIN32" = "x0" ; then
-        COND_PLATFORM_WIN320=
+        COND_PLATFORM_WIN32_0=
     fi
-    AC_SUBST(COND_PLATFORM_WIN320)
-dnl ### begin block COND_DEPS_TYPEGCC ###
-    COND_DEPS_TYPEGCC="#"
-    if test "x$DEPS_TYPE" = "xgcc" ; then
-        COND_DEPS_TYPEGCC=
-    fi
-    AC_SUBST(COND_DEPS_TYPEGCC)
-dnl ### begin block COND_WXUSE_ZLIBBUILTIN ###
-    COND_WXUSE_ZLIBBUILTIN="#"
-    if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
-        COND_WXUSE_ZLIBBUILTIN=
-    fi
-    AC_SUBST(COND_WXUSE_ZLIBBUILTIN)
-dnl ### begin block COND_UNICODE1 ###
-    COND_UNICODE1="#"
-    if test "x$UNICODE" = "x1" ; then
-        COND_UNICODE1=
-    fi
-    AC_SUBST(COND_UNICODE1)
-dnl ### begin block COND_BUILDDEBUG ###
-    COND_BUILDDEBUG="#"
-    if test "x$BUILD" = "xdebug" ; then
-        COND_BUILDDEBUG=
-    fi
-    AC_SUBST(COND_BUILDDEBUG)
-dnl ### begin block COND_WXUSE_LIBJPEGBUILTIN ###
-    COND_WXUSE_LIBJPEGBUILTIN="#"
-    if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
-        COND_WXUSE_LIBJPEGBUILTIN=
-    fi
-    AC_SUBST(COND_WXUSE_LIBJPEGBUILTIN)
-dnl ### begin block COND_WXUSE_ODBCBUILTIN ###
-    COND_WXUSE_ODBCBUILTIN="#"
-    if test "x$wxUSE_ODBC" = "xbuiltin" ; then
-        COND_WXUSE_ODBCBUILTIN=
-    fi
-    AC_SUBST(COND_WXUSE_ODBCBUILTIN)
-dnl ### begin block COND_WXUSE_LIBPNGBUILTIN ###
-    COND_WXUSE_LIBPNGBUILTIN="#"
-    if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
-        COND_WXUSE_LIBPNGBUILTIN=
-    fi
-    AC_SUBST(COND_WXUSE_LIBPNGBUILTIN)
-dnl ### begin block COND_MONOLITHIC0 ###
-    COND_MONOLITHIC0="#"
-    if test "x$MONOLITHIC" = "x0" ; then
-        COND_MONOLITHIC0=
-    fi
-    AC_SUBST(COND_MONOLITHIC0)
-dnl ### begin block COND_WXUNIV1 ###
-    COND_WXUNIV1="#"
-    if test "x$WXUNIV" = "x1" ; then
-        COND_WXUNIV1=
-    fi
-    AC_SUBST(COND_WXUNIV1)
-dnl ### begin block COND_PLATFORM_MAC1 ###
-    COND_PLATFORM_MAC1="#"
-    if test "x$PLATFORM_MAC" = "x1" ; then
-        COND_PLATFORM_MAC1=
-    fi
-    AC_SUBST(COND_PLATFORM_MAC1)
-dnl ### begin block COND_TOOLKITMAC ###
-    COND_TOOLKITMAC="#"
-    if test "x$TOOLKIT" = "xMAC" ; then
-        COND_TOOLKITMAC=
-    fi
-    AC_SUBST(COND_TOOLKITMAC)
-dnl ### begin block COND_MONOLITHIC1 ###
-    COND_MONOLITHIC1="#"
-    if test "x$MONOLITHIC" = "x1" ; then
-        COND_MONOLITHIC1=
-    fi
-    AC_SUBST(COND_MONOLITHIC1)
-dnl ### begin block COND_WXUSE_LIBTIFFBUILTIN ###
-    COND_WXUSE_LIBTIFFBUILTIN="#"
-    if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
-        COND_WXUSE_LIBTIFFBUILTIN=
-    fi
-    AC_SUBST(COND_WXUSE_LIBTIFFBUILTIN)
-dnl ### begin block COND_USE_GUI0 ###
-    COND_USE_GUI0="#"
+    AC_SUBST(COND_PLATFORM_WIN32_0)
+dnl ### begin block COND_USE_GUI_0 ###
+    COND_USE_GUI_0="#"
     if test "x$USE_GUI" = "x0" ; then
-        COND_USE_GUI0=
+        COND_USE_GUI_0=
     fi
-    AC_SUBST(COND_USE_GUI0)
-dnl ### begin block COND_USE_GUI1 ###
-    COND_USE_GUI1="#"
-    if test "x$USE_GUI" = "x1" ; then
-        COND_USE_GUI1=
-    fi
-    AC_SUBST(COND_USE_GUI1)
-dnl ### begin block COND_WXUSE_REGEXBUILTIN ###
-    COND_WXUSE_REGEXBUILTIN="#"
-    if test "x$wxUSE_REGEX" = "xbuiltin" ; then
-        COND_WXUSE_REGEXBUILTIN=
+    AC_SUBST(COND_USE_GUI_0)
+dnl ### begin block COND_DEPS_TYPE_GCC ###
+    COND_DEPS_TYPE_GCC="#"
+    if test "x$DEPS_TYPE" = "xgcc" ; then
+        COND_DEPS_TYPE_GCC=
     fi
-    AC_SUBST(COND_WXUSE_REGEXBUILTIN)
+    AC_SUBST(COND_DEPS_TYPE_GCC)