X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2add9e3c2f07bdb9234fbf3b84dda6b04d5ed598..b70362998b8f562923f6ed6708f06537ac056cd4:/autoconf_inc.m4

diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index 472a20f187..5117d82cf4 100644
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -1,10 +1,10 @@
 dnl ### begin block 00_header[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/propgrid/propgrid.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/propgrid/propgridsample.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/animate/anitest.bkl,../../samples/artprov/artprov.bkl,../../samples/aui/auidemo.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/collpane/collpane.bkl,../../samples/combo/combo.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/dataview/dataview.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/mobile_samples.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/power/power.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/richtext/richtext.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
 dnl
 dnl This macro was generated by
-dnl Bakefile 0.2.0 (http://bakefile.sourceforge.net)
+dnl Bakefile 0.2.1 (http://bakefile.sourceforge.net)
 dnl Do not modify, all changes will be overwritten!
 
-BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.0"
+BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.1"
 
 dnl ### begin block 10_AC_BAKEFILE_PRECOMP_HEADERS[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/propgrid/propgrid.bkl,../../contrib/build/svg/svg.bkl,../../tests/test.bkl,wx.bkl] ###
 AC_BAKEFILE_PRECOMP_HEADERS
@@ -320,12 +320,6 @@ dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1[wx.bkl] ###
         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[wx.bkl] ###
-    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[wx.bkl] ###
     COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF="#"
     if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMOTIF" ; then
@@ -392,6 +386,18 @@ dnl ### begin block 20_COND_PLATFORM_UNIX_1[../../contrib/build/animate/animate.
         COND_PLATFORM_UNIX_1=""
     fi
     AC_SUBST(COND_PLATFORM_UNIX_1)
+dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_MGL[wx.bkl] ###
+    COND_PLATFORM_UNIX_1_TOOLKIT_MGL="#"
+    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xMGL" ; then
+        COND_PLATFORM_UNIX_1_TOOLKIT_MGL=""
+    fi
+    AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_MGL)
+dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1[wx.bkl] ###
+    COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1="#"
+    if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then
+        COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1=""
+    fi
+    AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1)
 dnl ### begin block 20_COND_PLATFORM_UNIX_1_USE_GUI_1[wx.bkl] ###
     COND_PLATFORM_UNIX_1_USE_GUI_1="#"
     if test "x$PLATFORM_UNIX" = "x1" -a "x$USE_GUI" = "x1" ; then