fixed GetModuleHandleExA() call after last fix

[wxWidgets.git] / autoconf_inc.m4

diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index 1e7be34afa2cbdc8c718e0f19f9c515644e1feaf..6872c14927d6efeb39dc55e3152360500d73133c 100644 (file)
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -1,7 +1,11 @@
+dnl ### begin block 00_header ###
+dnl
 dnl This macro was generated by
-dnl Bakefile 0.1.3 (http://bakefile.sourceforge.net)
+dnl Bakefile 0.1.4 (http://bakefile.sourceforge.net)
 dnl Do not modify, all changes will be overwritten!
 
+BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.4"
+
 dnl ### begin block 0_AC_BAKEFILE_PRECOMP_HEADERS ###
 AC_BAKEFILE_PRECOMP_HEADERS
 
@@ -115,24 +119,30 @@ dnl ### begin block 1_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 1_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 1_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
         COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1)
-dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 ###
-    COND_MONOLITHIC_0_SHARED_0_USE_HTML_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_HTML" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_0_USE_HTML_1=""
-    fi
-    AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_HTML_1)
 dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1 ###
     COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_ODBC" = "x1" ; then
         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
@@ -145,24 +155,30 @@ dnl ### begin block 1_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 1_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 1_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
         COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1=""
     fi
     AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1)
-dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 ###
-    COND_MONOLITHIC_0_SHARED_1_USE_HTML_1="#"
-    if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_HTML" = "x1" ; then
-        COND_MONOLITHIC_0_SHARED_1_USE_HTML_1=""
-    fi
-    AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_HTML_1)
 dnl ### begin block 1_COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1 ###
     COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1="#"
     if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_ODBC" = "x1" ; then
         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
@@ -211,6 +227,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
@@ -229,6 +251,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
@@ -241,6 +287,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
@@ -295,6 +347,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
@@ -355,12 +425,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
@@ -469,6 +551,24 @@ 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_WINCE ###
+    COND_TOOLKIT_WINCE="#"
+    if test "x$TOOLKIT" = "xWINCE" ; then
+        COND_TOOLKIT_WINCE=""
+    fi
+    AC_SUBST(COND_TOOLKIT_WINCE)
+dnl ### begin block 1_COND_TOOLKIT_WINCE_USE_GUI_1 ###
+    COND_TOOLKIT_WINCE_USE_GUI_1="#"
+    if test "x$TOOLKIT" = "xWINCE" -a "x$USE_GUI" = "x1" ; then
+        COND_TOOLKIT_WINCE_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_TOOLKIT_WINCE_USE_GUI_1)
+dnl ### begin block 1_COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0 ###
+    COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0="#"
+    if test "x$TOOLKIT" = "xWINCE" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+        COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0=""
+    fi
+    AC_SUBST(COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0)
 dnl ### begin block 1_COND_TOOLKIT_X11 ###
     COND_TOOLKIT_X11="#"
     if test "x$TOOLKIT" = "xX11" ; then
@@ -547,6 +647,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
@@ -577,18 +683,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