From 5586805bfa1f74b4573b8de9e1755685f87afdc2 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Fri, 20 Aug 1999 19:40:03 +0000 Subject: [PATCH] Added dependency checking and all that. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 1859 +++++++++++++++++++++++++-------------- configure | 890 +++++++++++-------- configure.in | 46 +- distrib/msw/tmake/unx.t | 312 ++++--- docs/gtk/install.txt | 7 + docs/motif2/install.txt | 7 + 6 files changed, 1939 insertions(+), 1182 deletions(-) diff --git a/Makefile.in b/Makefile.in index 3ae684fd4c..9fc1ad78b7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,5 @@ # -# This file was automatically generated by tmake at 15:14, 1999/08/18 +# This file was automatically generated by tmake at 20:22, 1999/08/20 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T! # @@ -23,19 +23,29 @@ include ./src/make.env .SUFFIXES: .o .cpp .c .cxx .c.o : - $(CCC) -c $(CFLAGS) $(PICFLAGS) -o $@ $< + $(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) -o $@ $< .cpp.o : - $(CC) -c $(CPPFLAGS) $(PICFLAGS) -o $@ $< + $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $< .cxx.o : - $(CC) -c $(CPPFLAGS) $(PICFLAGS) -o $@ $< + $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $< ########################### Paths ################################# srcdir = @srcdir@ -VPATH = :@top_srcdir@ +VP1 = @top_srcdir@/src/common +VP2 = @top_srcdir@/src/@TOOLKIT_DIR@ +VP3 = @top_srcdir@/src/motif/xmcombo +VP4 = @top_srcdir@/src/generic +VP5 = @top_srcdir@/src/unix +VP6 = @top_srcdir@/src/html +VP7 = @top_srcdir@/src/png +VP8 = @top_srcdir@/src/jpeg +VP9 = @top_srcdir@/src/zlib + +VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9) top_srcdir = @top_srcdir@ prefix = @prefix@ @@ -555,696 +565,1243 @@ HTML_HEADERS = \ html/version.h GTK_GENERICOBJS = \ - src/generic/busyinfo.o \ - src/generic/caret.o \ - src/generic/choicdgg.o \ - src/generic/colrdlgg.o \ - src/generic/dcpsg.o \ - src/generic/dirdlgg.o \ - src/generic/filedlgg.o \ - src/generic/fontdlgg.o \ - src/generic/gridg.o \ - src/generic/helphtml.o \ - src/generic/helpwxht.o \ - src/generic/imaglist.o \ - src/generic/laywin.o \ - src/generic/listctrl.o \ - src/generic/msgdlgg.o \ - src/generic/numdlgg.o \ - src/generic/panelg.o \ - src/generic/printps.o \ - src/generic/prntdlgg.o \ - src/generic/progdlgg.o \ - src/generic/prop.o \ - src/generic/propform.o \ - src/generic/proplist.o \ - src/generic/sashwin.o \ - src/generic/scrolwin.o \ - src/generic/splitter.o \ - src/generic/statusbr.o \ - src/generic/textdlgg.o \ - src/generic/tipdlg.o \ - src/generic/treectrl.o \ - src/generic/wizard.o + busyinfo.o \ + caret.o \ + choicdgg.o \ + colrdlgg.o \ + dcpsg.o \ + dirdlgg.o \ + filedlgg.o \ + fontdlgg.o \ + gridg.o \ + helphtml.o \ + helpwxht.o \ + imaglist.o \ + laywin.o \ + listctrl.o \ + msgdlgg.o \ + numdlgg.o \ + panelg.o \ + printps.o \ + prntdlgg.o \ + progdlgg.o \ + prop.o \ + propform.o \ + proplist.o \ + sashwin.o \ + scrolwin.o \ + splitter.o \ + statusbr.o \ + textdlgg.o \ + tipdlg.o \ + treectrl.o \ + wizard.o + +GTK_GENERICDEPS = \ + busyinfo.d \ + caret.d \ + choicdgg.d \ + colrdlgg.d \ + dcpsg.d \ + dirdlgg.d \ + filedlgg.d \ + fontdlgg.d \ + gridg.d \ + helphtml.d \ + helpwxht.d \ + imaglist.d \ + laywin.d \ + listctrl.d \ + msgdlgg.d \ + numdlgg.d \ + panelg.d \ + printps.d \ + prntdlgg.d \ + progdlgg.d \ + prop.d \ + propform.d \ + proplist.d \ + sashwin.d \ + scrolwin.d \ + splitter.d \ + statusbr.d \ + textdlgg.d \ + tipdlg.d \ + treectrl.d \ + wizard.d GTK_COMMONOBJS = \ parser.o \ - src/common/cmndata.o \ - src/common/config.o \ - src/common/date.o \ - src/common/datstrm.o \ - src/common/db.o \ - src/common/dbtable.o \ - src/common/dcbase.o \ - src/common/dlgcmn.o \ - src/common/docmdi.o \ - src/common/docview.o \ - src/common/dynarray.o \ - src/common/dynlib.o \ - src/common/event.o \ - src/common/extended.o \ - src/common/ffile.o \ - src/common/file.o \ - src/common/fileconf.o \ - src/common/filefn.o \ - src/common/filesys.o \ - src/common/framecmn.o \ - src/common/fs_inet.o \ - src/common/fs_zip.o \ - src/common/ftp.o \ - src/common/gdicmn.o \ - src/common/gifdecod.o \ - src/common/hash.o \ - src/common/helpbase.o \ - src/common/http.o \ - src/common/imagbmp.o \ - src/common/image.o \ - src/common/imaggif.o \ - src/common/imagjpeg.o \ - src/common/imagpng.o \ - src/common/imagpnm.o \ - src/common/intl.o \ - src/common/ipcbase.o \ - src/common/layout.o \ - src/common/list.o \ - src/common/log.o \ - src/common/memory.o \ - src/common/mimetype.o \ - src/common/module.o \ - src/common/mstream.o \ - src/common/object.o \ - src/common/objstrm.o \ - src/common/paper.o \ - src/common/prntbase.o \ - src/common/process.o \ - src/common/protocol.o \ - src/common/resource.o \ - src/common/sckaddr.o \ - src/common/sckfile.o \ - src/common/sckipc.o \ - src/common/sckstrm.o \ - src/common/sizer.o \ - src/common/socket.o \ - src/common/strconv.o \ - src/common/stream.o \ - src/common/string.o \ - src/common/tbarbase.o \ - src/common/tbarsmpl.o \ - src/common/textcmn.o \ - src/common/textfile.o \ - src/common/time.o \ - src/common/timercmn.o \ - src/common/tokenzr.o \ - src/common/txtstrm.o \ - src/common/unzip.o \ - src/common/url.o \ - src/common/utilscmn.o \ - src/common/valgen.o \ - src/common/validate.o \ - src/common/valtext.o \ - src/common/variant.o \ - src/common/wfstream.o \ - src/common/wincmn.o \ - src/common/wxchar.o \ - src/common/wxexpr.o \ - src/common/zipstrm.o \ - src/common/zstream.o + cmndata.o \ + config.o \ + date.o \ + datstrm.o \ + db.o \ + dbtable.o \ + dcbase.o \ + dlgcmn.o \ + docmdi.o \ + docview.o \ + dynarray.o \ + dynlib.o \ + event.o \ + extended.o \ + ffile.o \ + file.o \ + fileconf.o \ + filefn.o \ + filesys.o \ + framecmn.o \ + fs_inet.o \ + fs_zip.o \ + ftp.o \ + gdicmn.o \ + gifdecod.o \ + hash.o \ + helpbase.o \ + http.o \ + imagbmp.o \ + image.o \ + imaggif.o \ + imagjpeg.o \ + imagpng.o \ + imagpnm.o \ + intl.o \ + ipcbase.o \ + layout.o \ + list.o \ + log.o \ + memory.o \ + mimetype.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 \ + sizer.o \ + socket.o \ + strconv.o \ + stream.o \ + string.o \ + tbarbase.o \ + tbarsmpl.o \ + textcmn.o \ + textfile.o \ + time.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 \ + cmndata.d \ + config.d \ + date.d \ + datstrm.d \ + db.d \ + dbtable.d \ + dcbase.d \ + dlgcmn.d \ + docmdi.d \ + docview.d \ + dynarray.d \ + dynlib.d \ + event.d \ + extended.d \ + ffile.d \ + file.d \ + fileconf.d \ + filefn.d \ + filesys.d \ + framecmn.d \ + fs_inet.d \ + fs_zip.d \ + ftp.d \ + gdicmn.d \ + gifdecod.d \ + hash.d \ + helpbase.d \ + http.d \ + imagbmp.d \ + image.d \ + imaggif.d \ + imagjpeg.d \ + imagpng.d \ + imagpnm.d \ + intl.d \ + ipcbase.d \ + layout.d \ + list.d \ + log.d \ + memory.d \ + mimetype.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 \ + sizer.d \ + socket.d \ + strconv.d \ + stream.d \ + string.d \ + tbarbase.d \ + tbarsmpl.d \ + textcmn.d \ + textfile.d \ + time.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 = \ - src/gtk/accel.o \ - src/gtk/app.o \ - src/gtk/bitmap.o \ - src/gtk/bmpbuttn.o \ - src/gtk/brush.o \ - src/gtk/button.o \ - src/gtk/checkbox.o \ - src/gtk/checklst.o \ - src/gtk/choice.o \ - src/gtk/clipbrd.o \ - src/gtk/colour.o \ - src/gtk/combobox.o \ - src/gtk/control.o \ - src/gtk/cursor.o \ - src/gtk/data.o \ - src/gtk/dataobj.o \ - src/gtk/dc.o \ - src/gtk/dcclient.o \ - src/gtk/dcmemory.o \ - src/gtk/dcscreen.o \ - src/gtk/dialog.o \ - src/gtk/dnd.o \ - src/gtk/font.o \ - src/gtk/frame.o \ - src/gtk/gauge.o \ - src/gtk/gdiobj.o \ - src/gtk/gsockgtk.o \ - src/gtk/icon.o \ - src/gtk/listbox.o \ - src/gtk/main.o \ - src/gtk/mdi.o \ - src/gtk/menu.o \ - src/gtk/minifram.o \ - src/gtk/notebook.o \ - src/gtk/palette.o \ - src/gtk/pen.o \ - src/gtk/radiobox.o \ - src/gtk/radiobut.o \ - src/gtk/region.o \ - src/gtk/scrolbar.o \ - src/gtk/settings.o \ - src/gtk/slider.o \ - src/gtk/spinbutt.o \ - src/gtk/statbmp.o \ - src/gtk/statbox.o \ - src/gtk/statline.o \ - src/gtk/stattext.o \ - src/gtk/tbargtk.o \ - src/gtk/textctrl.o \ - src/gtk/timer.o \ - src/gtk/tooltip.o \ - src/gtk/utilsgtk.o \ - src/gtk/utilsres.o \ - src/gtk/wave.o \ - src/gtk/win_gtk.o \ - src/gtk/window.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 \ + dnd.o \ + font.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 \ + 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 \ + 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 \ + 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 = \ - src/generic/busyinfo.o \ - src/generic/caret.o \ - src/generic/choicdgg.o \ - src/generic/colrdlgg.o \ - src/generic/dcpsg.o \ - src/generic/dirdlgg.o \ - src/generic/filedlgg.o \ - src/generic/fontdlgg.o \ - src/generic/gridg.o \ - src/generic/helphtml.o \ - src/generic/helpwxht.o \ - src/generic/helpxlp.o \ - src/generic/imaglist.o \ - src/generic/laywin.o \ - src/generic/listctrl.o \ - src/generic/msgdlgg.o \ - src/generic/notebook.o \ - src/generic/numdlgg.o \ - src/generic/panelg.o \ - src/generic/printps.o \ - src/generic/prntdlgg.o \ - src/generic/progdlgg.o \ - src/generic/prop.o \ - src/generic/propform.o \ - src/generic/proplist.o \ - src/generic/sashwin.o \ - src/generic/scrolwin.o \ - src/generic/splitter.o \ - src/generic/statusbr.o \ - src/generic/tabg.o \ - src/generic/textdlgg.o \ - src/generic/tipdlg.o \ - src/generic/treectrl.o \ - src/generic/wizard.o + busyinfo.o \ + caret.o \ + choicdgg.o \ + colrdlgg.o \ + dcpsg.o \ + dirdlgg.o \ + filedlgg.o \ + fontdlgg.o \ + gridg.o \ + helphtml.o \ + helpwxht.o \ + helpxlp.o \ + imaglist.o \ + laywin.o \ + listctrl.o \ + msgdlgg.o \ + notebook.o \ + numdlgg.o \ + panelg.o \ + printps.o \ + prntdlgg.o \ + progdlgg.o \ + prop.o \ + propform.o \ + proplist.o \ + sashwin.o \ + scrolwin.o \ + splitter.o \ + statusbr.o \ + tabg.o \ + textdlgg.o \ + tipdlg.o \ + treectrl.o \ + wizard.o + +MOTIF_GENERICDEPS = \ + busyinfo.d \ + caret.d \ + choicdgg.d \ + colrdlgg.d \ + dcpsg.d \ + dirdlgg.d \ + filedlgg.d \ + fontdlgg.d \ + gridg.d \ + helphtml.d \ + helpwxht.d \ + helpxlp.d \ + imaglist.d \ + laywin.d \ + listctrl.d \ + msgdlgg.d \ + notebook.d \ + numdlgg.d \ + panelg.d \ + printps.d \ + prntdlgg.d \ + progdlgg.d \ + prop.d \ + propform.d \ + proplist.d \ + sashwin.d \ + scrolwin.d \ + splitter.d \ + statusbr.d \ + tabg.d \ + textdlgg.d \ + tipdlg.d \ + treectrl.d \ + wizard.d MOTIF_COMMONOBJS = \ parser.o \ - src/common/choiccmn.o \ - src/common/cmndata.o \ - src/common/config.o \ - src/common/ctrlcmn.o \ - src/common/date.o \ - src/common/datstrm.o \ - src/common/db.o \ - src/common/dbtable.o \ - src/common/dcbase.o \ - src/common/dlgcmn.o \ - src/common/docmdi.o \ - src/common/docview.o \ - src/common/dynarray.o \ - src/common/dynlib.o \ - src/common/event.o \ - src/common/extended.o \ - src/common/ffile.o \ - src/common/file.o \ - src/common/fileconf.o \ - src/common/filefn.o \ - src/common/filesys.o \ - src/common/framecmn.o \ - src/common/fs_inet.o \ - src/common/fs_zip.o \ - src/common/ftp.o \ - src/common/gdicmn.o \ - src/common/gifdecod.o \ - src/common/hash.o \ - src/common/helpbase.o \ - src/common/http.o \ - src/common/imagbmp.o \ - src/common/image.o \ - src/common/imaggif.o \ - src/common/imagjpeg.o \ - src/common/imagpng.o \ - src/common/imagpnm.o \ - src/common/intl.o \ - src/common/ipcbase.o \ - src/common/layout.o \ - src/common/list.o \ - src/common/log.o \ - src/common/memory.o \ - src/common/mimetype.o \ - src/common/module.o \ - src/common/mstream.o \ - src/common/object.o \ - src/common/objstrm.o \ - src/common/odbc.o \ - src/common/paper.o \ - src/common/prntbase.o \ - src/common/process.o \ - src/common/protocol.o \ - src/common/resource.o \ - src/common/sckaddr.o \ - src/common/sckfile.o \ - src/common/sckipc.o \ - src/common/sckstrm.o \ - src/common/sizer.o \ - src/common/socket.o \ - src/common/strconv.o \ - src/common/stream.o \ - src/common/string.o \ - src/common/tbarbase.o \ - src/common/tbarsmpl.o \ - src/common/textcmn.o \ - src/common/textfile.o \ - src/common/time.o \ - src/common/timercmn.o \ - src/common/tokenzr.o \ - src/common/txtstrm.o \ - src/common/unzip.o \ - src/common/url.o \ - src/common/utilscmn.o \ - src/common/valgen.o \ - src/common/validate.o \ - src/common/valtext.o \ - src/common/variant.o \ - src/common/wfstream.o \ - src/common/wincmn.o \ - src/common/wxchar.o \ - src/common/wxexpr.o \ - src/common/zipstrm.o \ - src/common/zstream.o + choiccmn.o \ + cmndata.o \ + config.o \ + ctrlcmn.o \ + date.o \ + datstrm.o \ + db.o \ + dbtable.o \ + dcbase.o \ + dlgcmn.o \ + docmdi.o \ + docview.o \ + dynarray.o \ + dynlib.o \ + event.o \ + extended.o \ + ffile.o \ + file.o \ + fileconf.o \ + filefn.o \ + filesys.o \ + framecmn.o \ + fs_inet.o \ + fs_zip.o \ + ftp.o \ + gdicmn.o \ + gifdecod.o \ + hash.o \ + helpbase.o \ + http.o \ + imagbmp.o \ + image.o \ + imaggif.o \ + imagjpeg.o \ + imagpng.o \ + imagpnm.o \ + intl.o \ + ipcbase.o \ + layout.o \ + list.o \ + log.o \ + memory.o \ + mimetype.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 \ + sizer.o \ + socket.o \ + strconv.o \ + stream.o \ + string.o \ + tbarbase.o \ + tbarsmpl.o \ + textcmn.o \ + textfile.o \ + time.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 \ + choiccmn.d \ + cmndata.d \ + config.d \ + ctrlcmn.d \ + date.d \ + datstrm.d \ + db.d \ + dbtable.d \ + dcbase.d \ + dlgcmn.d \ + docmdi.d \ + docview.d \ + dynarray.d \ + dynlib.d \ + event.d \ + extended.d \ + ffile.d \ + file.d \ + fileconf.d \ + filefn.d \ + filesys.d \ + framecmn.d \ + fs_inet.d \ + fs_zip.d \ + ftp.d \ + gdicmn.d \ + gifdecod.d \ + hash.d \ + helpbase.d \ + http.d \ + imagbmp.d \ + image.d \ + imaggif.d \ + imagjpeg.d \ + imagpng.d \ + imagpnm.d \ + intl.d \ + ipcbase.d \ + layout.d \ + list.d \ + log.d \ + memory.d \ + mimetype.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 \ + sizer.d \ + socket.d \ + strconv.d \ + stream.d \ + string.d \ + tbarbase.d \ + tbarsmpl.d \ + textcmn.d \ + textfile.d \ + time.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 = \ - src/motif/xmcombo/xmcombo.o \ - src/motif/accel.o \ - src/motif/app.o \ - src/motif/bitmap.o \ - src/motif/bmpbuttn.o \ - src/motif/brush.o \ - src/motif/button.o \ - src/motif/checkbox.o \ - src/motif/choice.o \ - src/motif/clipbrd.o \ - src/motif/colour.o \ - src/motif/combobox.o \ - src/motif/control.o \ - src/motif/cursor.o \ - src/motif/data.o \ - src/motif/dataobj.o \ - src/motif/dc.o \ - src/motif/dcclient.o \ - src/motif/dcmemory.o \ - src/motif/dcscreen.o \ - src/motif/dialog.o \ - src/motif/filedlg.o \ - src/motif/font.o \ - src/motif/frame.o \ - src/motif/gauge.o \ - src/motif/gdiobj.o \ - src/motif/gsockmot.o \ - src/motif/icon.o \ - src/motif/listbox.o \ - src/motif/main.o \ - src/motif/mdi.o \ - src/motif/menu.o \ - src/motif/menuitem.o \ - src/motif/minifram.o \ - src/motif/msgdlg.o \ - src/motif/palette.o \ - src/motif/pen.o \ - src/motif/radiobox.o \ - src/motif/radiobut.o \ - src/motif/region.o \ - src/motif/scrolbar.o \ - src/motif/settings.o \ - src/motif/slider.o \ - src/motif/statbmp.o \ - src/motif/statbox.o \ - src/motif/stattext.o \ - src/motif/textctrl.o \ - src/motif/timer.o \ - src/motif/toolbar.o \ - src/motif/utils.o \ - src/motif/window.o + xmcombo.o \ + accel.o \ + app.o \ + bitmap.o \ + bmpbuttn.o \ + brush.o \ + button.o \ + checkbox.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 \ + 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 \ + 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 \ + statbmp.d \ + statbox.d \ + stattext.d \ + textctrl.d \ + timer.d \ + toolbar.d \ + utils.d \ + window.d MSW_GENERICOBJS = \ - src/generic/busyinfo.o \ - src/generic/choicdgg.o \ - src/generic/dirdlgg.o \ - src/generic/gridg.o \ - src/generic/laywin.o \ - src/generic/numdlgg.o \ - src/generic/panelg.o \ - src/generic/progdlgg.o \ - src/generic/prop.o \ - src/generic/propform.o \ - src/generic/proplist.o \ - src/generic/sashwin.o \ - src/generic/scrolwin.o \ - src/generic/splitter.o \ - src/generic/statusbr.o \ - src/generic/tabg.o \ - src/generic/textdlgg.o \ - src/generic/tipdlg.o \ - src/generic/wizard.o + busyinfo.o \ + choicdgg.o \ + dirdlgg.o \ + gridg.o \ + laywin.o \ + numdlgg.o \ + panelg.o \ + progdlgg.o \ + prop.o \ + propform.o \ + proplist.o \ + sashwin.o \ + scrolwin.o \ + splitter.o \ + statusbr.o \ + tabg.o \ + textdlgg.o \ + tipdlg.o \ + wizard.o + +MSW_GENERICDEPS = \ + busyinfo.d \ + choicdgg.d \ + dirdlgg.d \ + gridg.d \ + laywin.d \ + numdlgg.d \ + panelg.d \ + progdlgg.d \ + prop.d \ + propform.d \ + proplist.d \ + sashwin.d \ + scrolwin.d \ + splitter.d \ + statusbr.d \ + tabg.d \ + textdlgg.d \ + tipdlg.d \ + wizard.d MSW_COMMONOBJS = \ - src/common/choiccmn.o \ - src/common/cmndata.o \ - src/common/config.o \ - src/common/ctrlcmn.o \ - src/common/date.o \ - src/common/datstrm.o \ - src/common/db.o \ - src/common/dbtable.o \ - src/common/dcbase.o \ - src/common/dlgcmn.o \ - src/common/docmdi.o \ - src/common/docview.o \ - src/common/dynarray.o \ - src/common/dynlib.o \ - src/common/event.o \ - src/common/extended.o \ - src/common/ffile.o \ - src/common/file.o \ - src/common/fileconf.o \ - src/common/filefn.o \ - src/common/filesys.o \ - src/common/framecmn.o \ - src/common/fs_inet.o \ - src/common/fs_zip.o \ - src/common/ftp.o \ - src/common/gdicmn.o \ - src/common/gifdecod.o \ - src/common/hash.o \ - src/common/helpbase.o \ - src/common/http.o \ - src/common/imagbmp.o \ - src/common/image.o \ - src/common/imaggif.o \ - src/common/imagjpeg.o \ - src/common/imagpng.o \ - src/common/imagpnm.o \ - src/common/intl.o \ - src/common/ipcbase.o \ - src/common/layout.o \ - src/common/list.o \ - src/common/log.o \ - src/common/memory.o \ - src/common/mimetype.o \ - src/common/module.o \ - src/common/mstream.o \ - src/common/object.o \ - src/common/objstrm.o \ - src/common/paper.o \ - src/common/prntbase.o \ - src/common/process.o \ - src/common/protocol.o \ - src/common/resource.o \ - src/common/sckaddr.o \ - src/common/sckfile.o \ - src/common/sckipc.o \ - src/common/sckstrm.o \ - src/common/sizer.o \ - src/common/socket.o \ - src/common/strconv.o \ - src/common/stream.o \ - src/common/string.o \ - src/common/tbarbase.o \ - src/common/textcmn.o \ - src/common/textfile.o \ - src/common/time.o \ - src/common/timercmn.o \ - src/common/tokenzr.o \ - src/common/txtstrm.o \ - src/common/unzip.o \ - src/common/url.o \ - src/common/utilscmn.o \ - src/common/valgen.o \ - src/common/validate.o \ - src/common/valtext.o \ - src/common/variant.o \ - src/common/wfstream.o \ - src/common/wincmn.o \ - src/common/wxchar.o \ - src/common/wxexpr.o \ - src/common/zipstrm.o \ - src/common/zstream.o + choiccmn.o \ + cmndata.o \ + config.o \ + ctrlcmn.o \ + date.o \ + datstrm.o \ + db.o \ + dbtable.o \ + dcbase.o \ + dlgcmn.o \ + docmdi.o \ + docview.o \ + dynarray.o \ + dynlib.o \ + event.o \ + extended.o \ + ffile.o \ + file.o \ + fileconf.o \ + filefn.o \ + filesys.o \ + framecmn.o \ + fs_inet.o \ + fs_zip.o \ + ftp.o \ + gdicmn.o \ + gifdecod.o \ + hash.o \ + helpbase.o \ + http.o \ + imagbmp.o \ + image.o \ + imaggif.o \ + imagjpeg.o \ + imagpng.o \ + imagpnm.o \ + intl.o \ + ipcbase.o \ + layout.o \ + list.o \ + log.o \ + memory.o \ + mimetype.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 \ + sizer.o \ + socket.o \ + strconv.o \ + stream.o \ + string.o \ + tbarbase.o \ + textcmn.o \ + textfile.o \ + time.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 = \ + choiccmn.d \ + cmndata.d \ + config.d \ + ctrlcmn.d \ + date.d \ + datstrm.d \ + db.d \ + dbtable.d \ + dcbase.d \ + dlgcmn.d \ + docmdi.d \ + docview.d \ + dynarray.d \ + dynlib.d \ + event.d \ + extended.d \ + ffile.d \ + file.d \ + fileconf.d \ + filefn.d \ + filesys.d \ + framecmn.d \ + fs_inet.d \ + fs_zip.d \ + ftp.d \ + gdicmn.d \ + gifdecod.d \ + hash.d \ + helpbase.d \ + http.d \ + imagbmp.d \ + image.d \ + imaggif.d \ + imagjpeg.d \ + imagpng.d \ + imagpnm.d \ + intl.d \ + ipcbase.d \ + layout.d \ + list.d \ + log.d \ + memory.d \ + mimetype.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 \ + sizer.d \ + socket.d \ + strconv.d \ + stream.d \ + string.d \ + tbarbase.d \ + textcmn.d \ + textfile.d \ + time.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 = \ - src/msw/accel.o \ - src/msw/app.o \ - src/msw/bitmap.o \ - src/msw/bmpbuttn.o \ - src/msw/brush.o \ - src/msw/button.o \ - src/msw/caret.o \ - src/msw/checkbox.o \ - src/msw/checklst.o \ - src/msw/choice.o \ - src/msw/clipbrd.o \ - src/msw/colordlg.o \ - src/msw/colour.o \ - src/msw/combobox.o \ - src/msw/control.o \ - src/msw/curico.o \ - src/msw/cursor.o \ - src/msw/data.o \ - src/msw/dc.o \ - src/msw/dcclient.o \ - src/msw/dcmemory.o \ - src/msw/dcprint.o \ - src/msw/dcscreen.o \ - src/msw/dde.o \ - src/msw/dialog.o \ - src/msw/dib.o \ - src/msw/dibutils.o \ - src/msw/dragimag.o \ - src/msw/filedlg.o \ - src/msw/font.o \ - src/msw/fontdlg.o \ - src/msw/frame.o \ - src/msw/gauge95.o \ - src/msw/gdiobj.o \ - src/msw/helpwin.o \ - src/msw/icon.o \ - src/msw/imaglist.o \ - src/msw/joystick.o \ - src/msw/listbox.o \ - src/msw/listctrl.o \ - src/msw/main.o \ - src/msw/mdi.o \ - src/msw/menu.o \ - src/msw/menuitem.o \ - src/msw/metafile.o \ - src/msw/minifram.o \ - src/msw/msgdlg.o \ - src/msw/nativdlg.o \ - src/msw/notebook.o \ - src/msw/ownerdrw.o \ - src/msw/palette.o \ - src/msw/pen.o \ - src/msw/penwin.o \ - src/msw/pnghand.o \ - src/msw/printdlg.o \ - src/msw/printwin.o \ - src/msw/radiobox.o \ - src/msw/radiobut.o \ - src/msw/regconf.o \ - src/msw/region.o \ - src/msw/registry.o \ - src/msw/scrolbar.o \ - src/msw/settings.o \ - src/msw/slider95.o \ - src/msw/spinbutt.o \ - src/msw/statbmp.o \ - src/msw/statbox.o \ - src/msw/statbr95.o \ - src/msw/statline.o \ - src/msw/stattext.o \ - src/msw/tabctrl.o \ - src/msw/taskbar.o \ - src/msw/tbar95.o \ - src/msw/textctrl.o \ - src/msw/thread.o \ - src/msw/timer.o \ - src/msw/tooltip.o \ - src/msw/treectrl.o \ - src/msw/utils.o \ - src/msw/utilsexc.o \ - src/msw/wave.o \ - src/msw/window.o \ - src/msw/xpmhand.o + 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 \ + dib.o \ + dibutils.o \ + dragimag.o \ + filedlg.o \ + font.o \ + fontdlg.o \ + frame.o \ + gauge95.o \ + gdiobj.o \ + helpwin.o \ + icon.o \ + imaglist.o \ + joystick.o \ + listbox.o \ + listctrl.o \ + main.o \ + mdi.o \ + menu.o \ + menuitem.o \ + metafile.o \ + minifram.o \ + msgdlg.o \ + nativdlg.o \ + notebook.o \ + ownerdrw.o \ + palette.o \ + pen.o \ + penwin.o \ + pnghand.o \ + printdlg.o \ + printwin.o \ + radiobox.o \ + radiobut.o \ + regconf.o \ + region.o \ + registry.o \ + scrolbar.o \ + settings.o \ + slider95.o \ + spinbutt.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 \ + dib.d \ + dibutils.d \ + dragimag.d \ + filedlg.d \ + font.d \ + fontdlg.d \ + frame.d \ + gauge95.d \ + gdiobj.d \ + helpwin.d \ + icon.d \ + imaglist.d \ + joystick.d \ + listbox.d \ + listctrl.d \ + main.d \ + mdi.d \ + menu.d \ + menuitem.d \ + metafile.d \ + minifram.d \ + msgdlg.d \ + nativdlg.d \ + notebook.d \ + ownerdrw.d \ + palette.d \ + pen.d \ + penwin.d \ + pnghand.d \ + printdlg.d \ + printwin.d \ + radiobox.d \ + radiobut.d \ + regconf.d \ + region.d \ + registry.d \ + scrolbar.d \ + settings.d \ + slider95.d \ + spinbutt.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 HTMLOBJS = \ - src/html/htmlcell.o \ - src/html/htmlfilter.o \ - src/html/htmlhelp.o \ - src/html/htmlhelp_io.o \ - src/html/htmlparser.o \ - src/html/htmltag.o \ - src/html/htmlwin.o \ - src/html/htmlwinparser.o \ - src/html/mod_fonts.o \ - src/html/mod_hline.o \ - src/html/mod_image.o \ - src/html/mod_layout.o \ - src/html/mod_links.o \ - src/html/mod_list.o \ - src/html/mod_pre.o \ - src/html/mod_tables.o \ - src/html/search.o + htmlcell.o \ + htmlfilter.o \ + htmlhelp.o \ + htmlhelp_io.o \ + htmlparser.o \ + htmltag.o \ + htmlwin.o \ + htmlwinparser.o \ + mod_fonts.o \ + mod_hline.o \ + mod_image.o \ + mod_layout.o \ + mod_links.o \ + mod_list.o \ + mod_pre.o \ + mod_tables.o \ + search.o + +HTMLDEPS = \ + htmlcell.d \ + htmlfilter.d \ + htmlhelp.d \ + htmlhelp_io.d \ + htmlparser.d \ + htmltag.d \ + htmlwin.d \ + htmlwinparser.d \ + mod_fonts.d \ + mod_hline.d \ + mod_image.d \ + mod_layout.d \ + mod_links.d \ + mod_list.d \ + mod_pre.d \ + mod_tables.d \ + search.d UNIXOBJS = \ - src/unix/gsocket.o \ - src/unix/threadpsx.o \ - src/unix/utilsunx.o + gsocket.o \ + threadpsx.o \ + utilsunx.o + +UNIXDEPS = \ + gsocket.d \ + threadpsx.d \ + utilsunx.d ZLIBOBJS = \ - src/zlib/adler32.o \ - src/zlib/compress.o \ - src/zlib/crc32.o \ - src/zlib/gzio.o \ - src/zlib/uncompr.o \ - src/zlib/deflate.o \ - src/zlib/trees.o \ - src/zlib/zutil.o \ - src/zlib/inflate.o \ - src/zlib/infblock.o \ - src/zlib/inftrees.o \ - src/zlib/infcodes.o \ - src/zlib/infutil.o \ - src/zlib/inffast.o + adler32.o \ + compress.o \ + crc32.o \ + gzio.o \ + uncompr.o \ + deflate.o \ + trees.o \ + zutil.o \ + inflate.o \ + infblock.o \ + inftrees.o \ + infcodes.o \ + infutil.o \ + inffast.o PNGOBJS = \ - src/png/png.o \ - src/png/pngread.o \ - src/png/pngrtran.o \ - src/png/pngrutil.o \ - src/png/pngpread.o \ - src/png/pngtrans.o \ - src/png/pngwrite.o \ - src/png/pngwtran.o \ - src/png/pngwutil.o \ - src/png/pngerror.o \ - src/png/pngmem.o \ - src/png/pngwio.o \ - src/png/pngrio.o \ - src/png/pngget.o \ - src/png/pngset.o + png.o \ + pngread.o \ + pngrtran.o \ + pngrutil.o \ + pngpread.o \ + pngtrans.o \ + pngwrite.o \ + pngwtran.o \ + pngwutil.o \ + pngerror.o \ + pngmem.o \ + pngwio.o \ + pngrio.o \ + pngget.o \ + pngset.o JPEGOBJS = \ - src/jpeg/jcomapi.o \ - src/jpeg/jutils.o \ - src/jpeg/jerror.o \ - src/jpeg/jmemmgr.o \ - src/jpeg/jmemnobs.o \ - src/jpeg/jcapimin.o \ - src/jpeg/jcapistd.o \ - src/jpeg/jctrans.o \ - src/jpeg/jcparam.o \ - src/jpeg/jdatadst.o \ - src/jpeg/jcinit.o \ - src/jpeg/jcmaster.o \ - src/jpeg/jcmarker.o \ - src/jpeg/jcmainct.o \ - src/jpeg/jcprepct.o \ - src/jpeg/jccoefct.o \ - src/jpeg/jccolor.o \ - src/jpeg/jcsample.o \ - src/jpeg/jchuff.o \ - src/jpeg/jcphuff.o \ - src/jpeg/jcdctmgr.o \ - src/jpeg/jfdctfst.o \ - src/jpeg/jfdctflt.o \ - src/jpeg/jfdctint.o \ - src/jpeg/jdapimin.o \ - src/jpeg/jdapistd.o \ - src/jpeg/jdtrans.o \ - src/jpeg/jdatasrc.o \ - src/jpeg/jdmaster.o \ - src/jpeg/jdinput.o \ - src/jpeg/jdmarker.o \ - src/jpeg/jdhuff.o \ - src/jpeg/jdphuff.o \ - src/jpeg/jdmainct.o \ - src/jpeg/jdcoefct.o \ - src/jpeg/jdpostct.o \ - src/jpeg/jddctmgr.o \ - src/jpeg/jidctfst.o \ - src/jpeg/jidctflt.o \ - src/jpeg/jidctint.o \ - src/jpeg/jidctred.o \ - src/jpeg/jdsample.o \ - src/jpeg/jdcolor.o \ - src/jpeg/jquant1.o \ - src/jpeg/jquant2.o \ - src/jpeg/jdmerge.o + jcomapi.o \ + jutils.o \ + jerror.o \ + jmemmgr.o \ + jmemnobs.o \ + jcapimin.o \ + jcapistd.o \ + jctrans.o \ + jcparam.o \ + jdatadst.o \ + jcinit.o \ + jcmaster.o \ + jcmarker.o \ + jcmainct.o \ + jcprepct.o \ + jccoefct.o \ + jccolor.o \ + jcsample.o \ + jchuff.o \ + jcphuff.o \ + jcdctmgr.o \ + jfdctfst.o \ + jfdctflt.o \ + jfdctint.o \ + jdapimin.o \ + jdapistd.o \ + jdtrans.o \ + jdatasrc.o \ + jdmaster.o \ + jdinput.o \ + jdmarker.o \ + jdhuff.o \ + jdphuff.o \ + jdmainct.o \ + jdcoefct.o \ + jdpostct.o \ + jddctmgr.o \ + jidctfst.o \ + jidctflt.o \ + jidctint.o \ + jidctred.o \ + jdsample.o \ + jdcolor.o \ + jquant1.o \ + jquant2.o \ + jdmerge.o OBJECTS = $(@GUIOBJS@) $(@COMMONOBJS@) $(@GENERICOBJS@) $(@UNIXOBJS@) $(HTMLOBJS) \ $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) +DEPFILES = $(@GUIDEPS@) $(@COMMONDEPS@) $(@GENERICDEPS@) $(UNIXDEPS) $(HTMLDEPS) + HEADERS = $(@GUIHEADERS@) $(HTML_HEADERS) $(UNIX_HEADERS) $(PROTOCOL_HEADERS) \ $(GENERIC_HEADERS) $(WX_HEADERS) -REQUIRED_DIRS = ./lib ./src ./src/common ./src/gtk ./src/motif ./src/msw \ - ./src/generic ./src/unix ./src/motif/xmombo ./src/html \ - ./src/zlib ./src/jpeg ./src/png - -all: $(REQUIRED_DIRS) $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@ - -$(REQUIRED_DIRS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h - @mkdir -p ./lib - @mkdir -p ./src - @mkdir -p ./src/common - @mkdir -p ./src/msw - @mkdir -p ./src/gtk - @mkdir -p ./src/motif - @mkdir -p ./src/motif/xmcombo - @mkdir -p ./src/generic - @mkdir -p ./src/unix - @mkdir -p ./src/html - @mkdir -p ./src/png - @mkdir -p ./src/jpeg - @mkdir -p ./src/zlib +all: $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@ @WX_LIBRARY_NAME_STATIC@: $(OBJECTS) + $(INSTALL) -d ./lib $(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS) $(RANLIB) ./lib/$@ @WX_LIBRARY_NAME_SHARED@: $(OBJECTS) + $(INSTALL) -d ./lib $(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS) CREATE_LINKS: ./lib/@WX_TARGET_LIBRARY@ - @if test -e ./lib/@WX_LIBRARY_LINK1@; then $(RM) ./lib/@WX_LIBRARY_LINK1@; fi - @if test -e ./lib/@WX_LIBRARY_LINK2@; then $(RM) ./lib/@WX_LIBRARY_LINK2@; fi - @if test -e ./lib/@WX_LIBRARY_LINK3@; then $(RM) ./lib/@WX_LIBRARY_LINK3@; fi + $(RM) ./lib/@WX_LIBRARY_LINK1@ + $(RM) ./lib/@WX_LIBRARY_LINK2@ + $(RM) ./lib/@WX_LIBRARY_LINK3@ $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK1@ $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@ $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@ CREATE_INSTALLED_LINKS: $(libdir)/@WX_TARGET_LIBRARY@ - @if test -e $(libdir)/@WX_LIBRARY_LINK1@; then $(RM) $(libdir)/@WX_LIBRARY_LINK1@; fi - @if test -e $(libdir)/@WX_LIBRARY_LINK2@; then $(RM) $(libdir)/@WX_LIBRARY_LINK2@; fi - @if test -e $(libdir)/@WX_LIBRARY_LINK3@; then $(RM) $(libdir)/@WX_LIBRARY_LINK3@; fi + $(RM) $(libdir)/@WX_LIBRARY_LINK1@ + $(RM) $(libdir)/@WX_LIBRARY_LINK2@ + $(RM) $(libdir)/@WX_LIBRARY_LINK3@ $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK1@ $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK2@ $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK3@ @@ -1272,12 +1829,13 @@ lexer.c: $(COMMDIR)/lexer.l sed -e "s/unput/PROIO_unput/g" > lexer.c @$(RM) lex.yy.c +-include $(DEPFILES) + preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(top_builddir)/setup.h @echo " " @echo " Installing wxWindows..." @echo " " - $(INSTALL) -d $(prefix) $(INSTALL) -d $(bindir) $(INSTALL) -d $(libdir) @@ -1484,17 +2042,8 @@ dist: ALL_DIST @GUIDIST@ SAMPLES_DIST $(RM) -r _dist_dir clean: - $(RM) ./src/msw/*.o - $(RM) ./src/gtk/*.o - $(RM) ./src/motif/*.o - $(RM) ./src/html/*.o - $(RM) ./src/common/*.o - $(RM) ./src/unix/*.o - $(RM) ./src/generic/*.o - $(RM) ./src/png/*.o - $(RM) ./src/jpeg/*.o - $(RM) ./src/zlib/*.o $(RM) *.o + $(RM) *.d $(RM) parser.c $(RM) lexer.c $(RM) ./lib/* diff --git a/configure b/configure index 75130071e8..8bea89d622 100755 --- a/configure +++ b/configure @@ -102,6 +102,10 @@ ac_help="$ac_help ac_help="$ac_help --enable-no_exceptions create code without exceptions information" ac_help="$ac_help +--enable-permissive compile code disregarding strict ANSI" +ac_help="$ac_help +--enable-no_deps create code without dependency information" +ac_help="$ac_help --enable-gui use GUI classes" ac_help="$ac_help --enable-intl use internationalization system" @@ -813,7 +817,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:817: checking host system type" >&5 +echo "configure:821: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -834,7 +838,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:838: checking target system type" >&5 +echo "configure:842: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -852,7 +856,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:856: checking build system type" >&5 +echo "configure:860: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1140,7 +1144,7 @@ fi if test "$USE_LINUX" = 1; then echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6 -echo "configure:1144: checking for gettext in -lc" >&5 +echo "configure:1148: checking for gettext in -lc" >&5 ac_lib_var=`echo c'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1148,7 +1152,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:1167: \"$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 @@ -1201,8 +1205,10 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_SHARED=yes DEFAULT_wxUSE_OPTIMISE=yes DEFAULT_wxUSE_PROFILE=no + DEFAULT_wxUSE_NO_DEPS=no DEFAULT_wxUSE_NO_RTTI=no DEFAULT_wxUSE_NO_EXCEPTIONS=no + DEFAULT_wxUSE_PERMISSIVE=no DEFAULT_wxUSE_DEBUG_FLAG=yes DEFAULT_wxUSE_DEBUG_INFO=yes DEFAULT_wxUSE_DEBUG_GDB=yes @@ -1306,8 +1312,10 @@ else DEFAULT_wxUSE_SHARED=yes DEFAULT_wxUSE_OPTIMISE=yes DEFAULT_wxUSE_PROFILE=no + DEFAULT_wxUSE_NO_DEPS=no DEFAULT_wxUSE_NO_RTTI=no DEFAULT_wxUSE_NO_EXCEPTIONS=no + DEFAULT_wxUSE_PERMISSIVE=no DEFAULT_wxUSE_DEBUG_FLAG=no DEFAULT_wxUSE_DEBUG_INFO=no DEFAULT_wxUSE_DEBUG_GDB=no @@ -1468,7 +1476,7 @@ fi echo $ac_n "checking "for --with-dmalloc"""... $ac_c" 1>&6 -echo "configure:1472: checking "for --with-dmalloc"" >&5 +echo "configure:1480: checking "for --with-dmalloc"" >&5 no_cache=0 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then @@ -1507,7 +1515,7 @@ fi echo $ac_n "checking "for --with-zlib"""... $ac_c" 1>&6 -echo "configure:1511: checking "for --with-zlib"" >&5 +echo "configure:1519: checking "for --with-zlib"" >&5 no_cache=0 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then @@ -1546,7 +1554,7 @@ fi echo $ac_n "checking "for --with-libpng"""... $ac_c" 1>&6 -echo "configure:1550: checking "for --with-libpng"" >&5 +echo "configure:1558: checking "for --with-libpng"" >&5 no_cache=0 # Check whether --with-libpng or --without-libpng was given. if test "${with_libpng+set}" = set; then @@ -1585,7 +1593,7 @@ fi echo $ac_n "checking "for --with-libgif"""... $ac_c" 1>&6 -echo "configure:1589: checking "for --with-libgif"" >&5 +echo "configure:1597: checking "for --with-libgif"" >&5 no_cache=0 # Check whether --with-libgif or --without-libgif was given. if test "${with_libgif+set}" = set; then @@ -1624,7 +1632,7 @@ fi echo $ac_n "checking "for --with-libjpeg"""... $ac_c" 1>&6 -echo "configure:1628: checking "for --with-libjpeg"" >&5 +echo "configure:1636: checking "for --with-libjpeg"" >&5 no_cache=0 # Check whether --with-libjpeg or --without-libjpeg was given. if test "${with_libjpeg+set}" = set; then @@ -1663,7 +1671,7 @@ fi echo $ac_n "checking "for --with-opengl"""... $ac_c" 1>&6 -echo "configure:1667: checking "for --with-opengl"" >&5 +echo "configure:1675: checking "for --with-opengl"" >&5 no_cache=0 # Check whether --with-opengl or --without-opengl was given. if test "${with_opengl+set}" = set; then @@ -1702,7 +1710,7 @@ fi echo $ac_n "checking "for --with-odbc"""... $ac_c" 1>&6 -echo "configure:1706: checking "for --with-odbc"" >&5 +echo "configure:1714: checking "for --with-odbc"" >&5 no_cache=0 # Check whether --with-odbc or --without-odbc was given. if test "${with_odbc+set}" = set; then @@ -1744,7 +1752,7 @@ fi echo $ac_n "checking "for --enable-shared"""... $ac_c" 1>&6 -echo "configure:1748: checking "for --enable-shared"" >&5 +echo "configure:1756: checking "for --enable-shared"" >&5 no_cache=0 # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then @@ -1783,7 +1791,7 @@ fi echo $ac_n "checking "for --enable-optimise"""... $ac_c" 1>&6 -echo "configure:1787: checking "for --enable-optimise"" >&5 +echo "configure:1795: checking "for --enable-optimise"" >&5 no_cache=0 # Check whether --enable-optimise or --disable-optimise was given. if test "${enable_optimise+set}" = set; then @@ -1822,7 +1830,7 @@ fi echo $ac_n "checking "for --enable-debug"""... $ac_c" 1>&6 -echo "configure:1826: checking "for --enable-debug"" >&5 +echo "configure:1834: checking "for --enable-debug"" >&5 no_cache=0 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then @@ -1870,7 +1878,7 @@ fi echo $ac_n "checking "for --enable-debug_flag"""... $ac_c" 1>&6 -echo "configure:1874: checking "for --enable-debug_flag"" >&5 +echo "configure:1882: checking "for --enable-debug_flag"" >&5 no_cache=0 # Check whether --enable-debug_flag or --disable-debug_flag was given. if test "${enable_debug_flag+set}" = set; then @@ -1909,7 +1917,7 @@ fi echo $ac_n "checking "for --enable-debug_info"""... $ac_c" 1>&6 -echo "configure:1913: checking "for --enable-debug_info"" >&5 +echo "configure:1921: checking "for --enable-debug_info"" >&5 no_cache=0 # Check whether --enable-debug_info or --disable-debug_info was given. if test "${enable_debug_info+set}" = set; then @@ -1948,7 +1956,7 @@ fi echo $ac_n "checking "for --enable-debug_gdb"""... $ac_c" 1>&6 -echo "configure:1952: checking "for --enable-debug_gdb"" >&5 +echo "configure:1960: checking "for --enable-debug_gdb"" >&5 no_cache=0 # Check whether --enable-debug_gdb or --disable-debug_gdb was given. if test "${enable_debug_gdb+set}" = set; then @@ -1987,7 +1995,7 @@ fi echo $ac_n "checking "for --enable-debug_cntxt"""... $ac_c" 1>&6 -echo "configure:1991: checking "for --enable-debug_cntxt"" >&5 +echo "configure:1999: checking "for --enable-debug_cntxt"" >&5 no_cache=0 # Check whether --enable-debug_cntxt or --disable-debug_cntxt was given. if test "${enable_debug_cntxt+set}" = set; then @@ -2026,7 +2034,7 @@ fi echo $ac_n "checking "for --enable-mem_tracing"""... $ac_c" 1>&6 -echo "configure:2030: checking "for --enable-mem_tracing"" >&5 +echo "configure:2038: checking "for --enable-mem_tracing"" >&5 no_cache=0 # Check whether --enable-mem_tracing or --disable-mem_tracing was given. if test "${enable_mem_tracing+set}" = set; then @@ -2065,7 +2073,7 @@ fi echo $ac_n "checking "for --enable-profile"""... $ac_c" 1>&6 -echo "configure:2069: checking "for --enable-profile"" >&5 +echo "configure:2077: checking "for --enable-profile"" >&5 no_cache=0 # Check whether --enable-profile or --disable-profile was given. if test "${enable_profile+set}" = set; then @@ -2104,7 +2112,7 @@ fi echo $ac_n "checking "for --enable-no_rtti"""... $ac_c" 1>&6 -echo "configure:2108: checking "for --enable-no_rtti"" >&5 +echo "configure:2116: checking "for --enable-no_rtti"" >&5 no_cache=0 # Check whether --enable-no_rtti or --disable-no_rtti was given. if test "${enable_no_rtti+set}" = set; then @@ -2143,7 +2151,7 @@ fi echo $ac_n "checking "for --enable-no_exceptions"""... $ac_c" 1>&6 -echo "configure:2147: checking "for --enable-no_exceptions"" >&5 +echo "configure:2155: checking "for --enable-no_exceptions"" >&5 no_cache=0 # Check whether --enable-no_exceptions or --disable-no_exceptions was given. if test "${enable_no_exceptions+set}" = set; then @@ -2181,10 +2189,88 @@ fi fi + echo $ac_n "checking "for --enable-permissive"""... $ac_c" 1>&6 +echo "configure:2194: checking "for --enable-permissive"" >&5 + no_cache=0 + # Check whether --enable-permissive or --disable-permissive was given. +if test "${enable_permissive+set}" = set; then + enableval="$enable_permissive" + + if test "$enableval" = yes; then + ac_cv_use_permissive='wxUSE_PERMISSIVE=yes' + else + ac_cv_use_permissive='wxUSE_PERMISSIVE=no' + fi + +else + + LINE=`grep "wxUSE_PERMISSIVE" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_permissive='wxUSE_PERMISSIVE='$DEFAULT_wxUSE_PERMISSIVE + +fi + + + eval "$ac_cv_use_permissive" + if test "$no_cache" != 1; then + echo $ac_cv_use_permissive >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_PERMISSIVE" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + + echo $ac_n "checking "for --enable-no_deps"""... $ac_c" 1>&6 +echo "configure:2233: checking "for --enable-no_deps"" >&5 + no_cache=0 + # Check whether --enable-no_deps or --disable-no_deps was given. +if test "${enable_no_deps+set}" = set; then + enableval="$enable_no_deps" + + if test "$enableval" = yes; then + ac_cv_use_no_deps='wxUSE_NO_DEPS=yes' + else + ac_cv_use_no_deps='wxUSE_NO_DEPS=no' + fi + +else + + LINE=`grep "wxUSE_NO_DEPS" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_no_deps='wxUSE_NO_DEPS='$DEFAULT_wxUSE_NO_DEPS + +fi + + + eval "$ac_cv_use_no_deps" + if test "$no_cache" != 1; then + echo $ac_cv_use_no_deps >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_NO_DEPS" = yes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + + echo $ac_n "checking "for --enable-gui"""... $ac_c" 1>&6 -echo "configure:2188: checking "for --enable-gui"" >&5 +echo "configure:2274: checking "for --enable-gui"" >&5 no_cache=0 # Check whether --enable-gui or --disable-gui was given. if test "${enable_gui+set}" = set; then @@ -2225,7 +2311,7 @@ fi echo $ac_n "checking "for --enable-intl"""... $ac_c" 1>&6 -echo "configure:2229: checking "for --enable-intl"" >&5 +echo "configure:2315: checking "for --enable-intl"" >&5 no_cache=0 # Check whether --enable-intl or --disable-intl was given. if test "${enable_intl+set}" = set; then @@ -2264,7 +2350,7 @@ fi echo $ac_n "checking "for --enable-config"""... $ac_c" 1>&6 -echo "configure:2268: checking "for --enable-config"" >&5 +echo "configure:2354: checking "for --enable-config"" >&5 no_cache=0 # Check whether --enable-config or --disable-config was given. if test "${enable_config+set}" = set; then @@ -2303,7 +2389,7 @@ fi echo $ac_n "checking "for --enable-sockets"""... $ac_c" 1>&6 -echo "configure:2307: checking "for --enable-sockets"" >&5 +echo "configure:2393: checking "for --enable-sockets"" >&5 no_cache=0 # Check whether --enable-sockets or --disable-sockets was given. if test "${enable_sockets+set}" = set; then @@ -2342,7 +2428,7 @@ fi echo $ac_n "checking "for --enable-ipc"""... $ac_c" 1>&6 -echo "configure:2346: checking "for --enable-ipc"" >&5 +echo "configure:2432: checking "for --enable-ipc"" >&5 no_cache=0 # Check whether --enable-ipc or --disable-ipc was given. if test "${enable_ipc+set}" = set; then @@ -2381,7 +2467,7 @@ fi echo $ac_n "checking "for --enable-apple_ieee"""... $ac_c" 1>&6 -echo "configure:2385: checking "for --enable-apple_ieee"" >&5 +echo "configure:2471: checking "for --enable-apple_ieee"" >&5 no_cache=0 # Check whether --enable-apple_ieee or --disable-apple_ieee was given. if test "${enable_apple_ieee+set}" = set; then @@ -2420,7 +2506,7 @@ fi echo $ac_n "checking "for --enable-timedate"""... $ac_c" 1>&6 -echo "configure:2424: checking "for --enable-timedate"" >&5 +echo "configure:2510: checking "for --enable-timedate"" >&5 no_cache=0 # Check whether --enable-timedate or --disable-timedate was given. if test "${enable_timedate+set}" = set; then @@ -2459,7 +2545,7 @@ fi echo $ac_n "checking "for --enable-wave"""... $ac_c" 1>&6 -echo "configure:2463: checking "for --enable-wave"" >&5 +echo "configure:2549: checking "for --enable-wave"" >&5 no_cache=0 # Check whether --enable-wave or --disable-wave was given. if test "${enable_wave+set}" = set; then @@ -2498,7 +2584,7 @@ fi echo $ac_n "checking "for --enable-fraction"""... $ac_c" 1>&6 -echo "configure:2502: checking "for --enable-fraction"" >&5 +echo "configure:2588: checking "for --enable-fraction"" >&5 no_cache=0 # Check whether --enable-fraction or --disable-fraction was given. if test "${enable_fraction+set}" = set; then @@ -2537,7 +2623,7 @@ fi echo $ac_n "checking "for --enable-dynlib"""... $ac_c" 1>&6 -echo "configure:2541: checking "for --enable-dynlib"" >&5 +echo "configure:2627: checking "for --enable-dynlib"" >&5 no_cache=0 # Check whether --enable-dynlib or --disable-dynlib was given. if test "${enable_dynlib+set}" = set; then @@ -2576,7 +2662,7 @@ fi echo $ac_n "checking "for --enable-longlong"""... $ac_c" 1>&6 -echo "configure:2580: checking "for --enable-longlong"" >&5 +echo "configure:2666: checking "for --enable-longlong"" >&5 no_cache=0 # Check whether --enable-longlong or --disable-longlong was given. if test "${enable_longlong+set}" = set; then @@ -2615,7 +2701,7 @@ fi echo $ac_n "checking "for --enable-log"""... $ac_c" 1>&6 -echo "configure:2619: checking "for --enable-log"" >&5 +echo "configure:2705: checking "for --enable-log"" >&5 no_cache=0 # Check whether --enable-log or --disable-log was given. if test "${enable_log+set}" = set; then @@ -2654,7 +2740,7 @@ fi echo $ac_n "checking "for --enable-streams"""... $ac_c" 1>&6 -echo "configure:2658: checking "for --enable-streams"" >&5 +echo "configure:2744: checking "for --enable-streams"" >&5 no_cache=0 # Check whether --enable-streams or --disable-streams was given. if test "${enable_streams+set}" = set; then @@ -2693,7 +2779,7 @@ fi echo $ac_n "checking "for --enable-file"""... $ac_c" 1>&6 -echo "configure:2697: checking "for --enable-file"" >&5 +echo "configure:2783: checking "for --enable-file"" >&5 no_cache=0 # Check whether --enable-file or --disable-file was given. if test "${enable_file+set}" = set; then @@ -2732,7 +2818,7 @@ fi echo $ac_n "checking "for --enable-textfile"""... $ac_c" 1>&6 -echo "configure:2736: checking "for --enable-textfile"" >&5 +echo "configure:2822: checking "for --enable-textfile"" >&5 no_cache=0 # Check whether --enable-textfile or --disable-textfile was given. if test "${enable_textfile+set}" = set; then @@ -2771,7 +2857,7 @@ fi echo $ac_n "checking "for --enable-unicode"""... $ac_c" 1>&6 -echo "configure:2775: checking "for --enable-unicode"" >&5 +echo "configure:2861: checking "for --enable-unicode"" >&5 no_cache=0 # Check whether --enable-unicode or --disable-unicode was given. if test "${enable_unicode+set}" = set; then @@ -2810,7 +2896,7 @@ fi echo $ac_n "checking "for --enable-wcsrtombs"""... $ac_c" 1>&6 -echo "configure:2814: checking "for --enable-wcsrtombs"" >&5 +echo "configure:2900: checking "for --enable-wcsrtombs"" >&5 no_cache=0 # Check whether --enable-wcsrtombs or --disable-wcsrtombs was given. if test "${enable_wcsrtombs+set}" = set; then @@ -2849,7 +2935,7 @@ fi echo $ac_n "checking "for --enable-wxprintfv"""... $ac_c" 1>&6 -echo "configure:2853: checking "for --enable-wxprintfv"" >&5 +echo "configure:2939: checking "for --enable-wxprintfv"" >&5 no_cache=0 # Check whether --enable-wxprintfv or --disable-wxprintfv was given. if test "${enable_wxprintfv+set}" = set; then @@ -2888,7 +2974,7 @@ fi echo $ac_n "checking "for --enable-joystick"""... $ac_c" 1>&6 -echo "configure:2892: checking "for --enable-joystick"" >&5 +echo "configure:2978: checking "for --enable-joystick"" >&5 no_cache=0 # Check whether --enable-joystick or --disable-joystick was given. if test "${enable_joystick+set}" = set; then @@ -2927,7 +3013,7 @@ fi echo $ac_n "checking "for --enable-std_iostreams"""... $ac_c" 1>&6 -echo "configure:2931: checking "for --enable-std_iostreams"" >&5 +echo "configure:3017: checking "for --enable-std_iostreams"" >&5 no_cache=0 # Check whether --enable-std_iostreams or --disable-std_iostreams was given. if test "${enable_std_iostreams+set}" = set; then @@ -2966,7 +3052,7 @@ fi echo $ac_n "checking "for --enable-fs_inet"""... $ac_c" 1>&6 -echo "configure:2970: checking "for --enable-fs_inet"" >&5 +echo "configure:3056: checking "for --enable-fs_inet"" >&5 no_cache=0 # Check whether --enable-fs_inet or --disable-fs_inet was given. if test "${enable_fs_inet+set}" = set; then @@ -3005,7 +3091,7 @@ fi echo $ac_n "checking "for --enable-fs_zip"""... $ac_c" 1>&6 -echo "configure:3009: checking "for --enable-fs_zip"" >&5 +echo "configure:3095: checking "for --enable-fs_zip"" >&5 no_cache=0 # Check whether --enable-fs_zip or --disable-fs_zip was given. if test "${enable_fs_zip+set}" = set; then @@ -3044,7 +3130,7 @@ fi echo $ac_n "checking "for --enable-zipstream"""... $ac_c" 1>&6 -echo "configure:3048: checking "for --enable-zipstream"" >&5 +echo "configure:3134: checking "for --enable-zipstream"" >&5 no_cache=0 # Check whether --enable-zipstream or --disable-zipstream was given. if test "${enable_zipstream+set}" = set; then @@ -3085,7 +3171,7 @@ fi echo $ac_n "checking "for --enable-threads"""... $ac_c" 1>&6 -echo "configure:3089: checking "for --enable-threads"" >&5 +echo "configure:3175: checking "for --enable-threads"" >&5 no_cache=0 # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then @@ -3124,7 +3210,7 @@ fi echo $ac_n "checking "for --enable-serial"""... $ac_c" 1>&6 -echo "configure:3128: checking "for --enable-serial"" >&5 +echo "configure:3214: checking "for --enable-serial"" >&5 no_cache=0 # Check whether --enable-serial or --disable-serial was given. if test "${enable_serial+set}" = set; then @@ -3165,7 +3251,7 @@ fi echo $ac_n "checking "for --enable-docview"""... $ac_c" 1>&6 -echo "configure:3169: checking "for --enable-docview"" >&5 +echo "configure:3255: checking "for --enable-docview"" >&5 no_cache=0 # Check whether --enable-docview or --disable-docview was given. if test "${enable_docview+set}" = set; then @@ -3204,7 +3290,7 @@ fi echo $ac_n "checking "for --enable-help"""... $ac_c" 1>&6 -echo "configure:3208: checking "for --enable-help"" >&5 +echo "configure:3294: checking "for --enable-help"" >&5 no_cache=0 # Check whether --enable-help or --disable-help was given. if test "${enable_help+set}" = set; then @@ -3243,7 +3329,7 @@ fi echo $ac_n "checking "for --enable-constraints"""... $ac_c" 1>&6 -echo "configure:3247: checking "for --enable-constraints"" >&5 +echo "configure:3333: checking "for --enable-constraints"" >&5 no_cache=0 # Check whether --enable-constraints or --disable-constraints was given. if test "${enable_constraints+set}" = set; then @@ -3282,7 +3368,7 @@ fi echo $ac_n "checking "for --enable-printarch"""... $ac_c" 1>&6 -echo "configure:3286: checking "for --enable-printarch"" >&5 +echo "configure:3372: checking "for --enable-printarch"" >&5 no_cache=0 # Check whether --enable-printarch or --disable-printarch was given. if test "${enable_printarch+set}" = set; then @@ -3321,7 +3407,7 @@ fi echo $ac_n "checking "for --enable-mdi"""... $ac_c" 1>&6 -echo "configure:3325: checking "for --enable-mdi"" >&5 +echo "configure:3411: checking "for --enable-mdi"" >&5 no_cache=0 # Check whether --enable-mdi or --disable-mdi was given. if test "${enable_mdi+set}" = set; then @@ -3361,7 +3447,7 @@ fi echo $ac_n "checking "for --enable-postscript"""... $ac_c" 1>&6 -echo "configure:3365: checking "for --enable-postscript"" >&5 +echo "configure:3451: checking "for --enable-postscript"" >&5 no_cache=0 # Check whether --enable-postscript or --disable-postscript was given. if test "${enable_postscript+set}" = set; then @@ -3402,7 +3488,7 @@ fi echo $ac_n "checking "for --enable-prologio"""... $ac_c" 1>&6 -echo "configure:3406: checking "for --enable-prologio"" >&5 +echo "configure:3492: checking "for --enable-prologio"" >&5 no_cache=0 # Check whether --enable-prologio or --disable-prologio was given. if test "${enable_prologio+set}" = set; then @@ -3441,7 +3527,7 @@ fi echo $ac_n "checking "for --enable-resources"""... $ac_c" 1>&6 -echo "configure:3445: checking "for --enable-resources"" >&5 +echo "configure:3531: checking "for --enable-resources"" >&5 no_cache=0 # Check whether --enable-resources or --disable-resources was given. if test "${enable_resources+set}" = set; then @@ -3481,7 +3567,7 @@ fi echo $ac_n "checking "for --enable-xresources"""... $ac_c" 1>&6 -echo "configure:3485: checking "for --enable-xresources"" >&5 +echo "configure:3571: checking "for --enable-xresources"" >&5 no_cache=0 # Check whether --enable-xresources or --disable-xresources was given. if test "${enable_xresources+set}" = set; then @@ -3522,7 +3608,7 @@ fi echo $ac_n "checking "for --enable-clipboard"""... $ac_c" 1>&6 -echo "configure:3526: checking "for --enable-clipboard"" >&5 +echo "configure:3612: checking "for --enable-clipboard"" >&5 no_cache=0 # Check whether --enable-clipboard or --disable-clipboard was given. if test "${enable_clipboard+set}" = set; then @@ -3561,7 +3647,7 @@ fi echo $ac_n "checking "for --enable-dnd"""... $ac_c" 1>&6 -echo "configure:3565: checking "for --enable-dnd"" >&5 +echo "configure:3651: checking "for --enable-dnd"" >&5 no_cache=0 # Check whether --enable-dnd or --disable-dnd was given. if test "${enable_dnd+set}" = set; then @@ -3601,7 +3687,7 @@ fi echo $ac_n "checking "for --enable-wxtree"""... $ac_c" 1>&6 -echo "configure:3605: checking "for --enable-wxtree"" >&5 +echo "configure:3691: checking "for --enable-wxtree"" >&5 no_cache=0 # Check whether --enable-wxtree or --disable-wxtree was given. if test "${enable_wxtree+set}" = set; then @@ -3642,7 +3728,7 @@ fi echo $ac_n "checking "for --enable-controls"""... $ac_c" 1>&6 -echo "configure:3646: checking "for --enable-controls"" >&5 +echo "configure:3732: checking "for --enable-controls"" >&5 no_cache=0 # Check whether --enable-controls or --disable-controls was given. if test "${enable_controls+set}" = set; then @@ -3742,7 +3828,7 @@ fi echo $ac_n "checking "for --enable-accel"""... $ac_c" 1>&6 -echo "configure:3746: checking "for --enable-accel"" >&5 +echo "configure:3832: checking "for --enable-accel"" >&5 no_cache=0 # Check whether --enable-accel or --disable-accel was given. if test "${enable_accel+set}" = set; then @@ -3781,7 +3867,7 @@ fi echo $ac_n "checking "for --enable-caret"""... $ac_c" 1>&6 -echo "configure:3785: checking "for --enable-caret"" >&5 +echo "configure:3871: checking "for --enable-caret"" >&5 no_cache=0 # Check whether --enable-caret or --disable-caret was given. if test "${enable_caret+set}" = set; then @@ -3820,7 +3906,7 @@ fi echo $ac_n "checking "for --enable-bmpbutton"""... $ac_c" 1>&6 -echo "configure:3824: checking "for --enable-bmpbutton"" >&5 +echo "configure:3910: checking "for --enable-bmpbutton"" >&5 no_cache=0 # Check whether --enable-bmpbutton or --disable-bmpbutton was given. if test "${enable_bmpbutton+set}" = set; then @@ -3859,7 +3945,7 @@ fi echo $ac_n "checking "for --enable-checkbox"""... $ac_c" 1>&6 -echo "configure:3863: checking "for --enable-checkbox"" >&5 +echo "configure:3949: checking "for --enable-checkbox"" >&5 no_cache=0 # Check whether --enable-checkbox or --disable-checkbox was given. if test "${enable_checkbox+set}" = set; then @@ -3898,7 +3984,7 @@ fi echo $ac_n "checking "for --enable-checklst"""... $ac_c" 1>&6 -echo "configure:3902: checking "for --enable-checklst"" >&5 +echo "configure:3988: checking "for --enable-checklst"" >&5 no_cache=0 # Check whether --enable-checklst or --disable-checklst was given. if test "${enable_checklst+set}" = set; then @@ -3937,7 +4023,7 @@ fi echo $ac_n "checking "for --enable-choice"""... $ac_c" 1>&6 -echo "configure:3941: checking "for --enable-choice"" >&5 +echo "configure:4027: checking "for --enable-choice"" >&5 no_cache=0 # Check whether --enable-choice or --disable-choice was given. if test "${enable_choice+set}" = set; then @@ -3976,7 +4062,7 @@ fi echo $ac_n "checking "for --enable-combobox"""... $ac_c" 1>&6 -echo "configure:3980: checking "for --enable-combobox"" >&5 +echo "configure:4066: checking "for --enable-combobox"" >&5 no_cache=0 # Check whether --enable-combobox or --disable-combobox was given. if test "${enable_combobox+set}" = set; then @@ -4015,7 +4101,7 @@ fi echo $ac_n "checking "for --enable-gauge"""... $ac_c" 1>&6 -echo "configure:4019: checking "for --enable-gauge"" >&5 +echo "configure:4105: checking "for --enable-gauge"" >&5 no_cache=0 # Check whether --enable-gauge or --disable-gauge was given. if test "${enable_gauge+set}" = set; then @@ -4054,7 +4140,7 @@ fi echo $ac_n "checking "for --enable-grid"""... $ac_c" 1>&6 -echo "configure:4058: checking "for --enable-grid"" >&5 +echo "configure:4144: checking "for --enable-grid"" >&5 no_cache=0 # Check whether --enable-grid or --disable-grid was given. if test "${enable_grid+set}" = set; then @@ -4093,7 +4179,7 @@ fi echo $ac_n "checking "for --enable-imaglist"""... $ac_c" 1>&6 -echo "configure:4097: checking "for --enable-imaglist"" >&5 +echo "configure:4183: checking "for --enable-imaglist"" >&5 no_cache=0 # Check whether --enable-imaglist or --disable-imaglist was given. if test "${enable_imaglist+set}" = set; then @@ -4132,7 +4218,7 @@ fi echo $ac_n "checking "for --enable-listbox"""... $ac_c" 1>&6 -echo "configure:4136: checking "for --enable-listbox"" >&5 +echo "configure:4222: checking "for --enable-listbox"" >&5 no_cache=0 # Check whether --enable-listbox or --disable-listbox was given. if test "${enable_listbox+set}" = set; then @@ -4171,7 +4257,7 @@ fi echo $ac_n "checking "for --enable-listctrl"""... $ac_c" 1>&6 -echo "configure:4175: checking "for --enable-listctrl"" >&5 +echo "configure:4261: checking "for --enable-listctrl"" >&5 no_cache=0 # Check whether --enable-listctrl or --disable-listctrl was given. if test "${enable_listctrl+set}" = set; then @@ -4210,7 +4296,7 @@ fi echo $ac_n "checking "for --enable-notebook"""... $ac_c" 1>&6 -echo "configure:4214: checking "for --enable-notebook"" >&5 +echo "configure:4300: checking "for --enable-notebook"" >&5 no_cache=0 # Check whether --enable-notebook or --disable-notebook was given. if test "${enable_notebook+set}" = set; then @@ -4249,7 +4335,7 @@ fi echo $ac_n "checking "for --enable-radiobox"""... $ac_c" 1>&6 -echo "configure:4253: checking "for --enable-radiobox"" >&5 +echo "configure:4339: checking "for --enable-radiobox"" >&5 no_cache=0 # Check whether --enable-radiobox or --disable-radiobox was given. if test "${enable_radiobox+set}" = set; then @@ -4288,7 +4374,7 @@ fi echo $ac_n "checking "for --enable-radiobtn"""... $ac_c" 1>&6 -echo "configure:4292: checking "for --enable-radiobtn"" >&5 +echo "configure:4378: checking "for --enable-radiobtn"" >&5 no_cache=0 # Check whether --enable-radiobtn or --disable-radiobtn was given. if test "${enable_radiobtn+set}" = set; then @@ -4327,7 +4413,7 @@ fi echo $ac_n "checking "for --enable-sash"""... $ac_c" 1>&6 -echo "configure:4331: checking "for --enable-sash"" >&5 +echo "configure:4417: checking "for --enable-sash"" >&5 no_cache=0 # Check whether --enable-sash or --disable-sash was given. if test "${enable_sash+set}" = set; then @@ -4366,7 +4452,7 @@ fi echo $ac_n "checking "for --enable-scrollbar"""... $ac_c" 1>&6 -echo "configure:4370: checking "for --enable-scrollbar"" >&5 +echo "configure:4456: checking "for --enable-scrollbar"" >&5 no_cache=0 # Check whether --enable-scrollbar or --disable-scrollbar was given. if test "${enable_scrollbar+set}" = set; then @@ -4405,7 +4491,7 @@ fi echo $ac_n "checking "for --enable-slider"""... $ac_c" 1>&6 -echo "configure:4409: checking "for --enable-slider"" >&5 +echo "configure:4495: checking "for --enable-slider"" >&5 no_cache=0 # Check whether --enable-slider or --disable-slider was given. if test "${enable_slider+set}" = set; then @@ -4444,7 +4530,7 @@ fi echo $ac_n "checking "for --enable-spinbtn"""... $ac_c" 1>&6 -echo "configure:4448: checking "for --enable-spinbtn"" >&5 +echo "configure:4534: checking "for --enable-spinbtn"" >&5 no_cache=0 # Check whether --enable-spinbtn or --disable-spinbtn was given. if test "${enable_spinbtn+set}" = set; then @@ -4483,7 +4569,7 @@ fi echo $ac_n "checking "for --enable-splitter"""... $ac_c" 1>&6 -echo "configure:4487: checking "for --enable-splitter"" >&5 +echo "configure:4573: checking "for --enable-splitter"" >&5 no_cache=0 # Check whether --enable-splitter or --disable-splitter was given. if test "${enable_splitter+set}" = set; then @@ -4522,7 +4608,7 @@ fi echo $ac_n "checking "for --enable-statbmp"""... $ac_c" 1>&6 -echo "configure:4526: checking "for --enable-statbmp"" >&5 +echo "configure:4612: checking "for --enable-statbmp"" >&5 no_cache=0 # Check whether --enable-statbmp or --disable-statbmp was given. if test "${enable_statbmp+set}" = set; then @@ -4561,7 +4647,7 @@ fi echo $ac_n "checking "for --enable-statbox"""... $ac_c" 1>&6 -echo "configure:4565: checking "for --enable-statbox"" >&5 +echo "configure:4651: checking "for --enable-statbox"" >&5 no_cache=0 # Check whether --enable-statbox or --disable-statbox was given. if test "${enable_statbox+set}" = set; then @@ -4600,7 +4686,7 @@ fi echo $ac_n "checking "for --enable-statline"""... $ac_c" 1>&6 -echo "configure:4604: checking "for --enable-statline"" >&5 +echo "configure:4690: checking "for --enable-statline"" >&5 no_cache=0 # Check whether --enable-statline or --disable-statline was given. if test "${enable_statline+set}" = set; then @@ -4639,7 +4725,7 @@ fi echo $ac_n "checking "for --enable-statusbar"""... $ac_c" 1>&6 -echo "configure:4643: checking "for --enable-statusbar"" >&5 +echo "configure:4729: checking "for --enable-statusbar"" >&5 no_cache=0 # Check whether --enable-statusbar or --disable-statusbar was given. if test "${enable_statusbar+set}" = set; then @@ -4678,7 +4764,7 @@ fi echo $ac_n "checking "for --enable-tabdialog"""... $ac_c" 1>&6 -echo "configure:4682: checking "for --enable-tabdialog"" >&5 +echo "configure:4768: checking "for --enable-tabdialog"" >&5 no_cache=0 # Check whether --enable-tabdialog or --disable-tabdialog was given. if test "${enable_tabdialog+set}" = set; then @@ -4717,7 +4803,7 @@ fi echo $ac_n "checking "for --enable-toolbar"""... $ac_c" 1>&6 -echo "configure:4721: checking "for --enable-toolbar"" >&5 +echo "configure:4807: checking "for --enable-toolbar"" >&5 no_cache=0 # Check whether --enable-toolbar or --disable-toolbar was given. if test "${enable_toolbar+set}" = set; then @@ -4756,7 +4842,7 @@ fi echo $ac_n "checking "for --enable-treectrl"""... $ac_c" 1>&6 -echo "configure:4760: checking "for --enable-treectrl"" >&5 +echo "configure:4846: checking "for --enable-treectrl"" >&5 no_cache=0 # Check whether --enable-treectrl or --disable-treectrl was given. if test "${enable_treectrl+set}" = set; then @@ -4797,7 +4883,7 @@ fi echo $ac_n "checking "for --enable-commondlg"""... $ac_c" 1>&6 -echo "configure:4801: checking "for --enable-commondlg"" >&5 +echo "configure:4887: checking "for --enable-commondlg"" >&5 no_cache=0 # Check whether --enable-commondlg or --disable-commondlg was given. if test "${enable_commondlg+set}" = set; then @@ -4836,7 +4922,7 @@ fi echo $ac_n "checking "for --enable-dirdlg"""... $ac_c" 1>&6 -echo "configure:4840: checking "for --enable-dirdlg"" >&5 +echo "configure:4926: checking "for --enable-dirdlg"" >&5 no_cache=0 # Check whether --enable-dirdlg or --disable-dirdlg was given. if test "${enable_dirdlg+set}" = set; then @@ -4875,7 +4961,7 @@ fi echo $ac_n "checking "for --enable-textdlg"""... $ac_c" 1>&6 -echo "configure:4879: checking "for --enable-textdlg"" >&5 +echo "configure:4965: checking "for --enable-textdlg"" >&5 no_cache=0 # Check whether --enable-textdlg or --disable-textdlg was given. if test "${enable_textdlg+set}" = set; then @@ -4914,7 +5000,7 @@ fi echo $ac_n "checking "for --enable-tipdlg"""... $ac_c" 1>&6 -echo "configure:4918: checking "for --enable-tipdlg"" >&5 +echo "configure:5004: checking "for --enable-tipdlg"" >&5 no_cache=0 # Check whether --enable-tipdlg or --disable-tipdlg was given. if test "${enable_tipdlg+set}" = set; then @@ -4953,7 +5039,7 @@ fi echo $ac_n "checking "for --enable-progressdlg"""... $ac_c" 1>&6 -echo "configure:4957: checking "for --enable-progressdlg"" >&5 +echo "configure:5043: checking "for --enable-progressdlg"" >&5 no_cache=0 # Check whether --enable-progressdlg or --disable-progressdlg was given. if test "${enable_progressdlg+set}" = set; then @@ -4992,7 +5078,7 @@ fi echo $ac_n "checking "for --enable-miniframe"""... $ac_c" 1>&6 -echo "configure:4996: checking "for --enable-miniframe"" >&5 +echo "configure:5082: checking "for --enable-miniframe"" >&5 no_cache=0 # Check whether --enable-miniframe or --disable-miniframe was given. if test "${enable_miniframe+set}" = set; then @@ -5031,7 +5117,7 @@ fi echo $ac_n "checking "for --enable-html"""... $ac_c" 1>&6 -echo "configure:5035: checking "for --enable-html"" >&5 +echo "configure:5121: checking "for --enable-html"" >&5 no_cache=0 # Check whether --enable-html or --disable-html was given. if test "${enable_html+set}" = set; then @@ -5070,7 +5156,7 @@ fi echo $ac_n "checking "for --enable-tooltips"""... $ac_c" 1>&6 -echo "configure:5074: checking "for --enable-tooltips"" >&5 +echo "configure:5160: checking "for --enable-tooltips"" >&5 no_cache=0 # Check whether --enable-tooltips or --disable-tooltips was given. if test "${enable_tooltips+set}" = set; then @@ -5109,7 +5195,7 @@ fi echo $ac_n "checking "for --enable-splines"""... $ac_c" 1>&6 -echo "configure:5113: checking "for --enable-splines"" >&5 +echo "configure:5199: checking "for --enable-splines"" >&5 no_cache=0 # Check whether --enable-splines or --disable-splines was given. if test "${enable_splines+set}" = set; then @@ -5148,7 +5234,7 @@ fi echo $ac_n "checking "for --enable-validators"""... $ac_c" 1>&6 -echo "configure:5152: checking "for --enable-validators"" >&5 +echo "configure:5238: checking "for --enable-validators"" >&5 no_cache=0 # Check whether --enable-validators or --disable-validators was given. if test "${enable_validators+set}" = set; then @@ -5187,7 +5273,7 @@ fi echo $ac_n "checking "for --enable-busyinfo"""... $ac_c" 1>&6 -echo "configure:5191: checking "for --enable-busyinfo"" >&5 +echo "configure:5277: checking "for --enable-busyinfo"" >&5 no_cache=0 # Check whether --enable-busyinfo or --disable-busyinfo was given. if test "${enable_busyinfo+set}" = set; then @@ -5232,7 +5318,7 @@ fi echo $ac_n "checking for toolkit""... $ac_c" 1>&6 -echo "configure:5236: checking for toolkit" >&5 +echo "configure:5322: checking for toolkit" >&5 if test "$TOOLKIT_GIVEN" = 1; then for toolkit in `echo $ALL_TOOLKITS`; do @@ -5343,7 +5429,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5347: checking for $ac_word" >&5 +echo "configure:5433: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5373,7 +5459,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5377: checking for $ac_word" >&5 +echo "configure:5463: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5424,7 +5510,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5428: checking for $ac_word" >&5 +echo "configure:5514: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5456,7 +5542,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:5460: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:5546: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -5467,12 +5553,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 5471 "configure" +#line 5557 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:5476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -5498,12 +5584,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:5502: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:5588: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:5507: checking whether we are using GNU C" >&5 +echo "configure:5593: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5512,7 +5598,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:5516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:5602: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -5531,7 +5617,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:5535: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:5621: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5566,7 +5652,7 @@ fi CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'` echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:5570: checking how to run the C preprocessor" >&5 +echo "configure:5656: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -5581,13 +5667,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5677: \"$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 : @@ -5598,13 +5684,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5694: \"$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 : @@ -5615,13 +5701,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5711: \"$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 : @@ -5648,13 +5734,13 @@ echo "$ac_t""$CPP" 1>&6 if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:5652: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:5738: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -5672,7 +5758,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -5708,7 +5794,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5712: checking for $ac_word" >&5 +echo "configure:5798: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5740,7 +5826,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:5744: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:5830: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -5751,12 +5837,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 5755 "configure" +#line 5841 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:5760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -5782,12 +5868,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:5786: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:5872: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:5791: checking whether we are using GNU C++" >&5 +echo "configure:5877: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5796,7 +5882,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:5800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:5886: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -5815,7 +5901,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:5819: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:5905: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5848,7 +5934,7 @@ fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:5852: checking how to run the C++ preprocessor" >&5 +echo "configure:5938: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5861,12 +5947,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5956: \"$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 : @@ -5904,7 +5990,7 @@ cross_compiling=$ac_cv_prog_cc_cross # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5908: checking for $ac_word" >&5 +echo "configure:5994: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5935,7 +6021,7 @@ fi # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5939: checking for $ac_word" >&5 +echo "configure:6025: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5975,7 +6061,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:5979: checking for a BSD compatible install" >&5 +echo "configure:6065: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6031,7 +6117,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6035: checking for $ac_word" >&5 +echo "configure:6121: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6060,7 +6146,7 @@ fi echo $ac_n "checking "make for VPATH support"""... $ac_c" 1>&6 -echo "configure:6064: checking "make for VPATH support"" >&5 +echo "configure:6150: checking "make for VPATH support"" >&5 cat - << EOF > confMake check : file cp \$? \$@ @@ -6089,7 +6175,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6093: checking for $ac_word" >&5 +echo "configure:6179: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6123,7 +6209,7 @@ test -n "$YACC" || YACC="yacc" # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6127: checking for $ac_word" >&5 +echo "configure:6213: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6157,7 +6243,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:6161: checking for yywrap in -l$ac_lib" >&5 +echo "configure:6247: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6165,7 +6251,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6266: \"$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 @@ -6200,7 +6286,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:6204: checking whether ln -s works" >&5 +echo "configure:6290: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6354,7 +6440,7 @@ WXWINE= if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then echo $ac_n "checking for Windows headers""... $ac_c" 1>&6 -echo "configure:6358: checking for Windows headers" >&5 +echo "configure:6444: checking for Windows headers" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -6407,7 +6493,7 @@ if test "$wxUSE_GTK" = 1; then # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6411: checking for $ac_word" >&5 +echo "configure:6497: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6442,7 +6528,7 @@ fi min_gtk_version=1.2.0 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:6446: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:6532: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" != "no" ; then GTK_CFLAGS=`$GTK_CONFIG --cflags` @@ -6455,7 +6541,7 @@ echo "configure:6446: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -6479,7 +6565,7 @@ main () } EOF -if { (eval echo configure:6483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -6526,7 +6612,7 @@ fi # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6530: checking for $ac_word" >&5 +echo "configure:6616: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6561,7 +6647,7 @@ fi min_gtk_version=1.0.0 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:6565: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:6651: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" != "no" ; then GTK_CFLAGS=`$GTK_CONFIG --cflags` @@ -6574,7 +6660,7 @@ echo "configure:6565: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -6598,7 +6684,7 @@ main () } EOF -if { (eval echo configure:6602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -6633,17 +6719,20 @@ fi GUI_TK_LIBRARY="$GTK_LIBS -ldl" TOOLKIT=GTK - GUIOBJS=GTK_GUIOBJS GUIHEADERS=GTK_HEADERS + GUIOBJS=GTK_GUIOBJS COMMONOBJS=GTK_COMMONOBJS GENERICOBJS=GTK_GENERICOBJS + GUIDEPS=GTK_GUIDEPS + COMMONDEPS=GTK_COMMONDEPS + GENERICDEPS=GTK_GENERICDEPS UNIXOBJS=UNIXOBJS GUIDIST=GTK_DIST fi if test "$wxUSE_WINE" = 1; then echo $ac_n "checking for WINE includes""... $ac_c" 1>&6 -echo "configure:6647: checking for WINE includes" >&5 +echo "configure:6736: checking for WINE includes" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -6664,7 +6753,7 @@ for ac_dir in $SEARCH_INCLUDE; XPM_LINK="" echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:6668: checking for Xpm library" >&5 +echo "configure:6757: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -6692,7 +6781,7 @@ EOF MESA_LINK="" echo $ac_n "checking for Mesa library""... $ac_c" 1>&6 -echo "configure:6696: checking for Mesa library" >&5 +echo "configure:6785: checking for Mesa library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -6718,10 +6807,13 @@ for ac_dir in $SEARCH_LIB; WXWINE=1 TOOLKIT=MSW - GUIOBJS=MSW_GUIOBJS GUIHEADERS=MSW_HEADERS + GUIOBJS=MSW_GUIOBJS COMMONOBJS=MSW_COMMONOBJS GENERICOBJS=MSW_GENERICOBJS + GUIDEPS=MSW_GUIDEPS + COMMONDEPS=MSW_COMMONDEPS + GENERICDEPS=MSW_GENERICDEPS UNIXOBJS=UNIXOBJS GUIDIST=MSW_DIST fi @@ -6732,7 +6824,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:6736: checking for X" >&5 +echo "configure:6828: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -6794,12 +6886,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:6803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6895: \"$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* @@ -6868,14 +6960,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:6971: \"$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. @@ -6981,17 +7073,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:6985: checking whether -R must be followed by a space" >&5 +echo "configure:7077: 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:7087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -7007,14 +7099,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:7110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -7046,7 +7138,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:7050: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:7142: 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 @@ -7054,7 +7146,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:7161: \"$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 @@ -7087,7 +7179,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:7091: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:7183: 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 @@ -7095,7 +7187,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:7202: \"$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 @@ -7135,12 +7227,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:7139: checking for gethostbyname" >&5 +echo "configure:7231: 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:7260: \"$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 @@ -7185,7 +7277,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:7189: checking for gethostbyname in -lnsl" >&5 +echo "configure:7281: 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 @@ -7193,7 +7285,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:7300: \"$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 @@ -7234,12 +7326,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:7238: checking for connect" >&5 +echo "configure:7330: 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:7359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -7284,7 +7376,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:7288: checking for connect in -lsocket" >&5 +echo "configure:7380: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7292,7 +7384,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7399: \"$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 @@ -7327,12 +7419,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:7331: checking for remove" >&5 +echo "configure:7423: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+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:7452: \"$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 @@ -7377,7 +7469,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:7381: checking for remove in -lposix" >&5 +echo "configure:7473: 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 @@ -7385,7 +7477,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:7492: \"$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 @@ -7420,12 +7512,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:7424: checking for shmat" >&5 +echo "configure:7516: 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:7545: \"$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 @@ -7470,7 +7562,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:7474: checking for shmat in -lipc" >&5 +echo "configure:7566: 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 @@ -7478,7 +7570,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:7585: \"$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 @@ -7522,7 +7614,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:7526: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:7618: 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 @@ -7530,7 +7622,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:7637: \"$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 @@ -7574,7 +7666,7 @@ fi GUI_TK_LIBRARY="$X_LIBS" echo $ac_n "checking for Motif/Lesstif includes""... $ac_c" 1>&6 -echo "configure:7578: checking for Motif/Lesstif includes" >&5 +echo "configure:7670: checking for Motif/Lesstif includes" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -7593,7 +7685,7 @@ for ac_dir in $SEARCH_INCLUDE; fi echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6 -echo "configure:7597: checking for Motif/Lesstif library" >&5 +echo "configure:7689: checking for Motif/Lesstif library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -7636,7 +7728,7 @@ for ac_dir in $SEARCH_LIB; fi echo $ac_n "checking for Xt library""... $ac_c" 1>&6 -echo "configure:7640: checking for Xt library" >&5 +echo "configure:7732: checking for Xt library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -7668,7 +7760,7 @@ for ac_dir in $SEARCH_LIB; XPM_LINK="" echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:7672: checking for Xpm library" >&5 +echo "configure:7764: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -7707,10 +7799,13 @@ EOF GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" TOOLKIT=MOTIF - GUIOBJS=MOTIF_GUIOBJS GUIHEADERS=MOTIF_HEADERS + GUIOBJS=MOTIF_GUIOBJS COMMONOBJS=MOTIF_COMMONOBJS GENERICOBJS=MOTIF_GENERICOBJS + GUIDEPS=MOTIF_GUIDEPS + COMMONDEPS=MOTIF_COMMONDEPS + GENERICDEPS=MOTIF_GENERICDEPS UNIXOBJS=UNIXOBJS GUIDIST=MOTIF_DIST fi @@ -7825,17 +7920,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:7829: checking for $ac_hdr" >&5 +echo "configure:7924: 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:7839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7934: \"$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* @@ -7865,17 +7960,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:7869: checking for $ac_hdr" >&5 +echo "configure:7964: 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:7879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7974: \"$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* @@ -7905,17 +8000,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:7909: checking for $ac_hdr" >&5 +echo "configure:8004: 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:7919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8014: \"$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* @@ -7945,17 +8040,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:7949: checking for $ac_hdr" >&5 +echo "configure:8044: 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:7959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8054: \"$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* @@ -7985,17 +8080,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:7989: checking for $ac_hdr" >&5 +echo "configure:8084: 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:7999: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8094: \"$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* @@ -8025,17 +8120,17 @@ for ac_hdr in X11/XKBlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8029: checking for $ac_hdr" >&5 +echo "configure:8124: 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:8039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8134: \"$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* @@ -8064,12 +8159,12 @@ done echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:8068: checking for ANSI C header files" >&5 +echo "configure:8163: 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 @@ -8077,7 +8172,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8176: \"$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* @@ -8094,7 +8189,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 @@ -8112,7 +8207,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 @@ -8133,7 +8228,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -8144,7 +8239,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:8148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -8168,12 +8263,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:8172: checking for mode_t" >&5 +echo "configure:8267: 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 @@ -8201,12 +8296,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:8205: checking for off_t" >&5 +echo "configure:8300: 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 @@ -8234,12 +8329,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:8238: checking for pid_t" >&5 +echo "configure:8333: 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 @@ -8267,12 +8362,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:8271: checking for size_t" >&5 +echo "configure:8366: 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 @@ -8300,12 +8395,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:8304: checking for uid_t in sys/types.h" >&5 +echo "configure:8399: 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 @@ -8337,12 +8432,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:8341: checking for working const" >&5 +echo "configure:8436: 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:8490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -8412,21 +8507,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:8416: checking for inline" >&5 +echo "configure:8511: 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:8525: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -8453,7 +8548,7 @@ esac echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:8457: checking size of char" >&5 +echo "configure:8552: 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 @@ -8461,7 +8556,7 @@ else ac_cv_sizeof_char=1 else cat > conftest.$ac_ext < main() @@ -8472,7 +8567,7 @@ main() exit(0); } EOF -if { (eval echo configure:8476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8571: \"$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 @@ -8492,7 +8587,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:8496: checking size of short" >&5 +echo "configure:8591: 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 @@ -8500,7 +8595,7 @@ else ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < main() @@ -8511,7 +8606,7 @@ main() exit(0); } EOF -if { (eval echo configure:8515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8610: \"$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 @@ -8531,7 +8626,7 @@ EOF echo $ac_n "checking size of int *""... $ac_c" 1>&6 -echo "configure:8535: checking size of int *" >&5 +echo "configure:8630: 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 @@ -8539,7 +8634,7 @@ else ac_cv_sizeof_int_p=4 else cat > conftest.$ac_ext < main() @@ -8550,7 +8645,7 @@ main() exit(0); } EOF -if { (eval echo configure:8554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8649: \"$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 @@ -8570,7 +8665,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:8574: checking size of int" >&5 +echo "configure:8669: 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 @@ -8578,7 +8673,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < main() @@ -8589,7 +8684,7 @@ main() exit(0); } EOF -if { (eval echo configure:8593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8688: \"$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 @@ -8609,7 +8704,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:8613: checking size of long" >&5 +echo "configure:8708: 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 @@ -8617,7 +8712,7 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < main() @@ -8628,7 +8723,7 @@ main() exit(0); } EOF -if { (eval echo configure:8632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8727: \"$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 @@ -8648,7 +8743,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:8652: checking size of long long" >&5 +echo "configure:8747: 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 @@ -8656,7 +8751,7 @@ else ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext < main() @@ -8667,7 +8762,7 @@ main() exit(0); } EOF -if { (eval echo configure:8671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8766: \"$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 @@ -8688,14 +8783,14 @@ EOF echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:8692: checking whether byte ordering is bigendian" >&5 +echo "configure:8787: 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 @@ -8706,11 +8801,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:8710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8805: \"$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 @@ -8721,7 +8816,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:8725: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -8741,7 +8836,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:8853: \"$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 @@ -8801,17 +8896,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:8805: checking for $ac_hdr" >&5 +echo "configure:8900: 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:8815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8910: \"$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* @@ -8859,7 +8954,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6 -echo "configure:8863: checking if C++ compiler supports bool" >&5 +echo "configure:8958: 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 @@ -8874,7 +8969,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -8928,7 +9023,7 @@ EOF echo $ac_n "checking if size_t and int are different types""... $ac_c" 1>&6 -echo "configure:8932: checking if size_t and int are different types" >&5 +echo "configure:9027: checking if size_t and int are different types" >&5 if eval "test \"`echo '$''{'wx_cv_cpp_sizet_not_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8947,7 +9042,7 @@ cross_compiling=$ac_cv_prog_cxx_cross 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:9076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define wxUSE_SIZE_T_STRING_OPERATOR 1 @@ -9008,13 +9103,13 @@ echo "$ac_t""$wx_cv_cpp_sizet_not_int" 1>&6 echo $ac_n "checking if you need GNU extensions""... $ac_c" 1>&6 -echo "configure:9012: checking if you need GNU extensions" >&5 +echo "configure:9107: 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() { @@ -9027,7 +9122,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9126: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_gnu_extensions=yes else @@ -9052,7 +9147,7 @@ fi echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6 -echo "configure:9056: checking for wcslen in -lc" >&5 +echo "configure:9151: 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 @@ -9060,7 +9155,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:9170: \"$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 @@ -9097,7 +9192,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6 -echo "configure:9101: checking for wcslen in -lw" >&5 +echo "configure:9196: 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 @@ -9105,7 +9200,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:9215: \"$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 @@ -9147,12 +9242,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:9151: checking for vprintf" >&5 +echo "configure:9246: 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:9275: \"$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 @@ -9200,12 +9295,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:9204: checking for _doprnt" >&5 +echo "configure:9299: 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:9328: \"$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 @@ -9257,12 +9352,12 @@ fi for ac_func in vsnprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9261: checking for $ac_func" >&5 +echo "configure:9356: 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:9385: \"$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 @@ -9326,7 +9421,7 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for vsscanf""... $ac_c" 1>&6 -echo "configure:9330: checking for vsscanf" >&5 +echo "configure:9425: checking for vsscanf" >&5 if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9336,7 +9431,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:9462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF @@ -9397,12 +9492,12 @@ cross_compiling=$ac_cv_prog_cc_cross for ac_func in vfork do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9401: checking for $ac_func" >&5 +echo "configure:9496: 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:9525: \"$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 @@ -9455,12 +9550,12 @@ POSIX4_LINK= for ac_func in nanosleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9459: checking for $ac_func" >&5 +echo "configure:9554: 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:9583: \"$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 @@ -9509,7 +9604,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 -echo "configure:9513: checking for nanosleep in -lposix4" >&5 +echo "configure:9608: 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 @@ -9517,7 +9612,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:9627: \"$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 @@ -9556,12 +9651,12 @@ else for ac_func in usleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9560: checking for $ac_func" >&5 +echo "configure:9655: 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:9684: \"$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 @@ -9624,12 +9719,12 @@ done for ac_func in uname gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9628: checking for $ac_func" >&5 +echo "configure:9723: 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:9752: \"$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 @@ -9681,12 +9776,12 @@ done for ac_func in inet_addr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9685: checking for $ac_func" >&5 +echo "configure:9780: 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:9809: \"$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 @@ -9737,12 +9832,12 @@ done for ac_func in inet_aton do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9741: checking for $ac_func" >&5 +echo "configure:9836: 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:9865: \"$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 @@ -9791,7 +9886,7 @@ fi done echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 -echo "configure:9795: checking for inet_aton in -lresolv" >&5 +echo "configure:9890: checking for inet_aton in -lresolv" >&5 ac_lib_var=`echo resolv'_'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 @@ -9799,7 +9894,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9909: \"$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 @@ -9904,7 +9999,7 @@ fi if test "$wxUSE_THREADS" = "yes" ; then echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:9908: checking for pthread_create in -lpthread" >&5 +echo "configure:10003: 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 @@ -9912,7 +10007,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:10022: \"$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 @@ -9946,7 +10041,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:9950: checking for pthread_create in -lc_r" >&5 +echo "configure:10045: 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 @@ -9954,7 +10049,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:10064: \"$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 @@ -9989,17 +10084,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:9993: checking for sys/prctl.h" >&5 +echo "configure:10088: 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:10003: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10098: \"$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* @@ -10041,17 +10136,17 @@ if test "$wxUSE_THREADS" = "yes" ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10045: checking for $ac_hdr" >&5 +echo "configure:10140: 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:10055: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10150: \"$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* @@ -10079,7 +10174,7 @@ done echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:10083: checking for sched_yield in -l$THREADS_LINK" >&5 +echo "configure:10178: 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 @@ -10087,7 +10182,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:10197: \"$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 @@ -10120,7 +10215,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:10124: checking for sched_yield in -l"posix4"" >&5 +echo "configure:10219: 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 @@ -10128,7 +10223,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:10238: \"$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 @@ -10169,7 +10264,7 @@ fi echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:10173: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5 +echo "configure:10268: 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 @@ -10177,7 +10272,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:10287: \"$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 @@ -10210,7 +10305,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:10214: checking for pthread_attr_getschedpolicy in -l"posix4"" >&5 +echo "configure:10309: 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 @@ -10218,7 +10313,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:10328: \"$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 @@ -10259,7 +10354,7 @@ fi echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:10263: checking for pthread_cancel in -l$THREADS_LINK" >&5 +echo "configure:10358: 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 @@ -10267,7 +10362,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:10377: \"$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 @@ -10304,13 +10399,13 @@ fi echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6 -echo "configure:10308: checking for pthread_cleanup_push/pop" >&5 +echo "configure:10403: 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() { @@ -10320,7 +10415,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_pthread_cleanup_push=yes @@ -10376,16 +10471,17 @@ if test "$wxUSE_CYGWIN" = 1 ; then fi WXDEBUG= -if test "$wxUSE_DEBUG_GDB" = "yes" ; then - wxUSE_DEBUG_INFO=yes - WXDEBUG="-ggdb" -fi if test "$wxUSE_DEBUG_INFO" = "yes" ; then WXDEBUG="-g" wxUSE_OPTIMISE=no fi +if test "$wxUSE_DEBUG_GDB" = "yes" ; then + wxUSE_DEBUG_INFO=yes + WXDEBUG="-ggdb" +fi + if test "$wxUSE_DEBUG_FLAG" = "yes" ; then cat >> confdefs.h <<\EOF #define WXDEBUG 1 @@ -10419,6 +10515,7 @@ if test "$wxUSE_PROFILE" = "yes" ; then PROFILE="-pg" fi +DEP_INFO_FLAGS= if test "$GCC" = yes ; then if test "$wxUSE_NO_RTTI" = "yes" ; then WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-rtti" @@ -10426,6 +10523,13 @@ if test "$GCC" = yes ; then if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-exceptions" fi + if test "$wxUSE_PERMISSIVE" = "yes" ; then + CFLAGS="${CFLAGS} -fpermissive" + CXXFLAGS="${CXXFLAGS} -fpermissive" + fi + if test "$wxUSE_NO_DEPS" = "no" ; then + DEP_INFO_FLAGS="-MMD" + fi fi @@ -10485,17 +10589,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:10489: checking for GL/gl.h" >&5 +echo "configure:10593: 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:10499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10603: \"$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* @@ -10513,7 +10617,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:10517: checking for glInitNames in -lGL" >&5 +echo "configure:10621: 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 @@ -10521,7 +10625,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:10640: \"$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 @@ -10559,7 +10663,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for glInitNames in -lMesaGL""... $ac_c" 1>&6 -echo "configure:10563: checking for glInitNames in -lMesaGL" >&5 +echo "configure:10667: 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 @@ -10567,7 +10671,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:10686: \"$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 @@ -10792,16 +10896,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:10796: checking the type of the third argument of getsockname" >&5 +echo "configure:10900: checking the type of the third argument of getsockname" >&5 cat > conftest.$ac_ext < int main() { socklen_t len; getsockname(0, NULL, &len); ; return 0; } EOF -if { (eval echo configure:10805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10909: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SOCKLEN_T socklen_t @@ -10812,14 +10916,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { size_t len; getsockname(0, NULL, &len); ; return 0; } EOF -if { (eval echo configure:10823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SOCKLEN_T size_t @@ -10830,14 +10934,14 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { int len; getsockname(0, NULL, &len); ; return 0; } EOF -if { (eval echo configure:10841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define SOCKLEN_T int @@ -10872,17 +10976,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:10876: checking for $ac_hdr" >&5 +echo "configure:10980: 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:10886: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10990: \"$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* @@ -10924,12 +11028,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:10928: checking for $ac_func" >&5 +echo "configure:11032: 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:11061: \"$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 @@ -10978,7 +11082,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:10982: checking for dlopen in -ldl" >&5 +echo "configure:11086: 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 @@ -10986,7 +11090,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:11105: \"$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 @@ -11026,12 +11130,12 @@ done for ac_func in shl_load do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11030: checking for $ac_func" >&5 +echo "configure:11134: 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:11163: \"$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 @@ -11645,13 +11749,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:11655: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:11763: 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 @@ -11916,15 +12024,19 @@ s%@WX_CREATE_LINKS@%$WX_CREATE_LINKS%g s%@WX_CREATE_INSTALLED_LINKS@%$WX_CREATE_INSTALLED_LINKS%g s%@SHARED_LD@%$SHARED_LD%g s%@PIC_FLAG@%$PIC_FLAG%g +s%@DEP_INFO_FLAGS@%$DEP_INFO_FLAGS%g s%@WXDEBUG_DEFINE@%$WXDEBUG_DEFINE%g s%@TOOLKIT@%$TOOLKIT%g s%@TOOLKIT_DEF@%$TOOLKIT_DEF%g s%@TOOLKIT_DIR@%$TOOLKIT_DIR%g s%@TOOLKIT_INCLUDE@%$TOOLKIT_INCLUDE%g -s%@GUIOBJS@%$GUIOBJS%g s%@GUIHEADERS@%$GUIHEADERS%g +s%@GUIOBJS@%$GUIOBJS%g s%@COMMONOBJS@%$COMMONOBJS%g s%@GENERICOBJS@%$GENERICOBJS%g +s%@GUIDEPS@%$GUIDEPS%g +s%@COMMONDEPS@%$COMMONDEPS%g +s%@GENERICDEPS@%$GENERICDEPS%g s%@UNIXOBJS@%$UNIXOBJS%g s%@GUIDIST@%$GUIDIST%g s%@SRC_SUBDIRS@%$SRC_SUBDIRS%g diff --git a/configure.in b/configure.in index 9408a84b11..2bc64ebdfc 100644 --- a/configure.in +++ b/configure.in @@ -641,8 +641,10 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_SHARED=yes DEFAULT_wxUSE_OPTIMISE=yes DEFAULT_wxUSE_PROFILE=no + DEFAULT_wxUSE_NO_DEPS=no DEFAULT_wxUSE_NO_RTTI=no DEFAULT_wxUSE_NO_EXCEPTIONS=no + DEFAULT_wxUSE_PERMISSIVE=no DEFAULT_wxUSE_DEBUG_FLAG=yes DEFAULT_wxUSE_DEBUG_INFO=yes DEFAULT_wxUSE_DEBUG_GDB=yes @@ -746,8 +748,10 @@ else DEFAULT_wxUSE_SHARED=yes DEFAULT_wxUSE_OPTIMISE=yes DEFAULT_wxUSE_PROFILE=no + DEFAULT_wxUSE_NO_DEPS=no DEFAULT_wxUSE_NO_RTTI=no DEFAULT_wxUSE_NO_EXCEPTIONS=no + DEFAULT_wxUSE_PERMISSIVE=no DEFAULT_wxUSE_DEBUG_FLAG=no DEFAULT_wxUSE_DEBUG_INFO=no DEFAULT_wxUSE_DEBUG_GDB=no @@ -913,6 +917,8 @@ WX_ARG_ENABLE(mem_tracing, [ --enable-mem_tracing create code with memory WX_ARG_ENABLE(profile, [ --enable-profile create code with profiling information], wxUSE_PROFILE) WX_ARG_ENABLE(no_rtti, [ --enable-no_rtti create code without RTTI information], wxUSE_NO_RTTI) WX_ARG_ENABLE(no_exceptions, [ --enable-no_exceptions create code without exceptions information], wxUSE_NO_EXCEPTIONS) +WX_ARG_ENABLE(permissive, [ --enable-permissive compile code disregarding strict ANSI], wxUSE_PERMISSIVE) +WX_ARG_ENABLE(no_deps, [ --enable-no_deps create code without dependency information], wxUSE_NO_DEPS) dnl --------------------------------------------------------------------------- dnl --disable-gui will build only non-GUI part of wxWindows @@ -1419,10 +1425,13 @@ if test "$wxUSE_GTK" = 1; then GUI_TK_LIBRARY="$GTK_LIBS -ldl" TOOLKIT=GTK - GUIOBJS=GTK_GUIOBJS GUIHEADERS=GTK_HEADERS + GUIOBJS=GTK_GUIOBJS COMMONOBJS=GTK_COMMONOBJS GENERICOBJS=GTK_GENERICOBJS + GUIDEPS=GTK_GUIDEPS + COMMONDEPS=GTK_COMMONDEPS + GENERICDEPS=GTK_GENERICDEPS UNIXOBJS=UNIXOBJS GUIDIST=GTK_DIST fi @@ -1467,10 +1476,13 @@ if test "$wxUSE_WINE" = 1; then WXWINE=1 TOOLKIT=MSW - GUIOBJS=MSW_GUIOBJS GUIHEADERS=MSW_HEADERS + GUIOBJS=MSW_GUIOBJS COMMONOBJS=MSW_COMMONOBJS GENERICOBJS=MSW_GENERICOBJS + GUIDEPS=MSW_GUIDEPS + COMMONDEPS=MSW_COMMONDEPS + GENERICDEPS=MSW_GENERICDEPS UNIXOBJS=UNIXOBJS GUIDIST=MSW_DIST fi @@ -1539,10 +1551,13 @@ if test "$wxUSE_MOTIF" = 1; then GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" TOOLKIT=MOTIF - GUIOBJS=MOTIF_GUIOBJS GUIHEADERS=MOTIF_HEADERS + GUIOBJS=MOTIF_GUIOBJS COMMONOBJS=MOTIF_COMMONOBJS GENERICOBJS=MOTIF_GENERICOBJS + GUIDEPS=MOTIF_GUIDEPS + COMMONDEPS=MOTIF_COMMONDEPS + GENERICDEPS=MOTIF_GENERICDEPS UNIXOBJS=UNIXOBJS GUIDIST=MOTIF_DIST fi @@ -1966,16 +1981,17 @@ if test "$wxUSE_CYGWIN" = 1 ; then fi WXDEBUG= -if test "$wxUSE_DEBUG_GDB" = "yes" ; then - wxUSE_DEBUG_INFO=yes - WXDEBUG="-ggdb" -fi if test "$wxUSE_DEBUG_INFO" = "yes" ; then WXDEBUG="-g" wxUSE_OPTIMISE=no fi +if test "$wxUSE_DEBUG_GDB" = "yes" ; then + wxUSE_DEBUG_INFO=yes + WXDEBUG="-ggdb" +fi + if test "$wxUSE_DEBUG_FLAG" = "yes" ; then AC_DEFINE(WXDEBUG) WXDEBUG_DEFINE="-D__WXDEBUG__" @@ -2000,6 +2016,7 @@ if test "$wxUSE_PROFILE" = "yes" ; then PROFILE="-pg" fi +DEP_INFO_FLAGS= if test "$GCC" = yes ; then if test "$wxUSE_NO_RTTI" = "yes" ; then WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-rtti" @@ -2007,8 +2024,13 @@ if test "$GCC" = yes ; then if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-exceptions" fi -dnl CFLAGS="${CFLAGS} -fpermissive" -dnl CXXFLAGS="${CXXFLAGS} -fpermissive" + if test "$wxUSE_PERMISSIVE" = "yes" ; then + CFLAGS="${CFLAGS} -fpermissive" + CXXFLAGS="${CXXFLAGS} -fpermissive" + fi + if test "$wxUSE_NO_DEPS" = "no" ; then + DEP_INFO_FLAGS="-MMD" + fi fi @@ -2677,6 +2699,7 @@ AC_SUBST(WX_CREATE_INSTALLED_LINKS) AC_SUBST(SHARED_LD) AC_SUBST(PIC_FLAG) +AC_SUBST(DEP_INFO_FLAGS) dnl debugging options AC_SUBST(WXDEBUG_DEFINE) @@ -2688,10 +2711,13 @@ AC_SUBST(TOOLKIT_DIR) AC_SUBST(TOOLKIT_INCLUDE) dnl what to compile -AC_SUBST(GUIOBJS) AC_SUBST(GUIHEADERS) +AC_SUBST(GUIOBJS) AC_SUBST(COMMONOBJS) AC_SUBST(GENERICOBJS) +AC_SUBST(GUIDEPS) +AC_SUBST(COMMONDEPS) +AC_SUBST(GENERICDEPS) AC_SUBST(UNIXOBJS) AC_SUBST(GUIDIST) diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t index 332baca2b3..5180132c5f 100644 --- a/distrib/msw/tmake/unx.t +++ b/distrib/msw/tmake/unx.t @@ -20,23 +20,32 @@ next unless $file =~ /^dirdlgg\./; } + $file2 = $file; $file =~ s/cp?p?$/\o/; - $project{"WXMSW_GENERICOBJS"} .= "src/generic/" . $file . " " + $file2 =~ s/cp?p?$/\d/; + $project{"WXMSW_GENERICOBJS"} .= $file . " "; + $project{"WXMSW_GENERICDEPS"} .= $file2 . " " } foreach $file (sort keys %wxGeneric) { #! skip generic files not required for the wxGTK port next if $wxGeneric{$file} =~ /\bR\b/; + $file2 = $file; $file =~ s/cp?p?$/\o/; - $project{"WXGTK_GENERICOBJS"} .= "src/generic/" . $file . " " + $file2 =~ s/cp?p?$/\d/; + $project{"WXGTK_GENERICOBJS"} .= $file . " "; + $project{"WXGTK_GENERICDEPS"} .= $file2 . " " } foreach $file (sort keys %wxGeneric) { next if $wxCommon{$file} =~ /\bX\b/; + $file2 = $file; $file =~ s/cp?p?$/\o/; - $project{"WXMOTIF_GENERICOBJS"} .= "src/generic/" . $file . " " + $file2 =~ s/cp?p?$/\d/; + $project{"WXMOTIF_GENERICOBJS"} .= $file . " "; + $project{"WXMOTIF_GENERICDEPS"} .= $file2 . " " } #! Common @@ -44,15 +53,21 @@ foreach $file (sort keys %wxCommon) { next if $wxCommon{$file} =~ /\bR\b/; + $file2 = $file; $file =~ s/cp?p?$/\o/; - $project{"WXGTK_COMMONOBJS"} .= "src/common/" . $file . " " + $file2 =~ s/cp?p?$/\d/; + $project{"WXGTK_COMMONOBJS"} .= $file . " "; + $project{"WXGTK_COMMONDEPS"} .= $file2 . " " } foreach $file (sort keys %wxCommon) { next if $wxCommon{$file} =~ /\bX\b/; + $file2 = $file; $file =~ s/cp?p?$/\o/; - $project{"WXMOTIF_COMMONOBJS"} .= "src/common/" . $file . " " + $file2 =~ s/cp?p?$/\d/; + $project{"WXMOTIF_COMMONOBJS"} .= $file . " "; + $project{"WXMOTIF_COMMONDEPS"} .= $file2 . " " } foreach $file (sort keys %wxCommon) { @@ -61,8 +76,11 @@ #! needs extra files (sql*.h) so not compiled by default. next if $file =~ /^odbc\./; + $file2 = $file; $file =~ s/cp?p?$/\o/; - $project{"WXMSW_COMMONOBJS"} .= "src/common/" . $file . " " + $file2 =~ s/cp?p?$/\d/; + $project{"WXMSW_COMMONOBJS"} .= $file . " "; + $project{"WXMSW_COMMONDEPS"} .= $file2 . " " } #! GUI @@ -75,30 +93,45 @@ #! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations, next if $file =~ /^dirdlg\./; + $file2 = $file; $file =~ s/cp?p?$/\o/; - $project{"WXMSW_GUIOBJS"} .= "src/msw/" . $file . " " + $file2 =~ s/cp?p?$/\d/; + $project{"WXMSW_GUIOBJS"} .= $file . " "; + $project{"WXMSW_GUIDEPS"} .= $file2 . " " } foreach $file (sort keys %wxGTK) { + $file2 = $file; $file =~ s/cp?p?$/\o/; - $project{"WXGTK_GUIOBJS"} .= "src/gtk/" . $file . " " + $file2 =~ s/cp?p?$/\d/; + $project{"WXGTK_GUIOBJS"} .= $file . " "; + $project{"WXGTK_GUIDEPS"} .= $file2 . " " } foreach $file (sort keys %wxMOTIF) { + $file2 = $file; $file =~ s/cp?p?$/\o/; - $project{"WXMOTIF_GUIOBJS"} .= "src/motif/" . $file . " " + $file2 =~ s/cp?p?$/\d/; + $project{"WXMOTIF_GUIOBJS"} .= $file . " "; + $project{"WXMOTIF_GUIDEPS"} .= $file2 . " " } #! others foreach $file (sort keys %wxHTML) { + $file2 = $file; $file =~ s/cp?p?$/\o/; - $project{"WXHTMLOBJS"} .= "src/html/" . $file . " " + $file2 =~ s/cp?p?$/\d/; + $project{"WXHTMLOBJS"} .= $file . " "; + $project{"WXHTMLDEPS"} .= $file2 . " " } foreach $file (sort keys %wxUNIX) { + $file2 = $file; $file =~ s/cp?p?$/\o/; - $project{"WXUNIXOBJS"} .= "src/unix/" . $file . " " + $file2 =~ s/cp?p?$/\d/; + $project{"WXUNIXOBJS"} .= $file . " "; + $project{"WXUNIXDEPS"} .= $file2 . " " } #! headers @@ -160,19 +193,29 @@ include ./src/make.env .SUFFIXES: .o .cpp .c .cxx .c.o : - $(CCC) -c $(CFLAGS) $(PICFLAGS) -o $@ $< + $(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) -o $@ $< .cpp.o : - $(CC) -c $(CPPFLAGS) $(PICFLAGS) -o $@ $< + $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $< .cxx.o : - $(CC) -c $(CPPFLAGS) $(PICFLAGS) -o $@ $< + $(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $< ########################### Paths ################################# srcdir = @srcdir@ -VPATH = :@top_srcdir@ +VP1 = @top_srcdir@/src/common +VP2 = @top_srcdir@/src/@TOOLKIT_DIR@ +VP3 = @top_srcdir@/src/motif/xmcombo +VP4 = @top_srcdir@/src/generic +VP5 = @top_srcdir@/src/unix +VP6 = @top_srcdir@/src/html +VP7 = @top_srcdir@/src/png +VP8 = @top_srcdir@/src/jpeg +VP9 = @top_srcdir@/src/zlib + +VPATH = $(VP1):$(VP2):$(VP3):$(VP4):$(VP5):$(VP6):$(VP7):$(VP8):$(VP9) top_srcdir = @top_srcdir@ prefix = @prefix@ @@ -277,168 +320,189 @@ HTML_HEADERS = \ GTK_GENERICOBJS = \ #$ ExpandList("WXGTK_GENERICOBJS"); +GTK_GENERICDEPS = \ + #$ ExpandList("WXGTK_GENERICDEPS"); + GTK_COMMONOBJS = \ parser.o \ #$ ExpandList("WXGTK_COMMONOBJS"); +GTK_COMMONDEPS = \ + parser.d \ + #$ ExpandList("WXGTK_COMMONDEPS"); + GTK_GUIOBJS = \ #$ ExpandList("WXGTK_GUIOBJS"); +GTK_GUIDEPS = \ + #$ ExpandList("WXGTK_GUIDEPS"); + MOTIF_GENERICOBJS = \ #$ ExpandList("WXMOTIF_GENERICOBJS"); +MOTIF_GENERICDEPS = \ + #$ ExpandList("WXMOTIF_GENERICDEPS"); + MOTIF_COMMONOBJS = \ parser.o \ #$ ExpandList("WXMOTIF_COMMONOBJS"); +MOTIF_COMMONDEPS = \ + parser.d \ + #$ ExpandList("WXMOTIF_COMMONDEPS"); + MOTIF_GUIOBJS = \ - src/motif/xmcombo/xmcombo.o \ + xmcombo.o \ #$ ExpandList("WXMOTIF_GUIOBJS"); +MOTIF_GUIDEPS = \ + xmcombo.d \ + #$ ExpandList("WXMOTIF_GUIDEPS"); + MSW_GENERICOBJS = \ #$ ExpandList("WXMSW_GENERICOBJS"); +MSW_GENERICDEPS = \ + #$ ExpandList("WXMSW_GENERICDEPS"); + MSW_COMMONOBJS = \ #$ ExpandList("WXMSW_COMMONOBJS"); +MSW_COMMONDEPS = \ + #$ ExpandList("WXMSW_COMMONDEPS"); + MSW_GUIOBJS = \ #$ ExpandList("WXMSW_GUIOBJS"); +MSW_GUIDEPS = \ + #$ ExpandList("WXMSW_GUIDEPS"); + HTMLOBJS = \ #$ ExpandList("WXHTMLOBJS"); +HTMLDEPS = \ + #$ ExpandList("WXHTMLDEPS"); + UNIXOBJS = \ #$ ExpandList("WXUNIXOBJS"); +UNIXDEPS = \ + #$ ExpandList("WXUNIXDEPS"); + ZLIBOBJS = \ - src/zlib/adler32.o \ - src/zlib/compress.o \ - src/zlib/crc32.o \ - src/zlib/gzio.o \ - src/zlib/uncompr.o \ - src/zlib/deflate.o \ - src/zlib/trees.o \ - src/zlib/zutil.o \ - src/zlib/inflate.o \ - src/zlib/infblock.o \ - src/zlib/inftrees.o \ - src/zlib/infcodes.o \ - src/zlib/infutil.o \ - src/zlib/inffast.o + adler32.o \ + compress.o \ + crc32.o \ + gzio.o \ + uncompr.o \ + deflate.o \ + trees.o \ + zutil.o \ + inflate.o \ + infblock.o \ + inftrees.o \ + infcodes.o \ + infutil.o \ + inffast.o PNGOBJS = \ - src/png/png.o \ - src/png/pngread.o \ - src/png/pngrtran.o \ - src/png/pngrutil.o \ - src/png/pngpread.o \ - src/png/pngtrans.o \ - src/png/pngwrite.o \ - src/png/pngwtran.o \ - src/png/pngwutil.o \ - src/png/pngerror.o \ - src/png/pngmem.o \ - src/png/pngwio.o \ - src/png/pngrio.o \ - src/png/pngget.o \ - src/png/pngset.o + png.o \ + pngread.o \ + pngrtran.o \ + pngrutil.o \ + pngpread.o \ + pngtrans.o \ + pngwrite.o \ + pngwtran.o \ + pngwutil.o \ + pngerror.o \ + pngmem.o \ + pngwio.o \ + pngrio.o \ + pngget.o \ + pngset.o JPEGOBJS = \ - src/jpeg/jcomapi.o \ - src/jpeg/jutils.o \ - src/jpeg/jerror.o \ - src/jpeg/jmemmgr.o \ - src/jpeg/jmemnobs.o \ - src/jpeg/jcapimin.o \ - src/jpeg/jcapistd.o \ - src/jpeg/jctrans.o \ - src/jpeg/jcparam.o \ - src/jpeg/jdatadst.o \ - src/jpeg/jcinit.o \ - src/jpeg/jcmaster.o \ - src/jpeg/jcmarker.o \ - src/jpeg/jcmainct.o \ - src/jpeg/jcprepct.o \ - src/jpeg/jccoefct.o \ - src/jpeg/jccolor.o \ - src/jpeg/jcsample.o \ - src/jpeg/jchuff.o \ - src/jpeg/jcphuff.o \ - src/jpeg/jcdctmgr.o \ - src/jpeg/jfdctfst.o \ - src/jpeg/jfdctflt.o \ - src/jpeg/jfdctint.o \ - src/jpeg/jdapimin.o \ - src/jpeg/jdapistd.o \ - src/jpeg/jdtrans.o \ - src/jpeg/jdatasrc.o \ - src/jpeg/jdmaster.o \ - src/jpeg/jdinput.o \ - src/jpeg/jdmarker.o \ - src/jpeg/jdhuff.o \ - src/jpeg/jdphuff.o \ - src/jpeg/jdmainct.o \ - src/jpeg/jdcoefct.o \ - src/jpeg/jdpostct.o \ - src/jpeg/jddctmgr.o \ - src/jpeg/jidctfst.o \ - src/jpeg/jidctflt.o \ - src/jpeg/jidctint.o \ - src/jpeg/jidctred.o \ - src/jpeg/jdsample.o \ - src/jpeg/jdcolor.o \ - src/jpeg/jquant1.o \ - src/jpeg/jquant2.o \ - src/jpeg/jdmerge.o + jcomapi.o \ + jutils.o \ + jerror.o \ + jmemmgr.o \ + jmemnobs.o \ + jcapimin.o \ + jcapistd.o \ + jctrans.o \ + jcparam.o \ + jdatadst.o \ + jcinit.o \ + jcmaster.o \ + jcmarker.o \ + jcmainct.o \ + jcprepct.o \ + jccoefct.o \ + jccolor.o \ + jcsample.o \ + jchuff.o \ + jcphuff.o \ + jcdctmgr.o \ + jfdctfst.o \ + jfdctflt.o \ + jfdctint.o \ + jdapimin.o \ + jdapistd.o \ + jdtrans.o \ + jdatasrc.o \ + jdmaster.o \ + jdinput.o \ + jdmarker.o \ + jdhuff.o \ + jdphuff.o \ + jdmainct.o \ + jdcoefct.o \ + jdpostct.o \ + jddctmgr.o \ + jidctfst.o \ + jidctflt.o \ + jidctint.o \ + jidctred.o \ + jdsample.o \ + jdcolor.o \ + jquant1.o \ + jquant2.o \ + jdmerge.o OBJECTS = $(@GUIOBJS@) $(@COMMONOBJS@) $(@GENERICOBJS@) $(@UNIXOBJS@) $(HTMLOBJS) \ $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS) +DEPFILES = $(@GUIDEPS@) $(@COMMONDEPS@) $(@GENERICDEPS@) $(UNIXDEPS) $(HTMLDEPS) + HEADERS = $(@GUIHEADERS@) $(HTML_HEADERS) $(UNIX_HEADERS) $(PROTOCOL_HEADERS) \ $(GENERIC_HEADERS) $(WX_HEADERS) -REQUIRED_DIRS = ./lib ./src ./src/common ./src/gtk ./src/motif ./src/msw \ - ./src/generic ./src/unix ./src/motif/xmombo ./src/html \ - ./src/zlib ./src/jpeg ./src/png - -all: $(REQUIRED_DIRS) $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@ - -$(REQUIRED_DIRS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h - @mkdir -p ./lib - @mkdir -p ./src - @mkdir -p ./src/common - @mkdir -p ./src/msw - @mkdir -p ./src/gtk - @mkdir -p ./src/motif - @mkdir -p ./src/motif/xmcombo - @mkdir -p ./src/generic - @mkdir -p ./src/unix - @mkdir -p ./src/html - @mkdir -p ./src/png - @mkdir -p ./src/jpeg - @mkdir -p ./src/zlib +all: $(OBJECTS) @WX_TARGET_LIBRARY@ @WX_CREATE_LINKS@ @WX_LIBRARY_NAME_STATIC@: $(OBJECTS) + $(INSTALL) -d ./lib $(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS) $(RANLIB) ./lib/$@ @WX_LIBRARY_NAME_SHARED@: $(OBJECTS) + $(INSTALL) -d ./lib $(SHARED_LD) ./lib/$@ $(OBJECTS) $(EXTRALIBS) CREATE_LINKS: ./lib/@WX_TARGET_LIBRARY@ - @if test -e ./lib/@WX_LIBRARY_LINK1@; then $(RM) ./lib/@WX_LIBRARY_LINK1@; fi - @if test -e ./lib/@WX_LIBRARY_LINK2@; then $(RM) ./lib/@WX_LIBRARY_LINK2@; fi - @if test -e ./lib/@WX_LIBRARY_LINK3@; then $(RM) ./lib/@WX_LIBRARY_LINK3@; fi + $(RM) ./lib/@WX_LIBRARY_LINK1@ + $(RM) ./lib/@WX_LIBRARY_LINK2@ + $(RM) ./lib/@WX_LIBRARY_LINK3@ $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK1@ $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK2@ $(LN_S) @WX_TARGET_LIBRARY@ ./lib/@WX_LIBRARY_LINK3@ CREATE_INSTALLED_LINKS: $(libdir)/@WX_TARGET_LIBRARY@ - @if test -e $(libdir)/@WX_LIBRARY_LINK1@; then $(RM) $(libdir)/@WX_LIBRARY_LINK1@; fi - @if test -e $(libdir)/@WX_LIBRARY_LINK2@; then $(RM) $(libdir)/@WX_LIBRARY_LINK2@; fi - @if test -e $(libdir)/@WX_LIBRARY_LINK3@; then $(RM) $(libdir)/@WX_LIBRARY_LINK3@; fi + $(RM) $(libdir)/@WX_LIBRARY_LINK1@ + $(RM) $(libdir)/@WX_LIBRARY_LINK2@ + $(RM) $(libdir)/@WX_LIBRARY_LINK3@ $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK1@ $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK2@ $(LN_S) @WX_TARGET_LIBRARY@ $(libdir)/@WX_LIBRARY_LINK3@ @@ -466,12 +530,13 @@ lexer.c: $(COMMDIR)/lexer.l sed -e "s/unput/PROIO_unput/g" > lexer.c @$(RM) lex.yy.c +-include $(DEPFILES) + preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(top_builddir)/setup.h @echo " " @echo " Installing wxWindows..." @echo " " - $(INSTALL) -d $(prefix) $(INSTALL) -d $(bindir) $(INSTALL) -d $(libdir) @@ -678,17 +743,8 @@ dist: ALL_DIST @GUIDIST@ SAMPLES_DIST $(RM) -r _dist_dir clean: - $(RM) ./src/msw/*.o - $(RM) ./src/gtk/*.o - $(RM) ./src/motif/*.o - $(RM) ./src/html/*.o - $(RM) ./src/common/*.o - $(RM) ./src/unix/*.o - $(RM) ./src/generic/*.o - $(RM) ./src/png/*.o - $(RM) ./src/jpeg/*.o - $(RM) ./src/zlib/*.o $(RM) *.o + $(RM) *.d $(RM) parser.c $(RM) lexer.c $(RM) ./lib/* diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt index 33d915d787..2c482a12e7 100644 --- a/docs/gtk/install.txt +++ b/docs/gtk/install.txt @@ -267,6 +267,13 @@ The following options handle the kind of library you want to build. binary size. Also fewer crashes during the actual compilation... + --enable-no_deps Enable compilation without creation of + dependency information. + + --enable-permissive Enable compilation without creation of + giving erros as soon as you compile with + Solaris ANSI-defying headers... + --enable-mem_tracing Add built-in memory tracing. --enable-dmalloc Use the dmalloc memory debugger. diff --git a/docs/motif2/install.txt b/docs/motif2/install.txt index 3a7d4c11b5..542741170a 100644 --- a/docs/motif2/install.txt +++ b/docs/motif2/install.txt @@ -231,6 +231,13 @@ The following options handle the kind of library you want to build. binary size. Also fewer crashes during the actual compilation... + --enable-no_deps Enable compilation without creation of + dependency information. + + --enable-permissive Enable compilation without creation of + giving erros as soon as you compile with + Solaris ANSI-defying headers... + --enable-mem_tracing Add built-in memory tracing. --enable-dmalloc Use the dmalloc memory debugger. -- 2.47.2