Moved wxStandardPathsCF into base library when using CarbonLib or Darwin.

Make wxStandardPathsBase::Get() return a wxStandardPathsBase reference.
Implement it using wxAppTraits::GetStandardPaths() which is overridden by
wxMac and wxCocoa GUI libraries to return a reference to a wxStandardPathsCF.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index 99e4486359c881b2a95562ab8a53a3bd66f27c18..0122ff3c4de580b64a2b6d059ecf0687afa4219f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1232,9 +1232,11 @@ COND_TOOLKIT_COCOA_BASE_PLATFORM_HDR =  \
        wx/unix/pipe.h \
        wx/unix/stdpaths.h
 @COND_TOOLKIT_COCOA@BASE_PLATFORM_HDR = $(COND_TOOLKIT_COCOA_BASE_PLATFORM_HDR)
-@COND_TOOLKIT_MAC@BASE_PLATFORM_HDR = \
-@COND_TOOLKIT_MAC@     wx/mac/corefoundation/cfstring.h \
-@COND_TOOLKIT_MAC@     wx/mac/corefoundation/stdpaths.h
+COND_TOOLKIT_MAC_BASE_PLATFORM_HDR =  \
+       wx/mac/corefoundation/cfstring.h \
+       wx/mac/corefoundation/stdpaths.h \
+       wx/unix/stdpaths.h
+@COND_TOOLKIT_MAC@BASE_PLATFORM_HDR = $(COND_TOOLKIT_MAC_BASE_PLATFORM_HDR)
 @COND_PLATFORM_MACOSX_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h
 @COND_PLATFORM_MACOS_1@NET_PLATFORM_HDR = wx/mac/carbon/gsockmac.h
 @COND_PLATFORM_OS2_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h
@@ -1430,9 +1432,7 @@ COND_TOOLKIT_COCOA_GUI_HDR =  \
        wx/generic/paletteg.h \
        wx/generic/region.h \
        wx/generic/statusbr.h \
-       wx/generic/tabg.h \
-       wx/mac/corefoundation/cfstring.h \
-       wx/mac/corefoundation/stdpaths.h
+       wx/generic/tabg.h
 @COND_TOOLKIT_COCOA@GUI_HDR = $(COND_TOOLKIT_COCOA_GUI_HDR)
 COND_TOOLKIT_GTK_GUI_HDR =  \
        wx/generic/colrdlgg.h \
@@ -2486,7 +2486,9 @@ COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS =  \
        monodll_mimetype.o \
        monodll_snglinst.o \
        monodll_stdpaths.o \
-       monodll_threadpsx.o
+       monodll_threadpsx.o \
+       monodll_cfstring.o \
+       monodll_stdpaths_cf.o
 @COND_TOOLKIT_@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS)
 COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_baseunix.o \
@@ -2494,7 +2496,9 @@ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_mimetype.o \
        monodll_snglinst.o \
        monodll_stdpaths.o \
-       monodll_threadpsx.o
+       monodll_threadpsx.o \
+       monodll_cfstring.o \
+       monodll_stdpaths_cf.o
 @COND_TOOLKIT_COCOA@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS)
 COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_baseunix.o \
@@ -2502,7 +2506,9 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_mimetype.o \
        monodll_snglinst.o \
        monodll_stdpaths.o \
-       monodll_threadpsx.o
+       monodll_threadpsx.o \
+       monodll_cfstring.o \
+       monodll_stdpaths_cf.o
 @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS)
 COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_dirmac.o \
@@ -2513,7 +2519,8 @@ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_MoreFilesX.o \
        monodll_cfstring.o \
        monodll_stdpaths_cf.o \
-       monodll_baseunix.o
+       monodll_baseunix.o \
+       monodll_stdpaths.o
 @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS)
 COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_baseunix.o \
@@ -2521,7 +2528,9 @@ COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_mimetype.o \
        monodll_snglinst.o \
        monodll_stdpaths.o \
-       monodll_threadpsx.o
+       monodll_threadpsx.o \
+       monodll_cfstring.o \
+       monodll_stdpaths_cf.o
 @COND_TOOLKIT_MOTIF@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS)
 COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_baseunix.o \
@@ -2529,7 +2538,9 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS =  \
        monodll_mimetype.o \
        monodll_snglinst.o \
        monodll_stdpaths.o \
-       monodll_threadpsx.o
+       monodll_threadpsx.o \
+       monodll_cfstring.o \
+       monodll_stdpaths_cf.o
 @COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS)
 @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS \
 @COND_PLATFORM_MACOSX_1@       = monodll_utilsunx.o
@@ -2728,7 +2739,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
        monodll_vscroll.o
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS)
 COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
-       $(__LOWLEVEL_SRC_OBJECTS) \
+       $(__LOWLEVEL_SRC_OBJECTS_1) \
        monodll_accel.o \
        monodll_colrdlgg.o \
        monodll_dirdlgg.o \
@@ -2875,6 +2886,227 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
        monodll_vlbox.o \
        monodll_vscroll.o
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS)
+@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS = \
+@COND_TOOLKIT_COCOA@   monodll_gsockosx.o monodll_utilsexc_cf.o
+COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS =  \
+       monodll_caret.o \
+       monodll_dialup.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_utilsx11.o \
+       monodll_displayx11.o \
+       monodll_paletteg.o \
+       monodll_app.o \
+       monodll_bitmap.o \
+       monodll_brush.o \
+       monodll_clipbrd.o \
+       monodll_colour.o \
+       monodll_cursor.o \
+       monodll_data.o \
+       monodll_dataobj.o \
+       monodll_dc.o \
+       monodll_dcclient.o \
+       monodll_dcmemory.o \
+       monodll_dcscreen.o \
+       monodll_dnd.o \
+       monodll_evtloop.o \
+       monodll_font.o \
+       monodll_gdiobj.o \
+       monodll_gsockgtk.o \
+       monodll_icon.o \
+       monodll_main.o \
+       monodll_minifram.o \
+       monodll_pen.o \
+       monodll_popupwin.o \
+       monodll_region.o \
+       monodll_renderer.o \
+       monodll_settings.o \
+       monodll_timer.o \
+       monodll_tooltip.o \
+       monodll_toplevel.o \
+       monodll_utilsgtk.o \
+       monodll_win_gtk.o \
+       monodll_window.o
+@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS)
+@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS = $(__MAC_LOWLEVEL_SRC_OBJECTS)
+COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS =  \
+       monodll_caret.o \
+       monodll_timer.o \
+       monodll_app.o \
+       monodll_bitmap.o \
+       monodll_brush.o \
+       monodll_clipbrd.o \
+       monodll_colour.o \
+       monodll_cursor.o \
+       monodll_data.o \
+       monodll_dc.o \
+       monodll_dcclient.o \
+       monodll_dcmemory.o \
+       monodll_dcscreen.o \
+       monodll_dirmgl.o \
+       monodll_evtloop.o \
+       monodll_font.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_gdiobj.o \
+       monodll_icon.o \
+       monodll_palette.o \
+       monodll_pen.o \
+       monodll_region.o \
+       monodll_settings.o \
+       monodll_toplevel.o \
+       monodll_utils.o \
+       monodll_window.o
+@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS)
+COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS =  \
+       monodll_caret.o \
+       monodll_dialup.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_utilsx11.o \
+       monodll_displayx11.o \
+       monodll_bitmap.o \
+       monodll_brush.o \
+       monodll_pen.o \
+       monodll_region.o \
+       monodll_utilsx.o
+@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS)
+COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS =  \
+       monodll_app.o \
+       monodll_bitmap.o \
+       monodll_brush.o \
+       monodll_caret.o \
+       monodll_clipbrd.o \
+       monodll_colour.o \
+       monodll_cursor.o \
+       monodll_data.o \
+       monodll_dc.o \
+       monodll_dcclient.o \
+       monodll_dcmemory.o \
+       monodll_dcprint.o \
+       monodll_dcscreen.o \
+       monodll_dialup.o \
+       monodll_dib.o \
+       monodll_display.o \
+       monodll_enhmeta.o \
+       monodll_evtloop.o \
+       monodll_font.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_gdiimage.o \
+       monodll_gdiobj.o \
+       monodll_gsockmsw.o \
+       monodll_icon.o \
+       monodll_minifram.o \
+       monodll_dataobj.o \
+       monodll_dropsrc.o \
+       monodll_droptgt.o \
+       monodll_oleutils.o \
+       monodll_palette.o \
+       monodll_pen.o \
+       monodll_popupwin.o \
+       monodll_printdlg.o \
+       monodll_printwin.o \
+       monodll_region.o \
+       monodll_renderer.o \
+       monodll_settings.o \
+       monodll_timer.o \
+       monodll_tooltip.o \
+       monodll_toplevel.o \
+       monodll_utilsgui.o \
+       monodll_uxtheme.o \
+       monodll_window.o \
+       monodll_helpchm.o \
+       monodll_helpwin.o \
+       monodll_automtn.o \
+       monodll_uuid.o
+@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS)
+@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS = 
+COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS =  \
+       monodll_app.o \
+       monodll_bitmap.o \
+       monodll_brush.o \
+       monodll_caret.o \
+       monodll_clipbrd.o \
+       monodll_colour.o \
+       monodll_cursor.o \
+       monodll_data.o \
+       monodll_dc.o \
+       monodll_dcclient.o \
+       monodll_dcmemory.o \
+       monodll_dcprint.o \
+       monodll_dcscreen.o \
+       monodll_dialup.o \
+       monodll_dib.o \
+       monodll_display.o \
+       monodll_enhmeta.o \
+       monodll_evtloop.o \
+       monodll_font.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_gdiimage.o \
+       monodll_gdiobj.o \
+       monodll_gsockmsw.o \
+       monodll_icon.o \
+       monodll_minifram.o \
+       monodll_dataobj.o \
+       monodll_dropsrc.o \
+       monodll_droptgt.o \
+       monodll_oleutils.o \
+       monodll_palette.o \
+       monodll_pen.o \
+       monodll_popupwin.o \
+       monodll_printdlg.o \
+       monodll_printwin.o \
+       monodll_region.o \
+       monodll_renderer.o \
+       monodll_settings.o \
+       monodll_timer.o \
+       monodll_tooltip.o \
+       monodll_toplevel.o \
+       monodll_utilsgui.o \
+       monodll_uxtheme.o \
+       monodll_window.o
+@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS)
+COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS =  \
+       monodll_caret.o \
+       monodll_dialup.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_utilsx11.o \
+       monodll_displayx11.o \
+       monodll_timer.o \
+       monodll_app.o \
+       monodll_bitmap.o \
+       monodll_brush.o \
+       monodll_clipbrd.o \
+       monodll_colour.o \
+       monodll_cursor.o \
+       monodll_data.o \
+       monodll_dataobj.o \
+       monodll_dc.o \
+       monodll_dcclient.o \
+       monodll_dcmemory.o \
+       monodll_dcscreen.o \
+       monodll_evtloop.o \
+       monodll_font.o \
+       monodll_gdiobj.o \
+       monodll_gsockx11.o \
+       monodll_icon.o \
+       monodll_main.o \
+       monodll_minifram.o \
+       monodll_nanox.o \
+       monodll_palette.o \
+       monodll_pen.o \
+       monodll_popupwin.o \
+       monodll_region.o \
+       monodll_reparent.o \
+       monodll_settings.o \
+       monodll_toplevel.o \
+       monodll_utils.o \
+       monodll_utilsx.o \
+       monodll_window.o
+@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS)
 COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS =  \
        monodll_NSBox.o \
        monodll_NSButton.o \
@@ -2962,11 +3194,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS =  \
        monodll_regiong.o \
        monodll_statusbr.o \
        monodll_tabg.o \
-       monodll_timer.o \
-       monodll_cfstring.o \
-       monodll_gsockosx.o \
-       monodll_stdpaths_cf.o \
-       monodll_utilsexc_cf.o
+       monodll_timer.o
 @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS)
 COND_TOOLKIT_GTK___GUI_SRC_OBJECTS =  \
        monodll_accel.o \
@@ -3097,9 +3325,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS =  \
        monodll_statusbr.o \
        monodll_tabg.o \
        monodll_snglinst.o \
-       monodll_webkit.o \
-       monodll_gsockosx.o \
-       monodll_utilsexc_cf.o
+       monodll_webkit.o
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS)
 COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS =  \
        monodll_accel.o \
@@ -3358,25 +3584,246 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS =  \
        monodll_tbarwce.o \
        monodll_textctrlce.o
 @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS)
-@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS = \
-@COND_TOOLKIT_COCOA@   monodll_taskbar.o monodll_taskbarcmn.o
-COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS =  \
-       monodll_taskbarcmn.o \
-       monodll_joystick.o \
-       monodll_sound.o \
-       monodll_taskbarx11.o \
-       monodll_taskbar.o \
-       monodll_eggtrayicon.o
-@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS)
-COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS =  \
-       monodll_taskbarcmn.o \
-       monodll_drawer.o \
-       monodll_joystick.o \
-       monodll_sound.o \
-       monodll_taskbar.o
-@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS)
-COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS =  \
-       monodll_taskbarcmn.o \
+@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_1 = \
+@COND_TOOLKIT_COCOA@   monodll_gsockosx.o monodll_utilsexc_cf.o
+COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_1 =  \
+       monodll_caret.o \
+       monodll_dialup.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_utilsx11.o \
+       monodll_displayx11.o \
+       monodll_paletteg.o \
+       monodll_app.o \
+       monodll_bitmap.o \
+       monodll_brush.o \
+       monodll_clipbrd.o \
+       monodll_colour.o \
+       monodll_cursor.o \
+       monodll_data.o \
+       monodll_dataobj.o \
+       monodll_dc.o \
+       monodll_dcclient.o \
+       monodll_dcmemory.o \
+       monodll_dcscreen.o \
+       monodll_dnd.o \
+       monodll_evtloop.o \
+       monodll_font.o \
+       monodll_gdiobj.o \
+       monodll_gsockgtk.o \
+       monodll_icon.o \
+       monodll_main.o \
+       monodll_minifram.o \
+       monodll_pen.o \
+       monodll_popupwin.o \
+       monodll_region.o \
+       monodll_renderer.o \
+       monodll_settings.o \
+       monodll_timer.o \
+       monodll_tooltip.o \
+       monodll_toplevel.o \
+       monodll_utilsgtk.o \
+       monodll_win_gtk.o \
+       monodll_window.o
+@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_1)
+@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_1 = $(__MAC_LOWLEVEL_SRC_OBJECTS)
+COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_1 =  \
+       monodll_caret.o \
+       monodll_timer.o \
+       monodll_app.o \
+       monodll_bitmap.o \
+       monodll_brush.o \
+       monodll_clipbrd.o \
+       monodll_colour.o \
+       monodll_cursor.o \
+       monodll_data.o \
+       monodll_dc.o \
+       monodll_dcclient.o \
+       monodll_dcmemory.o \
+       monodll_dcscreen.o \
+       monodll_dirmgl.o \
+       monodll_evtloop.o \
+       monodll_font.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_gdiobj.o \
+       monodll_icon.o \
+       monodll_palette.o \
+       monodll_pen.o \
+       monodll_region.o \
+       monodll_settings.o \
+       monodll_toplevel.o \
+       monodll_utils.o \
+       monodll_window.o
+@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_1)
+COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_1 =  \
+       monodll_caret.o \
+       monodll_dialup.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_utilsx11.o \
+       monodll_displayx11.o \
+       monodll_bitmap.o \
+       monodll_brush.o \
+       monodll_pen.o \
+       monodll_region.o \
+       monodll_utilsx.o
+@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_1)
+COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 =  \
+       monodll_app.o \
+       monodll_bitmap.o \
+       monodll_brush.o \
+       monodll_caret.o \
+       monodll_clipbrd.o \
+       monodll_colour.o \
+       monodll_cursor.o \
+       monodll_data.o \
+       monodll_dc.o \
+       monodll_dcclient.o \
+       monodll_dcmemory.o \
+       monodll_dcprint.o \
+       monodll_dcscreen.o \
+       monodll_dialup.o \
+       monodll_dib.o \
+       monodll_display.o \
+       monodll_enhmeta.o \
+       monodll_evtloop.o \
+       monodll_font.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_gdiimage.o \
+       monodll_gdiobj.o \
+       monodll_gsockmsw.o \
+       monodll_icon.o \
+       monodll_minifram.o \
+       monodll_dataobj.o \
+       monodll_dropsrc.o \
+       monodll_droptgt.o \
+       monodll_oleutils.o \
+       monodll_palette.o \
+       monodll_pen.o \
+       monodll_popupwin.o \
+       monodll_printdlg.o \
+       monodll_printwin.o \
+       monodll_region.o \
+       monodll_renderer.o \
+       monodll_settings.o \
+       monodll_timer.o \
+       monodll_tooltip.o \
+       monodll_toplevel.o \
+       monodll_utilsgui.o \
+       monodll_uxtheme.o \
+       monodll_window.o \
+       monodll_helpchm.o \
+       monodll_helpwin.o \
+       monodll_automtn.o \
+       monodll_uuid.o
+@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1)
+@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_1 = 
+COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_1 =  \
+       monodll_app.o \
+       monodll_bitmap.o \
+       monodll_brush.o \
+       monodll_caret.o \
+       monodll_clipbrd.o \
+       monodll_colour.o \
+       monodll_cursor.o \
+       monodll_data.o \
+       monodll_dc.o \
+       monodll_dcclient.o \
+       monodll_dcmemory.o \
+       monodll_dcprint.o \
+       monodll_dcscreen.o \
+       monodll_dialup.o \
+       monodll_dib.o \
+       monodll_display.o \
+       monodll_enhmeta.o \
+       monodll_evtloop.o \
+       monodll_font.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_gdiimage.o \
+       monodll_gdiobj.o \
+       monodll_gsockmsw.o \
+       monodll_icon.o \
+       monodll_minifram.o \
+       monodll_dataobj.o \
+       monodll_dropsrc.o \
+       monodll_droptgt.o \
+       monodll_oleutils.o \
+       monodll_palette.o \
+       monodll_pen.o \
+       monodll_popupwin.o \
+       monodll_printdlg.o \
+       monodll_printwin.o \
+       monodll_region.o \
+       monodll_renderer.o \
+       monodll_settings.o \
+       monodll_timer.o \
+       monodll_tooltip.o \
+       monodll_toplevel.o \
+       monodll_utilsgui.o \
+       monodll_uxtheme.o \
+       monodll_window.o
+@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_1)
+COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 =  \
+       monodll_caret.o \
+       monodll_dialup.o \
+       monodll_fontenum.o \
+       monodll_fontutil.o \
+       monodll_utilsx11.o \
+       monodll_displayx11.o \
+       monodll_timer.o \
+       monodll_app.o \
+       monodll_bitmap.o \
+       monodll_brush.o \
+       monodll_clipbrd.o \
+       monodll_colour.o \
+       monodll_cursor.o \
+       monodll_data.o \
+       monodll_dataobj.o \
+       monodll_dc.o \
+       monodll_dcclient.o \
+       monodll_dcmemory.o \
+       monodll_dcscreen.o \
+       monodll_evtloop.o \
+       monodll_font.o \
+       monodll_gdiobj.o \
+       monodll_gsockx11.o \
+       monodll_icon.o \
+       monodll_main.o \
+       monodll_minifram.o \
+       monodll_nanox.o \
+       monodll_palette.o \
+       monodll_pen.o \
+       monodll_popupwin.o \
+       monodll_region.o \
+       monodll_reparent.o \
+       monodll_settings.o \
+       monodll_toplevel.o \
+       monodll_utils.o \
+       monodll_utilsx.o \
+       monodll_window.o
+@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_1 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1)
+@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS = \
+@COND_TOOLKIT_COCOA@   monodll_taskbar.o monodll_taskbarcmn.o
+COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS =  \
+       monodll_taskbarcmn.o \
+       monodll_joystick.o \
+       monodll_sound.o \
+       monodll_taskbarx11.o \
+       monodll_taskbar.o \
+       monodll_eggtrayicon.o
+@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS)
+COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS =  \
+       monodll_taskbarcmn.o \
+       monodll_drawer.o \
+       monodll_joystick.o \
+       monodll_sound.o \
+       monodll_taskbar.o
+@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS)
+COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS =  \
+       monodll_taskbarcmn.o \
        monodll_joystick.o \
        monodll_sound.o \
        monodll_taskbarx11.o
@@ -3473,7 +3920,9 @@ COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_mimetype.o \
        monolib_snglinst.o \
        monolib_stdpaths.o \
-       monolib_threadpsx.o
+       monolib_threadpsx.o \
+       monolib_cfstring.o \
+       monolib_stdpaths_cf.o
 @COND_TOOLKIT_@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_1)
 COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_baseunix.o \
@@ -3481,7 +3930,9 @@ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_mimetype.o \
        monolib_snglinst.o \
        monolib_stdpaths.o \
-       monolib_threadpsx.o
+       monolib_threadpsx.o \
+       monolib_cfstring.o \
+       monolib_stdpaths_cf.o
 @COND_TOOLKIT_COCOA@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_1)
 COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_baseunix.o \
@@ -3489,7 +3940,9 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_mimetype.o \
        monolib_snglinst.o \
        monolib_stdpaths.o \
-       monolib_threadpsx.o
+       monolib_threadpsx.o \
+       monolib_cfstring.o \
+       monolib_stdpaths_cf.o
 @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_1)
 COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_dirmac.o \
@@ -3500,7 +3953,8 @@ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_MoreFilesX.o \
        monolib_cfstring.o \
        monolib_stdpaths_cf.o \
-       monolib_baseunix.o
+       monolib_baseunix.o \
+       monolib_stdpaths.o
 @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_1)
 COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_baseunix.o \
@@ -3508,7 +3962,9 @@ COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_mimetype.o \
        monolib_snglinst.o \
        monolib_stdpaths.o \
-       monolib_threadpsx.o
+       monolib_threadpsx.o \
+       monolib_cfstring.o \
+       monolib_stdpaths_cf.o
 @COND_TOOLKIT_MOTIF@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_1)
 COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_baseunix.o \
@@ -3516,7 +3972,9 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_1 =  \
        monolib_mimetype.o \
        monolib_snglinst.o \
        monolib_stdpaths.o \
-       monolib_threadpsx.o
+       monolib_threadpsx.o \
+       monolib_cfstring.o \
+       monolib_stdpaths_cf.o
 @COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS_1 = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_1)
 @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_1 \
 @COND_PLATFORM_MACOSX_1@       = monolib_utilsunx.o
@@ -3615,7 +4073,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
        monolib_xmlrsall.o
 @COND_USE_GUI_1@__MONOLIB_GUI_SRC_OBJECTS_1 = $(COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1)
 COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
-       $(__LOWLEVEL_SRC_OBJECTS_0) \
+       $(__LOWLEVEL_SRC_OBJECTS_2) \
        $(__GUI_SRC_OBJECTS_1) \
        monolib_accesscmn.o \
        monolib_appcmn.o \
@@ -3715,7 +4173,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
        monolib_vscroll.o
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1)
 COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
-       $(__LOWLEVEL_SRC_OBJECTS_0) \
+       $(__LOWLEVEL_SRC_OBJECTS_3) \
        monolib_accel.o \
        monolib_colrdlgg.o \
        monolib_dirdlgg.o \
@@ -3862,22 +4320,244 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
        monolib_vlbox.o \
        monolib_vscroll.o
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_1 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1)
-COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 =  \
-       monolib_NSBox.o \
-       monolib_NSButton.o \
-       monolib_NSControl.o \
-       monolib_NSMenu.o \
-       monolib_NSPanel.o \
-       monolib_NSScroller.o \
-       monolib_NSTabView.o \
-       monolib_NSTableView.o \
-       monolib_NSTextField.o \
-       monolib_NSView.o \
-       monolib_NSWindow.o \
-       monolib_ObjcRef.o \
+@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_COCOA@   monolib_gsockosx.o monolib_utilsexc_cf.o
+COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_2 =  \
+       monolib_caret.o \
+       monolib_dialup.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_utilsx11.o \
+       monolib_displayx11.o \
+       monolib_paletteg.o \
        monolib_app.o \
        monolib_bitmap.o \
-       monolib_bmpbuttn.o \
+       monolib_brush.o \
+       monolib_clipbrd.o \
+       monolib_colour.o \
+       monolib_cursor.o \
+       monolib_data.o \
+       monolib_dataobj.o \
+       monolib_dc.o \
+       monolib_dcclient.o \
+       monolib_dcmemory.o \
+       monolib_dcscreen.o \
+       monolib_dnd.o \
+       monolib_evtloop.o \
+       monolib_font.o \
+       monolib_gdiobj.o \
+       monolib_gsockgtk.o \
+       monolib_icon.o \
+       monolib_main.o \
+       monolib_minifram.o \
+       monolib_pen.o \
+       monolib_popupwin.o \
+       monolib_region.o \
+       monolib_renderer.o \
+       monolib_settings.o \
+       monolib_timer.o \
+       monolib_tooltip.o \
+       monolib_toplevel.o \
+       monolib_utilsgtk.o \
+       monolib_win_gtk.o \
+       monolib_window.o
+@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_2)
+@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_2 = \
+@COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_0)
+COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_2 =  \
+       monolib_caret.o \
+       monolib_timer.o \
+       monolib_app.o \
+       monolib_bitmap.o \
+       monolib_brush.o \
+       monolib_clipbrd.o \
+       monolib_colour.o \
+       monolib_cursor.o \
+       monolib_data.o \
+       monolib_dc.o \
+       monolib_dcclient.o \
+       monolib_dcmemory.o \
+       monolib_dcscreen.o \
+       monolib_dirmgl.o \
+       monolib_evtloop.o \
+       monolib_font.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_gdiobj.o \
+       monolib_icon.o \
+       monolib_palette.o \
+       monolib_pen.o \
+       monolib_region.o \
+       monolib_settings.o \
+       monolib_toplevel.o \
+       monolib_utils.o \
+       monolib_window.o
+@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_2)
+COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_2 =  \
+       monolib_caret.o \
+       monolib_dialup.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_utilsx11.o \
+       monolib_displayx11.o \
+       monolib_bitmap.o \
+       monolib_brush.o \
+       monolib_pen.o \
+       monolib_region.o \
+       monolib_utilsx.o
+@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_2)
+COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 =  \
+       monolib_app.o \
+       monolib_bitmap.o \
+       monolib_brush.o \
+       monolib_caret.o \
+       monolib_clipbrd.o \
+       monolib_colour.o \
+       monolib_cursor.o \
+       monolib_data.o \
+       monolib_dc.o \
+       monolib_dcclient.o \
+       monolib_dcmemory.o \
+       monolib_dcprint.o \
+       monolib_dcscreen.o \
+       monolib_dialup.o \
+       monolib_dib.o \
+       monolib_display.o \
+       monolib_enhmeta.o \
+       monolib_evtloop.o \
+       monolib_font.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_gdiimage.o \
+       monolib_gdiobj.o \
+       monolib_gsockmsw.o \
+       monolib_icon.o \
+       monolib_minifram.o \
+       monolib_dataobj.o \
+       monolib_dropsrc.o \
+       monolib_droptgt.o \
+       monolib_oleutils.o \
+       monolib_palette.o \
+       monolib_pen.o \
+       monolib_popupwin.o \
+       monolib_printdlg.o \
+       monolib_printwin.o \
+       monolib_region.o \
+       monolib_renderer.o \
+       monolib_settings.o \
+       monolib_timer.o \
+       monolib_tooltip.o \
+       monolib_toplevel.o \
+       monolib_utilsgui.o \
+       monolib_uxtheme.o \
+       monolib_window.o \
+       monolib_helpchm.o \
+       monolib_helpwin.o \
+       monolib_automtn.o \
+       monolib_uuid.o
+@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2)
+@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_2 = 
+COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_2 =  \
+       monolib_app.o \
+       monolib_bitmap.o \
+       monolib_brush.o \
+       monolib_caret.o \
+       monolib_clipbrd.o \
+       monolib_colour.o \
+       monolib_cursor.o \
+       monolib_data.o \
+       monolib_dc.o \
+       monolib_dcclient.o \
+       monolib_dcmemory.o \
+       monolib_dcprint.o \
+       monolib_dcscreen.o \
+       monolib_dialup.o \
+       monolib_dib.o \
+       monolib_display.o \
+       monolib_enhmeta.o \
+       monolib_evtloop.o \
+       monolib_font.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_gdiimage.o \
+       monolib_gdiobj.o \
+       monolib_gsockmsw.o \
+       monolib_icon.o \
+       monolib_minifram.o \
+       monolib_dataobj.o \
+       monolib_dropsrc.o \
+       monolib_droptgt.o \
+       monolib_oleutils.o \
+       monolib_palette.o \
+       monolib_pen.o \
+       monolib_popupwin.o \
+       monolib_printdlg.o \
+       monolib_printwin.o \
+       monolib_region.o \
+       monolib_renderer.o \
+       monolib_settings.o \
+       monolib_timer.o \
+       monolib_tooltip.o \
+       monolib_toplevel.o \
+       monolib_utilsgui.o \
+       monolib_uxtheme.o \
+       monolib_window.o
+@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_2)
+COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_2 =  \
+       monolib_caret.o \
+       monolib_dialup.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_utilsx11.o \
+       monolib_displayx11.o \
+       monolib_timer.o \
+       monolib_app.o \
+       monolib_bitmap.o \
+       monolib_brush.o \
+       monolib_clipbrd.o \
+       monolib_colour.o \
+       monolib_cursor.o \
+       monolib_data.o \
+       monolib_dataobj.o \
+       monolib_dc.o \
+       monolib_dcclient.o \
+       monolib_dcmemory.o \
+       monolib_dcscreen.o \
+       monolib_evtloop.o \
+       monolib_font.o \
+       monolib_gdiobj.o \
+       monolib_gsockx11.o \
+       monolib_icon.o \
+       monolib_main.o \
+       monolib_minifram.o \
+       monolib_nanox.o \
+       monolib_palette.o \
+       monolib_pen.o \
+       monolib_popupwin.o \
+       monolib_region.o \
+       monolib_reparent.o \
+       monolib_settings.o \
+       monolib_toplevel.o \
+       monolib_utils.o \
+       monolib_utilsx.o \
+       monolib_window.o
+@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_2 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_2)
+COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 =  \
+       monolib_NSBox.o \
+       monolib_NSButton.o \
+       monolib_NSControl.o \
+       monolib_NSMenu.o \
+       monolib_NSPanel.o \
+       monolib_NSScroller.o \
+       monolib_NSTabView.o \
+       monolib_NSTableView.o \
+       monolib_NSTextField.o \
+       monolib_NSView.o \
+       monolib_NSWindow.o \
+       monolib_ObjcRef.o \
+       monolib_app.o \
+       monolib_bitmap.o \
+       monolib_bmpbuttn.o \
        monolib_brush.o \
        monolib_button.o \
        monolib_checkbox.o \
@@ -3949,11 +4629,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 =  \
        monolib_regiong.o \
        monolib_statusbr.o \
        monolib_tabg.o \
-       monolib_timer.o \
-       monolib_cfstring.o \
-       monolib_gsockosx.o \
-       monolib_stdpaths_cf.o \
-       monolib_utilsexc_cf.o
+       monolib_timer.o
 @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_1 =  \
        monolib_accel.o \
@@ -4084,9 +4760,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 =  \
        monolib_statusbr.o \
        monolib_tabg.o \
        monolib_snglinst.o \
-       monolib_webkit.o \
-       monolib_gsockosx.o \
-       monolib_utilsexc_cf.o
+       monolib_webkit.o
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1)
 COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 =  \
        monolib_accel.o \
@@ -4345,47 +5019,269 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 =  \
        monolib_tbarwce.o \
        monolib_textctrlce.o
 @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1)
-@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
-@COND_TOOLKIT_COCOA@   monolib_taskbar.o monolib_taskbarcmn.o
-COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
-       monolib_taskbarcmn.o \
-       monolib_joystick.o \
-       monolib_sound.o \
-       monolib_taskbarx11.o \
-       monolib_taskbar.o \
-       monolib_eggtrayicon.o
-@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_1)
-COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
-       monolib_taskbarcmn.o \
-       monolib_drawer.o \
-       monolib_joystick.o \
-       monolib_sound.o \
-       monolib_taskbar.o
-@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_1)
-COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
-       monolib_taskbarcmn.o \
-       monolib_joystick.o \
-       monolib_sound.o \
-       monolib_taskbarx11.o
-@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_1)
-@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
-@COND_TOOLKIT_MSW@     monolib_taskbarcmn.o monolib_sound.o monolib_taskbar.o \
-@COND_TOOLKIT_MSW@     monolib_joystick.o
-@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
-@COND_TOOLKIT_PM@      monolib_joystick.o monolib_sound.o
-@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
-@COND_TOOLKIT_WINCE@   monolib_taskbarcmn.o monolib_sound.o monolib_taskbar.o
-COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
-       monolib_taskbarcmn.o \
-       monolib_joystick.o \
-       monolib_sound.o \
-       monolib_taskbarx11.o
-@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1)
-@COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_1 = 
-@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_1 =  
-@COND_TOOLKIT_MAC@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_mediactrl.o
-@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_1 = 
-@COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_mediactrl.o 
+@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_COCOA@   monolib_gsockosx.o monolib_utilsexc_cf.o
+COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_3 =  \
+       monolib_caret.o \
+       monolib_dialup.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_utilsx11.o \
+       monolib_displayx11.o \
+       monolib_paletteg.o \
+       monolib_app.o \
+       monolib_bitmap.o \
+       monolib_brush.o \
+       monolib_clipbrd.o \
+       monolib_colour.o \
+       monolib_cursor.o \
+       monolib_data.o \
+       monolib_dataobj.o \
+       monolib_dc.o \
+       monolib_dcclient.o \
+       monolib_dcmemory.o \
+       monolib_dcscreen.o \
+       monolib_dnd.o \
+       monolib_evtloop.o \
+       monolib_font.o \
+       monolib_gdiobj.o \
+       monolib_gsockgtk.o \
+       monolib_icon.o \
+       monolib_main.o \
+       monolib_minifram.o \
+       monolib_pen.o \
+       monolib_popupwin.o \
+       monolib_region.o \
+       monolib_renderer.o \
+       monolib_settings.o \
+       monolib_timer.o \
+       monolib_tooltip.o \
+       monolib_toplevel.o \
+       monolib_utilsgtk.o \
+       monolib_win_gtk.o \
+       monolib_window.o
+@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_3)
+@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_3 = \
+@COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_0)
+COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_3 =  \
+       monolib_caret.o \
+       monolib_timer.o \
+       monolib_app.o \
+       monolib_bitmap.o \
+       monolib_brush.o \
+       monolib_clipbrd.o \
+       monolib_colour.o \
+       monolib_cursor.o \
+       monolib_data.o \
+       monolib_dc.o \
+       monolib_dcclient.o \
+       monolib_dcmemory.o \
+       monolib_dcscreen.o \
+       monolib_dirmgl.o \
+       monolib_evtloop.o \
+       monolib_font.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_gdiobj.o \
+       monolib_icon.o \
+       monolib_palette.o \
+       monolib_pen.o \
+       monolib_region.o \
+       monolib_settings.o \
+       monolib_toplevel.o \
+       monolib_utils.o \
+       monolib_window.o
+@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_3)
+COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_3 =  \
+       monolib_caret.o \
+       monolib_dialup.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_utilsx11.o \
+       monolib_displayx11.o \
+       monolib_bitmap.o \
+       monolib_brush.o \
+       monolib_pen.o \
+       monolib_region.o \
+       monolib_utilsx.o
+@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_3)
+COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 =  \
+       monolib_app.o \
+       monolib_bitmap.o \
+       monolib_brush.o \
+       monolib_caret.o \
+       monolib_clipbrd.o \
+       monolib_colour.o \
+       monolib_cursor.o \
+       monolib_data.o \
+       monolib_dc.o \
+       monolib_dcclient.o \
+       monolib_dcmemory.o \
+       monolib_dcprint.o \
+       monolib_dcscreen.o \
+       monolib_dialup.o \
+       monolib_dib.o \
+       monolib_display.o \
+       monolib_enhmeta.o \
+       monolib_evtloop.o \
+       monolib_font.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_gdiimage.o \
+       monolib_gdiobj.o \
+       monolib_gsockmsw.o \
+       monolib_icon.o \
+       monolib_minifram.o \
+       monolib_dataobj.o \
+       monolib_dropsrc.o \
+       monolib_droptgt.o \
+       monolib_oleutils.o \
+       monolib_palette.o \
+       monolib_pen.o \
+       monolib_popupwin.o \
+       monolib_printdlg.o \
+       monolib_printwin.o \
+       monolib_region.o \
+       monolib_renderer.o \
+       monolib_settings.o \
+       monolib_timer.o \
+       monolib_tooltip.o \
+       monolib_toplevel.o \
+       monolib_utilsgui.o \
+       monolib_uxtheme.o \
+       monolib_window.o \
+       monolib_helpchm.o \
+       monolib_helpwin.o \
+       monolib_automtn.o \
+       monolib_uuid.o
+@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3)
+@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_3 = 
+COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_3 =  \
+       monolib_app.o \
+       monolib_bitmap.o \
+       monolib_brush.o \
+       monolib_caret.o \
+       monolib_clipbrd.o \
+       monolib_colour.o \
+       monolib_cursor.o \
+       monolib_data.o \
+       monolib_dc.o \
+       monolib_dcclient.o \
+       monolib_dcmemory.o \
+       monolib_dcprint.o \
+       monolib_dcscreen.o \
+       monolib_dialup.o \
+       monolib_dib.o \
+       monolib_display.o \
+       monolib_enhmeta.o \
+       monolib_evtloop.o \
+       monolib_font.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_gdiimage.o \
+       monolib_gdiobj.o \
+       monolib_gsockmsw.o \
+       monolib_icon.o \
+       monolib_minifram.o \
+       monolib_dataobj.o \
+       monolib_dropsrc.o \
+       monolib_droptgt.o \
+       monolib_oleutils.o \
+       monolib_palette.o \
+       monolib_pen.o \
+       monolib_popupwin.o \
+       monolib_printdlg.o \
+       monolib_printwin.o \
+       monolib_region.o \
+       monolib_renderer.o \
+       monolib_settings.o \
+       monolib_timer.o \
+       monolib_tooltip.o \
+       monolib_toplevel.o \
+       monolib_utilsgui.o \
+       monolib_uxtheme.o \
+       monolib_window.o
+@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_3)
+COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 =  \
+       monolib_caret.o \
+       monolib_dialup.o \
+       monolib_fontenum.o \
+       monolib_fontutil.o \
+       monolib_utilsx11.o \
+       monolib_displayx11.o \
+       monolib_timer.o \
+       monolib_app.o \
+       monolib_bitmap.o \
+       monolib_brush.o \
+       monolib_clipbrd.o \
+       monolib_colour.o \
+       monolib_cursor.o \
+       monolib_data.o \
+       monolib_dataobj.o \
+       monolib_dc.o \
+       monolib_dcclient.o \
+       monolib_dcmemory.o \
+       monolib_dcscreen.o \
+       monolib_evtloop.o \
+       monolib_font.o \
+       monolib_gdiobj.o \
+       monolib_gsockx11.o \
+       monolib_icon.o \
+       monolib_main.o \
+       monolib_minifram.o \
+       monolib_nanox.o \
+       monolib_palette.o \
+       monolib_pen.o \
+       monolib_popupwin.o \
+       monolib_region.o \
+       monolib_reparent.o \
+       monolib_settings.o \
+       monolib_toplevel.o \
+       monolib_utils.o \
+       monolib_utilsx.o \
+       monolib_window.o
+@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_3 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3)
+@COND_TOOLKIT_COCOA@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
+@COND_TOOLKIT_COCOA@   monolib_taskbar.o monolib_taskbarcmn.o
+COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
+       monolib_taskbarcmn.o \
+       monolib_joystick.o \
+       monolib_sound.o \
+       monolib_taskbarx11.o \
+       monolib_taskbar.o \
+       monolib_eggtrayicon.o
+@COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_1)
+COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
+       monolib_taskbarcmn.o \
+       monolib_drawer.o \
+       monolib_joystick.o \
+       monolib_sound.o \
+       monolib_taskbar.o
+@COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_MAC___ADVANCED_PLATFORM_SRC_OBJECTS_1)
+COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
+       monolib_taskbarcmn.o \
+       monolib_joystick.o \
+       monolib_sound.o \
+       monolib_taskbarx11.o
+@COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_1)
+@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
+@COND_TOOLKIT_MSW@     monolib_taskbarcmn.o monolib_sound.o monolib_taskbar.o \
+@COND_TOOLKIT_MSW@     monolib_joystick.o
+@COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
+@COND_TOOLKIT_PM@      monolib_joystick.o monolib_sound.o
+@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
+@COND_TOOLKIT_WINCE@   monolib_taskbarcmn.o monolib_sound.o monolib_taskbar.o
+COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 =  \
+       monolib_taskbarcmn.o \
+       monolib_joystick.o \
+       monolib_sound.o \
+       monolib_taskbarx11.o
+@COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1)
+@COND_TOOLKIT_COCOA@__MEDIA_PLATFORM_SRC_OBJECTS_1 = 
+@COND_TOOLKIT_GTK@__MEDIA_PLATFORM_SRC_OBJECTS_1 =  
+@COND_TOOLKIT_MAC@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_mediactrl.o
+@COND_TOOLKIT_MOTIF@__MEDIA_PLATFORM_SRC_OBJECTS_1 = 
+@COND_TOOLKIT_MSW@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_mediactrl.o 
 @COND_TOOLKIT_PM@__MEDIA_PLATFORM_SRC_OBJECTS_1 = 
 @COND_TOOLKIT_WINCE@__MEDIA_PLATFORM_SRC_OBJECTS_1 = monolib_mediactrl.o
 @COND_TOOLKIT_X11@__MEDIA_PLATFORM_SRC_OBJECTS_1 = 
@@ -4495,7 +5391,9 @@ COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_mimetype.o \
        basedll_snglinst.o \
        basedll_stdpaths.o \
-       basedll_threadpsx.o
+       basedll_threadpsx.o \
+       basedll_cfstring.o \
+       basedll_stdpaths_cf.o
 @COND_TOOLKIT_@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_2)
 COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_baseunix.o \
@@ -4503,7 +5401,9 @@ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_mimetype.o \
        basedll_snglinst.o \
        basedll_stdpaths.o \
-       basedll_threadpsx.o
+       basedll_threadpsx.o \
+       basedll_cfstring.o \
+       basedll_stdpaths_cf.o
 @COND_TOOLKIT_COCOA@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_2)
 COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_baseunix.o \
@@ -4511,7 +5411,9 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_mimetype.o \
        basedll_snglinst.o \
        basedll_stdpaths.o \
-       basedll_threadpsx.o
+       basedll_threadpsx.o \
+       basedll_cfstring.o \
+       basedll_stdpaths_cf.o
 @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_2)
 COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_dirmac.o \
@@ -4522,7 +5424,8 @@ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_MoreFilesX.o \
        basedll_cfstring.o \
        basedll_stdpaths_cf.o \
-       basedll_baseunix.o
+       basedll_baseunix.o \
+       basedll_stdpaths.o
 @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_2)
 COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_baseunix.o \
@@ -4530,7 +5433,9 @@ COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_mimetype.o \
        basedll_snglinst.o \
        basedll_stdpaths.o \
-       basedll_threadpsx.o
+       basedll_threadpsx.o \
+       basedll_cfstring.o \
+       basedll_stdpaths_cf.o
 @COND_TOOLKIT_MOTIF@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_2)
 COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_baseunix.o \
@@ -4538,7 +5443,9 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_2 =  \
        basedll_mimetype.o \
        basedll_snglinst.o \
        basedll_stdpaths.o \
-       basedll_threadpsx.o
+       basedll_threadpsx.o \
+       basedll_cfstring.o \
+       basedll_stdpaths_cf.o
 @COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS_2 = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_2)
 @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_2 \
 @COND_PLATFORM_MACOSX_1@       = basedll_utilsunx.o
@@ -4614,7 +5521,9 @@ COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_mimetype.o \
        baselib_snglinst.o \
        baselib_stdpaths.o \
-       baselib_threadpsx.o
+       baselib_threadpsx.o \
+       baselib_cfstring.o \
+       baselib_stdpaths_cf.o
 @COND_TOOLKIT_@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT____BASE_MACOSX_SRC_OBJECTS_3)
 COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_baseunix.o \
@@ -4622,7 +5531,9 @@ COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_mimetype.o \
        baselib_snglinst.o \
        baselib_stdpaths.o \
-       baselib_threadpsx.o
+       baselib_threadpsx.o \
+       baselib_cfstring.o \
+       baselib_stdpaths_cf.o
 @COND_TOOLKIT_COCOA@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_COCOA___BASE_MACOSX_SRC_OBJECTS_3)
 COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_baseunix.o \
@@ -4630,7 +5541,9 @@ COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_mimetype.o \
        baselib_snglinst.o \
        baselib_stdpaths.o \
-       baselib_threadpsx.o
+       baselib_threadpsx.o \
+       baselib_cfstring.o \
+       baselib_stdpaths_cf.o
 @COND_TOOLKIT_GTK@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK___BASE_MACOSX_SRC_OBJECTS_3)
 COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_dirmac.o \
@@ -4641,7 +5554,8 @@ COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_MoreFilesX.o \
        baselib_cfstring.o \
        baselib_stdpaths_cf.o \
-       baselib_baseunix.o
+       baselib_baseunix.o \
+       baselib_stdpaths.o
 @COND_TOOLKIT_MAC@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_MAC___BASE_MACOSX_SRC_OBJECTS_3)
 COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_baseunix.o \
@@ -4649,7 +5563,9 @@ COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_mimetype.o \
        baselib_snglinst.o \
        baselib_stdpaths.o \
-       baselib_threadpsx.o
+       baselib_threadpsx.o \
+       baselib_cfstring.o \
+       baselib_stdpaths_cf.o
 @COND_TOOLKIT_MOTIF@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_MOTIF___BASE_MACOSX_SRC_OBJECTS_3)
 COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_baseunix.o \
@@ -4657,7 +5573,9 @@ COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3 =  \
        baselib_mimetype.o \
        baselib_snglinst.o \
        baselib_stdpaths.o \
-       baselib_threadpsx.o
+       baselib_threadpsx.o \
+       baselib_cfstring.o \
+       baselib_stdpaths_cf.o
 @COND_TOOLKIT_X11@__BASE_MACOSX_SRC_OBJECTS_3 = $(COND_TOOLKIT_X11___BASE_MACOSX_SRC_OBJECTS_3)
 @COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_3 \
 @COND_PLATFORM_MACOSX_1@       = baselib_utilsunx.o
@@ -4784,7 +5702,7 @@ COND_USE_SOSYMLINKS_1___coredll___so_symlinks_inst_cmd = rm -f \
 @COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_4 = \
 @COND_TOOLKIT_MAC@     coredll_utils.o coredll_uma.o
 COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
-       $(__LOWLEVEL_SRC_OBJECTS_8) \
+       $(__LOWLEVEL_SRC_OBJECTS_4) \
        $(__GUI_SRC_OBJECTS_2) \
        coredll_accesscmn.o \
        coredll_appcmn.o \
@@ -4884,7 +5802,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
        coredll_vscroll.o
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2)
 COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
-       $(__LOWLEVEL_SRC_OBJECTS_8) \
+       $(__LOWLEVEL_SRC_OBJECTS_5) \
        coredll_accel.o \
        coredll_colrdlgg.o \
        coredll_dirdlgg.o \
@@ -5031,6 +5949,228 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
        coredll_vlbox.o \
        coredll_vscroll.o
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_2 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2)
+@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_4 = \
+@COND_TOOLKIT_COCOA@   coredll_gsockosx.o coredll_utilsexc_cf.o
+COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_4 =  \
+       coredll_caret.o \
+       coredll_dialup.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_utilsx11.o \
+       coredll_displayx11.o \
+       coredll_paletteg.o \
+       coredll_app.o \
+       coredll_bitmap.o \
+       coredll_brush.o \
+       coredll_clipbrd.o \
+       coredll_colour.o \
+       coredll_cursor.o \
+       coredll_data.o \
+       coredll_dataobj.o \
+       coredll_dc.o \
+       coredll_dcclient.o \
+       coredll_dcmemory.o \
+       coredll_dcscreen.o \
+       coredll_dnd.o \
+       coredll_evtloop.o \
+       coredll_font.o \
+       coredll_gdiobj.o \
+       coredll_gsockgtk.o \
+       coredll_icon.o \
+       coredll_main.o \
+       coredll_minifram.o \
+       coredll_pen.o \
+       coredll_popupwin.o \
+       coredll_region.o \
+       coredll_renderer.o \
+       coredll_settings.o \
+       coredll_timer.o \
+       coredll_tooltip.o \
+       coredll_toplevel.o \
+       coredll_utilsgtk.o \
+       coredll_win_gtk.o \
+       coredll_window.o
+@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_4)
+@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_4 = \
+@COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_8)
+COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_4 =  \
+       coredll_caret.o \
+       coredll_timer.o \
+       coredll_app.o \
+       coredll_bitmap.o \
+       coredll_brush.o \
+       coredll_clipbrd.o \
+       coredll_colour.o \
+       coredll_cursor.o \
+       coredll_data.o \
+       coredll_dc.o \
+       coredll_dcclient.o \
+       coredll_dcmemory.o \
+       coredll_dcscreen.o \
+       coredll_dirmgl.o \
+       coredll_evtloop.o \
+       coredll_font.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_gdiobj.o \
+       coredll_icon.o \
+       coredll_palette.o \
+       coredll_pen.o \
+       coredll_region.o \
+       coredll_settings.o \
+       coredll_toplevel.o \
+       coredll_utils.o \
+       coredll_window.o
+@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_4)
+COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_4 =  \
+       coredll_caret.o \
+       coredll_dialup.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_utilsx11.o \
+       coredll_displayx11.o \
+       coredll_bitmap.o \
+       coredll_brush.o \
+       coredll_pen.o \
+       coredll_region.o \
+       coredll_utilsx.o
+@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_4)
+COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 =  \
+       coredll_app.o \
+       coredll_bitmap.o \
+       coredll_brush.o \
+       coredll_caret.o \
+       coredll_clipbrd.o \
+       coredll_colour.o \
+       coredll_cursor.o \
+       coredll_data.o \
+       coredll_dc.o \
+       coredll_dcclient.o \
+       coredll_dcmemory.o \
+       coredll_dcprint.o \
+       coredll_dcscreen.o \
+       coredll_dialup.o \
+       coredll_dib.o \
+       coredll_display.o \
+       coredll_enhmeta.o \
+       coredll_evtloop.o \
+       coredll_font.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_gdiimage.o \
+       coredll_gdiobj.o \
+       coredll_gsockmsw.o \
+       coredll_icon.o \
+       coredll_minifram.o \
+       coredll_dataobj.o \
+       coredll_dropsrc.o \
+       coredll_droptgt.o \
+       coredll_oleutils.o \
+       coredll_palette.o \
+       coredll_pen.o \
+       coredll_popupwin.o \
+       coredll_printdlg.o \
+       coredll_printwin.o \
+       coredll_region.o \
+       coredll_renderer.o \
+       coredll_settings.o \
+       coredll_timer.o \
+       coredll_tooltip.o \
+       coredll_toplevel.o \
+       coredll_utilsgui.o \
+       coredll_uxtheme.o \
+       coredll_window.o \
+       coredll_helpchm.o \
+       coredll_helpwin.o \
+       coredll_automtn.o \
+       coredll_uuid.o
+@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4)
+@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_4 = 
+COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_4 =  \
+       coredll_app.o \
+       coredll_bitmap.o \
+       coredll_brush.o \
+       coredll_caret.o \
+       coredll_clipbrd.o \
+       coredll_colour.o \
+       coredll_cursor.o \
+       coredll_data.o \
+       coredll_dc.o \
+       coredll_dcclient.o \
+       coredll_dcmemory.o \
+       coredll_dcprint.o \
+       coredll_dcscreen.o \
+       coredll_dialup.o \
+       coredll_dib.o \
+       coredll_display.o \
+       coredll_enhmeta.o \
+       coredll_evtloop.o \
+       coredll_font.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_gdiimage.o \
+       coredll_gdiobj.o \
+       coredll_gsockmsw.o \
+       coredll_icon.o \
+       coredll_minifram.o \
+       coredll_dataobj.o \
+       coredll_dropsrc.o \
+       coredll_droptgt.o \
+       coredll_oleutils.o \
+       coredll_palette.o \
+       coredll_pen.o \
+       coredll_popupwin.o \
+       coredll_printdlg.o \
+       coredll_printwin.o \
+       coredll_region.o \
+       coredll_renderer.o \
+       coredll_settings.o \
+       coredll_timer.o \
+       coredll_tooltip.o \
+       coredll_toplevel.o \
+       coredll_utilsgui.o \
+       coredll_uxtheme.o \
+       coredll_window.o
+@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_4)
+COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_4 =  \
+       coredll_caret.o \
+       coredll_dialup.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_utilsx11.o \
+       coredll_displayx11.o \
+       coredll_timer.o \
+       coredll_app.o \
+       coredll_bitmap.o \
+       coredll_brush.o \
+       coredll_clipbrd.o \
+       coredll_colour.o \
+       coredll_cursor.o \
+       coredll_data.o \
+       coredll_dataobj.o \
+       coredll_dc.o \
+       coredll_dcclient.o \
+       coredll_dcmemory.o \
+       coredll_dcscreen.o \
+       coredll_evtloop.o \
+       coredll_font.o \
+       coredll_gdiobj.o \
+       coredll_gsockx11.o \
+       coredll_icon.o \
+       coredll_main.o \
+       coredll_minifram.o \
+       coredll_nanox.o \
+       coredll_palette.o \
+       coredll_pen.o \
+       coredll_popupwin.o \
+       coredll_region.o \
+       coredll_reparent.o \
+       coredll_settings.o \
+       coredll_toplevel.o \
+       coredll_utils.o \
+       coredll_utilsx.o \
+       coredll_window.o
+@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_4 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_4)
 COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 =  \
        coredll_NSBox.o \
        coredll_NSButton.o \
@@ -5118,11 +6258,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 =  \
        coredll_regiong.o \
        coredll_statusbr.o \
        coredll_tabg.o \
-       coredll_timer.o \
-       coredll_cfstring.o \
-       coredll_gsockosx.o \
-       coredll_stdpaths_cf.o \
-       coredll_utilsexc_cf.o
+       coredll_timer.o
 @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_2 =  \
        coredll_accel.o \
@@ -5253,9 +6389,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 =  \
        coredll_statusbr.o \
        coredll_tabg.o \
        coredll_snglinst.o \
-       coredll_webkit.o \
-       coredll_gsockosx.o \
-       coredll_utilsexc_cf.o
+       coredll_webkit.o
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2)
 COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 =  \
        coredll_accel.o \
@@ -5514,45 +6648,267 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 =  \
        coredll_tbarwce.o \
        coredll_textctrlce.o
 @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2)
-COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname = \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__corelib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname)
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__install_corelib___depname \
-@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = install_corelib
-@COND_GCC_PCH_1@__corelib_PCH_INC = -I.pch/wxprec_corelib
-@COND_GCC_PCH_1@___pch_wxprec_corelib_wx_wxprec_h_gch___depname \
-@COND_GCC_PCH_1@       = .pch/wxprec_corelib/wx/wxprec.h.gch
-@COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 \
-@COND_PLATFORM_MACOSX_1@       = corelib_utilsunx.o
-@COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 \
-@COND_PLATFORM_UNIX_1@ = corelib_utilsunx.o
-@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 \
-@COND_PLATFORM_WIN32_1@        = corelib_main.o corelib_mslu.o corelib_volume.o
-@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5 = \
-@COND_TOOLKIT_MAC@     corelib_utils.o corelib_uma.o
-COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
-       $(__LOWLEVEL_SRC_OBJECTS_9) \
-       $(__GUI_SRC_OBJECTS_3) \
-       corelib_accesscmn.o \
-       corelib_appcmn.o \
-       corelib_artprov.o \
-       corelib_artstd.o \
-       corelib_bmpbase.o \
-       corelib_bookctrl.o \
-       corelib_choiccmn.o \
-       corelib_clipcmn.o \
-       corelib_cmdproc.o \
-       corelib_cmndata.o \
-       corelib_containr.o \
-       corelib_cshelp.o \
-       corelib_ctrlcmn.o \
-       corelib_ctrlsub.o \
-       corelib_datacmn.o \
-       corelib_dcbase.o \
-       corelib_dlgcmn.o \
-       corelib_dndcmn.o \
-       corelib_dobjcmn.o \
-       corelib_docmdi.o \
+@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_5 = \
+@COND_TOOLKIT_COCOA@   coredll_gsockosx.o coredll_utilsexc_cf.o
+COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_5 =  \
+       coredll_caret.o \
+       coredll_dialup.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_utilsx11.o \
+       coredll_displayx11.o \
+       coredll_paletteg.o \
+       coredll_app.o \
+       coredll_bitmap.o \
+       coredll_brush.o \
+       coredll_clipbrd.o \
+       coredll_colour.o \
+       coredll_cursor.o \
+       coredll_data.o \
+       coredll_dataobj.o \
+       coredll_dc.o \
+       coredll_dcclient.o \
+       coredll_dcmemory.o \
+       coredll_dcscreen.o \
+       coredll_dnd.o \
+       coredll_evtloop.o \
+       coredll_font.o \
+       coredll_gdiobj.o \
+       coredll_gsockgtk.o \
+       coredll_icon.o \
+       coredll_main.o \
+       coredll_minifram.o \
+       coredll_pen.o \
+       coredll_popupwin.o \
+       coredll_region.o \
+       coredll_renderer.o \
+       coredll_settings.o \
+       coredll_timer.o \
+       coredll_tooltip.o \
+       coredll_toplevel.o \
+       coredll_utilsgtk.o \
+       coredll_win_gtk.o \
+       coredll_window.o
+@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_5)
+@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_5 = \
+@COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_8)
+COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_5 =  \
+       coredll_caret.o \
+       coredll_timer.o \
+       coredll_app.o \
+       coredll_bitmap.o \
+       coredll_brush.o \
+       coredll_clipbrd.o \
+       coredll_colour.o \
+       coredll_cursor.o \
+       coredll_data.o \
+       coredll_dc.o \
+       coredll_dcclient.o \
+       coredll_dcmemory.o \
+       coredll_dcscreen.o \
+       coredll_dirmgl.o \
+       coredll_evtloop.o \
+       coredll_font.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_gdiobj.o \
+       coredll_icon.o \
+       coredll_palette.o \
+       coredll_pen.o \
+       coredll_region.o \
+       coredll_settings.o \
+       coredll_toplevel.o \
+       coredll_utils.o \
+       coredll_window.o
+@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_5)
+COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_5 =  \
+       coredll_caret.o \
+       coredll_dialup.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_utilsx11.o \
+       coredll_displayx11.o \
+       coredll_bitmap.o \
+       coredll_brush.o \
+       coredll_pen.o \
+       coredll_region.o \
+       coredll_utilsx.o
+@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_5)
+COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 =  \
+       coredll_app.o \
+       coredll_bitmap.o \
+       coredll_brush.o \
+       coredll_caret.o \
+       coredll_clipbrd.o \
+       coredll_colour.o \
+       coredll_cursor.o \
+       coredll_data.o \
+       coredll_dc.o \
+       coredll_dcclient.o \
+       coredll_dcmemory.o \
+       coredll_dcprint.o \
+       coredll_dcscreen.o \
+       coredll_dialup.o \
+       coredll_dib.o \
+       coredll_display.o \
+       coredll_enhmeta.o \
+       coredll_evtloop.o \
+       coredll_font.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_gdiimage.o \
+       coredll_gdiobj.o \
+       coredll_gsockmsw.o \
+       coredll_icon.o \
+       coredll_minifram.o \
+       coredll_dataobj.o \
+       coredll_dropsrc.o \
+       coredll_droptgt.o \
+       coredll_oleutils.o \
+       coredll_palette.o \
+       coredll_pen.o \
+       coredll_popupwin.o \
+       coredll_printdlg.o \
+       coredll_printwin.o \
+       coredll_region.o \
+       coredll_renderer.o \
+       coredll_settings.o \
+       coredll_timer.o \
+       coredll_tooltip.o \
+       coredll_toplevel.o \
+       coredll_utilsgui.o \
+       coredll_uxtheme.o \
+       coredll_window.o \
+       coredll_helpchm.o \
+       coredll_helpwin.o \
+       coredll_automtn.o \
+       coredll_uuid.o
+@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5)
+@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_5 = 
+COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_5 =  \
+       coredll_app.o \
+       coredll_bitmap.o \
+       coredll_brush.o \
+       coredll_caret.o \
+       coredll_clipbrd.o \
+       coredll_colour.o \
+       coredll_cursor.o \
+       coredll_data.o \
+       coredll_dc.o \
+       coredll_dcclient.o \
+       coredll_dcmemory.o \
+       coredll_dcprint.o \
+       coredll_dcscreen.o \
+       coredll_dialup.o \
+       coredll_dib.o \
+       coredll_display.o \
+       coredll_enhmeta.o \
+       coredll_evtloop.o \
+       coredll_font.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_gdiimage.o \
+       coredll_gdiobj.o \
+       coredll_gsockmsw.o \
+       coredll_icon.o \
+       coredll_minifram.o \
+       coredll_dataobj.o \
+       coredll_dropsrc.o \
+       coredll_droptgt.o \
+       coredll_oleutils.o \
+       coredll_palette.o \
+       coredll_pen.o \
+       coredll_popupwin.o \
+       coredll_printdlg.o \
+       coredll_printwin.o \
+       coredll_region.o \
+       coredll_renderer.o \
+       coredll_settings.o \
+       coredll_timer.o \
+       coredll_tooltip.o \
+       coredll_toplevel.o \
+       coredll_utilsgui.o \
+       coredll_uxtheme.o \
+       coredll_window.o
+@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_5)
+COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5 =  \
+       coredll_caret.o \
+       coredll_dialup.o \
+       coredll_fontenum.o \
+       coredll_fontutil.o \
+       coredll_utilsx11.o \
+       coredll_displayx11.o \
+       coredll_timer.o \
+       coredll_app.o \
+       coredll_bitmap.o \
+       coredll_brush.o \
+       coredll_clipbrd.o \
+       coredll_colour.o \
+       coredll_cursor.o \
+       coredll_data.o \
+       coredll_dataobj.o \
+       coredll_dc.o \
+       coredll_dcclient.o \
+       coredll_dcmemory.o \
+       coredll_dcscreen.o \
+       coredll_evtloop.o \
+       coredll_font.o \
+       coredll_gdiobj.o \
+       coredll_gsockx11.o \
+       coredll_icon.o \
+       coredll_main.o \
+       coredll_minifram.o \
+       coredll_nanox.o \
+       coredll_palette.o \
+       coredll_pen.o \
+       coredll_popupwin.o \
+       coredll_region.o \
+       coredll_reparent.o \
+       coredll_settings.o \
+       coredll_toplevel.o \
+       coredll_utils.o \
+       coredll_utilsx.o \
+       coredll_window.o
+@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_5 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5)
+COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname = \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__corelib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname)
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@__install_corelib___depname \
+@COND_MONOLITHIC_0_SHARED_0_USE_GUI_1@ = install_corelib
+@COND_GCC_PCH_1@__corelib_PCH_INC = -I.pch/wxprec_corelib
+@COND_GCC_PCH_1@___pch_wxprec_corelib_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_corelib/wx/wxprec.h.gch
+@COND_PLATFORM_MACOSX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 \
+@COND_PLATFORM_MACOSX_1@       = corelib_utilsunx.o
+@COND_PLATFORM_UNIX_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 \
+@COND_PLATFORM_UNIX_1@ = corelib_utilsunx.o
+@COND_PLATFORM_WIN32_1@__BASE_AND_GUI_PLATFORM_SRC_OBJECTS_5 \
+@COND_PLATFORM_WIN32_1@        = corelib_main.o corelib_mslu.o corelib_volume.o
+@COND_TOOLKIT_MAC@__BASE_AND_GUI_TOOLKIT_SRC_OBJECTS_5 = \
+@COND_TOOLKIT_MAC@     corelib_utils.o corelib_uma.o
+COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
+       $(__LOWLEVEL_SRC_OBJECTS_6) \
+       $(__GUI_SRC_OBJECTS_3) \
+       corelib_accesscmn.o \
+       corelib_appcmn.o \
+       corelib_artprov.o \
+       corelib_artstd.o \
+       corelib_bmpbase.o \
+       corelib_bookctrl.o \
+       corelib_choiccmn.o \
+       corelib_clipcmn.o \
+       corelib_cmdproc.o \
+       corelib_cmndata.o \
+       corelib_containr.o \
+       corelib_cshelp.o \
+       corelib_ctrlcmn.o \
+       corelib_ctrlsub.o \
+       corelib_datacmn.o \
+       corelib_dcbase.o \
+       corelib_dlgcmn.o \
+       corelib_dndcmn.o \
+       corelib_dobjcmn.o \
+       corelib_docmdi.o \
        corelib_docview.o \
        corelib_dpycmn.o \
        corelib_dseldlg.o \
@@ -5631,7 +6987,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
        corelib_vscroll.o
 @COND_USE_GUI_1_WXUNIV_0@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3)
 COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
-       $(__LOWLEVEL_SRC_OBJECTS_9) \
+       $(__LOWLEVEL_SRC_OBJECTS_7) \
        corelib_accel.o \
        corelib_colrdlgg.o \
        corelib_dirdlgg.o \
@@ -5778,19 +7134,241 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
        corelib_vlbox.o \
        corelib_vscroll.o
 @COND_USE_GUI_1_WXUNIV_1@__CORE_SRC_OBJECTS_3 = $(COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3)
-COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 =  \
-       corelib_NSBox.o \
-       corelib_NSButton.o \
-       corelib_NSControl.o \
-       corelib_NSMenu.o \
-       corelib_NSPanel.o \
-       corelib_NSScroller.o \
-       corelib_NSTabView.o \
-       corelib_NSTableView.o \
-       corelib_NSTextField.o \
-       corelib_NSView.o \
-       corelib_NSWindow.o \
-       corelib_ObjcRef.o \
+@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_6 = \
+@COND_TOOLKIT_COCOA@   corelib_gsockosx.o corelib_utilsexc_cf.o
+COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_6 =  \
+       corelib_caret.o \
+       corelib_dialup.o \
+       corelib_fontenum.o \
+       corelib_fontutil.o \
+       corelib_utilsx11.o \
+       corelib_displayx11.o \
+       corelib_paletteg.o \
+       corelib_app.o \
+       corelib_bitmap.o \
+       corelib_brush.o \
+       corelib_clipbrd.o \
+       corelib_colour.o \
+       corelib_cursor.o \
+       corelib_data.o \
+       corelib_dataobj.o \
+       corelib_dc.o \
+       corelib_dcclient.o \
+       corelib_dcmemory.o \
+       corelib_dcscreen.o \
+       corelib_dnd.o \
+       corelib_evtloop.o \
+       corelib_font.o \
+       corelib_gdiobj.o \
+       corelib_gsockgtk.o \
+       corelib_icon.o \
+       corelib_main.o \
+       corelib_minifram.o \
+       corelib_pen.o \
+       corelib_popupwin.o \
+       corelib_region.o \
+       corelib_renderer.o \
+       corelib_settings.o \
+       corelib_timer.o \
+       corelib_tooltip.o \
+       corelib_toplevel.o \
+       corelib_utilsgtk.o \
+       corelib_win_gtk.o \
+       corelib_window.o
+@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_6)
+@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_6 = \
+@COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_9)
+COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_6 =  \
+       corelib_caret.o \
+       corelib_timer.o \
+       corelib_app.o \
+       corelib_bitmap.o \
+       corelib_brush.o \
+       corelib_clipbrd.o \
+       corelib_colour.o \
+       corelib_cursor.o \
+       corelib_data.o \
+       corelib_dc.o \
+       corelib_dcclient.o \
+       corelib_dcmemory.o \
+       corelib_dcscreen.o \
+       corelib_dirmgl.o \
+       corelib_evtloop.o \
+       corelib_font.o \
+       corelib_fontenum.o \
+       corelib_fontutil.o \
+       corelib_gdiobj.o \
+       corelib_icon.o \
+       corelib_palette.o \
+       corelib_pen.o \
+       corelib_region.o \
+       corelib_settings.o \
+       corelib_toplevel.o \
+       corelib_utils.o \
+       corelib_window.o
+@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_6)
+COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_6 =  \
+       corelib_caret.o \
+       corelib_dialup.o \
+       corelib_fontenum.o \
+       corelib_fontutil.o \
+       corelib_utilsx11.o \
+       corelib_displayx11.o \
+       corelib_bitmap.o \
+       corelib_brush.o \
+       corelib_pen.o \
+       corelib_region.o \
+       corelib_utilsx.o
+@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_6)
+COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 =  \
+       corelib_app.o \
+       corelib_bitmap.o \
+       corelib_brush.o \
+       corelib_caret.o \
+       corelib_clipbrd.o \
+       corelib_colour.o \
+       corelib_cursor.o \
+       corelib_data.o \
+       corelib_dc.o \
+       corelib_dcclient.o \
+       corelib_dcmemory.o \
+       corelib_dcprint.o \
+       corelib_dcscreen.o \
+       corelib_dialup.o \
+       corelib_dib.o \
+       corelib_display.o \
+       corelib_enhmeta.o \
+       corelib_evtloop.o \
+       corelib_font.o \
+       corelib_fontenum.o \
+       corelib_fontutil.o \
+       corelib_gdiimage.o \
+       corelib_gdiobj.o \
+       corelib_gsockmsw.o \
+       corelib_icon.o \
+       corelib_minifram.o \
+       corelib_dataobj.o \
+       corelib_dropsrc.o \
+       corelib_droptgt.o \
+       corelib_oleutils.o \
+       corelib_palette.o \
+       corelib_pen.o \
+       corelib_popupwin.o \
+       corelib_printdlg.o \
+       corelib_printwin.o \
+       corelib_region.o \
+       corelib_renderer.o \
+       corelib_settings.o \
+       corelib_timer.o \
+       corelib_tooltip.o \
+       corelib_toplevel.o \
+       corelib_utilsgui.o \
+       corelib_uxtheme.o \
+       corelib_window.o \
+       corelib_helpchm.o \
+       corelib_helpwin.o \
+       corelib_automtn.o \
+       corelib_uuid.o
+@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6)
+@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_6 = 
+COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_6 =  \
+       corelib_app.o \
+       corelib_bitmap.o \
+       corelib_brush.o \
+       corelib_caret.o \
+       corelib_clipbrd.o \
+       corelib_colour.o \
+       corelib_cursor.o \
+       corelib_data.o \
+       corelib_dc.o \
+       corelib_dcclient.o \
+       corelib_dcmemory.o \
+       corelib_dcprint.o \
+       corelib_dcscreen.o \
+       corelib_dialup.o \
+       corelib_dib.o \
+       corelib_display.o \
+       corelib_enhmeta.o \
+       corelib_evtloop.o \
+       corelib_font.o \
+       corelib_fontenum.o \
+       corelib_fontutil.o \
+       corelib_gdiimage.o \
+       corelib_gdiobj.o \
+       corelib_gsockmsw.o \
+       corelib_icon.o \
+       corelib_minifram.o \
+       corelib_dataobj.o \
+       corelib_dropsrc.o \
+       corelib_droptgt.o \
+       corelib_oleutils.o \
+       corelib_palette.o \
+       corelib_pen.o \
+       corelib_popupwin.o \
+       corelib_printdlg.o \
+       corelib_printwin.o \
+       corelib_region.o \
+       corelib_renderer.o \
+       corelib_settings.o \
+       corelib_timer.o \
+       corelib_tooltip.o \
+       corelib_toplevel.o \
+       corelib_utilsgui.o \
+       corelib_uxtheme.o \
+       corelib_window.o
+@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_6)
+COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_6 =  \
+       corelib_caret.o \
+       corelib_dialup.o \
+       corelib_fontenum.o \
+       corelib_fontutil.o \
+       corelib_utilsx11.o \
+       corelib_displayx11.o \
+       corelib_timer.o \
+       corelib_app.o \
+       corelib_bitmap.o \
+       corelib_brush.o \
+       corelib_clipbrd.o \
+       corelib_colour.o \
+       corelib_cursor.o \
+       corelib_data.o \
+       corelib_dataobj.o \
+       corelib_dc.o \
+       corelib_dcclient.o \
+       corelib_dcmemory.o \
+       corelib_dcscreen.o \
+       corelib_evtloop.o \
+       corelib_font.o \
+       corelib_gdiobj.o \
+       corelib_gsockx11.o \
+       corelib_icon.o \
+       corelib_main.o \
+       corelib_minifram.o \
+       corelib_nanox.o \
+       corelib_palette.o \
+       corelib_pen.o \
+       corelib_popupwin.o \
+       corelib_region.o \
+       corelib_reparent.o \
+       corelib_settings.o \
+       corelib_toplevel.o \
+       corelib_utils.o \
+       corelib_utilsx.o \
+       corelib_window.o
+@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_6 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_6)
+COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 =  \
+       corelib_NSBox.o \
+       corelib_NSButton.o \
+       corelib_NSControl.o \
+       corelib_NSMenu.o \
+       corelib_NSPanel.o \
+       corelib_NSScroller.o \
+       corelib_NSTabView.o \
+       corelib_NSTableView.o \
+       corelib_NSTextField.o \
+       corelib_NSView.o \
+       corelib_NSWindow.o \
+       corelib_ObjcRef.o \
        corelib_app.o \
        corelib_bitmap.o \
        corelib_bmpbuttn.o \
@@ -5865,11 +7443,7 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 =  \
        corelib_regiong.o \
        corelib_statusbr.o \
        corelib_tabg.o \
-       corelib_timer.o \
-       corelib_cfstring.o \
-       corelib_gsockosx.o \
-       corelib_stdpaths_cf.o \
-       corelib_utilsexc_cf.o
+       corelib_timer.o
 @COND_TOOLKIT_COCOA@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3)
 COND_TOOLKIT_GTK___GUI_SRC_OBJECTS_3 =  \
        corelib_accel.o \
@@ -6000,9 +7574,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 =  \
        corelib_statusbr.o \
        corelib_tabg.o \
        corelib_snglinst.o \
-       corelib_webkit.o \
-       corelib_gsockosx.o \
-       corelib_utilsexc_cf.o
+       corelib_webkit.o
 @COND_TOOLKIT_MAC@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3)
 COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 =  \
        corelib_accel.o \
@@ -6261,43 +7833,265 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 =  \
        corelib_tbarwce.o \
        corelib_textctrlce.o
 @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3)
-COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname = \
-       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__advdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname)
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__install_advdll___depname \
-@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = install_advdll
-COND_PLATFORM_MACOSX_1___advdll___macinstnamecmd = -install_name \
-       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
-@COND_PLATFORM_MACOSX_1@__advdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___advdll___macinstnamecmd)
-COND_PLATFORM_OS2_1___advdll___importlib = -import \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__advdll___importlib = $(COND_PLATFORM_OS2_1___advdll___importlib)
-COND_PLATFORM_WIN32_1___advdll___importlib = \
-       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_WIN32_1@__advdll___importlib = $(COND_PLATFORM_WIN32_1___advdll___importlib)
-@COND_GCC_PCH_1@__advdll_PCH_INC = -I.pch/wxprec_advdll
-@COND_GCC_PCH_1@___pch_wxprec_advdll_wx_wxprec_h_gch___depname \
-@COND_GCC_PCH_1@       = .pch/wxprec_advdll/wx/wxprec.h.gch
-COND_USE_SOVERLINUX_1___advdll___soname_flags = \
-       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__advdll___soname_flags = $(COND_USE_SOVERLINUX_1___advdll___soname_flags)
-COND_USE_SOVERSOLARIS_1___advdll___soname_flags = \
-       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__advdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___advdll___soname_flags)
-COND_USE_SOSYMLINKS_1___advdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__advdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___advdll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___advdll___so_symlinks_inst_cmd = rm -f \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
+@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_7 = \
+@COND_TOOLKIT_COCOA@   corelib_gsockosx.o corelib_utilsexc_cf.o
+COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_7 =  \
+       corelib_caret.o \
+       corelib_dialup.o \
+       corelib_fontenum.o \
+       corelib_fontutil.o \
+       corelib_utilsx11.o \
+       corelib_displayx11.o \
+       corelib_paletteg.o \
+       corelib_app.o \
+       corelib_bitmap.o \
+       corelib_brush.o \
+       corelib_clipbrd.o \
+       corelib_colour.o \
+       corelib_cursor.o \
+       corelib_data.o \
+       corelib_dataobj.o \
+       corelib_dc.o \
+       corelib_dcclient.o \
+       corelib_dcmemory.o \
+       corelib_dcscreen.o \
+       corelib_dnd.o \
+       corelib_evtloop.o \
+       corelib_font.o \
+       corelib_gdiobj.o \
+       corelib_gsockgtk.o \
+       corelib_icon.o \
+       corelib_main.o \
+       corelib_minifram.o \
+       corelib_pen.o \
+       corelib_popupwin.o \
+       corelib_region.o \
+       corelib_renderer.o \
+       corelib_settings.o \
+       corelib_timer.o \
+       corelib_tooltip.o \
+       corelib_toplevel.o \
+       corelib_utilsgtk.o \
+       corelib_win_gtk.o \
+       corelib_window.o
+@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_7)
+@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_7 = \
+@COND_TOOLKIT_MAC@     $(__MAC_LOWLEVEL_SRC_OBJECTS_9)
+COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_7 =  \
+       corelib_caret.o \
+       corelib_timer.o \
+       corelib_app.o \
+       corelib_bitmap.o \
+       corelib_brush.o \
+       corelib_clipbrd.o \
+       corelib_colour.o \
+       corelib_cursor.o \
+       corelib_data.o \
+       corelib_dc.o \
+       corelib_dcclient.o \
+       corelib_dcmemory.o \
+       corelib_dcscreen.o \
+       corelib_dirmgl.o \
+       corelib_evtloop.o \
+       corelib_font.o \
+       corelib_fontenum.o \
+       corelib_fontutil.o \
+       corelib_gdiobj.o \
+       corelib_icon.o \
+       corelib_palette.o \
+       corelib_pen.o \
+       corelib_region.o \
+       corelib_settings.o \
+       corelib_toplevel.o \
+       corelib_utils.o \
+       corelib_window.o
+@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_7)
+COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_7 =  \
+       corelib_caret.o \
+       corelib_dialup.o \
+       corelib_fontenum.o \
+       corelib_fontutil.o \
+       corelib_utilsx11.o \
+       corelib_displayx11.o \
+       corelib_bitmap.o \
+       corelib_brush.o \
+       corelib_pen.o \
+       corelib_region.o \
+       corelib_utilsx.o
+@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_7)
+COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 =  \
+       corelib_app.o \
+       corelib_bitmap.o \
+       corelib_brush.o \
+       corelib_caret.o \
+       corelib_clipbrd.o \
+       corelib_colour.o \
+       corelib_cursor.o \
+       corelib_data.o \
+       corelib_dc.o \
+       corelib_dcclient.o \
+       corelib_dcmemory.o \
+       corelib_dcprint.o \
+       corelib_dcscreen.o \
+       corelib_dialup.o \
+       corelib_dib.o \
+       corelib_display.o \
+       corelib_enhmeta.o \
+       corelib_evtloop.o \
+       corelib_font.o \
+       corelib_fontenum.o \
+       corelib_fontutil.o \
+       corelib_gdiimage.o \
+       corelib_gdiobj.o \
+       corelib_gsockmsw.o \
+       corelib_icon.o \
+       corelib_minifram.o \
+       corelib_dataobj.o \
+       corelib_dropsrc.o \
+       corelib_droptgt.o \
+       corelib_oleutils.o \
+       corelib_palette.o \
+       corelib_pen.o \
+       corelib_popupwin.o \
+       corelib_printdlg.o \
+       corelib_printwin.o \
+       corelib_region.o \
+       corelib_renderer.o \
+       corelib_settings.o \
+       corelib_timer.o \
+       corelib_tooltip.o \
+       corelib_toplevel.o \
+       corelib_utilsgui.o \
+       corelib_uxtheme.o \
+       corelib_window.o \
+       corelib_helpchm.o \
+       corelib_helpwin.o \
+       corelib_automtn.o \
+       corelib_uuid.o
+@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7)
+@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_7 = 
+COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_7 =  \
+       corelib_app.o \
+       corelib_bitmap.o \
+       corelib_brush.o \
+       corelib_caret.o \
+       corelib_clipbrd.o \
+       corelib_colour.o \
+       corelib_cursor.o \
+       corelib_data.o \
+       corelib_dc.o \
+       corelib_dcclient.o \
+       corelib_dcmemory.o \
+       corelib_dcprint.o \
+       corelib_dcscreen.o \
+       corelib_dialup.o \
+       corelib_dib.o \
+       corelib_display.o \
+       corelib_enhmeta.o \
+       corelib_evtloop.o \
+       corelib_font.o \
+       corelib_fontenum.o \
+       corelib_fontutil.o \
+       corelib_gdiimage.o \
+       corelib_gdiobj.o \
+       corelib_gsockmsw.o \
+       corelib_icon.o \
+       corelib_minifram.o \
+       corelib_dataobj.o \
+       corelib_dropsrc.o \
+       corelib_droptgt.o \
+       corelib_oleutils.o \
+       corelib_palette.o \
+       corelib_pen.o \
+       corelib_popupwin.o \
+       corelib_printdlg.o \
+       corelib_printwin.o \
+       corelib_region.o \
+       corelib_renderer.o \
+       corelib_settings.o \
+       corelib_timer.o \
+       corelib_tooltip.o \
+       corelib_toplevel.o \
+       corelib_utilsgui.o \
+       corelib_uxtheme.o \
+       corelib_window.o
+@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_7)
+COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 =  \
+       corelib_caret.o \
+       corelib_dialup.o \
+       corelib_fontenum.o \
+       corelib_fontutil.o \
+       corelib_utilsx11.o \
+       corelib_displayx11.o \
+       corelib_timer.o \
+       corelib_app.o \
+       corelib_bitmap.o \
+       corelib_brush.o \
+       corelib_clipbrd.o \
+       corelib_colour.o \
+       corelib_cursor.o \
+       corelib_data.o \
+       corelib_dataobj.o \
+       corelib_dc.o \
+       corelib_dcclient.o \
+       corelib_dcmemory.o \
+       corelib_dcscreen.o \
+       corelib_evtloop.o \
+       corelib_font.o \
+       corelib_gdiobj.o \
+       corelib_gsockx11.o \
+       corelib_icon.o \
+       corelib_main.o \
+       corelib_minifram.o \
+       corelib_nanox.o \
+       corelib_palette.o \
+       corelib_pen.o \
+       corelib_popupwin.o \
+       corelib_region.o \
+       corelib_reparent.o \
+       corelib_settings.o \
+       corelib_toplevel.o \
+       corelib_utils.o \
+       corelib_utilsx.o \
+       corelib_window.o
+@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_7 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7)
+COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname = \
+       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__advdll___depname = $(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname)
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@__install_advdll___depname \
+@COND_MONOLITHIC_0_SHARED_1_USE_GUI_1@ = install_advdll
+COND_PLATFORM_MACOSX_1___advdll___macinstnamecmd = -install_name \
+       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_PLATFORM_MACOSX_1@__advdll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___advdll___macinstnamecmd)
+COND_PLATFORM_OS2_1___advdll___importlib = -import \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_PLATFORM_OS2_1@__advdll___importlib = $(COND_PLATFORM_OS2_1___advdll___importlib)
+COND_PLATFORM_WIN32_1___advdll___importlib = \
+       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_PLATFORM_WIN32_1@__advdll___importlib = $(COND_PLATFORM_WIN32_1___advdll___importlib)
+@COND_GCC_PCH_1@__advdll_PCH_INC = -I.pch/wxprec_advdll
+@COND_GCC_PCH_1@___pch_wxprec_advdll_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_advdll/wx/wxprec.h.gch
+COND_USE_SOVERLINUX_1___advdll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_USE_SOVERLINUX_1@__advdll___soname_flags = $(COND_USE_SOVERLINUX_1___advdll___soname_flags)
+COND_USE_SOVERSOLARIS_1___advdll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_USE_SOVERSOLARIS_1@__advdll___soname_flags = $(COND_USE_SOVERSOLARIS_1___advdll___soname_flags)
+COND_USE_SOSYMLINKS_1___advdll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOSYMLINKS_1@__advdll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___advdll___so_symlinks_cmd)
+COND_USE_SOSYMLINKS_1___advdll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
        $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
        $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
        $(LN_S) \
@@ -6693,986 +8487,114 @@ COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_inst_cmd = rm -f \
        $(LN_S) \
        $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
        $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_inst_cmd)
-COND_MONOLITHIC_0_SHARED_0_USE_XRC_1___xrclib___depname = \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@__xrclib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_XRC_1___xrclib___depname)
-@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@__install_xrclib___depname \
-@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ = install_xrclib
-@COND_GCC_PCH_1@__xrclib_PCH_INC = -I.pch/wxprec_xrclib
-@COND_GCC_PCH_1@___pch_wxprec_xrclib_wx_wxprec_h_gch___depname \
-@COND_GCC_PCH_1@       = .pch/wxprec_xrclib/wx/wxprec.h.gch
-COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname = \
-       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__gldll___depname = $(COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname)
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__install_gldll___depname \
-@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ = install_gldll
-COND_PLATFORM_MACOSX_1___gldll___macinstnamecmd = -install_name \
-       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
-@COND_PLATFORM_MACOSX_1@__gldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___gldll___macinstnamecmd)
-COND_PLATFORM_OS2_1___gldll___importlib = -import \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_OS2_1@__gldll___importlib = $(COND_PLATFORM_OS2_1___gldll___importlib)
-COND_PLATFORM_WIN32_1___gldll___importlib = \
-       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_PLATFORM_WIN32_1@__gldll___importlib = $(COND_PLATFORM_WIN32_1___gldll___importlib)
-@COND_GCC_PCH_1@__gldll_PCH_INC = -I.pch/wxprec_gldll
-@COND_GCC_PCH_1@___pch_wxprec_gldll_wx_wxprec_h_gch___depname \
-@COND_GCC_PCH_1@       = .pch/wxprec_gldll/wx/wxprec.h.gch
-COND_USE_SOVERLINUX_1___gldll___soname_flags = \
-       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
-@COND_USE_SOVERLINUX_1@__gldll___soname_flags = $(COND_USE_SOVERLINUX_1___gldll___soname_flags)
-COND_USE_SOVERSOLARIS_1___gldll___soname_flags = \
-       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
-@COND_USE_SOVERSOLARIS_1@__gldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___gldll___soname_flags)
-COND_USE_SOSYMLINKS_1___gldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
-@COND_USE_SOSYMLINKS_1@__gldll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___gldll___so_symlinks_cmd)
-COND_USE_SOSYMLINKS_1___gldll___so_symlinks_inst_cmd = rm -f \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
-       $(LN_S) \
-       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
-       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
-@COND_USE_SOSYMLINKS_1@__gldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___gldll___so_symlinks_inst_cmd)
-@COND_TOOLKIT_COCOA@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
-@COND_TOOLKIT_GTK@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
-@COND_TOOLKIT_MAC@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
-@COND_TOOLKIT_MOTIF@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
-@COND_TOOLKIT_MSW@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
-@COND_TOOLKIT_PM@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
-@COND_TOOLKIT_WINCE@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
-@COND_TOOLKIT_X11@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
-COND_MONOLITHIC_0___WXLIBGLDEP_CORE_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIBGLDEP_CORE_p = $(COND_MONOLITHIC_0___WXLIBGLDEP_CORE_p)
-COND_MONOLITHIC_0___WXLIBGLDEP_BASE_p = \
-       -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_0@__WXLIBGLDEP_BASE_p = $(COND_MONOLITHIC_0___WXLIBGLDEP_BASE_p)
-COND_MONOLITHIC_1___WXLIB_MONO_p = \
-       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
-@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
-COND_SHARED_0_USE_GUI_1_USE_OPENGL_1___gllib___depname = \
-       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@__gllib___depname = $(COND_SHARED_0_USE_GUI_1_USE_OPENGL_1___gllib___depname)
-@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@__install_gllib___depname \
-@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ = install_gllib
-@COND_GCC_PCH_1@__gllib_PCH_INC = -I.pch/wxprec_gllib
-@COND_GCC_PCH_1@___pch_wxprec_gllib_wx_wxprec_h_gch___depname \
-@COND_GCC_PCH_1@       = .pch/wxprec_gllib/wx/wxprec.h.gch
-@COND_TOOLKIT_COCOA@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
-@COND_TOOLKIT_GTK@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
-@COND_TOOLKIT_MAC@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
-@COND_TOOLKIT_MOTIF@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
-@COND_TOOLKIT_MSW@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
-@COND_TOOLKIT_PM@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
-@COND_TOOLKIT_WINCE@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
-@COND_TOOLKIT_X11@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
-COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \
-       $(DLLPREFIX_MODULE)sound_sdl$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
-@COND_WITH_PLUGIN_SDL_1@__sound_sdl___depname = $(COND_WITH_PLUGIN_SDL_1___sound_sdl___depname)
-@COND_WITH_PLUGIN_SDL_1@__install_sound_sdl___depname = install_sound_sdl
-@COND_USE_XRC_1@__wxrc___depname = wxrc
-@COND_USE_XRC_1@__clean_wxrc___depname = clean-wxrc
-@COND_USE_XRC_1@__install_wxrc___depname = install-wxrc
-@COND_USE_GUI_1@__install_afm___depname = install-afm
-@COND_USE_GUI_1@__install_gsafm___depname = install-gsafm
-@COND_TOOLKIT_MAC@__macos_res___depname = lib/libwx_$(TOOLCHAIN_NAME).3.r
-@COND_TOOLKIT_MAC@__macos_res_install___depname = macos-res-install
-@COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).3.r
-@COND_TOOLKIT_COCOA@__cocoa_res_install___depname = cocoa-res-install
-@COND_SHARED_0@____SHARED = 
-@COND_SHARED_1@____SHARED = $(PIC_FLAG)
-@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS = 
-COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS =  \
-       monodll_caret.o \
-       monodll_dialup.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_utilsx11.o \
-       monodll_displayx11.o \
-       monodll_paletteg.o \
-       monodll_app.o \
-       monodll_bitmap.o \
-       monodll_brush.o \
-       monodll_clipbrd.o \
-       monodll_colour.o \
-       monodll_cursor.o \
-       monodll_data.o \
-       monodll_dataobj.o \
-       monodll_dc.o \
-       monodll_dcclient.o \
-       monodll_dcmemory.o \
-       monodll_dcscreen.o \
-       monodll_dnd.o \
-       monodll_evtloop.o \
-       monodll_font.o \
-       monodll_gdiobj.o \
-       monodll_gsockgtk.o \
-       monodll_icon.o \
-       monodll_main.o \
-       monodll_minifram.o \
-       monodll_pen.o \
-       monodll_popupwin.o \
-       monodll_region.o \
-       monodll_renderer.o \
-       monodll_settings.o \
-       monodll_timer.o \
-       monodll_tooltip.o \
-       monodll_toplevel.o \
-       monodll_utilsgtk.o \
-       monodll_win_gtk.o \
-       monodll_window.o
-@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS)
-@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS = 
-COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS =  \
-       monodll_caret.o \
-       monodll_timer.o \
-       monodll_app.o \
-       monodll_bitmap.o \
-       monodll_brush.o \
-       monodll_clipbrd.o \
-       monodll_colour.o \
-       monodll_cursor.o \
-       monodll_data.o \
-       monodll_dc.o \
-       monodll_dcclient.o \
-       monodll_dcmemory.o \
-       monodll_dcscreen.o \
-       monodll_dirmgl.o \
-       monodll_evtloop.o \
-       monodll_font.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_gdiobj.o \
-       monodll_icon.o \
-       monodll_palette.o \
-       monodll_pen.o \
-       monodll_region.o \
-       monodll_settings.o \
-       monodll_toplevel.o \
-       monodll_utils.o \
-       monodll_window.o
-@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS)
-COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS =  \
-       monodll_caret.o \
-       monodll_dialup.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_utilsx11.o \
-       monodll_displayx11.o \
-       monodll_bitmap.o \
-       monodll_brush.o \
-       monodll_pen.o \
-       monodll_region.o \
-       monodll_utilsx.o
-@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS)
-COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS =  \
-       monodll_app.o \
-       monodll_bitmap.o \
-       monodll_brush.o \
-       monodll_caret.o \
-       monodll_clipbrd.o \
-       monodll_colour.o \
-       monodll_cursor.o \
-       monodll_data.o \
-       monodll_dc.o \
-       monodll_dcclient.o \
-       monodll_dcmemory.o \
-       monodll_dcprint.o \
-       monodll_dcscreen.o \
-       monodll_dialup.o \
-       monodll_dib.o \
-       monodll_display.o \
-       monodll_enhmeta.o \
-       monodll_evtloop.o \
-       monodll_font.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_gdiimage.o \
-       monodll_gdiobj.o \
-       monodll_gsockmsw.o \
-       monodll_icon.o \
-       monodll_minifram.o \
-       monodll_dataobj.o \
-       monodll_dropsrc.o \
-       monodll_droptgt.o \
-       monodll_oleutils.o \
-       monodll_palette.o \
-       monodll_pen.o \
-       monodll_popupwin.o \
-       monodll_printdlg.o \
-       monodll_printwin.o \
-       monodll_region.o \
-       monodll_renderer.o \
-       monodll_settings.o \
-       monodll_timer.o \
-       monodll_tooltip.o \
-       monodll_toplevel.o \
-       monodll_utilsgui.o \
-       monodll_uxtheme.o \
-       monodll_window.o \
-       monodll_helpchm.o \
-       monodll_helpwin.o \
-       monodll_automtn.o \
-       monodll_uuid.o
-@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS)
-@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS = 
-COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS =  \
-       monodll_app.o \
-       monodll_bitmap.o \
-       monodll_brush.o \
-       monodll_caret.o \
-       monodll_clipbrd.o \
-       monodll_colour.o \
-       monodll_cursor.o \
-       monodll_data.o \
-       monodll_dc.o \
-       monodll_dcclient.o \
-       monodll_dcmemory.o \
-       monodll_dcprint.o \
-       monodll_dcscreen.o \
-       monodll_dialup.o \
-       monodll_dib.o \
-       monodll_display.o \
-       monodll_enhmeta.o \
-       monodll_evtloop.o \
-       monodll_font.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_gdiimage.o \
-       monodll_gdiobj.o \
-       monodll_gsockmsw.o \
-       monodll_icon.o \
-       monodll_minifram.o \
-       monodll_dataobj.o \
-       monodll_dropsrc.o \
-       monodll_droptgt.o \
-       monodll_oleutils.o \
-       monodll_palette.o \
-       monodll_pen.o \
-       monodll_popupwin.o \
-       monodll_printdlg.o \
-       monodll_printwin.o \
-       monodll_region.o \
-       monodll_renderer.o \
-       monodll_settings.o \
-       monodll_timer.o \
-       monodll_tooltip.o \
-       monodll_toplevel.o \
-       monodll_utilsgui.o \
-       monodll_uxtheme.o \
-       monodll_window.o
-@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS)
-COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS =  \
-       monodll_caret.o \
-       monodll_dialup.o \
-       monodll_fontenum.o \
-       monodll_fontutil.o \
-       monodll_utilsx11.o \
-       monodll_displayx11.o \
-       monodll_timer.o \
-       monodll_app.o \
-       monodll_bitmap.o \
-       monodll_brush.o \
-       monodll_clipbrd.o \
-       monodll_colour.o \
-       monodll_cursor.o \
-       monodll_data.o \
-       monodll_dataobj.o \
-       monodll_dc.o \
-       monodll_dcclient.o \
-       monodll_dcmemory.o \
-       monodll_dcscreen.o \
-       monodll_evtloop.o \
-       monodll_font.o \
-       monodll_gdiobj.o \
-       monodll_gsockx11.o \
-       monodll_icon.o \
-       monodll_main.o \
-       monodll_minifram.o \
-       monodll_nanox.o \
-       monodll_palette.o \
-       monodll_pen.o \
-       monodll_popupwin.o \
-       monodll_region.o \
-       monodll_reparent.o \
-       monodll_settings.o \
-       monodll_toplevel.o \
-       monodll_utils.o \
-       monodll_utilsx.o \
-       monodll_window.o
-@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS)
-@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_0 = 
-COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0 =  \
-       monolib_caret.o \
-       monolib_dialup.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_utilsx11.o \
-       monolib_displayx11.o \
-       monolib_paletteg.o \
-       monolib_app.o \
-       monolib_bitmap.o \
-       monolib_brush.o \
-       monolib_clipbrd.o \
-       monolib_colour.o \
-       monolib_cursor.o \
-       monolib_data.o \
-       monolib_dataobj.o \
-       monolib_dc.o \
-       monolib_dcclient.o \
-       monolib_dcmemory.o \
-       monolib_dcscreen.o \
-       monolib_dnd.o \
-       monolib_evtloop.o \
-       monolib_font.o \
-       monolib_gdiobj.o \
-       monolib_gsockgtk.o \
-       monolib_icon.o \
-       monolib_main.o \
-       monolib_minifram.o \
-       monolib_pen.o \
-       monolib_popupwin.o \
-       monolib_region.o \
-       monolib_renderer.o \
-       monolib_settings.o \
-       monolib_timer.o \
-       monolib_tooltip.o \
-       monolib_toplevel.o \
-       monolib_utilsgtk.o \
-       monolib_win_gtk.o \
-       monolib_window.o
-@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_0)
-@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_0 = 
-COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_0 =  \
-       monolib_caret.o \
-       monolib_timer.o \
-       monolib_app.o \
-       monolib_bitmap.o \
-       monolib_brush.o \
-       monolib_clipbrd.o \
-       monolib_colour.o \
-       monolib_cursor.o \
-       monolib_data.o \
-       monolib_dc.o \
-       monolib_dcclient.o \
-       monolib_dcmemory.o \
-       monolib_dcscreen.o \
-       monolib_dirmgl.o \
-       monolib_evtloop.o \
-       monolib_font.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_gdiobj.o \
-       monolib_icon.o \
-       monolib_palette.o \
-       monolib_pen.o \
-       monolib_region.o \
-       monolib_settings.o \
-       monolib_toplevel.o \
-       monolib_utils.o \
-       monolib_window.o
-@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_0)
-COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_0 =  \
-       monolib_caret.o \
-       monolib_dialup.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_utilsx11.o \
-       monolib_displayx11.o \
-       monolib_bitmap.o \
-       monolib_brush.o \
-       monolib_pen.o \
-       monolib_region.o \
-       monolib_utilsx.o
-@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_0)
-COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0 =  \
-       monolib_app.o \
-       monolib_bitmap.o \
-       monolib_brush.o \
-       monolib_caret.o \
-       monolib_clipbrd.o \
-       monolib_colour.o \
-       monolib_cursor.o \
-       monolib_data.o \
-       monolib_dc.o \
-       monolib_dcclient.o \
-       monolib_dcmemory.o \
-       monolib_dcprint.o \
-       monolib_dcscreen.o \
-       monolib_dialup.o \
-       monolib_dib.o \
-       monolib_display.o \
-       monolib_enhmeta.o \
-       monolib_evtloop.o \
-       monolib_font.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_gdiimage.o \
-       monolib_gdiobj.o \
-       monolib_gsockmsw.o \
-       monolib_icon.o \
-       monolib_minifram.o \
-       monolib_dataobj.o \
-       monolib_dropsrc.o \
-       monolib_droptgt.o \
-       monolib_oleutils.o \
-       monolib_palette.o \
-       monolib_pen.o \
-       monolib_popupwin.o \
-       monolib_printdlg.o \
-       monolib_printwin.o \
-       monolib_region.o \
-       monolib_renderer.o \
-       monolib_settings.o \
-       monolib_timer.o \
-       monolib_tooltip.o \
-       monolib_toplevel.o \
-       monolib_utilsgui.o \
-       monolib_uxtheme.o \
-       monolib_window.o \
-       monolib_helpchm.o \
-       monolib_helpwin.o \
-       monolib_automtn.o \
-       monolib_uuid.o
-@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_0)
-@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_0 = 
-COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_0 =  \
-       monolib_app.o \
-       monolib_bitmap.o \
-       monolib_brush.o \
-       monolib_caret.o \
-       monolib_clipbrd.o \
-       monolib_colour.o \
-       monolib_cursor.o \
-       monolib_data.o \
-       monolib_dc.o \
-       monolib_dcclient.o \
-       monolib_dcmemory.o \
-       monolib_dcprint.o \
-       monolib_dcscreen.o \
-       monolib_dialup.o \
-       monolib_dib.o \
-       monolib_display.o \
-       monolib_enhmeta.o \
-       monolib_evtloop.o \
-       monolib_font.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_gdiimage.o \
-       monolib_gdiobj.o \
-       monolib_gsockmsw.o \
-       monolib_icon.o \
-       monolib_minifram.o \
-       monolib_dataobj.o \
-       monolib_dropsrc.o \
-       monolib_droptgt.o \
-       monolib_oleutils.o \
-       monolib_palette.o \
-       monolib_pen.o \
-       monolib_popupwin.o \
-       monolib_printdlg.o \
-       monolib_printwin.o \
-       monolib_region.o \
-       monolib_renderer.o \
-       monolib_settings.o \
-       monolib_timer.o \
-       monolib_tooltip.o \
-       monolib_toplevel.o \
-       monolib_utilsgui.o \
-       monolib_uxtheme.o \
-       monolib_window.o
-@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_0)
-COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0 =  \
-       monolib_caret.o \
-       monolib_dialup.o \
-       monolib_fontenum.o \
-       monolib_fontutil.o \
-       monolib_utilsx11.o \
-       monolib_displayx11.o \
-       monolib_timer.o \
-       monolib_app.o \
-       monolib_bitmap.o \
-       monolib_brush.o \
-       monolib_clipbrd.o \
-       monolib_colour.o \
-       monolib_cursor.o \
-       monolib_data.o \
-       monolib_dataobj.o \
-       monolib_dc.o \
-       monolib_dcclient.o \
-       monolib_dcmemory.o \
-       monolib_dcscreen.o \
-       monolib_evtloop.o \
-       monolib_font.o \
-       monolib_gdiobj.o \
-       monolib_gsockx11.o \
-       monolib_icon.o \
-       monolib_main.o \
-       monolib_minifram.o \
-       monolib_nanox.o \
-       monolib_palette.o \
-       monolib_pen.o \
-       monolib_popupwin.o \
-       monolib_region.o \
-       monolib_reparent.o \
-       monolib_settings.o \
-       monolib_toplevel.o \
-       monolib_utils.o \
-       monolib_utilsx.o \
-       monolib_window.o
-@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_0 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_0)
-@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_8 = 
-COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8 =  \
-       coredll_caret.o \
-       coredll_dialup.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_utilsx11.o \
-       coredll_displayx11.o \
-       coredll_paletteg.o \
-       coredll_app.o \
-       coredll_bitmap.o \
-       coredll_brush.o \
-       coredll_clipbrd.o \
-       coredll_colour.o \
-       coredll_cursor.o \
-       coredll_data.o \
-       coredll_dataobj.o \
-       coredll_dc.o \
-       coredll_dcclient.o \
-       coredll_dcmemory.o \
-       coredll_dcscreen.o \
-       coredll_dnd.o \
-       coredll_evtloop.o \
-       coredll_font.o \
-       coredll_gdiobj.o \
-       coredll_gsockgtk.o \
-       coredll_icon.o \
-       coredll_main.o \
-       coredll_minifram.o \
-       coredll_pen.o \
-       coredll_popupwin.o \
-       coredll_region.o \
-       coredll_renderer.o \
-       coredll_settings.o \
-       coredll_timer.o \
-       coredll_tooltip.o \
-       coredll_toplevel.o \
-       coredll_utilsgtk.o \
-       coredll_win_gtk.o \
-       coredll_window.o
-@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_8)
-@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_8 = 
-COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_8 =  \
-       coredll_caret.o \
-       coredll_timer.o \
-       coredll_app.o \
-       coredll_bitmap.o \
-       coredll_brush.o \
-       coredll_clipbrd.o \
-       coredll_colour.o \
-       coredll_cursor.o \
-       coredll_data.o \
-       coredll_dc.o \
-       coredll_dcclient.o \
-       coredll_dcmemory.o \
-       coredll_dcscreen.o \
-       coredll_dirmgl.o \
-       coredll_evtloop.o \
-       coredll_font.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_gdiobj.o \
-       coredll_icon.o \
-       coredll_palette.o \
-       coredll_pen.o \
-       coredll_region.o \
-       coredll_settings.o \
-       coredll_toplevel.o \
-       coredll_utils.o \
-       coredll_window.o
-@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_8)
-COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8 =  \
-       coredll_caret.o \
-       coredll_dialup.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_utilsx11.o \
-       coredll_displayx11.o \
-       coredll_bitmap.o \
-       coredll_brush.o \
-       coredll_pen.o \
-       coredll_region.o \
-       coredll_utilsx.o
-@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_8)
-COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8 =  \
-       coredll_app.o \
-       coredll_bitmap.o \
-       coredll_brush.o \
-       coredll_caret.o \
-       coredll_clipbrd.o \
-       coredll_colour.o \
-       coredll_cursor.o \
-       coredll_data.o \
-       coredll_dc.o \
-       coredll_dcclient.o \
-       coredll_dcmemory.o \
-       coredll_dcprint.o \
-       coredll_dcscreen.o \
-       coredll_dialup.o \
-       coredll_dib.o \
-       coredll_display.o \
-       coredll_enhmeta.o \
-       coredll_evtloop.o \
-       coredll_font.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_gdiimage.o \
-       coredll_gdiobj.o \
-       coredll_gsockmsw.o \
-       coredll_icon.o \
-       coredll_minifram.o \
-       coredll_dataobj.o \
-       coredll_dropsrc.o \
-       coredll_droptgt.o \
-       coredll_oleutils.o \
-       coredll_palette.o \
-       coredll_pen.o \
-       coredll_popupwin.o \
-       coredll_printdlg.o \
-       coredll_printwin.o \
-       coredll_region.o \
-       coredll_renderer.o \
-       coredll_settings.o \
-       coredll_timer.o \
-       coredll_tooltip.o \
-       coredll_toplevel.o \
-       coredll_utilsgui.o \
-       coredll_uxtheme.o \
-       coredll_window.o \
-       coredll_helpchm.o \
-       coredll_helpwin.o \
-       coredll_automtn.o \
-       coredll_uuid.o
-@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_8)
-@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_8 = 
-COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_8 =  \
-       coredll_app.o \
-       coredll_bitmap.o \
-       coredll_brush.o \
-       coredll_caret.o \
-       coredll_clipbrd.o \
-       coredll_colour.o \
-       coredll_cursor.o \
-       coredll_data.o \
-       coredll_dc.o \
-       coredll_dcclient.o \
-       coredll_dcmemory.o \
-       coredll_dcprint.o \
-       coredll_dcscreen.o \
-       coredll_dialup.o \
-       coredll_dib.o \
-       coredll_display.o \
-       coredll_enhmeta.o \
-       coredll_evtloop.o \
-       coredll_font.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_gdiimage.o \
-       coredll_gdiobj.o \
-       coredll_gsockmsw.o \
-       coredll_icon.o \
-       coredll_minifram.o \
-       coredll_dataobj.o \
-       coredll_dropsrc.o \
-       coredll_droptgt.o \
-       coredll_oleutils.o \
-       coredll_palette.o \
-       coredll_pen.o \
-       coredll_popupwin.o \
-       coredll_printdlg.o \
-       coredll_printwin.o \
-       coredll_region.o \
-       coredll_renderer.o \
-       coredll_settings.o \
-       coredll_timer.o \
-       coredll_tooltip.o \
-       coredll_toplevel.o \
-       coredll_utilsgui.o \
-       coredll_uxtheme.o \
-       coredll_window.o
-@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_8)
-COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8 =  \
-       coredll_caret.o \
-       coredll_dialup.o \
-       coredll_fontenum.o \
-       coredll_fontutil.o \
-       coredll_utilsx11.o \
-       coredll_displayx11.o \
-       coredll_timer.o \
-       coredll_app.o \
-       coredll_bitmap.o \
-       coredll_brush.o \
-       coredll_clipbrd.o \
-       coredll_colour.o \
-       coredll_cursor.o \
-       coredll_data.o \
-       coredll_dataobj.o \
-       coredll_dc.o \
-       coredll_dcclient.o \
-       coredll_dcmemory.o \
-       coredll_dcscreen.o \
-       coredll_evtloop.o \
-       coredll_font.o \
-       coredll_gdiobj.o \
-       coredll_gsockx11.o \
-       coredll_icon.o \
-       coredll_main.o \
-       coredll_minifram.o \
-       coredll_nanox.o \
-       coredll_palette.o \
-       coredll_pen.o \
-       coredll_popupwin.o \
-       coredll_region.o \
-       coredll_reparent.o \
-       coredll_settings.o \
-       coredll_toplevel.o \
-       coredll_utils.o \
-       coredll_utilsx.o \
-       coredll_window.o
-@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_8 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_8)
-@COND_TOOLKIT_COCOA@__LOWLEVEL_SRC_OBJECTS_9 = 
-COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9 =  \
-       corelib_caret.o \
-       corelib_dialup.o \
-       corelib_fontenum.o \
-       corelib_fontutil.o \
-       corelib_utilsx11.o \
-       corelib_displayx11.o \
-       corelib_paletteg.o \
-       corelib_app.o \
-       corelib_bitmap.o \
-       corelib_brush.o \
-       corelib_clipbrd.o \
-       corelib_colour.o \
-       corelib_cursor.o \
-       corelib_data.o \
-       corelib_dataobj.o \
-       corelib_dc.o \
-       corelib_dcclient.o \
-       corelib_dcmemory.o \
-       corelib_dcscreen.o \
-       corelib_dnd.o \
-       corelib_evtloop.o \
-       corelib_font.o \
-       corelib_gdiobj.o \
-       corelib_gsockgtk.o \
-       corelib_icon.o \
-       corelib_main.o \
-       corelib_minifram.o \
-       corelib_pen.o \
-       corelib_popupwin.o \
-       corelib_region.o \
-       corelib_renderer.o \
-       corelib_settings.o \
-       corelib_timer.o \
-       corelib_tooltip.o \
-       corelib_toplevel.o \
-       corelib_utilsgtk.o \
-       corelib_win_gtk.o \
-       corelib_window.o
-@COND_TOOLKIT_GTK@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_GTK___LOWLEVEL_SRC_OBJECTS_9)
-@COND_TOOLKIT_MAC@__LOWLEVEL_SRC_OBJECTS_9 = 
-COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_9 =  \
-       corelib_caret.o \
-       corelib_timer.o \
-       corelib_app.o \
-       corelib_bitmap.o \
-       corelib_brush.o \
-       corelib_clipbrd.o \
-       corelib_colour.o \
-       corelib_cursor.o \
-       corelib_data.o \
-       corelib_dc.o \
-       corelib_dcclient.o \
-       corelib_dcmemory.o \
-       corelib_dcscreen.o \
-       corelib_dirmgl.o \
-       corelib_evtloop.o \
-       corelib_font.o \
-       corelib_fontenum.o \
-       corelib_fontutil.o \
-       corelib_gdiobj.o \
-       corelib_icon.o \
-       corelib_palette.o \
-       corelib_pen.o \
-       corelib_region.o \
-       corelib_settings.o \
-       corelib_toplevel.o \
-       corelib_utils.o \
-       corelib_window.o
-@COND_TOOLKIT_MGL@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_9)
-COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_9 =  \
-       corelib_caret.o \
-       corelib_dialup.o \
-       corelib_fontenum.o \
-       corelib_fontutil.o \
-       corelib_utilsx11.o \
-       corelib_displayx11.o \
-       corelib_bitmap.o \
-       corelib_brush.o \
-       corelib_pen.o \
-       corelib_region.o \
-       corelib_utilsx.o
-@COND_TOOLKIT_MOTIF@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MOTIF___LOWLEVEL_SRC_OBJECTS_9)
-COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9 =  \
-       corelib_app.o \
-       corelib_bitmap.o \
-       corelib_brush.o \
-       corelib_caret.o \
-       corelib_clipbrd.o \
-       corelib_colour.o \
-       corelib_cursor.o \
-       corelib_data.o \
-       corelib_dc.o \
-       corelib_dcclient.o \
-       corelib_dcmemory.o \
-       corelib_dcprint.o \
-       corelib_dcscreen.o \
-       corelib_dialup.o \
-       corelib_dib.o \
-       corelib_display.o \
-       corelib_enhmeta.o \
-       corelib_evtloop.o \
-       corelib_font.o \
-       corelib_fontenum.o \
-       corelib_fontutil.o \
-       corelib_gdiimage.o \
-       corelib_gdiobj.o \
-       corelib_gsockmsw.o \
-       corelib_icon.o \
-       corelib_minifram.o \
-       corelib_dataobj.o \
-       corelib_dropsrc.o \
-       corelib_droptgt.o \
-       corelib_oleutils.o \
-       corelib_palette.o \
-       corelib_pen.o \
-       corelib_popupwin.o \
-       corelib_printdlg.o \
-       corelib_printwin.o \
-       corelib_region.o \
-       corelib_renderer.o \
-       corelib_settings.o \
-       corelib_timer.o \
-       corelib_tooltip.o \
-       corelib_toplevel.o \
-       corelib_utilsgui.o \
-       corelib_uxtheme.o \
-       corelib_window.o \
-       corelib_helpchm.o \
-       corelib_helpwin.o \
-       corelib_automtn.o \
-       corelib_uuid.o
-@COND_TOOLKIT_MSW@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_9)
-@COND_TOOLKIT_PM@__LOWLEVEL_SRC_OBJECTS_9 = 
-COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_9 =  \
-       corelib_app.o \
-       corelib_bitmap.o \
-       corelib_brush.o \
-       corelib_caret.o \
-       corelib_clipbrd.o \
-       corelib_colour.o \
-       corelib_cursor.o \
-       corelib_data.o \
-       corelib_dc.o \
-       corelib_dcclient.o \
-       corelib_dcmemory.o \
-       corelib_dcprint.o \
-       corelib_dcscreen.o \
-       corelib_dialup.o \
-       corelib_dib.o \
-       corelib_display.o \
-       corelib_enhmeta.o \
-       corelib_evtloop.o \
-       corelib_font.o \
-       corelib_fontenum.o \
-       corelib_fontutil.o \
-       corelib_gdiimage.o \
-       corelib_gdiobj.o \
-       corelib_gsockmsw.o \
-       corelib_icon.o \
-       corelib_minifram.o \
-       corelib_dataobj.o \
-       corelib_dropsrc.o \
-       corelib_droptgt.o \
-       corelib_oleutils.o \
-       corelib_palette.o \
-       corelib_pen.o \
-       corelib_popupwin.o \
-       corelib_printdlg.o \
-       corelib_printwin.o \
-       corelib_region.o \
-       corelib_renderer.o \
-       corelib_settings.o \
-       corelib_timer.o \
-       corelib_tooltip.o \
-       corelib_toplevel.o \
-       corelib_utilsgui.o \
-       corelib_uxtheme.o \
-       corelib_window.o
-@COND_TOOLKIT_WINCE@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_9)
-COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9 =  \
-       corelib_caret.o \
-       corelib_dialup.o \
-       corelib_fontenum.o \
-       corelib_fontutil.o \
-       corelib_utilsx11.o \
-       corelib_displayx11.o \
-       corelib_timer.o \
-       corelib_app.o \
-       corelib_bitmap.o \
-       corelib_brush.o \
-       corelib_clipbrd.o \
-       corelib_colour.o \
-       corelib_cursor.o \
-       corelib_data.o \
-       corelib_dataobj.o \
-       corelib_dc.o \
-       corelib_dcclient.o \
-       corelib_dcmemory.o \
-       corelib_dcscreen.o \
-       corelib_evtloop.o \
-       corelib_font.o \
-       corelib_gdiobj.o \
-       corelib_gsockx11.o \
-       corelib_icon.o \
-       corelib_main.o \
-       corelib_minifram.o \
-       corelib_nanox.o \
-       corelib_palette.o \
-       corelib_pen.o \
-       corelib_popupwin.o \
-       corelib_region.o \
-       corelib_reparent.o \
-       corelib_settings.o \
-       corelib_toplevel.o \
-       corelib_utils.o \
-       corelib_utilsx.o \
-       corelib_window.o
-@COND_TOOLKIT_X11@__LOWLEVEL_SRC_OBJECTS_9 = $(COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_9)
+@COND_USE_SOSYMLINKS_1@__xrcdll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___xrcdll___so_symlinks_inst_cmd)
+COND_MONOLITHIC_0_SHARED_0_USE_XRC_1___xrclib___depname = \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@__xrclib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_XRC_1___xrclib___depname)
+@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@__install_xrclib___depname \
+@COND_MONOLITHIC_0_SHARED_0_USE_XRC_1@ = install_xrclib
+@COND_GCC_PCH_1@__xrclib_PCH_INC = -I.pch/wxprec_xrclib
+@COND_GCC_PCH_1@___pch_wxprec_xrclib_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_xrclib/wx/wxprec.h.gch
+COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname = \
+       $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__gldll___depname = $(COND_SHARED_1_USE_GUI_1_USE_OPENGL_1___gldll___depname)
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@__install_gldll___depname \
+@COND_SHARED_1_USE_GUI_1_USE_OPENGL_1@ = install_gldll
+COND_PLATFORM_MACOSX_1___gldll___macinstnamecmd = -install_name \
+       $(libdir)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_PLATFORM_MACOSX_1@__gldll___macinstnamecmd = $(COND_PLATFORM_MACOSX_1___gldll___macinstnamecmd)
+COND_PLATFORM_OS2_1___gldll___importlib = -import \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_PLATFORM_OS2_1@__gldll___importlib = $(COND_PLATFORM_OS2_1___gldll___importlib)
+COND_PLATFORM_WIN32_1___gldll___importlib = \
+       -Wl,--out-implib,$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_PLATFORM_WIN32_1@__gldll___importlib = $(COND_PLATFORM_WIN32_1___gldll___importlib)
+@COND_GCC_PCH_1@__gldll_PCH_INC = -I.pch/wxprec_gldll
+@COND_GCC_PCH_1@___pch_wxprec_gldll_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_gldll/wx/wxprec.h.gch
+COND_USE_SOVERLINUX_1___gldll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2)
+@COND_USE_SOVERLINUX_1@__gldll___soname_flags = $(COND_USE_SOVERLINUX_1___gldll___soname_flags)
+COND_USE_SOVERSOLARIS_1___gldll___soname_flags = \
+       $(SONAME_FLAG)$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3)
+@COND_USE_SOVERSOLARIS_1@__gldll___soname_flags = $(COND_USE_SOVERSOLARIS_1___gldll___soname_flags)
+COND_USE_SOSYMLINKS_1___gldll___so_symlinks_cmd = (cd $(LIBDIRNAME)/; rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX))
+@COND_USE_SOSYMLINKS_1@__gldll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___gldll___so_symlinks_cmd)
+COND_USE_SOSYMLINKS_1___gldll___so_symlinks_inst_cmd = rm -f \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2); \
+       $(LN_S) \
+       $(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
+       $(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
+@COND_USE_SOSYMLINKS_1@__gldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___gldll___so_symlinks_inst_cmd)
+@COND_TOOLKIT_COCOA@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_GTK@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_MAC@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_MOTIF@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_MSW@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_PM@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_WINCE@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
+@COND_TOOLKIT_X11@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
+COND_MONOLITHIC_0___WXLIBGLDEP_CORE_p = \
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIBGLDEP_CORE_p = $(COND_MONOLITHIC_0___WXLIBGLDEP_CORE_p)
+COND_MONOLITHIC_0___WXLIBGLDEP_BASE_p = \
+       -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIBGLDEP_BASE_p = $(COND_MONOLITHIC_0___WXLIBGLDEP_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+       -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+COND_SHARED_0_USE_GUI_1_USE_OPENGL_1___gllib___depname = \
+       $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
+@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@__gllib___depname = $(COND_SHARED_0_USE_GUI_1_USE_OPENGL_1___gllib___depname)
+@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@__install_gllib___depname \
+@COND_SHARED_0_USE_GUI_1_USE_OPENGL_1@ = install_gllib
+@COND_GCC_PCH_1@__gllib_PCH_INC = -I.pch/wxprec_gllib
+@COND_GCC_PCH_1@___pch_wxprec_gllib_wx_wxprec_h_gch___depname \
+@COND_GCC_PCH_1@       = .pch/wxprec_gllib/wx/wxprec.h.gch
+@COND_TOOLKIT_COCOA@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
+@COND_TOOLKIT_GTK@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
+@COND_TOOLKIT_MAC@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
+@COND_TOOLKIT_MOTIF@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
+@COND_TOOLKIT_MSW@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
+@COND_TOOLKIT_PM@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
+@COND_TOOLKIT_WINCE@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
+@COND_TOOLKIT_X11@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
+COND_WITH_PLUGIN_SDL_1___sound_sdl___depname = \
+       $(DLLPREFIX_MODULE)sound_sdl$(PLUGINSUFFIX)$(PLUGVERDELIM)$(PLUGIN_VERSION0)$(WXCOMPILER).$(SO_SUFFIX_MODULE)
+@COND_WITH_PLUGIN_SDL_1@__sound_sdl___depname = $(COND_WITH_PLUGIN_SDL_1___sound_sdl___depname)
+@COND_WITH_PLUGIN_SDL_1@__install_sound_sdl___depname = install_sound_sdl
+@COND_USE_XRC_1@__wxrc___depname = wxrc
+@COND_USE_XRC_1@__clean_wxrc___depname = clean-wxrc
+@COND_USE_XRC_1@__install_wxrc___depname = install-wxrc
+@COND_USE_GUI_1@__install_afm___depname = install-afm
+@COND_USE_GUI_1@__install_gsafm___depname = install-gsafm
+@COND_TOOLKIT_MAC@__macos_res___depname = lib/libwx_$(TOOLCHAIN_NAME).3.r
+@COND_TOOLKIT_MAC@__macos_res_install___depname = macos-res-install
+@COND_TOOLKIT_COCOA@__cocoa_res___depname = lib/libwx_$(TOOLCHAIN_NAME).3.r
+@COND_TOOLKIT_COCOA@__cocoa_res_install___depname = cocoa-res-install
+@COND_SHARED_0@____SHARED = 
+@COND_SHARED_1@____SHARED = $(PIC_FLAG)
+@COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS \
+@COND_PLATFORM_MACOSX_1@       = monodll_gsockosx.o monodll_utilsexc_cf.o
+@COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS_0 \
+@COND_PLATFORM_MACOSX_1@       = monolib_gsockosx.o monolib_utilsexc_cf.o
+@COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS_8 \
+@COND_PLATFORM_MACOSX_1@       = coredll_gsockosx.o coredll_utilsexc_cf.o
+@COND_PLATFORM_MACOSX_1@__MAC_LOWLEVEL_SRC_OBJECTS_9 \
+@COND_PLATFORM_MACOSX_1@       = corelib_gsockosx.o corelib_utilsexc_cf.o
 @COND_PLATFORM_MACOSX_0_USE_SOVERSION_1@dll___targetsuf2 = .$(SO_SUFFIX).3
 @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@dll___targetsuf2 = .3.$(SO_SUFFIX)
 @COND_USE_SOVERSION_0@dll___targetsuf2 = .$(SO_SUFFIX)
@@ -9427,6 +10349,9 @@ monodll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_UNIX_1@monodll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monodll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@monodll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -9541,21 +10466,45 @@ monodll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monodll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@monodll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monodll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@monodll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@monodll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@monodll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 @COND_PLATFORM_MACOS_1@monodll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monodll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@monodll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monodll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@monodll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@monodll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@monodll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 @COND_PLATFORM_MACOS_1@monodll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
 @COND_PLATFORM_UNIX_1@monodll_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(MONODLL_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -10525,6 +11474,18 @@ monodll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@monodll_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monodll_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(MONODLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
+
 @COND_TOOLKIT_X11_USE_GUI_1@monodll_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -11539,18 +12500,6 @@ monodll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(MONODLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_drawer.o: $(srcdir)/src/cocoa/drawer.mm $(MONODLL_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
 
@@ -12718,6 +13667,9 @@ monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_UNIX_1@monolib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monolib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@monolib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -12832,21 +13784,45 @@ monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monolib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@monolib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monolib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@monolib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@monolib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@monolib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 @COND_PLATFORM_MACOS_1@monolib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@monolib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@monolib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@monolib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@monolib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@monolib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@monolib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 @COND_PLATFORM_MACOS_1@monolib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
 @COND_PLATFORM_UNIX_1@monolib_utilsunx.o: $(srcdir)/src/unix/utilsunx.cpp $(MONOLIB_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -13816,6 +14792,18 @@ monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@monolib_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@monolib_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(MONOLIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
+
 @COND_TOOLKIT_X11_USE_GUI_1@monolib_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -14830,18 +15818,6 @@ monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(MONOLIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_drawer.o: $(srcdir)/src/cocoa/drawer.mm $(MONOLIB_ODEP)
 @COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
 
@@ -15571,6 +16547,9 @@ basedll_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_UNIX_1@basedll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@basedll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
 @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@basedll_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
@@ -15670,12 +16649,42 @@ basedll_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@basedll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@basedll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@basedll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@basedll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@basedll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@basedll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
 @COND_PLATFORM_MACOS_1@basedll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@basedll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@basedll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@basedll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@basedll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@   $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@basedll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@basedll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASEDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
+
 @COND_PLATFORM_MACOS_1@basedll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASEDLL_ODEP)
 @COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(BASEDLL_CXXFLAGS) $<
 
@@ -16012,6 +17021,9 @@ baselib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_UNIX_1@baselib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_UNIX_1@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@baselib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
 @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@baselib_stdpaths.o: $(srcdir)/src/unix/stdpaths.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
@@ -16111,12 +17123,42 @@ baselib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@baselib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@baselib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@baselib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@baselib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@baselib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@baselib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
 @COND_PLATFORM_MACOS_1@baselib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@baselib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@baselib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@baselib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@baselib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@   $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@baselib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@baselib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_@      $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
+
 @COND_PLATFORM_MACOS_1@baselib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(BASELIB_ODEP)
 @COND_PLATFORM_MACOS_1@        $(CXXC) -c -o $@ $(BASELIB_CXXFLAGS) $<
 
@@ -16378,12 +17420,6 @@ coredll_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(COREDLL_ODEP)
 coredll_regiong.o: $(srcdir)/src/generic/regiong.cpp $(COREDLL_ODEP)
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
-coredll_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-coredll_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(COREDLL_ODEP)
-       $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
 coredll_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(COREDLL_ODEP)
        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -17398,6 +18434,18 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@coredll_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA_USE_GUI_1@coredll_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@coredll_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(COREDLL_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA_USE_GUI_1@coredll_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(COREDLL_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
+
 @COND_TOOLKIT_X11_USE_GUI_1@coredll_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -18412,18 +19460,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@coredll_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(COREDLL_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_mdig.o: $(srcdir)/src/generic/mdig.cpp $(COREDLL_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
 
@@ -18868,12 +19904,6 @@ corelib_utilsexc.o: $(srcdir)/src/cocoa/utilsexc.mm $(CORELIB_ODEP)
 corelib_regiong.o: $(srcdir)/src/generic/regiong.cpp $(CORELIB_ODEP)
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
-corelib_cfstring.o: $(srcdir)/src/mac/corefoundation/cfstring.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-corelib_stdpaths_cf.o: $(srcdir)/src/mac/corefoundation/stdpaths_cf.cpp $(CORELIB_ODEP)
-       $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
 corelib_gsockpm.o: $(srcdir)/src/os2/gsockpm.cpp $(CORELIB_ODEP)
        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -19888,6 +20918,18 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@corelib_uuid.o: $(srcdir)/src/msw/ole/uuid.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_MSW_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA_USE_GUI_1@corelib_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@corelib_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(CORELIB_ODEP)
+@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
+@COND_TOOLKIT_COCOA_USE_GUI_1@corelib_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(CORELIB_ODEP)
+@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
+
 @COND_TOOLKIT_X11_USE_GUI_1@corelib_gsockx11.o: $(srcdir)/src/x11/gsockx11.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_X11_USE_GUI_1@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
@@ -20902,18 +21944,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@corelib_treectrl.o: $(srcdir)/src/msw/treectrl.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_gsockosx.o: $(srcdir)/src/mac/corefoundation/gsockosx.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@  $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_utilsexc_cf.o: $(srcdir)/src/mac/corefoundation/utilsexc_cf.cpp $(CORELIB_ODEP)
-@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@        $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_mdig.o: $(srcdir)/src/generic/mdig.cpp $(CORELIB_ODEP)
 @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@   $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
 

diff --git a/autoconf_inc.m4 b/autoconf_inc.m4
index 7df543d77d9fba616f5503ee584348b85f98f68f..be1066c36c127dae0bc0876935c96d62d8f64e2b 100644 (file)
--- a/autoconf_inc.m4
+++ b/autoconf_inc.m4
@@ -257,6 +257,12 @@ 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_MOTIF ###
     COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF="#"
     if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMOTIF" ; then

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 00e9646d2dd03a85a0bbeb9937d673598038aed9..1cd90f18976ff7077daab11a491e79dc1d961e0d 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -43,6 +43,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!--                               wxBase                                   -->
 <!-- ====================================================================== -->
 
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+<!--                               UNIX                                     -->
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 <set var="BASE_UNIX_SRC" hints="files">
     src/unix/baseunix.cpp
     src/unix/dir.cpp
@@ -63,6 +66,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/unix/stdpaths.h
 </set>
 
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+<!--                             Windows                                    -->
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 <set var="BASE_WIN32_SRC" hints="files">
     src/msw/basemsw.cpp
     src/msw/crashrpt.cpp
@@ -101,6 +107,20 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <if cond="TOOLKIT=='WINCE'">wx/msw/wince/time.h</if>
 </set>
 
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+<!--                                Mac                                     -->
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+
+<!-- Used on Mac OS CarbonLib, Mac OS X wxMac base, and Mac OS X darwin base -->
+<set var="BASE_COREFOUNDATION_SRC" hints="files">
+    src/mac/corefoundation/cfstring.cpp
+    src/mac/corefoundation/stdpaths_cf.cpp
+</set>
+<set var="BASE_COREFOUNDATION_HDR" hints="files">
+    wx/mac/corefoundation/cfstring.h
+    wx/mac/corefoundation/stdpaths.h
+</set>
+
 <!-- Base files used by Carbon on OS X and CarbonLib (not true Classic) -->
 <!-- FIXME: Maybe this ought to be named BASE_MAC_CARBON_SRC  -->
 <set var="BASE_MAC_SRC" hints="files">
@@ -112,14 +132,22 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <!-- One would think MoreFilesX is only for OS X but it seems to
          apply to CarbonLib as well (FSRefMakeFSSpec) -->
     src/mac/carbon/morefilex/MoreFilesX.c
-    <!-- Shared wxMac and wxCocoa files -->
-    src/mac/corefoundation/cfstring.cpp
-    src/mac/corefoundation/stdpaths_cf.cpp
+    $(BASE_COREFOUNDATION_SRC)
+</set>
+<set var="BASE_MAC_HDR" hints="files">
+    $(BASE_COREFOUNDATION_HDR)
+</set>
+<!-- Base and GUI files used by both OS X and CarbonLib -->
+<set var="BASE_AND_GUI_MAC_SRC" hints="files">
+    src/mac/carbon/utils.cpp
+    src/mac/carbon/uma.cpp
 </set>
 
 <!-- Base files used by Classic (not CarbonLib or OS X builds) -->
 <!-- set var="BASE_MAC_CLASSIC_SRC">
 </set -->
+<!-- set var="BASE_MAC_CLASSIC_HDR">
+</set -->
 
 <!-- Base files used only by CarbonLib builds (not Classic or OS X) -->
 <set var="BASE_MAC_CARBONLIB_SRC" hints="files">
@@ -133,24 +161,31 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/mac/carbon/morefile/MoreFilesExtras.c
     src/mac/carbon/morefile/Search.c
 </set>
+<!-- set var="BASE_MAC_CARBONLIB_HDR" hints="files">
+</set -->
 
 <!-- Base files used only by OS X builds (not CarbonLib or Classic)  -->
 <set var="BASE_MAC_OSX_SRC" hints="files">
     src/unix/baseunix.cpp
+    src/unix/stdpaths.cpp
 </set>
-
-<!-- Base and GUI files used by both OS X and CarbonLib -->
-<set var="BASE_AND_GUI_MAC_SRC" hints="files">
-    src/mac/carbon/utils.cpp
-    src/mac/carbon/uma.cpp
+<set var="BASE_MAC_OSX_HDR" hints="files">
+    wx/unix/stdpaths.h
 </set>
 
-<set var="BASE_MAC_HDR" hints="files">
-    <!-- Shared wxMac and wxCocoa files -->
-    wx/mac/corefoundation/cfstring.h
-    wx/mac/corefoundation/stdpaths.h
+<!-- Base files used by non-wxMac OS X builds -->
+<set var="BASE_DARWIN_SRC" hints="files">
+    $(BASE_UNIX_SRC)
+    $(BASE_COREFOUNDATION_SRC)
+</set>
+<set var="BASE_DARWIN_HDR" hints="files">
+    $(BASE_UNIX_HDR)
+    $(BASE_COREFOUNDATION_HDR)
 </set>
 
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+<!--                               OS/2                                     -->
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 <set var="BASE_OS2_SRC" hints="files">
     src/os2/dir.cpp
     src/os2/mimetype.cpp
@@ -168,6 +203,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/stdpaths.h
 </set>
 
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+<!--                              Common                                    -->
+<!-- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
 <set var="BASE_CMN_SRC" hints="files">
     src/common/appbase.cpp
     src/common/clntdata.cpp
@@ -1612,10 +1650,18 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!--                                wxMac                                   -->
 <!-- ====================================================================== -->
 
+<set var="MAC_OSX_LOWLEVEL_SRC" hints="files">
+    <!-- Shared wxMac and wxCocoa files -->
+    src/mac/corefoundation/gsockosx.cpp
+    src/mac/corefoundation/utilsexc_cf.cpp
+</set>
+
 <set var="MAC_LOWLEVEL_SRC" hints="files">
+    <if cond="PLATFORM_MACOSX=='1'">$(MAC_OSX_LOWLEVEL_SRC)</if>
 </set>
 <set var="MAC_LOWLEVEL_HDR" hints="files">
 </set>
+
 <set var="MAC_SRC" hints="files">
     src/mac/carbon/accel.cpp
     src/mac/carbon/aga.cpp
@@ -1703,11 +1749,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <!-- wxWebKit files -->
     src/html/htmlctrl/webkit/webkit.mm
 </set>
-<set var="MAC_OSX_SRC" hints="files">
-    <!-- Shared wxMac and wxCocoa files -->
-    src/mac/corefoundation/gsockosx.cpp
-    src/mac/corefoundation/utilsexc_cf.cpp
-</set>
 
 <!-- Header files like wx/mac/foo.h which include wx/mac/carbon/foo.h -->
 <set var="MAC_CMN_HDR" hints="files">
@@ -1896,6 +1937,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 <!-- ====================================================================== -->
 
 <set var="COCOA_LOWLEVEL_SRC" hints="files">
+    <!-- Shared wxMac and wxCocoa files -->
+    src/mac/corefoundation/gsockosx.cpp
+    src/mac/corefoundation/utilsexc_cf.cpp
 </set>
 <set var="COCOA_LOWLEVEL_HDR" hints="files">
 </set>
@@ -1988,11 +2032,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/statusbr.cpp
     src/generic/tabg.cpp
     src/generic/timer.cpp
-    <!-- Shared wxMac and wxCocoa files -->
-    src/mac/corefoundation/cfstring.cpp
-    src/mac/corefoundation/gsockosx.cpp
-    src/mac/corefoundation/stdpaths_cf.cpp
-    src/mac/corefoundation/utilsexc_cf.cpp
 </set>
 <set var="COCOA_HDR" hints="files">
     wx/cocoa/NSApplication.h
@@ -2076,9 +2115,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/region.h
     wx/generic/statusbr.h
     wx/generic/tabg.h
-    <!-- Shared wxMac and wxCocoa files -->
-    wx/mac/corefoundation/cfstring.h
-    wx/mac/corefoundation/stdpaths.h
 </set>
 
 
@@ -2584,15 +2620,15 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <!-- These are the files for PLATFORM_MACOSX -->
     <set var="BASE_MACOSX_SRC" hints="files">
         <if cond="TOOLKIT=='MAC'">$(BASE_MAC_SRC) $(BASE_MAC_OSX_SRC)</if>
-        <if cond="TOOLKIT=='COCOA'">$(BASE_UNIX_SRC)</if>
-        <if cond="TOOLKIT=='GTK'">$(BASE_UNIX_SRC)</if>
-        <if cond="TOOLKIT=='X11'">$(BASE_UNIX_SRC)</if>
-        <if cond="TOOLKIT=='MOTIF'">$(BASE_UNIX_SRC)</if>
+        <if cond="TOOLKIT=='COCOA'">$(BASE_DARWIN_SRC)</if>
+        <if cond="TOOLKIT=='GTK'">$(BASE_DARWIN_SRC)</if>
+        <if cond="TOOLKIT=='X11'">$(BASE_DARWIN_SRC)</if>
+        <if cond="TOOLKIT=='MOTIF'">$(BASE_DARWIN_SRC)</if>
         <!-- FIXME: TOOLKIT!='MAC' is what we really want -->
         
         <!-- FIXME: a hack because there are two wxBase versions on
                     Mac; once fixed, this would no longer be needed -->
-        <if cond="TOOLKIT==''">$(BASE_UNIX_SRC)</if>
+        <if cond="TOOLKIT==''">$(BASE_DARWIN_SRC)</if>
     </set>
     <set var="BASE_PLATFORM_SRC" hints="files">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_SRC)</if>
@@ -2614,7 +2650,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="BASE_PLATFORM_HDR" hints="files">
         <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if>
         <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)</if>
-        <if cond="TOOLKIT=='MAC'">$(BASE_MAC_HDR)</if>
+        <if cond="TOOLKIT=='MAC'">$(BASE_MAC_HDR) $(BASE_MAC_OSX_HDR)</if>
         <if cond="TOOLKIT=='COCOA'">$(BASE_UNIX_HDR)</if>
     </set>
 
@@ -2678,7 +2714,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
         <if cond="TOOLKIT=='MSW'">$(MSW_SRC) $(MSW_ONLY_SRC)</if>
         <if cond="TOOLKIT=='WINCE'">$(MSW_SRC) $(WINCE_SRC)</if>
-        <if cond="TOOLKIT=='MAC'">$(MAC_SRC) $(MAC_OSX_SRC)</if>
+        <if cond="TOOLKIT=='MAC'">$(MAC_SRC)</if>
         <if cond="TOOLKIT=='COCOA'">$(COCOA_SRC)</if>
         <if cond="TOOLKIT=='PM'">$(OS2_SRC)</if>
     </set>

diff --git a/configure b/configure
index a641f98ccff9b31a411a8580634f6bf3d67b6aaf..00fa39f59fdcae3394105a267f37034352ac0d80 100755 (executable)
--- a/configure
+++ b/configure
@@ -313,7 +313,7 @@ ac_includes_default="\
 #endif"
 
 ac_subdirs_all="$ac_subdirs_all src/expat"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV EXTRALIBS_ESD SDL_CONFIG SDL_CFLAGS SDL_LIBS LIBGNOMEPRINTUI_CFLAGS LIBGNOMEPRINTUI_LIBS CORE_BASE_LIBS CORE_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WX_FLAVOUR WX_LIB_FLAVOUR WXUNIV MONOLITHIC USE_PLUGINS EXTRALIBS EXTRALIBS_XML EXTRALIBS_HTML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL EXTRALIBS_SDL WITH_PLUGIN_SDL EXTRALIBS_GNOMEPRINT UNICODE BUILD DEBUG_INFO DEBUG_FLAG TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SAMPLES_RPATH_POSTLINK HOST_SUFFIX CPPUNIT_CFLAGS CPPUNIT_LIBS SET_MAKE MAKE_SET ac_ct_AR ac_ct_STRIP NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX PLATFORM_OS2 SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING GCC_PCH COND_BUILD_DEBUG COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT COND_BUILD_DEBUG_UNICODE_0 COND_BUILD_DEBUG_UNICODE_1 COND_BUILD_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT COND_BUILD_RELEASE_UNICODE_0 COND_BUILD_RELEASE_UNICODE_1 COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_GCC_PCH_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_XRC_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_XRC_1 COND_MONOLITHIC_0_USE_ODBC_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_ COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF COND_PLATFORM_MACOSX_1_TOOLKIT_X11 COND_PLATFORM_MACOSX_1_USE_GUI_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MACOS_1 COND_PLATFORM_MAC_1 COND_PLATFORM_OS2_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_UNIX_1_USE_GUI_1 COND_PLATFORM_UNIX_1_USE_PLUGINS_0 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0 COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0 COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0 COND_SHARED_0_TOOLKIT_PM_WXUNIV_0 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_SHARED_0_WXUSE_EXPAT_BUILTIN COND_SHARED_0_WXUSE_ODBC_BUILTIN COND_SHARED_0_WXUSE_REGEX_BUILTIN COND_SHARED_0_WXUSE_ZLIB_BUILTIN COND_SHARED_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_TOOLKIT_ COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1 COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1 COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_PM COND_TOOLKIT_PM_USE_GUI_1 COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_WINCE COND_TOOLKIT_WINCE_USE_GUI_1 COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_UNICODE_1 COND_USE_EXCEPTIONS_0 COND_USE_EXCEPTIONS_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_USE_ODBC_1 COND_USE_OPENGL_1 COND_USE_PLUGINS_0 COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_USE_XRC_1 COND_WITH_PLUGIN_SDL_1 COND_WXUNIV_1 COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_TOOLKIT_MAC_WXUNIV_0 COND_TOOLKIT_MSW_WXUNIV_0 COND_TOOLKIT_PM_WXUNIV_0 SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLCHAIN_NAME TOOLCHAIN_FULLNAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS cross_compiling WIDGET_SET WX_RELEASE WX_VERSION WX_SUBVERSION WX_CHARTYPE WX_DEBUGTYPE WXCONFIG_EXTRALIBS WXCONFIG_INCLUDE WXCONFIG_RPATH WXCONFIG_LDFLAGS_GUI WX_LARGEFILE_FLAGS GCC_PRAGMA_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX EXE_LINKER GUIDIST DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL CPPUNIT_CONFIG LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV EXTRALIBS_ESD SDL_CONFIG SDL_CFLAGS SDL_LIBS LIBGNOMEPRINTUI_CFLAGS LIBGNOMEPRINTUI_LIBS CORE_BASE_LIBS CORE_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WX_FLAVOUR WX_LIB_FLAVOUR WXUNIV MONOLITHIC USE_PLUGINS EXTRALIBS EXTRALIBS_XML EXTRALIBS_HTML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL EXTRALIBS_SDL WITH_PLUGIN_SDL EXTRALIBS_GNOMEPRINT UNICODE BUILD DEBUG_INFO DEBUG_FLAG TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SAMPLES_RPATH_POSTLINK HOST_SUFFIX CPPUNIT_CFLAGS CPPUNIT_LIBS SET_MAKE MAKE_SET ac_ct_AR ac_ct_STRIP NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX PLATFORM_OS2 SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING GCC_PCH COND_BUILD_DEBUG COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT COND_BUILD_DEBUG_UNICODE_0 COND_BUILD_DEBUG_UNICODE_1 COND_BUILD_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT COND_BUILD_RELEASE_UNICODE_0 COND_BUILD_RELEASE_UNICODE_1 COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_GCC_PCH_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_XRC_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_XRC_1 COND_MONOLITHIC_0_USE_ODBC_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_ COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1 COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF COND_PLATFORM_MACOSX_1_TOOLKIT_X11 COND_PLATFORM_MACOSX_1_USE_GUI_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MACOS_1 COND_PLATFORM_MAC_1 COND_PLATFORM_OS2_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_UNIX_1_USE_GUI_1 COND_PLATFORM_UNIX_1_USE_PLUGINS_0 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0 COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0 COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0 COND_SHARED_0_TOOLKIT_PM_WXUNIV_0 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_SHARED_0_WXUSE_EXPAT_BUILTIN COND_SHARED_0_WXUSE_ODBC_BUILTIN COND_SHARED_0_WXUSE_REGEX_BUILTIN COND_SHARED_0_WXUSE_ZLIB_BUILTIN COND_SHARED_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_TOOLKIT_ COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1 COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1 COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_PM COND_TOOLKIT_PM_USE_GUI_1 COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_WINCE COND_TOOLKIT_WINCE_USE_GUI_1 COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_UNICODE_1 COND_USE_EXCEPTIONS_0 COND_USE_EXCEPTIONS_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_USE_ODBC_1 COND_USE_OPENGL_1 COND_USE_PLUGINS_0 COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_USE_XRC_1 COND_WITH_PLUGIN_SDL_1 COND_WXUNIV_1 COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN COND_TOOLKIT_MAC_WXUNIV_0 COND_TOOLKIT_MSW_WXUNIV_0 COND_TOOLKIT_PM_WXUNIV_0 SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLCHAIN_NAME TOOLCHAIN_FULLNAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS cross_compiling WIDGET_SET WX_RELEASE WX_VERSION WX_SUBVERSION WX_CHARTYPE WX_DEBUGTYPE WXCONFIG_EXTRALIBS WXCONFIG_INCLUDE WXCONFIG_RPATH WXCONFIG_LDFLAGS_GUI WX_LARGEFILE_FLAGS GCC_PRAGMA_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX EXE_LINKER GUIDIST DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL CPPUNIT_CONFIG LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1183,7 +1183,7 @@ esac
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi
-    cd "$ac_popdir"
+    cd $ac_popdir
   done
 fi
 
@@ -10950,7 +10950,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11008,7 +11009,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11124,7 +11126,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11178,7 +11181,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11223,7 +11227,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11267,7 +11272,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11764,7 +11770,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11822,7 +11829,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11893,7 +11901,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -11937,7 +11946,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12372,7 +12382,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12438,7 +12449,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12479,7 +12491,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12580,7 +12593,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12647,7 +12661,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12729,7 +12744,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12899,7 +12915,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12966,7 +12983,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13115,7 +13133,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13264,7 +13283,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13413,7 +13433,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13564,7 +13585,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13715,7 +13737,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13901,7 +13924,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -13969,7 +13993,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14129,7 +14154,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14276,7 +14302,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14387,7 +14414,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14447,7 +14475,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14521,7 +14550,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14583,7 +14613,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14623,7 +14654,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14679,7 +14711,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14719,7 +14752,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14783,7 +14817,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14814,8 +14849,10 @@ See \`config.log' for more details." >&2;}
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -14927,7 +14964,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14989,7 +15027,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15029,7 +15068,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15085,7 +15125,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15125,7 +15166,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15189,7 +15231,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15220,8 +15263,10 @@ See \`config.log' for more details." >&2;}
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -15333,7 +15378,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15395,7 +15441,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15435,7 +15482,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15491,7 +15539,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15531,7 +15580,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15595,7 +15645,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15626,8 +15677,10 @@ See \`config.log' for more details." >&2;}
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -15739,7 +15792,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15801,7 +15855,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15841,7 +15896,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15897,7 +15953,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -15937,7 +15994,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16001,7 +16059,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16032,8 +16091,10 @@ See \`config.log' for more details." >&2;}
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -16145,7 +16206,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16207,7 +16269,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16247,7 +16310,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16303,7 +16367,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16343,7 +16408,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16407,7 +16473,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16438,8 +16505,10 @@ See \`config.log' for more details." >&2;}
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -16551,7 +16620,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16613,7 +16683,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16653,7 +16724,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16709,7 +16781,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16749,7 +16822,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16813,7 +16887,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16844,8 +16919,10 @@ See \`config.log' for more details." >&2;}
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -16960,7 +17037,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17022,7 +17100,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17062,7 +17141,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17118,7 +17198,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17158,7 +17239,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17222,7 +17304,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17253,8 +17336,10 @@ See \`config.log' for more details." >&2;}
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -17368,7 +17453,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17430,7 +17516,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17470,7 +17557,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17526,7 +17614,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17566,7 +17655,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17630,7 +17720,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17661,8 +17752,10 @@ See \`config.log' for more details." >&2;}
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -17779,7 +17872,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17841,7 +17935,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17881,7 +17976,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17937,7 +18033,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17977,7 +18074,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18041,7 +18139,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18072,8 +18171,10 @@ See \`config.log' for more details." >&2;}
 esac
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
-echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run test program while cross compiling
+See \`config.log' for more details." >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -18263,7 +18364,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18404,7 +18506,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18474,7 +18577,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18567,7 +18671,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18608,7 +18713,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18968,7 +19074,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19146,7 +19253,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19235,7 +19343,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19278,7 +19387,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19365,7 +19475,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19445,7 +19556,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19524,7 +19636,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19605,7 +19718,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19657,7 +19771,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19716,7 +19831,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19773,7 +19889,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19908,7 +20025,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -19973,7 +20091,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20108,7 +20227,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20310,7 +20430,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20401,7 +20522,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20577,7 +20699,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20733,7 +20856,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20884,7 +21008,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21038,7 +21163,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21186,7 +21312,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21286,7 +21413,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21352,7 +21480,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21446,7 +21575,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21592,7 +21722,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21686,7 +21817,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21836,7 +21968,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21907,7 +22040,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21994,7 +22128,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22144,7 +22279,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22228,7 +22364,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22373,7 +22510,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22838,7 +22976,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23145,7 +23284,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23460,7 +23600,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23627,7 +23768,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23739,7 +23881,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23818,7 +23961,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24000,12 +24144,9 @@ echo "$as_me: error: Cannot find MicroWindows libraries, make sure they are comp
     fi
 
         if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
-
-if test "x$ac_path_x_has_been_run" != xyes; then
-  echo "$as_me:$LINENO: checking for X" >&5
+                                echo "$as_me:$LINENO: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
-ac_path_x_has_been_run=yes
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -24098,7 +24239,7 @@ ac_x_header_dirs='
 /usr/openwin/share/include'
 
 if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for a specified header file.
+  # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -24172,7 +24313,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24232,15 +24374,10 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
                ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  # It might be that x_includes is empty (headers are found in the
-  # standard search path. Then output the corresponding message
-  ac_out_x_includes=$x_includes
-  test "x$x_includes" = x && ac_out_x_includes="in standard search path"
-  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5
-echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6
+  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
-fi
 if test "$no_x" = yes; then
   # Not all programs may use this symbol, but it does not hurt to define it.
 
@@ -24288,7 +24425,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24339,7 +24477,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24415,7 +24554,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24470,7 +24610,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24538,7 +24679,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24646,7 +24788,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24710,7 +24853,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24778,7 +24922,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24882,7 +25027,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24946,7 +25092,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25043,7 +25190,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25107,7 +25255,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25204,7 +25353,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25268,7 +25418,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25347,7 +25498,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25799,7 +25951,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25909,7 +26062,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26004,7 +26158,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26086,7 +26241,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26164,7 +26320,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26273,7 +26430,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26354,7 +26512,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26424,7 +26583,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26525,7 +26685,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26626,7 +26787,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26776,7 +26938,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26843,7 +27006,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26910,7 +27074,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27061,7 +27226,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27143,7 +27309,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27305,7 +27472,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27510,7 +27678,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27842,7 +28011,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27894,7 +28064,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28183,7 +28354,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28248,7 +28420,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28313,7 +28486,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28378,7 +28552,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28482,7 +28657,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28559,7 +28735,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28627,7 +28804,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28703,7 +28881,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28819,7 +28998,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28892,7 +29072,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28960,7 +29141,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29075,7 +29257,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29190,7 +29373,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29261,7 +29445,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29371,7 +29556,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29430,7 +29616,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29527,7 +29714,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29577,7 +29765,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29651,7 +29840,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29772,7 +29962,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29856,7 +30047,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29969,7 +30161,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -30045,7 +30238,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -30116,7 +30310,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -30190,7 +30385,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -30241,7 +30437,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -30370,7 +30567,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -30479,7 +30677,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -30582,7 +30781,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -30703,7 +30903,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -30775,7 +30976,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -30879,7 +31081,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -30999,7 +31202,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -31110,7 +31314,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -31220,7 +31425,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -31292,7 +31498,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -31359,7 +31566,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -31426,7 +31634,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -31539,7 +31748,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -31612,7 +31822,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -31700,7 +31911,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -31761,7 +31973,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -31915,7 +32128,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -32106,7 +32320,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -32254,7 +32469,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -32321,7 +32537,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -32502,7 +32719,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -32571,7 +32789,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -32679,7 +32898,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -32769,7 +32989,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -32859,7 +33080,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -32924,7 +33146,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -33041,7 +33264,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -33111,7 +33335,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -33179,7 +33404,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -33256,7 +33482,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -33559,7 +33786,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -33634,7 +33862,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -33739,7 +33968,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -33814,7 +34044,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -33928,7 +34159,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -34000,7 +34232,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -34154,7 +34387,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -34524,7 +34758,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -34956,7 +35191,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -35024,7 +35260,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -35073,7 +35310,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -35122,7 +35360,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -35240,7 +35479,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -35309,7 +35549,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -35415,7 +35656,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -35494,7 +35736,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -35541,7 +35784,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -35667,7 +35911,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -35733,7 +35978,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -35822,7 +36068,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -35875,7 +36122,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -35922,7 +36170,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -36090,7 +36339,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -36274,7 +36524,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -36467,7 +36718,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -36621,7 +36873,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -37249,7 +37502,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -37678,7 +37932,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -37779,7 +38034,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -37892,7 +38148,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -37993,7 +38250,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -38895,7 +39153,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -38971,7 +39230,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -39957,7 +40217,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -40087,7 +40348,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -40365,6 +40627,11 @@ EOF
         COND_PLATFORM_MACOSX_1_TOOLKIT_MAC=""
     fi
 
+    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
+
     COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF="#"
     if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMOTIF" ; then
         COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF=""
@@ -41396,7 +41663,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -42508,6 +42776,7 @@ s,@COND_PLATFORM_MACOSX_1_TOOLKIT_@,$COND_PLATFORM_MACOSX_1_TOOLKIT_,;t t
 s,@COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA@,$COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA,;t t
 s,@COND_PLATFORM_MACOSX_1_TOOLKIT_GTK@,$COND_PLATFORM_MACOSX_1_TOOLKIT_GTK,;t t
 s,@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC@,$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC,;t t
+s,@COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1@,$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1,;t t
 s,@COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF@,$COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF,;t t
 s,@COND_PLATFORM_MACOSX_1_TOOLKIT_X11@,$COND_PLATFORM_MACOSX_1_TOOLKIT_X11,;t t
 s,@COND_PLATFORM_MACOSX_1_USE_GUI_1@,$COND_PLATFORM_MACOSX_1_USE_GUI_1,;t t
@@ -42806,6 +43075,11 @@ esac
   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
   esac
 
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
   #    /* config.h.  Generated by config.status.  */
@@ -42844,12 +43118,6 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
         fi;;
       esac
     done` || { (exit 1); exit 1; }
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub
@@ -43430,7 +43698,7 @@ echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
    { (exit 1); exit 1; }; }
     fi
 
-    cd "$ac_popdir"
+    cd $ac_popdir
   done
 fi
 

diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h
index c36ffd1546d0a591e59ce31d6d5f4164ae665f64..e9f9accdac8059e78374f2a5edf1b5eb2e6f0022 100644 (file)
--- a/include/wx/apptrait.h
+++ b/include/wx/apptrait.h
@@ -49,6 +49,8 @@ struct WXDLLIMPEXP_BASE wxToolkitInfo
 // wxAppTraits: this class defines various configurable aspects of wxApp
 // ----------------------------------------------------------------------------
 
+class WXDLLIMPEXP_BASE wxStandardPathsBase;
+
 class WXDLLIMPEXP_BASE wxAppTraitsBase
 {
 public:
@@ -75,6 +77,9 @@ public:
     // NB: returned pointer will be deleted by the caller
     virtual wxRendererNative *CreateRenderer() = 0;
 
+    // wxStandardPaths object is normally the same for wxBase and wxGUI
+    // except in the case of wxMac and wxCocoa
+    virtual wxStandardPathsBase& GetStandardPaths();
 
     // functions abstracting differences between GUI and console modes
     // ------------------------------------------------------------------------

diff --git a/include/wx/mac/corefoundation/stdpaths.h b/include/wx/mac/corefoundation/stdpaths.h
index 8066e6958f39e0cce96cb5826246faa29ceb4f98..784222671a5ea68b4664cb21307d95a2a7fa5d48 100644 (file)
--- a/include/wx/mac/corefoundation/stdpaths.h
+++ b/include/wx/mac/corefoundation/stdpaths.h
@@ -24,10 +24,6 @@ public:
     wxStandardPathsCF();
     ~wxStandardPathsCF();
 
-    // return the global standard paths object
-    // Overrides wxStandardPathsBase version for GUI code.
-    static wxStandardPathsCF& Get();
-
     // wxMac specific: allow user to specify a different bundle
     wxStandardPathsCF(struct __CFBundle *bundle);
     void SetBundle(struct __CFBundle *bundle);
@@ -43,13 +39,14 @@ protected:
     struct __CFBundle *m_bundle;
 };
 
-// wxMac has its own base so it always uses this version.
-// Otherwise, we want to use this version only when compiling GUI code.
-// The CoreFoundation version is always available by its full name to all code.
-#if defined(__WXMAC__) || wxUSE_BASE == 0
-#define wxStandardPaths wxStandardPathsCF
-#else
+// If using UNIX (i.e. darwin) then use UNIX standard paths
+#if defined(__UNIX__)
 #include "wx/unix/stdpaths.h"
+#else
+// If compiling wxMac for CarbonLib then we are wxStandardPaths
+class WXDLLIMPEXP_BASE wxStandardPaths: public wxStandardPathsCF
+{
+};
 #endif
 
 #endif // _WX_MAC_STDPATHS_H_

diff --git a/include/wx/stdpaths.h b/include/wx/stdpaths.h
index 8721d015d0e33b4415f0a2a733647a119f74772e..5877ca4450d6de49dcd35dd85cbc8c5e39298082 100644 (file)
--- a/include/wx/stdpaths.h
+++ b/include/wx/stdpaths.h
@@ -14,13 +14,6 @@
 
 #include "wx/string.h"
 
-#if defined(__WXMAC__)
-class WXDLLIMPEXP_BASE wxStandardPathsCF;
-#define wxStandardPaths wxStandardPathsCF
-#else
-class WXDLLIMPEXP_BASE wxStandardPaths;
-#endif
-
 // ----------------------------------------------------------------------------
 // wxStandardPaths returns the standard locations in the file system
 // ----------------------------------------------------------------------------
@@ -29,7 +22,7 @@ class WXDLLIMPEXP_BASE wxStandardPathsBase
 {
 public:
     // return the global standard paths object
-    static wxStandardPaths& Get();
+    static wxStandardPathsBase& Get();
 
 
     // return the directory with system config files:
@@ -89,7 +82,8 @@ protected:
 
 #if defined(__WXMSW__)
     #include "wx/msw/stdpaths.h"
-#elif defined(__WXMAC__) || defined(__WXCOCOA__)
+// We want CoreFoundation paths on both CarbonLib and Darwin (for all ports)
+#elif defined(__WXMAC__) || defined(__DARWIN__)
     #include "wx/mac/corefoundation/stdpaths.h"
 #elif defined(__OS2__)
     #include "wx/os2/stdpaths.h"

diff --git a/include/wx/unix/apptrait.h b/include/wx/unix/apptrait.h
index 4172ad467d9b5a84c403765023fde4ba4ac67c72..964413cde7f6e309b21522d0d102d4f080e69943 100644 (file)
--- a/include/wx/unix/apptrait.h
+++ b/include/wx/unix/apptrait.h
@@ -37,6 +37,9 @@ public:
     virtual void DetachWriteFDOfEndProcessPipe(wxExecuteData& execData);
     virtual int WaitForChild(wxExecuteData& execData);
 
+#if defined(__WXMAC__) || defined(__WXCOCOA__)
+    virtual wxStandardPathsBase& GetStandardPaths();
+#endif
     virtual wxToolkitInfo& GetToolkitInfo();
 };
 

diff --git a/src/common/stdpbase.cpp b/src/common/stdpbase.cpp
index 58e9e4ebbaa5e813bb346818f2738d0976f611e9..ab6b882ef6b9b0f6f19ddab865c1683990033126 100644 (file)
--- a/src/common/stdpbase.cpp
+++ b/src/common/stdpbase.cpp
@@ -27,6 +27,7 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #endif //WX_PRECOMP
+#include "wx/apptrait.h"
 
 #include "wx/filename.h"
 #include "wx/stdpaths.h"
@@ -42,7 +43,12 @@ static wxStandardPaths gs_stdPaths;
 // ============================================================================
 
 /* static */
-wxStandardPaths& wxStandardPathsBase::Get()
+wxStandardPathsBase& wxStandardPathsBase::Get()
+{
+    return wxTheApp->GetTraits()->GetStandardPaths();
+}
+
+wxStandardPathsBase& wxAppTraitsBase::GetStandardPaths()
 {
     return gs_stdPaths;
 }

diff --git a/src/mac/corefoundation/stdpaths_cf.cpp b/src/mac/corefoundation/stdpaths_cf.cpp
index 24caa0ff767c49f31923a91c3af93d3b084dd041..07bfaaa1110aaedfcc6e6db0142c557193d2e9e7 100644 (file)
--- a/src/mac/corefoundation/stdpaths_cf.cpp
+++ b/src/mac/corefoundation/stdpaths_cf.cpp
@@ -26,11 +26,6 @@
 #include <CFURL.h>
 #endif
 
-// See comment in include/wx/mac/corefoundation/stdpaths.h
-#ifndef wxStandardPaths
-#warning "wxStandardPaths should be defined to wxStandardPathsCF when compiling this file."
-#endif
-
 #if defined(__WXCOCOA__) || defined(__WXMAC_OSX__)
 #define kDefaultPathStyle kCFURLPOSIXPathStyle
 #else
@@ -46,50 +41,43 @@ static wxString BundleRelativeURLToPath(CFURLRef relativeURL)
     return wxMacCFStringHolder(cfStrPath).AsString(wxLocale::GetSystemEncoding());
 }
 
-
-static wxStandardPaths gs_stdPaths;
-/* static */ wxStandardPaths& wxStandardPaths::Get()
-{
-    return gs_stdPaths;
-}
-
-wxStandardPaths::wxStandardPaths()
+wxStandardPathsCF::wxStandardPathsCF()
 :   m_bundle(CFBundleGetMainBundle())
 {
     CFRetain(m_bundle);
 }
 
-wxStandardPaths::wxStandardPaths(struct __CFBundle *bundle)
+wxStandardPathsCF::wxStandardPathsCF(struct __CFBundle *bundle)
 :   m_bundle(bundle)
 {
     CFRetain(m_bundle);
 }
 
-wxStandardPaths::~wxStandardPaths()
+wxStandardPathsCF::~wxStandardPathsCF()
 {
     CFRelease(m_bundle);
 }
 
-void wxStandardPaths::SetBundle(struct __CFBundle *bundle)
+void wxStandardPathsCF::SetBundle(struct __CFBundle *bundle)
 {
     CFRetain(bundle);
     CFRelease(m_bundle);
     m_bundle = bundle;
 }
 
-wxString wxStandardPaths::GetConfigDir() const
+wxString wxStandardPathsCF::GetConfigDir() const
 {
     // TODO: What do we do for pure Carbon?
     return wxT("/Library/Preferences");
 }
 
-wxString wxStandardPaths::GetUserConfigDir() const
+wxString wxStandardPathsCF::GetUserConfigDir() const
 {
     // TODO: What do we do for pure Carbon?
     return wxFileName::GetHomeDir() + wxT("/Library/Preferences");
 }
 
-wxString wxStandardPaths::GetDataDir() const
+wxString wxStandardPathsCF::GetDataDir() const
 {
     wxCHECK_MSG(m_bundle, wxEmptyString, wxT("wxStandardPaths for CoreFoundation only works with bundled apps"));
     CFURLRef relativeURL = CFBundleCopySharedSupportURL(m_bundle);
@@ -99,17 +87,17 @@ wxString wxStandardPaths::GetDataDir() const
     return ret;
 }
 
-wxString wxStandardPaths::GetLocalDataDir() const
+wxString wxStandardPathsCF::GetLocalDataDir() const
 {
     return AppendAppName(wxT("/Library/Application Support"));
 }
 
-wxString wxStandardPaths::GetUserDataDir() const
+wxString wxStandardPathsCF::GetUserDataDir() const
 {
     return AppendAppName(wxFileName::GetHomeDir() + _T("/Library/Application Support"));
 }
 
-wxString wxStandardPaths::GetPluginsDir() const
+wxString wxStandardPathsCF::GetPluginsDir() const
 {
     wxCHECK_MSG(m_bundle, wxEmptyString, wxT("wxStandardPaths for CoreFoundation only works with bundled apps"));
     CFURLRef relativeURL = CFBundleCopyBuiltInPlugInsURL(m_bundle);

diff --git a/src/mac/corefoundation/utilsexc_cf.cpp b/src/mac/corefoundation/utilsexc_cf.cpp
index 353263ab9204a8062722dcabcb8936e9584371ef..a3f55509be1dde3fc16858684ce59d9e9af47283 100644 (file)
--- a/src/mac/corefoundation/utilsexc_cf.cpp
+++ b/src/mac/corefoundation/utilsexc_cf.cpp
@@ -16,6 +16,8 @@
     #include "wx/utils.h"
 #endif //ndef WX_PRECOMP
 #include "wx/unix/execute.h"
+#include "wx/stdpaths.h"
+#include "wx/apptrait.h"
 
 #include <CoreFoundation/CFMachPort.h>
 #include <sys/wait.h>
@@ -109,3 +111,11 @@ int wxAddProcessCallbackForPid(wxEndProcessData *proc_data, int pid)
     return 0;
 }
 
+// NOTE: This doens't really belong here but this was a handy file to
+// put it in because it's already compiled for wxCocoa and wxMac GUI lib.
+static wxStandardPathsCF gs_stdPaths;
+wxStandardPathsBase& wxGUIAppTraits::GetStandardPaths()
+{
+    return gs_stdPaths;
+}
+