From: Vadim Zeitlin Date: Mon, 31 Jan 2000 18:26:16 +0000 (+0000) Subject: 1. configre/makefiles changes X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2224580a415da12d7c453943c4ae4a1b58ecd369 1. configre/makefiles changes a) wxBase compilation/installation/dist works, added wxBase.spec b) list of files is include by Makefile.in, not embedded into it c) configure runs "subconfigures" for samples/demos/utils 2. wxTokenizer class from Gregory Pietsch git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/Makefile.in b/Makefile.in index b89ed941b8..ceb5ea02dd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,3 @@ -# -# This file was automatically generated by tmake at 18:29, 2000/01/29 -# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T! - # # File: makefile.unx # Author: Julian Smart, Robert Roebling, Vadim Zeitlin @@ -83,7 +79,7 @@ INSTALL_DATA = @INSTALL_DATA@ # my autoconf doesn't set this #INSTALL_SCRIPT = @INSTALL_SCRIPT@ # maybe do an additional chmod if needed? -INSTALL_SCRIPT = @INSTALL@ +INSTALL_SCRIPT = @INSTALL@ transform = @program_transform_name@ NORMAL_INSTALL = : @@ -131,2411 +127,28 @@ DOCDIR = $(WXDIR)/docs ########################## Archive name ############################### -WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz +WXARCHIVE = @DISTDIR@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz WXSAMPLES = wx$(TOOLKIT)-samples-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz WXDEMOS = wx$(TOOLKIT)-demos-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz -DISTDIR = ./_dist_dir/wx$(TOOLKIT) +DISTDIR = ./_dist_dir/@DISTDIR@ ############################## Files ################################## -BASE_HEADERS = \ - app.h \ - buffer.h \ - cmdline.h \ - date.h \ - datetime.h \ - datetime.inl \ - debug.h \ - defs.h \ - dir.h \ - dynarray.h \ - dynlib.h \ - event.h \ - ffile.h \ - file.h \ - fileconf.h \ - hash.h \ - intl.h \ - ioswrap.h \ - list.h \ - log.h \ - longlong.h \ - memconf.h \ - memory.h \ - mimetype.h \ - module.h \ - object.h \ - process.h \ - strconv.h \ - stream.h \ - string.h \ - textfile.h \ - thread.h \ - time.h \ - timer.h \ - tokenzr.h \ - txtstrm.h \ - utils.h \ - variant.h \ - version.h \ - wfstream.h \ - wx.h \ - wxchar.h \ - wxprec.h - -WX_HEADERS = \ - accel.h \ - app.h \ - arrimpl.cpp \ - bitmap.h \ - bmpbuttn.h \ - brush.h \ - buffer.h \ - busyinfo.h \ - button.h \ - calctrl.h \ - caret.h \ - checkbox.h \ - checklst.h \ - choicdlg.h \ - choice.h \ - clipbrd.h \ - cmdline.h \ - cmndata.h \ - colordlg.h \ - colour.h \ - combobox.h \ - confbase.h \ - config.h \ - control.h \ - ctrlsub.h \ - cursor.h \ - dataobj.h \ - date.h \ - datetime.h \ - datetime.inl \ - datstrm.h \ - db.h \ - dbtable.h \ - dc.h \ - dcclient.h \ - dcmemory.h \ - dcprint.h \ - dcps.h \ - dcscreen.h \ - dde.h \ - debug.h \ - defs.h \ - dialog.h \ - dialup.h \ - dir.h \ - dirdlg.h \ - dnd.h \ - docmdi.h \ - docview.h \ - dragimag.h \ - dynarray.h \ - dynlib.h \ - encconv.h \ - event.h \ - expr.h \ - ffile.h \ - file.h \ - fileconf.h \ - filedlg.h \ - filefn.h \ - filesys.h \ - font.h \ - fontdlg.h \ - fontenum.h \ - fontmap.h \ - fontutil.h \ - frame.h \ - fs_inet.h \ - fs_zip.h \ - gauge.h \ - gdicmn.h \ - gdiobj.h \ - geometry.h \ - gifdecod.h \ - grid.h \ - gsocket.h \ - hash.h \ - help.h \ - helpbase.h \ - helphtml.h \ - helpwin.h \ - helpxlp.h \ - icon.h \ - imagbmp.h \ - image.h \ - imaggif.h \ - imagjpeg.h \ - imaglist.h \ - imagpcx.h \ - imagpng.h \ - imagpnm.h \ - imagtiff.h \ - intl.h \ - ioswrap.h \ - ipcbase.h \ - isql.h \ - isqlext.h \ - joystick.h \ - layout.h \ - laywin.h \ - list.h \ - listbox.h \ - listctrl.h \ - listimpl.cpp \ - log.h \ - longlong.h \ - matrix.h \ - mdi.h \ - memconf.h \ - memory.h \ - menu.h \ - menuitem.h \ - metafile.h \ - mimetype.h \ - minifram.h \ - module.h \ - msgdlg.h \ - mstream.h \ - notebook.h \ - object.h \ - objstrm.h \ - odbc.h \ - ownerdrw.h \ - palette.h \ - panel.h \ - paper.h \ - pen.h \ - plot.h \ - print.h \ - printdlg.h \ - prntbase.h \ - process.h \ - progdlg.h \ - prop.h \ - propform.h \ - proplist.h \ - radiobox.h \ - radiobut.h \ - region.h \ - resource.h \ - sashwin.h \ - sckaddr.h \ - sckipc.h \ - sckstrm.h \ - scrolbar.h \ - scrolwin.h \ - serbase.h \ - settings.h \ - setup.h \ - sizer.h \ - slider.h \ - socket.h \ - spinbutt.h \ - spinctrl.h \ - splitter.h \ - statbmp.h \ - statbox.h \ - statline.h \ - stattext.h \ - statusbr.h \ - strconv.h \ - stream.h \ - string.h \ - tab.h \ - tabctrl.h \ - taskbar.h \ - tbarbase.h \ - tbarsmpl.h \ - textctrl.h \ - textdlg.h \ - textfile.h \ - thread.h \ - time.h \ - timer.h \ - tipdlg.h \ - tokenzr.h \ - toolbar.h \ - tooltip.h \ - treectrl.h \ - txtstrm.h \ - types.h \ - url.h \ - utils.h \ - valgen.h \ - validate.h \ - valtext.h \ - variant.h \ - version.h \ - wave.h \ - wfstream.h \ - window.h \ - wizard.h \ - wx.h \ - wx_cw.h \ - wx_cw_cm.h \ - wx_cw_d.h \ - wxchar.h \ - wxexpr.h \ - wxhtml.h \ - wxprec.h \ - xpmhand.h \ - zipstrm.h \ - zstream.h - -GTK_HEADERS = \ - gtk/accel.h \ - gtk/app.h \ - gtk/bitmap.h \ - gtk/bmpbuttn.h \ - gtk/brush.h \ - gtk/button.h \ - gtk/checkbox.h \ - gtk/checklst.h \ - gtk/choice.h \ - gtk/clipbrd.h \ - gtk/colour.h \ - gtk/combobox.h \ - gtk/control.h \ - gtk/cursor.h \ - gtk/dataform.h \ - gtk/dataobj.h \ - gtk/dataobj2.h \ - gtk/dc.h \ - gtk/dcclient.h \ - gtk/dcmemory.h \ - gtk/dcscreen.h \ - gtk/dialog.h \ - gtk/dnd.h \ - gtk/filedlg.h \ - gtk/font.h \ - gtk/fontdlg.h \ - gtk/frame.h \ - gtk/gauge.h \ - gtk/gdiobj.h \ - gtk/icon.h \ - gtk/joystick.h \ - gtk/listbox.h \ - gtk/mdi.h \ - gtk/menu.h \ - gtk/menuitem.h \ - gtk/minifram.h \ - gtk/notebook.h \ - gtk/palette.h \ - gtk/pen.h \ - gtk/radiobox.h \ - gtk/radiobut.h \ - gtk/region.h \ - gtk/scrolbar.h \ - gtk/settings.h \ - gtk/slider.h \ - gtk/spinbutt.h \ - gtk/spinctrl.h \ - gtk/statbmp.h \ - gtk/statbox.h \ - gtk/statline.h \ - gtk/stattext.h \ - gtk/tbargtk.h \ - gtk/textctrl.h \ - gtk/timer.h \ - gtk/tooltip.h \ - gtk/treectrl.h \ - gtk/wave.h \ - gtk/win_gtk.h \ - gtk/window.h - -MOTIF_HEADERS = \ - motif/accel.h \ - motif/app.h \ - motif/bitmap.h \ - motif/bmpbuttn.h \ - motif/brush.h \ - motif/button.h \ - motif/checkbox.h \ - motif/checklst.h \ - motif/choice.h \ - motif/clipbrd.h \ - motif/colordlg.h \ - motif/colour.h \ - motif/combobox.h \ - motif/control.h \ - motif/cursor.h \ - motif/dataform.h \ - motif/dataobj.h \ - motif/dataobj2.h \ - motif/dc.h \ - motif/dcclient.h \ - motif/dcmemory.h \ - motif/dcprint.h \ - motif/dcscreen.h \ - motif/dialog.h \ - motif/dnd.h \ - motif/filedlg.h \ - motif/font.h \ - motif/fontdlg.h \ - motif/frame.h \ - motif/gauge.h \ - motif/gdiobj.h \ - motif/icon.h \ - motif/joystick.h \ - motif/listbox.h \ - motif/mdi.h \ - motif/menu.h \ - motif/menuitem.h \ - motif/metafile.h \ - motif/minifram.h \ - motif/msgdlg.h \ - motif/palette.h \ - motif/pen.h \ - motif/print.h \ - motif/printdlg.h \ - motif/private.h \ - motif/radiobox.h \ - motif/radiobut.h \ - motif/region.h \ - motif/scrolbar.h \ - motif/settings.h \ - motif/slider.h \ - motif/spinbutt.h \ - motif/statbmp.h \ - motif/statbox.h \ - motif/stattext.h \ - motif/textctrl.h \ - motif/timer.h \ - motif/toolbar.h \ - motif/window.h - -MSW_HEADERS = \ - msw/accel.h \ - msw/app.h \ - msw/bitmap.h \ - msw/bmpbuttn.h \ - msw/brush.h \ - msw/button.h \ - msw/caret.h \ - msw/checkbox.h \ - msw/checklst.h \ - msw/choice.h \ - msw/clipbrd.h \ - msw/colordlg.h \ - msw/colour.h \ - msw/combobox.h \ - msw/control.h \ - msw/curico.h \ - msw/curicop.h \ - msw/cursor.h \ - msw/dc.h \ - msw/dcclient.h \ - msw/dcmemory.h \ - msw/dcprint.h \ - msw/dcscreen.h \ - msw/dde.h \ - msw/dialog.h \ - msw/dib.h \ - msw/dibutils.h \ - msw/dirdlg.h \ - msw/dragimag.h \ - msw/enhmeta.h \ - msw/filedlg.h \ - msw/font.h \ - msw/fontdlg.h \ - msw/frame.h \ - msw/gauge.h \ - msw/gauge95.h \ - msw/gaugemsw.h \ - msw/gdiimage.h \ - msw/gdiobj.h \ - msw/helpwin.h \ - msw/icon.h \ - msw/imaglist.h \ - msw/iniconf.h \ - msw/joystick.h \ - msw/listbox.h \ - msw/listctrl.h \ - msw/mdi.h \ - msw/menu.h \ - msw/menuitem.h \ - msw/metafile.h \ - msw/mimetype.h \ - msw/minifram.h \ - msw/msgdlg.h \ - msw/msvcrt.h \ - msw/notebook.h \ - msw/palette.h \ - msw/pen.h \ - msw/printdlg.h \ - msw/printwin.h \ - msw/private.h \ - msw/radiobox.h \ - msw/radiobut.h \ - msw/regconf.h \ - msw/region.h \ - msw/registry.h \ - msw/scrolbar.h \ - msw/settings.h \ - msw/setup0.h \ - msw/slider.h \ - msw/slider95.h \ - msw/slidrmsw.h \ - msw/spinbutt.h \ - msw/statbmp.h \ - msw/statbox.h \ - msw/statbr95.h \ - msw/statline.h \ - msw/stattext.h \ - msw/tabctrl.h \ - msw/taskbar.h \ - msw/tbar95.h \ - msw/tbarmsw.h \ - msw/textctrl.h \ - msw/timer.h \ - msw/tooltip.h \ - msw/treectrl.h \ - msw/wave.h \ - msw/window.h \ - msw/winundef.h \ - msw/xpmhand.h - -PM_HEADERS = \ - os2/accel.h \ - os2/app.h \ - os2/bitmap.h \ - os2/bmpbuttn.h \ - os2/brush.h \ - os2/button.h \ - os2/checkbox.h \ - os2/checklst.h \ - os2/choice.h \ - os2/clipbrd.h \ - os2/colour.h \ - os2/combobox.h \ - os2/control.h \ - os2/cursor.h \ - os2/dataform.h \ - os2/dataobj.h \ - os2/dataobj2.h \ - os2/dc.h \ - os2/dcclient.h \ - os2/dcmemory.h \ - os2/dcprint.h \ - os2/dcscreen.h \ - os2/dialog.h \ - os2/dirdlg.h \ - os2/dnd.h \ - os2/filedlg.h \ - os2/font.h \ - os2/fontdlg.h \ - os2/frame.h \ - os2/gauge.h \ - os2/gdiimage.h \ - os2/gdiobj.h \ - os2/gsockos2.h \ - os2/helpwin.h \ - os2/icon.h \ - os2/iniconf.h \ - os2/joystick.h \ - os2/listbox.h \ - os2/mdi.h \ - os2/menu.h \ - os2/menuitem.h \ - os2/metafile.h \ - os2/minifram.h \ - os2/msgdlg.h \ - os2/notebook.h \ - os2/palette.h \ - os2/pen.h \ - os2/pnghand.h \ - os2/pngread.h \ - os2/print.h \ - os2/private.h \ - os2/radiobox.h \ - os2/radiobut.h \ - os2/region.h \ - os2/scrolbar.h \ - os2/settings.h \ - os2/setup0.h \ - os2/slider.h \ - os2/spinbutt.h \ - os2/spinctrl.h \ - os2/statbmp.h \ - os2/statbox.h \ - os2/statline.h \ - os2/stattext.h \ - os2/tabctrl.h \ - os2/taskbar.h \ - os2/textctrl.h \ - os2/timer.h \ - os2/toolbar.h \ - os2/tooltip.h \ - os2/wave.h \ - os2/window.h - -UNIX_HEADERS = \ - unix/execute.h \ - unix/fontutil.h \ - unix/gsockunx.h \ - unix/mimetype.h - -GENERIC_HEADERS = \ - generic/calctrl.h \ - generic/caret.h \ - generic/choicdgg.h \ - generic/colrdlgg.h \ - generic/dcpsg.h \ - generic/dirdlgg.h \ - generic/filedlgg.h \ - generic/fontdlgg.h \ - generic/grid.h \ - generic/gridg.h \ - generic/helpext.h \ - generic/helphtml.h \ - generic/helpwxht.h \ - generic/helpxlp.h \ - generic/imaglist.h \ - generic/laywin.h \ - generic/listctrl.h \ - generic/msgdlgg.h \ - generic/notebook.h \ - generic/panelg.h \ - generic/plot.h \ - generic/printps.h \ - generic/prntdlgg.h \ - generic/progdlgg.h \ - generic/sashwin.h \ - generic/scrolwin.h \ - generic/splitter.h \ - generic/statusbr.h \ - generic/tabg.h \ - generic/textdlgg.h \ - generic/treectrl.h \ - generic/wizard.h - -PROTOCOL_HEADERS = \ - protocol/file.h \ - protocol/ftp.h \ - protocol/http.h \ - protocol/protocol.h - -HTML_HEADERS = \ - html/forcelnk.h \ - html/helpctrl.h \ - html/helpdata.h \ - html/helpfrm.h \ - html/htmlcell.h \ - html/htmldefs.h \ - html/htmlfilt.h \ - html/htmlpars.h \ - html/htmltag.h \ - html/htmlwin.h \ - html/htmprint.h \ - html/m_templ.h \ - html/winpars.h - -GTK_GENERICOBJS = \ - busyinfo.o \ - calctrl.o \ - caret.o \ - choicdgg.o \ - colrdlgg.o \ - dcpsg.o \ - dirdlgg.o \ - filedlgg.o \ - grid.o \ - helpext.o \ - helphtml.o \ - helpwxht.o \ - imaglist.o \ - laywin.o \ - listctrl.o \ - logg.o \ - msgdlgg.o \ - numdlgg.o \ - panelg.o \ - plot.o \ - printps.o \ - prntdlgg.o \ - progdlgg.o \ - prop.o \ - propform.o \ - proplist.o \ - sashwin.o \ - scrolwin.o \ - splitter.o \ - statusbr.o \ - tabg.o \ - tbarsmpl.o \ - textdlgg.o \ - tipdlg.o \ - treectrl.o \ - wizard.o - -GTK_GENERICDEPS = \ - busyinfo.d \ - calctrl.d \ - caret.d \ - choicdgg.d \ - colrdlgg.d \ - dcpsg.d \ - dirdlgg.d \ - filedlgg.d \ - grid.d \ - helpext.d \ - helphtml.d \ - helpwxht.d \ - imaglist.d \ - laywin.d \ - listctrl.d \ - logg.d \ - msgdlgg.d \ - numdlgg.d \ - panelg.d \ - plot.d \ - printps.d \ - prntdlgg.d \ - progdlgg.d \ - prop.d \ - propform.d \ - proplist.d \ - sashwin.d \ - scrolwin.d \ - splitter.d \ - statusbr.d \ - tabg.d \ - tbarsmpl.d \ - textdlgg.d \ - tipdlg.d \ - treectrl.d \ - wizard.d - -GTK_COMMONOBJS = \ - parser.o \ - appcmn.o \ - choiccmn.o \ - clipcmn.o \ - cmdline.o \ - cmndata.o \ - config.o \ - ctrlcmn.o \ - ctrlsub.o \ - datetime.o \ - datstrm.o \ - db.o \ - dbtable.o \ - dcbase.o \ - dlgcmn.o \ - dndcmn.o \ - dobjcmn.o \ - docmdi.o \ - docview.o \ - dynarray.o \ - dynlib.o \ - encconv.o \ - event.o \ - extended.o \ - ffile.o \ - file.o \ - fileconf.o \ - filefn.o \ - filesys.o \ - fontcmn.o \ - fontmap.o \ - framecmn.o \ - fs_inet.o \ - fs_zip.o \ - ftp.o \ - gdicmn.o \ - geometry.o \ - gifdecod.o \ - hash.o \ - helpbase.o \ - http.o \ - imagall.o \ - imagbmp.o \ - image.o \ - imaggif.o \ - imagjpeg.o \ - imagpcx.o \ - imagpng.o \ - imagpnm.o \ - imagtiff.o \ - intl.o \ - ipcbase.o \ - layout.o \ - lboxcmn.o \ - list.o \ - log.o \ - longlong.o \ - memory.o \ - menucmn.o \ - mimecmn.o \ - module.o \ - mstream.o \ - object.o \ - objstrm.o \ - paper.o \ - prntbase.o \ - process.o \ - protocol.o \ - resource.o \ - sckaddr.o \ - sckfile.o \ - sckipc.o \ - sckstrm.o \ - serbase.o \ - sizer.o \ - socket.o \ - strconv.o \ - stream.o \ - string.o \ - tbarbase.o \ - textcmn.o \ - textfile.o \ - timercmn.o \ - tokenzr.o \ - txtstrm.o \ - unzip.o \ - url.o \ - utilscmn.o \ - valgen.o \ - validate.o \ - valtext.o \ - variant.o \ - wfstream.o \ - wincmn.o \ - wxchar.o \ - wxexpr.o \ - zipstrm.o \ - zstream.o - -GTK_COMMONDEPS = \ - parser.d \ - appcmn.d \ - choiccmn.d \ - clipcmn.d \ - cmdline.d \ - cmndata.d \ - config.d \ - ctrlcmn.d \ - ctrlsub.d \ - datetime.d \ - datstrm.d \ - db.d \ - dbtable.d \ - dcbase.d \ - dlgcmn.d \ - dndcmn.d \ - dobjcmn.d \ - docmdi.d \ - docview.d \ - dynarray.d \ - dynlib.d \ - encconv.d \ - event.d \ - extended.d \ - ffile.d \ - file.d \ - fileconf.d \ - filefn.d \ - filesys.d \ - fontcmn.d \ - fontmap.d \ - framecmn.d \ - fs_inet.d \ - fs_zip.d \ - ftp.d \ - gdicmn.d \ - geometry.d \ - gifdecod.d \ - hash.d \ - helpbase.d \ - http.d \ - imagall.d \ - imagbmp.d \ - image.d \ - imaggif.d \ - imagjpeg.d \ - imagpcx.d \ - imagpng.d \ - imagpnm.d \ - imagtiff.d \ - intl.d \ - ipcbase.d \ - layout.d \ - lboxcmn.d \ - list.d \ - log.d \ - longlong.d \ - memory.d \ - menucmn.d \ - mimecmn.d \ - module.d \ - mstream.d \ - object.d \ - objstrm.d \ - paper.d \ - prntbase.d \ - process.d \ - protocol.d \ - resource.d \ - sckaddr.d \ - sckfile.d \ - sckipc.d \ - sckstrm.d \ - serbase.d \ - sizer.d \ - socket.d \ - strconv.d \ - stream.d \ - string.d \ - tbarbase.d \ - textcmn.d \ - textfile.d \ - timercmn.d \ - tokenzr.d \ - txtstrm.d \ - unzip.d \ - url.d \ - utilscmn.d \ - valgen.d \ - validate.d \ - valtext.d \ - variant.d \ - wfstream.d \ - wincmn.d \ - wxchar.d \ - wxexpr.d \ - zipstrm.d \ - zstream.d - -GTK_GUIOBJS = \ - accel.o \ - app.o \ - bitmap.o \ - bmpbuttn.o \ - brush.o \ - button.o \ - checkbox.o \ - checklst.o \ - choice.o \ - clipbrd.o \ - colour.o \ - combobox.o \ - control.o \ - cursor.o \ - data.o \ - dataobj.o \ - dc.o \ - dcclient.o \ - dcmemory.o \ - dcscreen.o \ - dialog.o \ - dnd.o \ - font.o \ - fontdlg.o \ - frame.o \ - gauge.o \ - gdiobj.o \ - gsockgtk.o \ - icon.o \ - listbox.o \ - main.o \ - mdi.o \ - menu.o \ - minifram.o \ - notebook.o \ - palette.o \ - pen.o \ - radiobox.o \ - radiobut.o \ - region.o \ - scrolbar.o \ - settings.o \ - slider.o \ - spinbutt.o \ - spinctrl.o \ - statbmp.o \ - statbox.o \ - statline.o \ - stattext.o \ - tbargtk.o \ - textctrl.o \ - timer.o \ - tooltip.o \ - utilsgtk.o \ - utilsres.o \ - wave.o \ - win_gtk.o \ - window.o - -GTK_GUIDEPS = \ - accel.d \ - app.d \ - bitmap.d \ - bmpbuttn.d \ - brush.d \ - button.d \ - checkbox.d \ - checklst.d \ - choice.d \ - clipbrd.d \ - colour.d \ - combobox.d \ - control.d \ - cursor.d \ - data.d \ - dataobj.d \ - dc.d \ - dcclient.d \ - dcmemory.d \ - dcscreen.d \ - dialog.d \ - dnd.d \ - font.d \ - fontdlg.d \ - frame.d \ - gauge.d \ - gdiobj.d \ - gsockgtk.d \ - icon.d \ - listbox.d \ - main.d \ - mdi.d \ - menu.d \ - minifram.d \ - notebook.d \ - palette.d \ - pen.d \ - radiobox.d \ - radiobut.d \ - region.d \ - scrolbar.d \ - settings.d \ - slider.d \ - spinbutt.d \ - spinctrl.d \ - statbmp.d \ - statbox.d \ - statline.d \ - stattext.d \ - tbargtk.d \ - textctrl.d \ - timer.d \ - tooltip.d \ - utilsgtk.d \ - utilsres.d \ - wave.d \ - win_gtk.d \ - window.d - -MOTIF_GENERICOBJS = \ - busyinfo.o \ - calctrl.o \ - caret.o \ - choicdgg.o \ - colrdlgg.o \ - dcpsg.o \ - dirdlgg.o \ - fontdlgg.o \ - grid.o \ - helpext.o \ - helphtml.o \ - helpwxht.o \ - helpxlp.o \ - imaglist.o \ - laywin.o \ - listctrl.o \ - logg.o \ - msgdlgg.o \ - notebook.o \ - numdlgg.o \ - panelg.o \ - plot.o \ - printps.o \ - prntdlgg.o \ - progdlgg.o \ - prop.o \ - propform.o \ - proplist.o \ - sashwin.o \ - scrolwin.o \ - splitter.o \ - statline.o \ - statusbr.o \ - tabg.o \ - tbarsmpl.o \ - textdlgg.o \ - tipdlg.o \ - treectrl.o \ - wizard.o - -MOTIF_GENERICDEPS = \ - busyinfo.d \ - calctrl.d \ - caret.d \ - choicdgg.d \ - colrdlgg.d \ - dcpsg.d \ - dirdlgg.d \ - fontdlgg.d \ - grid.d \ - helpext.d \ - helphtml.d \ - helpwxht.d \ - helpxlp.d \ - imaglist.d \ - laywin.d \ - listctrl.d \ - logg.d \ - msgdlgg.d \ - notebook.d \ - numdlgg.d \ - panelg.d \ - plot.d \ - printps.d \ - prntdlgg.d \ - progdlgg.d \ - prop.d \ - propform.d \ - proplist.d \ - sashwin.d \ - scrolwin.d \ - splitter.d \ - statline.d \ - statusbr.d \ - tabg.d \ - tbarsmpl.d \ - textdlgg.d \ - tipdlg.d \ - treectrl.d \ - wizard.d - -MOTIF_COMMONOBJS = \ - parser.o \ - appcmn.o \ - choiccmn.o \ - clipcmn.o \ - cmdline.o \ - cmndata.o \ - config.o \ - ctrlcmn.o \ - ctrlsub.o \ - datetime.o \ - datstrm.o \ - db.o \ - dbtable.o \ - dcbase.o \ - dlgcmn.o \ - dndcmn.o \ - dobjcmn.o \ - docmdi.o \ - docview.o \ - dynarray.o \ - dynlib.o \ - encconv.o \ - event.o \ - extended.o \ - ffile.o \ - file.o \ - fileconf.o \ - filefn.o \ - filesys.o \ - fontcmn.o \ - fontmap.o \ - framecmn.o \ - fs_inet.o \ - fs_zip.o \ - ftp.o \ - gdicmn.o \ - geometry.o \ - gifdecod.o \ - hash.o \ - helpbase.o \ - http.o \ - imagall.o \ - imagbmp.o \ - image.o \ - imaggif.o \ - imagjpeg.o \ - imagpcx.o \ - imagpng.o \ - imagpnm.o \ - imagtiff.o \ - intl.o \ - ipcbase.o \ - layout.o \ - lboxcmn.o \ - list.o \ - log.o \ - longlong.o \ - memory.o \ - menucmn.o \ - mimecmn.o \ - module.o \ - mstream.o \ - object.o \ - objstrm.o \ - paper.o \ - prntbase.o \ - process.o \ - protocol.o \ - resource.o \ - sckaddr.o \ - sckfile.o \ - sckipc.o \ - sckstrm.o \ - serbase.o \ - sizer.o \ - socket.o \ - strconv.o \ - stream.o \ - string.o \ - tbarbase.o \ - textcmn.o \ - textfile.o \ - timercmn.o \ - tokenzr.o \ - txtstrm.o \ - unzip.o \ - url.o \ - utilscmn.o \ - valgen.o \ - validate.o \ - valtext.o \ - variant.o \ - wfstream.o \ - wincmn.o \ - wxchar.o \ - wxexpr.o \ - zipstrm.o \ - zstream.o - -MOTIF_COMMONDEPS = \ - parser.d \ - appcmn.d \ - choiccmn.d \ - clipcmn.d \ - cmdline.d \ - cmndata.d \ - config.d \ - ctrlcmn.d \ - ctrlsub.d \ - datetime.d \ - datstrm.d \ - db.d \ - dbtable.d \ - dcbase.d \ - dlgcmn.d \ - dndcmn.d \ - dobjcmn.d \ - docmdi.d \ - docview.d \ - dynarray.d \ - dynlib.d \ - encconv.d \ - event.d \ - extended.d \ - ffile.d \ - file.d \ - fileconf.d \ - filefn.d \ - filesys.d \ - fontcmn.d \ - fontmap.d \ - framecmn.d \ - fs_inet.d \ - fs_zip.d \ - ftp.d \ - gdicmn.d \ - geometry.d \ - gifdecod.d \ - hash.d \ - helpbase.d \ - http.d \ - imagall.d \ - imagbmp.d \ - image.d \ - imaggif.d \ - imagjpeg.d \ - imagpcx.d \ - imagpng.d \ - imagpnm.d \ - imagtiff.d \ - intl.d \ - ipcbase.d \ - layout.d \ - lboxcmn.d \ - list.d \ - log.d \ - longlong.d \ - memory.d \ - menucmn.d \ - mimecmn.d \ - module.d \ - mstream.d \ - object.d \ - objstrm.d \ - paper.d \ - prntbase.d \ - process.d \ - protocol.d \ - resource.d \ - sckaddr.d \ - sckfile.d \ - sckipc.d \ - sckstrm.d \ - serbase.d \ - sizer.d \ - socket.d \ - strconv.d \ - stream.d \ - string.d \ - tbarbase.d \ - textcmn.d \ - textfile.d \ - timercmn.d \ - tokenzr.d \ - txtstrm.d \ - unzip.d \ - url.d \ - utilscmn.d \ - valgen.d \ - validate.d \ - valtext.d \ - variant.d \ - wfstream.d \ - wincmn.d \ - wxchar.d \ - wxexpr.d \ - zipstrm.d \ - zstream.d - -MOTIF_GUIOBJS = \ - xmcombo.o \ - accel.o \ - app.o \ - bitmap.o \ - bmpbuttn.o \ - brush.o \ - button.o \ - checkbox.o \ - checklst.o \ - choice.o \ - clipbrd.o \ - colour.o \ - combobox.o \ - control.o \ - cursor.o \ - data.o \ - dataobj.o \ - dc.o \ - dcclient.o \ - dcmemory.o \ - dcscreen.o \ - dialog.o \ - filedlg.o \ - font.o \ - frame.o \ - gauge.o \ - gdiobj.o \ - gsockmot.o \ - icon.o \ - listbox.o \ - main.o \ - mdi.o \ - menu.o \ - menuitem.o \ - minifram.o \ - msgdlg.o \ - palette.o \ - pen.o \ - radiobox.o \ - radiobut.o \ - region.o \ - scrolbar.o \ - settings.o \ - slider.o \ - spinbutt.o \ - statbmp.o \ - statbox.o \ - stattext.o \ - textctrl.o \ - timer.o \ - toolbar.o \ - utils.o \ - window.o - -MOTIF_GUIDEPS = \ - xmcombo.d \ - accel.d \ - app.d \ - bitmap.d \ - bmpbuttn.d \ - brush.d \ - button.d \ - checkbox.d \ - checklst.d \ - choice.d \ - clipbrd.d \ - colour.d \ - combobox.d \ - control.d \ - cursor.d \ - data.d \ - dataobj.d \ - dc.d \ - dcclient.d \ - dcmemory.d \ - dcscreen.d \ - dialog.d \ - filedlg.d \ - font.d \ - frame.d \ - gauge.d \ - gdiobj.d \ - gsockmot.d \ - icon.d \ - listbox.d \ - main.d \ - mdi.d \ - menu.d \ - menuitem.d \ - minifram.d \ - msgdlg.d \ - palette.d \ - pen.d \ - radiobox.d \ - radiobut.d \ - region.d \ - scrolbar.d \ - settings.d \ - slider.d \ - spinbutt.d \ - statbmp.d \ - statbox.d \ - stattext.d \ - textctrl.d \ - timer.d \ - toolbar.d \ - utils.d \ - window.d - -MSW_GENERICOBJS = \ - busyinfo.o \ - calctrl.o \ - choicdgg.o \ - dirdlgg.o \ - grid.o \ - laywin.o \ - logg.o \ - numdlgg.o \ - panelg.o \ - plot.o \ - progdlgg.o \ - prop.o \ - propform.o \ - proplist.o \ - sashwin.o \ - scrolwin.o \ - splitter.o \ - statusbr.o \ - tbarsmpl.o \ - textdlgg.o \ - tipdlg.o \ - wizard.o - -MSW_GENERICDEPS = \ - busyinfo.d \ - calctrl.d \ - choicdgg.d \ - dirdlgg.d \ - grid.d \ - laywin.d \ - logg.d \ - numdlgg.d \ - panelg.d \ - plot.d \ - progdlgg.d \ - prop.d \ - propform.d \ - proplist.d \ - sashwin.d \ - scrolwin.d \ - splitter.d \ - statusbr.d \ - tbarsmpl.d \ - textdlgg.d \ - tipdlg.d \ - wizard.d - -MSW_COMMONOBJS = \ - parser.o \ - appcmn.o \ - choiccmn.o \ - clipcmn.o \ - cmdline.o \ - cmndata.o \ - config.o \ - ctrlcmn.o \ - ctrlsub.o \ - datetime.o \ - datstrm.o \ - db.o \ - dbtable.o \ - dcbase.o \ - dlgcmn.o \ - dndcmn.o \ - dobjcmn.o \ - docmdi.o \ - docview.o \ - dynarray.o \ - dynlib.o \ - encconv.o \ - event.o \ - extended.o \ - ffile.o \ - file.o \ - fileconf.o \ - filefn.o \ - filesys.o \ - fontcmn.o \ - fontmap.o \ - framecmn.o \ - fs_inet.o \ - fs_zip.o \ - ftp.o \ - gdicmn.o \ - geometry.o \ - gifdecod.o \ - hash.o \ - helpbase.o \ - http.o \ - imagall.o \ - imagbmp.o \ - image.o \ - imaggif.o \ - imagjpeg.o \ - imagpcx.o \ - imagpng.o \ - imagpnm.o \ - imagtiff.o \ - intl.o \ - ipcbase.o \ - layout.o \ - lboxcmn.o \ - list.o \ - log.o \ - longlong.o \ - memory.o \ - menucmn.o \ - mimecmn.o \ - module.o \ - mstream.o \ - object.o \ - objstrm.o \ - odbc.o \ - paper.o \ - prntbase.o \ - process.o \ - protocol.o \ - resource.o \ - sckaddr.o \ - sckfile.o \ - sckipc.o \ - sckstrm.o \ - serbase.o \ - sizer.o \ - socket.o \ - strconv.o \ - stream.o \ - string.o \ - tbarbase.o \ - textcmn.o \ - textfile.o \ - timercmn.o \ - tokenzr.o \ - txtstrm.o \ - unzip.o \ - url.o \ - utilscmn.o \ - valgen.o \ - validate.o \ - valtext.o \ - variant.o \ - wfstream.o \ - wincmn.o \ - wxchar.o \ - wxexpr.o \ - zipstrm.o \ - zstream.o - -MSW_COMMONDEPS = \ - parser.d \ - appcmn.d \ - choiccmn.d \ - clipcmn.d \ - cmdline.d \ - cmndata.d \ - config.d \ - ctrlcmn.d \ - ctrlsub.d \ - datetime.d \ - datstrm.d \ - db.d \ - dbtable.d \ - dcbase.d \ - dlgcmn.d \ - dndcmn.d \ - dobjcmn.d \ - docmdi.d \ - docview.d \ - dynarray.d \ - dynlib.d \ - encconv.d \ - event.d \ - extended.d \ - ffile.d \ - file.d \ - fileconf.d \ - filefn.d \ - filesys.d \ - fontcmn.d \ - fontmap.d \ - framecmn.d \ - fs_inet.d \ - fs_zip.d \ - ftp.d \ - gdicmn.d \ - geometry.d \ - gifdecod.d \ - hash.d \ - helpbase.d \ - http.d \ - imagall.d \ - imagbmp.d \ - image.d \ - imaggif.d \ - imagjpeg.d \ - imagpcx.d \ - imagpng.d \ - imagpnm.d \ - imagtiff.d \ - intl.d \ - ipcbase.d \ - layout.d \ - lboxcmn.d \ - list.d \ - log.d \ - longlong.d \ - memory.d \ - menucmn.d \ - mimecmn.d \ - module.d \ - mstream.d \ - object.d \ - objstrm.d \ - odbc.d \ - paper.d \ - prntbase.d \ - process.d \ - protocol.d \ - resource.d \ - sckaddr.d \ - sckfile.d \ - sckipc.d \ - sckstrm.d \ - serbase.d \ - sizer.d \ - socket.d \ - strconv.d \ - stream.d \ - string.d \ - tbarbase.d \ - textcmn.d \ - textfile.d \ - timercmn.d \ - tokenzr.d \ - txtstrm.d \ - unzip.d \ - url.d \ - utilscmn.d \ - valgen.d \ - validate.d \ - valtext.d \ - variant.d \ - wfstream.d \ - wincmn.d \ - wxchar.d \ - wxexpr.d \ - zipstrm.d \ - zstream.d - -MSW_GUIOBJS = \ - accel.o \ - app.o \ - bitmap.o \ - bmpbuttn.o \ - brush.o \ - button.o \ - caret.o \ - checkbox.o \ - checklst.o \ - choice.o \ - clipbrd.o \ - colordlg.o \ - colour.o \ - combobox.o \ - control.o \ - curico.o \ - cursor.o \ - data.o \ - dc.o \ - dcclient.o \ - dcmemory.o \ - dcprint.o \ - dcscreen.o \ - dde.o \ - dialog.o \ - dialup.o \ - dib.o \ - dibutils.o \ - dir.o \ - dragimag.o \ - enhmeta.o \ - filedlg.o \ - font.o \ - fontdlg.o \ - fontenum.o \ - fontutil.o \ - frame.o \ - gauge95.o \ - gdiimage.o \ - gdiobj.o \ - gsocket.o \ - helpwin.o \ - icon.o \ - imaglist.o \ - joystick.o \ - listbox.o \ - listctrl.o \ - main.o \ - mdi.o \ - menu.o \ - menuitem.o \ - metafile.o \ - mimetype.o \ - minifram.o \ - msgdlg.o \ - nativdlg.o \ - notebook.o \ - ownerdrw.o \ - palette.o \ - pen.o \ - penwin.o \ - printdlg.o \ - printwin.o \ - radiobox.o \ - radiobut.o \ - regconf.o \ - region.o \ - registry.o \ - scrolbar.o \ - settings.o \ - slider95.o \ - spinbutt.o \ - spinctrl.o \ - statbmp.o \ - statbox.o \ - statbr95.o \ - statline.o \ - stattext.o \ - tabctrl.o \ - taskbar.o \ - tbar95.o \ - textctrl.o \ - thread.o \ - timer.o \ - tooltip.o \ - treectrl.o \ - utils.o \ - utilsexc.o \ - wave.o \ - window.o \ - xpmhand.o - -MSW_GUIDEPS = \ - accel.d \ - app.d \ - bitmap.d \ - bmpbuttn.d \ - brush.d \ - button.d \ - caret.d \ - checkbox.d \ - checklst.d \ - choice.d \ - clipbrd.d \ - colordlg.d \ - colour.d \ - combobox.d \ - control.d \ - curico.d \ - cursor.d \ - data.d \ - dc.d \ - dcclient.d \ - dcmemory.d \ - dcprint.d \ - dcscreen.d \ - dde.d \ - dialog.d \ - dialup.d \ - dib.d \ - dibutils.d \ - dir.d \ - dragimag.d \ - enhmeta.d \ - filedlg.d \ - font.d \ - fontdlg.d \ - fontenum.d \ - fontutil.d \ - frame.d \ - gauge95.d \ - gdiimage.d \ - gdiobj.d \ - gsocket.d \ - helpwin.d \ - icon.d \ - imaglist.d \ - joystick.d \ - listbox.d \ - listctrl.d \ - main.d \ - mdi.d \ - menu.d \ - menuitem.d \ - metafile.d \ - mimetype.d \ - minifram.d \ - msgdlg.d \ - nativdlg.d \ - notebook.d \ - ownerdrw.d \ - palette.d \ - pen.d \ - penwin.d \ - printdlg.d \ - printwin.d \ - radiobox.d \ - radiobut.d \ - regconf.d \ - region.d \ - registry.d \ - scrolbar.d \ - settings.d \ - slider95.d \ - spinbutt.d \ - spinctrl.d \ - statbmp.d \ - statbox.d \ - statbr95.d \ - statline.d \ - stattext.d \ - tabctrl.d \ - taskbar.d \ - tbar95.d \ - textctrl.d \ - thread.d \ - timer.d \ - tooltip.d \ - treectrl.d \ - utils.d \ - utilsexc.d \ - wave.d \ - window.d \ - xpmhand.d - -PM_GENERICOBJS = \ - busyinfo.o \ - calctrl.o \ - caret.o \ - choicdgg.o \ - colrdlgg.o \ - dcpsg.o \ - grid.o \ - helpext.o \ - helphtml.o \ - helpwxht.o \ - helpxlp.o \ - imaglist.o \ - laywin.o \ - listctrl.o \ - logg.o \ - msgdlgg.o \ - numdlgg.o \ - panelg.o \ - plot.o \ - printps.o \ - prntdlgg.o \ - progdlgg.o \ - prop.o \ - propform.o \ - proplist.o \ - sashwin.o \ - scrolwin.o \ - splitter.o \ - statusbr.o \ - tbarsmpl.o \ - textdlgg.o \ - tipdlg.o \ - treectrl.o \ - wizard.o - -PM_GENERICDEPS = \ - busyinfo.d \ - calctrl.d \ - caret.d \ - choicdgg.d \ - colrdlgg.d \ - dcpsg.d \ - grid.d \ - helpext.d \ - helphtml.d \ - helpwxht.d \ - helpxlp.d \ - imaglist.d \ - laywin.d \ - listctrl.d \ - logg.d \ - msgdlgg.d \ - numdlgg.d \ - panelg.d \ - plot.d \ - printps.d \ - prntdlgg.d \ - progdlgg.d \ - prop.d \ - propform.d \ - proplist.d \ - sashwin.d \ - scrolwin.d \ - splitter.d \ - statusbr.d \ - tbarsmpl.d \ - textdlgg.d \ - tipdlg.d \ - treectrl.d \ - wizard.d - -PM_COMMONOBJS = \ - parser.o \ - appcmn.o \ - choiccmn.o \ - clipcmn.o \ - cmdline.o \ - cmndata.o \ - config.o \ - ctrlcmn.o \ - ctrlsub.o \ - datetime.o \ - datstrm.o \ - db.o \ - dbtable.o \ - dcbase.o \ - dlgcmn.o \ - dndcmn.o \ - dobjcmn.o \ - docmdi.o \ - docview.o \ - dynarray.o \ - dynlib.o \ - encconv.o \ - event.o \ - extended.o \ - ffile.o \ - file.o \ - fileconf.o \ - filefn.o \ - filesys.o \ - fontcmn.o \ - fontmap.o \ - framecmn.o \ - fs_inet.o \ - fs_zip.o \ - ftp.o \ - gdicmn.o \ - geometry.o \ - gifdecod.o \ - hash.o \ - helpbase.o \ - http.o \ - imagall.o \ - imagbmp.o \ - image.o \ - imaggif.o \ - imagjpeg.o \ - imagpcx.o \ - imagpng.o \ - imagpnm.o \ - imagtiff.o \ - intl.o \ - ipcbase.o \ - layout.o \ - lboxcmn.o \ - list.o \ - log.o \ - longlong.o \ - memory.o \ - menucmn.o \ - mimecmn.o \ - module.o \ - mstream.o \ - object.o \ - objstrm.o \ - odbc.o \ - paper.o \ - prntbase.o \ - process.o \ - protocol.o \ - resource.o \ - sckaddr.o \ - sckfile.o \ - sckipc.o \ - sckstrm.o \ - serbase.o \ - sizer.o \ - socket.o \ - strconv.o \ - stream.o \ - string.o \ - tbarbase.o \ - textcmn.o \ - textfile.o \ - timercmn.o \ - tokenzr.o \ - txtstrm.o \ - unzip.o \ - url.o \ - utilscmn.o \ - valgen.o \ - validate.o \ - valtext.o \ - variant.o \ - wfstream.o \ - wincmn.o \ - wxchar.o \ - wxexpr.o \ - zipstrm.o \ - zstream.o - -PM_COMMONDEPS = \ - parser.d \ - appcmn.d \ - choiccmn.d \ - clipcmn.d \ - cmdline.d \ - cmndata.d \ - config.d \ - ctrlcmn.d \ - ctrlsub.d \ - datetime.d \ - datstrm.d \ - db.d \ - dbtable.d \ - dcbase.d \ - dlgcmn.d \ - dndcmn.d \ - dobjcmn.d \ - docmdi.d \ - docview.d \ - dynarray.d \ - dynlib.d \ - encconv.d \ - event.d \ - extended.d \ - ffile.d \ - file.d \ - fileconf.d \ - filefn.d \ - filesys.d \ - fontcmn.d \ - fontmap.d \ - framecmn.d \ - fs_inet.d \ - fs_zip.d \ - ftp.d \ - gdicmn.d \ - geometry.d \ - gifdecod.d \ - hash.d \ - helpbase.d \ - http.d \ - imagall.d \ - imagbmp.d \ - image.d \ - imaggif.d \ - imagjpeg.d \ - imagpcx.d \ - imagpng.d \ - imagpnm.d \ - imagtiff.d \ - intl.d \ - ipcbase.d \ - layout.d \ - lboxcmn.d \ - list.d \ - log.d \ - longlong.d \ - memory.d \ - menucmn.d \ - mimecmn.d \ - module.d \ - mstream.d \ - object.d \ - objstrm.d \ - odbc.d \ - paper.d \ - prntbase.d \ - process.d \ - protocol.d \ - resource.d \ - sckaddr.d \ - sckfile.d \ - sckipc.d \ - sckstrm.d \ - serbase.d \ - sizer.d \ - socket.d \ - strconv.d \ - stream.d \ - string.d \ - tbarbase.d \ - textcmn.d \ - textfile.d \ - timercmn.d \ - tokenzr.d \ - txtstrm.d \ - unzip.d \ - url.d \ - utilscmn.d \ - valgen.d \ - validate.d \ - valtext.d \ - variant.d \ - wfstream.d \ - wincmn.d \ - wxchar.d \ - wxexpr.d \ - zipstrm.d \ - zstream.d - -PM_GUIOBJS = \ - accel.o \ - app.o \ - bitmap.o \ - bmpbuttn.o \ - brush.o \ - button.o \ - checkbox.o \ - checklst.o \ - choice.o \ - clipbrd.o \ - colour.o \ - combobox.o \ - control.o \ - cursor.o \ - data.o \ - dataobj.o \ - dc.o \ - dcclient.o \ - dcmemory.o \ - dcprint.o \ - dcscreen.o \ - dialog.o \ - dir.o \ - dirdlg.o \ - dnd.o \ - filedlg.o \ - font.o \ - fontdlg.o \ - fontenum.o \ - fontutil.o \ - frame.o \ - gauge.o \ - gdiimage.o \ - gdiobj.o \ - gsocket.o \ - helpwin.o \ - icon.o \ - iniconf.o \ - joystick.o \ - listbox.o \ - main.o \ - mdi.o \ - menu.o \ - menuitem.o \ - metafile.o \ - mimetype.o \ - minifram.o \ - msgdlg.o \ - nativdlg.o \ - notebook.o \ - ownerdrw.o \ - palette.o \ - pen.o \ - print.o \ - radiobox.o \ - radiobut.o \ - region.o \ - scrolbar.o \ - settings.o \ - slider.o \ - spinbutt.o \ - spinctrl.o \ - statbmp.o \ - statbox.o \ - statline.o \ - stattext.o \ - tabctrl.o \ - taskbar.o \ - textctrl.o \ - thread.o \ - timer.o \ - toolbar.o \ - tooltip.o \ - utils.o \ - utilsexc.o \ - wave.o \ - window.o - -PM_GUIDEPS = \ - accel.d \ - app.d \ - bitmap.d \ - bmpbuttn.d \ - brush.d \ - button.d \ - checkbox.d \ - checklst.d \ - choice.d \ - clipbrd.d \ - colour.d \ - combobox.d \ - control.d \ - cursor.d \ - data.d \ - dataobj.d \ - dc.d \ - dcclient.d \ - dcmemory.d \ - dcprint.d \ - dcscreen.d \ - dialog.d \ - dir.d \ - dirdlg.d \ - dnd.d \ - filedlg.d \ - font.d \ - fontdlg.d \ - fontenum.d \ - fontutil.d \ - frame.d \ - gauge.d \ - gdiimage.d \ - gdiobj.d \ - gsocket.d \ - helpwin.d \ - icon.d \ - iniconf.d \ - joystick.d \ - listbox.d \ - main.d \ - mdi.d \ - menu.d \ - menuitem.d \ - metafile.d \ - mimetype.d \ - minifram.d \ - msgdlg.d \ - nativdlg.d \ - notebook.d \ - ownerdrw.d \ - palette.d \ - pen.d \ - print.d \ - radiobox.d \ - radiobut.d \ - region.d \ - scrolbar.d \ - settings.d \ - slider.d \ - spinbutt.d \ - spinctrl.d \ - statbmp.d \ - statbox.d \ - statline.d \ - stattext.d \ - tabctrl.d \ - taskbar.d \ - textctrl.d \ - thread.d \ - timer.d \ - toolbar.d \ - tooltip.d \ - utils.d \ - utilsexc.d \ - wave.d \ - window.d - -BASE_OBJS = \ - init.o \ - appcmn.o \ - cmdline.o \ - config.o \ - datetime.o \ - dynarray.o \ - dynlib.o \ - event.o \ - extended.o \ - ffile.o \ - file.o \ - fileconf.o \ - filefn.o \ - filesys.o \ - hash.o \ - intl.o \ - list.o \ - log.o \ - longlong.o \ - mimecmn.o \ - module.o \ - object.o \ - process.o \ - strconv.o \ - stream.o \ - string.o \ - textfile.o \ - timercmn.o \ - tokenzr.o \ - txtstrm.o \ - utilscmn.o \ - variant.o \ - wfstream.o \ - wxchar.o \ - dir.o \ - mimetype.o \ - threadpsx.o \ - utilsunx.o - -BASE_DEPS = \ - init.d \ - appcmn.d \ - cmdline.d \ - config.d \ - datetime.d \ - dynarray.d \ - dynlib.d \ - event.d \ - extended.d \ - ffile.d \ - file.d \ - fileconf.d \ - filefn.d \ - filesys.d \ - hash.d \ - intl.d \ - list.d \ - log.d \ - longlong.d \ - mimecmn.d \ - module.d \ - object.d \ - process.d \ - strconv.d \ - stream.d \ - string.d \ - textfile.d \ - timercmn.d \ - tokenzr.d \ - txtstrm.d \ - utilscmn.d \ - variant.d \ - wfstream.d \ - wxchar.d \ - dir.d \ - mimetype.d \ - threadpsx.d \ - utilsunx.d - -HTMLOBJS = \ - helpctrl.o \ - helpdata.o \ - helpfrm.o \ - htmlcell.o \ - htmlfilt.o \ - htmlpars.o \ - htmltag.o \ - htmlwin.o \ - htmprint.o \ - m_dflist.o \ - m_fonts.o \ - m_hline.o \ - m_image.o \ - m_layout.o \ - m_links.o \ - m_list.o \ - m_meta.o \ - m_pre.o \ - m_tables.o \ - winpars.o - -HTMLDEPS = \ - helpctrl.d \ - helpdata.d \ - helpfrm.d \ - htmlcell.d \ - htmlfilt.d \ - htmlpars.d \ - htmltag.d \ - htmlwin.d \ - htmprint.d \ - m_dflist.d \ - m_fonts.d \ - m_hline.d \ - m_image.d \ - m_layout.d \ - m_links.d \ - m_list.d \ - m_meta.d \ - m_pre.d \ - m_tables.d \ - winpars.d - -UNIX_OBJS = \ - dialup.o \ - dir.o \ - fontenum.o \ - fontutil.o \ - gsocket.o \ - mimetype.o \ - threadpsx.o \ - utilsunx.o - -UNIX_DEPS = \ - dialup.d \ - dir.d \ - fontenum.d \ - fontutil.d \ - gsocket.d \ - mimetype.d \ - threadpsx.d \ - utilsunx.d +# this line will include a file which defines ALL_SOURCES, ALL_OBJECTS, +# ALL_DEPFILES and ALL_HEADERS variables with the complete list of .cpp, .o, +# .d and .h/.inl files for the current toolkit +include $(top_srcdir)/@PORT_FILES@ + +SOURCES = $(ALL_SOURCES) +HEADERS = $(ALL_HEADERS) + +# for the objects and depfiles, we might be bulding only part of them +# depending on configure arguments, so select a subset of ALL +OBJECTS = @ALL_OBJECTS@ +DEPFILES = @ALL_DEPFILES@ +# the object files of sublibraries (we assume that they don't change [often], +# so we don't generate these lists with tmake but embed them here) ZLIBOBJS = \ adler32.o \ compress.o \ @@ -2669,23 +282,7 @@ IODBC_OBJS = \ misc.o \ prepare.o \ result.o - -GUIOBJS = @GUIOBJS@ -GUIDEPS = @GUIDEPS@ -GUIHEADERS = @GUIHEADERS@ -COMMONOBJS = @COMMONOBJS@ -COMMONDEPS = @COMMONDEPS@ -GENERICOBJS = @GENERICOBJS@ -GENERICDEPS = @GENERICDEPS@ -UNIXOBJS = @UNIXOBJS@ -UNIXDEPS = @UNIXDEPS@ -IODBCOBJS = @IODBCOBJS@ - -OBJECTS = @ALL_OBJECTS@ - -DEPFILES = @ALL_DEPFILES@ - -HEADERS = @ALL_HEADERS@ +############################## Rules ################################## BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@ @@ -2708,7 +305,7 @@ CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@ $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@ $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@ -CREATE_INSTALLED_LINKS: $(libdir)/@WX_LIBRARY_NAME_SHARED@ +CREATE_INSTALLED_LINKS: preinstall $(RM) $(libdir)/@WX_LIBRARY_LINK1@ $(RM) $(libdir)/@WX_LIBRARY_LINK2@ $(RM) $(libdir)/@WX_LIBRARY_LINK3@ @@ -2741,14 +338,16 @@ lexer.c: $(COMMDIR)/lexer.l -include $(DEPFILES) -afminstall: +afminstall: preinstall $(INSTALL) -d $(datadir) $(INSTALL) -d $(datadir)/wx $(INSTALL) -d $(datadir)/wx/afm $(INSTALL) -d $(datadir)/wx/gs_afm $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm - + +# this is the real install target: copies the library, wx-config and the +# headers to the installation directory preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config @echo " " @echo " Installing wxWindows..." @@ -2770,28 +369,27 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(INSTALL) -d $(includedir)/wx @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi - @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/protocol; fi - @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/unix; fi @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi + $(INSTALL) -d $(includedir)/wx/protocol + $(INSTALL) -d $(includedir)/wx/unix @list='$(HEADERS)'; for p in $$list; do \ $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \ echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \ done -write_message: +install: @AFMINSTALL@ @WX_ALL_INSTALLED@ @echo " " @echo " The installation of wxWindows is finished. On certain" @echo " platforms (e.g. Linux) you'll now have to run ldconfig" - @echo " if you installed a shared library." + @echo " if you installed a shared library and also modify" + @echo " LD_LIBRARY_PATH (or equivalent) environment variable." @echo " " - @echo " wxWindows comes with no guarantees and doesn't claim" + @echo " wxWindows comes with no guarantees and doesn't claim" @echo " to be suitable for any purpose." @echo " " @echo " Read the wxWindows Licence on licencing conditions." @echo " " -install: preinstall @AFMINSTALL@ @WX_ALL_INSTALLED@ write_message - uninstall: @echo " " @echo " Uninstalling wxWindows..." @@ -2827,10 +425,11 @@ uninstall: @if test -d $(includedir)/wx/protocol; then rmdir $(includedir)/wx/protocol; fi @if test -d $(includedir)/wx; then rmdir $(includedir)/wx; fi -ALL_DIST: +# this target should copy only the files common to really all ports (including +# wxBase) to the dist dir +ALL_DIST: distclean mkdir _dist_dir mkdir $(DISTDIR) - cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR) cp $(WXDIR)/configure.in $(DISTDIR) cp $(WXDIR)/configure $(DISTDIR) cp $(WXDIR)/config.sub $(DISTDIR) @@ -2843,6 +442,11 @@ ALL_DIST: cp $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB cp $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt cp $(DOCDIR)/symbols.txt $(DISTDIR)/SYMBOLS.txt + +# this target is the common part of distribution script for all GUI toolkits, +# but is not used when building wxBase distribution +ALL_GUI_DIST: ALL_DIST + cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR) cp $(DOCDIR)/$(TOOLKITDIR)/install.txt $(DISTDIR)/INSTALL.txt cp $(DOCDIR)/$(TOOLKITDIR)/changes.txt $(DISTDIR)/CHANGES.txt cp $(DOCDIR)/$(TOOLKITDIR)/readme.txt $(DISTDIR)/README.txt @@ -2852,10 +456,10 @@ ALL_DIST: mkdir $(DISTDIR)/include/wx/$(TOOLKITDIR) mkdir $(DISTDIR)/include/wx/generic mkdir $(DISTDIR)/include/wx/html - mkdir $(DISTDIR)/include/wx/unix mkdir $(DISTDIR)/include/wx/protocol - cp $(INCDIR)/wx/*.h $(DISTDIR)/include/wx - cp $(INCDIR)/wx/*.inl $(DISTDIR)/include/wx + mkdir $(DISTDIR)/include/wx/unix + cp $(INCDIR)/wx/*.h $(DISTDIR)/include/wx + cp $(INCDIR)/wx/*.inl $(DISTDIR)/include/wx cp $(INCDIR)/wx/*.cpp $(DISTDIR)/include/wx cp $(INCDIR)/wx/generic/*.h $(DISTDIR)/include/wx/generic cp $(INCDIR)/wx/generic/*.xpm $(DISTDIR)/include/wx/generic @@ -2868,15 +472,18 @@ ALL_DIST: mkdir $(DISTDIR)/src/html mkdir $(DISTDIR)/src/html/bitmaps mkdir $(DISTDIR)/src/$(TOOLKITDIR) - mkdir $(DISTDIR)/src/unix mkdir $(DISTDIR)/src/png mkdir $(DISTDIR)/src/jpeg mkdir $(DISTDIR)/src/tiff mkdir $(DISTDIR)/src/zlib mkdir $(DISTDIR)/src/iodbc + mkdir $(DISTDIR)/src/unix + cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@ cp $(SRCDIR)/*.in $(DISTDIR)/src cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common cp $(COMMDIR)/*.c $(DISTDIR)/src/common + cp $(UNIXDIR)/*.c $(DISTDIR)/src/unix + cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix cp $(COMMDIR)/*.inc $(DISTDIR)/src/common cp $(COMMDIR)/*.l $(DISTDIR)/src/common cp $(COMMDIR)/*.h $(DISTDIR)/src/common @@ -2884,8 +491,6 @@ ALL_DIST: cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps - cp $(UNIXDIR)/*.c $(DISTDIR)/src/unix - cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix cp $(PNGDIR)/*.h $(DISTDIR)/src/png cp $(PNGDIR)/*.c $(DISTDIR)/src/png cp $(PNGDIR)/README $(DISTDIR)/src/png @@ -2906,7 +511,30 @@ ALL_DIST: cp $(ODBCDIR)/NEWS $(DISTDIR)/src/iodbc cp $(ODBCDIR)/Changes.log $(DISTDIR)/src/iodbc -GTK_DIST: +BASE_DIST: ALL_DIST + mkdir $(DISTDIR)/include + mkdir $(DISTDIR)/include/wx + mkdir $(DISTDIR)/include/wx/protocol + mkdir $(DISTDIR)/include/wx/unix + mkdir $(DISTDIR)/src + mkdir $(DISTDIR)/src/common + mkdir $(DISTDIR)/src/unix + cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@ + cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@ + cp $(WXDIR)/@RPM_SPEC@ $(DISTDIR)/@RPM_SPEC@ + cp $(DOCDIR)/install.txt $(DISTDIR)/INSTALL.txt + cp $(DOCDIR)/changes.txt $(DISTDIR)/CHANGES.txt + cp $(DOCDIR)/readme.txt $(DISTDIR)/README.txt + cp $(DOCDIR)/todo.txt $(DISTDIR)/TODO.txt + cp $(SRCDIR)/*.in $(DISTDIR)/src + list='$(HEADERS)'; for p in $$list; do \ + cp $(WXDIR)/include/wx/$$p $(DISTDIR)/include/wx/$$p; \ + done + list='$(SOURCES)'; for p in $$list; do \ + cp $(WXDIR)/src/$$p $(DISTDIR)/src/$$p; \ + done + +GTK_DIST: ALL_GUI_DIST cp $(WXDIR)/wxGTK.spec $(DISTDIR) cp $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk cp $(INCDIR)/wx/gtk/*.xpm $(DISTDIR)/include/wx/gtk @@ -2914,7 +542,7 @@ GTK_DIST: cp $(GTKDIR)/*.c $(DISTDIR)/src/gtk cp $(GTKDIR)/*.xbm $(DISTDIR)/src/gtk -MOTIF_DIST: +MOTIF_DIST: ALL_GUI_DIST cp $(WXDIR)/wxMOTIF.spec $(DISTDIR) cp $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif cp $(MOTIFDIR)/*.cpp $(DISTDIR)/src/motif @@ -2924,7 +552,7 @@ MOTIF_DIST: cp $(MOTIFDIR)/xmcombo/*.h $(DISTDIR)/src/motif/xmcombo cp $(MOTIFDIR)/xmcombo/copying.txt $(DISTDIR)/src/motif/xmcombo -MSW_DIST: +MSW_DIST: ALL_GUI_DIST cp $(WXDIR)/wxWINE.spec $(DISTDIR) cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.cur $(DISTDIR)/include/wx/msw @@ -2937,9 +565,11 @@ MSW_DIST: mkdir $(DISTDIR)/src/msw/ole cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole -DEMOS_DIST: +DEMOS_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/demos cp $(DEMODIR)/Makefile.in $(DISTDIR)/demos + cp $(DEMODIR)/configure $(DISTDIR)/samples + cp $(DEMODIR)/configure.in $(DISTDIR)/samples mkdir $(DISTDIR)/demos/bombs cp $(DEMODIR)/bombs/Makefile.in $(DISTDIR)/demos/bombs @@ -2979,9 +609,11 @@ DEMOS_DIST: cp $(DEMODIR)/fractal/makefile.unx $(DISTDIR)/demos/fractal cp $(DEMODIR)/fractal/*.cpp $(DISTDIR)/demos/fractal -SAMPLES_DIST: +SAMPLES_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/samples cp $(SAMPDIR)/Makefile.in $(DISTDIR)/samples + cp $(SAMPDIR)/configure $(DISTDIR)/samples + cp $(SAMPDIR)/configure.in $(DISTDIR)/samples mkdir $(DISTDIR)/samples/caret cp $(SAMPDIR)/caret/Makefile.in $(DISTDIR)/samples/caret @@ -3331,9 +963,11 @@ SAMPLES_DIST: cp $(SAMPDIR)/sockets/*.cpp $(DISTDIR)/samples/sockets cp $(SAMPDIR)/sockets/*.xpm $(DISTDIR)/samples/sockets -UTILS_DIST: +UTILS_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/utils cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils + cp $(UTILSDIR)/configure $(DISTDIR)/samples + cp $(UTILSDIR)/configure.in $(DISTDIR)/samples mkdir $(DISTDIR)/utils/wxMMedia2 mkdir $(DISTDIR)/utils/wxMMedia2/lib @@ -3361,21 +995,29 @@ UTILS_DIST: cp $(UTILSDIR)/ogl/src/*.h $(DISTDIR)/utils/ogl/src cp $(UTILSDIR)/ogl/src/*.cpp $(DISTDIR)/utils/ogl/src -MISC_DIST: +MISC_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/misc mkdir $(DISTDIR)/misc/afm cp $(MISCDIR)/afm/*.afm $(DISTDIR)/misc/afm mkdir $(DISTDIR)/misc/gs_afm cp $(MISCDIR)/gs_afm/*.afm $(DISTDIR)/misc/gs_afm - -dist: ALL_DIST @GUIDIST@ SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST - cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) .. - mv _dist_dir/wx$(TOOLKIT)/samples _dist_dir/wx$(TOOLKIT)/wxSamples - cd _dist_dir/wx$(TOOLKIT); tar ch wxSamples | gzip -f9 > $(WXSAMPLES); mv $(WXSAMPLES) ../.. - mv _dist_dir/wx$(TOOLKIT)/demos _dist_dir/wx$(TOOLKIT)/wxDemos - cd _dist_dir/wx$(TOOLKIT); tar ch wxDemos | gzip -f9 > $(WXDEMOS); mv $(WXDEMOS) ../.. + +distclean: $(RM) -r _dist_dir +dist: @GUIDIST@ + @echo "*** Creating wxWindows distribution in $(DISTDIR)..." + cd _dist_dir; tar ch @DISTDIR@ | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) .. + @if test "$(USE_GUI)" = 1; then \ + cd $(DISTDIR); \ + mv samples wxSamples; \ + tar ch wxSamples | gzip -f9 > ../../$(WXSAMPLES); \ + mv wxSamples samples; \ + mv demos wxDemos; \ + tar ch wxDemos | gzip -f9 > ../../$(WXDEMOS); \ + mv wxDemos demos; \ + fi + clean: $(RM) *.o $(RM) *.d diff --git a/configure b/configure index f3f1a4a9e2..8a24e52c57 100755 --- a/configure +++ b/configure @@ -38,7 +38,7 @@ # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.14 +# Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -596,7 +596,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.14" + echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) @@ -6954,7 +6954,7 @@ echo "configure:6954: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" != "no" ; then GTK_CFLAGS=`$GTK_CONFIG --cflags` - GTK_LIBS=`$GTK_CONFIG --libs` + GTK_LIBS=`$GTK_CONFIG --libs gthread` ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS" @@ -7026,7 +7026,10 @@ fi TOOLKIT_INCLUDE="$GTK_CFLAGS" - GUI_TK_LIBRARY="$GTK_LIBS -lgthread" + + + GUI_TK_LIBRARY="$GTK_LIBS" + TOOLKIT=GTK AFMINSTALL=afminstall @@ -7042,8 +7045,8 @@ fi UNIXDEPS="\$(UNIX_DEPS)" GUIDIST=GTK_DIST -echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6 -echo "configure:7047: checking for gdk_im_open in -lgdk" >&5 + echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6 +echo "configure:7050: checking for gdk_im_open in -lgdk" >&5 ac_lib_var=`echo gdk'_'gdk_im_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7051,7 +7054,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgdk $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7085,12 +7088,11 @@ else echo "$ac_t""no" 1>&6 fi - fi if test "$wxUSE_WINE" = 1; then echo $ac_n "checking for WINE includes""... $ac_c" 1>&6 -echo "configure:7094: checking for WINE includes" >&5 +echo "configure:7096: checking for WINE includes" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -7111,7 +7113,7 @@ for ac_dir in $SEARCH_INCLUDE; XPM_LINK="" echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:7115: checking for Xpm library" >&5 +echo "configure:7117: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -7139,7 +7141,7 @@ EOF MESA_LINK="" echo $ac_n "checking for Mesa library""... $ac_c" 1>&6 -echo "configure:7143: checking for Mesa library" >&5 +echo "configure:7145: checking for Mesa library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -7183,7 +7185,7 @@ if test "$wxUSE_MOTIF" = 1; then # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:7187: checking for X" >&5 +echo "configure:7189: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -7245,12 +7247,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7319,14 +7321,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -7432,17 +7434,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:7436: checking whether -R must be followed by a space" >&5 +echo "configure:7438: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -7458,14 +7460,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -7497,7 +7499,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:7501: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:7503: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7505,7 +7507,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7538,7 +7540,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:7542: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:7544: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7546,7 +7548,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7586,12 +7588,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:7590: checking for gethostbyname" >&5 +echo "configure:7592: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -7636,7 +7637,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:7640: checking for gethostbyname in -lnsl" >&5 +echo "configure:7641: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7644,7 +7645,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7685,12 +7686,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:7689: checking for connect" >&5 +echo "configure:7690: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -7828,7 +7827,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:7832: checking for remove in -lposix" >&5 +echo "configure:7831: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7836,7 +7835,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7871,12 +7870,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:7875: checking for shmat" >&5 +echo "configure:7874: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -7921,7 +7919,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:7925: checking for shmat in -lipc" >&5 +echo "configure:7923: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7929,7 +7927,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7973,7 +7971,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:7977: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:7975: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7981,7 +7979,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8028,7 +8026,7 @@ fi echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6 -echo "configure:8032: checking for Motif/Lesstif headers" >&5 +echo "configure:8030: checking for Motif/Lesstif headers" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -8047,7 +8045,7 @@ for ac_dir in $SEARCH_INCLUDE; fi echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6 -echo "configure:8051: checking for Motif/Lesstif library" >&5 +echo "configure:8049: checking for Motif/Lesstif library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -8090,7 +8088,7 @@ for ac_dir in $SEARCH_LIB; fi echo $ac_n "checking for Xt library""... $ac_c" 1>&6 -echo "configure:8094: checking for Xt library" >&5 +echo "configure:8092: checking for Xt library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -8122,7 +8120,7 @@ for ac_dir in $SEARCH_LIB; XPM_LINK="" echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:8126: checking for Xpm library" >&5 +echo "configure:8124: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -8194,13 +8192,13 @@ else TOOLKIT_DIR="os2" fi -TOOLKIT_DEF="-D__WX${TOOLKIT}__" + TOOLKIT_DEF="-D__WX${TOOLKIT}__" -WX_LIBRARY="wx_${TOOLKIT_DIR}" + WX_LIBRARY="wx_${TOOLKIT_DIR}" ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(IODBCOBJS)" if test "$wxUSE_LIBJPEG" = "yes" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)" + ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)" fi if test "$wxUSE_LIBTIFF" = "yes" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(TIFFOBJS)" @@ -8212,16 +8210,28 @@ WX_LIBRARY="wx_${TOOLKIT_DIR}" ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)" fi ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS)" - ALL_HEADERS="\$(GUIHEADERS) \$(HTML_HEADERS) \$(UNIX_HEADERS) \$(PROTOCOL_HEADERS) \$(GENERIC_HEADERS) \$(WX_HEADERS)" + + PORT_FILES="src/\$(TOOLKITDIR)/files.lst" + RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst" + RPM_SPEC="wx\$(TOOLKIT).spec" + + GUIDIST="${GUIDIST} SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST" + DISTDIR="wx\$(TOOLKIT)" else USE_GUI=0 - ALL_OBJECTS="\$(BASE_OBJS)" - ALL_DEPFILES="\${BASE_DEPS}" - ALL_HEADERS="\${BASE_HEADERS}" + ALL_OBJECTS="\$(BASE_OBJS) \${BASE_UNIX_OBJS}" + ALL_DEPFILES="\${BASE_DEPS} \${BASE_UNIX_DEPS}" WX_LIBRARY="wxbase" + + PORT_FILES="src/files.lst" + RPM_FILES="src/rpmfiles.lst" + RPM_SPEC="wxBase.spec" + + GUIDIST="BASE_DIST" + DISTDIR="wxBase" fi WX_LIBRARY_NAME="lib${WX_LIBRARY}.la" @@ -8351,17 +8361,17 @@ for ac_hdr in strings.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8355: checking for $ac_hdr" >&5 +echo "configure:8365: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8365: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8375: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8391,17 +8401,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8395: checking for $ac_hdr" >&5 +echo "configure:8405: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8431,17 +8441,17 @@ for ac_hdr in wchar.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8435: checking for $ac_hdr" >&5 +echo "configure:8445: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8455: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8471,17 +8481,17 @@ for ac_hdr in wcstr.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8475: checking for $ac_hdr" >&5 +echo "configure:8485: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8485: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8511,17 +8521,17 @@ for ac_hdr in fnmatch.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8515: checking for $ac_hdr" >&5 +echo "configure:8525: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8535: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8553,17 +8563,17 @@ if test "$wxUSE_GUI" = "yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8557: checking for $ac_hdr" >&5 +echo "configure:8567: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8593,12 +8603,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:8597: checking for ANSI C header files" >&5 +echo "configure:8607: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -8606,7 +8616,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8610: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8623,7 +8633,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -8641,7 +8651,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -8662,7 +8672,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -8673,7 +8683,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:8677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -8697,12 +8707,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:8701: checking for mode_t" >&5 +echo "configure:8711: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -8730,12 +8740,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:8734: checking for off_t" >&5 +echo "configure:8744: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -8763,12 +8773,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:8767: checking for pid_t" >&5 +echo "configure:8777: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -8796,12 +8806,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:8800: checking for size_t" >&5 +echo "configure:8810: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -8829,12 +8839,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:8833: checking for uid_t in sys/types.h" >&5 +echo "configure:8843: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -8865,13 +8875,13 @@ fi echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6 -echo "configure:8869: checking for pw_gecos in struct passwd" >&5 +echo "configure:8879: checking for pw_gecos in struct passwd" >&5 if eval "test \"`echo '$''{'wx_cv_struct_pw_gecos'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -8882,7 +8892,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8896: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_pw_gecos=yes @@ -8909,12 +8919,12 @@ echo "$ac_t""$wx_cv_struct_pw_gecos" 1>&6 echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:8913: checking for working const" >&5 +echo "configure:8923: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -8984,21 +8994,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:8988: checking for inline" >&5 +echo "configure:8998: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -9025,7 +9035,7 @@ esac echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:9029: checking size of char" >&5 +echo "configure:9039: checking size of char" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9033,7 +9043,7 @@ else ac_cv_sizeof_char=1 else cat > conftest.$ac_ext < main() @@ -9044,7 +9054,7 @@ main() exit(0); } EOF -if { (eval echo configure:9048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_char=`cat conftestval` else @@ -9064,7 +9074,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:9068: checking size of short" >&5 +echo "configure:9078: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9072,7 +9082,7 @@ else ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < main() @@ -9083,7 +9093,7 @@ main() exit(0); } EOF -if { (eval echo configure:9087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -9103,7 +9113,7 @@ EOF echo $ac_n "checking size of int *""... $ac_c" 1>&6 -echo "configure:9107: checking size of int *" >&5 +echo "configure:9117: checking size of int *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9111,7 +9121,7 @@ else ac_cv_sizeof_int_p=4 else cat > conftest.$ac_ext < main() @@ -9122,7 +9132,7 @@ main() exit(0); } EOF -if { (eval echo configure:9126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int_p=`cat conftestval` else @@ -9142,7 +9152,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:9146: checking size of int" >&5 +echo "configure:9156: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9150,7 +9160,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < main() @@ -9161,7 +9171,7 @@ main() exit(0); } EOF -if { (eval echo configure:9165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -9181,7 +9191,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:9185: checking size of long" >&5 +echo "configure:9195: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9189,7 +9199,7 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < main() @@ -9200,7 +9210,7 @@ main() exit(0); } EOF -if { (eval echo configure:9204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -9220,7 +9230,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:9224: checking size of long long" >&5 +echo "configure:9234: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9228,7 +9238,7 @@ else ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext < main() @@ -9239,7 +9249,7 @@ main() exit(0); } EOF -if { (eval echo configure:9243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -9260,14 +9270,14 @@ EOF echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:9264: checking whether byte ordering is bigendian" >&5 +echo "configure:9274: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -9278,11 +9288,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:9282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -9293,7 +9303,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:9297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -9313,7 +9323,7 @@ if test "$cross_compiling" = yes; then ac_cv_c_bigendian=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -9373,17 +9383,17 @@ cross_compiling=$ac_cv_prog_cxx_cross do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9377: checking for $ac_hdr" >&5 +echo "configure:9387: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9397: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9431,7 +9441,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6 -echo "configure:9435: checking if C++ compiler supports bool" >&5 +echo "configure:9445: checking if C++ compiler supports bool" >&5 if eval "test \"`echo '$''{'wx_cv_cpp_bool'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9446,7 +9456,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -9500,13 +9510,13 @@ EOF echo $ac_n "checking if you need GNU extensions""... $ac_c" 1>&6 -echo "configure:9504: checking if you need GNU extensions" >&5 +echo "configure:9514: checking if you need GNU extensions" >&5 if eval "test \"`echo '$''{'wx_cv_gnu_extensions'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -9519,7 +9529,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_gnu_extensions=yes else @@ -9544,7 +9554,7 @@ fi echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6 -echo "configure:9548: checking for wcslen in -lc" >&5 +echo "configure:9558: checking for wcslen in -lc" >&5 ac_lib_var=`echo c'_'wcslen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9552,7 +9562,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9589,7 +9599,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6 -echo "configure:9593: checking for wcslen in -lw" >&5 +echo "configure:9603: checking for wcslen in -lw" >&5 ac_lib_var=`echo w'_'wcslen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9597,7 +9607,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lw $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9639,12 +9649,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:9643: checking for vprintf" >&5 +echo "configure:9653: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -9692,12 +9701,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:9696: checking for _doprnt" >&5 +echo "configure:9705: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -9749,12 +9757,12 @@ fi for ac_func in vsnprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9753: checking for $ac_func" >&5 +echo "configure:9761: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9818,7 +9825,7 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for vsscanf""... $ac_c" 1>&6 -echo "configure:9822: checking for vsscanf" >&5 +echo "configure:9829: checking for vsscanf" >&5 if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9828,7 +9835,7 @@ else else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF @@ -9891,12 +9898,12 @@ if test "$USE_UNIX" = 1; then for ac_func in vfork do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9895: checking for $ac_func" >&5 +echo "configure:9902: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9948,12 +9954,12 @@ done for ac_func in timegm do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9952: checking for $ac_func" >&5 +echo "configure:9958: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10016,12 +10021,12 @@ if test "$HAVE_SOME_SLEEP_FUNC" != 1; then for ac_func in nanosleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10020: checking for $ac_func" >&5 +echo "configure:10025: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10070,7 +10074,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 -echo "configure:10074: checking for nanosleep in -lposix4" >&5 +echo "configure:10078: checking for nanosleep in -lposix4" >&5 ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10078,7 +10082,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10117,12 +10121,12 @@ else for ac_func in usleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10121: checking for $ac_func" >&5 +echo "configure:10125: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10185,12 +10188,12 @@ fi for ac_func in uname gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10189: checking for $ac_func" >&5 +echo "configure:10192: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10242,12 +10244,12 @@ done for ac_func in strtok_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10246: checking for $ac_func" >&5 +echo "configure:10248: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10300,12 +10301,12 @@ INET_LINK= for ac_func in inet_addr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10304: checking for $ac_func" >&5 +echo "configure:10305: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10498,7 +10497,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6 -echo "configure:10502: checking for inet_aton in -l$INET_LINK" >&5 +echo "configure:10501: checking for inet_aton in -l$INET_LINK" >&5 ac_lib_var=`echo $INET_LINK'_'inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10506,7 +10505,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$INET_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10624,7 +10623,7 @@ fi if test "$wxUSE_THREADS" = "yes" ; then echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:10628: checking for pthread_create in -lpthread" >&5 +echo "configure:10627: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10632,7 +10631,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10666,7 +10665,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:10670: checking for pthread_create in -lc_r" >&5 +echo "configure:10669: checking for pthread_create in -lc_r" >&5 ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10674,7 +10673,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10709,17 +10708,17 @@ else ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6 -echo "configure:10713: checking for sys/prctl.h" >&5 +echo "configure:10712: checking for sys/prctl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10723: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10722: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10759,12 +10758,12 @@ if test "$wxUSE_THREADS" = "yes" ; then for ac_func in thr_setconcurrency do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10763: checking for $ac_func" >&5 +echo "configure:10762: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10818,17 +10816,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10822: checking for $ac_hdr" >&5 +echo "configure:10820: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10830: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10856,7 +10854,7 @@ done echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:10860: checking for sched_yield in -l$THREADS_LINK" >&5 +echo "configure:10858: checking for sched_yield in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'sched_yield | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10864,7 +10862,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10897,7 +10895,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sched_yield in -l"posix4"""... $ac_c" 1>&6 -echo "configure:10901: checking for sched_yield in -l"posix4"" >&5 +echo "configure:10899: checking for sched_yield in -l"posix4"" >&5 ac_lib_var=`echo "posix4"'_'sched_yield | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10905,7 +10903,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l"posix4" $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10946,7 +10944,7 @@ fi echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:10950: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5 +echo "configure:10948: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10954,7 +10952,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10987,7 +10985,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_attr_getschedpolicy in -l"posix4"""... $ac_c" 1>&6 -echo "configure:10991: checking for pthread_attr_getschedpolicy in -l"posix4"" >&5 +echo "configure:10989: checking for pthread_attr_getschedpolicy in -l"posix4"" >&5 ac_lib_var=`echo "posix4"'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10995,7 +10993,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l"posix4" $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11036,7 +11034,7 @@ fi echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:11040: checking for pthread_cancel in -l$THREADS_LINK" >&5 +echo "configure:11038: checking for pthread_cancel in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'pthread_cancel | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11044,7 +11042,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11081,13 +11079,13 @@ fi echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6 -echo "configure:11085: checking for pthread_cleanup_push/pop" >&5 +echo "configure:11083: checking for pthread_cleanup_push/pop" >&5 if eval "test \"`echo '$''{'wx_cv_func_pthread_cleanup_push'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -11097,7 +11095,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_pthread_cleanup_push=yes @@ -11138,7 +11136,7 @@ EOF else if test "$ac_cv_func_strtok_r" = "yes"; then echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6 -echo "configure:11142: checking if -D_REENTRANT is needed" >&5 +echo "configure:11140: checking if -D_REENTRANT is needed" >&5 if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then CFLAGS="${CFLAGS} -D_REENTRANT" CXXFLAGS="${CXXFLAGS} -D_REENTRANT" @@ -11293,17 +11291,17 @@ fi if test "$wxUSE_OPENGL" = "yes"; then ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6 -echo "configure:11297: checking for GL/gl.h" >&5 +echo "configure:11295: checking for GL/gl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11305: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11321,7 +11319,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for glInitNames in -lGL""... $ac_c" 1>&6 -echo "configure:11325: checking for glInitNames in -lGL" >&5 +echo "configure:11323: checking for glInitNames in -lGL" >&5 ac_lib_var=`echo GL'_'glInitNames | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11329,7 +11327,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lGL wxUSE_OPENGL=0 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11367,7 +11365,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for glInitNames in -lMesaGL""... $ac_c" 1>&6 -echo "configure:11371: checking for glInitNames in -lMesaGL" >&5 +echo "configure:11369: checking for glInitNames in -lMesaGL" >&5 ac_lib_var=`echo MesaGL'_'glInitNames | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11375,7 +11373,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lMesaGL $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11573,12 +11571,12 @@ if test "$wxUSE_TIMEDATE" = "yes"; then for ac_func in strptime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11577: checking for $ac_func" >&5 +echo "configure:11575: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11628,13 +11625,13 @@ done echo $ac_n "checking for timezone variable in ""... $ac_c" 1>&6 -echo "configure:11632: checking for timezone variable in " >&5 +echo "configure:11629: checking for timezone variable in " >&5 if eval "test \"`echo '$''{'wx_cv_var_timezone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -11646,7 +11643,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=__timezone @@ -11657,7 +11654,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -11669,7 +11666,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=_timezone @@ -11680,7 +11677,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -11692,7 +11689,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11696: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11693: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=timezone @@ -11727,12 +11724,12 @@ EOF for ac_func in localtime gettimeofday ftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11731: checking for $ac_func" >&5 +echo "configure:11728: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11783,13 +11779,13 @@ done if test "$ac_cv_func_localtime" = "yes"; then echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:11787: checking for tm_gmtoff in struct tm" >&5 +echo "configure:11783: checking for tm_gmtoff in struct tm" >&5 if eval "test \"`echo '$''{'wx_cv_struct_tm_has_gmtoff'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -11801,7 +11797,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11801: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_tm_has_gmtoff=yes @@ -11824,7 +11820,7 @@ fi echo "$ac_t""$wx_cv_struct_tm_has_gmtoff" 1>&6 elif test "$ac_cv_func_gettimeofday" = "yes"; then echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6 -echo "configure:11828: checking whether gettimeofday takes two arguments" >&5 +echo "configure:11824: checking whether gettimeofday takes two arguments" >&5 if eval "test \"`echo '$''{'wx_cv_func_gettimeofday_has_2_args'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11839,7 +11835,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -11853,7 +11849,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=yes else @@ -11861,7 +11857,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -11874,7 +11870,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=no else @@ -11918,12 +11914,12 @@ fi if test "$wxUSE_SOCKETS" = "yes"; then echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:11922: checking for socket" >&5 +echo "configure:11918: checking for socket" >&5 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -11965,7 +11960,7 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:11969: checking for socket in -lsocket" >&5 +echo "configure:11964: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11973,7 +11968,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12024,16 +12019,16 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking the type of the third argument of getsockname""... $ac_c" 1>&6 -echo "configure:12028: checking the type of the third argument of getsockname" >&5 +echo "configure:12023: checking the type of the third argument of getsockname" >&5 cat > conftest.$ac_ext < int main() { socklen_t len; getsockname(0, 0, &len); ; return 0; } EOF -if { (eval echo configure:12037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12032: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SOCKLEN_T socklen_t @@ -12044,14 +12039,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { size_t len; getsockname(0, 0, &len); ; return 0; } EOF -if { (eval echo configure:12055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SOCKLEN_T size_t @@ -12062,14 +12057,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { int len; getsockname(0, 0, &len); ; return 0; } EOF -if { (eval echo configure:12073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SOCKLEN_T int @@ -12111,17 +12106,17 @@ if test "$wxUSE_JOYSTICK" = 1; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12115: checking for $ac_hdr" >&5 +echo "configure:12110: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12120: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12163,12 +12158,12 @@ if test "$wxUSE_DYNLIB_CLASS" = "yes"; then for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12167: checking for $ac_func" >&5 +echo "configure:12162: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12220,7 +12214,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:12224: checking for dlopen in -ldl" >&5 +echo "configure:12218: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12228,7 +12222,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12268,12 +12262,12 @@ else for ac_func in shl_load do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12272: checking for $ac_func" >&5 +echo "configure:12266: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12526,17 +12519,17 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12530: checking for $ac_hdr" >&5 +echo "configure:12523: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12540: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12533: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13046,13 +13039,17 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq + + + + echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:13056: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:13053: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13081,12 +13078,29 @@ fi -if test "${TOOLKIT_DIR}" = "msw" ; then - GL_TOOLKIT_DIR="win" +if test "$wxUSE_GUI" = "yes"; then + echo $ac_n "checking glcanvas subdirectory to use""... $ac_c" 1>&6 +echo "configure:13084: checking glcanvas subdirectory to use" >&5 +if eval "test \"`echo '$''{'wx_cv_path_glcanvas'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - GL_TOOLKIT_DIR="${TOOLKIT_DIR}" + + if test "${TOOLKIT_DIR}" = "msw" ; then + wx_cv_path_glcanvas="win" + else + wx_cv_path_glcanvas="${TOOLKIT_DIR}" + fi + fi +echo "$ac_t""$wx_cv_path_glcanvas" 1>&6 + + GL_TOOLKIT_DIR=$wx_cv_PATH_glcanvas + + + subdirs="demos samples utils" + +fi trap '' 1 2 15 cat > confcache <<\EOF @@ -13178,7 +13192,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.14" + echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -13195,84 +13209,6 @@ trap 'rm -fr `echo " src/makeprog.env src/makelib.env Makefile - demos/Makefile - demos/bombs/Makefile - demos/dbbrowse/Makefile - demos/forty/Makefile - demos/fractal/Makefile - demos/life/Makefile - demos/poem/Makefile - samples/Makefile - samples/caret/Makefile - samples/calendar/Makefile - samples/checklst/Makefile - samples/config/Makefile - samples/controls/Makefile - samples/console/Makefile - samples/db/Makefile - samples/dialogs/Makefile - samples/docview/Makefile - samples/docvwmdi/Makefile - samples/dnd/Makefile - samples/drawing/Makefile - samples/exec/Makefile - samples/font/Makefile - samples/grid/Makefile - samples/help/Makefile - samples/image/Makefile - samples/internat/Makefile - samples/ipc/Makefile - samples/layout/Makefile - samples/listctrl/Makefile - samples/mdi/Makefile - samples/minifram/Makefile - samples/minimal/Makefile - samples/dialup/Makefile - samples/newgrid/Makefile - samples/notebook/Makefile - samples/png/Makefile - samples/printing/Makefile - samples/proplist/Makefile - samples/propsize/Makefile - samples/richedit/Makefile - samples/resource/Makefile - samples/sashtest/Makefile - samples/scroll/Makefile - samples/scrollsub/Makefile - samples/splitter/Makefile - samples/text/Makefile - samples/thread/Makefile - samples/toolbar/Makefile - samples/treectrl/Makefile - samples/typetest/Makefile - samples/validate/Makefile - samples/sockets/Makefile - samples/wizard/Makefile - samples/html/Makefile - samples/html/about/Makefile - samples/html/help/Makefile - samples/html/printing/Makefile - samples/html/helpview/Makefile - samples/html/test/Makefile - samples/html/zip/Makefile - samples/html/virtual/Makefile - samples/html/widget/Makefile - utils/Makefile - utils/wxMMedia2/Makefile - utils/wxMMedia2/lib/Makefile - utils/wxMMedia2/sample/Makefile - utils/glcanvas/Makefile - utils/glcanvas/${GL_TOOLKIT_DIR}/Makefile - utils/ogl/Makefile - utils/ogl/src/Makefile - utils/makegen/Makefile - utils/HelpGen/Makefile - utils/HelpGen/src/Makefile - utils/tex2rtf/Makefile - utils/tex2rtf/src/Makefile - utils/hhp2cached/Makefile - utils/dialoged/Makefile - utils/dialoged/src/Makefile setup.h:setup.h.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF @@ -13713,4 +13575,101 @@ chmod +x $CONFIG_STATUS rm -fr confdefs* $ac_clean_files test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 +if test "$no_recursion" != yes; then + + # Remove --cache-file and --srcdir arguments so they do not pile up. + ac_sub_configure_args= + ac_prev= + for ac_arg in $ac_configure_args; do + if test -n "$ac_prev"; then + ac_prev= + continue + fi + case "$ac_arg" in + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + ;; + *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; + esac + done + + for ac_config_dir in demos samples utils; do + + # Do not complain, so a configure script can configure whichever + # parts of a large source tree are present. + if test ! -d $srcdir/$ac_config_dir; then + continue + fi + + echo configuring in $ac_config_dir + + case "$srcdir" in + .) ;; + *) + if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :; + else + { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; } + fi + ;; + esac + + ac_popdir=`pwd` + cd $ac_config_dir + + # A "../" for each directory in /$ac_config_dir. + ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'` + + case "$srcdir" in + .) # No --srcdir option. We are building in place. + ac_sub_srcdir=$srcdir ;; + /*) # Absolute path. + ac_sub_srcdir=$srcdir/$ac_config_dir ;; + *) # Relative path. + ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;; + esac + + # Check for guested configure; otherwise get Cygnus style configure. + if test -f $ac_sub_srcdir/configure; then + ac_sub_configure=$ac_sub_srcdir/configure + elif test -f $ac_sub_srcdir/configure.in; then + ac_sub_configure=$ac_configure + else + echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2 + ac_sub_configure= + fi + + # The recursion is here. + if test -n "$ac_sub_configure"; then + + # Make the cache file name correct relative to the subdirectory. + case "$cache_file" in + /*) ac_sub_cache_file=$cache_file ;; + *) # Relative path. + ac_sub_cache_file="$ac_dots$cache_file" ;; + esac + case "$ac_given_INSTALL" in + [/$]*) INSTALL="$ac_given_INSTALL" ;; + *) INSTALL="$ac_dots$ac_given_INSTALL" ;; + esac + + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + # The eval makes quoting arguments work. + if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir + then : + else + { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; } + fi + fi + + cd $ac_popdir + done +fi + diff --git a/configure.in b/configure.in index 17f158dfd9..c93bdedcc8 100644 --- a/configure.in +++ b/configure.in @@ -1554,9 +1554,8 @@ dnl fi UNIXDEPS="\$(UNIX_DEPS)" GUIDIST=GTK_DIST -dnl test for XIM support in libgdk -AC_CHECK_LIB(gdk, gdk_im_open, AC_DEFINE(HAVE_XIM)) - + dnl test for XIM support in libgdk + AC_CHECK_LIB(gdk, gdk_im_open, AC_DEFINE(HAVE_XIM)) fi if test "$wxUSE_WINE" = 1; then @@ -1736,16 +1735,16 @@ else TOOLKIT_DIR="os2" fi -dnl the symbol which allows conditional compilation for the given toolkit -TOOLKIT_DEF="-D__WX${TOOLKIT}__" + dnl the symbol which allows conditional compilation for the given toolkit + TOOLKIT_DEF="-D__WX${TOOLKIT}__" -dnl the name of the (libtool) library -WX_LIBRARY="wx_${TOOLKIT_DIR}" + dnl the name of the (libtool) library + WX_LIBRARY="wx_${TOOLKIT_DIR}" dnl the sources, their dependenices and the headers ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(IODBCOBJS)" if test "$wxUSE_LIBJPEG" = "yes" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)" + ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)" fi if test "$wxUSE_LIBTIFF" = "yes" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(TIFFOBJS)" @@ -1757,19 +1756,33 @@ WX_LIBRARY="wx_${TOOLKIT_DIR}" ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)" fi ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS)" - ALL_HEADERS="\$(GUIHEADERS) \$(HTML_HEADERS) \$(UNIX_HEADERS) \$(PROTOCOL_HEADERS) \$(GENERIC_HEADERS) \$(WX_HEADERS)" + + PORT_FILES="src/\$(TOOLKITDIR)/files.lst" + RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst" + RPM_SPEC="wx\$(TOOLKIT).spec" + + dnl distribute samples/demos/utils with GUI versions + GUIDIST="${GUIDIST} SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST" + DISTDIR="wx\$(TOOLKIT)" else dnl leave all TOOLKIT_XXX vars empty USE_GUI=0 dnl the sources, their dependenices and the headers - ALL_OBJECTS="\$(BASE_OBJS)" - ALL_DEPFILES="\${BASE_DEPS}" - ALL_HEADERS="\${BASE_HEADERS}" + ALL_OBJECTS="\$(BASE_OBJS) \${BASE_UNIX_OBJS}" + ALL_DEPFILES="\${BASE_DEPS} \${BASE_UNIX_DEPS}" dnl building wxBase only WX_LIBRARY="wxbase" + + PORT_FILES="src/files.lst" + RPM_FILES="src/rpmfiles.lst" + RPM_SPEC="wxBase.spec" + + dnl distribute only wxBase sources/headers + GUIDIST="BASE_DIST" + DISTDIR="wxBase" fi dnl the name of the (libtool) library @@ -2056,8 +2069,8 @@ AC_CACHE_CHECK([for vsscanf], wx_cv_func_vsscanf, AC_DEFINE(HAVE_VSSCANF) wx_cv_func_vsscanf=yes ], - wx_cv_func_vsscanf=no, - wx_cv_func_vsscanf=no + wx_cv_func_vsscanf=no, + wx_cv_func_vsscanf=no ) ]) @@ -3272,8 +3285,13 @@ AC_SUBST(UNIXOBJS) AC_SUBST(UNIXDEPS) AC_SUBST(ALL_OBJECTS) AC_SUBST(ALL_DEPFILES) -AC_SUBST(ALL_HEADERS) + +dnl distribution vars AC_SUBST(GUIDIST) +AC_SUBST(PORT_FILES) +AC_SUBST(DISTDIR) +AC_SUBST(RPM_SPEC) +AC_SUBST(RPM_FILES) dnl additional subdirectories where we will build AC_SUBST(SRC_SUBDIRS) @@ -3297,15 +3315,26 @@ AC_PROG_MAKE_SET AC_CONFIG_HEADER(setup.h:setup.h.in) -dnl Duh! glcanvas/$(TOOLKIT_DIR) doesn't work for msw because some -dnl genius called it "win" -if test "${TOOLKIT_DIR}" = "msw" ; then - GL_TOOLKIT_DIR="win" -else - GL_TOOLKIT_DIR="${TOOLKIT_DIR}" +dnl some more GUI only things +if test "$wxUSE_GUI" = "yes"; then + AC_CACHE_CHECK([glcanvas subdirectory to use], wx_cv_path_glcanvas, + [ + dnl Duh! glcanvas/$(TOOLKIT_DIR) doesn't work for msw because some + dnl genius called it "win" + if test "${TOOLKIT_DIR}" = "msw" ; then + wx_cv_path_glcanvas="win" + else + wx_cv_path_glcanvas="${TOOLKIT_DIR}" + fi + ]) + + dnl It's needed in glcanvas/Makefile.in so we even have to subst this hack! + GL_TOOLKIT_DIR=$wx_cv_PATH_glcanvas + AC_SUBST(GL_TOOLKIT_DIR) + + AC_CONFIG_SUBDIRS(demos samples utils) fi -dnl It's needed in glcanvas/Makefile.in so we even have to subst this hack! -AC_SUBST(GL_TOOLKIT_DIR) +dnl from wxUSE_GUI dnl create each of the files in the space separated list from the file.in dnl (the original file name may be overriden by appending another name after a @@ -3316,84 +3345,6 @@ AC_OUTPUT([ src/makeprog.env src/makelib.env Makefile - demos/Makefile - demos/bombs/Makefile - demos/dbbrowse/Makefile - demos/forty/Makefile - demos/fractal/Makefile - demos/life/Makefile - demos/poem/Makefile - samples/Makefile - samples/caret/Makefile - samples/calendar/Makefile - samples/checklst/Makefile - samples/config/Makefile - samples/controls/Makefile - samples/console/Makefile - samples/db/Makefile - samples/dialogs/Makefile - samples/docview/Makefile - samples/docvwmdi/Makefile - samples/dnd/Makefile - samples/drawing/Makefile - samples/exec/Makefile - samples/font/Makefile - samples/grid/Makefile - samples/help/Makefile - samples/image/Makefile - samples/internat/Makefile - samples/ipc/Makefile - samples/layout/Makefile - samples/listctrl/Makefile - samples/mdi/Makefile - samples/minifram/Makefile - samples/minimal/Makefile - samples/dialup/Makefile - samples/newgrid/Makefile - samples/notebook/Makefile - samples/png/Makefile - samples/printing/Makefile - samples/proplist/Makefile - samples/propsize/Makefile - samples/richedit/Makefile - samples/resource/Makefile - samples/sashtest/Makefile - samples/scroll/Makefile - samples/scrollsub/Makefile - samples/splitter/Makefile - samples/text/Makefile - samples/thread/Makefile - samples/toolbar/Makefile - samples/treectrl/Makefile - samples/typetest/Makefile - samples/validate/Makefile - samples/sockets/Makefile - samples/wizard/Makefile - samples/html/Makefile - samples/html/about/Makefile - samples/html/help/Makefile - samples/html/printing/Makefile - samples/html/helpview/Makefile - samples/html/test/Makefile - samples/html/zip/Makefile - samples/html/virtual/Makefile - samples/html/widget/Makefile - utils/Makefile - utils/wxMMedia2/Makefile - utils/wxMMedia2/lib/Makefile - utils/wxMMedia2/sample/Makefile - utils/glcanvas/Makefile - utils/glcanvas/${GL_TOOLKIT_DIR}/Makefile - utils/ogl/Makefile - utils/ogl/src/Makefile - utils/makegen/Makefile - utils/HelpGen/Makefile - utils/HelpGen/src/Makefile - utils/tex2rtf/Makefile - utils/tex2rtf/src/Makefile - utils/hhp2cached/Makefile - utils/dialoged/Makefile - utils/dialoged/src/Makefile ], [ chmod +x wx-config diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in index 769f9e9532..3c8a0800c6 100644 --- a/demos/bombs/Makefile.in +++ b/demos/bombs/Makefile.in @@ -9,7 +9,7 @@ # # Makefile for bombs example (UNIX). -top_srcdir = @top_srcdir@ +top_srcdir = @top_srcdir@/.. top_builddir = ../.. program_dir = demos/bombs diff --git a/demos/configure b/demos/configure new file mode 100755 index 0000000000..64e6c89170 --- /dev/null +++ b/demos/configure @@ -0,0 +1,791 @@ +#! /bin/sh + +# From configure.in Id +# Guess values for system-dependent variables and create Makefiles. +# Generated automatically using autoconf version 2.13 +# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. +# +# This configure script is free software; the Free Software Foundation +# gives unlimited permission to copy, distribute and modify it. + +# Defaults: +ac_help= +ac_default_prefix=/usr/local +# Any additions from configure.in: + +# Initialize some variables set by options. +# The variables have the same names as the options, with +# dashes changed to underlines. +build=NONE +cache_file=./config.cache +exec_prefix=NONE +host=NONE +no_create= +nonopt=NONE +no_recursion= +prefix=NONE +program_prefix=NONE +program_suffix=NONE +program_transform_name=s,x,x, +silent= +site= +srcdir= +target=NONE +verbose= +x_includes=NONE +x_libraries=NONE +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datadir='${prefix}/share' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +libdir='${exec_prefix}/lib' +includedir='${prefix}/include' +oldincludedir='/usr/include' +infodir='${prefix}/info' +mandir='${prefix}/man' + +# Initialize some other variables. +subdirs= +MFLAGS= MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} +# Maximum number of lines to put in a shell here document. +ac_max_here_lines=12 + +ac_prev= +for ac_option +do + + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval "$ac_prev=\$ac_option" + ac_prev= + continue + fi + + case "$ac_option" in + -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) ac_optarg= ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. + + case "$ac_option" in + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir="$ac_optarg" ;; + + -build | --build | --buil | --bui | --bu) + ac_prev=build ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build="$ac_optarg" ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file="$ac_optarg" ;; + + -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ + | --da=*) + datadir="$ac_optarg" ;; + + -disable-* | --disable-*) + ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then + { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } + fi + ac_feature=`echo $ac_feature| sed 's/-/_/g'` + eval "enable_${ac_feature}=no" ;; + + -enable-* | --enable-*) + ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then + { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } + fi + ac_feature=`echo $ac_feature| sed 's/-/_/g'` + case "$ac_option" in + *=*) ;; + *) ac_optarg=yes ;; + esac + eval "enable_${ac_feature}='$ac_optarg'" ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix="$ac_optarg" ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + + -help | --help | --hel | --he) + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat << EOF +Usage: configure [options] [host] +Options: [defaults in brackets after descriptions] +Configuration: + --cache-file=FILE cache test results in FILE + --help print this message + --no-create do not create output files + --quiet, --silent do not print \`checking...' messages + --version print the version of autoconf that created configure +Directory and file names: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [same as prefix] + --bindir=DIR user executables in DIR [EPREFIX/bin] + --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] + --libexecdir=DIR program executables in DIR [EPREFIX/libexec] + --datadir=DIR read-only architecture-independent data in DIR + [PREFIX/share] + --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data in DIR + [PREFIX/com] + --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] + --libdir=DIR object code libraries in DIR [EPREFIX/lib] + --includedir=DIR C header files in DIR [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] + --infodir=DIR info documentation in DIR [PREFIX/info] + --mandir=DIR man documentation in DIR [PREFIX/man] + --srcdir=DIR find the sources in DIR [configure dir or ..] + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM + run sed PROGRAM on installed program names +EOF + cat << EOF +Host type: + --build=BUILD configure for building on BUILD [BUILD=HOST] + --host=HOST configure for HOST [guessed] + --target=TARGET configure for TARGET [TARGET=HOST] +Features and packages: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --x-includes=DIR X include files are in DIR + --x-libraries=DIR X library files are in DIR +EOF + if test -n "$ac_help"; then + echo "--enable and --with options recognized:$ac_help" + fi + exit 0 ;; + + -host | --host | --hos | --ho) + ac_prev=host ;; + -host=* | --host=* | --hos=* | --ho=*) + host="$ac_optarg" ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir="$ac_optarg" ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir="$ac_optarg" ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir="$ac_optarg" ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir="$ac_optarg" ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst \ + | --locals | --local | --loca | --loc | --lo) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* \ + | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + localstatedir="$ac_optarg" ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir="$ac_optarg" ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; + + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir="$ac_optarg" ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix="$ac_optarg" ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix="$ac_optarg" ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix="$ac_optarg" ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name="$ac_optarg" ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir="$ac_optarg" ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir="$ac_optarg" ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site="$ac_optarg" ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir="$ac_optarg" ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir="$ac_optarg" ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target="$ac_optarg" ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + + -version | --version | --versio | --versi | --vers) + echo "configure generated by autoconf version 2.13" + exit 0 ;; + + -with-* | --with-*) + ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then + { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } + fi + ac_package=`echo $ac_package| sed 's/-/_/g'` + case "$ac_option" in + *=*) ;; + *) ac_optarg=yes ;; + esac + eval "with_${ac_package}='$ac_optarg'" ;; + + -without-* | --without-*) + ac_package=`echo $ac_option|sed -e 's/-*without-//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then + { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } + fi + ac_package=`echo $ac_package| sed 's/-/_/g'` + eval "with_${ac_package}=no" ;; + + --x) + # Obsolete; use --with-x. + with_x=yes ;; + + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes="$ac_optarg" ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries="$ac_optarg" ;; + + -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } + ;; + + *) + if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then + echo "configure: warning: $ac_option: invalid host type" 1>&2 + fi + if test "x$nonopt" != xNONE; then + { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } + fi + nonopt="$ac_option" + ;; + + esac +done + +if test -n "$ac_prev"; then + { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } +fi + +trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 + +# File descriptor usage: +# 0 standard input +# 1 file creation +# 2 errors and warnings +# 3 some systems may open it to /dev/tty +# 4 used on the Kubota Titan +# 6 checking for... messages and results +# 5 compiler messages saved in config.log +if test "$silent" = yes; then + exec 6>/dev/null +else + exec 6>&1 +fi +exec 5>./config.log + +echo "\ +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. +" 1>&5 + +# Strip out --no-create and --no-recursion so they do not pile up. +# Also quote any args containing shell metacharacters. +ac_configure_args= +for ac_arg +do + case "$ac_arg" in + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c) ;; + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) + ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) ac_configure_args="$ac_configure_args $ac_arg" ;; + esac +done + +# NLS nuisances. +# Only set these to C if already set. These must not be set unconditionally +# because not all systems understand e.g. LANG=C (notably SCO). +# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +# Non-C LC_CTYPE values break the ctype check. +if test "${LANG+set}" = set; then LANG=C; export LANG; fi +if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -rf conftest* confdefs.h +# AIX cpp loses on an empty file, so make sure it contains at least a newline. +echo > confdefs.h + +# A filename unique to this package, relative to the directory that +# configure is in, which we can look for to find out if srcdir is correct. +ac_unique_file=Makefile.in + +# Find the source files, if location was not specified. +if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then its parent. + ac_prog=$0 + ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` + test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. + srcdir=$ac_confdir + if test ! -r $srcdir/$ac_unique_file; then + srcdir=.. + fi +else + ac_srcdir_defaulted=no +fi +if test ! -r $srcdir/$ac_unique_file; then + if test "$ac_srcdir_defaulted" = yes; then + { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } + else + { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } + fi +fi +srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` + +# Prefer explicitly selected file to automatically selected ones. +if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + fi +fi +for ac_site_file in $CONFIG_SITE; do + if test -r "$ac_site_file"; then + echo "loading site script $ac_site_file" + . "$ac_site_file" + fi +done + +if test -r "$cache_file"; then + echo "loading cache $cache_file" + . $cache_file +else + echo "creating cache $cache_file" + > $cache_file +fi + +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +ac_exeext= +ac_objext=o +if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then + # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. + if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then + ac_n= ac_c=' +' ac_t=' ' + else + ac_n=-n ac_c= ac_t= + fi +else + ac_n= ac_c='\c' ac_t= +fi + + + +trap '' 1 2 15 +cat > confcache <<\EOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs. It is not useful on other systems. +# If it contains results you don't want to keep, you may remove or edit it. +# +# By default, configure uses ./config.cache as the cache file, +# creating it if it does not exist already. You can give configure +# the --cache-file=FILE option to use a different cache file; that is +# what configure does when it calls configure scripts in +# subdirectories, so they share the cache. +# Giving --cache-file=/dev/null disables caching, for debugging configure. +# config.status only pays attention to the cache file if you give it the +# --recheck option to rerun configure. +# +EOF +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, don't put newlines in cache variables' values. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +(set) 2>&1 | + case `(ac_space=' '; set | grep ac_space) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote substitution + # turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + -e "s/'/'\\\\''/g" \ + -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' + ;; + esac >> confcache +if cmp -s $cache_file confcache; then + : +else + if test -w $cache_file; then + echo "updating cache $cache_file" + cat confcache > $cache_file + else + echo "not updating unwritable cache $cache_file" + fi +fi +rm -f confcache + +trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 + +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +# Any assignment to VPATH causes Sun make to only execute +# the first set of double-colon rules, so remove it if not needed. +# If there is a colon in the path, we need to keep it. +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' +fi + +trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 + +# Transform confdefs.h into DEFS. +# Protect against shell expansion while executing Makefile rules. +# Protect against Makefile macro expansion. +cat > conftest.defs <<\EOF +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g +s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g +s%\[%\\&%g +s%\]%\\&%g +s%\$%$$%g +EOF +DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` +rm -f conftest.defs + + +# Without the "./", some shells look in PATH for config.status. +: ${CONFIG_STATUS=./config.status} + +echo creating $CONFIG_STATUS +rm -f $CONFIG_STATUS +cat > $CONFIG_STATUS </dev/null | sed 1q`: +# +# $0 $ac_configure_args +# +# Compiler output produced by configure, useful for debugging +# configure, is in ./config.log if it exists. + +ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" +for ac_option +do + case "\$ac_option" in + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" + exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; + -version | --version | --versio | --versi | --vers | --ver | --ve | --v) + echo "$CONFIG_STATUS generated by autoconf version 2.13" + exit 0 ;; + -help | --help | --hel | --he | --h) + echo "\$ac_cs_usage"; exit 0 ;; + *) echo "\$ac_cs_usage"; exit 1 ;; + esac +done + +ac_given_srcdir=$srcdir + +trap 'rm -fr `echo " + Makefile + bombs/Makefile + dbbrowse/Makefile + forty/Makefile + fractal/Makefile + life/Makefile + poem/Makefile + " | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +EOF +cat >> $CONFIG_STATUS < conftest.subs <<\\CEOF +$ac_vpsub +$extrasub +s%@SHELL@%$SHELL%g +s%@CFLAGS@%$CFLAGS%g +s%@CPPFLAGS@%$CPPFLAGS%g +s%@CXXFLAGS@%$CXXFLAGS%g +s%@FFLAGS@%$FFLAGS%g +s%@DEFS@%$DEFS%g +s%@LDFLAGS@%$LDFLAGS%g +s%@LIBS@%$LIBS%g +s%@exec_prefix@%$exec_prefix%g +s%@prefix@%$prefix%g +s%@program_transform_name@%$program_transform_name%g +s%@bindir@%$bindir%g +s%@sbindir@%$sbindir%g +s%@libexecdir@%$libexecdir%g +s%@datadir@%$datadir%g +s%@sysconfdir@%$sysconfdir%g +s%@sharedstatedir@%$sharedstatedir%g +s%@localstatedir@%$localstatedir%g +s%@libdir@%$libdir%g +s%@includedir@%$includedir%g +s%@oldincludedir@%$oldincludedir%g +s%@infodir@%$infodir%g +s%@mandir@%$mandir%g + +CEOF +EOF + +cat >> $CONFIG_STATUS <<\EOF + +# Split the substitutions into bite-sized pieces for seds with +# small command number limits, like on Digital OSF/1 and HP-UX. +ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. +ac_file=1 # Number of current file. +ac_beg=1 # First line for current file. +ac_end=$ac_max_sed_cmds # Line after last line for current file. +ac_more_lines=: +ac_sed_cmds="" +while $ac_more_lines; do + if test $ac_beg -gt 1; then + sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file + else + sed "${ac_end}q" conftest.subs > conftest.s$ac_file + fi + if test ! -s conftest.s$ac_file; then + ac_more_lines=false + rm -f conftest.s$ac_file + else + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f conftest.s$ac_file" + else + ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" + fi + ac_file=`expr $ac_file + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_cmds` + fi +done +if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat +fi +EOF + +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF +for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case "$ac_file" in + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` + ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + *) ac_file_in="${ac_file}.in" ;; + esac + + # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. + + # Remove last slash and all that follows it. Not all systems have dirname. + ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then + # The file is in a subdirectory. + test ! -d "$ac_dir" && mkdir "$ac_dir" + ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" + # A "../" for each directory in $ac_dir_suffix. + ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` + else + ac_dir_suffix= ac_dots= + fi + + case "$ac_given_srcdir" in + .) srcdir=. + if test -z "$ac_dots"; then top_srcdir=. + else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; + /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + *) # Relative path. + srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" + top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + + + echo creating "$ac_file" + rm -f "$ac_file" + configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." + case "$ac_file" in + *Makefile*) ac_comsub="1i\\ +# $configure_input" ;; + *) ac_comsub= ;; + esac + + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + sed -e "$ac_comsub +s%@configure_input@%$configure_input%g +s%@srcdir@%$srcdir%g +s%@top_srcdir@%$top_srcdir%g +" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file +fi; done +rm -f conftest.s* + +EOF +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF + +exit 0 +EOF +chmod +x $CONFIG_STATUS +rm -fr confdefs* $ac_clean_files +test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 + diff --git a/demos/configure.in b/demos/configure.in new file mode 100644 index 0000000000..3ea43d8814 --- /dev/null +++ b/demos/configure.in @@ -0,0 +1,14 @@ +dnl Process this file with autoconf to produce a configure script. +AC_REVISION($Id$)dnl + +AC_INIT(Makefile.in) + +AC_OUTPUT([ + Makefile + bombs/Makefile + dbbrowse/Makefile + forty/Makefile + fractal/Makefile + life/Makefile + poem/Makefile + ]) diff --git a/demos/dbbrowse/Makefile.in b/demos/dbbrowse/Makefile.in index 96581471a8..992e9f4600 100644 --- a/demos/dbbrowse/Makefile.in +++ b/demos/dbbrowse/Makefile.in @@ -9,7 +9,7 @@ # # Makefile for dbbrowse example (UNIX). -top_srcdir = @top_srcdir@ +top_srcdir = @top_srcdir@/.. top_builddir = ../.. program_dir = demos/dbbrowse diff --git a/demos/dbbrowse/dbgrid.h b/demos/dbbrowse/dbgrid.h index e6191d2ed7..efe053ab3f 100644 --- a/demos/dbbrowse/dbgrid.h +++ b/demos/dbbrowse/dbgrid.h @@ -8,6 +8,11 @@ // Licence: wxWindows license // RCS-ID: $Id$ //--------------------------------------------------------------------------- + +#if !defined(wxUSE_NEW_GRID) || !(wxUSE_NEW_GRID) + #error "DBGrid requires the new wxGrid class" +#endif + class mjDoc; //--------------------------------------------------------------------------- class DBGrid: public wxGrid diff --git a/demos/forty/Makefile.in b/demos/forty/Makefile.in index 49d2e72818..cf1ccedc01 100644 --- a/demos/forty/Makefile.in +++ b/demos/forty/Makefile.in @@ -9,7 +9,7 @@ # # Makefile for forty example (UNIX). -top_srcdir = @top_srcdir@ +top_srcdir = @top_srcdir@/.. top_builddir = ../.. program_dir = demos/forty diff --git a/demos/fractal/Makefile.in b/demos/fractal/Makefile.in index a073969cba..0888589325 100644 --- a/demos/fractal/Makefile.in +++ b/demos/fractal/Makefile.in @@ -9,7 +9,7 @@ # # Makefile for fractal example (UNIX). -top_srcdir = @top_srcdir@ +top_srcdir = @top_srcdir@/.. top_builddir = ../.. program_dir = demos/fractal diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in index 727a0349ef..5bbeb8538e 100644 --- a/demos/life/Makefile.in +++ b/demos/life/Makefile.in @@ -9,7 +9,7 @@ # # Makefile for toolbar example (UNIX). -top_srcdir = @top_srcdir@ +top_srcdir = @top_srcdir@/.. top_builddir = ../.. program_dir = demos/life diff --git a/demos/poem/Makefile.in b/demos/poem/Makefile.in index 82dc4a0bfb..e1eccbd6d6 100644 --- a/demos/poem/Makefile.in +++ b/demos/poem/Makefile.in @@ -9,7 +9,7 @@ # # Makefile for wxPoem example (UNIX). -top_srcdir = @top_srcdir@ +top_srcdir = @top_srcdir@/.. top_builddir = ../.. program_dir = demos/poem diff --git a/distrib/msw/tmake/base.t b/distrib/msw/tmake/base.t new file mode 100644 index 0000000000..420de365ef --- /dev/null +++ b/distrib/msw/tmake/base.t @@ -0,0 +1,84 @@ +#!################################################################################ +#! File: base.t +#! Purpose: tmake template file from which src/common/files.lst containing the +#! list of files for wxBase library is generated by tmake +#! Author: Vadim Zeitlin +#! Created: 27.01.00 +#! Version: $Id$ +#!################################################################################ +#${ + #! include the code which parses filelist.txt file and initializes + #! %wxCommon, %wxGeneric, %wxHtml, %wxUnix, %wxGTK, %wxMOTIF and + #! %wxOS2PM hashes. + IncludeTemplate("filelist.t"); + + #! find all our sources + foreach $file (sort keys %wxBase) { + ($fileobj = $file) =~ s/cp?p?$/\o/; + ($filedep = $file) =~ s/cp?p?$/\d/; + + $project{"BASE_SOURCES"} .= "common/" . $file . " "; + $project{"BASE_OBJS"} .= $fileobj . " "; + $project{"BASE_DEPS"} .= $filedep . " "; + } + + foreach $file (sort keys %wxCommon) { + next unless $wxCommon{$file} =~ /\bB\b/; + + ($fileobj = $file) =~ s/cp?p?$/\o/; + ($filedep = $file) =~ s/cp?p?$/\d/; + + $project{"BASE_SOURCES"} .= "common/" . $file . " "; + $project{"BASE_OBJS"} .= $fileobj . " "; + $project{"BASE_DEPS"} .= $filedep . " "; + } + + foreach $file (sort keys %wxUNIX) { + next unless $wxUNIX{$file} =~ /\bB\b/; + + ($fileobj = $file) =~ s/cp?p?$/\o/; + ($filedep = $file) =~ s/cp?p?$/\d/; + + $project{"BASE_SOURCES"} .= "unix/" . $file . " "; + $project{"BASE_UNIX_OBJS"} .= $fileobj . " "; + $project{"BASE_UNIX_DEPS"} .= $filedep . " "; + } + + #! find all our headers + foreach $file (sort keys %wxWXINCLUDE) { + next unless $wxWXINCLUDE{$file} =~ /\bB\b/; + + $project{"BASE_HEADERS"} .= $file . " " + } + + foreach $file (sort keys %wxUNIXINCLUDE) { + next unless $wxWXINCLUDE{$file} =~ /\bB\b/; + + $project{"BASE_HEADERS"} .= "unix/" . $file . " " + } + + foreach $file (sort keys %wxPROTOCOLINCLUDE) { + next unless $wxPROTOCOLINCLUDE{$file} =~ /\bB\b/; + + $project{"BASE_HEADERS"} .= "protocol/" . $file . " " + } +#$} +# This file was automatically generated by tmake at #$ Now() +# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASE.T! +ALL_SOURCES = \ + #$ ExpandList("BASE_SOURCES"); + +ALL_HEADERS = \ + #$ ExpandList("BASE_HEADERS"); + +BASE_OBJS = \ + #$ ExpandList("BASE_OBJS"); + +BASE_DEPS = \ + #$ ExpandList("BASE_DEPS"); + +BASE_UNIX_OBJS = \ + #$ ExpandList("BASE_UNIX_OBJS"); + +BASE_DEPS = \ + #$ ExpandList("BASE_DEPS"); diff --git a/distrib/msw/tmake/baserpm.t b/distrib/msw/tmake/baserpm.t new file mode 100644 index 0000000000..dc1b2ad0cb --- /dev/null +++ b/distrib/msw/tmake/baserpm.t @@ -0,0 +1,30 @@ +#!################################################################################ +#! File: base.t +#! Purpose: tmake template file from which src/rpmfiles.lst containing the +#! list of files for wxBase.spec RPM generation script is generated +#! Author: Vadim Zeitlin +#! Created: 28.01.00 +#! Version: $Id$ +#!################################################################################ +#${ + IncludeTemplate("filelist.t"); + + foreach $file (sort keys %wxWXINCLUDE) { + next unless $wxWXINCLUDE{$file} =~ /\bB\b/; + + $project{"BASE_HEADERS"} .= "include/wx/" . $file . " " + } + + foreach $file (sort keys %wxUNIXINCLUDE) { + next unless $wxWXINCLUDE{$file} =~ /\bB\b/; + + $project{"BASE_HEADERS"} .= "include/wx/unix/" . $file . " " + } + + foreach $file (sort keys %wxPROTOCOLINCLUDE) { + next unless $wxPROTOCOLINCLUDE{$file} =~ /\bB\b/; + + $project{"BASE_HEADERS"} .= "include/wx/protocol/" . $file . " " + } +#$} +#$ ExpandGlue("BASE_HEADERS", "/usr/", "\n/usr/", ""); diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index d8073d600c..c96d410949 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -109,7 +109,7 @@ config.cpp C B ctrlcmn.cpp C ctrlsub.cpp C datetime.cpp C B -datstrm.cpp C +datstrm.cpp C B db.cpp C dbtable.cpp C dcbase.cpp C @@ -163,7 +163,7 @@ mimecmn.cpp C 32,B module.cpp C B mstream.cpp C object.cpp C B -objstrm.cpp C +objstrm.cpp C B odbc.cpp C R,X paper.cpp C prntbase.cpp C @@ -174,7 +174,7 @@ sckaddr.cpp C S sckfile.cpp C S sckipc.cpp C S sckstrm.cpp C S -serbase.cpp C +serbase.cpp C B sizer.cpp C socket.cpp C S stream.cpp C B @@ -525,8 +525,8 @@ m_tables.cpp H m_meta.cpp H htmprint.cpp H -arrimpl.cpp W -listimpl.cpp W +arrimpl.cpp W B +listimpl.cpp W B accel.h W app.h W B bitmap.h W @@ -547,8 +547,8 @@ cmndata.h W colordlg.h W colour.h W combobox.h W -confbase.h W -config.h W +confbase.h W B +config.h W B control.h W ctrlsub.h W cursor.h W @@ -556,7 +556,7 @@ dataobj.h W date.h W B datetime.h W B datetime.inl W B -datstrm.h W +datstrm.h W B db.h W dbtable.h W dc.h W @@ -585,8 +585,8 @@ ffile.h W B file.h W B fileconf.h W B filedlg.h W -filefn.h W -filesys.h W +filefn.h W B +filesys.h W B font.h W fontdlg.h W fontenum.h W @@ -646,7 +646,7 @@ msgdlg.h W mstream.h W notebook.h W object.h W B -objstrm.h W +objstrm.h W B odbc.h W ownerdrw.h W palette.h W @@ -672,7 +672,7 @@ sckipc.h W sckstrm.h W scrolbar.h W scrolwin.h W -serbase.h W +serbase.h W B settings.h W setup.h W sizer.h W @@ -707,7 +707,7 @@ toolbar.h W tooltip.h W treectrl.h W types.h W -url.h W +url.h W B utils.h W B valgen.h W validate.h W @@ -1043,10 +1043,10 @@ execute.h S mimetype.h S B gsockunx.h S -file.h P -ftp.h P -http.h P -protocol.h P +file.h P B +ftp.h P B +http.h P B +protocol.h P B forcelnk.h L helpdata.h L diff --git a/distrib/msw/tmake/gtk.t b/distrib/msw/tmake/gtk.t new file mode 100644 index 0000000000..a9cbdbca5d --- /dev/null +++ b/distrib/msw/tmake/gtk.t @@ -0,0 +1,134 @@ +#!################################################################################ +#! File: gtk.t +#! Purpose: tmake template file from which src/gtk/files.lst containing the +#! list of files for wxGTK library is generated by tmake +#! Author: Vadim Zeitlin +#! Created: 28.01.00 +#! Version: $Id$ +#!################################################################################ +#${ + #! include the code which parses filelist.txt file and initializes + #! %wxCommon, %wxGeneric, %wxHtml, %wxUNIX, %wxGTK, %wxMOTIF and + #! %wxOS2PM hashes. + IncludeTemplate("filelist.t"); + + #! find all our sources + $project{"COMMONOBJS"} .= "parser.o "; + $project{"COMMONDEPS"} .= "parser.d "; + + foreach $file (sort keys %wxGeneric) { + next if $wxGeneric{$file} =~ /\bR\b/; + + ($fileobj = $file) =~ s/cp?p?$/\o/; + ($filedep = $file) =~ s/cp?p?$/\d/; + + $project{"GTK_SOURCES"} .= "generic/" . $file . " "; + $project{"GENERICOBJS"} .= $fileobj . " "; + $project{"GENERICDEPS"} .= $filedep . " " + } + + foreach $file (sort keys %wxCommon) { + next if $wxCommon{$file} =~ /\bR\b/; + + ($fileobj = $file) =~ s/cp?p?$/\o/; + ($filedep = $file) =~ s/cp?p?$/\d/; + + $project{"GTK_SOURCES"} .= "common/" . $file . " "; + $project{"COMMONOBJS"} .= $fileobj . " "; + $project{"COMMONDEPS"} .= $filedep . " " + } + + foreach $file (sort keys %wxGTK) { + ($fileobj = $file) =~ s/cp?p?$/\o/; + ($filedep = $file) =~ s/cp?p?$/\d/; + + $project{"GTK_SOURCES"} .= "gtk/" . $file . " "; + $project{"GUIOBJS"} .= $fileobj . " "; + $project{"GUIDEPS"} .= $filedep . " " + } + + foreach $file (sort keys %wxUNIX) { + ($fileobj = $file) =~ s/cp?p?$/\o/; + ($filedep = $file) =~ s/cp?p?$/\d/; + + $project{"GTK_SOURCES"} .= "unix/" . $file . " "; + $project{"UNIXOBJS"} .= $fileobj . " "; + $project{"UNIXDEPS"} .= $filedep . " " + } + + foreach $file (sort keys %wxHTML) { + ($fileobj = $file) =~ s/cp?p?$/\o/; + ($filedep = $file) =~ s/cp?p?$/\d/; + + $project{"GTK_SOURCES"} .= "html/" . $file . " "; + $project{"HTMLOBJS"} .= $fileobj . " "; + $project{"HTMLDEPS"} .= $filedep . " " + } + #! find all our headers + foreach $file (sort keys %wxWXINCLUDE) { + $project{"GTK_HEADERS"} .= $file . " " + } + + foreach $file (sort keys %wxGTKINCLUDE) { + $project{"GTK_HEADERS"} .= "gtk/" . $file . " " + } + + foreach $file (sort keys %wxGENERICINCLUDE) { + $project{"GTK_HEADERS"} .= "generic/" . $file . " " + } + + foreach $file (sort keys %wxUNIXINCLUDE) { + $project{"GTK_HEADERS"} .= "unix/" . $file . " " + } + + foreach $file (sort keys %wxHTMLINCLUDE) { + $project{"GTK_HEADERS"} .= "html/" . $file . " " + } + + foreach $file (sort keys %wxPROTOCOLINCLUDE) { + $project{"GTK_HEADERS"} .= "protocol/" . $file . " " + } +#$} +# This file was automatically generated by tmake at #$ Now() +# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! +ALL_SOURCES = \ + #$ ExpandList("GTK_SOURCES"); + +ALL_HEADERS = \ + #$ ExpandList("GTK_HEADERS"); + +COMMONOBJS = \ + #$ ExpandList("COMMONOBJS"); + +COMMONDEPS = \ + #$ ExpandList("COMMONDEPS"); + +GENERICOBJS = \ + #$ ExpandList("GENERICOBJS"); + +GENERICDEPS = \ + #$ ExpandList("GENERICDEPS"); + +GUIOBJS = \ + #$ ExpandList("GUIOBJS"); + +GUIDEPS = \ + #$ ExpandList("GUIDEPS"); + +UNIXOBJS = \ + #$ ExpandList("UNIXOBJS"); + +UNIXDEPS = \ + #$ ExpandList("UNIXDEPS"); + +HTMLOBJS = \ + #$ ExpandList("HTMLOBJS"); + +HTMLDEPS = \ + #$ ExpandList("HTMLDEPS"); + +IODBCOBJS = \ + #$ ExpandList("IODBCOBJS"); + +IODBCDEPS = \ + #$ ExpandList("IODBCDEPS"); diff --git a/distrib/msw/tmake/motif.t b/distrib/msw/tmake/motif.t new file mode 100644 index 0000000000..7334fe4a8b --- /dev/null +++ b/distrib/msw/tmake/motif.t @@ -0,0 +1,135 @@ +#!################################################################################ +#! File: motif.t +#! Purpose: tmake template file from which src/motif/files.lst containing the +#! list of files for wxMotif library is generated by tmake +#! Author: Vadim Zeitlin +#! Created: 28.01.00 +#! Version: $Id$ +#!################################################################################ +#${ + #! include the code which parses filelist.txt file and initializes + #! %wxCommon, %wxGeneric, %wxHtml, %wxUNIX, %wxMOTIF, %wxMOTIF and + #! %wxOS2PM hashes. + IncludeTemplate("filelist.t"); + + #! find all our sources + $project{"COMMONOBJS"} .= "parser.o "; + $project{"COMMONDEPS"} .= "parser.d "; + $project{"GUIOBJS"} .= "xmcombo.o "; + + foreach $file (sort keys %wxGeneric) { + next if $wxGeneric{$file} =~ /\bX\b/; + + ($fileobj = $file) =~ s/cp?p?$/\o/; + ($filedep = $file) =~ s/cp?p?$/\d/; + + $project{"MOTIF_SOURCES"} .= "generic/" . $file . " "; + $project{"GENERICOBJS"} .= $fileobj . " "; + $project{"GENERICDEPS"} .= $filedep . " " + } + + foreach $file (sort keys %wxCommon) { + next if $wxCommon{$file} =~ /\bR\b/; + + ($fileobj = $file) =~ s/cp?p?$/\o/; + ($filedep = $file) =~ s/cp?p?$/\d/; + + $project{"MOTIF_SOURCES"} .= "common/" . $file . " "; + $project{"COMMONOBJS"} .= $fileobj . " "; + $project{"COMMONDEPS"} .= $filedep . " " + } + + foreach $file (sort keys %wxMOTIF) { + ($fileobj = $file) =~ s/cp?p?$/\o/; + ($filedep = $file) =~ s/cp?p?$/\d/; + + $project{"MOTIF_SOURCES"} .= "motif/" . $file . " "; + $project{"GUIOBJS"} .= $fileobj . " "; + $project{"GUIDEPS"} .= $filedep . " " + } + + foreach $file (sort keys %wxUNIX) { + ($fileobj = $file) =~ s/cp?p?$/\o/; + ($filedep = $file) =~ s/cp?p?$/\d/; + + $project{"MOTIF_SOURCES"} .= "unix/" . $file . " "; + $project{"UNIXOBJS"} .= $fileobj . " "; + $project{"UNIXDEPS"} .= $filedep . " " + } + + foreach $file (sort keys %wxHTML) { + ($fileobj = $file) =~ s/cp?p?$/\o/; + ($filedep = $file) =~ s/cp?p?$/\d/; + + $project{"MOTIF_SOURCES"} .= "html/" . $file . " "; + $project{"HTMLOBJS"} .= $fileobj . " "; + $project{"HTMLDEPS"} .= $filedep . " " + } + #! find all our headers + foreach $file (sort keys %wxWXINCLUDE) { + $project{"MOTIF_HEADERS"} .= $file . " " + } + + foreach $file (sort keys %wxMOTIFINCLUDE) { + $project{"MOTIF_HEADERS"} .= "motif/" . $file . " " + } + + foreach $file (sort keys %wxGENERICINCLUDE) { + $project{"MOTIF_HEADERS"} .= "generic/" . $file . " " + } + + foreach $file (sort keys %wxUNIXINCLUDE) { + $project{"MOTIF_HEADERS"} .= "unix/" . $file . " " + } + + foreach $file (sort keys %wxHTMLINCLUDE) { + $project{"MOTIF_HEADERS"} .= "html/" . $file . " " + } + + foreach $file (sort keys %wxPROTOCOLINCLUDE) { + $project{"MOTIF_HEADERS"} .= "protocol/" . $file . " " + } +#$} +# This file was automatically generated by tmake at #$ Now() +# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T! +ALL_SOURCES = \ + #$ ExpandList("MOTIF_SOURCES"); + +ALL_HEADERS = \ + #$ ExpandList("MOTIF_HEADERS"); + +COMMONOBJS = \ + #$ ExpandList("COMMONOBJS"); + +COMMONDEPS = \ + #$ ExpandList("COMMONDEPS"); + +GENERICOBJS = \ + #$ ExpandList("GENERICOBJS"); + +GENERICDEPS = \ + #$ ExpandList("GENERICDEPS"); + +GUIOBJS = \ + #$ ExpandList("GUIOBJS"); + +GUIDEPS = \ + #$ ExpandList("GUIDEPS"); + +UNIXOBJS = \ + #$ ExpandList("UNIXOBJS"); + +UNIXDEPS = \ + #$ ExpandList("UNIXDEPS"); + +HTMLOBJS = \ + #$ ExpandList("HTMLOBJS"); + +HTMLDEPS = \ + #$ ExpandList("HTMLDEPS"); + +IODBCOBJS = \ + #$ ExpandList("IODBCOBJS"); + +IODBCDEPS = \ + #$ ExpandList("IODBCDEPS"); diff --git a/docs/install.txt b/docs/install.txt new file mode 100644 index 0000000000..04925e5207 --- /dev/null +++ b/docs/install.txt @@ -0,0 +1,14 @@ + INSTALL.TXT + +NB: this file describes the installation of wxBase library. If you are using a + GUI version of wxWindows, please refer to the install.txt in the + appropriate subdirectory! + +0. Requirments and supported platforms + ----------------------------------- + +1. Installing under Win32 + ---------------------- + +2. Installing under Unix/BeOS + -------------------------- diff --git a/include/wx/tokenzr.h b/include/wx/tokenzr.h index 1668cd47ba..b1d8ed65cc 100644 --- a/include/wx/tokenzr.h +++ b/include/wx/tokenzr.h @@ -2,7 +2,7 @@ // Name: tokenzr.h // Purpose: String tokenizer // Author: Guilhem Lavaux -// Modified by: +// Modified by: Gregory Pietsch // Created: 04/22/98 // RCS-ID: $Id$ // Copyright: (c) Guilhem Lavaux @@ -13,7 +13,7 @@ #define _WX_TOKENZRH #ifdef __GNUG__ -#pragma interface + #pragma interface "tokenzr.h" #endif #include "wx/object.h" @@ -26,7 +26,7 @@ public: wxStringTokenizer(const wxString& to_tokenize, const wxString& delims = " \t\r\n", bool ret_delim = FALSE); - wxStringTokenizer() { m_retdelims = FALSE;} + wxStringTokenizer() { m_retdelims = FALSE; m_pos = 0; } virtual ~wxStringTokenizer(); int CountTokens() const; @@ -36,6 +36,9 @@ public: wxString GetNextToken() { return NextToken(); }; wxString GetString() const { return m_string; } + // One note about GetString -- it returns the string + // remaining after the previous tokens have been removed, + // not the original string void SetString(const wxString& to_tokenize, const wxString& delims = " \t\r\n", @@ -44,14 +47,18 @@ public: m_string = to_tokenize; m_delims = delims; m_retdelims = ret_delim; + m_pos = 0; } -protected: - off_t FindDelims(const wxString& str, const wxString& delims) const; - void EatLeadingDelims(); + // Here's the desired function. It returns the position + // of the next token in the original string by keeping track + // of everything that's been deleted by GetNextToken. + wxUint32 GetPosition() { return m_pos; } +protected: wxString m_string, m_delims; bool m_retdelims; + wxUint32 m_pos; // the position }; #endif // _WX_TOKENZRH diff --git a/wxBase.spec b/wxBase.spec new file mode 100644 index 0000000000..c27ad5bcc6 --- /dev/null +++ b/wxBase.spec @@ -0,0 +1,71 @@ +# Note that this is NOT a relocatable package +%define pref /usr +%define ver 2.1.13 +%define rel 0 + +Summary: wxBase library - non-GUI support classes of wxWindows toolkit +Name: wxBase +Version: %{ver} +Release: %{rel} +Copyright: wxWindows Licence +Group: Development/Libraries +Source: wxBase-%{ver}.tar.gz +URL: none +Packager: Vadim Zeitlin +BuildRoot: /tmp/wxBase_rpm + +%description +wxBase is a collection of C++ classes providing basic data structures (strings, +lists, arrays), powerful wxDateTime class for date manipulations, portable +wrappers around many OS-specific functions allowing to build the same program +under all supported folders, wxThread class for writing multithreaded programs +using either Win32 or POSIX threads and much more. wxBase currently supports +the following platforms: Win32, generic Unix (Linux, FreeBSD, Solaris, HP-UX, +...) and BeOS. + +%package devel +Summary: wxBase headers needed for developping with wxBase +Group: Development/Libraries +Requires: wxBase + +%description devel +Header files for wxBase. You need them to develop programs using wxBase. + +%prep +%setup -n wxBase +./configure --prefix=%{pref} --disable-gui + +%build +if [ "$SMP" != "" ]; then + export MAKE="make -j$SMP" +else + export MAKE="make" +fi +$MAKE + +%install +rm -rf $RPM_BUILD_ROOT +make prefix=$RPM_BUILD_ROOT%{pref} install + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + +%files +%defattr (644, root, root, 755) +%doc COPYING.LIB INSTALL.txt LICENCE.txt README.txt SYMBOLS.txt TODO.txt +%attr(755, -, -) %{pref}/lib/libwxbase* +%dir %{pref}/lib/wx +%dir %{pref}/lib/wx/include +%dir %{pref}/lib/wx/include/wx +%{pref}/lib/wx/include/wx/setup.h + +%files devel -f src/rpmfiles.lst +%defattr (644, root, root, 755) +%attr(755, -, -) %{pref}/bin/wx-config +