diff --git a/Makefile.in b/Makefile.in index d900a7c5af..3435dc23ca 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,11 +1,12 @@ # # File: makefile.unx -# Author: Julian Smart, Robert Roebling, Vadim Zeitlin +# Author: Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee # Created: 1993 -# Updated: 1999 +# Updated: 2001 # Copyright:(c) 1993, AIAI, University of Edinburgh, # Copyright:(c) 1999, Vadim Zeitlin # Copyright:(c) 1999, Robert Roebling +# Copyright:(c) 2001, Ron Lee # # Makefile for libwx_gtk.a, libwx_motif.a and libwx_msw.a @@ -15,17 +16,17 @@ include ./src/make.env ############## override make.env for PIC ########################## -# Clears all default suffixes -.SUFFIXES: .o .cpp .c .cxx +%.o : %.c + $(CC) -c $(CFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $< -.c.o : - $(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $< +%.o : %.cpp + $(CXX) -c $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $< -.cpp.o : - $(CC) -c @DEP_INFO_FLAGS@ $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $< +%.o : %.cxx + $(CXX) -c $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $< -.cxx.o : - $(CC) -c @DEP_INFO_FLAGS@ $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $< +%.r : %.rsrc + $(DEREZ) $^ Carbon.r --useDF > $@ ########################### Paths ################################# @@ -44,55 +45,31 @@ VP9 = @top_srcdir@/src/zlib VPA = @top_srcdir@/src/regex VP10 = @top_srcdir@/src/iodbc VP11 = @top_srcdir@/src/msw/ole -VP12 = $(FTVP01)@PATH_IFS@$(FTVP02)@PATH_IFS@$(FTVP03)@PATH_IFS@$(FTVP04)@PATH_IFS@$(FTVP05)@PATH_IFS@$(FTVP06)@PATH_IFS@$(FTVP07)@PATH_IFS@$(FTVP08)@PATH_IFS@ -VP13 = $(FTVP09)@PATH_IFS@$(FTVP10)@PATH_IFS@$(FTVP11)@PATH_IFS@$(FTVP12)@PATH_IFS@$(FTVP13)@PATH_IFS@$(FTVP14)@PATH_IFS@$(FTVP15)@PATH_IFS@ # the comment at the end of the next line is needed because otherwise autoconf # would remove this line completely - it contains a built-in hack to remove # any VPATH assignment not containing ':' -VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VPA)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13) # ':' for autoconf +VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VPA)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ libdir = @libdir@ -infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = localedir = $(datadir)/locale -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = . +build_libdir = $(top_builddir)/lib INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -# my autoconf doesn't set this -#INSTALL_SCRIPT = @INSTALL_SCRIPT@ -# maybe do an additional chmod if needed? INSTALL_SCRIPT = @INSTALL@ -transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : build_alias = @build_alias@ build_triplet = @build@ host_alias = @host_alias@ @@ -117,6 +94,7 @@ PNGDIR = $(WXDIR)/src/png JPEGDIR = $(WXDIR)/src/jpeg TIFFDIR = $(WXDIR)/src/tiff ZLIBDIR = $(WXDIR)/src/zlib +REGEXDIR = $(WXDIR)/src/regex GTKDIR = $(WXDIR)/src/gtk MOTIFDIR = $(WXDIR)/src/motif MSWDIR = $(WXDIR)/src/msw @@ -166,7 +144,6 @@ HEADERS = $(ALL_HEADERS) # for the objects and depfiles, we might be bulding only part of them # depending on configure arguments, so select a subset of ALL OBJECTS = @ALL_OBJECTS@ -DEPFILES = @ALL_DEPFILES@ # the object files of sublibraries (we assume that they don't change [often], # so we don't generate these lists with tmake but embed them here) @@ -328,80 +305,49 @@ IODBCOBJS = \ prepare.o \ result.o -OLEOBJS = \ - automtn.o \ - dataobj.o \ - dropsrc.o \ - droptgt.o \ - oleutils.o \ - uuid.o ############################## Rules ################################## -BURNT_LIBRARY_NAME = @BURNT_LIBRARY_NAME@ -BURNT_LIBRARY_NAME_GL = @BURNT_LIBRARY_NAME_GL@ +SONAME_FLAGS = @SONAME_FLAGS@ +SONAME_FLAGS_GL = @SONAME_FLAGS_GL@ all: @WX_ALL@ -@WX_LIBRARY_NAME_STATIC@: $(OBJECTS) - @$(INSTALL) -d ./lib - $(AR) $(AROPTIONS) ./lib/$@ $(OBJECTS) - $(RANLIB) ./lib/$@ +$(build_libdir)/@WX_LIBRARY_NAME_STATIC@: $(OBJECTS) + @$(INSTALL) -d $(build_libdir) + $(AR) $(AROPTIONS) $@ $(OBJECTS) + $(RANLIB) $@ -@WX_LIBRARY_NAME_STATIC_GL@: glcanvas.o - @$(INSTALL) -d ./lib - $(AR) $(AROPTIONS) ./lib/$@ glcanvas.o - $(RANLIB) ./lib/$@ +$(build_libdir)/@WX_LIBRARY_NAME_STATIC_GL@: glcanvas.o + @$(INSTALL) -d $(build_libdir) + $(AR) $(AROPTIONS) $@ glcanvas.o + $(RANLIB) $@ -@WX_LIBRARY_NAME_SHARED@: $(OBJECTS) - @$(INSTALL) -d ./lib - $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS) +$(build_libdir)/@WX_LIBRARY_NAME_SHARED@: $(OBJECTS) + @$(INSTALL) -d $(build_libdir) + $(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS) -@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o @WX_LIBRARY_NAME_SHARED@ - @$(INSTALL) -d ./lib - $(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o ./lib/@WX_LIBRARY_NAME_SHARED@ $(EXTRALIBS) $(OPENGLLIBS) +$(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o $(build_libdir)/@WX_LIBRARY_NAME_SHARED@ + @$(INSTALL) -d $(build_libdir) + $(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o -L$(build_libdir) @WXCONFIG_LIBS@ $(EXTRALIBS) $(OPENGLLIBS) -./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).r: ./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).rsrc - $(DEREZ) $^ $(DEREZFLAGS) > $@ +$(build_libdir)/@WX_RESOURCES_DARWIN@: $(MACRESOURCES) + @$(INSTALL) -d $(build_libdir) + $(RESCOMP) -d __UNIX__ -useDF $^ -o $@ -./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).rsrc: $(MACRESOURCES) - $(REZ) $(REZFLAGS) $^ -o $@ - -CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@ - @$(RM) ./lib/@WX_LIBRARY_LINK1@ - @$(RM) ./lib/@WX_LIBRARY_LINK2@ - @$(RM) ./lib/@WX_LIBRARY_LINK3@ - cd lib \ +$(build_libdir)/@WX_LIBRARY_LINK1@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED@ + @$(RM) $(build_libdir)/@WX_LIBRARY_LINK1@ + @$(RM) $(build_libdir)/@WX_LIBRARY_LINK2@ + cd $(build_libdir) \ && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \ - && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \ - && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@ + && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ -CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@ - @$(RM) ./lib/@WX_LIBRARY_LINK1_GL@ - @$(RM) ./lib/@WX_LIBRARY_LINK2_GL@ - @$(RM) ./lib/@WX_LIBRARY_LINK3_GL@ - cd lib \ +$(build_libdir)/@WX_LIBRARY_LINK1_GL@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@ + @$(RM) $(build_libdir)/@WX_LIBRARY_LINK1_GL@ + @$(RM) $(build_libdir)/@WX_LIBRARY_LINK2_GL@ + cd $(build_libdir) \ && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \ - && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ \ - && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK3_GL@ - -CREATE_INSTALLED_LINKS: preinstall - $(RM) $(libdir)/@WX_LIBRARY_LINK1@ - $(RM) $(libdir)/@WX_LIBRARY_LINK2@ - $(RM) $(libdir)/@WX_LIBRARY_LINK3@ - cd $(libdir) \ - && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \ - && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \ - && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@ - -CREATE_INSTALLED_LINKS_GL: preinstall_gl - $(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@ - $(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@ - $(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@ - cd $(libdir) \ - && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \ - && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ \ - && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK3_GL@ + && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h @@ -426,7 +372,22 @@ lexer.c: $(COMMDIR)/lexer.l sed -e "s/unput/PROIO_unput/g" > lexer.c @$(RM) @LEX_STEM@.c --include $(DEPFILES) +-include $(OBJECTS:.o=.d) + + +CREATE_INSTALLED_LINKS: preinstall + $(RM) $(libdir)/@WX_LIBRARY_LINK1@ + $(RM) $(libdir)/@WX_LIBRARY_LINK2@ + cd $(libdir) \ + && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \ + && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ + +CREATE_INSTALLED_LINKS_GL: preinstall_gl + $(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@ + $(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@ + cd $(libdir) \ + && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \ + && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ afminstall: preinstall @if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi @@ -438,7 +399,7 @@ afminstall: preinstall # this is the real install target: copies the library, wx-config and the # headers to the installation directory -preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_NAME@-config +preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config @echo " " @echo " Installing wxWindows..." @echo " " @@ -447,17 +408,19 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_N @if test ! -d $(bindir); then $(INSTALL) -d $(bindir); fi @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi - $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLKIT_NAME@-config $(bindir)/wx@TOOLKIT_NAME@-config - cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLKIT_NAME@-config wx-config - $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@ + $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config + cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config + $(INSTALL_PROGRAM) $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@ $(INSTALL) -d $(libdir)/wx $(INSTALL) -d $(libdir)/wx/include - $(INSTALL) -d $(libdir)/wx/include/wx - $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_NAME@ - $(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h + $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@ + $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx + $(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \ + $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h $(INSTALL) -d $(includedir)/wx + @# FIXME: This will erroneously install a wx/base dir for wxBase.. @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi @@ -476,12 +439,12 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_N echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \ done -preinstall_gl: $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@ +preinstall_gl: $(build_libdir)/@WX_TARGET_LIBRARY_GL@ @echo " " @echo " Installing wxWindows OpenGl add-on..." @echo " " @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi - $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@ + $(INSTALL_PROGRAM) $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@ install: @AFMINSTALL@ @WX_ALL_INSTALLED@ @echo " " @@ -504,16 +467,14 @@ uninstall: @$(RM) $(libdir)/@WX_TARGET_LIBRARY@ @$(RM) $(libdir)/@WX_LIBRARY_LINK1@ @$(RM) $(libdir)/@WX_LIBRARY_LINK2@ - @$(RM) $(libdir)/@WX_LIBRARY_LINK3@ @echo " Removing GL library..." @$(RM) $(libdir)/@WX_TARGET_LIBRARY_GL@ @$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@ @$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@ - @$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@ @echo " Removing helper files..." - @$(RM) $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h + @$(RM) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h @$(RM) $(bindir)/wx-config - @$(RM) $(bindir)/wx@TOOLKIT_NAME@-config + @$(RM) $(bindir)/wx@TOOLCHAIN_NAME@-config @$(RM) $(datadir)/wx/afm/* @$(RM) $(datadir)/wx/gs_afm/* # FIXME: wxBase doesnt install these next 3 dirs. @@ -532,8 +493,8 @@ uninstall: done @echo " Removing directories..." @-rmdir $(localedir) - @if test -d $(libdir)/wx/include/wx/@TOOLKIT_NAME@; then rmdir $(libdir)/wx/include/wx/@TOOLKIT_NAME@; fi - @if test -d $(libdir)/wx/include/wx; then rmdir $(libdir)/wx/include/wx; fi + @if test -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx; then rmdir $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx; fi + @if test -d $(libdir)/wx/include/@TOOLCHAIN_NAME@; then rmdir $(libdir)/wx/include/@TOOLCHAIN_NAME@; fi @if test -d $(libdir)/wx/include; then rmdir $(libdir)/wx/include; fi @if test -d $(libdir)/wx; then rmdir $(libdir)/wx; fi @if test -d $(includedir)/wx/gtk; then rmdir $(includedir)/wx/gtk; fi @@ -573,6 +534,11 @@ ALL_DIST: distclean cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib + mkdir $(DISTDIR)/src/regex + cp $(REGEXDIR)/*.{i,}h $(DISTDIR)/src/regex + cp $(REGEXDIR)/*.c $(DISTDIR)/src/regex + cp $(REGEXDIR)/{Makefile,COPYRIGHT,README,WHATSNEW} $(DISTDIR)/src/regex + cp $(REGEXDIR)/{mkh,tests} $(DISTDIR)/src/regex # this target is the common part of distribution script for all GUI toolkits, # but is not used when building wxBase distribution @@ -608,7 +574,7 @@ ALL_GUI_DIST: ALL_DIST mkdir $(DISTDIR)/src/tiff mkdir $(DISTDIR)/src/iodbc mkdir $(DISTDIR)/src/unix - cp $(WXDIR)/@PORT_FILES@ $(DISTDIR) + cp $(SRCDIR)/files.lst $(DISTDIR)/src/ cp $(SRCDIR)/*.in $(DISTDIR)/src cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common cp $(COMMDIR)/*.c $(DISTDIR)/src/common @@ -648,7 +614,7 @@ BASE_DIST: ALL_DIST mkdir $(DISTDIR)/include/wx/unix mkdir $(DISTDIR)/src/common mkdir $(DISTDIR)/src/unix - cp $(WXDIR)/@PORT_FILES@ $(DISTDIR) + cp @PORT_FILES@ $(DISTDIR) cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@ cp $(WXDIR)/@RPM_SPEC@ $(DISTDIR)/@RPM_SPEC@ cp $(WXDIR)/wxBase*.ds[pw] $(DISTDIR) @@ -679,6 +645,7 @@ BASE_DIST: ALL_DIST GTK_DIST: ALL_GUI_DIST cp $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk cp $(INCDIR)/wx/gtk/*.xpm $(DISTDIR)/include/wx/gtk + cp $(GTKDIR)/files.lst $(DISTDIR)/src/gtk cp $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk cp $(GTKDIR)/*.c $(DISTDIR)/src/gtk cp $(GTKDIR)/*.xbm $(DISTDIR)/src/gtk @@ -689,6 +656,7 @@ GTK_DIST: ALL_GUI_DIST MOTIF_DIST: ALL_GUI_DIST cp $(WXDIR)/wxMOTIF.spec $(DISTDIR) cp $(INCDIR)/wx/motif/*.h $(DISTDIR)/include/wx/motif + cp $(MOTIFDIR)/files.lst $(DISTDIR)/src/motif cp $(MOTIFDIR)/*.cpp $(DISTDIR)/src/motif cp $(MOTIFDIR)/*.xbm $(DISTDIR)/src/motif mkdir $(DISTDIR)/src/motif/xmcombo @@ -701,15 +669,26 @@ MACX_DIST: ALL_GUI_DIST MSW_DIST: ALL_GUI_DIST cp $(WXDIR)/wxWINE.spec $(DISTDIR) + mkdir $(DISTDIR)/include/wx/msw/ctl3d + mkdir $(DISTDIR)/include/wx/msw/gnuwin32 + mkdir $(DISTDIR)/include/wx/msw/gnuwin32/gl + mkdir $(DISTDIR)/include/wx/msw/ole cp $(INCDIR)/wx/msw/*.h $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.cur $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.ico $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.bmp $(DISTDIR)/include/wx/msw cp $(INCDIR)/wx/msw/*.rc $(DISTDIR)/include/wx/msw + cp $(INCDIR)/wx/msw/ctl3d/*.h $(DISTDIR)/include/wx/msw/ctl3d + cp $(INCDIR)/wx/msw/gnuwin32/*.h $(DISTDIR)/include/wx/msw/gnuwin32 + cp $(INCDIR)/wx/msw/gnuwin32/gl/*.h $(DISTDIR)/include/wx/msw/gnuwin32/gl + cp $(INCDIR)/wx/msw/gnuwin32/gl/*.def $(DISTDIR)/include/wx/msw/gnuwin32/gl + cp $(INCDIR)/wx/msw/ole/*.h $(DISTDIR)/include/wx/msw/ole + + mkdir $(DISTDIR)/src/msw/ole + cp $(MSWDIR)/files.lst $(DISTDIR)/src/msw cp $(MSWDIR)/*.cpp $(DISTDIR)/src/msw cp $(MSWDIR)/*.c $(DISTDIR)/src/msw cp $(MSWDIR)/*.def $(DISTDIR)/src/msw - mkdir $(DISTDIR)/src/msw/ole cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole DEMOS_DIST: ALL_GUI_DIST @@ -1203,6 +1182,12 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/wizard/*.cpp $(DISTDIR)/samples/wizard cp $(SAMPDIR)/wizard/*.xpm $(DISTDIR)/samples/wizard + mkdir $(DISTDIR)/samples/widgets + mkdir $(DISTDIR)/samples/widgets/icons + cp $(SAMPDIR)/widgets/Makefile.in $(DISTDIR)/samples/widgets + cp $(SAMPDIR)/widgets/*.{cpp,h,rc} $(DISTDIR)/samples/widgets + cp $(SAMPDIR)/widgets/icons/*.xpm $(DISTDIR)/samples/widgets/icons + UTILS_DIST: ALL_GUI_DIST mkdir $(DISTDIR)/utils cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils @@ -1266,6 +1251,7 @@ PYTHON_DIST: mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk mkdir $(DISTDIR)/wxPython/contrib/ogl mkdir $(DISTDIR)/wxPython/contrib/stc + mkdir $(DISTDIR)/wxPython/contrib/xrc mkdir $(DISTDIR)/wxPython/demo mkdir $(DISTDIR)/wxPython/demo/bitmaps mkdir $(DISTDIR)/wxPython/demo/data @@ -1274,7 +1260,7 @@ PYTHON_DIST: mkdir $(DISTDIR)/wxPython/wxPython mkdir $(DISTDIR)/wxPython/wxPython/lib mkdir $(DISTDIR)/wxPython/wxPython/lib/editor - mkdir $(DISTDIR)/wxPython/wxPython/lib/sizers + mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins cp $(WXDIR)/wxPython/*.txt $(DISTDIR)/wxPython cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython @@ -1284,6 +1270,7 @@ PYTHON_DIST: cp $(WXDIR)/wxPython/contrib/glcanvas/gtk/glcanvas.* $(DISTDIR)/wxPython/contrib/glcanvas/gtk -cp $(WXDIR)/wxPython/contrib/ogl/* $(DISTDIR)/wxPython/contrib/ogl -cp $(WXDIR)/wxPython/contrib/stc/* $(DISTDIR)/wxPython/contrib/stc + -cp $(WXDIR)/wxPython/contrib/xrc/xrc.* $(DISTDIR)/wxPython/contrib/xrc -cp $(WXDIR)/wxPython/demo/* $(DISTDIR)/wxPython/demo -cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps -cp $(WXDIR)/wxPython/demo/data/* $(DISTDIR)/wxPython/demo/data @@ -1292,6 +1279,7 @@ PYTHON_DIST: cp $(WXDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/wxPython/src/gtk cp $(WXDIR)/wxPython/wxPython/lib/*.py $(DISTDIR)/wxPython/wxPython/lib cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor + cp $(WXDIR)/wxPython/wxPython/lib/mixins/*.py $(DISTDIR)/wxPython/wxPython/lib/mixins distclean: $(RM) -r _dist_dir @@ -1314,7 +1302,6 @@ dist-only: fi dist: @GUIDIST@ - cp $(WXDIR)/src/files.lst $(DISTDIR)/src @echo "*** Creating wxWindows distribution in $(DISTDIR)..." @cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE); @if test "$(USE_GUI)" = 1; then \ @@ -1345,7 +1332,6 @@ bzip-dist-only: fi bzip-dist: @GUIDIST@ - cp $(WXDIR)/src/files.lst $(DISTDIR)/src/ @echo "*** Creating wxWindows distribution in $(DISTDIR)..." @cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP) @if test "$(USE_GUI)" = 1; then \ @@ -1358,24 +1344,41 @@ bzip-dist: @GUIDIST@ mv wxDemos demos; \ fi -debian-dist: @GUIDIST@ MANUAL_DIST PYTHON_DIST +debian-dist: debian-native-dist debian-msw-dirs MSW_DIST mkdir $(DISTDIR)/debian -cp $(WXDIR)/debian/* $(DISTDIR)/debian - cp $(WXDIR)/src/files.lst $(DISTDIR)/src/ cp $(DOCDIR)/licence.txt $(DISTDIR)/docs cp $(DOCDIR)/licendoc.txt $(DISTDIR)/docs cp $(DOCDIR)/preamble.txt $(DISTDIR)/docs rm -f $(DISTDIR)/*.spec + + @# now prune away a lot of the crap included by using cp -R + @# in other dist targets. Ugly and hardly portable but it + @# will run on any Debian box and that's enough for now. + + find $(DISTDIR) \( -name "CVS" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \ + \( -name "makefile.*" -a ! -name "makefile.unx" \) \) \ + -print0 | xargs -0 rm -rf + rm -rf $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER) mv $(DISTDIR) $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER) +debian-native-dist: @GUIDIST@ MANUAL_DIST PYTHON_DIST + +debian-msw-dirs: + mkdir $(DISTDIR)/include/wx/msw + mkdir $(DISTDIR)/src/msw + + clean: $(RM) *.o $(RM) *.d $(RM) parser.c $(RM) lexer.c - # $(RM) -r ./lib/wx/* - $(RM) ./lib/lib* + $(RM) $(build_libdir)/lib* + # Don't remove this lot, configure will reuse it + # if it's still good + # $(RM) -r $(build_libdir)/wx/* cleanall: clean @@ -1393,3 +1396,4 @@ rpm: dist cp -f $(WXARCHIVE) $(RPMTOP)/SOURCES rpm -ba --define "_topdir `pwd`/$(RPMTOP)" $(WXDIR)/wx$(TOOLKIT).spec mv -f `find $(RPMTOP) -name "wx$(TARGET)*.rpm"` . + diff --git a/configure b/configure index a8cb6bc23c..a312553291 100755 --- a/configure +++ b/configure @@ -98,7 +98,7 @@ ac_help="$ac_help ac_help="$ac_help --enable-shared create shared library code" ac_help="$ac_help - --enable-burnt_name create set name in shared library " + --enable-soname set the DT_SONAME field in ELF shared libraries" ac_help="$ac_help --enable-optimise create optimised code" ac_help="$ac_help @@ -1059,12 +1059,14 @@ DEFAULT_DEFAULT_wxUSE_PM=0 DEFAULT_DEFAULT_wxUSE_WINE=0 PROGRAM_EXT= +SO_SUFFIX=so case "${host}" in *-hp-hpux* ) USE_HPUX=1 DEFAULT_DEFAULT_wxUSE_MOTIF=1 NEEDS_D_REENTRANT_FOR_R_FUNCS=1 + SO_SUFFIX=sl cat >> confdefs.h <<\EOF #define __HPUX__ 1 EOF @@ -1237,6 +1239,7 @@ EOF *-*-cygwin* | *-*-mingw32* ) USE_UNIX=0 USE_WIN32=1 + SO_SUFFIX=dll cat >> confdefs.h <<\EOF #define __WIN32__ 1 EOF @@ -1277,16 +1280,13 @@ EOF *-*-darwin* ) USE_BSD=1 USE_DARWIN=1 + SO_SUFFIX=dylib cat >> confdefs.h <<\EOF #define __BSD__ 1 EOF cat >> confdefs.h <<\EOF #define __DARWIN__ 1 -EOF - - cat >> confdefs.h <<\EOF -#define __UNIX__ 1 EOF DEFAULT_DEFAULT_wxUSE_MAC=1 @@ -1310,24 +1310,16 @@ if test "$USE_UNIX" = 1 ; then #define __UNIX__ 1 EOF - - SRC_SUBDIRS="$SRC_SUBDIRS unix" - INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS unix" -fi - -if test "$USE_BEOS" = 1; then - SRC_SUBDIRS="$SRC_SUBDIRS be" - INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS be" fi if test "$USE_LINUX" = 1; then echo $ac_n "checking for glibc 2.1 or later""... $ac_c" 1>&6 -echo "configure:1326: checking for glibc 2.1 or later" >&5 +echo "configure:1318: checking for glibc 2.1 or later" >&5 if eval "test \"`echo '$''{'wx_lib_glibc21'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -1338,7 +1330,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_lib_glibc21=yes @@ -1357,7 +1349,6 @@ rm -f conftest* fi echo "$ac_t""$wx_lib_glibc21" 1>&6 - if test "$wx_lib_glibc21" = "yes"; then cat >> confdefs.h <<\EOF #define wxHAVE_GLIBC2 1 @@ -1383,7 +1374,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_THREADS=yes DEFAULT_wxUSE_SHARED=yes - DEFAULT_wxUSE_BURNT_NAME=no + DEFAULT_wxUSE_SONAME=no DEFAULT_wxUSE_OPTIMISE=no DEFAULT_wxUSE_PROFILE=no DEFAULT_wxUSE_NO_DEPS=no @@ -1543,7 +1534,7 @@ else DEFAULT_wxUSE_THREADS=yes DEFAULT_wxUSE_SHARED=yes - DEFAULT_wxUSE_BURNT_NAME=no + DEFAULT_wxUSE_SONAME=no DEFAULT_wxUSE_OPTIMISE=yes DEFAULT_wxUSE_PROFILE=no DEFAULT_wxUSE_NO_DEPS=no @@ -1712,7 +1703,7 @@ done echo $ac_n "checking for --enable-gui""... $ac_c" 1>&6 -echo "configure:1716: checking for --enable-gui" >&5 +echo "configure:1707: checking for --enable-gui" >&5 no_cache=0 # Check whether --enable-gui or --disable-gui was given. if test "${enable_gui+set}" = set; then @@ -1754,7 +1745,7 @@ if test "$wxUSE_GUI" = "yes"; then echo $ac_n "checking for --enable-universal""... $ac_c" 1>&6 -echo "configure:1758: checking for --enable-universal" >&5 +echo "configure:1749: checking for --enable-universal" >&5 no_cache=0 # Check whether --enable-universal or --disable-universal was given. if test "${enable_universal+set}" = set; then @@ -1851,7 +1842,7 @@ fi echo $ac_n "checking for --with-libpng""... $ac_c" 1>&6 -echo "configure:1855: checking for --with-libpng" >&5 +echo "configure:1846: checking for --with-libpng" >&5 no_cache=0 # Check whether --with-libpng or --without-libpng was given. if test "${with_libpng+set}" = set; then @@ -1898,7 +1889,7 @@ fi echo $ac_n "checking for --with-libjpeg""... $ac_c" 1>&6 -echo "configure:1902: checking for --with-libjpeg" >&5 +echo "configure:1893: checking for --with-libjpeg" >&5 no_cache=0 # Check whether --with-libjpeg or --without-libjpeg was given. if test "${with_libjpeg+set}" = set; then @@ -1945,7 +1936,7 @@ fi echo $ac_n "checking for --with-libtiff""... $ac_c" 1>&6 -echo "configure:1949: checking for --with-libtiff" >&5 +echo "configure:1940: checking for --with-libtiff" >&5 no_cache=0 # Check whether --with-libtiff or --without-libtiff was given. if test "${with_libtiff+set}" = set; then @@ -1992,7 +1983,7 @@ fi echo $ac_n "checking for --with-freetype""... $ac_c" 1>&6 -echo "configure:1996: checking for --with-freetype" >&5 +echo "configure:1987: checking for --with-freetype" >&5 no_cache=0 # Check whether --with-freetype or --without-freetype was given. if test "${with_freetype+set}" = set; then @@ -2039,7 +2030,7 @@ fi echo $ac_n "checking for --with-opengl""... $ac_c" 1>&6 -echo "configure:2043: checking for --with-opengl" >&5 +echo "configure:2034: checking for --with-opengl" >&5 no_cache=0 # Check whether --with-opengl or --without-opengl was given. if test "${with_opengl+set}" = set; then @@ -2081,7 +2072,7 @@ fi echo $ac_n "checking for --with-dmalloc""... $ac_c" 1>&6 -echo "configure:2085: checking for --with-dmalloc" >&5 +echo "configure:2076: checking for --with-dmalloc" >&5 no_cache=0 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then @@ -2120,7 +2111,7 @@ fi echo $ac_n "checking for --with-regex""... $ac_c" 1>&6 -echo "configure:2124: checking for --with-regex" >&5 +echo "configure:2115: checking for --with-regex" >&5 no_cache=0 # Check whether --with-regex or --without-regex was given. if test "${with_regex+set}" = set; then @@ -2167,7 +2158,7 @@ fi echo $ac_n "checking for --with-zlib""... $ac_c" 1>&6 -echo "configure:2171: checking for --with-zlib" >&5 +echo "configure:2162: checking for --with-zlib" >&5 no_cache=0 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then @@ -2214,7 +2205,7 @@ fi echo $ac_n "checking for --with-odbc""... $ac_c" 1>&6 -echo "configure:2218: checking for --with-odbc" >&5 +echo "configure:2209: checking for --with-odbc" >&5 no_cache=0 # Check whether --with-odbc or --without-odbc was given. if test "${with_odbc+set}" = set; then @@ -2256,7 +2247,7 @@ fi echo $ac_n "checking for --enable-shared""... $ac_c" 1>&6 -echo "configure:2260: checking for --enable-shared" >&5 +echo "configure:2251: checking for --enable-shared" >&5 no_cache=0 # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then @@ -2294,39 +2285,39 @@ fi fi - echo $ac_n "checking for --enable-burnt_name""... $ac_c" 1>&6 -echo "configure:2299: checking for --enable-burnt_name" >&5 + echo $ac_n "checking for --enable-soname""... $ac_c" 1>&6 +echo "configure:2290: checking for --enable-soname" >&5 no_cache=0 - # Check whether --enable-burnt_name or --disable-burnt_name was given. -if test "${enable_burnt_name+set}" = set; then - enableval="$enable_burnt_name" + # Check whether --enable-soname or --disable-soname was given. +if test "${enable_soname+set}" = set; then + enableval="$enable_soname" if test "$enableval" = yes; then - ac_cv_use_burnt_name='wxUSE_BURNT_NAME=yes' + ac_cv_use_soname='wxUSE_SONAME=yes' else - ac_cv_use_burnt_name='wxUSE_BURNT_NAME=no' + ac_cv_use_soname='wxUSE_SONAME=no' fi else - LINE=`grep "wxUSE_BURNT_NAME" ${wx_arg_cache_file}` + LINE=`grep "wxUSE_SONAME" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_burnt_name='wxUSE_BURNT_NAME='$DEFAULT_wxUSE_BURNT_NAME + ac_cv_use_soname='wxUSE_SONAME='$DEFAULT_wxUSE_SONAME fi - eval "$ac_cv_use_burnt_name" + eval "$ac_cv_use_soname" if test "$no_cache" != 1; then - echo $ac_cv_use_burnt_name >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_soname >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_BURNT_NAME" = yes; then + if test "$wxUSE_SONAME" = yes; then echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 @@ -2334,7 +2325,7 @@ fi echo $ac_n "checking for --enable-optimise""... $ac_c" 1>&6 -echo "configure:2338: checking for --enable-optimise" >&5 +echo "configure:2329: checking for --enable-optimise" >&5 no_cache=0 # Check whether --enable-optimise or --disable-optimise was given. if test "${enable_optimise+set}" = set; then @@ -2373,7 +2364,7 @@ fi echo $ac_n "checking for --enable-debug""... $ac_c" 1>&6 -echo "configure:2377: checking for --enable-debug" >&5 +echo "configure:2368: checking for --enable-debug" >&5 no_cache=0 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then @@ -2421,7 +2412,7 @@ fi echo $ac_n "checking for --enable-debug_flag""... $ac_c" 1>&6 -echo "configure:2425: checking for --enable-debug_flag" >&5 +echo "configure:2416: 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 @@ -2460,7 +2451,7 @@ fi echo $ac_n "checking for --enable-debug_info""... $ac_c" 1>&6 -echo "configure:2464: checking for --enable-debug_info" >&5 +echo "configure:2455: 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 @@ -2499,7 +2490,7 @@ fi echo $ac_n "checking for --enable-debug_gdb""... $ac_c" 1>&6 -echo "configure:2503: checking for --enable-debug_gdb" >&5 +echo "configure:2494: 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 @@ -2538,7 +2529,7 @@ fi echo $ac_n "checking for --enable-debug_cntxt""... $ac_c" 1>&6 -echo "configure:2542: checking for --enable-debug_cntxt" >&5 +echo "configure:2533: 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 @@ -2577,7 +2568,7 @@ fi echo $ac_n "checking for --enable-mem_tracing""... $ac_c" 1>&6 -echo "configure:2581: checking for --enable-mem_tracing" >&5 +echo "configure:2572: 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 @@ -2616,7 +2607,7 @@ fi echo $ac_n "checking for --enable-profile""... $ac_c" 1>&6 -echo "configure:2620: checking for --enable-profile" >&5 +echo "configure:2611: checking for --enable-profile" >&5 no_cache=0 # Check whether --enable-profile or --disable-profile was given. if test "${enable_profile+set}" = set; then @@ -2655,7 +2646,7 @@ fi echo $ac_n "checking for --enable-no_rtti""... $ac_c" 1>&6 -echo "configure:2659: checking for --enable-no_rtti" >&5 +echo "configure:2650: 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 @@ -2694,7 +2685,7 @@ fi echo $ac_n "checking for --enable-no_exceptions""... $ac_c" 1>&6 -echo "configure:2698: checking for --enable-no_exceptions" >&5 +echo "configure:2689: 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 @@ -2733,7 +2724,7 @@ fi echo $ac_n "checking for --enable-permissive""... $ac_c" 1>&6 -echo "configure:2737: checking for --enable-permissive" >&5 +echo "configure:2728: checking for --enable-permissive" >&5 no_cache=0 # Check whether --enable-permissive or --disable-permissive was given. if test "${enable_permissive+set}" = set; then @@ -2772,7 +2763,7 @@ fi echo $ac_n "checking for --enable-no_deps""... $ac_c" 1>&6 -echo "configure:2776: checking for --enable-no_deps" >&5 +echo "configure:2767: 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 @@ -2812,7 +2803,7 @@ fi echo $ac_n "checking for --enable-compat20""... $ac_c" 1>&6 -echo "configure:2816: checking for --enable-compat20" >&5 +echo "configure:2807: checking for --enable-compat20" >&5 no_cache=0 # Check whether --enable-compat20 or --disable-compat20 was given. if test "${enable_compat20+set}" = set; then @@ -2851,7 +2842,7 @@ fi echo $ac_n "checking for --enable-compat22""... $ac_c" 1>&6 -echo "configure:2855: checking for --enable-compat22" >&5 +echo "configure:2846: checking for --enable-compat22" >&5 no_cache=0 # Check whether --enable-compat22 or --disable-compat22 was given. if test "${enable_compat22+set}" = set; then @@ -2892,7 +2883,7 @@ fi echo $ac_n "checking for --enable-intl""... $ac_c" 1>&6 -echo "configure:2896: checking for --enable-intl" >&5 +echo "configure:2887: checking for --enable-intl" >&5 no_cache=0 # Check whether --enable-intl or --disable-intl was given. if test "${enable_intl+set}" = set; then @@ -2931,7 +2922,7 @@ fi echo $ac_n "checking for --enable-config""... $ac_c" 1>&6 -echo "configure:2935: checking for --enable-config" >&5 +echo "configure:2926: checking for --enable-config" >&5 no_cache=0 # Check whether --enable-config or --disable-config was given. if test "${enable_config+set}" = set; then @@ -2971,7 +2962,7 @@ fi echo $ac_n "checking for --enable-sockets""... $ac_c" 1>&6 -echo "configure:2975: checking for --enable-sockets" >&5 +echo "configure:2966: checking for --enable-sockets" >&5 no_cache=0 # Check whether --enable-sockets or --disable-sockets was given. if test "${enable_sockets+set}" = set; then @@ -3011,7 +3002,7 @@ fi echo $ac_n "checking for --enable-ipc""... $ac_c" 1>&6 -echo "configure:3015: checking for --enable-ipc" >&5 +echo "configure:3006: checking for --enable-ipc" >&5 no_cache=0 # Check whether --enable-ipc or --disable-ipc was given. if test "${enable_ipc+set}" = set; then @@ -3051,7 +3042,7 @@ fi echo $ac_n "checking for --enable-cmdline""... $ac_c" 1>&6 -echo "configure:3055: checking for --enable-cmdline" >&5 +echo "configure:3046: checking for --enable-cmdline" >&5 no_cache=0 # Check whether --enable-cmdline or --disable-cmdline was given. if test "${enable_cmdline+set}" = set; then @@ -3090,7 +3081,7 @@ fi echo $ac_n "checking for --enable-datetime""... $ac_c" 1>&6 -echo "configure:3094: checking for --enable-datetime" >&5 +echo "configure:3085: checking for --enable-datetime" >&5 no_cache=0 # Check whether --enable-datetime or --disable-datetime was given. if test "${enable_datetime+set}" = set; then @@ -3129,7 +3120,7 @@ fi echo $ac_n "checking for --enable-timedate""... $ac_c" 1>&6 -echo "configure:3133: checking for --enable-timedate" >&5 +echo "configure:3124: checking for --enable-timedate" >&5 no_cache=0 # Check whether --enable-timedate or --disable-timedate was given. if test "${enable_timedate+set}" = set; then @@ -3168,7 +3159,7 @@ fi echo $ac_n "checking for --enable-stopwatch""... $ac_c" 1>&6 -echo "configure:3172: checking for --enable-stopwatch" >&5 +echo "configure:3163: checking for --enable-stopwatch" >&5 no_cache=0 # Check whether --enable-stopwatch or --disable-stopwatch was given. if test "${enable_stopwatch+set}" = set; then @@ -3207,7 +3198,7 @@ fi echo $ac_n "checking for --enable-dialupman""... $ac_c" 1>&6 -echo "configure:3211: checking for --enable-dialupman" >&5 +echo "configure:3202: checking for --enable-dialupman" >&5 no_cache=0 # Check whether --enable-dialupman or --disable-dialupman was given. if test "${enable_dialupman+set}" = set; then @@ -3246,7 +3237,7 @@ fi echo $ac_n "checking for --enable-apple_ieee""... $ac_c" 1>&6 -echo "configure:3250: checking for --enable-apple_ieee" >&5 +echo "configure:3241: 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 @@ -3285,7 +3276,7 @@ fi echo $ac_n "checking for --enable-timer""... $ac_c" 1>&6 -echo "configure:3289: checking for --enable-timer" >&5 +echo "configure:3280: checking for --enable-timer" >&5 no_cache=0 # Check whether --enable-timer or --disable-timer was given. if test "${enable_timer+set}" = set; then @@ -3324,7 +3315,7 @@ fi echo $ac_n "checking for --enable-wave""... $ac_c" 1>&6 -echo "configure:3328: checking for --enable-wave" >&5 +echo "configure:3319: checking for --enable-wave" >&5 no_cache=0 # Check whether --enable-wave or --disable-wave was given. if test "${enable_wave+set}" = set; then @@ -3363,7 +3354,7 @@ fi echo $ac_n "checking for --enable-fraction""... $ac_c" 1>&6 -echo "configure:3367: checking for --enable-fraction" >&5 +echo "configure:3358: checking for --enable-fraction" >&5 no_cache=0 # Check whether --enable-fraction or --disable-fraction was given. if test "${enable_fraction+set}" = set; then @@ -3402,7 +3393,7 @@ fi echo $ac_n "checking for --enable-dynlib""... $ac_c" 1>&6 -echo "configure:3406: checking for --enable-dynlib" >&5 +echo "configure:3397: checking for --enable-dynlib" >&5 no_cache=0 # Check whether --enable-dynlib or --disable-dynlib was given. if test "${enable_dynlib+set}" = set; then @@ -3441,7 +3432,7 @@ fi echo $ac_n "checking for --enable-longlong""... $ac_c" 1>&6 -echo "configure:3445: checking for --enable-longlong" >&5 +echo "configure:3436: checking for --enable-longlong" >&5 no_cache=0 # Check whether --enable-longlong or --disable-longlong was given. if test "${enable_longlong+set}" = set; then @@ -3480,7 +3471,7 @@ fi echo $ac_n "checking for --enable-geometry""... $ac_c" 1>&6 -echo "configure:3484: checking for --enable-geometry" >&5 +echo "configure:3475: checking for --enable-geometry" >&5 no_cache=0 # Check whether --enable-geometry or --disable-geometry was given. if test "${enable_geometry+set}" = set; then @@ -3519,7 +3510,7 @@ fi echo $ac_n "checking for --enable-log""... $ac_c" 1>&6 -echo "configure:3523: checking for --enable-log" >&5 +echo "configure:3514: checking for --enable-log" >&5 no_cache=0 # Check whether --enable-log or --disable-log was given. if test "${enable_log+set}" = set; then @@ -3558,7 +3549,7 @@ fi echo $ac_n "checking for --enable-streams""... $ac_c" 1>&6 -echo "configure:3562: checking for --enable-streams" >&5 +echo "configure:3553: checking for --enable-streams" >&5 no_cache=0 # Check whether --enable-streams or --disable-streams was given. if test "${enable_streams+set}" = set; then @@ -3597,7 +3588,7 @@ fi echo $ac_n "checking for --enable-file""... $ac_c" 1>&6 -echo "configure:3601: checking for --enable-file" >&5 +echo "configure:3592: checking for --enable-file" >&5 no_cache=0 # Check whether --enable-file or --disable-file was given. if test "${enable_file+set}" = set; then @@ -3636,7 +3627,7 @@ fi echo $ac_n "checking for --enable-ffile""... $ac_c" 1>&6 -echo "configure:3640: checking for --enable-ffile" >&5 +echo "configure:3631: checking for --enable-ffile" >&5 no_cache=0 # Check whether --enable-ffile or --disable-ffile was given. if test "${enable_ffile+set}" = set; then @@ -3675,7 +3666,7 @@ fi echo $ac_n "checking for --enable-textfile""... $ac_c" 1>&6 -echo "configure:3679: checking for --enable-textfile" >&5 +echo "configure:3670: checking for --enable-textfile" >&5 no_cache=0 # Check whether --enable-textfile or --disable-textfile was given. if test "${enable_textfile+set}" = set; then @@ -3714,7 +3705,7 @@ fi echo $ac_n "checking for --enable-fontmap""... $ac_c" 1>&6 -echo "configure:3718: checking for --enable-fontmap" >&5 +echo "configure:3709: checking for --enable-fontmap" >&5 no_cache=0 # Check whether --enable-fontmap or --disable-fontmap was given. if test "${enable_fontmap+set}" = set; then @@ -3753,7 +3744,7 @@ fi echo $ac_n "checking for --enable-unicode""... $ac_c" 1>&6 -echo "configure:3757: checking for --enable-unicode" >&5 +echo "configure:3748: checking for --enable-unicode" >&5 no_cache=0 # Check whether --enable-unicode or --disable-unicode was given. if test "${enable_unicode+set}" = set; then @@ -3792,7 +3783,7 @@ fi echo $ac_n "checking for --enable-wcsrtombs""... $ac_c" 1>&6 -echo "configure:3796: checking for --enable-wcsrtombs" >&5 +echo "configure:3787: checking for --enable-wcsrtombs" >&5 no_cache=0 # Check whether --enable-wcsrtombs or --disable-wcsrtombs was given. if test "${enable_wcsrtombs+set}" = set; then @@ -3831,7 +3822,7 @@ fi echo $ac_n "checking for --enable-wxprintfv""... $ac_c" 1>&6 -echo "configure:3835: checking for --enable-wxprintfv" >&5 +echo "configure:3826: checking for --enable-wxprintfv" >&5 no_cache=0 # Check whether --enable-wxprintfv or --disable-wxprintfv was given. if test "${enable_wxprintfv+set}" = set; then @@ -3870,7 +3861,7 @@ fi echo $ac_n "checking for --enable-std_iostreams""... $ac_c" 1>&6 -echo "configure:3874: checking for --enable-std_iostreams" >&5 +echo "configure:3865: 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 @@ -3909,7 +3900,7 @@ fi echo $ac_n "checking for --enable-filesystem""... $ac_c" 1>&6 -echo "configure:3913: checking for --enable-filesystem" >&5 +echo "configure:3904: checking for --enable-filesystem" >&5 no_cache=0 # Check whether --enable-filesystem or --disable-filesystem was given. if test "${enable_filesystem+set}" = set; then @@ -3948,7 +3939,7 @@ fi echo $ac_n "checking for --enable-fs_inet""... $ac_c" 1>&6 -echo "configure:3952: checking for --enable-fs_inet" >&5 +echo "configure:3943: 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 @@ -3987,7 +3978,7 @@ fi echo $ac_n "checking for --enable-fs_zip""... $ac_c" 1>&6 -echo "configure:3991: checking for --enable-fs_zip" >&5 +echo "configure:3982: 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 @@ -4026,7 +4017,7 @@ fi echo $ac_n "checking for --enable-zipstream""... $ac_c" 1>&6 -echo "configure:4030: checking for --enable-zipstream" >&5 +echo "configure:4021: checking for --enable-zipstream" >&5 no_cache=0 # Check whether --enable-zipstream or --disable-zipstream was given. if test "${enable_zipstream+set}" = set; then @@ -4066,7 +4057,7 @@ fi echo $ac_n "checking for --enable-catch_segvs""... $ac_c" 1>&6 -echo "configure:4070: checking for --enable-catch_segvs" >&5 +echo "configure:4061: checking for --enable-catch_segvs" >&5 no_cache=0 # Check whether --enable-catch_segvs or --disable-catch_segvs was given. if test "${enable_catch_segvs+set}" = set; then @@ -4105,7 +4096,7 @@ fi echo $ac_n "checking for --enable-snglinst""... $ac_c" 1>&6 -echo "configure:4109: checking for --enable-snglinst" >&5 +echo "configure:4100: checking for --enable-snglinst" >&5 no_cache=0 # Check whether --enable-snglinst or --disable-snglinst was given. if test "${enable_snglinst+set}" = set; then @@ -4145,7 +4136,7 @@ fi echo $ac_n "checking for --enable-mimetype""... $ac_c" 1>&6 -echo "configure:4149: checking for --enable-mimetype" >&5 +echo "configure:4140: checking for --enable-mimetype" >&5 no_cache=0 # Check whether --enable-mimetype or --disable-mimetype was given. if test "${enable_mimetype+set}" = set; then @@ -4184,7 +4175,7 @@ fi echo $ac_n "checking for --enable-system_options""... $ac_c" 1>&6 -echo "configure:4188: checking for --enable-system_options" >&5 +echo "configure:4179: checking for --enable-system_options" >&5 no_cache=0 # Check whether --enable-system_options or --disable-system_options was given. if test "${enable_system_options+set}" = set; then @@ -4225,7 +4216,7 @@ fi echo $ac_n "checking for --enable-threads""... $ac_c" 1>&6 -echo "configure:4229: checking for --enable-threads" >&5 +echo "configure:4220: checking for --enable-threads" >&5 no_cache=0 # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then @@ -4264,7 +4255,7 @@ fi echo $ac_n "checking for --enable-serial""... $ac_c" 1>&6 -echo "configure:4268: checking for --enable-serial" >&5 +echo "configure:4259: checking for --enable-serial" >&5 no_cache=0 # Check whether --enable-serial or --disable-serial was given. if test "${enable_serial+set}" = set; then @@ -4307,7 +4298,7 @@ if test "$wxUSE_GUI" = "yes"; then echo $ac_n "checking for --enable-docview""... $ac_c" 1>&6 -echo "configure:4311: checking for --enable-docview" >&5 +echo "configure:4302: checking for --enable-docview" >&5 no_cache=0 # Check whether --enable-docview or --disable-docview was given. if test "${enable_docview+set}" = set; then @@ -4346,7 +4337,7 @@ fi echo $ac_n "checking for --enable-help""... $ac_c" 1>&6 -echo "configure:4350: checking for --enable-help" >&5 +echo "configure:4341: checking for --enable-help" >&5 no_cache=0 # Check whether --enable-help or --disable-help was given. if test "${enable_help+set}" = set; then @@ -4385,7 +4376,7 @@ fi echo $ac_n "checking for --enable-mshtmlhelp""... $ac_c" 1>&6 -echo "configure:4389: checking for --enable-mshtmlhelp" >&5 +echo "configure:4380: checking for --enable-mshtmlhelp" >&5 no_cache=0 # Check whether --enable-mshtmlhelp or --disable-mshtmlhelp was given. if test "${enable_mshtmlhelp+set}" = set; then @@ -4424,7 +4415,7 @@ fi echo $ac_n "checking for --enable-html""... $ac_c" 1>&6 -echo "configure:4428: checking for --enable-html" >&5 +echo "configure:4419: checking for --enable-html" >&5 no_cache=0 # Check whether --enable-html or --disable-html was given. if test "${enable_html+set}" = set; then @@ -4463,7 +4454,7 @@ fi echo $ac_n "checking for --enable-htmlhelp""... $ac_c" 1>&6 -echo "configure:4467: checking for --enable-htmlhelp" >&5 +echo "configure:4458: checking for --enable-htmlhelp" >&5 no_cache=0 # Check whether --enable-htmlhelp or --disable-htmlhelp was given. if test "${enable_htmlhelp+set}" = set; then @@ -4502,7 +4493,7 @@ fi echo $ac_n "checking for --enable-constraints""... $ac_c" 1>&6 -echo "configure:4506: checking for --enable-constraints" >&5 +echo "configure:4497: checking for --enable-constraints" >&5 no_cache=0 # Check whether --enable-constraints or --disable-constraints was given. if test "${enable_constraints+set}" = set; then @@ -4541,7 +4532,7 @@ fi echo $ac_n "checking for --enable-printarch""... $ac_c" 1>&6 -echo "configure:4545: checking for --enable-printarch" >&5 +echo "configure:4536: checking for --enable-printarch" >&5 no_cache=0 # Check whether --enable-printarch or --disable-printarch was given. if test "${enable_printarch+set}" = set; then @@ -4580,7 +4571,7 @@ fi echo $ac_n "checking for --enable-mdi""... $ac_c" 1>&6 -echo "configure:4584: checking for --enable-mdi" >&5 +echo "configure:4575: checking for --enable-mdi" >&5 no_cache=0 # Check whether --enable-mdi or --disable-mdi was given. if test "${enable_mdi+set}" = set; then @@ -4619,7 +4610,7 @@ fi echo $ac_n "checking for --enable-loggui""... $ac_c" 1>&6 -echo "configure:4623: checking for --enable-loggui" >&5 +echo "configure:4614: checking for --enable-loggui" >&5 no_cache=0 # Check whether --enable-loggui or --disable-loggui was given. if test "${enable_loggui+set}" = set; then @@ -4658,7 +4649,7 @@ fi echo $ac_n "checking for --enable-logwin""... $ac_c" 1>&6 -echo "configure:4662: checking for --enable-logwin" >&5 +echo "configure:4653: checking for --enable-logwin" >&5 no_cache=0 # Check whether --enable-logwin or --disable-logwin was given. if test "${enable_logwin+set}" = set; then @@ -4698,7 +4689,7 @@ fi echo $ac_n "checking for --enable-postscript""... $ac_c" 1>&6 -echo "configure:4702: checking for --enable-postscript" >&5 +echo "configure:4693: checking for --enable-postscript" >&5 no_cache=0 # Check whether --enable-postscript or --disable-postscript was given. if test "${enable_postscript+set}" = set; then @@ -4740,7 +4731,7 @@ fi echo $ac_n "checking for --enable-prologio""... $ac_c" 1>&6 -echo "configure:4744: checking for --enable-prologio" >&5 +echo "configure:4735: checking for --enable-prologio" >&5 no_cache=0 # Check whether --enable-prologio or --disable-prologio was given. if test "${enable_prologio+set}" = set; then @@ -4779,7 +4770,7 @@ fi echo $ac_n "checking for --enable-resources""... $ac_c" 1>&6 -echo "configure:4783: checking for --enable-resources" >&5 +echo "configure:4774: checking for --enable-resources" >&5 no_cache=0 # Check whether --enable-resources or --disable-resources was given. if test "${enable_resources+set}" = set; then @@ -4819,7 +4810,7 @@ fi echo $ac_n "checking for --enable-xresources""... $ac_c" 1>&6 -echo "configure:4823: checking for --enable-xresources" >&5 +echo "configure:4814: checking for --enable-xresources" >&5 no_cache=0 # Check whether --enable-xresources or --disable-xresources was given. if test "${enable_xresources+set}" = set; then @@ -4860,7 +4851,7 @@ fi echo $ac_n "checking for --enable-clipboard""... $ac_c" 1>&6 -echo "configure:4864: checking for --enable-clipboard" >&5 +echo "configure:4855: checking for --enable-clipboard" >&5 no_cache=0 # Check whether --enable-clipboard or --disable-clipboard was given. if test "${enable_clipboard+set}" = set; then @@ -4899,7 +4890,7 @@ fi echo $ac_n "checking for --enable-dnd""... $ac_c" 1>&6 -echo "configure:4903: checking for --enable-dnd" >&5 +echo "configure:4894: checking for --enable-dnd" >&5 no_cache=0 # Check whether --enable-dnd or --disable-dnd was given. if test "${enable_dnd+set}" = set; then @@ -4938,7 +4929,7 @@ fi echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6 -echo "configure:4942: checking for --enable-metafile" >&5 +echo "configure:4933: checking for --enable-metafile" >&5 no_cache=0 # Check whether --enable-metafile or --disable-metafile was given. if test "${enable_metafile+set}" = set; then @@ -4978,7 +4969,7 @@ fi echo $ac_n "checking for --enable-treelayout""... $ac_c" 1>&6 -echo "configure:4982: checking for --enable-treelayout" >&5 +echo "configure:4973: checking for --enable-treelayout" >&5 no_cache=0 # Check whether --enable-treelayout or --disable-treelayout was given. if test "${enable_treelayout+set}" = set; then @@ -5019,7 +5010,7 @@ fi echo $ac_n "checking for --enable-controls""... $ac_c" 1>&6 -echo "configure:5023: checking for --enable-controls" >&5 +echo "configure:5014: checking for --enable-controls" >&5 no_cache=0 # Check whether --enable-controls or --disable-controls was given. if test "${enable_controls+set}" = set; then @@ -5137,7 +5128,7 @@ fi echo $ac_n "checking for --enable-accel""... $ac_c" 1>&6 -echo "configure:5141: checking for --enable-accel" >&5 +echo "configure:5132: checking for --enable-accel" >&5 no_cache=0 # Check whether --enable-accel or --disable-accel was given. if test "${enable_accel+set}" = set; then @@ -5176,7 +5167,7 @@ fi echo $ac_n "checking for --enable-button""... $ac_c" 1>&6 -echo "configure:5180: checking for --enable-button" >&5 +echo "configure:5171: checking for --enable-button" >&5 no_cache=0 # Check whether --enable-button or --disable-button was given. if test "${enable_button+set}" = set; then @@ -5215,7 +5206,7 @@ fi echo $ac_n "checking for --enable-bmpbutton""... $ac_c" 1>&6 -echo "configure:5219: checking for --enable-bmpbutton" >&5 +echo "configure:5210: checking for --enable-bmpbutton" >&5 no_cache=0 # Check whether --enable-bmpbutton or --disable-bmpbutton was given. if test "${enable_bmpbutton+set}" = set; then @@ -5254,7 +5245,7 @@ fi echo $ac_n "checking for --enable-calendar""... $ac_c" 1>&6 -echo "configure:5258: checking for --enable-calendar" >&5 +echo "configure:5249: checking for --enable-calendar" >&5 no_cache=0 # Check whether --enable-calendar or --disable-calendar was given. if test "${enable_calendar+set}" = set; then @@ -5293,7 +5284,7 @@ fi echo $ac_n "checking for --enable-caret""... $ac_c" 1>&6 -echo "configure:5297: checking for --enable-caret" >&5 +echo "configure:5288: checking for --enable-caret" >&5 no_cache=0 # Check whether --enable-caret or --disable-caret was given. if test "${enable_caret+set}" = set; then @@ -5332,7 +5323,7 @@ fi echo $ac_n "checking for --enable-checkbox""... $ac_c" 1>&6 -echo "configure:5336: checking for --enable-checkbox" >&5 +echo "configure:5327: checking for --enable-checkbox" >&5 no_cache=0 # Check whether --enable-checkbox or --disable-checkbox was given. if test "${enable_checkbox+set}" = set; then @@ -5371,7 +5362,7 @@ fi echo $ac_n "checking for --enable-checklst""... $ac_c" 1>&6 -echo "configure:5375: checking for --enable-checklst" >&5 +echo "configure:5366: checking for --enable-checklst" >&5 no_cache=0 # Check whether --enable-checklst or --disable-checklst was given. if test "${enable_checklst+set}" = set; then @@ -5410,7 +5401,7 @@ fi echo $ac_n "checking for --enable-choice""... $ac_c" 1>&6 -echo "configure:5414: checking for --enable-choice" >&5 +echo "configure:5405: checking for --enable-choice" >&5 no_cache=0 # Check whether --enable-choice or --disable-choice was given. if test "${enable_choice+set}" = set; then @@ -5449,7 +5440,7 @@ fi echo $ac_n "checking for --enable-combobox""... $ac_c" 1>&6 -echo "configure:5453: checking for --enable-combobox" >&5 +echo "configure:5444: checking for --enable-combobox" >&5 no_cache=0 # Check whether --enable-combobox or --disable-combobox was given. if test "${enable_combobox+set}" = set; then @@ -5488,7 +5479,7 @@ fi echo $ac_n "checking for --enable-gauge""... $ac_c" 1>&6 -echo "configure:5492: checking for --enable-gauge" >&5 +echo "configure:5483: checking for --enable-gauge" >&5 no_cache=0 # Check whether --enable-gauge or --disable-gauge was given. if test "${enable_gauge+set}" = set; then @@ -5527,7 +5518,7 @@ fi echo $ac_n "checking for --enable-grid""... $ac_c" 1>&6 -echo "configure:5531: checking for --enable-grid" >&5 +echo "configure:5522: checking for --enable-grid" >&5 no_cache=0 # Check whether --enable-grid or --disable-grid was given. if test "${enable_grid+set}" = set; then @@ -5566,7 +5557,7 @@ fi echo $ac_n "checking for --enable-newgrid""... $ac_c" 1>&6 -echo "configure:5570: checking for --enable-newgrid" >&5 +echo "configure:5561: checking for --enable-newgrid" >&5 no_cache=0 # Check whether --enable-newgrid or --disable-newgrid was given. if test "${enable_newgrid+set}" = set; then @@ -5605,7 +5596,7 @@ fi echo $ac_n "checking for --enable-imaglist""... $ac_c" 1>&6 -echo "configure:5609: checking for --enable-imaglist" >&5 +echo "configure:5600: checking for --enable-imaglist" >&5 no_cache=0 # Check whether --enable-imaglist or --disable-imaglist was given. if test "${enable_imaglist+set}" = set; then @@ -5644,7 +5635,7 @@ fi echo $ac_n "checking for --enable-listbox""... $ac_c" 1>&6 -echo "configure:5648: checking for --enable-listbox" >&5 +echo "configure:5639: checking for --enable-listbox" >&5 no_cache=0 # Check whether --enable-listbox or --disable-listbox was given. if test "${enable_listbox+set}" = set; then @@ -5683,7 +5674,7 @@ fi echo $ac_n "checking for --enable-listctrl""... $ac_c" 1>&6 -echo "configure:5687: checking for --enable-listctrl" >&5 +echo "configure:5678: checking for --enable-listctrl" >&5 no_cache=0 # Check whether --enable-listctrl or --disable-listctrl was given. if test "${enable_listctrl+set}" = set; then @@ -5722,7 +5713,7 @@ fi echo $ac_n "checking for --enable-notebook""... $ac_c" 1>&6 -echo "configure:5726: checking for --enable-notebook" >&5 +echo "configure:5717: checking for --enable-notebook" >&5 no_cache=0 # Check whether --enable-notebook or --disable-notebook was given. if test "${enable_notebook+set}" = set; then @@ -5761,7 +5752,7 @@ fi echo $ac_n "checking for --enable-propsheet""... $ac_c" 1>&6 -echo "configure:5765: checking for --enable-propsheet" >&5 +echo "configure:5756: checking for --enable-propsheet" >&5 no_cache=0 # Check whether --enable-propsheet or --disable-propsheet was given. if test "${enable_propsheet+set}" = set; then @@ -5800,7 +5791,7 @@ fi echo $ac_n "checking for --enable-radiobox""... $ac_c" 1>&6 -echo "configure:5804: checking for --enable-radiobox" >&5 +echo "configure:5795: checking for --enable-radiobox" >&5 no_cache=0 # Check whether --enable-radiobox or --disable-radiobox was given. if test "${enable_radiobox+set}" = set; then @@ -5839,7 +5830,7 @@ fi echo $ac_n "checking for --enable-radiobtn""... $ac_c" 1>&6 -echo "configure:5843: checking for --enable-radiobtn" >&5 +echo "configure:5834: checking for --enable-radiobtn" >&5 no_cache=0 # Check whether --enable-radiobtn or --disable-radiobtn was given. if test "${enable_radiobtn+set}" = set; then @@ -5878,7 +5869,7 @@ fi echo $ac_n "checking for --enable-sash""... $ac_c" 1>&6 -echo "configure:5882: checking for --enable-sash" >&5 +echo "configure:5873: checking for --enable-sash" >&5 no_cache=0 # Check whether --enable-sash or --disable-sash was given. if test "${enable_sash+set}" = set; then @@ -5917,7 +5908,7 @@ fi echo $ac_n "checking for --enable-scrollbar""... $ac_c" 1>&6 -echo "configure:5921: checking for --enable-scrollbar" >&5 +echo "configure:5912: checking for --enable-scrollbar" >&5 no_cache=0 # Check whether --enable-scrollbar or --disable-scrollbar was given. if test "${enable_scrollbar+set}" = set; then @@ -5956,7 +5947,7 @@ fi echo $ac_n "checking for --enable-slider""... $ac_c" 1>&6 -echo "configure:5960: checking for --enable-slider" >&5 +echo "configure:5951: checking for --enable-slider" >&5 no_cache=0 # Check whether --enable-slider or --disable-slider was given. if test "${enable_slider+set}" = set; then @@ -5995,7 +5986,7 @@ fi echo $ac_n "checking for --enable-spinbtn""... $ac_c" 1>&6 -echo "configure:5999: checking for --enable-spinbtn" >&5 +echo "configure:5990: checking for --enable-spinbtn" >&5 no_cache=0 # Check whether --enable-spinbtn or --disable-spinbtn was given. if test "${enable_spinbtn+set}" = set; then @@ -6034,7 +6025,7 @@ fi echo $ac_n "checking for --enable-spinctrl""... $ac_c" 1>&6 -echo "configure:6038: checking for --enable-spinctrl" >&5 +echo "configure:6029: checking for --enable-spinctrl" >&5 no_cache=0 # Check whether --enable-spinctrl or --disable-spinctrl was given. if test "${enable_spinctrl+set}" = set; then @@ -6073,7 +6064,7 @@ fi echo $ac_n "checking for --enable-splitter""... $ac_c" 1>&6 -echo "configure:6077: checking for --enable-splitter" >&5 +echo "configure:6068: checking for --enable-splitter" >&5 no_cache=0 # Check whether --enable-splitter or --disable-splitter was given. if test "${enable_splitter+set}" = set; then @@ -6112,7 +6103,7 @@ fi echo $ac_n "checking for --enable-statbmp""... $ac_c" 1>&6 -echo "configure:6116: checking for --enable-statbmp" >&5 +echo "configure:6107: checking for --enable-statbmp" >&5 no_cache=0 # Check whether --enable-statbmp or --disable-statbmp was given. if test "${enable_statbmp+set}" = set; then @@ -6151,7 +6142,7 @@ fi echo $ac_n "checking for --enable-statbox""... $ac_c" 1>&6 -echo "configure:6155: checking for --enable-statbox" >&5 +echo "configure:6146: checking for --enable-statbox" >&5 no_cache=0 # Check whether --enable-statbox or --disable-statbox was given. if test "${enable_statbox+set}" = set; then @@ -6190,7 +6181,7 @@ fi echo $ac_n "checking for --enable-statline""... $ac_c" 1>&6 -echo "configure:6194: checking for --enable-statline" >&5 +echo "configure:6185: checking for --enable-statline" >&5 no_cache=0 # Check whether --enable-statline or --disable-statline was given. if test "${enable_statline+set}" = set; then @@ -6229,7 +6220,7 @@ fi echo $ac_n "checking for --enable-stattext""... $ac_c" 1>&6 -echo "configure:6233: checking for --enable-stattext" >&5 +echo "configure:6224: checking for --enable-stattext" >&5 no_cache=0 # Check whether --enable-stattext or --disable-stattext was given. if test "${enable_stattext+set}" = set; then @@ -6268,7 +6259,7 @@ fi echo $ac_n "checking for --enable-statusbar""... $ac_c" 1>&6 -echo "configure:6272: checking for --enable-statusbar" >&5 +echo "configure:6263: checking for --enable-statusbar" >&5 no_cache=0 # Check whether --enable-statusbar or --disable-statusbar was given. if test "${enable_statusbar+set}" = set; then @@ -6307,7 +6298,7 @@ fi echo $ac_n "checking for --enable-tabdialog""... $ac_c" 1>&6 -echo "configure:6311: checking for --enable-tabdialog" >&5 +echo "configure:6302: checking for --enable-tabdialog" >&5 no_cache=0 # Check whether --enable-tabdialog or --disable-tabdialog was given. if test "${enable_tabdialog+set}" = set; then @@ -6346,7 +6337,7 @@ fi echo $ac_n "checking for --enable-textctrl""... $ac_c" 1>&6 -echo "configure:6350: checking for --enable-textctrl" >&5 +echo "configure:6341: checking for --enable-textctrl" >&5 no_cache=0 # Check whether --enable-textctrl or --disable-textctrl was given. if test "${enable_textctrl+set}" = set; then @@ -6385,7 +6376,7 @@ fi echo $ac_n "checking for --enable-togglebtn""... $ac_c" 1>&6 -echo "configure:6389: checking for --enable-togglebtn" >&5 +echo "configure:6380: checking for --enable-togglebtn" >&5 no_cache=0 # Check whether --enable-togglebtn or --disable-togglebtn was given. if test "${enable_togglebtn+set}" = set; then @@ -6424,7 +6415,7 @@ fi echo $ac_n "checking for --enable-toolbar""... $ac_c" 1>&6 -echo "configure:6428: checking for --enable-toolbar" >&5 +echo "configure:6419: checking for --enable-toolbar" >&5 no_cache=0 # Check whether --enable-toolbar or --disable-toolbar was given. if test "${enable_toolbar+set}" = set; then @@ -6463,7 +6454,7 @@ fi echo $ac_n "checking for --enable-tbarnative""... $ac_c" 1>&6 -echo "configure:6467: checking for --enable-tbarnative" >&5 +echo "configure:6458: checking for --enable-tbarnative" >&5 no_cache=0 # Check whether --enable-tbarnative or --disable-tbarnative was given. if test "${enable_tbarnative+set}" = set; then @@ -6502,7 +6493,7 @@ fi echo $ac_n "checking for --enable-tbarsmpl""... $ac_c" 1>&6 -echo "configure:6506: checking for --enable-tbarsmpl" >&5 +echo "configure:6497: checking for --enable-tbarsmpl" >&5 no_cache=0 # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given. if test "${enable_tbarsmpl+set}" = set; then @@ -6541,7 +6532,7 @@ fi echo $ac_n "checking for --enable-treectrl""... $ac_c" 1>&6 -echo "configure:6545: checking for --enable-treectrl" >&5 +echo "configure:6536: checking for --enable-treectrl" >&5 no_cache=0 # Check whether --enable-treectrl or --disable-treectrl was given. if test "${enable_treectrl+set}" = set; then @@ -6580,7 +6571,7 @@ fi echo $ac_n "checking for --enable-popupwin""... $ac_c" 1>&6 -echo "configure:6584: checking for --enable-popupwin" >&5 +echo "configure:6575: checking for --enable-popupwin" >&5 no_cache=0 # Check whether --enable-popupwin or --disable-popupwin was given. if test "${enable_popupwin+set}" = set; then @@ -6621,7 +6612,7 @@ fi echo $ac_n "checking for --enable-commondlg""... $ac_c" 1>&6 -echo "configure:6625: checking for --enable-commondlg" >&5 +echo "configure:6616: checking for --enable-commondlg" >&5 no_cache=0 # Check whether --enable-commondlg or --disable-commondlg was given. if test "${enable_commondlg+set}" = set; then @@ -6660,7 +6651,7 @@ fi echo $ac_n "checking for --enable-choicedlg""... $ac_c" 1>&6 -echo "configure:6664: checking for --enable-choicedlg" >&5 +echo "configure:6655: checking for --enable-choicedlg" >&5 no_cache=0 # Check whether --enable-choicedlg or --disable-choicedlg was given. if test "${enable_choicedlg+set}" = set; then @@ -6699,7 +6690,7 @@ fi echo $ac_n "checking for --enable-coldlg""... $ac_c" 1>&6 -echo "configure:6703: checking for --enable-coldlg" >&5 +echo "configure:6694: checking for --enable-coldlg" >&5 no_cache=0 # Check whether --enable-coldlg or --disable-coldlg was given. if test "${enable_coldlg+set}" = set; then @@ -6738,7 +6729,7 @@ fi echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6 -echo "configure:6742: checking for --enable-filedlg" >&5 +echo "configure:6733: checking for --enable-filedlg" >&5 no_cache=0 # Check whether --enable-filedlg or --disable-filedlg was given. if test "${enable_filedlg+set}" = set; then @@ -6777,7 +6768,7 @@ fi echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6 -echo "configure:6781: checking for --enable-filedlg" >&5 +echo "configure:6772: checking for --enable-filedlg" >&5 no_cache=0 # Check whether --enable-filedlg or --disable-filedlg was given. if test "${enable_filedlg+set}" = set; then @@ -6816,7 +6807,7 @@ fi echo $ac_n "checking for --enable-fontdlg""... $ac_c" 1>&6 -echo "configure:6820: checking for --enable-fontdlg" >&5 +echo "configure:6811: checking for --enable-fontdlg" >&5 no_cache=0 # Check whether --enable-fontdlg or --disable-fontdlg was given. if test "${enable_fontdlg+set}" = set; then @@ -6855,7 +6846,7 @@ fi echo $ac_n "checking for --enable-dirdlg""... $ac_c" 1>&6 -echo "configure:6859: checking for --enable-dirdlg" >&5 +echo "configure:6850: checking for --enable-dirdlg" >&5 no_cache=0 # Check whether --enable-dirdlg or --disable-dirdlg was given. if test "${enable_dirdlg+set}" = set; then @@ -6894,7 +6885,7 @@ fi echo $ac_n "checking for --enable-msgdlg""... $ac_c" 1>&6 -echo "configure:6898: checking for --enable-msgdlg" >&5 +echo "configure:6889: checking for --enable-msgdlg" >&5 no_cache=0 # Check whether --enable-msgdlg or --disable-msgdlg was given. if test "${enable_msgdlg+set}" = set; then @@ -6933,7 +6924,7 @@ fi echo $ac_n "checking for --enable-numberdlg""... $ac_c" 1>&6 -echo "configure:6937: checking for --enable-numberdlg" >&5 +echo "configure:6928: checking for --enable-numberdlg" >&5 no_cache=0 # Check whether --enable-numberdlg or --disable-numberdlg was given. if test "${enable_numberdlg+set}" = set; then @@ -6972,7 +6963,7 @@ fi echo $ac_n "checking for --enable-splash""... $ac_c" 1>&6 -echo "configure:6976: checking for --enable-splash" >&5 +echo "configure:6967: checking for --enable-splash" >&5 no_cache=0 # Check whether --enable-splash or --disable-splash was given. if test "${enable_splash+set}" = set; then @@ -7011,7 +7002,7 @@ fi echo $ac_n "checking for --enable-textdlg""... $ac_c" 1>&6 -echo "configure:7015: checking for --enable-textdlg" >&5 +echo "configure:7006: checking for --enable-textdlg" >&5 no_cache=0 # Check whether --enable-textdlg or --disable-textdlg was given. if test "${enable_textdlg+set}" = set; then @@ -7050,7 +7041,7 @@ fi echo $ac_n "checking for --enable-tipdlg""... $ac_c" 1>&6 -echo "configure:7054: checking for --enable-tipdlg" >&5 +echo "configure:7045: checking for --enable-tipdlg" >&5 no_cache=0 # Check whether --enable-tipdlg or --disable-tipdlg was given. if test "${enable_tipdlg+set}" = set; then @@ -7089,7 +7080,7 @@ fi echo $ac_n "checking for --enable-progressdlg""... $ac_c" 1>&6 -echo "configure:7093: checking for --enable-progressdlg" >&5 +echo "configure:7084: checking for --enable-progressdlg" >&5 no_cache=0 # Check whether --enable-progressdlg or --disable-progressdlg was given. if test "${enable_progressdlg+set}" = set; then @@ -7128,7 +7119,7 @@ fi echo $ac_n "checking for --enable-wizarddlg""... $ac_c" 1>&6 -echo "configure:7132: checking for --enable-wizarddlg" >&5 +echo "configure:7123: checking for --enable-wizarddlg" >&5 no_cache=0 # Check whether --enable-wizarddlg or --disable-wizarddlg was given. if test "${enable_wizarddlg+set}" = set; then @@ -7169,7 +7160,7 @@ fi echo $ac_n "checking for --enable-menus""... $ac_c" 1>&6 -echo "configure:7173: checking for --enable-menus" >&5 +echo "configure:7164: checking for --enable-menus" >&5 no_cache=0 # Check whether --enable-menus or --disable-menus was given. if test "${enable_menus+set}" = set; then @@ -7208,7 +7199,7 @@ fi echo $ac_n "checking for --enable-miniframe""... $ac_c" 1>&6 -echo "configure:7212: checking for --enable-miniframe" >&5 +echo "configure:7203: checking for --enable-miniframe" >&5 no_cache=0 # Check whether --enable-miniframe or --disable-miniframe was given. if test "${enable_miniframe+set}" = set; then @@ -7247,7 +7238,7 @@ fi echo $ac_n "checking for --enable-tooltips""... $ac_c" 1>&6 -echo "configure:7251: checking for --enable-tooltips" >&5 +echo "configure:7242: checking for --enable-tooltips" >&5 no_cache=0 # Check whether --enable-tooltips or --disable-tooltips was given. if test "${enable_tooltips+set}" = set; then @@ -7286,7 +7277,7 @@ fi echo $ac_n "checking for --enable-splines""... $ac_c" 1>&6 -echo "configure:7290: checking for --enable-splines" >&5 +echo "configure:7281: checking for --enable-splines" >&5 no_cache=0 # Check whether --enable-splines or --disable-splines was given. if test "${enable_splines+set}" = set; then @@ -7325,7 +7316,7 @@ fi echo $ac_n "checking for --enable-validators""... $ac_c" 1>&6 -echo "configure:7329: checking for --enable-validators" >&5 +echo "configure:7320: checking for --enable-validators" >&5 no_cache=0 # Check whether --enable-validators or --disable-validators was given. if test "${enable_validators+set}" = set; then @@ -7364,7 +7355,7 @@ fi echo $ac_n "checking for --enable-busyinfo""... $ac_c" 1>&6 -echo "configure:7368: checking for --enable-busyinfo" >&5 +echo "configure:7359: checking for --enable-busyinfo" >&5 no_cache=0 # Check whether --enable-busyinfo or --disable-busyinfo was given. if test "${enable_busyinfo+set}" = set; then @@ -7403,7 +7394,7 @@ fi echo $ac_n "checking for --enable-joystick""... $ac_c" 1>&6 -echo "configure:7407: checking for --enable-joystick" >&5 +echo "configure:7398: checking for --enable-joystick" >&5 no_cache=0 # Check whether --enable-joystick or --disable-joystick was given. if test "${enable_joystick+set}" = set; then @@ -7442,7 +7433,7 @@ fi echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6 -echo "configure:7446: checking for --enable-metafile" >&5 +echo "configure:7437: checking for --enable-metafile" >&5 no_cache=0 # Check whether --enable-metafile or --disable-metafile was given. if test "${enable_metafile+set}" = set; then @@ -7481,7 +7472,7 @@ fi echo $ac_n "checking for --enable-dragimage""... $ac_c" 1>&6 -echo "configure:7485: checking for --enable-dragimage" >&5 +echo "configure:7476: checking for --enable-dragimage" >&5 no_cache=0 # Check whether --enable-dragimage or --disable-dragimage was given. if test "${enable_dragimage+set}" = set; then @@ -7522,7 +7513,7 @@ fi echo $ac_n "checking for --enable-image""... $ac_c" 1>&6 -echo "configure:7526: checking for --enable-image" >&5 +echo "configure:7517: checking for --enable-image" >&5 no_cache=0 # Check whether --enable-image or --disable-image was given. if test "${enable_image+set}" = set; then @@ -7561,7 +7552,7 @@ fi echo $ac_n "checking for --enable-gif""... $ac_c" 1>&6 -echo "configure:7565: checking for --enable-gif" >&5 +echo "configure:7556: checking for --enable-gif" >&5 no_cache=0 # Check whether --enable-gif or --disable-gif was given. if test "${enable_gif+set}" = set; then @@ -7600,7 +7591,7 @@ fi echo $ac_n "checking for --enable-pcx""... $ac_c" 1>&6 -echo "configure:7604: checking for --enable-pcx" >&5 +echo "configure:7595: checking for --enable-pcx" >&5 no_cache=0 # Check whether --enable-pcx or --disable-pcx was given. if test "${enable_pcx+set}" = set; then @@ -7639,7 +7630,7 @@ fi echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6 -echo "configure:7643: checking for --enable-pnm" >&5 +echo "configure:7634: checking for --enable-pnm" >&5 no_cache=0 # Check whether --enable-pnm or --disable-pnm was given. if test "${enable_pnm+set}" = set; then @@ -7678,7 +7669,7 @@ fi echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6 -echo "configure:7682: checking for --enable-pnm" >&5 +echo "configure:7673: checking for --enable-pnm" >&5 no_cache=0 # Check whether --enable-pnm or --disable-pnm was given. if test "${enable_pnm+set}" = set; then @@ -7725,74 +7716,75 @@ fi echo $ac_n "checking for toolkit""... $ac_c" 1>&6 -echo "configure:7729: checking for toolkit" >&5 +echo "configure:7720: checking for toolkit" >&5 if test "$wxUSE_GUI" = "yes"; then -if test "$USE_BEOS" = 1; then - { echo "configure: error: BeOS GUI is not supported yet, use --disable-gui" 1>&2; exit 1; } -fi + if test "$USE_BEOS" = 1; then + { echo "configure: error: BeOS GUI is not supported yet, use --disable-gui" 1>&2; exit 1; } + fi -if test "$TOOLKIT_GIVEN" = 1; then - for toolkit in `echo $ALL_TOOLKITS`; do - var=wxUSE_$toolkit - eval "value=\$${var}" - eval "$var=`echo \$value | sed -e "s/yes/1/" -e "s/no/0/"`" - done -else - for toolkit in `echo $ALL_TOOLKITS`; do - if test "$has_toolkit_in_cache" != 1; then - var=DEFAULT_DEFAULT_wxUSE_$toolkit + if test "$TOOLKIT_GIVEN" = 1; then + for toolkit in `echo $ALL_TOOLKITS`; do + var=wxUSE_$toolkit + eval "value=\$${var}" + eval "$var=`echo \$value | sed -e "s/yes/1/" -e "s/no/0/"`" + done else - var=DEFAULT_wxUSE_$toolkit + for toolkit in `echo $ALL_TOOLKITS`; do + if test "$has_toolkit_in_cache" != 1; then + var=DEFAULT_DEFAULT_wxUSE_$toolkit + else + var=DEFAULT_wxUSE_$toolkit + fi + eval "wxUSE_$toolkit=\$${var}" + done fi - eval "wxUSE_$toolkit=\$${var}" - done -fi -NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0} + ${wxUSE_MGL:-0}` + NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0} \ + + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0} \ + + ${wxUSE_MGL:-0}` -case "${host}" in - *-pc-os2_emx ) - NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}` - # PATH_IFS is autodetected by OS/2's configure (usually ';') - LEX_STEM="lexyy" - ;; - *) - PATH_IFS=':' - LEX_STEM="lex.yy" - ;; -esac + case "${host}" in + *-pc-os2_emx ) + # PATH_IFS is autodetected by OS/2's configure (usually ';') + NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}` + LEX_STEM="lexyy" + ;; + *) + PATH_IFS=':' + LEX_STEM="lex.yy" + ;; + esac -case "$NUM_TOOLKITS" in - 1) - ;; - 0) - { echo "configure: error: Please specify a toolkit - cannot determine the default for ${host}" 1>&2; exit 1; } - ;; - *) - { echo "configure: error: Please specify at most one toolkit (may be some are cached?)" 1>&2; exit 1; } -esac - -for toolkit in `echo $ALL_TOOLKITS`; do - var=wxUSE_$toolkit - eval "value=\$${var}" - if test "x$value" != x; then - cache_var=CACHE_$toolkit - eval "cache=\$${cache_var}" - if test "$cache" = 1; then - echo "$var=$value" >> ${wx_arg_cache_file} - fi - if test "$value" = 1; then - toolkit_echo=`echo $toolkit | tr [A-Z] [a-z]` - echo "$ac_t""$toolkit_echo" 1>&6 - fi - fi -done + case "$NUM_TOOLKITS" in + 1) + ;; + 0) + { echo "configure: error: Please specify a toolkit - cannot determine the default for ${host}" 1>&2; exit 1; } + ;; + *) + { echo "configure: error: Please specify at most one toolkit (may be some are cached?)" 1>&2; exit 1; } + esac + for toolkit in `echo $ALL_TOOLKITS`; do + var=wxUSE_$toolkit + eval "value=\$${var}" + if test "x$value" != x; then + cache_var=CACHE_$toolkit + eval "cache=\$${cache_var}" + if test "$cache" = 1; then + echo "$var=$value" >> ${wx_arg_cache_file} + fi + if test "$value" = 1; then + toolkit_echo=`echo $toolkit | tr [A-Z] [a-z]` + echo "$ac_t""$toolkit_echo" 1>&6 + fi + fi + done else PATH_IFS=':' - echo "$ac_t""base only" 1>&6 + echo "$ac_t""base ($host_alias hosted) only" 1>&6 fi @@ -7845,21 +7837,25 @@ rm -f confcache if test "$build" != "$host" ; then - CC=$host_alias-gcc - CXX=$host_alias-c++ - AR=$host_alias-ar - RANLIB=$host_alias-ranlib - DLLTOOL=$host_alias-dlltool - RESCOMP=$host_alias-windres - LD=$host_alias-ld - NM=$host_alias-nm - STRIP=$host_alias-strip + if test "$USE_WIN32" = 1 ; then + CC=$host_alias-gcc + CXX=$host_alias-c++ + AR=$host_alias-ar + RANLIB=$host_alias-ranlib + DLLTOOL=$host_alias-dlltool + RESCOMP=$host_alias-windres + LD=$host_alias-ld + NM=$host_alias-nm + STRIP=$host_alias-strip + else + { echo "configure: error: $build_alias -> $host_alias cross compilation not supported yet." 1>&2; exit 1; } + fi 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:7863: checking for $ac_word" >&5 +echo "configure:7859: 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 @@ -7889,7 +7885,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:7893: checking for $ac_word" >&5 +echo "configure:7889: 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 @@ -7940,7 +7936,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:7944: checking for $ac_word" >&5 +echo "configure:7940: 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 @@ -7972,7 +7968,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:7976: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:7972: 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. @@ -7983,12 +7979,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 7987 "configure" +#line 7983 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:7992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7988: \"$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 @@ -8014,12 +8010,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:8018: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:8014: 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:8023: checking whether we are using GNU C" >&5 +echo "configure:8019: 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 @@ -8028,7 +8024,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:8032: \"$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:8028: \"$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 @@ -8047,7 +8043,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:8051: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:8047: 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 @@ -8082,7 +8078,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:8086: checking how to run the C preprocessor" >&5 +echo "configure:8082: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -8097,13 +8093,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:8107: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8103: \"$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 : @@ -8114,13 +8110,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:8124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8120: \"$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 : @@ -8131,13 +8127,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:8141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8137: \"$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 : @@ -8161,16 +8157,15 @@ else fi 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:8168: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:8163: 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 @@ -8188,7 +8183,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -8224,7 +8219,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:8228: checking for $ac_word" >&5 +echo "configure:8223: 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 @@ -8256,7 +8251,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:8260: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:8255: 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. @@ -8267,12 +8262,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 8271 "configure" +#line 8266 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:8276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8271: \"$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 @@ -8298,12 +8293,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:8302: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:8297: 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:8307: checking whether we are using GNU C++" >&5 +echo "configure:8302: 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 @@ -8312,7 +8307,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:8316: \"$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:8311: \"$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 @@ -8331,7 +8326,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:8335: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:8330: 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 @@ -8363,50 +8358,6 @@ else fi -echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:8368: 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 -else - ac_ext=C -# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -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:8386: \"$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 - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CXXCPP=/lib/cpp -fi -rm -f conftest* - ac_cv_prog_CXXCPP="$CXXCPP" -ac_ext=C -# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cxx_cross -fi -fi -CXXCPP="$ac_cv_prog_CXXCPP" -echo "$ac_t""$CXXCPP" 1>&6 - - CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g//g'` ac_ext=c @@ -8420,7 +8371,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:8424: checking for $ac_word" >&5 +echo "configure:8375: 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 @@ -8451,7 +8402,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:8455: checking for $ac_word" >&5 +echo "configure:8406: 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 @@ -8491,7 +8442,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:8495: checking for a BSD compatible install" >&5 +echo "configure:8446: 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 @@ -8547,7 +8498,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:8551: checking for $ac_word" >&5 +echo "configure:8502: 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 @@ -8576,7 +8527,7 @@ fi echo $ac_n "checking make for VPATH support""... $ac_c" 1>&6 -echo "configure:8580: checking make for VPATH support" >&5 +echo "configure:8531: checking make for VPATH support" >&5 cat - << EOF > confMake check : file cp \$? \$@ @@ -8613,7 +8564,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:8617: checking for $ac_word" >&5 +echo "configure:8568: 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 @@ -8647,7 +8598,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:8651: checking for $ac_word" >&5 +echo "configure:8602: 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 @@ -8681,7 +8632,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:8685: checking for yywrap in -l$ac_lib" >&5 +echo "configure:8636: 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 @@ -8689,7 +8640,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:8655: \"$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 @@ -8724,7 +8675,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:8728: checking whether ln -s works" >&5 +echo "configure:8679: 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 @@ -8869,17 +8820,17 @@ REGEX_INCLUDE= if test "$wxUSE_REGEX" != "no"; then ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for regex.h""... $ac_c" 1>&6 -echo "configure:8873: checking for regex.h" >&5 +echo "configure:8824: checking for regex.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:8883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8834: \"$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* @@ -8898,12 +8849,12 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then for ac_func in regcomp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8902: checking for $ac_func" >&5 +echo "configure:8853: 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:8881: \"$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 @@ -8972,35 +8923,64 @@ fi AFMINSTALL= -if test "$wxUSE_GUI" = "yes"; then - USE_GUI=1 +TOOLKIT= +TOOLKIT_INCLUDE= +WIDGET_SET= - TOOLKIT= - TOOLKIT_INCLUDE= - - GUI_TK_LIBRARY= - GUI_TK_LINK= - - WXGTK12= - WXGTK127= - WXGTK20= - - WXWINE= - - if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then - ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for windows.h""... $ac_c" 1>&6 -echo "configure:8994: checking for windows.h" >&5 +if test "$USE_WIN32" = 1 ; then + for ac_hdr in w32api.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:8936: 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:8946: \"$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* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + + ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for windows.h""... $ac_c" 1>&6 +echo "configure:8974: checking for windows.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:9004: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8984: \"$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* @@ -9020,39 +9000,85 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then else echo "$ac_t""no" 1>&6 - { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; } - + { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; } + fi - INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw" + echo $ac_n "checking if w32api has good enough MSIE support""... $ac_c" 1>&6 +echo "configure:9010: checking if w32api has good enough MSIE support" >&5 +if eval "test \"`echo '$''{'wx_cv_w32api_win_ie'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext < +int main() { - LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32" + #define wxCHECK_W32API_VERSION( major, minor ) \ + ( defined( __W32API_MAJOR_VERSION ) && defined( __W32API_MINOR_VERSION ) \ + && ( ( __W32API_MAJOR_VERSION > (major) ) \ + || ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor)))) - if test "$wxUSE_ODBC" = "yes" ; then - LIBS="$LIBS -lodbc32 -lole32 -loleaut32" - fi + #if !wxCHECK_W32API_VERSION(1,1) + #error You need w32api 1.1 or newer + #endif + +; return 0; } +EOF +if { (eval echo configure:9032: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + wx_cv_w32api_win_ie=yes + CPPFLAGS="$CPPFLAGS -D_WIN_IE=0x400" + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + + wx_cv_w32api_win_ie=no + +fi +rm -f conftest* + +fi - if test "$wxUSE_MINGW" = 1; then - LDFLAGS="$LDFLAGS -mwindows" - fi +echo "$ac_t""$wx_cv_w32api_win_ie" 1>&6 + LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32" + + if test "$wxUSE_ODBC" = "yes" ; then + LIBS="$LIBS -lodbc32 -lole32 -loleaut32" + fi + + if test "$wxUSE_MINGW" = 1; then + LDFLAGS="$LDFLAGS -mwindows" + fi + + RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__" + RESPROGRAMOBJ="\$(PROGRAM)_resources.o" +fi + +if test "$wxUSE_GUI" = "yes"; then + USE_GUI=1 + + GUI_TK_LIBRARY= + + WXGTK12= + WXGTK127= + WXGTK20= + + if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then TOOLKIT=MSW GUIDIST=MSW_DIST - - RCINCSWITCH="--include-dir" - RCDEFSWITCH="--define" - RCPREPROCESSOR="--preprocessor \"\$(CC) -c -E -xc-header -DRC_INVOKED\"" - RCINPUTSWITCH="-i" - RCOUTPUTSWITCH="-o" - RESFLAGS="$RCPREPROCESSOR $RCINCSWITCH \$(top_srcdir)/include $RCINCSWITCH \$(top_srcdir)/\$(program_dir) $RCDEFSWITCH __WIN32__ $RCDEFSWITCH __WIN95__ $RCDEFSWITCH __GNUWIN32__" - - RESPROGRAM="\$(RES_PROGRAM)" fi if test "$wxUSE_GTK" = 1; then echo $ac_n "checking for GTK+ version""... $ac_c" 1>&6 -echo "configure:9056: checking for GTK+ version" >&5 +echo "configure:9082: checking for GTK+ version" >&5 gtk_version_cached=1 if eval "test \"`echo '$''{'wx_cv_lib_gtk'+set}'`\" = set"; then @@ -9114,7 +9140,7 @@ fi # Extract the first word of "gtk-config-2.0", so it can be a program name with args. set dummy gtk-config-2.0; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9118: checking for $ac_word" >&5 +echo "configure:9144: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG_2_0'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9149,7 +9175,7 @@ fi min_gtk_version=1.3.1 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:9153: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:9179: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG_2_0" = "no" ; then no_gtk=yes @@ -9172,7 +9198,7 @@ echo "configure:9153: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -9250,7 +9276,7 @@ main () } EOF -if { (eval echo configure:9254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -9284,7 +9310,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -9294,7 +9320,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:9298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" @@ -9352,7 +9378,7 @@ rm -f conftest* # 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:9356: checking for $ac_word" >&5 +echo "configure:9382: 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 @@ -9387,7 +9413,7 @@ fi min_gtk_version=1.2.7 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:9391: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:9417: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" != "no" ; then GTK_CFLAGS=`$GTK_CONFIG --cflags` @@ -9400,7 +9426,7 @@ echo "configure:9391: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -9433,7 +9459,7 @@ main () } EOF -if { (eval echo configure:9437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -9482,7 +9508,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:9486: checking for $ac_word" >&5 +echo "configure:9512: 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 @@ -9517,7 +9543,7 @@ fi min_gtk_version=1.2.3 echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:9521: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:9547: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" != "no" ; then GTK_CFLAGS=`$GTK_CONFIG --cflags` @@ -9530,7 +9556,7 @@ echo "configure:9521: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -9563,7 +9589,7 @@ main () } EOF -if { (eval echo configure:9567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -9634,7 +9660,7 @@ equivalent variable and GTK+ is version 1.2.3 or above. GUIDIST=GTK_DIST echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6 -echo "configure:9638: checking for gdk_im_open in -lgdk" >&5 +echo "configure:9664: checking for gdk_im_open in -lgdk" >&5 ac_lib_var=`echo gdk'_'gdk_im_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9642,7 +9668,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgdk $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9683: \"$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 @@ -9681,7 +9707,7 @@ fi if test "$wxUSE_MGL" = 1; then echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6 -echo "configure:9685: checking for SciTech MGL library" >&5 +echo "configure:9711: checking for SciTech MGL library" >&5 if test "x$MGL_ROOT" = x ; then echo "$ac_t""not found" 1>&6 { echo "configure: error: Cannot find MGL library. Make sure MGL_ROOT is set." 1>&2; exit 1; } @@ -9689,24 +9715,24 @@ echo "configure:9685: checking for SciTech MGL library" >&5 echo "$ac_t""$MGL_ROOT" 1>&6 fi - MGL_OS=linux/gcc/glibc - MGL_LIB_TYPE="" + mgl_os=linux/gcc/glibc + mgl_lib_type="" if test "$wxUSE_DEBUG_FLAG" = yes ; then - if test -f $MGL_ROOT/lib/debug/$MGL_OS/libmgl.a ; then - MGL_LIB_TYPE=debug + if test -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.a ; then + mgl_lib_type=debug fi fi - if test "x$MGL_LIB_TYPE" = x ; then - if test -f $MGL_ROOT/lib/release/$MGL_OS/libmgl.a ; then - MGL_LIB_TYPE=release + if test "x$mgl_lib_type" = x ; then + if test -f $MGL_ROOT/lib/release/$mgl_os/libmgl.a ; then + mgl_lib_type=release else { echo "configure: error: Cannot find MGL libraries, make sure they are compiled." 1>&2; exit 1; } fi fi TOOLKIT_INCLUDE="-I$MGL_ROOT/include" - GUI_TK_LIBRARY="-L$MGL_ROOT/lib/$MGL_LIB_TYPE/$MGL_OS -lmgl -lmglcpp -lpm" + GUI_TK_LIBRARY="-L$MGL_ROOT/lib/$mgl_lib_type/$mgl_os -lmgl -lmglcpp -lpm" AFMINSTALL=afminstall TOOLKIT=MGL @@ -9714,29 +9740,46 @@ echo "configure:9685: checking for SciTech MGL library" >&5 fi if test "$wxUSE_WINE" = 1; then - echo $ac_n "checking for WINE includes""... $ac_c" 1>&6 -echo "configure:9719: checking for WINE includes" >&5 - -ac_find_includes= -for ac_dir in $SEARCH_INCLUDE; - do - if test -f "$ac_dir/windows.h"; then - ac_find_includes=$ac_dir - break - fi - done + ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for windows.h""... $ac_c" 1>&6 +echo "configure:9746: checking for windows.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:9756: \"$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* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + : +else + echo "$ac_t""no" 1>&6 - if test "$ac_find_includes" != "" ; then - echo "$ac_t""found $ac_find_includes" 1>&6 - TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes" - else - echo "$ac_t""no" 1>&6 { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; } - fi + +fi - XPM_LINK="" + + xpm_link="" echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:9740: checking for Xpm library" >&5 +echo "configure:9783: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -9751,7 +9794,7 @@ for ac_dir in $SEARCH_LIB; if test "$ac_find_libraries" != "" ; then GUI_TK_LIBRARY="-L$ac_find_libraries" - XPM_LINK="-lXpm" + xpm_link="-lXpm" cat >> confdefs.h <<\EOF #define wxHAVE_LIB_XPM 1 EOF @@ -9762,9 +9805,9 @@ EOF echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2 fi - MESA_LINK="" + mesa_link="" echo $ac_n "checking for Mesa library""... $ac_c" 1>&6 -echo "configure:9768: checking for Mesa library" >&5 +echo "configure:9811: checking for Mesa library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -9779,17 +9822,16 @@ for ac_dir in $SEARCH_LIB; if test "$ac_find_libraries" != "" ; then GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries" - MESA_LINK="-lMesaGL" + mesa_link="-lMesaGL" echo "$ac_t""found at $ac_find_libraries" 1>&6 else { echo "configure: error: no" 1>&2; exit 1; } fi - GUI_TK_LINK="-lwine $MESA_LINK $XPM_LINK -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses" - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" - WXWINE=1 + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwine $mesa_link $xpm_link -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses" TOOLKIT=MSW GUIDIST=MSW_DIST + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXWINE__" fi @@ -9798,7 +9840,7 @@ for ac_dir in $SEARCH_LIB; # 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:9802: checking for X" >&5 +echo "configure:9844: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -9860,12 +9902,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:9869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9911: \"$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* @@ -9934,14 +9976,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:9987: \"$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. @@ -10047,17 +10089,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:10051: checking whether -R must be followed by a space" >&5 +echo "configure:10093: 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:10103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -10073,14 +10115,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:10126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -10112,7 +10154,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:10116: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:10158: 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 @@ -10120,7 +10162,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:10177: \"$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 @@ -10153,7 +10195,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:10157: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:10199: 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 @@ -10161,7 +10203,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:10218: \"$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 @@ -10201,12 +10243,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:10205: checking for gethostbyname" >&5 +echo "configure:10247: 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:10275: \"$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 @@ -10250,7 +10292,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:10254: checking for gethostbyname in -lnsl" >&5 +echo "configure:10296: 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 @@ -10258,7 +10300,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:10315: \"$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 @@ -10299,12 +10341,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:10303: checking for connect" >&5 +echo "configure:10345: 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:10373: \"$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 @@ -10348,7 +10390,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:10352: checking for connect in -lsocket" >&5 +echo "configure:10394: 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 @@ -10356,7 +10398,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:10413: \"$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 @@ -10391,12 +10433,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:10395: checking for remove" >&5 +echo "configure:10437: 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:10465: \"$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 @@ -10440,7 +10482,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:10444: checking for remove in -lposix" >&5 +echo "configure:10486: 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 @@ -10448,7 +10490,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:10505: \"$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 @@ -10483,12 +10525,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:10487: checking for shmat" >&5 +echo "configure:10529: 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:10557: \"$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 @@ -10532,7 +10574,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:10536: checking for shmat in -lipc" >&5 +echo "configure:10578: 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 @@ -10540,7 +10582,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:10597: \"$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 @@ -10584,7 +10626,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:10588: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:10630: 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 @@ -10592,7 +10634,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:10649: \"$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 @@ -10637,14 +10679,11 @@ fi GUI_TK_LIBRARY="$X_LIBS" TOOLKIT_INCLUDE="$X_CFLAGS" - AFMINSTALL=afminstall - - COMPILED_X_PROGRAM=0 echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6 -echo "configure:10648: checking for Motif/Lesstif headers" >&5 +echo "configure:10687: checking for Motif/Lesstif headers" >&5 ac_find_includes= for ac_dir in $SEARCH_INCLUDE; @@ -10659,7 +10698,7 @@ for ac_dir in $SEARCH_INCLUDE; echo "$ac_t""found $ac_find_includes" 1>&6 else cat > conftest.$ac_ext < @@ -10667,12 +10706,11 @@ for ac_dir in $SEARCH_INCLUDE; int main() { int version; - version = xmUseVersion; ; return 0; } EOF -if { (eval echo configure:10676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found in default search path" 1>&6 @@ -10693,7 +10731,7 @@ rm -f conftest* if test "$COMPILED_X_PROGRAM" = 0; then echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6 -echo "configure:10697: checking for Motif/Lesstif library" >&5 +echo "configure:10735: checking for Motif/Lesstif library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -10732,7 +10770,7 @@ for ac_dir in $SEARCH_LIB; echo "$ac_t""found at $ac_find_libraries" 1>&6 else cat > conftest.$ac_ext < @@ -10740,12 +10778,11 @@ for ac_dir in $SEARCH_LIB; int main() { int version; - version = xmUseVersion; ; return 0; } EOF -if { (eval echo configure:10749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""found in default search path" 1>&6 @@ -10765,10 +10802,9 @@ rm -f conftest* fi fi - - XPM_LINK="" + xpm_link="" echo $ac_n "checking for Xpm library""... $ac_c" 1>&6 -echo "configure:10772: checking for Xpm library" >&5 +echo "configure:10808: checking for Xpm library" >&5 ac_find_libraries= for ac_dir in $SEARCH_LIB; @@ -10792,7 +10828,7 @@ for ac_dir in $SEARCH_LIB; fi GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" - XPM_LINK="-lXpm " + xpm_link="-lXpm " cat >> confdefs.h <<\EOF #define wxHAVE_LIB_XPM 1 EOF @@ -10800,7 +10836,7 @@ EOF echo "$ac_t""found at $ac_find_libraries" 1>&6 else cat > conftest.$ac_ext < @@ -10808,16 +10844,15 @@ EOF int main() { int version; - version = XpmLibraryVersion(); ; return 0; } EOF -if { (eval echo configure:10817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10852: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - XPM_LINK="-lXpm " - cat >> confdefs.h <<\EOF + xpm_link="-lXpm " + cat >> confdefs.h <<\EOF #define wxHAVE_LIB_XPM 1 EOF @@ -10837,15 +10872,15 @@ fi rm -f conftest* fi - GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11" - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm $xpm_link -lXmu -lXext -lXt -lX11" + TOOLKIT_VPATH="\${top_srcdir}/src/${TOOLKIT_DIR}${PATH_IFS}\${top_srcdir}/src/motif/xmcombo" TOOLKIT=MOTIF GUIDIST=MOTIF_DIST fi - if test "$wxUSE_MAC" = 1; then + if test "$wxUSE_MAC" = 1; then TOOLKIT=MAC - GUIDIST=MACX_DIST + GUIDIST=MACX_DIST fi if test "$wxUSE_PM" = 1; then @@ -10853,42 +10888,20 @@ rm -f conftest* GUIDIST=GTK_DIST fi - if test "$TOOLKIT" != "PM" ; then - TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"` - else + if test "$TOOLKIT" = "PM" ; then TOOLKIT_DIR="os2" - fi - - TOOLKIT_NAME="${TOOLKIT_DIR}" - - TOOLKIT_VPATH="\${top_srcdir}/src/${TOOLKIT_DIR}" - - if test "$TOOLKIT_NAME" = "motif"; then - TOOLKIT_VPATH="${TOOLKIT_VPATH}${PATH_IFS}\${top_srcdir}/src/motif/xmcombo" - fi - - if test "$wxUSE_UNIVERSAL" = "yes"; then - TOOLKIT_NAME="${TOOLKIT_NAME}univ" - UNIV_VPATH="\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes" - TOOLKIT_VPATH="${UNIV_VPATH}${PATH_IFS}${TOOLKIT_VPATH}" - SETUPH_DIR="univ" else - SETUPH_DIR="${TOOLKIT_DIR}" + TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"` fi - if test "$wxUSE_DEBUG_FLAG" = "yes"; then - TOOLKIT_NAME="${TOOLKIT_NAME}d" - fi + PORT_FILES="\${top_srcdir}/src/\$(TOOLKITDIR)/files.lst" - TOOLKIT_DEF="-D__WX${TOOLKIT}__" if test "$wxUSE_UNIVERSAL" = "yes"; then - TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXUNIVERSAL__" - fi - - WX_LIBRARY="wx_${TOOLKIT_NAME}" - - if test "$wxUSE_UNIVERSAL" = "yes"; then ALL_OBJECTS="\$(GUI_LOWLEVEL_OBJS) \${UNIVOBJS}" + PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst" + TOOLKIT_VPATH="\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes${PATH_IFS}\${top_srcdir}/src/${TOOLKIT_DIR}" + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__" + WIDGET_SET=univ else ALL_OBJECTS="\$(GUIOBJS)" fi @@ -10903,16 +10916,9 @@ rm -f conftest* ALL_OBJECTS="${ALL_OBJECTS} \$(HTMLOBJS)" fi - if test "$TOOLKIT" != "MSW"; then - if test "$wxUSE_ODBC" = "yes" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)" - fi + if test "$TOOLKIT" != "MSW" -a "$wxUSE_ODBC" = "yes" ; then + ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)" fi - - if test "x$REGEX_INCLUDE" != "x" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)" - fi - if test "$wxUSE_LIBJPEG" = "yes" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)" fi @@ -10922,33 +10928,10 @@ rm -f conftest* if test "$wxUSE_LIBPNG" = "yes" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(PNGOBJS)" fi - if test "$wxUSE_ZLIB" = "yes" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)" - fi if test "$wxUSE_FREETYPE" = "yes" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(FREETYPEOBJS)" fi - if test "$wxUSE_UNIVERSAL" = "yes"; then - ALL_DEPFILES="\$(GUI_LOWLEVEL_DEPS) \$(UNIVDEPS)" - else - ALL_DEPFILES="\$(GUIDEPS)" - fi - - ALL_DEPFILES="${ALL_DEPFILES} \$(COMMONDEPS) \$(GENERICDEPS)" - - if test "$TOOLKIT" != "MSW"; then - ALL_DEPFILES="${ALL_DEPFILES} \$(UNIXDEPS)" - fi - - if test "$wxUSE_HTML" = "yes"; then - ALL_DEPFILES="${ALL_DEPFILES} \$(HTMLDEPS)" - fi - - PORT_FILES="\${top_srcdir}/src/\$(TOOLKITDIR)/files.lst" - if test "$wxUSE_UNIVERSAL" = "yes"; then - PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst" - fi RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst" RPM_SPEC="wx\$(TOOLKIT).spec" @@ -10957,31 +10940,18 @@ rm -f conftest* else USE_GUI=0 - TOOLKIT_DIR="base" + TOOLKIT_DIR="base" - TOOLKIT_VPATH="." + if test "$USE_WIN32" = 1 ; then + ALL_OBJECTS="\${BASE_OBJS} \${BASE_MSW_OBJS}" + TOOLKIT_VPATH="\${top_srcdir}/src/msw" - if test "$wxUSE_DEBUG_FLAG" = "yes"; then - TOOLKIT_NAME="${TOOLKIT_DIR}d" + TOOLKIT="MSW" else - TOOLKIT_NAME="${TOOLKIT_DIR}" + ALL_OBJECTS="\${BASE_OBJS} \${BASE_UNIX_OBJS}" + TOOLKIT_VPATH="\${top_srcdir}/src/unix" fi - TOOLKIT_DEF="-D__WXBASE__" - - ALL_OBJECTS="\$(BASE_OBJS) \$(BASE_UNIX_OBJS)" - ALL_DEPFILES="\$(BASE_DEPS) \$(BASE_UNIX_DEPS)" - - if test "x$REGEX_INCLUDE" != "x" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)" - fi - - if test "$wxUSE_ZLIB" = "yes" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)" - fi - - WX_LIBRARY="wx_${TOOLKIT_NAME}" - PORT_FILES="\${top_srcdir}/src/files.lst" RPM_FILES="src/rpmfiles.lst" RPM_SPEC="wxBase.spec" @@ -10990,50 +10960,217 @@ else DISTDIR="wxBase" fi -WX_LIBRARY_NAME="lib${WX_LIBRARY}.la" -WX_LIBRARY_NAME_GL="lib${WX_LIBRARY}_gl.la" +if test "x$REGEX_INCLUDE" != "x" ; then + ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)" +fi +if test "$wxUSE_ZLIB" = "yes" ; then + ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)" +fi + +if test "$wxUSE_OPENGL" = "yes"; then + if test "$wxUSE_MAC" = 1; then + cat >> confdefs.h <<\EOF +#define wxUSE_OPENGL 1 +EOF + + cat >> confdefs.h <<\EOF +#define wxUSE_GLCANVAS 1 +EOF + + OPENGL_LIBS="-framework OpenGL -framework AGL" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl" + else + ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6 +echo "configure:10986: 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:10996: \"$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* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + cat >> confdefs.h <<\EOF +#define wxUSE_OPENGL 1 +EOF + + cat >> confdefs.h <<\EOF +#define wxUSE_GLCANVAS 1 +EOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl" + echo $ac_n "checking for glFlush in -lGL""... $ac_c" 1>&6 +echo "configure:11023: checking for glFlush in -lGL" >&5 +ac_lib_var=`echo GL'_'glFlush | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lGL $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + OPENGL_LIBS="-lGL -lGLU" + +else + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for glFlush in -lMesaGL""... $ac_c" 1>&6 +echo "configure:11064: checking for glFlush in -lMesaGL" >&5 +ac_lib_var=`echo MesaGL'_'glFlush | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lMesaGL $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + OPENGL_LIBS="-lMesaGL -lMesaGLU" + +else + echo "$ac_t""no" 1>&6 +fi + + +fi + + +else + echo "$ac_t""no" 1>&6 +wxUSE_OPENGL=0 +fi + + fi +fi + +if test -z "$TOOLKIT_VPATH" ; then + TOOLKIT_VPATH="\${top_srcdir}/src/${TOOLKIT_DIR}" +fi + +if test -n "$TOOLKIT" ; then + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WX${TOOLKIT}__" +fi + +if test "$wxUSE_CYGWIN" = 1 ; then + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__" +fi + +lib_debug_suffix= +if test "$wxUSE_DEBUG_FLAG" = "yes"; then + lib_debug_suffix=d + TOOLCHAIN_NAME="${TOOLCHAIN_NAME}d" +fi + +TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_debug_suffix}-${WX_RELEASE}" +TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_debug_suffix}_gl-${WX_RELEASE}" + +if test "$cross_compiling" = "yes"; then + TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}" + TOOLCHAIN_NAME_GL="${TOOLCHAIN_NAME_GL}-${host_alias}" +fi + +WX_LIBRARY="wx_${TOOLCHAIN_NAME}" +WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}" + +WXCONFIG_LIBS="-l${WX_LIBRARY}" + +if test "$wxUSE_OPENGL" = "yes"; then + WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} $OPENGL_LIBS" +fi WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a" -WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a" +WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a" + +WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" +WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" + +WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}" +WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}" +WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}" +WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" + +WX_RESOURCES_DARWIN="lib${WX_LIBRARY}.rsrc" + if test "$wxUSE_SHARED" = "yes"; then - case "${host}" in - *-*-mingw32* ) - WX_LIBRARY_NAME_SHARED="wx${WX_MAJOR_VERSION_NUMBER}${WX_MINOR_VERSION_NUMBER}_${WX_RELEASE_NUMBER}.dll" - ;; - - *-hp-hpux* ) - SO_SUFFIX="sl" - ;; - - *-*-darwin* ) - SO_SUFFIX="dylib" - ;; - - * ) - SO_SUFFIX="so" - ;; - esac - - if test "x$SO_SUFFIX" != "x"; then - WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" - WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" - fi - - WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.${SO_SUFFIX}.${WX_CURRENT}" - WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.${SO_SUFFIX}" - WX_LIBRARY_LINK3="lib${WX_LIBRARY}.${SO_SUFFIX}" - WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.${SO_SUFFIX}.${WX_CURRENT}" - WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.${SO_SUFFIX}" - WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.${SO_SUFFIX}" if test "$wxUSE_OPENGL" = "yes"; then WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL" - WX_ALL="CREATE_LINKS CREATE_LINKS_GL" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1} \$(build_libdir)/${WX_LIBRARY_LINK1_GL}" else WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1}" fi if test "$GCC" = "yes"; then @@ -11056,13 +11193,13 @@ if test "$wxUSE_SHARED" = "yes"; then *-*-linux* ) if test "$GCC" != "yes"; then echo $ac_n "checking for Intel compiler""... $ac_c" 1>&6 -echo "configure:11060: checking for Intel compiler" >&5 +echo "configure:11197: checking for Intel compiler" >&5 if eval "test \"`echo '$''{'wx_cv_prog_icc'+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:11214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_prog_icc=yes else @@ -11088,15 +11225,14 @@ rm -f conftest* fi echo "$ac_t""$wx_cv_prog_icc" 1>&6 - if test "$wx_cv_prog_icc" = "yes"; then PIC_FLAG="-KPIC" fi fi - if test "$wxUSE_BURNT_NAME" = "yes" ; then - BURNT_LIBRARY_NAME="-Wl,-soname,${WX_LIBRARY_LINK1}" - BURNT_LIBRARY_NAME_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}" + if test "$wxUSE_SONAME" = "yes" ; then + SONAME_FLAGS="-Wl,-soname,${WX_LIBRARY_LINK1}" + SONAME_FLAGS_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}" WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)" fi ;; @@ -11111,13 +11247,78 @@ echo "$ac_t""$wx_cv_prog_icc" 1>&6 ;; *-*-darwin* ) - TOOLKIT_DEF="${TOOLKIT_DEF} -D__UNIX__ -D__DARWIN__ -D__POWERPC__" + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__UNIX__ -D__DARWIN__ -D__POWERPC__" CPPFLAGS="${CPPFLAGS} -fno-common" SHARED_LD="${CXX} -dynamiclib -o" PIC_FLAG="-dynamic -fPIC" if test "$wxUSE_MAC" = 1 ; then - WX_ALL="${WX_ALL} ./lib/lib${WX_LIBRARY}-${WX_RELEASE}.r" + WX_ALL="${WX_ALL} lib${WX_LIBRARY}.r" + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DTARGET_CARBON" + CPPFLAGS="${CPPFLAGS} -fpascal-strings" + CXXFLAGS="${CXXFLAGS} -cpp-precomp" + # Extract the first word of "Rez", so it can be a program name with args. +set dummy Rez; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:11264: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_RESCOMP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$RESCOMP"; then + ac_cv_prog_RESCOMP="$RESCOMP" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RESCOMP="Rez" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_RESCOMP" && ac_cv_prog_RESCOMP="/Developer/Tools/Rez" +fi +fi +RESCOMP="$ac_cv_prog_RESCOMP" +if test -n "$RESCOMP"; then + echo "$ac_t""$RESCOMP" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + # Extract the first word of "Derez", so it can be a program name with args. +set dummy Derez; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:11294: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_DEREZ'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$DEREZ"; then + ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_DEREZ="Derez" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/Derez" +fi +fi +DEREZ="$ac_cv_prog_DEREZ" +if test -n "$DEREZ"; then + echo "$ac_t""$DEREZ" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + LIBWXMACRES="\$(top_builddir)/lib/lib${WX_LIBRARY}.r" + LIBWXMACRESCOMP="\$(RESCOMP) Carbon.r -t APPL ${LIBWXMACRES} -o \$(BIN_PROGRAM)" fi ;; @@ -11126,34 +11327,27 @@ echo "$ac_t""$wx_cv_prog_icc" 1>&6 ;; *-*-cygwin* ) - WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" - WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}" - if test "$wxUSE_OPENGL" = "yes"; then - WX_ALL_INSTALLED="preinstall_gl" - WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}" - else - WX_ALL="${WX_LIBRARY_NAME_STATIC}" - fi + echo "configure: warning: Shared libs unsupported for $host_alias -- forcing static build." 1>&2 + wxUSE_SHARED=no ;; *-*-mingw32* ) - WX_LIBRARY_NAME_STATIC="lib/libwx${WX_MAJOR_VERSION_NUMBER}${WX_MINOR_VERSION_NUMBER}_${WX_RELEASE_NUMBER}.a" - SHARED_LD="${CC} -shared -Wl,--out-implib,${WX_LIBRARY_NAME_STATIC} -o" - TOOLKIT_DEF="${TOOLKIT_DEF} -DWXUSINGDLL=1" + SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_NAME_STATIC} -o" + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXUSINGDLL=1" WXMSW_DLL_DEFINES="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1" WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}" WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_SHARED_GL}" if test "$wxUSE_OPENGL" = "yes"; then WX_ALL_INSTALLED="preinstall_gl" - WX_ALL="${WX_LIBRARY_NAME_SHARED} ${WX_LIBRARY_NAME_SHARED_GL}" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}" else - WX_ALL="${WX_LIBRARY_NAME_SHARED}" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}" fi ;; *-pc-os2_emx ) WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" - WX_ALL="${WX_LIBRARY_NAME_STATIC}" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC}" ;; *-*-beos* ) @@ -11178,21 +11372,24 @@ echo "$ac_t""$wx_cv_prog_icc" 1>&6 fi WX_TARGET_LIBRARY_TYPE="so" -else - WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" - WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}" +fi - if test "$wxUSE_OPENGL" = "yes"; then - WX_ALL_INSTALLED="preinstall_gl" - WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}" - else - WX_ALL="${WX_LIBRARY_NAME_STATIC}" - fi +if test "$wxUSE_SHARED" = "no"; then - if test "$wxUSE_GUI" = "no"; then + if test "$wxUSE_GUI" = "no" -o "$USE_WIN32" = 1 ; then WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall" fi + if test "$wxUSE_OPENGL" = "yes"; then + WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_gl" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC} \$(build_libdir)/${WX_LIBRARY_NAME_STATIC_GL}" + else + WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC}" + fi + + WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" + WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}" + WX_TARGET_LIBRARY_TYPE="a" fi @@ -11201,17 +11398,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:11205: checking for $ac_hdr" >&5 +echo "configure:11402: 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:11215: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11412: \"$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* @@ -11241,17 +11438,17 @@ for ac_hdr in stdlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11245: checking for $ac_hdr" >&5 +echo "configure:11442: 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:11255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11452: \"$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* @@ -11281,17 +11478,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:11285: checking for $ac_hdr" >&5 +echo "configure:11482: 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:11295: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11321,17 +11518,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:11325: checking for $ac_hdr" >&5 +echo "configure:11522: 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:11335: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11532: \"$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* @@ -11361,17 +11558,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:11365: checking for $ac_hdr" >&5 +echo "configure:11562: 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:11375: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11572: \"$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* @@ -11401,17 +11598,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:11405: checking for $ac_hdr" >&5 +echo "configure:11602: 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:11415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11612: \"$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* @@ -11441,17 +11638,17 @@ for ac_hdr in iconv.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11445: checking for $ac_hdr" >&5 +echo "configure:11642: 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:11455: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11652: \"$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* @@ -11481,17 +11678,17 @@ for ac_hdr in langinfo.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11485: checking for $ac_hdr" >&5 +echo "configure:11682: 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:11495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11692: \"$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* @@ -11524,17 +11721,17 @@ if test "$wxUSE_GUI" = "yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11528: checking for $ac_hdr" >&5 +echo "configure:11725: 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:11538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11735: \"$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* @@ -11563,100 +11760,14 @@ done fi fi -if test "$USE_WIN32" = 1; then - for ac_hdr in w32api.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11572: 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:11582: \"$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* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 -fi -done - - - echo $ac_n "checking if w32api has good enough MSIE support""... $ac_c" 1>&6 -echo "configure:11610: checking if w32api has good enough MSIE support" >&5 -if eval "test \"`echo '$''{'wx_cv_w32api_win_ie'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - - cat > conftest.$ac_ext < -int main() { - - #define wxCHECK_W32API_VERSION( major, minor ) \ - ( defined( __W32API_MAJOR_VERSION ) && defined( __W32API_MINOR_VERSION ) \ - && ( ( __W32API_MAJOR_VERSION > (major) ) \ - || ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor)))) - - #if !wxCHECK_W32API_VERSION(1,1) - #error You need w32api 1.1 or newer - #endif - -; return 0; } -EOF -if { (eval echo configure:11632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - wx_cv_w32api_win_ie=yes - CPPFLAGS="$CPPFLAGS -D_WIN_IE=0x400" - -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - - wx_cv_w32api_win_ie=no - -fi -rm -f conftest* - -fi - -echo "$ac_t""$wx_cv_w32api_win_ie" 1>&6 -fi - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:11655: checking for ANSI C header files" >&5 +echo "configure:11766: 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 @@ -11664,7 +11775,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11779: \"$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* @@ -11681,7 +11792,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 @@ -11699,7 +11810,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 @@ -11720,7 +11831,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -11731,7 +11842,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:11735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -11755,12 +11866,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:11759: checking for mode_t" >&5 +echo "configure:11870: 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 @@ -11788,12 +11899,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:11792: checking for off_t" >&5 +echo "configure:11903: 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 @@ -11821,12 +11932,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:11825: checking for pid_t" >&5 +echo "configure:11936: 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 @@ -11854,12 +11965,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:11858: checking for size_t" >&5 +echo "configure:11969: 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 @@ -11887,12 +11998,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:11891: checking for uid_t in sys/types.h" >&5 +echo "configure:12002: 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 @@ -11922,13 +12033,13 @@ fi echo $ac_n "checking for wchar_t""... $ac_c" 1>&6 -echo "configure:11926: checking for wchar_t" >&5 +echo "configure:12037: checking for wchar_t" >&5 if eval "test \"`echo '$''{'wx_cv_type_wchar_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -11939,7 +12050,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_wchar_t=yes else @@ -11947,7 +12058,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < int main() { @@ -11958,7 +12069,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11962: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_wchar_t=yes else @@ -11992,12 +12103,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking if size_t is unsigned int""... $ac_c" 1>&6 -echo "configure:11996: checking if size_t is unsigned int" >&5 +echo "configure:12107: checking if size_t is unsigned int" >&5 if eval "test \"`echo '$''{'wx_cv_size_t_is_uint'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -12010,7 +12121,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_size_t_is_uint=no else @@ -12033,12 +12144,12 @@ EOF else echo $ac_n "checking if size_t is unsigned long""... $ac_c" 1>&6 -echo "configure:12037: checking if size_t is unsigned long" >&5 +echo "configure:12148: checking if size_t is unsigned long" >&5 if eval "test \"`echo '$''{'wx_cv_size_t_is_ulong'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -12051,7 +12162,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12166: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_size_t_is_ulong=no else @@ -12085,13 +12196,13 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6 -echo "configure:12089: checking for pw_gecos in struct passwd" >&5 +echo "configure:12200: checking for pw_gecos in struct passwd" >&5 if eval "test \"`echo '$''{'wx_cv_struct_pw_gecos'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -12102,7 +12213,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_pw_gecos=yes @@ -12132,12 +12243,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:12136: checking for working const" >&5 +echo "configure:12247: 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:12301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -12207,21 +12318,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:12211: checking for inline" >&5 +echo "configure:12322: 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:12336: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -12248,7 +12359,7 @@ esac echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:12252: checking size of char" >&5 +echo "configure:12363: 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 @@ -12256,9 +12367,10 @@ else ac_cv_sizeof_char=1 else cat > conftest.$ac_ext < +#include main() { FILE *f=fopen("conftestval", "w"); @@ -12267,7 +12379,7 @@ main() exit(0); } EOF -if { (eval echo configure:12271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12383: \"$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 @@ -12287,7 +12399,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:12291: checking size of short" >&5 +echo "configure:12403: 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 @@ -12295,9 +12407,10 @@ else ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < +#include main() { FILE *f=fopen("conftestval", "w"); @@ -12306,7 +12419,7 @@ main() exit(0); } EOF -if { (eval echo configure:12310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12423: \"$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 @@ -12326,7 +12439,7 @@ EOF echo $ac_n "checking size of int *""... $ac_c" 1>&6 -echo "configure:12330: checking size of int *" >&5 +echo "configure:12443: 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 @@ -12334,9 +12447,10 @@ else ac_cv_sizeof_int_p=4 else cat > conftest.$ac_ext < +#include main() { FILE *f=fopen("conftestval", "w"); @@ -12345,7 +12459,7 @@ main() exit(0); } EOF -if { (eval echo configure:12349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12463: \"$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 @@ -12365,7 +12479,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:12369: checking size of int" >&5 +echo "configure:12483: 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 @@ -12373,9 +12487,10 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < +#include main() { FILE *f=fopen("conftestval", "w"); @@ -12384,7 +12499,7 @@ main() exit(0); } EOF -if { (eval echo configure:12388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12503: \"$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 @@ -12404,7 +12519,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:12408: checking size of long" >&5 +echo "configure:12523: 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 @@ -12412,9 +12527,10 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < +#include main() { FILE *f=fopen("conftestval", "w"); @@ -12423,7 +12539,7 @@ main() exit(0); } EOF -if { (eval echo configure:12427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12543: \"$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 @@ -12443,7 +12559,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:12447: checking size of long long" >&5 +echo "configure:12563: 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 @@ -12451,9 +12567,10 @@ else ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext < +#include main() { FILE *f=fopen("conftestval", "w"); @@ -12462,7 +12579,7 @@ main() exit(0); } EOF -if { (eval echo configure:12466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12583: \"$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 @@ -12483,7 +12600,7 @@ EOF echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6 -echo "configure:12487: checking size of wchar_t" >&5 +echo "configure:12604: checking size of wchar_t" >&5 if eval "test \"`echo '$''{'wx_cv_sizeof_wchar_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12493,7 +12610,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:12633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then wx_cv_sizeof_wchar_t=`cat conftestval` else @@ -12535,14 +12652,14 @@ EOF echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:12539: checking whether byte ordering is bigendian" >&5 +echo "configure:12656: 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 @@ -12553,11 +12670,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:12557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12674: \"$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 @@ -12568,7 +12685,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:12572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -12588,7 +12705,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:12722: \"$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 @@ -12628,6 +12745,49 @@ EOF fi +echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 +echo "configure:12750: 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 +else + ac_ext=C +# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +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:12768: \"$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 + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CXXCPP=/lib/cpp +fi +rm -f conftest* + ac_cv_prog_CXXCPP="$CXXCPP" +ac_ext=C +# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross +fi +fi +CXXCPP="$ac_cv_prog_CXXCPP" +echo "$ac_t""$CXXCPP" 1>&6 + if test "$cross_compiling" = "yes"; then cat >> confdefs.h <<\EOF @@ -12648,17 +12808,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:12652: checking for $ac_hdr" >&5 +echo "configure:12812: 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:12662: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12822: \"$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* @@ -12706,7 +12866,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6 -echo "configure:12710: checking if C++ compiler supports bool" >&5 +echo "configure:12870: 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 @@ -12721,7 +12881,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_cpp_bool=yes @@ -12771,7 +12931,7 @@ EOF echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6 -echo "configure:12775: checking for wcslen in -lc" >&5 +echo "configure:12935: 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 @@ -12779,7 +12939,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:12954: \"$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 @@ -12816,7 +12976,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6 -echo "configure:12820: checking for wcslen in -lw" >&5 +echo "configure:12980: 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 @@ -12824,7 +12984,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:12999: \"$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 @@ -12861,7 +13021,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for wcslen in -lmsvcrt""... $ac_c" 1>&6 -echo "configure:12865: checking for wcslen in -lmsvcrt" >&5 +echo "configure:13025: checking for wcslen in -lmsvcrt" >&5 ac_lib_var=`echo msvcrt'_'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 @@ -12869,7 +13029,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmsvcrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13044: \"$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 @@ -12914,12 +13074,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:12918: checking for vprintf" >&5 +echo "configure:13078: 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:13106: \"$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 @@ -12966,12 +13126,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:12970: checking for _doprnt" >&5 +echo "configure:13130: 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:13158: \"$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 @@ -13025,13 +13185,13 @@ fi echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:13029: checking for vsnprintf" >&5 +echo "configure:13189: checking for vsnprintf" >&5 if eval "test \"`echo '$''{'wx_cv_func_vsnprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -13056,7 +13216,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13060: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_vsnprintf=yes @@ -13067,7 +13227,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -13092,7 +13252,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13096: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_vsnprintf=yes @@ -13124,13 +13284,13 @@ else fi echo $ac_n "checking for vsscanf""... $ac_c" 1>&6 -echo "configure:13128: checking for vsscanf" >&5 +echo "configure:13288: checking for vsscanf" >&5 if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -13153,7 +13313,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_vsscanf=yes @@ -13191,13 +13351,13 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking if iconv() takes char**""... $ac_c" 1>&6 -echo "configure:13195: checking if iconv() takes char**" >&5 +echo "configure:13355: checking if iconv() takes char**" >&5 if eval "test \"`echo '$''{'wx_cv_iconv_takes_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -13209,7 +13369,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13213: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_iconv_takes_char=yes else @@ -13242,12 +13402,12 @@ if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then for ac_func in sigaction do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13246: checking for $ac_func" >&5 +echo "configure:13406: 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:13434: \"$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 @@ -13311,13 +13471,13 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for sa_handler type""... $ac_c" 1>&6 -echo "configure:13315: checking for sa_handler type" >&5 +echo "configure:13475: checking for sa_handler type" >&5 if eval "test \"`echo '$''{'wx_cv_type_sa_handler'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -13329,7 +13489,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_sa_handler=int @@ -13366,12 +13526,12 @@ fi for ac_func in vfork do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13370: checking for $ac_func" >&5 +echo "configure:13530: 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:13558: \"$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 @@ -13420,12 +13580,12 @@ done echo $ac_n "checking for statfs""... $ac_c" 1>&6 -echo "configure:13424: checking for statfs" >&5 +echo "configure:13584: checking for statfs" >&5 if eval "test \"`echo '$''{'wx_cv_func_statfs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -13441,7 +13601,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_statfs=yes @@ -13474,12 +13634,12 @@ if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then for ac_func in fcntl flock do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13478: checking for $ac_func" >&5 +echo "configure:13638: 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:13666: \"$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 @@ -13536,12 +13696,12 @@ fi for ac_func in timegm do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13540: checking for $ac_func" >&5 +echo "configure:13700: 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:13728: \"$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 @@ -13592,12 +13752,12 @@ done for ac_func in putenv setenv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13596: checking for $ac_func" >&5 +echo "configure:13756: 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:13784: \"$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 @@ -13667,12 +13827,12 @@ if test "$HAVE_SOME_SLEEP_FUNC" != 1; then for ac_func in nanosleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13671: checking for $ac_func" >&5 +echo "configure:13831: 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:13859: \"$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 @@ -13720,7 +13880,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6 -echo "configure:13724: checking for nanosleep in -lposix4" >&5 +echo "configure:13884: 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 @@ -13728,7 +13888,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:13903: \"$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 @@ -13767,12 +13927,12 @@ else for ac_func in usleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13771: checking for $ac_func" >&5 +echo "configure:13931: 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:13959: \"$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 @@ -13838,12 +13998,12 @@ fi for ac_func in uname gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13842: checking for $ac_func" >&5 +echo "configure:14002: 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:14030: \"$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 @@ -13903,12 +14063,12 @@ cross_compiling=$ac_cv_prog_cxx_cross for ac_func in strtok_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13907: checking for $ac_func" >&5 +echo "configure:14067: 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:14098: \"$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 @@ -13971,12 +14131,12 @@ INET_LINK= for ac_func in inet_addr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13975: checking for $ac_func" >&5 +echo "configure:14135: 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:14163: \"$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 @@ -14024,7 +14184,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6 -echo "configure:14028: checking for inet_addr in -lnsl" >&5 +echo "configure:14188: checking for inet_addr in -lnsl" >&5 ac_lib_var=`echo nsl'_'inet_addr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14032,7 +14192,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:14207: \"$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 @@ -14062,7 +14222,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6 -echo "configure:14066: checking for inet_addr in -lresolv" >&5 +echo "configure:14226: checking for inet_addr in -lresolv" >&5 ac_lib_var=`echo resolv'_'inet_addr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14070,7 +14230,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:14245: \"$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 @@ -14114,12 +14274,12 @@ done for ac_func in inet_aton do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14118: checking for $ac_func" >&5 +echo "configure:14278: 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:14306: \"$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 @@ -14167,7 +14327,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6 -echo "configure:14171: checking for inet_aton in -l$INET_LINK" >&5 +echo "configure:14331: checking for inet_aton in -l$INET_LINK" >&5 ac_lib_var=`echo $INET_LINK'_'inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14175,7 +14335,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$INET_LINK $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14350: \"$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 @@ -14277,8 +14437,10 @@ rm -f confcache if test "$TOOLKIT" != "MSW"; then -THREADS_LINK="" -THREADS_OBJ="" +THREADS_LINK= +THREADS_OBJ= +CODE_GEN_FLAGS= +CODE_GEN_FLAGS_CXX= if test "$wxUSE_THREADS" = "yes" ; then if test "$wxUSE_WINE" = 1 ; then @@ -14299,7 +14461,7 @@ if test "$wxUSE_THREADS" = "yes" ; then fi echo $ac_n "checking for pthread_create in -l$THREADS_LIB""... $ac_c" 1>&6 -echo "configure:14303: checking for pthread_create in -l$THREADS_LIB" >&5 +echo "configure:14465: checking for pthread_create in -l$THREADS_LIB" >&5 ac_lib_var=`echo $THREADS_LIB'_'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 @@ -14307,7 +14469,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$THREADS_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14484: \"$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 @@ -14341,7 +14503,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:14345: checking for pthread_create in -lc_r" >&5 +echo "configure:14507: 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 @@ -14349,7 +14511,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:14526: \"$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 @@ -14384,17 +14546,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:14388: checking for sys/prctl.h" >&5 +echo "configure:14550: 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:14398: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14560: \"$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* @@ -14434,12 +14596,12 @@ if test "$wxUSE_THREADS" = "yes" ; then for ac_func in thr_setconcurrency do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14438: checking for $ac_func" >&5 +echo "configure:14600: 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:14628: \"$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 @@ -14492,17 +14654,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:14496: checking for $ac_hdr" >&5 +echo "configure:14658: 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:14506: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14668: \"$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* @@ -14530,7 +14692,7 @@ done echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:14534: checking for sched_yield in -l$THREADS_LINK" >&5 +echo "configure:14696: 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 @@ -14538,7 +14700,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:14715: \"$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 @@ -14571,7 +14733,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6 -echo "configure:14575: checking for sched_yield in -lposix4" >&5 +echo "configure:14737: checking for sched_yield in -lposix4" >&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 @@ -14579,7 +14741,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:14756: \"$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 @@ -14621,7 +14783,7 @@ fi HAVE_PRIOR_FUNCS=0 echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:14625: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5 +echo "configure:14787: 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 @@ -14629,7 +14791,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:14806: \"$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 @@ -14656,7 +14818,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for pthread_attr_setschedparam in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:14660: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5 +echo "configure:14822: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_setschedparam | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14664,7 +14826,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:14841: \"$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 @@ -14691,7 +14853,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for sched_get_priority_max in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:14695: checking for sched_get_priority_max in -l$THREADS_LINK" >&5 +echo "configure:14857: checking for sched_get_priority_max in -l$THREADS_LINK" >&5 ac_lib_var=`echo $THREADS_LINK'_'sched_get_priority_max | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14699,7 +14861,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:14876: \"$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 @@ -14729,7 +14891,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6 -echo "configure:14733: checking for sched_get_priority_max in -lposix4" >&5 +echo "configure:14895: checking for sched_get_priority_max in -lposix4" >&5 ac_lib_var=`echo posix4'_'sched_get_priority_max | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14737,7 +14899,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:14914: \"$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 @@ -14795,7 +14957,7 @@ EOF fi echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6 -echo "configure:14799: checking for pthread_cancel in -l$THREADS_LINK" >&5 +echo "configure:14961: 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 @@ -14803,7 +14965,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:14980: \"$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 @@ -14840,13 +15002,13 @@ fi echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6 -echo "configure:14844: checking for pthread_cleanup_push/pop" >&5 +echo "configure:15006: 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() { @@ -14856,7 +15018,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_pthread_cleanup_push=yes @@ -14888,13 +15050,13 @@ EOF fi echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6 -echo "configure:14892: checking for pthread_mutexattr_t" >&5 +echo "configure:15054: checking for pthread_mutexattr_t" >&5 if eval "test \"`echo '$''{'wx_cv_type_pthread_mutexattr_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -14904,7 +15066,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15070: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_pthread_mutexattr_t=yes @@ -14931,13 +15093,13 @@ EOF else echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6 -echo "configure:14935: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5 +echo "configure:15097: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5 if eval "test \"`echo '$''{'wx_cv_type_pthread_rec_mutex_init'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -14946,7 +15108,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14950: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15112: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_pthread_rec_mutex_init=yes @@ -14993,16 +15155,16 @@ EOF if test "$USE_DARWIN" != 1; then - CPPFLAGS="${CPPFLAGS} -D_REENTRANT" + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT" fi SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread" else if test "$ac_cv_func_strtok_r" = "yes"; then echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6 -echo "configure:15004: checking if -D_REENTRANT is needed" >&5 +echo "configure:15166: checking if -D_REENTRANT is needed" >&5 if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then - CPPFLAGS="${CPPFLAGS} -D_REENTRANT" + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT" echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 @@ -15032,86 +15194,6 @@ EOF fi -if test "$WXWINE" = 1 ; then - TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXWINE__" -fi - -if test "$wxUSE_MAC" = 1 ; then - TOOLKIT_DEF="${TOOLKIT_DEF} -DTARGET_CARBON" - CPPFLAGS="${CPPFLAGS} -fpascal-strings" - CXXFLAGS="${CXXFLAGS} -cpp-precomp" - # Extract the first word of "Rez", so it can be a program name with args. -set dummy Rez; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15047: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_REZ'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$REZ"; then - ac_cv_prog_REZ="$REZ" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_REZ="Rez" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_REZ" && ac_cv_prog_REZ="/Developer/Tools/Rez" -fi -fi -REZ="$ac_cv_prog_REZ" -if test -n "$REZ"; then - echo "$ac_t""$REZ" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - # Extract the first word of "Derez", so it can be a program name with args. -set dummy Derez; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:15077: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_DEREZ'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$DEREZ"; then - ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_DEREZ="Derez" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/Derez" -fi -fi -DEREZ="$ac_cv_prog_DEREZ" -if test -n "$DEREZ"; then - echo "$ac_t""$DEREZ" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - RESCOMP=${REZ} - REZFLAGS="-d __UNIX__ -useDF" - DEREZFLAGS="Carbon.r -useDF" - RESFLAGS="Carbon.r -t APPL" - LIBWXMACRES="\$(LIBWX_MACRES)" - LIBWXMACRESCOMP="\$(LIBWX_MACRESCOMP)" -fi - -if test "$wxUSE_CYGWIN" = 1 ; then - TOOLKIT_DEF="${TOOLKIT_DEF} -D__WIN95__" -fi - WXDEBUG= if test "$wxUSE_DEBUG_INFO" = "yes" ; then @@ -15161,21 +15243,25 @@ if test "$wxUSE_PROFILE" = "yes" ; then PROFILE="-pg" fi -DEP_INFO_FLAGS= -CODE_GEN_FLAGS= -CODE_GEN_FLAGS_CXX= if test "$GCC" = yes ; then if test "$wxUSE_NO_RTTI" = "yes" ; then - CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS -fno-rtti" + CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-rtti" fi if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then - CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS -fno-exceptions" + CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-exceptions" fi if test "$wxUSE_PERMISSIVE" = "yes" ; then CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive" fi if test "$wxUSE_NO_DEPS" = "no" ; then - DEP_INFO_FLAGS="-MMD" + CFLAGS="-MMD ${CFLAGS}" + CXXFLAGS="-MMD ${CXXFLAGS}" + fi + if test "$USE_WIN32" = 1 ; then + # I'm not even really sure what this was ever added to solve, + # but someone added it for mingw native builds, so I guess + # they had a reason, right?? + CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-pcc-struct-return" fi fi @@ -15226,17 +15312,17 @@ EOF ZLIB_LINK= ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for zlib.h""... $ac_c" 1>&6 -echo "configure:15230: checking for zlib.h" >&5 +echo "configure:15316: checking for zlib.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:15240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15326: \"$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* @@ -15253,7 +15339,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 -echo "configure:15257: checking for deflate in -lz" >&5 +echo "configure:15343: checking for deflate in -lz" >&5 ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15261,7 +15347,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15362: \"$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 @@ -15319,17 +15405,17 @@ EOF PNG_LINK= ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:15323: checking for png.h" >&5 +echo "configure:15409: checking for png.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:15333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15419: \"$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* @@ -15346,7 +15432,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6 -echo "configure:15350: checking for png_check_sig in -lpng" >&5 +echo "configure:15436: checking for png_check_sig in -lpng" >&5 ac_lib_var=`echo png'_'png_check_sig | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15354,7 +15440,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15455: \"$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 @@ -15409,12 +15495,12 @@ EOF else JPEG_LINK= echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:15413: checking for jpeglib.h" >&5 +echo "configure:15499: checking for jpeglib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_jpeglib_h'+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:15516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_jpeglib_h=yes else @@ -15444,7 +15530,7 @@ fi if test "$ac_cv_header_jpeglib_h" = "yes"; then echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 -echo "configure:15448: checking for jpeg_read_header in -ljpeg" >&5 +echo "configure:15534: checking for jpeg_read_header in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15452,7 +15538,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15553: \"$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 @@ -15503,17 +15589,17 @@ EOF TIFF_LINK= ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:15507: checking for tiffio.h" >&5 +echo "configure:15593: checking for tiffio.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:15517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15603: \"$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* @@ -15530,7 +15616,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for TIFFError in -ltiff""... $ac_c" 1>&6 -echo "configure:15534: checking for TIFFError in -ltiff" >&5 +echo "configure:15620: checking for TIFFError in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFError | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15538,7 +15624,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15639: \"$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 @@ -15591,17 +15677,17 @@ EOF FREETYPE_LINK= ac_safe=`echo "freetype.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for freetype.h""... $ac_c" 1>&6 -echo "configure:15595: checking for freetype.h" >&5 +echo "configure:15681: checking for freetype.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:15605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15691: \"$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* @@ -15618,7 +15704,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for FT_Render_Glyph in -lfreetype""... $ac_c" 1>&6 -echo "configure:15622: checking for FT_Render_Glyph in -lfreetype" >&5 +echo "configure:15708: checking for FT_Render_Glyph in -lfreetype" >&5 ac_lib_var=`echo freetype'_'FT_Render_Glyph | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15626,7 +15712,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lfreetype -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15727: \"$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 @@ -15668,152 +15754,6 @@ fi fi fi -if test "$wxUSE_OPENGL" = "yes"; then - if test "$wxUSE_MAC" = 1; then - cat >> confdefs.h <<\EOF -#define wxUSE_OPENGL 1 -EOF - - cat >> confdefs.h <<\EOF -#define wxUSE_GLCANVAS 1 -EOF - - OPENGL_LINK="-framework OpenGL -framework AGL" - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl" - else - ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6 -echo "configure:15687: 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:15697: \"$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* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - cat >> confdefs.h <<\EOF -#define wxUSE_OPENGL 1 -EOF - - cat >> confdefs.h <<\EOF -#define wxUSE_GLCANVAS 1 -EOF - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl" - echo $ac_n "checking for glFlush in -lGL""... $ac_c" 1>&6 -echo "configure:15724: checking for glFlush in -lGL" >&5 -ac_lib_var=`echo GL'_'glFlush | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lGL $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - OPENGL_LINK="-lGL -lGLU" - -else - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for glFlush in -lMesaGL""... $ac_c" 1>&6 -echo "configure:15765: checking for glFlush in -lMesaGL" >&5 -ac_lib_var=`echo MesaGL'_'glFlush | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lMesaGL $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - OPENGL_LINK="-lMesaGL -lMesaGLU" - -else - echo "$ac_t""no" 1>&6 -fi - - -fi - - -else - echo "$ac_t""no" 1>&6 -wxUSE_OPENGL=0 -fi - - fi -fi - if test "$wxUSE_GUI" = "yes"; then cat >> confdefs.h <<\EOF @@ -16047,12 +15987,12 @@ if test "$wxUSE_DATETIME" = "yes"; then for ac_func in strptime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16051: checking for $ac_func" >&5 +echo "configure:15991: 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:16019: \"$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 @@ -16101,13 +16041,13 @@ done echo $ac_n "checking for timezone variable in ""... $ac_c" 1>&6 -echo "configure:16105: checking for timezone variable in " >&5 +echo "configure:16045: checking for timezone variable in " >&5 if eval "test \"`echo '$''{'wx_cv_var_timezone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -16119,7 +16059,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16063: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=timezone @@ -16130,7 +16070,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -16142,7 +16082,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=_timezone @@ -16153,7 +16093,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < @@ -16165,7 +16105,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_var_timezone=__timezone @@ -16200,12 +16140,12 @@ EOF for ac_func in localtime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16204: checking for $ac_func" >&5 +echo "configure:16144: 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:16172: \"$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 @@ -16255,13 +16195,13 @@ done if test "$ac_cv_func_localtime" = "yes"; then echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:16259: checking for tm_gmtoff in struct tm" >&5 +echo "configure:16199: checking for tm_gmtoff in struct tm" >&5 if eval "test \"`echo '$''{'wx_cv_struct_tm_has_gmtoff'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -16273,7 +16213,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_struct_tm_has_gmtoff=yes @@ -16302,12 +16242,12 @@ EOF for ac_func in gettimeofday ftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16306: checking for $ac_func" >&5 +echo "configure:16246: 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:16274: \"$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 @@ -16357,7 +16297,7 @@ done if test "$ac_cv_func_gettimeofday" = "yes"; then echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6 -echo "configure:16361: checking whether gettimeofday takes two arguments" >&5 +echo "configure:16301: checking whether gettimeofday takes two arguments" >&5 if eval "test \"`echo '$''{'wx_cv_func_gettimeofday_has_2_args'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16372,7 +16312,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -16385,7 +16325,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16329: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=yes else @@ -16393,7 +16333,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -16406,7 +16346,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:16410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_func_gettimeofday_has_2_args=no else @@ -16453,14 +16393,14 @@ fi if test "$TOOLKIT" != "MSW"; then -if test "$wxUSE_SOCKETS" = "yes"; then - echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:16459: checking for socket" >&5 + if test "$wxUSE_SOCKETS" = "yes"; then + echo $ac_n "checking for socket""... $ac_c" 1>&6 +echo "configure:16399: checking for socket" >&5 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -16501,7 +16441,7 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:16505: checking for socket in -lsocket" >&5 +echo "configure:16445: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16509,7 +16449,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16464: \"$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 @@ -16539,27 +16479,27 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 - echo "configure: warning: socket library not found - sockets will be disabled" 1>&2 - wxUSE_SOCKETS=no + echo "configure: warning: socket library not found - sockets will be disabled" 1>&2 + wxUSE_SOCKETS=no + +fi + fi - -fi + fi -fi - - -if test "$wxUSE_SOCKETS" = "yes" ; then - echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6 -echo "configure:16557: checking what is the type of the third argument of getsockname" >&5 + + if test "$wxUSE_SOCKETS" = "yes" ; then + echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6 +echo "configure:16497: checking what is the type of the third argument of getsockname" >&5 if eval "test \"`echo '$''{'wx_cv_type_getsockname3'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - - ac_ext=C + + ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' @@ -16567,29 +16507,8 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross - cat > conftest.$ac_ext < - #include - -int main() { - - socklen_t len; - getsockname(0, 0, &len); - -; return 0; } -EOF -if { (eval echo configure:16585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - wx_cv_type_getsockname3=socklen_t -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - cat > conftest.$ac_ext < conftest.$ac_ext < @@ -16597,20 +16516,20 @@ else int main() { - size_t len; + socklen_t len; getsockname(0, 0, &len); ; return 0; } EOF -if { (eval echo configure:16606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16525: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - wx_cv_type_getsockname3=size_t + wx_cv_type_getsockname3=socklen_t else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -16618,12 +16537,33 @@ else int main() { - int len; + size_t len; getsockname(0, 0, &len); ; return 0; } EOF -if { (eval echo configure:16627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + wx_cv_type_getsockname3=size_t +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cat > conftest.$ac_ext < + #include + +int main() { + + int len; + getsockname(0, 0, &len); + +; return 0; } +EOF +if { (eval echo configure:16567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* wx_cv_type_getsockname3=int else @@ -16631,71 +16571,68 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* wx_cv_type_getsockname3=unknown + +fi +rm -f conftest* fi rm -f conftest* -fi -rm -f conftest* - fi rm -f conftest* - ac_ext=c + ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross - + fi echo "$ac_t""$wx_cv_type_getsockname3" 1>&6 - if test "$wx_cv_type_getsockname3" = "unknown"; then - wxUSE_SOCKETS=no - echo "configure: warning: Couldn't find socklen_t synonym for this system" 1>&2 - else - cat >> confdefs.h <&2 + else + cat >> confdefs.h <> confdefs.h <<\EOF #define wxUSE_SOCKETS 1 EOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets" - INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol" fi if test "$wxUSE_GUI" = "yes"; then -if test "$TOOLKIT" != "MSW"; then - -if test "$wxUSE_JOYSTICK" = "yes"; then - for ac_hdr in linux/joystick.h + if test "$TOOLKIT" != "MSW"; then + if test "$wxUSE_JOYSTICK" = "yes"; then + for ac_hdr in linux/joystick.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:16689: checking for $ac_hdr" >&5 +echo "configure:16626: 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:16699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:16636: \"$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* @@ -16721,42 +16658,40 @@ else fi done - if test "$ac_cv_header_linux_joystick_h" != "yes"; then - wxUSE_JOYSTICK=no - echo "configure: warning: Joystick not supported by this system" 1>&2 - fi -fi + if test "$ac_cv_header_linux_joystick_h" != "yes"; then + wxUSE_JOYSTICK=no + echo "configure: warning: Joystick not supported by this system" 1>&2 + fi + fi + fi -fi - -if test "$wxUSE_JOYSTICK" = "yes"; then - cat >> confdefs.h <<\EOF + if test "$wxUSE_JOYSTICK" = "yes"; then + cat >> confdefs.h <<\EOF #define wxUSE_JOYSTICK 1 EOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest" -fi - + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest" + fi fi if test "$TOOLKIT" != "MSW"; then -HAVE_DL_FUNCS=0 -HAVE_SHL_FUNCS=0 -if test "$wxUSE_DYNLIB_CLASS" = "yes"; then - if test "$USE_DARWIN" = 1; then - HAVE_DL_FUNCS=1 - else - for ac_func in dlopen + HAVE_DL_FUNCS=0 + HAVE_SHL_FUNCS=0 + if test "$wxUSE_DYNLIB_CLASS" = "yes"; then + if test "$USE_DARWIN" = 1; then + HAVE_DL_FUNCS=1 + else + for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16755: checking for $ac_func" >&5 +echo "configure:16690: 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:16718: \"$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 @@ -16798,16 +16733,16 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then #define $ac_tr_func 1 EOF - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_DLOPEN 1 EOF - HAVE_DL_FUNCS=1 - + HAVE_DL_FUNCS=1 + else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:16811: checking for dlopen in -ldl" >&5 +echo "configure:16746: 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 @@ -16815,7 +16750,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:16765: \"$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 @@ -16842,25 +16777,25 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_DLOPEN 1 EOF - HAVE_DL_FUNCS=1 - LIBS="$LIBS -ldl" - + HAVE_DL_FUNCS=1 + LIBS="$LIBS -ldl" + else echo "$ac_t""no" 1>&6 - for ac_func in shl_load + for ac_func in shl_load do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16859: checking for $ac_func" >&5 +echo "configure:16794: 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:16822: \"$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 @@ -16902,16 +16837,16 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then #define $ac_tr_func 1 EOF - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_SHL_LOAD 1 EOF - HAVE_SHL_FUNCS=1 - + HAVE_SHL_FUNCS=1 + else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6 -echo "configure:16915: checking for dld in -lshl_load" >&5 +echo "configure:16850: checking for dld in -lshl_load" >&5 ac_lib_var=`echo shl_load'_'dld | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16919,7 +16854,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lshl_load $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16869: \"$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 @@ -16946,35 +16881,35 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - HAVE_SHL_FUNCS=1 - LIBS="$LIBS -ldld" - + HAVE_SHL_FUNCS=1 + LIBS="$LIBS -ldld" + else echo "$ac_t""no" 1>&6 fi - + fi done - + fi - + fi done - if test "$HAVE_DL_FUNCS" = 1; then - for ac_func in dlerror + if test "$HAVE_DL_FUNCS" = 1; then + for ac_func in dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16973: checking for $ac_func" >&5 +echo "configure:16908: 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:16936: \"$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 @@ -17022,7 +16957,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6 -echo "configure:17026: checking for dlerror in -ldl" >&5 +echo "configure:16961: checking for dlerror in -ldl" >&5 ac_lib_var=`echo dl'_'dlerror | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17030,7 +16965,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:16980: \"$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 @@ -17067,23 +17002,22 @@ fi fi done - fi - fi + fi + fi - if test "$HAVE_DL_FUNCS" = 0; then - if test "$HAVE_SHL_FUNCS" = 0; then - if test "$USE_UNIX" = 1; then - echo "configure: warning: Missing dynamic loading support, several features will be disabled" 1>&2 - wxUSE_DYNLIB_CLASS=no - else - echo "configure: warning: Assuming wxLibrary class works on this platform" 1>&2 - fi + if test "$HAVE_DL_FUNCS" = 0; then + if test "$HAVE_SHL_FUNCS" = 0; then + if test "$USE_UNIX" = 1; then + echo "configure: warning: Missing dynamic loading support, several features will be disabled" 1>&2 + wxUSE_DYNLIB_CLASS=no + else + echo "configure: warning: Assuming wxLibrary class works on this platform" 1>&2 + fi + fi fi fi fi -fi - if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then cat >> confdefs.h <<\EOF #define wxUSE_DYNLIB_CLASS 1 @@ -17199,17 +17133,17 @@ EOF if test "$wxUSE_MS_HTML_HELP" = "yes"; then ac_safe=`echo "htmlhelp.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for htmlhelp.h""... $ac_c" 1>&6 -echo "configure:17203: checking for htmlhelp.h" >&5 +echo "configure:17137: checking for htmlhelp.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:17213: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:17147: \"$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* @@ -17290,22 +17224,24 @@ EOF fi -if test "$USE_WIN32" = 1; then +if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \ + -o "$wxUSE_CLIPBOARD" = "yes" \ + -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then for ac_hdr in ole2.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:17299: checking for $ac_hdr" >&5 +echo "configure:17235: 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:17309: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:17245: \"$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* @@ -17335,7 +17271,6 @@ done if test "$ac_cv_header_ole2_h" = "yes" ; then if test "$GCC" = yes ; then ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)" - ALL_DEPFILES="$ALL_DEPFILES \$(OLEDEPS)" CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks" LIBS="$LIBS -lrpcrt4 -loleaut32 -lole32 -luuid" cat >> confdefs.h <<\EOF @@ -17863,7 +17798,6 @@ if test "$wxUSE_HTML" = "yes"; then EOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html" - INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS html" fi if test "$wxUSE_VALIDATORS" = "yes"; then @@ -18045,19 +17979,33 @@ EOF GUILIBS="$GUI_TK_LIBRARY $TOOLKIT_LINK" -OPENGL_LIBS="$OPENGL_LINK" EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -lm" + if test "$wxUSE_MAC" = 1 ; then EXTRA_LIBS="$EXTRA_LIBS -framework Carbon -framework System" fi + if test "$wxUSE_GUI" = "yes"; then EXTRA_LIBS="$GUILIBS $PNG_LINK $JPEG_LINK $TIFF_LINK $FREETYPE_LINK $EXTRA_LIBS" + + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs \ + drawing dynamic erase event exec font image \ + minimal richedit rotate widgets" + + if test "$wxUSE_UNIVERSAL" = "yes" ; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS univ" + fi + + CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)" +else + SAMPLES_SUBDIRS="console" fi LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS" -INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include \ +INCLUDES="-I. -I\${top_builddir}/lib/wx/include/${TOOLCHAIN_NAME} -I\${top_srcdir}/include \ $REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \ $FREETYPE_INCLUDE $TOOLKIT_INCLUDE" @@ -18077,21 +18025,6 @@ CXXFLAGS=`echo $CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \+/ /g'` LDFLAGS="$LDFLAGS $PROFILE" -if test "$wxUSE_GUI" = "yes"; then - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs \ - drawing dynamic erase event exec font image \ - minimal richedit rotate widgets" - - if test "$wxUSE_UNIVERSAL" = "yes" ; then - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS univ" - fi - - CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)" -else - SAMPLES_SUBDIRS="console" -fi - SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`" @@ -18161,19 +18094,6 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq - - - - - - - - - - - - - @@ -18189,7 +18109,7 @@ 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:18193: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:18113: 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 @@ -18216,14 +18136,8 @@ else fi -if test -d include; then - if test -d include/wx; then - if test -d include/wx/${SETUPH_DIR}; then - if test -f include/wx/${SETUPH_DIR}/setup.h; then - mv -f include/wx/${SETUPH_DIR}/setup.h setup.h - fi - fi - fi +if test -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h; then + mv -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h setup.h fi @@ -18398,7 +18312,6 @@ s%@build_os@%$build_os%g s%@CC@%$CC%g s%@CPP@%$CPP%g s%@CXX@%$CXX%g -s%@CXXCPP@%$CXXCPP%g s%@RANLIB@%$RANLIB%g s%@AR@%$AR%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g @@ -18417,77 +18330,62 @@ s%@X_CFLAGS@%$X_CFLAGS%g s%@X_PRE_LIBS@%$X_PRE_LIBS%g s%@X_LIBS@%$X_LIBS%g s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g -s%@REZ@%$REZ%g +s%@RESCOMP@%$RESCOMP%g s%@DEREZ@%$DEREZ%g +s%@CXXCPP@%$CXXCPP%g s%@LEX_STEM@%$LEX_STEM%g s%@PATH_IFS@%$PATH_IFS%g s%@WX_MAJOR_VERSION_NUMBER@%$WX_MAJOR_VERSION_NUMBER%g s%@WX_MINOR_VERSION_NUMBER@%$WX_MINOR_VERSION_NUMBER%g s%@WX_RELEASE_NUMBER@%$WX_RELEASE_NUMBER%g -s%@WX_LIBRARY_NAME@%$WX_LIBRARY_NAME%g s%@WX_LIBRARY_NAME_STATIC@%$WX_LIBRARY_NAME_STATIC%g s%@WX_LIBRARY_NAME_SHARED@%$WX_LIBRARY_NAME_SHARED%g -s%@WX_LIBRARY@%$WX_LIBRARY%g s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g s%@WX_LIBRARY_LINK1@%$WX_LIBRARY_LINK1%g s%@WX_LIBRARY_LINK2@%$WX_LIBRARY_LINK2%g -s%@WX_LIBRARY_LINK3@%$WX_LIBRARY_LINK3%g s%@PROGRAM_EXT@%$PROGRAM_EXT%g -s%@WX_LIBRARY_NAME_GL@%$WX_LIBRARY_NAME_GL%g s%@WX_LIBRARY_NAME_STATIC_GL@%$WX_LIBRARY_NAME_STATIC_GL%g s%@WX_LIBRARY_NAME_SHARED_GL@%$WX_LIBRARY_NAME_SHARED_GL%g -s%@WX_LIBRARY_GL@%$WX_LIBRARY_GL%g s%@WX_TARGET_LIBRARY_GL@%$WX_TARGET_LIBRARY_GL%g s%@WX_LIBRARY_LINK1_GL@%$WX_LIBRARY_LINK1_GL%g s%@WX_LIBRARY_LINK2_GL@%$WX_LIBRARY_LINK2_GL%g -s%@WX_LIBRARY_LINK3_GL@%$WX_LIBRARY_LINK3_GL%g s%@WX_ALL@%$WX_ALL%g s%@WX_ALL_INSTALLED@%$WX_ALL_INSTALLED%g s%@SHARED_LD@%$SHARED_LD%g s%@PIC_FLAG@%$PIC_FLAG%g -s%@DEP_INFO_FLAGS@%$DEP_INFO_FLAGS%g s%@CODE_GEN_FLAGS@%$CODE_GEN_FLAGS%g s%@CODE_GEN_FLAGS_CXX@%$CODE_GEN_FLAGS_CXX%g -s%@BURNT_LIBRARY_NAME@%$BURNT_LIBRARY_NAME%g -s%@BURNT_LIBRARY_NAME_GL@%$BURNT_LIBRARY_NAME_GL%g +s%@SONAME_FLAGS@%$SONAME_FLAGS%g +s%@SONAME_FLAGS_GL@%$SONAME_FLAGS_GL%g s%@WX_TARGET_LIBRARY_SONAME@%$WX_TARGET_LIBRARY_SONAME%g s%@WX_TARGET_LIBRARY_TYPE@%$WX_TARGET_LIBRARY_TYPE%g s%@WXDEBUG_DEFINE@%$WXDEBUG_DEFINE%g s%@USE_GUI@%$USE_GUI%g s%@AFMINSTALL@%$AFMINSTALL%g -s%@SETUPH_DIR@%$SETUPH_DIR%g s%@TOOLKIT@%$TOOLKIT%g -s%@TOOLKIT_DEF@%$TOOLKIT_DEF%g s%@TOOLKIT_DIR@%$TOOLKIT_DIR%g -s%@TOOLKIT_NAME@%$TOOLKIT_NAME%g -s%@TOOLKIT_INCLUDE@%$TOOLKIT_INCLUDE%g s%@TOOLKIT_VPATH@%$TOOLKIT_VPATH%g +s%@TOOLCHAIN_NAME@%$TOOLCHAIN_NAME%g +s%@TOOLCHAIN_DEFS@%$TOOLCHAIN_DEFS%g +s%@cross_compiling@%$cross_compiling%g +s%@WXCONFIG_LIBS@%$WXCONFIG_LIBS%g +s%@WXCONFIG_LIBS_GL@%$WXCONFIG_LIBS_GL%g s%@WXCONFIG_INCLUDE@%$WXCONFIG_INCLUDE%g s%@ALL_OBJECTS@%$ALL_OBJECTS%g -s%@ALL_DEPFILES@%$ALL_DEPFILES%g s%@GUIDIST@%$GUIDIST%g s%@PORT_FILES@%$PORT_FILES%g s%@DISTDIR@%$DISTDIR%g s%@RPM_SPEC@%$RPM_SPEC%g s%@RPM_FILES@%$RPM_FILES%g -s%@SRC_SUBDIRS@%$SRC_SUBDIRS%g -s%@INCLUDE_SUBDIRS@%$INCLUDE_SUBDIRS%g -s%@UTILS_SUBDIRS@%$UTILS_SUBDIRS%g -s%@DOCS_SUBDIRS@%$DOCS_SUBDIRS%g s%@SAMPLES_SUBDIRS@%$SAMPLES_SUBDIRS%g -s%@USER_SUBDIRS@%$USER_SUBDIRS%g s%@EXTRA_LIBS@%$EXTRA_LIBS%g s%@OPENGL_LIBS@%$OPENGL_LIBS%g s%@EXTRADEFS@%$EXTRADEFS%g s%@LD_LIBS@%$LD_LIBS%g s%@WXMSW_DLL_DEFINES@%$WXMSW_DLL_DEFINES%g -s%@RCINPUTSWITCH@%$RCINPUTSWITCH%g -s%@RCOUTPUTSWITCH@%$RCOUTPUTSWITCH%g -s%@RESPROGRAM@%$RESPROGRAM%g -s%@RESCOMP@%$RESCOMP%g s%@RESFLAGS@%$RESFLAGS%g -s%@REZFLAGS@%$REZFLAGS%g -s%@DEREZFLAGS@%$DEREZFLAGS%g +s%@RESPROGRAMOBJ@%$RESPROGRAMOBJ%g +s%@WX_RESOURCES_DARWIN@%$WX_RESOURCES_DARWIN%g s%@LIBWXMACRES@%$LIBWXMACRES%g s%@LIBWXMACRESCOMP@%$LIBWXMACRESCOMP%g s%@DLLTOOL@%$DLLTOOL%g @@ -18712,21 +18610,19 @@ fi; done EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF - if test ! -f wx${TOOLKIT_NAME}-config; then + if test ! -L wx-config; then chmod +x wx-config - mv wx-config wx${TOOLKIT_NAME}-config - ${LN_S} wx${TOOLKIT_NAME}-config wx-config + mv wx-config wx${TOOLCHAIN_NAME}-config + ${LN_S} wx${TOOLCHAIN_NAME}-config wx-config fi - if test ! -d lib; then mkdir lib fi @@ -18736,30 +18632,15 @@ cat >> $CONFIG_STATUS <<\EOF if test ! -d lib/wx/include; then mkdir lib/wx/include fi - if test ! -d lib/wx/include/wx; then - mkdir lib/wx/include/wx + if test ! -d lib/wx/include/${TOOLCHAIN_NAME}; then + mkdir lib/wx/include/${TOOLCHAIN_NAME} fi - if test ! -d lib/wx/include/wx/${TOOLKIT_NAME}; then - mkdir lib/wx/include/wx/${TOOLKIT_NAME} + if test ! -d lib/wx/include/${TOOLCHAIN_NAME}/wx; then + mkdir lib/wx/include/${TOOLCHAIN_NAME}/wx fi if test -f setup.h; then - cp -fp setup.h lib/wx/include/wx/${TOOLKIT_NAME}/setup.h + mv -f setup.h lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h fi - - - if test ! -d include; then - mkdir include - fi - if test ! -d include/wx; then - mkdir include/wx - fi - if test ! -d include/wx/${SETUPH_DIR}; then - mkdir include/wx/${SETUPH_DIR} - fi - if test -f setup.h; then - cp -fp setup.h include/wx/${SETUPH_DIR}/setup.h - fi - exit 0 EOF diff --git a/configure.in b/configure.in index 049843487e..266c660e96 100644 --- a/configure.in +++ b/configure.in @@ -3,8 +3,8 @@ AC_REVISION($Id$)dnl dnl --------------------------------------------------------------------------- dnl -dnl Top-level configure.in for wxWindows by Robert Roebling, Phil Blecker and -dnl Vadim Zeitlin +dnl Top-level configure.in for wxWindows by Robert Roebling, Phil Blecker, +dnl Vadim Zeitlin and Ron Lee dnl dnl This script is under the wxWindows licence. dnl @@ -435,6 +435,7 @@ DEFAULT_DEFAULT_wxUSE_PM=0 DEFAULT_DEFAULT_wxUSE_WINE=0 PROGRAM_EXT= +SO_SUFFIX=so dnl to support a new system, you need to add its canonical name (as determined dnl by config.sub or specified by the configure command line) to this "case" @@ -445,6 +446,7 @@ case "${host}" in USE_HPUX=1 DEFAULT_DEFAULT_wxUSE_MOTIF=1 NEEDS_D_REENTRANT_FOR_R_FUNCS=1 + SO_SUFFIX=sl AC_DEFINE(__HPUX__) ;; *-*-linux* ) @@ -539,6 +541,7 @@ case "${host}" in *-*-cygwin* | *-*-mingw32* ) USE_UNIX=0 USE_WIN32=1 + SO_SUFFIX=dll AC_DEFINE(__WIN32__) AC_DEFINE(__WIN95__) AC_DEFINE(__WINDOWS__) @@ -558,9 +561,9 @@ case "${host}" in *-*-darwin* ) USE_BSD=1 USE_DARWIN=1 + SO_SUFFIX=dylib AC_DEFINE(__BSD__) AC_DEFINE(__DARWIN__) - AC_DEFINE(__UNIX__) DEFAULT_DEFAULT_wxUSE_MAC=1 ;; @@ -577,14 +580,6 @@ esac if test "$USE_UNIX" = 1 ; then wxUSE_UNIX=yes AC_DEFINE(__UNIX__) - - SRC_SUBDIRS="$SRC_SUBDIRS unix" - INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS unix" -fi - -if test "$USE_BEOS" = 1; then - SRC_SUBDIRS="$SRC_SUBDIRS be" - INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS be" fi dnl check for glibc version @@ -604,7 +599,6 @@ if test "$USE_LINUX" = 1; then ] ) ) - if test "$wx_lib_glibc21" = "yes"; then AC_DEFINE(wxHAVE_GLIBC2) fi @@ -631,7 +625,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_THREADS=yes DEFAULT_wxUSE_SHARED=yes - DEFAULT_wxUSE_BURNT_NAME=no + DEFAULT_wxUSE_SONAME=no DEFAULT_wxUSE_OPTIMISE=no DEFAULT_wxUSE_PROFILE=no DEFAULT_wxUSE_NO_DEPS=no @@ -791,7 +785,7 @@ else DEFAULT_wxUSE_THREADS=yes DEFAULT_wxUSE_SHARED=yes - DEFAULT_wxUSE_BURNT_NAME=no + DEFAULT_wxUSE_SONAME=no DEFAULT_wxUSE_OPTIMISE=yes DEFAULT_wxUSE_PROFILE=no DEFAULT_wxUSE_NO_DEPS=no @@ -1012,7 +1006,7 @@ dnl compile options dnl --------------------------------------------------------------------------- WX_ARG_ENABLE(shared, [ --enable-shared create shared library code], wxUSE_SHARED) -WX_ARG_ENABLE(burnt_name, [ --enable-burnt_name create set name in shared library ], wxUSE_BURNT_NAME) +WX_ARG_ENABLE(soname, [ --enable-soname set the DT_SONAME field in ELF shared libraries], wxUSE_SONAME) WX_ARG_ENABLE(optimise, [ --enable-optimise create optimised code], wxUSE_OPTIMISE) WX_ARG_ENABLE(debug, [ --enable-debug same as debug_flag and debug_info], wxUSE_DEBUG) @@ -1316,80 +1310,79 @@ AC_MSG_CHECKING(for toolkit) if test "$wxUSE_GUI" = "yes"; then -if test "$USE_BEOS" = 1; then - AC_MSG_ERROR([BeOS GUI is not supported yet, use --disable-gui]) -fi + if test "$USE_BEOS" = 1; then + AC_MSG_ERROR([BeOS GUI is not supported yet, use --disable-gui]) + fi -if test "$TOOLKIT_GIVEN" = 1; then - dnl convert "yes" to 1 and "no" to 0 - for toolkit in `echo $ALL_TOOLKITS`; do - var=wxUSE_$toolkit - eval "value=\$${var}" - eval "$var=`echo \$value | sed -e "s/yes/1/" -e "s/no/0/"`" - done -else - dnl try to guess the most apropriate toolkit for this platform - for toolkit in `echo $ALL_TOOLKITS`; do - if test "$has_toolkit_in_cache" != 1; then - var=DEFAULT_DEFAULT_wxUSE_$toolkit + if test "$TOOLKIT_GIVEN" = 1; then + dnl convert "yes" to 1 and "no" to 0 + for toolkit in `echo $ALL_TOOLKITS`; do + var=wxUSE_$toolkit + eval "value=\$${var}" + eval "$var=`echo \$value | sed -e "s/yes/1/" -e "s/no/0/"`" + done else - var=DEFAULT_wxUSE_$toolkit + dnl try to guess the most apropriate toolkit for this platform + for toolkit in `echo $ALL_TOOLKITS`; do + if test "$has_toolkit_in_cache" != 1; then + var=DEFAULT_DEFAULT_wxUSE_$toolkit + else + var=DEFAULT_wxUSE_$toolkit + fi + eval "wxUSE_$toolkit=\$${var}" + done fi - eval "wxUSE_$toolkit=\$${var}" - done -fi -dnl we suppose that expr is available (maybe there is a better way to do -dnl this? what about using ALL_TOOLKITS? TODO) -NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0} + ${wxUSE_MGL:-0}` + dnl we suppose that expr is available (maybe there is a better way to do + dnl this? what about using ALL_TOOLKITS? TODO) + NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0} \ + + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0} \ + + ${wxUSE_MGL:-0}` -dnl Allow wxUSE_PM only for OS/2 with EMX. -dnl Path separator; ':' for unix. -dnl Stem for flex output; lexyy for OS/2, lex.yy otherwise -dnl Extension for programs; '.exe' for OS/2 and msw builds (set later). -case "${host}" in - *-pc-os2_emx ) - NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}` - # PATH_IFS is autodetected by OS/2's configure (usually ';') - LEX_STEM="lexyy" - ;; - *) - PATH_IFS=':' - LEX_STEM="lex.yy" - ;; -esac + dnl Allow wxUSE_PM only for OS/2 with EMX. + dnl Path separator; ':' for unix. + dnl Stem for flex output; lexyy for OS/2, lex.yy otherwise + case "${host}" in + *-pc-os2_emx ) + # PATH_IFS is autodetected by OS/2's configure (usually ';') + NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}` + LEX_STEM="lexyy" + ;; + *) + PATH_IFS=':' + LEX_STEM="lex.yy" + ;; + esac -case "$NUM_TOOLKITS" in - 1) - ;; - 0) - AC_MSG_ERROR(Please specify a toolkit - cannot determine the default for ${host}) - ;; - *) - AC_MSG_ERROR(Please specify at most one toolkit (may be some are cached?)) -esac + case "$NUM_TOOLKITS" in + 1) + ;; + 0) + AC_MSG_ERROR(Please specify a toolkit - cannot determine the default for ${host}) + ;; + *) + AC_MSG_ERROR(Please specify at most one toolkit (may be some are cached?)) + esac -dnl cache the wxUSE_ values too -for toolkit in `echo $ALL_TOOLKITS`; do - var=wxUSE_$toolkit - eval "value=\$${var}" - if test "x$value" != x; then - cache_var=CACHE_$toolkit - eval "cache=\$${cache_var}" - if test "$cache" = 1; then - echo "$var=$value" >> ${wx_arg_cache_file} - fi - if test "$value" = 1; then - toolkit_echo=`echo $toolkit | tr [[A-Z]] [[a-z]]` - AC_MSG_RESULT($toolkit_echo) - fi - fi -done - -dnl from "if wxUSE_GUI" + dnl cache the wxUSE_ values too + for toolkit in `echo $ALL_TOOLKITS`; do + var=wxUSE_$toolkit + eval "value=\$${var}" + if test "x$value" != x; then + cache_var=CACHE_$toolkit + eval "cache=\$${cache_var}" + if test "$cache" = 1; then + echo "$var=$value" >> ${wx_arg_cache_file} + fi + if test "$value" = 1; then + toolkit_echo=`echo $toolkit | tr [[A-Z]] [[a-z]]` + AC_MSG_RESULT($toolkit_echo) + fi + fi + done else PATH_IFS=':' - AC_MSG_RESULT(base only) + AC_MSG_RESULT(base ($host_alias hosted) only) fi dnl --------------------------------------------------------------------------- @@ -1402,15 +1395,19 @@ AC_CACHE_SAVE dnl cross-compiling support: we're cross compiling if the build system is dnl different from the target one (assume host and target be always the same) if test "$build" != "$host" ; then - CC=$host_alias-gcc - CXX=$host_alias-c++ - AR=$host_alias-ar - RANLIB=$host_alias-ranlib - DLLTOOL=$host_alias-dlltool - RESCOMP=$host_alias-windres - LD=$host_alias-ld - NM=$host_alias-nm - STRIP=$host_alias-strip + if test "$USE_WIN32" = 1 ; then + CC=$host_alias-gcc + CXX=$host_alias-c++ + AR=$host_alias-ar + RANLIB=$host_alias-ranlib + DLLTOOL=$host_alias-dlltool + RESCOMP=$host_alias-windres + LD=$host_alias-ld + NM=$host_alias-nm + STRIP=$host_alias-strip + else + AC_MSG_ERROR($build_alias -> $host_alias cross compilation not supported yet.) + fi fi dnl C-compiler checks @@ -1422,10 +1419,6 @@ AC_PROG_CC CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'` -dnl what is the c-preprocessor -dnl defines CPP with the c-preprocessor -AC_PROG_CPP - dnl is -traditional needed for correct compilations dnl adds -traditional for gcc if needed AC_PROG_GCC_TRADITIONAL @@ -1440,10 +1433,6 @@ dnl defines GXX empty if not using gxx dnl defines CXXFLAGS AC_PROG_CXX -dnl what is the C++-preprocessor -dnl defines CXXCPP with the C++-preprocessor -AC_PROG_CXXCPP - CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g//g'` AC_LANG_RESTORE @@ -1465,7 +1454,7 @@ dnl defines STRIP as strip or nothing if not found AC_CHECK_PROG(STRIP, strip, strip, true) dnl check if VPATH works -AC_MSG_CHECKING([make for VPATH support]) +AC_MSG_CHECKING(make for VPATH support) dnl create Makefile cat - << EOF > confMake check : file @@ -1628,56 +1617,74 @@ dnl ---------------------------------------------------------------- AFMINSTALL= +TOOLKIT= +TOOLKIT_INCLUDE= +WIDGET_SET= + +dnl are we building for a win32 target environment? +dnl If so, setup common stuff needed for both GUI and Base libs. +if test "$USE_WIN32" = 1 ; then + AC_CHECK_HEADERS(w32api.h) + AC_CHECK_HEADER(windows.h, [], + [ + AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h) + ]) + + dnl check if can use _WIN_IE macro + AC_CACHE_CHECK([if w32api has good enough MSIE support], wx_cv_w32api_win_ie, + [ + AC_TRY_COMPILE([#include ], + [ + #define wxCHECK_W32API_VERSION( major, minor ) \ + ( defined( __W32API_MAJOR_VERSION ) && defined( __W32API_MINOR_VERSION ) \ + && ( ( __W32API_MAJOR_VERSION > (major) ) \ + || ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor)))) + + #if !wxCHECK_W32API_VERSION(1,1) + #error You need w32api 1.1 or newer + #endif + ], [ + wx_cv_w32api_win_ie=yes + CPPFLAGS="$CPPFLAGS -D_WIN_IE=0x400" + ], [ + wx_cv_w32api_win_ie=no + ]) + ]) + + dnl --- FIXME: This is still a somewhat random list of libs, + dnl --- some of them should probably be included conditionally. + LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32" + + dnl add extra odbc libs if we have compiled in odbc + if test "$wxUSE_ODBC" = "yes" ; then + LIBS="$LIBS -lodbc32 -lole32 -loleaut32" + fi + + dnl -mwindows is needed to avoid that spawning of a console window + dnl This probably doesn't belong here.. The user may actually *want* + dnl a console window. People should add this to their own app makefiles + dnl instead. Unless someone cries murder about it, expect this to + dnl disappear from here soon. + if test "$wxUSE_MINGW" = 1; then + LDFLAGS="$LDFLAGS -mwindows" + fi + + RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__" + RESPROGRAMOBJ="\$(PROGRAM)_resources.o" +fi + if test "$wxUSE_GUI" = "yes"; then USE_GUI=1 - TOOLKIT= - TOOLKIT_INCLUDE= - GUI_TK_LIBRARY= - GUI_TK_LINK= WXGTK12= WXGTK127= WXGTK20= - WXWINE= - if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then - AC_CHECK_HEADER(windows.h, [], - [ - AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h) - ]) - - INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw" - - dnl --- Quick & Dirty ; link against most/all libraries - dnl --- This will bloat the executable, but it'll work for now... - LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32" - - dnl add extra odbc libs if we have compiled in odbc - if test "$wxUSE_ODBC" = "yes" ; then - LIBS="$LIBS -lodbc32 -lole32 -loleaut32" - fi - - dnl -mwindows is needed to avoid that spawning of a console window - if test "$wxUSE_MINGW" = 1; then - LDFLAGS="$LDFLAGS -mwindows" - fi - TOOLKIT=MSW GUIDIST=MSW_DIST - - dnl we should calculate these - RCINCSWITCH="--include-dir" - RCDEFSWITCH="--define" - RCPREPROCESSOR="--preprocessor \"\$(CC) -c -E -xc-header -DRC_INVOKED\"" - RCINPUTSWITCH="-i" - RCOUTPUTSWITCH="-o" - RESFLAGS="$RCPREPROCESSOR $RCINCSWITCH \$(top_srcdir)/include $RCINCSWITCH \$(top_srcdir)/\$(program_dir) $RCDEFSWITCH __WIN32__ $RCDEFSWITCH __WIN95__ $RCDEFSWITCH __GNUWIN32__" - - dnl set optinal RES_PROGRAM_OPT to RES_PROGRAM - RESPROGRAM="\$(RES_PROGRAM)" fi if test "$wxUSE_GTK" = 1; then @@ -1761,24 +1768,24 @@ equivalent variable and GTK+ is version 1.2.3 or above. AC_MSG_RESULT($MGL_ROOT) fi - MGL_OS=linux/gcc/glibc - MGL_LIB_TYPE="" + mgl_os=linux/gcc/glibc + mgl_lib_type="" if test "$wxUSE_DEBUG_FLAG" = yes ; then - if test -f $MGL_ROOT/lib/debug/$MGL_OS/libmgl.a ; then - MGL_LIB_TYPE=debug + if test -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.a ; then + mgl_lib_type=debug fi fi - if test "x$MGL_LIB_TYPE" = x ; then - if test -f $MGL_ROOT/lib/release/$MGL_OS/libmgl.a ; then - MGL_LIB_TYPE=release + if test "x$mgl_lib_type" = x ; then + if test -f $MGL_ROOT/lib/release/$mgl_os/libmgl.a ; then + mgl_lib_type=release else AC_MSG_ERROR([Cannot find MGL libraries, make sure they are compiled.]) fi fi TOOLKIT_INCLUDE="-I$MGL_ROOT/include" - GUI_TK_LIBRARY="-L$MGL_ROOT/lib/$MGL_LIB_TYPE/$MGL_OS -lmgl -lmglcpp -lpm" + GUI_TK_LIBRARY="-L$MGL_ROOT/lib/$mgl_lib_type/$mgl_os -lmgl -lmglcpp -lpm" AFMINSTALL=afminstall TOOLKIT=MGL @@ -1786,22 +1793,17 @@ equivalent variable and GTK+ is version 1.2.3 or above. fi if test "$wxUSE_WINE" = 1; then - AC_MSG_CHECKING(for WINE includes) - WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, windows.h) - if test "$ac_find_includes" != "" ; then - AC_MSG_RESULT(found $ac_find_includes) - TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes" - else - AC_MSG_RESULT(no) + AC_CHECK_HEADER(windows.h, [], + [ AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h) - fi + ]) - XPM_LINK="" + xpm_link="" AC_MSG_CHECKING(for Xpm library) WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm) if test "$ac_find_libraries" != "" ; then GUI_TK_LIBRARY="-L$ac_find_libraries" - XPM_LINK="-lXpm" + xpm_link="-lXpm" AC_DEFINE(wxHAVE_LIB_XPM) AC_MSG_RESULT(found at $ac_find_libraries) else @@ -1809,22 +1811,21 @@ equivalent variable and GTK+ is version 1.2.3 or above. AC_MSG_WARN(library will be compiled without support for images in XPM format) fi - MESA_LINK="" + mesa_link="" AC_MSG_CHECKING(for Mesa library) WX_PATH_FIND_LIBRARIES($SEARCH_LIB,MesaGL) if test "$ac_find_libraries" != "" ; then GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries" - MESA_LINK="-lMesaGL" + mesa_link="-lMesaGL" AC_MSG_RESULT(found at $ac_find_libraries) else AC_MSG_ERROR(no) fi - GUI_TK_LINK="-lwine $MESA_LINK $XPM_LINK -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses" - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" - WXWINE=1 + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwine $mesa_link $xpm_link -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses" TOOLKIT=MSW GUIDIST=MSW_DIST + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXWINE__" fi dnl use standard macros to check for X headers/libs, this brings support @@ -1843,34 +1844,7 @@ equivalent variable and GTK+ is version 1.2.3 or above. GUI_TK_LIBRARY="$X_LIBS" TOOLKIT_INCLUDE="$X_CFLAGS" - AFMINSTALL=afminstall - - dnl manual check for X11 headers/libs - dnl - dnl AC_MSG_CHECKING(for X11 headers) - dnl WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, X11/Intrinsic.h) - dnl if test "$ac_find_includes" != "" ; then - dnl AC_MSG_RESULT(found $ac_find_includes) - dnl else - dnl AC_MSG_RESULT(no) - dnl AC_MSG_ERROR(please set CFLAGS to contain the location of X11/Intrinsic.h) - dnl fi - dnl - dnl AC_MSG_CHECKING(for X11 libraries) - dnl WX_PATH_FIND_LIBRARIES($SEARCH_LIB, X11) - dnl if test "$ac_find_libraries" != "" ; then - dnl WX_INCLUDE_PATH_EXIST($ac_find_includes, $TOOLKIT_INCLUDE) - dnl WX_LINK_PATH_EXIST($ac_find_libraries, $GUI_TK_LIBRARY) - dnl - dnl GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" - dnl TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include" - dnl AC_MSG_RESULT(found at $ac_find_libraries) - dnl else - dnl AC_MSG_RESULT(no) - dnl AC_MSG_ERROR(please set LDFLAGS to contain the location of libX11) - dnl fi - COMPILED_X_PROGRAM=0 AC_MSG_CHECKING(for Motif/Lesstif headers) @@ -1884,7 +1858,6 @@ equivalent variable and GTK+ is version 1.2.3 or above. ], [ int version; - version = xmUseVersion; ], [ @@ -1918,7 +1891,6 @@ equivalent variable and GTK+ is version 1.2.3 or above. ], [ int version; - version = xmUseVersion; ], [ @@ -1933,45 +1905,13 @@ equivalent variable and GTK+ is version 1.2.3 or above. fi fi - dnl we don't need this as we used AC_PATH_XTRA above which does it for us - dnl - dnl dnl if we already compiled a sample program, X libs are surely there - dnl if test "$COMPILED_X_PROGRAM" = 0; then - dnl AC_MSG_CHECKING(for Xt library) - dnl WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xt) - dnl if test "$ac_find_libraries" != "" ; then - dnl WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) - dnl GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" - dnl AC_MSG_RESULT(found at $ac_find_libraries) - dnl else - dnl AC_TRY_COMPILE - dnl ( - dnl [ - dnl #include - dnl ], - dnl [ - dnl char *p; - dnl p = XtMalloc(5); - dnl ], - dnl [ - dnl AC_MSG_RESULT(found in default search path) - dnl COMPILED_X_PROGRAM=1 - dnl ], - dnl [ - dnl AC_MSG_RESULT(no) - dnl AC_MSG_ERROR(please set LDFLAGS to contain the location of libXt) - dnl ] - dnl ) - dnl fi - dnl fi - - XPM_LINK="" + xpm_link="" AC_MSG_CHECKING(for Xpm library) WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm) if test "$ac_find_libraries" != "" ; then WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link" - XPM_LINK="-lXpm " + xpm_link="-lXpm " AC_DEFINE(wxHAVE_LIB_XPM) AC_MSG_RESULT(found at $ac_find_libraries) else @@ -1981,12 +1921,11 @@ equivalent variable and GTK+ is version 1.2.3 or above. ], [ int version; - version = XpmLibraryVersion(); ], [ - XPM_LINK="-lXpm " - AC_DEFINE(wxHAVE_LIB_XPM) + xpm_link="-lXpm " + AC_DEFINE(wxHAVE_LIB_XPM) AC_MSG_RESULT(found in default search path) COMPILED_X_PROGRAM=0 ], @@ -1997,15 +1936,15 @@ equivalent variable and GTK+ is version 1.2.3 or above. ) fi - GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11" - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm $xpm_link -lXmu -lXext -lXt -lX11" + TOOLKIT_VPATH="\${top_srcdir}/src/${TOOLKIT_DIR}${PATH_IFS}\${top_srcdir}/src/motif/xmcombo" TOOLKIT=MOTIF GUIDIST=MOTIF_DIST fi + dnl we can't call this MAC_DIST or autoconf thinks its a macro if test "$wxUSE_MAC" = 1; then TOOLKIT=MAC - dnl we can't call this MAC_DIST or autoconf thinks its a macro GUIDIST=MACX_DIST fi @@ -2015,50 +1954,21 @@ equivalent variable and GTK+ is version 1.2.3 or above. fi dnl the name of the directory where the files for this toolkit live - if test "$TOOLKIT" != "PM" ; then - TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[[A-Z]]" "[[a-z]]"` - else + if test "$TOOLKIT" = "PM" ; then TOOLKIT_DIR="os2" - fi - - dnl the (base) name of the library and support files for this toolkit - TOOLKIT_NAME="${TOOLKIT_DIR}" - - dnl the list of paths containing the files for this toolkit - TOOLKIT_VPATH="\${top_srcdir}/src/${TOOLKIT_DIR}" - - dnl need to add an extra dir for wxMotif - if test "$TOOLKIT_NAME" = "motif"; then - TOOLKIT_VPATH="${TOOLKIT_VPATH}${PATH_IFS}\${top_srcdir}/src/motif/xmcombo" - fi - - dnl are we using the generic version with this low level toolkit? - if test "$wxUSE_UNIVERSAL" = "yes"; then - TOOLKIT_NAME="${TOOLKIT_NAME}univ" - UNIV_VPATH="\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes" - TOOLKIT_VPATH="${UNIV_VPATH}${PATH_IFS}${TOOLKIT_VPATH}" - SETUPH_DIR="univ" else - SETUPH_DIR="${TOOLKIT_DIR}" + TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[[A-Z]]" "[[a-z]]"` fi - dnl append 'd' to the debug library name - if test "$wxUSE_DEBUG_FLAG" = "yes"; then - TOOLKIT_NAME="${TOOLKIT_NAME}d" - fi + dnl misc other files depending on the port + PORT_FILES="\${top_srcdir}/src/\$(TOOLKITDIR)/files.lst" - dnl the symbol which allows conditional compilation for the given toolkit - TOOLKIT_DEF="-D__WX${TOOLKIT}__" - if test "$wxUSE_UNIVERSAL" = "yes"; then - TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXUNIVERSAL__" - fi - - dnl the name of the (libtool) library - WX_LIBRARY="wx_${TOOLKIT_NAME}" - - dnl collect together all the object files for this port if test "$wxUSE_UNIVERSAL" = "yes"; then ALL_OBJECTS="\$(GUI_LOWLEVEL_OBJS) \${UNIVOBJS}" + PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst" + TOOLKIT_VPATH="\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes${PATH_IFS}\${top_srcdir}/src/${TOOLKIT_DIR}" + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__" + WIDGET_SET=univ else ALL_OBJECTS="\$(GUIOBJS)" fi @@ -2074,18 +1984,9 @@ equivalent variable and GTK+ is version 1.2.3 or above. fi dnl ODBC objects are Unix only - if test "$TOOLKIT" != "MSW"; then - if test "$wxUSE_ODBC" = "yes" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)" - fi + if test "$TOOLKIT" != "MSW" -a "$wxUSE_ODBC" = "yes" ; then + ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)" fi - - dnl REGEX_INCLUDE is only set if we want regex support and if we use our - dnl own sources and not the system library - if test "x$REGEX_INCLUDE" != "x" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)" - fi - if test "$wxUSE_LIBJPEG" = "yes" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)" fi @@ -2095,35 +1996,10 @@ equivalent variable and GTK+ is version 1.2.3 or above. if test "$wxUSE_LIBPNG" = "yes" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(PNGOBJS)" fi - if test "$wxUSE_ZLIB" = "yes" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)" - fi if test "$wxUSE_FREETYPE" = "yes" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(FREETYPEOBJS)" fi - dnl collect all .d files together as well - if test "$wxUSE_UNIVERSAL" = "yes"; then - ALL_DEPFILES="\$(GUI_LOWLEVEL_DEPS) \$(UNIVDEPS)" - else - ALL_DEPFILES="\$(GUIDEPS)" - fi - - ALL_DEPFILES="${ALL_DEPFILES} \$(COMMONDEPS) \$(GENERICDEPS)" - - if test "$TOOLKIT" != "MSW"; then - ALL_DEPFILES="${ALL_DEPFILES} \$(UNIXDEPS)" - fi - - if test "$wxUSE_HTML" = "yes"; then - ALL_DEPFILES="${ALL_DEPFILES} \$(HTMLDEPS)" - fi - - dnl misc other files depending on the port - PORT_FILES="\${top_srcdir}/src/\$(TOOLKITDIR)/files.lst" - if test "$wxUSE_UNIVERSAL" = "yes"; then - PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst" - fi RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst" RPM_SPEC="wx\$(TOOLKIT).spec" @@ -2133,38 +2009,23 @@ equivalent variable and GTK+ is version 1.2.3 or above. else USE_GUI=0 - dnl this may be (almost) unneccesary for wxBase now we use TOOLKIT_NAME + dnl this doesn't quite work right for wxBase, but the places + dnl where it is wrong aren't fatal (yet) though. TOOLKIT_DIR="base" - dnl well, we have to set it to something... - TOOLKIT_VPATH="." - - dnl the base name of the library and wxXXX-config files - if test "$wxUSE_DEBUG_FLAG" = "yes"; then - TOOLKIT_NAME="${TOOLKIT_DIR}d" - else - TOOLKIT_NAME="${TOOLKIT_DIR}" - fi - - TOOLKIT_DEF="-D__WXBASE__" - dnl the sources, their dependenices and the headers - ALL_OBJECTS="\$(BASE_OBJS) \$(BASE_UNIX_OBJS)" - ALL_DEPFILES="\$(BASE_DEPS) \$(BASE_UNIX_DEPS)" + if test "$USE_WIN32" = 1 ; then + ALL_OBJECTS="\${BASE_OBJS} \${BASE_MSW_OBJS}" + TOOLKIT_VPATH="\${top_srcdir}/src/msw" - dnl REGEX_INCLUDE is only set if we want regex support and if we use our - dnl own sources and not the system library - if test "x$REGEX_INCLUDE" != "x" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)" + dnl yes, the toolkit for wxBase on win32 is actually MSW + dnl wxBase on unix does not need a 'TOOLKIT' defined. + TOOLKIT="MSW" + else + ALL_OBJECTS="\${BASE_OBJS} \${BASE_UNIX_OBJS}" + TOOLKIT_VPATH="\${top_srcdir}/src/unix" fi - if test "$wxUSE_ZLIB" = "yes" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)" - fi - - dnl building wxBase only - WX_LIBRARY="wx_${TOOLKIT_NAME}" - PORT_FILES="\${top_srcdir}/src/files.lst" RPM_FILES="src/rpmfiles.lst" RPM_SPEC="wxBase.spec" @@ -2174,57 +2035,104 @@ else DISTDIR="wxBase" fi -dnl the name of the (libtool) library -WX_LIBRARY_NAME="lib${WX_LIBRARY}.la" -WX_LIBRARY_NAME_GL="lib${WX_LIBRARY}_gl.la" +dnl REGEX_INCLUDE is only set if we want regex support and if we use our +dnl own sources and not the system library +if test "x$REGEX_INCLUDE" != "x" ; then + ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)" +fi +if test "$wxUSE_ZLIB" = "yes" ; then + ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)" +fi + +if test "$wxUSE_OPENGL" = "yes"; then + if test "$wxUSE_MAC" = 1; then + AC_DEFINE(wxUSE_OPENGL) + AC_DEFINE(wxUSE_GLCANVAS) + OPENGL_LIBS="-framework OpenGL -framework AGL" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl" + else + AC_CHECK_HEADER(GL/gl.h, [ + AC_DEFINE(wxUSE_OPENGL) + AC_DEFINE(wxUSE_GLCANVAS) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl" + AC_CHECK_LIB(GL, glFlush, [ + OPENGL_LIBS="-lGL -lGLU" + ],[ + AC_CHECK_LIB(MesaGL, glFlush, [ + OPENGL_LIBS="-lMesaGL -lMesaGLU" + ],) + ],) + ],wxUSE_OPENGL=0) + fi +fi + +if test -z "$TOOLKIT_VPATH" ; then + TOOLKIT_VPATH="\${top_srcdir}/src/${TOOLKIT_DIR}" +fi + +dnl the symbol which allows conditional compilation for the given toolkit +if test -n "$TOOLKIT" ; then + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WX${TOOLKIT}__" +fi + +if test "$wxUSE_CYGWIN" = 1 ; then + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__" +fi + +lib_debug_suffix= +if test "$wxUSE_DEBUG_FLAG" = "yes"; then + lib_debug_suffix=d + TOOLCHAIN_NAME="${TOOLCHAIN_NAME}d" +fi + +TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_debug_suffix}-${WX_RELEASE}" +TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_debug_suffix}_gl-${WX_RELEASE}" + +if test "$cross_compiling" = "yes"; then + TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}" + TOOLCHAIN_NAME_GL="${TOOLCHAIN_NAME_GL}-${host_alias}" +fi + +dnl library link name +WX_LIBRARY="wx_${TOOLCHAIN_NAME}" +WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}" + +dnl define which libs wx-config should link. +WXCONFIG_LIBS="-l${WX_LIBRARY}" + +if test "$wxUSE_OPENGL" = "yes"; then + WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} $OPENGL_LIBS" +fi dnl the name of the static library WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a" -WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a" +WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a" + +dnl the name of the shared library +WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" +WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" + +dnl the name of the links to the shared library +WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}" +WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}" +WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}" +WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" + +dnl the name of the resources file for wxMAC +WX_RESOURCES_DARWIN="lib${WX_LIBRARY}.rsrc" + dnl --- the marker for quick search, leave it here: SHARED_LIB_SETUP --- if test "$wxUSE_SHARED" = "yes"; then - dnl the name of the shared library - case "${host}" in - *-*-mingw32* ) - WX_LIBRARY_NAME_SHARED="wx${WX_MAJOR_VERSION_NUMBER}${WX_MINOR_VERSION_NUMBER}_${WX_RELEASE_NUMBER}.dll" - ;; - - *-hp-hpux* ) - SO_SUFFIX="sl" - ;; - - *-*-darwin* ) - SO_SUFFIX="dylib" - ;; - - * ) - SO_SUFFIX="so" - ;; - esac - - dnl set the name of the shared lib if not done above - if test "x$SO_SUFFIX" != "x"; then - WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" - WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" - fi - - dnl the name of the links to the shared library - WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.${SO_SUFFIX}.${WX_CURRENT}" - WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.${SO_SUFFIX}" - WX_LIBRARY_LINK3="lib${WX_LIBRARY}.${SO_SUFFIX}" - WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.${SO_SUFFIX}.${WX_CURRENT}" - WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.${SO_SUFFIX}" - WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.${SO_SUFFIX}" dnl install targets if test "$wxUSE_OPENGL" = "yes"; then WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL" - WX_ALL="CREATE_LINKS CREATE_LINKS_GL" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1} \$(build_libdir)/${WX_LIBRARY_LINK1_GL}" else WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS" - WX_ALL="CREATE_LINKS" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1}" fi dnl the extra compiler flags needed for compilation of shared library @@ -2263,15 +2171,14 @@ if test "$wxUSE_SHARED" = "yes"; then wx_cv_prog_icc=no ) ]) - if test "$wx_cv_prog_icc" = "yes"; then PIC_FLAG="-KPIC" fi fi - if test "$wxUSE_BURNT_NAME" = "yes" ; then - BURNT_LIBRARY_NAME="-Wl,-soname,${WX_LIBRARY_LINK1}" - BURNT_LIBRARY_NAME_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}" + if test "$wxUSE_SONAME" = "yes" ; then + SONAME_FLAGS="-Wl,-soname,${WX_LIBRARY_LINK1}" + SONAME_FLAGS_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}" dnl substitute this in makelib.env for the contrib libs WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)" fi @@ -2289,14 +2196,23 @@ if test "$wxUSE_SHARED" = "yes"; then ;; *-*-darwin* ) - TOOLKIT_DEF="${TOOLKIT_DEF} -D__UNIX__ -D__DARWIN__ -D__POWERPC__" + dnl FIXME: do we need __UNIX__ here? It's already defined above + dnl for darwin right?? + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__UNIX__ -D__DARWIN__ -D__POWERPC__" CPPFLAGS="${CPPFLAGS} -fno-common" SHARED_LD="${CXX} -dynamiclib -o" PIC_FLAG="-dynamic -fPIC" dnl add the resources target for wxMac if test "$wxUSE_MAC" = 1 ; then - WX_ALL="${WX_ALL} ./lib/lib${WX_LIBRARY}-${WX_RELEASE}.r" + WX_ALL="${WX_ALL} lib${WX_LIBRARY}.r" + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DTARGET_CARBON" + CPPFLAGS="${CPPFLAGS} -fpascal-strings" + CXXFLAGS="${CXXFLAGS} -cpp-precomp" + AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez) + AC_CHECK_PROG(DEREZ, Derez, Derez, /Developer/Tools/Derez) + LIBWXMACRES="\$(top_builddir)/lib/lib${WX_LIBRARY}.r" + LIBWXMACRESCOMP="\$(RESCOMP) Carbon.r -t APPL ${LIBWXMACRES} -o \$(BIN_PROGRAM)" fi ;; @@ -2306,35 +2222,28 @@ if test "$wxUSE_SHARED" = "yes"; then *-*-cygwin* ) dnl only static for now - WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" - WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}" - if test "$wxUSE_OPENGL" = "yes"; then - WX_ALL_INSTALLED="preinstall_gl" - WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}" - else - WX_ALL="${WX_LIBRARY_NAME_STATIC}" - fi + AC_MSG_WARN(Shared libs unsupported for $host_alias -- forcing static build.) + wxUSE_SHARED=no ;; *-*-mingw32* ) - WX_LIBRARY_NAME_STATIC="lib/libwx${WX_MAJOR_VERSION_NUMBER}${WX_MINOR_VERSION_NUMBER}_${WX_RELEASE_NUMBER}.a" - SHARED_LD="${CC} -shared -Wl,--out-implib,${WX_LIBRARY_NAME_STATIC} -o" - TOOLKIT_DEF="${TOOLKIT_DEF} -DWXUSINGDLL=1" + SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_NAME_STATIC} -o" + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXUSINGDLL=1" WXMSW_DLL_DEFINES="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1" WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}" WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_SHARED_GL}" if test "$wxUSE_OPENGL" = "yes"; then WX_ALL_INSTALLED="preinstall_gl" - WX_ALL="${WX_LIBRARY_NAME_SHARED} ${WX_LIBRARY_NAME_SHARED_GL}" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}" else - WX_ALL="${WX_LIBRARY_NAME_SHARED}" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}" fi ;; *-pc-os2_emx ) dnl only static for now WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" - WX_ALL="${WX_LIBRARY_NAME_STATIC}" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC}" ;; *-*-beos* ) @@ -2364,24 +2273,27 @@ if test "$wxUSE_SHARED" = "yes"; then dnl do not alter the LIBRARY_TYPE strings "so" and "a", they are magic WX_TARGET_LIBRARY_TYPE="so" -else - dnl set target to static - WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" - WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}" +fi - if test "$wxUSE_OPENGL" = "yes"; then - WX_ALL_INSTALLED="preinstall_gl" - WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}" - else - WX_ALL="${WX_LIBRARY_NAME_STATIC}" - fi +dnl do not 'else' this, it may be changed in the above conditional. +if test "$wxUSE_SHARED" = "no"; then - dnl give static wxBase build a working install target - if test "$wxUSE_GUI" = "no"; then + dnl give static wxBase and wxMSW build a working install target + if test "$wxUSE_GUI" = "no" -o "$USE_WIN32" = 1 ; then dnl we're here because WX_ALL_INSTALLED is empty, but play safe anyway WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall" fi + if test "$wxUSE_OPENGL" = "yes"; then + WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_gl" + WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC} \$(build_libdir)/${WX_LIBRARY_NAME_STATIC_GL}" + else + WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC}" + fi + + WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" + WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}" + WX_TARGET_LIBRARY_TYPE="a" fi @@ -2413,31 +2325,6 @@ if test "$wxUSE_GUI" = "yes"; then fi fi -if test "$USE_WIN32" = 1; then - AC_CHECK_HEADERS(w32api.h) - - dnl check if can use _WIN_IE macro - AC_CACHE_CHECK([if w32api has good enough MSIE support], wx_cv_w32api_win_ie, - [ - AC_TRY_COMPILE([#include ], - [ - #define wxCHECK_W32API_VERSION( major, minor ) \ - ( defined( __W32API_MAJOR_VERSION ) && defined( __W32API_MINOR_VERSION ) \ - && ( ( __W32API_MAJOR_VERSION > (major) ) \ - || ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor)))) - - #if !wxCHECK_W32API_VERSION(1,1) - #error You need w32api 1.1 or newer - #endif - ], [ - wx_cv_w32api_win_ie=yes - CPPFLAGS="$CPPFLAGS -D_WIN_IE=0x400" - ], [ - wx_cv_w32api_win_ie=no - ]) - ]) -fi - dnl --------------------------------------------------------------------------- dnl Checks for typedefs dnl --------------------------------------------------------------------------- @@ -2949,8 +2836,10 @@ dnl defines THREADS_OBJ which contains the object files to build dnl defines THREADS_LINK which contains the thread library to link with dnl defines wxUSE_THREADS=1 if thread support is activated -THREADS_LINK="" -THREADS_OBJ="" +THREADS_LINK= +THREADS_OBJ= +CODE_GEN_FLAGS= +CODE_GEN_FLAGS_CXX= if test "$wxUSE_THREADS" = "yes" ; then if test "$wxUSE_WINE" = 1 ; then @@ -3149,7 +3038,7 @@ if test "$wxUSE_THREADS" = "yes"; then dnl must define _REENTRANT for multithreaded code except for Darwin/Mac OS X if test "$USE_DARWIN" != 1; then - CPPFLAGS="${CPPFLAGS} -D_REENTRANT" + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT" fi SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread" @@ -3159,7 +3048,7 @@ else if test "$ac_cv_func_strtok_r" = "yes"; then AC_MSG_CHECKING(if -D_REENTRANT is needed) if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then - CPPFLAGS="${CPPFLAGS} -D_REENTRANT" + TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT" AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -3180,28 +3069,6 @@ if test "$WXGTK127" = 1 ; then AC_DEFINE_UNQUOTED(__WXGTK127__,$WXGTK127) fi -if test "$WXWINE" = 1 ; then - TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXWINE__" -fi - -if test "$wxUSE_MAC" = 1 ; then - TOOLKIT_DEF="${TOOLKIT_DEF} -DTARGET_CARBON" - CPPFLAGS="${CPPFLAGS} -fpascal-strings" - CXXFLAGS="${CXXFLAGS} -cpp-precomp" - AC_CHECK_PROG(REZ, Rez, Rez, /Developer/Tools/Rez) - AC_CHECK_PROG(DEREZ, Derez, Derez, /Developer/Tools/Derez) - RESCOMP=${REZ} - REZFLAGS="-d __UNIX__ -useDF" - DEREZFLAGS="Carbon.r -useDF" - RESFLAGS="Carbon.r -t APPL" - LIBWXMACRES="\$(LIBWX_MACRES)" - LIBWXMACRESCOMP="\$(LIBWX_MACRESCOMP)" -fi - -if test "$wxUSE_CYGWIN" = 1 ; then - TOOLKIT_DEF="${TOOLKIT_DEF} -D__WIN95__" -fi - WXDEBUG= if test "$wxUSE_DEBUG_INFO" = "yes" ; then @@ -3239,21 +3106,25 @@ if test "$wxUSE_PROFILE" = "yes" ; then PROFILE="-pg" fi -DEP_INFO_FLAGS= -CODE_GEN_FLAGS= -CODE_GEN_FLAGS_CXX= if test "$GCC" = yes ; then if test "$wxUSE_NO_RTTI" = "yes" ; then - CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS -fno-rtti" + CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-rtti" fi if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then - CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS -fno-exceptions" + CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-exceptions" fi if test "$wxUSE_PERMISSIVE" = "yes" ; then CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive" fi if test "$wxUSE_NO_DEPS" = "no" ; then - DEP_INFO_FLAGS="-MMD" + CFLAGS="-MMD ${CFLAGS}" + CXXFLAGS="-MMD ${CXXFLAGS}" + fi + if test "$USE_WIN32" = 1 ; then + # I'm not even really sure what this was ever added to solve, + # but someone added it for mingw native builds, so I guess + # they had a reason, right?? + CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-pcc-struct-return" fi fi @@ -3403,28 +3274,6 @@ if test "$wxUSE_FREETYPE" = "yes" -o "$wxUSE_FREETYPE" = "sys" ; then fi fi -if test "$wxUSE_OPENGL" = "yes"; then - if test "$wxUSE_MAC" = 1; then - AC_DEFINE(wxUSE_OPENGL) - AC_DEFINE(wxUSE_GLCANVAS) - OPENGL_LINK="-framework OpenGL -framework AGL" - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl" - else - AC_CHECK_HEADER(GL/gl.h, [ - AC_DEFINE(wxUSE_OPENGL) - AC_DEFINE(wxUSE_GLCANVAS) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl" - AC_CHECK_LIB(GL, glFlush, [ - OPENGL_LINK="-lGL -lGLU" - ],[ - AC_CHECK_LIB(MesaGL, glFlush, [ - OPENGL_LINK="-lMesaGL -lMesaGLU" - ],) - ],) - ],wxUSE_OPENGL=0) - fi -fi - dnl --------------------------------------------------------------------------- dnl the library may be built without GUI classes at all dnl --------------------------------------------------------------------------- @@ -3726,84 +3575,82 @@ dnl ------------------------------------------------------------------------ dnl under MSW we always have sockets if test "$TOOLKIT" != "MSW"; then -if test "$wxUSE_SOCKETS" = "yes"; then - dnl under Solaris, socket functions live in -lsocket - AC_CHECK_FUNC(socket,, - AC_CHECK_LIB(socket, socket, - INET_LINK="$INET_LINK -lsocket", - [ - AC_MSG_WARN([socket library not found - sockets will be disabled]) - wxUSE_SOCKETS=no - ] + if test "$wxUSE_SOCKETS" = "yes"; then + dnl under Solaris, socket functions live in -lsocket + AC_CHECK_FUNC(socket,, + AC_CHECK_LIB(socket, socket, + INET_LINK="$INET_LINK -lsocket", + [ + AC_MSG_WARN([socket library not found - sockets will be disabled]) + wxUSE_SOCKETS=no + ] + ) ) - ) -fi + fi -dnl this test may be appropriate if building under cygwin -dnl right now I'm assuming it also uses the winsock stuff -dnl like mingw does.. -- RL + dnl this test may be appropriate if building under cygwin + dnl right now I'm assuming it also uses the winsock stuff + dnl like mingw does.. -- RL -if test "$wxUSE_SOCKETS" = "yes" ; then - dnl determine the type of third argument for getsockname - AC_CACHE_CHECK([what is the type of the third argument of getsockname], - wx_cv_type_getsockname3, - [ - AC_LANG_SAVE - AC_LANG_CPLUSPLUS + if test "$wxUSE_SOCKETS" = "yes" ; then + dnl determine the type of third argument for getsockname + AC_CACHE_CHECK([what is the type of the third argument of getsockname], + wx_cv_type_getsockname3, + [ + AC_LANG_SAVE + AC_LANG_CPLUSPLUS - AC_TRY_COMPILE( - [ - #include - #include - ], - [ - socklen_t len; - getsockname(0, 0, &len); - ], - wx_cv_type_getsockname3=socklen_t, AC_TRY_COMPILE( [ #include #include ], [ - size_t len; + socklen_t len; getsockname(0, 0, &len); ], - wx_cv_type_getsockname3=size_t, + wx_cv_type_getsockname3=socklen_t, AC_TRY_COMPILE( [ #include #include ], [ - int len; + size_t len; getsockname(0, 0, &len); ], - wx_cv_type_getsockname3=int, - wx_cv_type_getsockname3=unknown + wx_cv_type_getsockname3=size_t, + AC_TRY_COMPILE( + [ + #include + #include + ], + [ + int len; + getsockname(0, 0, &len); + ], + wx_cv_type_getsockname3=int, + wx_cv_type_getsockname3=unknown + ) ) ) - ) - AC_LANG_RESTORE - ]) + AC_LANG_RESTORE + ]) - if test "$wx_cv_type_getsockname3" = "unknown"; then - wxUSE_SOCKETS=no - AC_MSG_WARN([Couldn't find socklen_t synonym for this system]) - else - AC_DEFINE_UNQUOTED(SOCKLEN_T, $wx_cv_type_getsockname3) + if test "$wx_cv_type_getsockname3" = "unknown"; then + wxUSE_SOCKETS=no + AC_MSG_WARN([Couldn't find socklen_t synonym for this system]) + else + AC_DEFINE_UNQUOTED(SOCKLEN_T, $wx_cv_type_getsockname3) + fi fi fi - -fi dnl if !MSW if test "$wxUSE_SOCKETS" = "yes" ; then AC_DEFINE(wxUSE_SOCKETS) SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets" - INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol" fi dnl --------------------------------------------------------------------------- @@ -3812,29 +3659,24 @@ dnl --------------------------------------------------------------------------- if test "$wxUSE_GUI" = "yes"; then -dnl under MSW we always have joystick support -if test "$TOOLKIT" != "MSW"; then + dnl under MSW we always have joystick support + if test "$TOOLKIT" != "MSW"; then + if test "$wxUSE_JOYSTICK" = "yes"; then + dnl joystick support is only for Linux 2.1.x or greater + AC_CHECK_HEADERS(linux/joystick.h) + if test "$ac_cv_header_linux_joystick_h" != "yes"; then + wxUSE_JOYSTICK=no + AC_MSG_WARN(Joystick not supported by this system, disabled) + fi + fi + fi -if test "$wxUSE_JOYSTICK" = "yes"; then - dnl joystick support is only for Linux 2.1.x or greater - AC_CHECK_HEADERS(linux/joystick.h) - if test "$ac_cv_header_linux_joystick_h" != "yes"; then - wxUSE_JOYSTICK=no - AC_MSG_WARN(Joystick not supported by this system, disabled) - fi + if test "$wxUSE_JOYSTICK" = "yes"; then + AC_DEFINE(wxUSE_JOYSTICK) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest" + fi fi -fi -dnl if !MSW - -if test "$wxUSE_JOYSTICK" = "yes"; then - AC_DEFINE(wxUSE_JOYSTICK) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest" -fi - -fi -dnl if wxUSE_GUI - dnl ------------------------------------------------------------------------ dnl DLL support dnl ------------------------------------------------------------------------ @@ -3842,67 +3684,65 @@ dnl ------------------------------------------------------------------------ dnl under MSW we always have LoadLibrary/GetProcAddress if test "$TOOLKIT" != "MSW"; then -HAVE_DL_FUNCS=0 -HAVE_SHL_FUNCS=0 -if test "$wxUSE_DYNLIB_CLASS" = "yes"; then - if test "$USE_DARWIN" = 1; then - dnl dlopen/dlerror is implemented in dynlib.cpp for Darwin/Mac OS X - HAVE_DL_FUNCS=1 - else - dnl the test is a bit complicated because we check for dlopen() both with - dnl and without -ldl and we also try to find shl_load() if there is no - dnl dlopen() on this system - AC_CHECK_FUNCS(dlopen, - [ - AC_DEFINE(HAVE_DLOPEN) + HAVE_DL_FUNCS=0 + HAVE_SHL_FUNCS=0 + if test "$wxUSE_DYNLIB_CLASS" = "yes"; then + if test "$USE_DARWIN" = 1; then + dnl dlopen/dlerror is implemented in dynlib.cpp for Darwin/Mac OS X HAVE_DL_FUNCS=1 - ], - [ - AC_CHECK_LIB(dl, dlopen, - [ - AC_DEFINE(HAVE_DLOPEN) - HAVE_DL_FUNCS=1 - LIBS="$LIBS -ldl" - ], - [ - AC_CHECK_FUNCS(shl_load, - [ - AC_DEFINE(HAVE_SHL_LOAD) - HAVE_SHL_FUNCS=1 - ], - [ - AC_CHECK_LIB(shl_load, dld, - [ - HAVE_SHL_FUNCS=1 - LIBS="$LIBS -ldld" - ]) - ]) - ]) - ]) + else + dnl the test is a bit complicated because we check for dlopen() both with + dnl and without -ldl and we also try to find shl_load() if there is no + dnl dlopen() on this system + AC_CHECK_FUNCS(dlopen, + [ + AC_DEFINE(HAVE_DLOPEN) + HAVE_DL_FUNCS=1 + ], + [ + AC_CHECK_LIB(dl, dlopen, + [ + AC_DEFINE(HAVE_DLOPEN) + HAVE_DL_FUNCS=1 + LIBS="$LIBS -ldl" + ], + [ + AC_CHECK_FUNCS(shl_load, + [ + AC_DEFINE(HAVE_SHL_LOAD) + HAVE_SHL_FUNCS=1 + ], + [ + AC_CHECK_LIB(shl_load, dld, + [ + HAVE_SHL_FUNCS=1 + LIBS="$LIBS -ldld" + ]) + ]) + ]) + ]) - dnl check also for dlerror() - if test "$HAVE_DL_FUNCS" = 1; then - AC_CHECK_FUNCS(dlerror, - AC_DEFINE(HAVE_DLERROR), - AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR))) - fi - fi + dnl check also for dlerror() + if test "$HAVE_DL_FUNCS" = 1; then + AC_CHECK_FUNCS(dlerror, + AC_DEFINE(HAVE_DLERROR), + AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR))) + fi + fi - if test "$HAVE_DL_FUNCS" = 0; then - if test "$HAVE_SHL_FUNCS" = 0; then - if test "$USE_UNIX" = 1; then - AC_MSG_WARN([Missing dynamic loading support, several features will be disabled]) - wxUSE_DYNLIB_CLASS=no - else - AC_MSG_WARN([Assuming wxLibrary class works on this platform]) - fi + if test "$HAVE_DL_FUNCS" = 0; then + if test "$HAVE_SHL_FUNCS" = 0; then + if test "$USE_UNIX" = 1; then + AC_MSG_WARN([Missing dynamic loading support, several features will be disabled]) + wxUSE_DYNLIB_CLASS=no + else + AC_MSG_WARN([Assuming wxLibrary class works on this platform]) + fi + fi fi fi fi -fi -dnl if !MSW - if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then AC_DEFINE(wxUSE_DYNLIB_CLASS) else @@ -4038,13 +3878,14 @@ dnl --------------------------------------------------------------------------- dnl check for ole headers and disable a few features requiring it if not dnl present (earlier versions of mingw32 don't have ole2.h) -if test "$USE_WIN32" = 1; then +if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \ + -o "$wxUSE_CLIPBOARD" = "yes" \ + -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then AC_CHECK_HEADERS(ole2.h) if test "$ac_cv_header_ole2_h" = "yes" ; then if test "$GCC" = yes ; then ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)" - ALL_DEPFILES="$ALL_DEPFILES \$(OLEDEPS)" CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks" LIBS="$LIBS -lrpcrt4 -loleaut32 -lole32 -luuid" AC_DEFINE(wxUSE_OLE) @@ -4412,7 +4253,6 @@ fi if test "$wxUSE_HTML" = "yes"; then AC_DEFINE(wxUSE_HTML) SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html" - INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS html" fi if test "$wxUSE_VALIDATORS" = "yes"; then @@ -4545,18 +4385,37 @@ dnl Output the makefiles and such from the results found above dnl --------------------------------------------------------------------------- GUILIBS="$GUI_TK_LIBRARY $TOOLKIT_LINK" -OPENGL_LIBS="$OPENGL_LINK" dnl all additional libraries (except wxWindows itself) we link with dnl dnl note that we always link with -lm except for Mac OS X dnl extended.c uses floor() and is always linked in EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -lm" + if test "$wxUSE_MAC" = 1 ; then EXTRA_LIBS="$EXTRA_LIBS -framework Carbon -framework System" fi + if test "$wxUSE_GUI" = "yes"; then EXTRA_LIBS="$GUILIBS $PNG_LINK $JPEG_LINK $TIFF_LINK $FREETYPE_LINK $EXTRA_LIBS" + + dnl TODO add checks that these samples will really compile (i.e. all the + dnl library features they need are present) + + dnl TODO some samples are never built so far: + dnl ipc, mfc, nativdlg, oleauto, ownerdrw + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs \ + drawing dynamic erase event exec font image \ + minimal richedit rotate widgets" + + if test "$wxUSE_UNIVERSAL" = "yes" ; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS univ" + fi + + dnl this is needed to be able to find AFM files + CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)" +else + SAMPLES_SUBDIRS="console" fi dnl all the libraries needed to link wxWindows programs when using the @@ -4564,7 +4423,7 @@ dnl makefile system without libtool LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS" dnl all -I options we must pass to the compiler -INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include \ +INCLUDES="-I. -I\${top_builddir}/lib/wx/include/${TOOLCHAIN_NAME} -I\${top_srcdir}/include \ $REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \ $FREETYPE_INCLUDE $TOOLKIT_INCLUDE" @@ -4589,26 +4448,6 @@ CXXFLAGS=`echo $CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \+/ /g'` LDFLAGS="$LDFLAGS $PROFILE" -if test "$wxUSE_GUI" = "yes"; then - dnl TODO add checks that these samples will really compile (i.e. all the - dnl library features they need are present) - - dnl TODO some samples are never built so far: - dnl ipc, mfc, nativdlg, oleauto, ownerdrw - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs \ - drawing dynamic erase event exec font image \ - minimal richedit rotate widgets" - - if test "$wxUSE_UNIVERSAL" = "yes" ; then - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS univ" - fi - - dnl this is needed to be able to find AFM files - CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)" -else - SAMPLES_SUBDIRS="console" -fi - dnl for convenience, sort the samples in alphabetical order dnl dnl FIXME For some mysterious reasons, sometimes the directories are duplicated @@ -4627,25 +4466,19 @@ dnl global options AC_SUBST(WX_MAJOR_VERSION_NUMBER) AC_SUBST(WX_MINOR_VERSION_NUMBER) AC_SUBST(WX_RELEASE_NUMBER) -AC_SUBST(WX_LIBRARY_NAME) AC_SUBST(WX_LIBRARY_NAME_STATIC) AC_SUBST(WX_LIBRARY_NAME_SHARED) -AC_SUBST(WX_LIBRARY) AC_SUBST(WX_TARGET_LIBRARY) AC_SUBST(WX_LIBRARY_LINK1) AC_SUBST(WX_LIBRARY_LINK2) -AC_SUBST(WX_LIBRARY_LINK3) AC_SUBST(PROGRAM_EXT) dnl global gl options -AC_SUBST(WX_LIBRARY_NAME_GL) AC_SUBST(WX_LIBRARY_NAME_STATIC_GL) AC_SUBST(WX_LIBRARY_NAME_SHARED_GL) -AC_SUBST(WX_LIBRARY_GL) AC_SUBST(WX_TARGET_LIBRARY_GL) AC_SUBST(WX_LIBRARY_LINK1_GL) AC_SUBST(WX_LIBRARY_LINK2_GL) -AC_SUBST(WX_LIBRARY_LINK3_GL) dnl are we supposed to create the links? AC_SUBST(WX_ALL) @@ -4653,11 +4486,11 @@ AC_SUBST(WX_ALL_INSTALLED) AC_SUBST(SHARED_LD) AC_SUBST(PIC_FLAG) -AC_SUBST(DEP_INFO_FLAGS) AC_SUBST(CODE_GEN_FLAGS) AC_SUBST(CODE_GEN_FLAGS_CXX) -AC_SUBST(BURNT_LIBRARY_NAME) -AC_SUBST(BURNT_LIBRARY_NAME_GL) + +AC_SUBST(SONAME_FLAGS) +AC_SUBST(SONAME_FLAGS_GL) AC_SUBST(WX_TARGET_LIBRARY_SONAME) AC_SUBST(WX_TARGET_LIBRARY_TYPE) @@ -4667,18 +4500,20 @@ AC_SUBST(WXDEBUG_DEFINE) dnl toolkit options AC_SUBST(USE_GUI) AC_SUBST(AFMINSTALL) -AC_SUBST(SETUPH_DIR) AC_SUBST(TOOLKIT) -AC_SUBST(TOOLKIT_DEF) AC_SUBST(TOOLKIT_DIR) -AC_SUBST(TOOLKIT_NAME) -AC_SUBST(TOOLKIT_INCLUDE) AC_SUBST(TOOLKIT_VPATH) +AC_SUBST(TOOLCHAIN_NAME) +AC_SUBST(TOOLCHAIN_DEFS) + +dnl wx-config options +AC_SUBST(cross_compiling) +AC_SUBST(WXCONFIG_LIBS) +AC_SUBST(WXCONFIG_LIBS_GL) AC_SUBST(WXCONFIG_INCLUDE) dnl what to compile AC_SUBST(ALL_OBJECTS) -AC_SUBST(ALL_DEPFILES) dnl distribution vars AC_SUBST(GUIDIST) @@ -4688,12 +4523,7 @@ AC_SUBST(RPM_SPEC) AC_SUBST(RPM_FILES) dnl additional subdirectories where we will build -AC_SUBST(SRC_SUBDIRS) -AC_SUBST(INCLUDE_SUBDIRS) -AC_SUBST(UTILS_SUBDIRS) -AC_SUBST(DOCS_SUBDIRS) AC_SUBST(SAMPLES_SUBDIRS) -AC_SUBST(USER_SUBDIRS) dnl additional libraries and linker settings AC_SUBST(LDFLAGS) @@ -4705,20 +4535,17 @@ AC_SUBST(LD_LIBS) AC_SUBST(WXMSW_DLL_DEFINES) dnl additional resurces settings -AC_SUBST(RCINPUTSWITCH) -AC_SUBST(RCOUTPUTSWITCH) -AC_SUBST(RESPROGRAM) AC_SUBST(RESCOMP) AC_SUBST(RESFLAGS) +AC_SUBST(RESPROGRAMOBJ) +AC_SUBST(WX_RESOURCES_DARWIN) + dnl additional for Mac OS X -AC_SUBST(REZ) -AC_SUBST(REZFLAGS) AC_SUBST(DEREZ) -AC_SUBST(DEREZFLAGS) AC_SUBST(LIBWXMACRES) AC_SUBST(LIBWXMACRESCOMP) -dnl These seam to be missing +dnl These seem to be missing AC_SUBST(DLLTOOL) AC_SUBST(AS) AC_SUBST(NM) @@ -4732,14 +4559,8 @@ dnl - and we do use it) AC_PROG_MAKE_SET dnl move setup.h back if available -if test -d include; then - if test -d include/wx; then - if test -d include/wx/${SETUPH_DIR}; then - if test -f include/wx/${SETUPH_DIR}/setup.h; then - mv -f include/wx/${SETUPH_DIR}/setup.h setup.h - fi - fi - fi +if test -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h; then + mv -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h setup.h fi AC_CONFIG_HEADER(setup.h:setup.h.in) @@ -4760,7 +4581,6 @@ if test "$wxUSE_GUI" = "yes"; then wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype AC_CONFIG_SUBDIRS(demos samples utils contrib) fi -dnl from wxUSE_GUI dnl create each of the files in the space separated list from the file.in dnl (the original file name may be overriden by appending another name after a @@ -4773,18 +4593,16 @@ AC_OUTPUT([ Makefile ], [ - dnl don't move the file on itself - this happens when we run - dnl config.status which, as configure, executes these commands - dnl but, unlike it, doesn't create wx-config (which already - if test ! -f wx${TOOLKIT_NAME}-config; then + dnl This test is required to make the following idempotent. + dnl Otherwise running config.status or rerunning configure + dnl would stomp the wx-config link or try to move it onto + dnl itself. + if test ! -L wx-config; then chmod +x wx-config - mv wx-config wx${TOOLKIT_NAME}-config - ${LN_S} wx${TOOLKIT_NAME}-config wx-config + mv wx-config wx${TOOLCHAIN_NAME}-config + ${LN_S} wx${TOOLCHAIN_NAME}-config wx-config fi - dnl the debian build process wants setup.h in the lib subdir so we - dnl can pretend wxWin is already installed, so we *copy* it there - if test ! -d lib; then mkdir lib fi @@ -4794,37 +4612,20 @@ AC_OUTPUT([ if test ! -d lib/wx/include; then mkdir lib/wx/include fi - if test ! -d lib/wx/include/wx; then - mkdir lib/wx/include/wx + if test ! -d lib/wx/include/${TOOLCHAIN_NAME}; then + mkdir lib/wx/include/${TOOLCHAIN_NAME} fi - if test ! -d lib/wx/include/wx/${TOOLKIT_NAME}; then - mkdir lib/wx/include/wx/${TOOLKIT_NAME} + if test ! -d lib/wx/include/${TOOLCHAIN_NAME}/wx; then + mkdir lib/wx/include/${TOOLCHAIN_NAME}/wx fi if test -f setup.h; then - cp -fp setup.h lib/wx/include/wx/${TOOLKIT_NAME}/setup.h + mv -f setup.h lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h fi - - dnl *move* setup.h to its final place - - if test ! -d include; then - mkdir include - fi - if test ! -d include/wx; then - mkdir include/wx - fi - if test ! -d include/wx/${SETUPH_DIR}; then - mkdir include/wx/${SETUPH_DIR} - fi - if test -f setup.h; then - cp -fp setup.h include/wx/${SETUPH_DIR}/setup.h - fi - ], [ - SETUPH_DIR="${SETUPH_DIR}" - TOOLKIT_NAME="${TOOLKIT_NAME}" + TOOLCHAIN_NAME="${TOOLCHAIN_NAME}" LN_S="${LN_S}" ] ) -dnl vi: set et ts=4 sw=4 list: +dnl vi: set et sts=4 sw=4: diff --git a/contrib/include/wx/applet/window.h b/contrib/include/wx/applet/window.h index ec02e68b84..753fac62d6 100644 --- a/contrib/include/wx/applet/window.h +++ b/contrib/include/wx/applet/window.h @@ -42,6 +42,7 @@ class wxQlet; class wxLoadPageEvent; class wxPageLoadedEvent; class wxIncludePrep; +class wxToolBarBase; // Declare a linked list of wxApplet pointers WX_DECLARE_LIST(wxApplet, wxAppletList); diff --git a/contrib/src/Makefile.in b/contrib/src/Makefile.in index 10c09135b8..45e37c974d 100644 --- a/contrib/src/Makefile.in +++ b/contrib/src/Makefile.in @@ -1,6 +1,6 @@ # $Id$ -CONTRIB_SUBDIRS=ogl mmedia stc xrc applet plot canvas animate fl +CONTRIB_SUBDIRS=ogl mmedia stc xrc plot canvas animate fl #applet all: @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done diff --git a/contrib/src/applet/appletwindow.cpp b/contrib/src/applet/appletwindow.cpp index 0ccbd0f27c..6c6d5895da 100644 --- a/contrib/src/applet/appletwindow.cpp +++ b/contrib/src/applet/appletwindow.cpp @@ -38,7 +38,9 @@ #include "wx/html/forcelnk.h" // crt +#ifdef __WXMSW__ #include // spawnl() +#endif // Include private headers #include "wx/applet/applet.h" diff --git a/contrib/src/fl/Makefile.in b/contrib/src/fl/Makefile.in index d0bf5e4190..e902c419f7 100644 --- a/contrib/src/fl/Makefile.in +++ b/contrib/src/fl/Makefile.in @@ -1,27 +1,57 @@ -# -# File: Makefile -# Author: Hans Van Leemputten -# Created: 2001 -# Updated: -# Copyright: (c) wxWorkshop team, 2001 -# -# Makefile for wxWindows FrameLayout library (Linux/wxGTK). +# $Id$ top_srcdir = @top_srcdir@/.. top_builddir = ../../.. libsrc_dir = contrib/src/fl TARGET_LIBNAME = libfl -OBJ_EXT = o -# Version Info. LIBVERSION_CURRENT=1 LIBVERSION_REVISION=0 LIBVERSION_AGE=0 -include $(top_srcdir)/$(libsrc_dir)/files.lst +HEADER_PATH=$(top_srcdir)/contrib/include/wx +HEADER_SUBDIR=fl + +HEADERS = \ + bardragpl.h \ + cbcustom.h \ + dynbarhnd.h \ + dyntbarhnd.h \ + garbagec.h \ + hintanimpl.h \ + panedrawpl.h \ + rowlayoutpl.h \ + updatesmgr.h \ + antiflickpl.h \ + barhintspl.h \ + controlbar.h \ + dyntbar.h \ + frmview.h \ + gcupdatesmgr.h \ + newbmpbtn.h \ + rowdragpl.h \ + toolwnd.h + +OBJECTS = \ + antiflickpl.o \ + gcupdatesmgr.o \ + rowlayoutpl.o \ + bardragpl.o \ + dyntbar.o \ + hintanimpl.o \ + toolwnd.o \ + barhintspl.o \ + dyntbarhnd.o \ + newbmpbtn.o \ + updatesmgr.o \ + cbcustom.o \ + frmview.o \ + panedrawpl.o \ + controlbar.o \ + garbagec.o \ + rowdragpl.o -OBJECTS = $(FL_OBJECTS) DEPFILES= $(OBJECTS:.o=.d) APPEXTRADEFS = -I$(top_srcdir)/contrib/include @@ -29,3 +59,4 @@ APPEXTRADEFS = -I$(top_srcdir)/contrib/include include $(top_builddir)/src/makelib.env -include $(DEPFILES) + diff --git a/debian/changelog b/debian/changelog index af0910878f..4662cb505f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,33 +1,59 @@ -wxwindows2.2 (2.3.1) unstable; urgency=low +wxwindows2.3 (2.3.2) unstable; urgency=low - * 2.3.1 debs -- still not QA'd for general release yet. + * Major Overhaul. First serious release contender. - -- Ron Sun, 10 Jun 2001 20:10:36 -0700 + -- Ron Lee Thu, 27 Sep 2001 05:55:07 -0700 -wxwindows2.2 (2.3.0) unstable; urgency=low +wxwindows2.3 (2.3.1) unstable; urgency=low + + * 2.3.1 test debs -- still not QA'd for general release yet. + + -- Ron Lee Sun, 10 Jun 2001 20:10:36 -0700 + +wxwindows2.3 (2.3.0) unstable; urgency=low * Updated 2.2 build scripts for 2.3 * initial test builds, please do not release.. -- Ron Lee Sat, 27 Jan 2001 01:51:24 -0800 +wxwindows2.2 (2.2.8) unstable; urgency=low + + * Fixed bogus samples makefile. Closes: #110061 + * Added ability to build wxMSW-cross packages, but they + are not built and distributed by default. + + If you think such creatures belong in the archive, + register your vote by filing a wishlist bug (or preferably + append some reasoned response to one already posted ;) + + * Pruned more inapplicable files from the raw cvs source, + cleaned configure.in and removed the need for a common setup.h, + removed superfluous library links and generally tweaked things + so as to make adding new ports easier. + * added --gl-libs flag to wx-config. + + -- Ron Lee Thu, 30 Aug 2001 15:41:49 -0700 + wxwindows2.2 (2.2.7) unstable; urgency=medium * The "Testing Tarantella" release. * various small control (mis)behaviours corrected. * added missing build-dep for gettext. + * updated wxPython description, Closes: #102689 + * Never publicly released, oh well. - -- Ron Sun, 10 Jun 2001 19:32:46 -0700 + -- Ron Lee Sun, 10 Jun 2001 19:32:46 -0700 wxwindows2.2 (2.2.6.1) unstable; urgency=low * fix rules so it really doesn't build -indep for ports - and fixed ambiguous oveload bug in mmedia contrib. + and fixed ambiguous overload bug in mmedia contrib. This time it will build on alpha for sure. Really. :) Closes: #92288 * added extra -dev package deps. Closes: #91364 - -- Ron Sat, 7 Apr 2001 06:49:58 -0700 + -- Ron Lee Sat, 7 Apr 2001 06:49:58 -0700 wxwindows2.2 (2.2.6) unstable; urgency=low @@ -39,7 +65,7 @@ wxwindows2.2 (2.2.6) unstable; urgency=low likely default use. * general buglet count reduced. - -- Ron Thu, 8 Mar 2001 21:10:07 -0800 + -- Ron Lee Thu, 8 Mar 2001 21:10:07 -0800 wxwindows2.2 (2.2.5.1) unstable; urgency=low diff --git a/debian/control.in b/debian/control.in index bae324d126..42cf24b3ec 100644 --- a/debian/control.in +++ b/debian/control.in @@ -117,10 +117,10 @@ Package: libwxgtk=V-python Architecture: any Section: interpreters Depends: python-base (>=1.5.2), ${shlibs:Depends} -Suggests: wxwin=V-doc +Suggests: wxwin=V-doc, wxwin=V-examples Conflicts: libwxgtk=V-python-contrib, python-wxwin Replaces: libwxgtk=V-python-contrib, python-wxwin -Description: wxWindows Cross-platform C++ GUI toolkit (Python binding) +Description: wxWindows Cross-platform C++ GUI toolkit (wxPython binding) wxWindows is a class library for C++ providing GUI (Graphical User Interface) and other facilities on more than one platform. Version =V currently supports subsets of GTK+, Motif, and MS Windows. @@ -204,3 +204,33 @@ Description: wxWindows Cross-platform C++ GUI toolkit (examples) . This package contains examples of using the wxWindows toolkit. +Package: libwxbase-msw=V-dev +Architecture: i386 +Section: otherosfs +Depends: wxwin=V-headers-msw (= ${Source-Version}) +Conflicts: libwxbase-msw-dev +Replaces: libwxbase-msw-dev +Provides: libwxbase-msw-dev +Description: wxBase mingw32msvc-cross + mingw32msvc-cross wxBase libs. + +Package: libwxmsw=V-dev +Architecture: i386 +Section: otherosfs +Depends: wxwin=V-headers-msw (= ${Source-Version}) +Conflicts: libwxmsw-dev +Replaces: libwxmsw-dev +Provides: libwxmsw-dev +Description: wxMSW mingw32msvc-cross + mingw32msvc-cross wxMSW libs. + +Package: wxwin=V-headers-msw +Architecture: i386 +Section: otherosfs +Depends: wxwin=V-headers (= ${Source-Version}) +Conflicts: wxwin-headers-msw +Replaces: wxwin-headers-msw +Provides: wxwin-headers-msw +Description: Extra wxWindows headers for mingw32msvc-cross + Headers required by the wxWindows mingw32msvc-cross libraries. + diff --git a/debian/libwxbase-dbg.dirs b/debian/libwxbase-dbg.dirs index 306d0d7d49..c5ba0318f3 100644 --- a/debian/libwxbase-dbg.dirs +++ b/debian/libwxbase-dbg.dirs @@ -1,5 +1,5 @@ usr/bin -usr/lib/wx/include/wx +usr/lib/wx/include/based-=V/wx usr/share/man/man1 usr/share/lintian/overrides diff --git a/debian/libwxbase-dbg.links b/debian/libwxbase-dbg.links index 124b341bbb..7b8770e7a7 100644 --- a/debian/libwxbase-dbg.links +++ b/debian/libwxbase-dbg.links @@ -1,2 +1,2 @@ -usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbased-config.1.gz +usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbased-=V-config.1.gz diff --git a/debian/libwxbase-dbg.postinst b/debian/libwxbase-dbg.postinst index eac3f0a3a8..2aae1122d4 100644 --- a/debian/libwxbase-dbg.postinst +++ b/debian/libwxbase-dbg.postinst @@ -1,7 +1,7 @@ #! /bin/sh set -e -update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbased-config 50 +update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbased-=V-config 50 if [ "$1" = "configure" ]; then ldconfig diff --git a/debian/libwxbase-dbg.prerm b/debian/libwxbase-dbg.prerm index c7dc094a7c..1f1080f90d 100644 --- a/debian/libwxbase-dbg.prerm +++ b/debian/libwxbase-dbg.prerm @@ -1,7 +1,7 @@ #! /bin/sh set -e -update-alternatives --remove wx-config /usr/bin/wxbased-config +update-alternatives --remove wx-config /usr/bin/wxbased-=V-config #DEBHELPER# diff --git a/debian/libwxbase-dev.dirs b/debian/libwxbase-dev.dirs index 22e51e28b4..adecdf7a7e 100644 --- a/debian/libwxbase-dev.dirs +++ b/debian/libwxbase-dev.dirs @@ -1,3 +1,3 @@ usr/bin -usr/lib/wx/include/wx +usr/lib/wx/include/base-=V/wx usr/share/man/man1 diff --git a/debian/libwxbase-dev.files b/debian/libwxbase-dev.files index 5e667db9c3..610ec6f1b3 100644 --- a/debian/libwxbase-dev.files +++ b/debian/libwxbase-dev.files @@ -1,4 +1,4 @@ -usr/bin/wxbase-config -usr/lib/wx/include/wx/base/setup.h +usr/bin/wxbase-=V-config +usr/lib/wx/include/base-=V/wx/setup.h usr/lib/libwx_base*.so diff --git a/debian/libwxbase-dev.links b/debian/libwxbase-dev.links index e0598ad269..b470e36be2 100644 --- a/debian/libwxbase-dev.links +++ b/debian/libwxbase-dev.links @@ -1 +1 @@ -usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-config.1.gz +usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-=V-config.1.gz diff --git a/debian/libwxbase-dev.postinst b/debian/libwxbase-dev.postinst index 9293860cdd..a8e5a81bc1 100644 --- a/debian/libwxbase-dev.postinst +++ b/debian/libwxbase-dev.postinst @@ -1,7 +1,7 @@ #! /bin/sh set -e -update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbase-config 60 +update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbase-=V-config 60 #DEBHELPER# diff --git a/debian/libwxbase-dev.prerm b/debian/libwxbase-dev.prerm index be132da496..54d3029c56 100644 --- a/debian/libwxbase-dev.prerm +++ b/debian/libwxbase-dev.prerm @@ -1,7 +1,7 @@ #! /bin/sh set -e -update-alternatives --remove wx-config /usr/bin/wxbase-config +update-alternatives --remove wx-config /usr/bin/wxbase-=V-config #DEBHELPER# diff --git a/debian/libwxbase-msw-dev.dirs b/debian/libwxbase-msw-dev.dirs new file mode 100644 index 0000000000..0f7274eb91 --- /dev/null +++ b/debian/libwxbase-msw-dev.dirs @@ -0,0 +1,4 @@ +usr/bin +usr/=H/lib/wx/include/base-=V-=H/wx +usr/share/man/man1 + diff --git a/debian/libwxbase-msw-dev.links b/debian/libwxbase-msw-dev.links new file mode 100644 index 0000000000..7cb936bb34 --- /dev/null +++ b/debian/libwxbase-msw-dev.links @@ -0,0 +1,2 @@ +usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-=V-=H-config.1.gz + diff --git a/debian/libwxbase-msw-dev.postinst b/debian/libwxbase-msw-dev.postinst new file mode 100644 index 0000000000..5ee74f62cd --- /dev/null +++ b/debian/libwxbase-msw-dev.postinst @@ -0,0 +1,7 @@ +#! /bin/sh +set -e + +update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbase-=V-=H-config 40 + +#DEBHELPER# + diff --git a/debian/libwxbase-msw-dev.prerm b/debian/libwxbase-msw-dev.prerm new file mode 100644 index 0000000000..42e29e0c64 --- /dev/null +++ b/debian/libwxbase-msw-dev.prerm @@ -0,0 +1,7 @@ +#! /bin/sh +set -e + +update-alternatives --remove wx-config /usr/bin/wxbase-=V-=H-config + +#DEBHELPER# + diff --git a/debian/libwxgtk-dbg.dirs b/debian/libwxgtk-dbg.dirs index 7ec136990e..f20b3d0ecb 100644 --- a/debian/libwxgtk-dbg.dirs +++ b/debian/libwxgtk-dbg.dirs @@ -1,5 +1,5 @@ usr/bin -usr/lib/wx/include/wx/gtkd/ +usr/lib/wx/include/gtkd-=V/wx usr/share/man/man1 usr/share/lintian/overrides diff --git a/debian/libwxgtk-dbg.links b/debian/libwxgtk-dbg.links index aa9cfe39cf..7ef5011266 100644 --- a/debian/libwxgtk-dbg.links +++ b/debian/libwxgtk-dbg.links @@ -1,2 +1,2 @@ -usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtkd-config.1.gz +usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtkd-=V-config.1.gz diff --git a/debian/libwxgtk-dbg.postinst b/debian/libwxgtk-dbg.postinst index a6eeacea7f..d5c1795ebf 100644 --- a/debian/libwxgtk-dbg.postinst +++ b/debian/libwxgtk-dbg.postinst @@ -1,7 +1,7 @@ #! /bin/sh set -e -update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtkd-config 50 +update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtkd-=V-config 50 if [ "$1" = "configure" ]; then ldconfig diff --git a/debian/libwxgtk-dbg.prerm b/debian/libwxgtk-dbg.prerm index db293a0055..72616f1df8 100644 --- a/debian/libwxgtk-dbg.prerm +++ b/debian/libwxgtk-dbg.prerm @@ -1,7 +1,7 @@ #! /bin/sh set -e -update-alternatives --remove wx-config /usr/bin/wxgtkd-config +update-alternatives --remove wx-config /usr/bin/wxgtkd-=V-config #DEBHELPER# diff --git a/debian/libwxgtk-dev.dirs b/debian/libwxgtk-dev.dirs index d5f4413e0c..32b01a1202 100644 --- a/debian/libwxgtk-dev.dirs +++ b/debian/libwxgtk-dev.dirs @@ -1,3 +1,4 @@ usr/bin -usr/lib/wx/include/wx/gtk/ +usr/lib/wx/include/gtk-=V/wx usr/share/man/man1 + diff --git a/debian/libwxgtk-dev.files b/debian/libwxgtk-dev.files index 11c13c2ee7..17d4068a55 100644 --- a/debian/libwxgtk-dev.files +++ b/debian/libwxgtk-dev.files @@ -1,6 +1,4 @@ -usr/bin/wxgtk-config -usr/lib/wx/include/wx/gtk/setup.h -usr/lib/libwx_gtk-*.so -usr/lib/libwx_gtk.so -usr/lib/libwx_gtk_gl*.so +usr/bin/wxgtk-=V-config +usr/lib/wx/include/gtk-=V/wx/setup.h +usr/lib/libwx_gtk*.so diff --git a/debian/libwxgtk-dev.links b/debian/libwxgtk-dev.links index 725498bd4d..ae94c6caa8 100644 --- a/debian/libwxgtk-dev.links +++ b/debian/libwxgtk-dev.links @@ -1 +1,2 @@ -usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtk-config.1.gz +usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtk-=V-config.1.gz + diff --git a/debian/libwxgtk-dev.postinst b/debian/libwxgtk-dev.postinst index 49fe3ebea7..e4b02b2e9c 100644 --- a/debian/libwxgtk-dev.postinst +++ b/debian/libwxgtk-dev.postinst @@ -1,7 +1,7 @@ #! /bin/sh set -e -update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtk-config 70 +update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtk-=V-config 70 #DEBHELPER# diff --git a/debian/libwxgtk-dev.prerm b/debian/libwxgtk-dev.prerm index 0b730b471a..cfe25f580e 100644 --- a/debian/libwxgtk-dev.prerm +++ b/debian/libwxgtk-dev.prerm @@ -1,7 +1,7 @@ #! /bin/sh set -e -update-alternatives --remove wx-config /usr/bin/wxgtk-config +update-alternatives --remove wx-config /usr/bin/wxgtk-=V-config #DEBHELPER# diff --git a/debian/libwxmsw-dev.dirs b/debian/libwxmsw-dev.dirs new file mode 100644 index 0000000000..b5c129eacb --- /dev/null +++ b/debian/libwxmsw-dev.dirs @@ -0,0 +1,4 @@ +usr/bin +usr/=H/lib/wx/include/msw-=V-=H/wx +usr/share/man/man1 + diff --git a/debian/libwxmsw-dev.links b/debian/libwxmsw-dev.links new file mode 100644 index 0000000000..7acae87205 --- /dev/null +++ b/debian/libwxmsw-dev.links @@ -0,0 +1,2 @@ +usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxmsw-=V-=H-config.1.gz + diff --git a/debian/libwxmsw-dev.postinst b/debian/libwxmsw-dev.postinst new file mode 100644 index 0000000000..285809bdd7 --- /dev/null +++ b/debian/libwxmsw-dev.postinst @@ -0,0 +1,7 @@ +#! /bin/sh +set -e + +update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxmsw-=V-=H-config 40 + +#DEBHELPER# + diff --git a/debian/libwxmsw-dev.prerm b/debian/libwxmsw-dev.prerm new file mode 100644 index 0000000000..eae8656486 --- /dev/null +++ b/debian/libwxmsw-dev.prerm @@ -0,0 +1,7 @@ +#! /bin/sh +set -e + +update-alternatives --remove wx-config /usr/bin/wxmsw-=V-=H-config + +#DEBHELPER# + diff --git a/debian/rules b/debian/rules index 8ac1b81269..8686835500 100755 --- a/debian/rules +++ b/debian/rules @@ -13,6 +13,9 @@ export DH_OPTIONS release:=$(shell dpkg-parsechangelog | sed -n 's/^Source: wxwindows//p') python_dir:=python$(shell python -c "import sys;print sys.version[:3]") +cross_host=i586-mingw32msvc +cross_build=$(shell ./config.guess) + # Packages to build: package_wxbase_lib=libwxbase$(release) package_wxbase_dev=libwxbase$(release)-dev @@ -28,6 +31,10 @@ package_i18n=wxwin$(release)-i18n package_doc=wxwin$(release)-doc package_examples=wxwin$(release)-examples +package_wxbase_msw_dev=libwxbase-msw$(release)-dev +package_msw_dev=libwxmsw$(release)-dev +package_headers_msw=wxwin$(release)-headers-msw + # Build directories: objdir_wxbase_shared=objs_wxbase_sh objdir_wxbase_static=objs_wxbase_st @@ -39,9 +46,14 @@ objdir_doc_cruft=objs_doc_con objdir_doc=docs/wxWindows-manual.html objdir_examples=docs/examples objdir_i18n=locale + +objdir_wxbase_msw_static=objs_wxbase_msw_st +objdir_msw_static=objs_msw_st + objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \ $(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) \ - $(objdir_doc) $(objdir_examples) + $(objdir_doc_cruft) $(objdir_doc) $(objdir_examples) \ + $(objdir_wxbase_msw_static) $(objdir_msw_static) # note that the i18n package is actually arch indep (once built) # but must be built (and installed) during the arch any phase as @@ -56,7 +68,11 @@ build_arch_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \ build_indep_stamps=build-examples-stamp build-doc-stamp -build_stamps=$(build_arch_stamps) $(build_indep_stamps) +build_cross_stamps=build-wxbase-msw-dev-stamp build-msw-dev-stamp + +build_stamps_native=$(build_arch_stamps) $(build_indep_stamps) + +build_stamps=$(build_stamps_native) $(build_cross_stamps) # Install targets: install_all_arch=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \ @@ -66,7 +82,11 @@ install_all_arch=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \ install_all_indep=install-examples install-doc -install_all=$(install_all_arch) $(install_all_indep) +install_all_cross=install-wxbase-msw-dev install-msw-dev install-headers-msw + +install_all_native=$(install_all_arch) $(install_all_indep) + +install_all=$(install_all_native) $(install_all_cross) wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \ @@ -79,10 +99,7 @@ wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \ debian/control: debian/control.in sed -e 's/=V/$(release)/g' < debian/control.in > debian/control -debian/wxwin-doc.doc-base: debian/wxwin-doc.doc-base.in - sed -e 's/=V/$(release)/g' < debian/wxwin-doc.doc-base.in > debian/wxwin-doc.doc-base - -control-files-stamp: debian/control debian/wxwin-doc.doc-base +control-files-stamp: debian/control dh_testdir @for f in dirs postinst; do \ echo "generating control file $(package_wxbase_lib).$$f"; \ @@ -90,11 +107,13 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base done; @for f in dirs files links postinst prerm; do \ echo "generating control file $(package_wxbase_dev).$$f"; \ - cp debian/libwxbase-dev.$$f debian/$(package_wxbase_dev).$$f; \ + sed -e 's/=V/$(release)/g' < debian/libwxbase-dev.$$f \ + > debian/$(package_wxbase_dev).$$f; \ done; @for f in dirs links postinst prerm; do \ echo "generating control file $(package_wxbase_dbg).$$f"; \ - cp debian/libwxbase-dbg.$$f debian/$(package_wxbase_dbg).$$f; \ + sed -e 's/=V/$(release)/g' < debian/libwxbase-dbg.$$f \ + > debian/$(package_wxbase_dbg).$$f; \ done; @for f in dirs postinst; do \ echo "generating control file $(package_gtk_lib).$$f"; \ @@ -102,11 +121,13 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base done; @for f in dirs files links postinst prerm; do \ echo "generating control file $(package_gtk_dev).$$f"; \ - cp debian/libwxgtk-dev.$$f debian/$(package_gtk_dev).$$f; \ + sed -e 's/=V/$(release)/g' < debian/libwxgtk-dev.$$f \ + > debian/$(package_gtk_dev).$$f; \ done; @for f in dirs links postinst prerm; do \ echo "generating control file $(package_gtk_dbg).$$f"; \ - cp debian/libwxgtk-dbg.$$f debian/$(package_gtk_dbg).$$f; \ + sed -e 's/=V/$(release)/g' < debian/libwxgtk-dbg.$$f \ + > debian/$(package_gtk_dbg).$$f; \ done; @for f in dirs docs files postinst prerm; do \ echo "generating control file $(package_gtk_py).$$f"; \ @@ -131,36 +152,57 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base done; @for f in dirs docs doc-base; do \ echo "generating control file $(package_doc).$$f"; \ - cp debian/wxwin-doc.$$f debian/$(package_doc).$$f; \ + sed -e 's/=V/$(release)/g' < debian/wxwin-doc.$$f \ + > debian/$(package_doc).$$f; \ done; @for f in examples; do \ echo "generating control file $(package_examples).$$f"; \ cp debian/wxwin-examples.$$f debian/$(package_examples).$$f; \ done; + @for f in dirs links postinst prerm; do \ + echo "generating control file $(package_wxbase_msw_dev).$$f"; \ + sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxbase-msw-dev.$$f \ + > debian/$(package_wxbase_msw_dev).$$f; \ + done; + @for f in dirs links postinst prerm; do \ + echo "generating control file $(package_msw_dev).$$f"; \ + sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxmsw-dev.$$f \ + > debian/$(package_msw_dev).$$f; \ + done; + @for f in dirs; do \ + echo "generating control file $(package_headers_msw).$$f"; \ + sed -e 's/=H/$(cross_host)/g' < debian/wxwin-headers-msw.$$f \ + > debian/$(package_headers_msw).$$f; \ + done; touch $@ build_arch: control-files-stamp $(build_arch_stamps) -build_all: control-files-stamp $(build_stamps) +build_all: control-files-stamp $(build_stamps_native) -# do nothing until we know which binary target is called -build: +# Really we should probably do nothing here until we know which +# binary target is being called, but alpha builds were exploding +# (compiler segfaults) in random places when building under fakeroot +# from the binary-arch target. Build all -arch files here then, and +# let the -indep stuff fend for itself later. + +build: build_arch build-wxbase-shared-stamp: dh_testdir - mkdir $(objdir_wxbase_shared) + mkdir -p $(objdir_wxbase_shared) cd $(objdir_wxbase_shared) \ && ../configure --prefix=/usr \ --cache-file=../config_deb.cache \ --disable-gui \ - --enable-burnt_name \ + --enable-soname \ --with-zlib=sys \ && $(MAKE) touch $@ build-wxbase-static-stamp: dh_testdir - mkdir $(objdir_wxbase_static) + mkdir -p $(objdir_wxbase_static) cd $(objdir_wxbase_static) \ && ../configure --prefix=/usr \ --cache-file=../config_deb.cache \ @@ -172,26 +214,26 @@ build-wxbase-static-stamp: build-wxbase-debug-stamp: dh_testdir - mkdir $(objdir_wxbase_debug) + mkdir -p $(objdir_wxbase_debug) cd $(objdir_wxbase_debug) \ && ../configure --prefix=/usr \ --cache-file=../config_deb.cache \ --disable-gui \ --enable-debug \ - --enable-burnt_name \ + --enable-soname \ --with-zlib=sys \ && $(MAKE) touch $@ build-gtk-shared-stamp: dh_testdir - mkdir $(objdir_gtk_shared) + mkdir -p $(objdir_gtk_shared) cd $(objdir_gtk_shared) \ && ../configure --prefix=/usr \ --cache-file=../config_deb.cache \ --with-gtk \ --with-opengl \ - --enable-burnt_name \ + --enable-soname \ --with-zlib=sys \ --with-libjpeg=sys \ --with-libpng=sys \ @@ -201,7 +243,7 @@ build-gtk-shared-stamp: build-gtk-static-stamp: dh_testdir - mkdir $(objdir_gtk_static) + mkdir -p $(objdir_gtk_static) cd $(objdir_gtk_static) \ && ../configure --prefix=/usr \ --cache-file=../config_deb.cache \ @@ -217,14 +259,14 @@ build-gtk-static-stamp: build-gtk-debug-stamp: dh_testdir - mkdir $(objdir_gtk_debug) + mkdir -p $(objdir_gtk_debug) cd $(objdir_gtk_debug) \ && ../configure --prefix=/usr \ --cache-file=../config_deb.cache \ --with-gtk \ --with-opengl \ --enable-debug \ - --enable-burnt_name \ + --enable-soname \ --with-zlib=sys \ --with-libjpeg=sys \ --with-libpng=sys \ @@ -258,7 +300,7 @@ build-doc-stamp: build-gtk-shared-stamp mkdir $(objdir_doc) mkdir $(objdir_doc_cruft) cd $(objdir_doc_cruft) \ - && LD_LIBRARY_PATH=../$(objdir_gtk_shared)/lib \ + && LD_LIBRARY_PATH=../$(objdir_gtk_shared)/lib:$(LD_LIBRARY_PATH) \ ../$(objdir_gtk_shared)/utils/tex2rtf/src/tex2rtf \ ../docs/latex/wx/manual.tex ../$(objdir_doc)/wxwin.htm -twice -html cp docs/latex/wx/*.gif $(objdir_doc) @@ -267,10 +309,15 @@ build-doc-stamp: build-gtk-shared-stamp $(objdir_doc)/wxwin.htx $(objdir_doc)/wxwin.ref touch $@ -build-examples-stamp: +build-examples-stamp: build-gtk-shared-stamp dh_testdir - mkdir $(objdir_examples) + mkdir -p $(objdir_examples) + + # copy all samples and the Makefile generated for libwxgtk. cp -a samples $(objdir_examples) + rm -f $(objdir_examples)/samples/Makefile + cp -a $(objdir_gtk_shared)/samples/Makefile $(objdir_examples)/samples + cp -a demos $(objdir_examples) cp -a wxPython/demo $(objdir_examples)/wxPython @for d in $(objdir_examples)/demos $(objdir_examples)/samples; do \ @@ -292,6 +339,33 @@ build-i18n-stamp: build-gtk-shared-stamp && $(MAKE) allmo touch $@ +build-wxbase-msw-dev-stamp: + dh_testdir + mkdir -p $(objdir_wxbase_msw_static) + cd $(objdir_wxbase_msw_static) \ + && ../configure --prefix=/usr/$(cross_host) \ + --cache-file=../config_deb.cache \ + --host=$(cross_host) \ + --build=$(cross_build) \ + --disable-gui \ + --disable-shared \ + && $(MAKE) + touch $@ + +build-msw-dev-stamp: + dh_testdir + mkdir -p $(objdir_msw_static) + cd $(objdir_msw_static) \ + && ../configure --prefix=/usr/$(cross_host) \ + --cache-file=../config_deb.cache \ + --host=$(cross_host) \ + --build=$(cross_build) \ + --with-mingw \ + --disable-shared \ + && $(MAKE) + touch $@ + + clean: debian/control dh_testdir dh_testroot @@ -312,10 +386,13 @@ clean: debian/control rm -f debian/$(package_i18n).* rm -f debian/$(package_doc).* rm -f debian/$(package_examples).* + rm -f debian/$(package_wxbase_msw_dev).* + rm -f debian/$(package_msw_dev).* + rm -f debian/$(package_headers_msw).* install_arch: build_arch $(install_all_arch) -install: build_all $(install_all) +install: build_all $(install_all_native) install-wxbase-lib: DH_OPTIONS=-p$(package_wxbase_lib) install-wxbase-lib: build-wxbase-shared-stamp @@ -324,7 +401,7 @@ install-wxbase-lib: build-wxbase-shared-stamp dh_clean -k dh_installdirs cp -a $(objdir_wxbase_shared)/lib/* debian/$(package_wxbase_lib)/usr/lib - cp $(objdir_wxbase_shared)/wxbase-config debian/$(package_wxbase_lib)/usr/bin/ + cp $(objdir_wxbase_shared)/wxbase-$(release)-config debian/$(package_wxbase_lib)/usr/bin/ install-wxbase-dev: DH_OPTIONS=-p$(package_wxbase_dev) install-wxbase-dev: build-wxbase-static-stamp install-wxbase-lib @@ -342,7 +419,7 @@ install-wxbase-dbg: build-wxbase-debug-stamp dh_clean -k dh_installdirs cp -a $(objdir_wxbase_debug)/lib/* debian/$(package_wxbase_dbg)/usr/lib - cp $(objdir_wxbase_debug)/wxbased-config debian/$(package_wxbase_dbg)/usr/bin/ + cp $(objdir_wxbase_debug)/wxbased-$(release)-config debian/$(package_wxbase_dbg)/usr/bin/ cp debian/lintian-override debian/$(package_wxbase_dbg)/usr/share/lintian/overrides/$(package_wxbase_dbg) install-gtk-lib: DH_OPTIONS=-p$(package_gtk_lib) @@ -371,7 +448,7 @@ install-gtk-dbg: build-gtk-debug-stamp dh_clean -k dh_installdirs cp -a $(objdir_gtk_debug)/lib/* debian/$(package_gtk_dbg)/usr/lib - cp $(objdir_gtk_debug)/wxgtkd-config debian/$(package_gtk_dbg)/usr/bin/ + cp $(objdir_gtk_debug)/wxgtkd-$(release)-config debian/$(package_gtk_dbg)/usr/bin/ cp debian/lintian-override debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg) install-gtk-contrib: DH_OPTIONS=-p$(package_gtk_contrib) @@ -441,6 +518,45 @@ install-examples: build-examples-stamp dh_clean -k dh_installdirs +install-wxbase-msw-dev: DH_OPTIONS=-p$(package_wxbase_msw_dev) +install-wxbase-msw-dev: build-wxbase-msw-dev-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + cp -a $(objdir_wxbase_msw_static)/lib/* debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib + cp $(objdir_wxbase_msw_static)/wxbase-$(release)-$(cross_host)-config debian/$(package_wxbase_msw_dev)/usr/bin/ + $(cross_host)-strip --strip-debug debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib/*.a + +install-msw-dev: DH_OPTIONS=-p$(package_msw_dev) +install-msw-dev: build-msw-dev-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + cp -a $(objdir_msw_static)/lib/* debian/$(package_msw_dev)/usr/$(cross_host)/lib + cp $(objdir_msw_static)/wxmsw-$(release)-$(cross_host)-config debian/$(package_msw_dev)/usr/bin/ + $(cross_host)-strip --strip-debug debian/$(package_msw_dev)/usr/$(cross_host)/lib/*.a + +install-headers-msw: DH_OPTIONS=-p$(package_headers_msw) +install-headers-msw: + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + @# Symlink all the headers that will be installed by the main -headers + @# package to where the cross compiler will expect them. + @for f in `ls -1 include/wx`; do \ + ln -s /usr/include/wx/$$f debian/$(package_headers_msw)/usr/$(cross_host)/include/wx; \ + echo "linking header /usr/include/wx/$$f"; \ + done; + @# But install this lot for real. + rm -f debian/$(package_headers_msw)/usr/$(cross_host)/include/wx/msw + cp -a include/wx/msw debian/$(package_headers_msw)/usr/$(cross_host)/include/wx + @# and remove this cruft(?) + rm -f debian/$(package_headers_msw)/usr/$(cross_host)/include/wx/treelay.h + + binary-common: dh_testdir dh_testroot @@ -448,7 +564,11 @@ binary-common: dh_installchangelogs dh_installexamples dh_link - dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg) + + @# Don't strip debug libs at all, and strip cross libs elsewhere + @# with the cross host tools until dh_strip gets smarter. + dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg) -N$(package_wxbase_msw_dev) -N$(package_msw_dev) + dh_compress dh_fixperms dh_makeshlibs -N$(package_gtk_py) -V @@ -462,15 +582,29 @@ binary-common: # Note that you currently can't build the indep packages without first # building the arch specific package files needed to create them. binary-indep: build_all install - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + $(MAKE) -f debian/rules \ + DH_OPTIONS="-i -N$(package_wxbase_msw_dev) -N$(package_msw_dev) -N$(package_headers_msw)" \ + binary-common # Build just the architecture-dependent files here. binary-arch: build_arch install_arch - $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common + $(MAKE) -f debian/rules \ + DH_OPTIONS="-a -N$(package_wxbase_msw_dev) -N$(package_msw_dev) -N$(package_headers_msw)" \ + binary-common # Build all packages target. binary: binary-arch binary-indep +# This is a special target for building the wxMSW-cross packages. +# It's not currently called during the official package build run +# but may be run separately to build the extra packages. +# There is an implied build dep on the mingw32 cross compiler +# that is not in the control file. +binary-cross: control-files-stamp $(install_all_cross) + $(MAKE) -f debian/rules \ + DH_OPTIONS="-p$(package_wxbase_msw_dev) -p$(package_msw_dev) -p$(package_headers_msw)" \ + binary-common + ############################################################################ # @@ -511,8 +645,10 @@ binary-doc: control-files-stamp install-doc .PHONY: build build_all build_arch clean binary-indep binary-arch binary binary-common \ binary-gtk binary-gtk-dev binary-gtk-dbg binary-wxbase binary-wxbase-dev \ - binary-wxbase-dbg binary-doc install install_arch install-wxbase-lib \ + binary-wxbase-dbg binary-doc binary-cross \ + install install_arch install-wxbase-lib \ install-wxbase-dev install-wxbase-dbg install-gtk-lib install-gtk-dev \ install-gtk-dbg install-gtk-contrib install-gtk-contrib-dev \ - install-gtk-py install-headers install-i18n install-doc install-examples + install-gtk-py install-headers install-i18n install-doc install-examples \ + install-wxbase-msw-dev install-msw-dev install-headers-msw diff --git a/debian/wxwin-doc.doc-base.in b/debian/wxwin-doc.doc-base similarity index 100% rename from debian/wxwin-doc.doc-base.in rename to debian/wxwin-doc.doc-base diff --git a/debian/wxwin-headers-msw.dirs b/debian/wxwin-headers-msw.dirs new file mode 100644 index 0000000000..ebfde3d2ab --- /dev/null +++ b/debian/wxwin-headers-msw.dirs @@ -0,0 +1,2 @@ +usr/=H/include/wx + diff --git a/distrib/msw/tmake/base.t b/distrib/msw/tmake/base.t index eabcdf40da..889aa93d74 100644 --- a/distrib/msw/tmake/base.t +++ b/distrib/msw/tmake/base.t @@ -15,33 +15,36 @@ #! find all our sources foreach $file (sort keys %wxBase) { ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"BASE_SOURCES"} .= "common/" . $file . " "; $project{"BASE_OBJS"} .= $fileobj . " "; - $project{"BASE_DEPS"} .= $filedep . " "; } foreach $file (sort keys %wxCommon) { next unless $wxCommon{$file} =~ /\bB\b/; ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"BASE_SOURCES"} .= "common/" . $file . " "; $project{"BASE_OBJS"} .= $fileobj . " "; - $project{"BASE_DEPS"} .= $filedep . " "; } foreach $file (sort keys %wxUNIX) { next unless $wxUNIX{$file} =~ /\bB\b/; ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"BASE_SOURCES"} .= "unix/" . $file . " "; $project{"BASE_UNIX_OBJS"} .= $fileobj . " "; - $project{"BASE_UNIX_DEPS"} .= $filedep . " "; + } + + foreach $file (sort keys %wxMSW) { + next unless $wxMSW{$file} =~ /\bB\b/; + + ($fileobj = $file) =~ s/cp?p?$/\o/; + + $project{"BASE_SOURCES"} .= "msw/" . $file . " "; + $project{"BASE_MSW_OBJS"} .= $fileobj . " "; } #! find all our headers @@ -57,6 +60,12 @@ $project{"BASE_HEADERS"} .= "unix/" . $file . " " } + foreach $file (sort keys %wxMSWINCLUDE) { + next unless $wxMSWINCLUDE{$file} =~ /\bB\b/; + + $project{"BASE_HEADERS"} .= "msw/" . $file . " " + } + foreach $file (sort keys %wxPROTOCOLINCLUDE) { next unless $wxPROTOCOLINCLUDE{$file} =~ /\bB\b/; @@ -74,11 +83,10 @@ ALL_HEADERS = \ BASE_OBJS = \ #$ ExpandList("BASE_OBJS"); -BASE_DEPS = \ - #$ ExpandList("BASE_DEPS"); - BASE_UNIX_OBJS = \ #$ ExpandList("BASE_UNIX_OBJS"); -BASE_DEPS = \ - #$ ExpandList("BASE_DEPS"); +BASE_MSW_OBJS = \ + #$ ExpandList("BASE_MSW_OBJS"); + + diff --git a/distrib/msw/tmake/gtk.t b/distrib/msw/tmake/gtk.t index 9fd210fc09..0a1dd141df 100644 --- a/distrib/msw/tmake/gtk.t +++ b/distrib/msw/tmake/gtk.t @@ -14,60 +14,48 @@ #! find all our sources $project{"COMMONOBJS"} .= "parser.o "; - $project{"COMMONDEPS"} .= "parser.d "; foreach $file (sort keys %wxGeneric) { next if $wxGeneric{$file} =~ /\bR\b/; ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"GTK_SOURCES"} .= "generic/" . $file . " "; $project{"GENERICOBJS"} .= $fileobj . " "; - $project{"GENERICDEPS"} .= $filedep . " " } foreach $file (sort keys %wxCommon) { next if $wxCommon{$file} =~ /\bR\b/; ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"GTK_SOURCES"} .= "common/" . $file . " "; $project{"COMMONOBJS"} .= $fileobj . " "; - $project{"COMMONDEPS"} .= $filedep . " " } foreach $file (sort keys %wxGTK) { ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"GTK_SOURCES"} .= "gtk/" . $file . " "; $project{"GUIOBJS"} .= $fileobj . " "; - $project{"GUIDEPS"} .= $filedep . " "; if ( $wxGTK{$file} =~ /\bL\b/ ) { $project{"GUI_LOWLEVEL_OBJS"} .= $fileobj . " "; - $project{"GUI_LOWLEVEL_DEPS"} .= $filedep . " "; } } foreach $file (sort keys %wxUNIX) { ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"GTK_SOURCES"} .= "unix/" . $file . " "; $project{"UNIXOBJS"} .= $fileobj . " "; - $project{"UNIXDEPS"} .= $filedep . " " } foreach $file (sort keys %wxHTML) { ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"GTK_SOURCES"} .= "html/" . $file . " "; $project{"HTMLOBJS"} .= $fileobj . " "; - $project{"HTMLDEPS"} .= $filedep . " " } #! find all our headers @@ -108,36 +96,18 @@ ALL_HEADERS = \ COMMONOBJS = \ #$ ExpandList("COMMONOBJS"); -COMMONDEPS = \ - #$ ExpandList("COMMONDEPS"); - GENERICOBJS = \ #$ ExpandList("GENERICOBJS"); -GENERICDEPS = \ - #$ ExpandList("GENERICDEPS"); - GUIOBJS = \ #$ ExpandList("GUIOBJS"); -GUIDEPS = \ - #$ ExpandList("GUIDEPS"); - GUI_LOWLEVEL_OBJS = \ #$ ExpandList("GUI_LOWLEVEL_OBJS"); -GUI_LOWLEVEL_DEPS = \ - #$ ExpandList("GUI_LOWLEVEL_DEPS"); - UNIXOBJS = \ #$ ExpandList("UNIXOBJS"); -UNIXDEPS = \ - #$ ExpandList("UNIXDEPS"); - HTMLOBJS = \ #$ ExpandList("HTMLOBJS"); -HTMLDEPS = \ - #$ ExpandList("HTMLDEPS"); - diff --git a/distrib/msw/tmake/mgl.t b/distrib/msw/tmake/mgl.t index 51d108098e..ad1a8d1a42 100644 --- a/distrib/msw/tmake/mgl.t +++ b/distrib/msw/tmake/mgl.t @@ -14,60 +14,48 @@ #! find all our sources $project{"COMMONOBJS"} .= "parser.o "; - $project{"COMMONDEPS"} .= "parser.d "; foreach $file (sort keys %wxGeneric) { next if $wxGeneric{$file} =~ /\bNotMGL\b/; ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"MGL_SOURCES"} .= "generic/" . $file . " "; $project{"GENERICOBJS"} .= $fileobj . " "; - $project{"GENERICDEPS"} .= $filedep . " " } foreach $file (sort keys %wxCommon) { next if $wxCommon{$file} =~ /\bNotMGL\b/; ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"MGL_SOURCES"} .= "common/" . $file . " "; $project{"COMMONOBJS"} .= $fileobj . " "; - $project{"COMMONDEPS"} .= $filedep . " " } foreach $file (sort keys %wxMGL) { ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"MGL_SOURCES"} .= "mgl/" . $file . " "; #! $project{"GUIOBJS"} .= $fileobj . " "; -#! $project{"GUIDEPS"} .= $filedep . " "; if ( $wxMGL{$file} =~ /\bL\b/ ) { $project{"GUI_LOWLEVEL_OBJS"} .= $fileobj . " "; - $project{"GUI_LOWLEVEL_DEPS"} .= $filedep . " "; } } foreach $file (sort keys %wxUNIX) { ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"MGL_SOURCES"} .= "unix/" . $file . " "; $project{"UNIXOBJS"} .= $fileobj . " "; - $project{"UNIXDEPS"} .= $filedep . " " } foreach $file (sort keys %wxHTML) { ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"MGL_SOURCES"} .= "html/" . $file . " "; $project{"HTMLOBJS"} .= $fileobj . " "; - $project{"HTMLDEPS"} .= $filedep . " " } #! find all our headers @@ -106,36 +94,18 @@ ALL_HEADERS = \ COMMONOBJS = \ #$ ExpandList("COMMONOBJS"); -COMMONDEPS = \ - #$ ExpandList("COMMONDEPS"); - GENERICOBJS = \ #$ ExpandList("GENERICOBJS"); -GENERICDEPS = \ - #$ ExpandList("GENERICDEPS"); - #!GUIOBJS = \ #! #$ ExpandList("GUIOBJS"); #! -#!GUIDEPS = \ -#! #$ ExpandList("GUIDEPS"); - GUI_LOWLEVEL_OBJS = \ #$ ExpandList("GUI_LOWLEVEL_OBJS"); -GUI_LOWLEVEL_DEPS = \ - #$ ExpandList("GUI_LOWLEVEL_DEPS"); - UNIXOBJS = \ #$ ExpandList("UNIXOBJS"); -UNIXDEPS = \ - #$ ExpandList("UNIXDEPS"); - HTMLOBJS = \ #$ ExpandList("HTMLOBJS"); -HTMLDEPS = \ - #$ ExpandList("HTMLDEPS"); - diff --git a/distrib/msw/tmake/motif.t b/distrib/msw/tmake/motif.t index d67e487cdf..9ef6b17f7b 100644 --- a/distrib/msw/tmake/motif.t +++ b/distrib/msw/tmake/motif.t @@ -14,56 +14,45 @@ #! find all our sources $project{"COMMONOBJS"} .= "parser.o "; - $project{"COMMONDEPS"} .= "parser.d "; $project{"GUIOBJS"} .= "xmcombo.o "; foreach $file (sort keys %wxGeneric) { next if $wxGeneric{$file} =~ /\bX\b/; ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"MOTIF_SOURCES"} .= "generic/" . $file . " "; $project{"GENERICOBJS"} .= $fileobj . " "; - $project{"GENERICDEPS"} .= $filedep . " " } foreach $file (sort keys %wxCommon) { next if $wxCommon{$file} =~ /\bX\b/; ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"MOTIF_SOURCES"} .= "common/" . $file . " "; $project{"COMMONOBJS"} .= $fileobj . " "; - $project{"COMMONDEPS"} .= $filedep . " " } foreach $file (sort keys %wxMOTIF) { ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"MOTIF_SOURCES"} .= "motif/" . $file . " "; $project{"GUIOBJS"} .= $fileobj . " "; - $project{"GUIDEPS"} .= $filedep . " " } foreach $file (sort keys %wxUNIX) { ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"MOTIF_SOURCES"} .= "unix/" . $file . " "; $project{"UNIXOBJS"} .= $fileobj . " "; - $project{"UNIXDEPS"} .= $filedep . " " } foreach $file (sort keys %wxHTML) { ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"MOTIF_SOURCES"} .= "html/" . $file . " "; $project{"HTMLOBJS"} .= $fileobj . " "; - $project{"HTMLDEPS"} .= $filedep . " " } #! find all our headers foreach $file (sort keys %wxWXINCLUDE) { @@ -103,29 +92,15 @@ ALL_HEADERS = \ COMMONOBJS = \ #$ ExpandList("COMMONOBJS"); -COMMONDEPS = \ - #$ ExpandList("COMMONDEPS"); - GENERICOBJS = \ #$ ExpandList("GENERICOBJS"); -GENERICDEPS = \ - #$ ExpandList("GENERICDEPS"); - GUIOBJS = \ #$ ExpandList("GUIOBJS"); -GUIDEPS = \ - #$ ExpandList("GUIDEPS"); - UNIXOBJS = \ #$ ExpandList("UNIXOBJS"); -UNIXDEPS = \ - #$ ExpandList("UNIXDEPS"); - HTMLOBJS = \ #$ ExpandList("HTMLOBJS"); -HTMLDEPS = \ - #$ ExpandList("HTMLDEPS"); diff --git a/distrib/msw/tmake/msw.t b/distrib/msw/tmake/msw.t index 42e56ef40c..9663b0ed44 100644 --- a/distrib/msw/tmake/msw.t +++ b/distrib/msw/tmake/msw.t @@ -14,54 +14,44 @@ #! find all our sources $project{"COMMONOBJS"} .= "parser.o "; - $project{"COMMONDEPS"} .= "parser.d "; foreach $file (sort keys %wxGeneric) { next if $wxGeneric{$file} =~ /\b(PS|G|U|16)\b/; ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"MSW_SOURCES"} .= "generic/" . $file . " "; $project{"GENERICOBJS"} .= $fileobj . " "; - $project{"GENERICDEPS"} .= $filedep . " " } foreach $file (sort keys %wxCommon) { next if $wxCommon{$file} =~ /\bR\b/; ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"MSW_SOURCES"} .= "common/" . $file . " "; $project{"COMMONOBJS"} .= $fileobj . " "; - $project{"COMMONDEPS"} .= $filedep . " " } foreach $file (sort keys %wxMSW) { next if $wxMSW{$file} =~ /\b16\b/; ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; if( $wxMSW{$file} =~ /\bO\b/ ) { $project{"MSW_SOURCES"} .= "msw/ole/" . $file . " "; $project{"OLEOBJS"} .= $fileobj . " "; - $project{"OLEDEPS"} .= $filedep . " "; } else { $project{"MSW_SOURCES"} .= "msw/" . $file . " "; $project{"GUIOBJS"} .= $fileobj . " "; - $project{"GUIDEPS"} .= $filedep . " "; } } foreach $file (sort keys %wxHTML) { ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"MSW_SOURCES"} .= "html/" . $file . " "; $project{"HTMLOBJS"} .= $fileobj . " "; - $project{"HTMLDEPS"} .= $filedep . " " } #! find all our headers foreach $file (sort keys %wxWXINCLUDE) { @@ -99,41 +89,15 @@ ALL_HEADERS = \ COMMONOBJS = \ #$ ExpandList("COMMONOBJS"); -COMMONDEPS = \ - #$ ExpandList("COMMONDEPS"); - GENERICOBJS = \ #$ ExpandList("GENERICOBJS"); -GENERICDEPS = \ - #$ ExpandList("GENERICDEPS"); - GUIOBJS = \ #$ ExpandList("GUIOBJS"); -GUIDEPS = \ - #$ ExpandList("GUIDEPS"); - -UNIXOBJS = \ - #$ ExpandList("UNIXOBJS"); - -UNIXDEPS = \ - #$ ExpandList("UNIXDEPS"); - HTMLOBJS = \ #$ ExpandList("HTMLOBJS"); -HTMLDEPS = \ - #$ ExpandList("HTMLDEPS"); - OLEOBJS = \ #$ ExpandList("OLEOBJS"); -OLEDEPS = \ - #$ ExpandList("OLEDEPS"); - -IODBCOBJS = \ - #$ ExpandList("IODBCOBJS"); - -IODBCDEPS = \ - #$ ExpandList("IODBCDEPS"); diff --git a/distrib/msw/tmake/os2.t b/distrib/msw/tmake/os2.t index 65a07b0352..b9aa0f7312 100644 --- a/distrib/msw/tmake/os2.t +++ b/distrib/msw/tmake/os2.t @@ -15,46 +15,37 @@ #! find all our sources $project{"COMMONOBJS"} .= "parser.o "; - $project{"COMMONDEPS"} .= "parser.d "; foreach $file (sort keys %wxGeneric) { next if $wxGeneric{$file} =~ /\bP\b/; ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"OS2PM_SOURCES"} .= "generic/" . $file . " "; $project{"GENERICOBJS"} .= $fileobj . " "; - $project{"GENERICDEPS"} .= $filedep . " " } foreach $file (sort keys %wxCommon) { next if $wxCommon{$file} =~ /\bP\b/; ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"OS2PM_SOURCES"} .= "common/" . $file . " "; $project{"COMMONOBJS"} .= $fileobj . " "; - $project{"COMMONDEPS"} .= $filedep . " " } foreach $file (sort keys %wxOS2PM) { ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"OS2PM_SOURCES"} .= "os2/" . $file . " "; $project{"GUIOBJS"} .= $fileobj . " "; - $project{"GUIDEPS"} .= $filedep . " " } foreach $file (sort keys %wxHTML) { ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"OS2PM_SOURCES"} .= "html/" . $file . " "; $project{"HTMLOBJS"} .= $fileobj . " "; - $project{"HTMLDEPS"} .= $filedep . " " } #! find all our headers foreach $file (sort keys %wxWXINCLUDE) { @@ -90,30 +81,15 @@ ALL_HEADERS = \ COMMONOBJS = \ #$ ExpandList("COMMONOBJS"); -COMMONDEPS = \ - #$ ExpandList("COMMONDEPS"); - GENERICOBJS = \ #$ ExpandList("GENERICOBJS"); -GENERICDEPS = \ - #$ ExpandList("GENERICDEPS"); - GUIOBJS = \ #$ ExpandList("GUIOBJS"); -GUIDEPS = \ - #$ ExpandList("GUIDEPS"); - UNIXOBJS = \ #$ ExpandList("UNIXOBJS"); -UNIXDEPS = \ - #$ ExpandList("UNIXDEPS"); - HTMLOBJS = \ #$ ExpandList("HTMLOBJS"); -HTMLDEPS = \ - #$ ExpandList("HTMLDEPS"); - diff --git a/distrib/msw/tmake/univ.t b/distrib/msw/tmake/univ.t index 29eb69aff7..944b9eef07 100644 --- a/distrib/msw/tmake/univ.t +++ b/distrib/msw/tmake/univ.t @@ -15,19 +15,14 @@ #! find all our sources foreach $file (sort keys %wxUNIV) { ($fileobj = $file) =~ s/cp?p?$/\o/; - ($filedep = $file) =~ s/cp?p?$/\d/; $project{"UNIV_SOURCES"} .= "univ/" . $file . " "; $project{"UNIVOBJS"} .= $fileobj . " "; - $project{"UNIVDEPS"} .= $filedep . " "; } #$} # This file was automatically generated by tmake at #$ Now() -# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! +# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNIV.T! UNIVOBJS = \ #$ ExpandList("UNIVOBJS"); -UNIVDEPS = \ - #$ ExpandList("UNIVDEPS"); - diff --git a/docs/motif/install.txt b/docs/motif/install.txt index 2709f5d5c1..2eada2b3f4 100644 --- a/docs/motif/install.txt +++ b/docs/motif/install.txt @@ -243,10 +243,10 @@ Usage: ./configure options If you want to use system's C and C++ compiler, -set environment variables CC and CCC as +set environment variables CXX and CC as % setenv CC cc - % setenv CCC CC + % setenv CXX CC % ./configure options to see all the options please use: @@ -432,13 +432,13 @@ g++ myfoo.cpp `wx-config --libs` `wx-config --cflags` -o myfoo Using this way, a make file for the minimal sample would look like this -CC = g++ +CXX = g++ minimal: minimal.o - $(CC) -o minimal minimal.o `wx-config --libs` + $(CXX) -o minimal minimal.o `wx-config --libs` minimal.o: minimal.cpp mondrian.xpm - $(CC) `wx-config --cflags` -c minimal.cpp -o minimal.o + $(CXX) `wx-config --cflags` -c minimal.cpp -o minimal.o clean: rm -f *.o minimal diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h index 2f5c2e49df..176aebd123 100644 --- a/include/wx/msw/private.h +++ b/include/wx/msw/private.h @@ -28,6 +28,8 @@ // undefine conflicting symbols which were defined in windows.h #include "wx/msw/winundef.h" +#include "wx/log.h" + class WXDLLEXPORT wxFont; class WXDLLEXPORT wxWindow; diff --git a/include/wx/os2/setup.h b/include/wx/os2/setup.h index 33ea02be7f..304dec922b 100644 --- a/include/wx/os2/setup.h +++ b/include/wx/os2/setup.h @@ -226,10 +226,6 @@ // Use standard C++ streams if 1. If 0, use wxWin // streams implementation. -#define wxUSE_WXCONFIG 1 - // if enabled, compiles built-in OS independent wxConfig - // class and it's file (any platform) and registry (Win) - // based implementations #define wxUSE_THREADS 1 // support for multithreaded applications: if // 1, compile in thread classes (thread.h) diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h index 33ea02be7f..304dec922b 100644 --- a/include/wx/os2/setup0.h +++ b/include/wx/os2/setup0.h @@ -226,10 +226,6 @@ // Use standard C++ streams if 1. If 0, use wxWin // streams implementation. -#define wxUSE_WXCONFIG 1 - // if enabled, compiles built-in OS independent wxConfig - // class and it's file (any platform) and registry (Win) - // based implementations #define wxUSE_THREADS 1 // support for multithreaded applications: if // 1, compile in thread classes (thread.h) diff --git a/include/wx/setup.h b/include/wx/setup.h deleted file mode 100644 index 4450f67890..0000000000 --- a/include/wx/setup.h +++ /dev/null @@ -1,78 +0,0 @@ -/* - * The main configuration file for wxWindows. - * - * NB: this file can be included in .c files, so it must be compileable by a C - * compiler - use #ifdef __cplusplus for C++ specific features and avoid - * using C++ style comments - */ - -#ifndef _WX_SETUP_H_BASE_ -#define _WX_SETUP_H_BASE_ - -/* compatibility code, to be removed asap: */ - -#if !defined(__WXBASE__) && !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXSTUBS__) && !defined(__WXMAC__) && !defined(__WXPM__) -#error No __WXxxx__ define set! Please define one of __WXBASE__,__WXMSW__,__WXGTK__,__WXMOTIF__,__WXSTUBS__,__WXMAC__,__WXPM__ -#endif - -/* - wxUniversal is defined together with one of other ports, so test for it - first - */ -#ifdef __WXUNIVERSAL__ -#if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__) -#include "wx/univd/setup.h" -#else -#include "wx/univ/setup.h" -#endif - -#elif defined(__WXBASE__) -#if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__) -#include "wx/based/setup.h" -#else -#include "wx/base/setup.h" -#endif - -#elif defined(__VMS) -#include "wx_root:[wxwindows]setup.h" -#elif defined(__WXMSW__) -#include "wx/msw/setup.h" -#elif defined(__WXMAC__) -#include "wx/mac/setup.h" - -#elif defined(__WXMOTIF__) -#if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__) -#include "wx/motifd/setup.h" -#else -#include "wx/motif/setup.h" -#endif - -#elif defined(__WXPM__) -#include "wx/os2/setup.h" -#elif defined(__WXSTUBS__) -#include "wx/stubs/setup.h" - -#elif defined(__WXGTK__) -#if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__) -#include "wx/gtkd/setup.h" -#else -#include "wx/gtk/setup.h" -#endif - -#endif - -#include "wx/chkconf.h" - -/* - define some constants identifying wxWindows version in more details than - just the version number - */ - -/* wxLogChain class available */ -#define wxHAS_LOG_CHAIN - -/* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */ -#undef wxHAS_WORKING_GTK_DC_BLIT - -#endif /* _WX_SETUP_H_BASE_ */ - diff --git a/samples/ipc/Makefile.in b/samples/ipc/Makefile.in index 8c8c8af84a..9789fc0116 100644 --- a/samples/ipc/Makefile.in +++ b/samples/ipc/Makefile.in @@ -21,7 +21,7 @@ VPATH = @PATH_IFS@$(top_srcdir)/samples/ipc # ':' for autoconf .SUFFIXES: .o .cpp .c .cxx .cpp.o : - $(CC) -c $(CXXFLAGS) -o $@ $< + $(CXX) -c $(CXXFLAGS) -o $@ $< # Set defaults from configure include ../../src/make.env @@ -29,10 +29,10 @@ include ../../src/make.env all: client server client: client.o ../../lib/@WX_TARGET_LIBRARY@ - $(CC) $(LDFLAGS) -o client client.o $(LDLIBS) + $(CXX) $(LDFLAGS) -o client client.o $(LDLIBS) server: server.o ../../lib/@WX_TARGET_LIBRARY@ - $(CC) $(LDFLAGS) -o server server.o $(LDLIBS) + $(CXX) $(LDFLAGS) -o server server.o $(LDLIBS) clean: rm -f $(OBJECTS) $(PROGRAM) core diff --git a/samples/sockets/Makefile.in b/samples/sockets/Makefile.in index f7ff32f5a3..0a740e42d4 100644 --- a/samples/sockets/Makefile.in +++ b/samples/sockets/Makefile.in @@ -21,7 +21,7 @@ VPATH = @PATH_IFS@$(top_srcdir)/samples/sockets # ':' for autoconf .SUFFIXES: .o .cpp .c .cxx .cpp.o : - $(CC) -c $(CXXFLAGS) -o $@ $< + $(CXX) -c $(CXXFLAGS) -o $@ $< # Set defaults from configure include ../../src/make.env @@ -29,13 +29,13 @@ include ../../src/make.env all: client@PROGRAM_EXT@ server@PROGRAM_EXT@ sockets_resources.o: sockets.rc - $(RESCOMP) $(RCINPUTSWITCH) $< $(RCOUTPUTSWITCH) $@ $(RESFLAGS) + $(RESCOMP) -i $< -o $@ $(RESFLAGS) client@PROGRAM_EXT@: client.o ../../lib/@WX_TARGET_LIBRARY@ sockets_resources.o - $(CC) $(LDFLAGS) -o client@PROGRAM_EXT@ sockets_resources.o client.o $(LDLIBS) + $(CXX) $(LDFLAGS) -o client@PROGRAM_EXT@ sockets_resources.o client.o $(LDLIBS) server@PROGRAM_EXT@: server.o ../../lib/@WX_TARGET_LIBRARY@ - $(CC) $(LDFLAGS) -o server@PROGRAM_EXT@ sockets_resources.o server.o $(LDLIBS) + $(CXX) $(LDFLAGS) -o server@PROGRAM_EXT@ sockets_resources.o server.o $(LDLIBS) clean: rm -f client@PROGRAM_EXT@ server@PROGRAM_EXT@ sockets_resources.o client.o server.o core diff --git a/setup.h.in b/setup.h.in index f63c962970..6b58a81179 100644 --- a/setup.h.in +++ b/setup.h.in @@ -1008,4 +1008,25 @@ /* Define this if you are using gtk and gdk contains support for X11R6 XIM */ #undef HAVE_XIM + +/* --------------------------------------------------------* + * This stuff is static, it doesn't get modified directly + * by configure. +*/ + +#include "wx/chkconf.h" + +/* + define some constants identifying wxWindows version in more details than + just the version number + */ + +/* wxLogChain class available */ +#define wxHAS_LOG_CHAIN + +/* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */ +#undef wxHAS_WORKING_GTK_DC_BLIT + + #endif /* __WX_SETUP_H__ */ + diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index 82656dd1d2..5f5ae4b89f 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -641,7 +641,7 @@ public: size_t outbuf = n; size_t res, cres; - wchar_t *tmpbuf; + wchar_t *tmpbuf = 0; if (g_wcNeedsSwap) { diff --git a/src/files.lst b/src/files.lst index 550ca62868..5716797e3e 100644 --- a/src/files.lst +++ b/src/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 15:17, 2001/09/17 +# This file was automatically generated by tmake at 16:49, 2001/09/21 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASE.T! ALL_SOURCES = \ common/init.cpp \ @@ -69,7 +69,19 @@ ALL_SOURCES = \ unix/mimetype.cpp \ unix/snglinst.cpp \ unix/threadpsx.cpp \ - unix/utilsunx.cpp + unix/utilsunx.cpp \ + msw/dde.cpp \ + msw/dir.cpp \ + msw/gsocket.c \ + msw/gsockmsw.c \ + msw/main.cpp \ + msw/mimetype.cpp \ + msw/regconf.cpp \ + msw/registry.cpp \ + msw/snglinst.cpp \ + msw/thread.cpp \ + msw/utils.cpp \ + msw/utilsexc.cpp ALL_HEADERS = \ app.h \ @@ -152,6 +164,8 @@ ALL_HEADERS = \ zstream.h \ unix/gsockunx.h \ unix/mimetype.h \ + msw/dde.h \ + msw/mimetype.h \ protocol/file.h \ protocol/ftp.h \ protocol/http.h \ @@ -222,71 +236,6 @@ BASE_OBJS = \ zipstrm.o \ zstream.o -BASE_DEPS = \ - init.d \ - appcmn.d \ - cmdline.d \ - config.d \ - datetime.d \ - datstrm.d \ - db.d \ - dbtable.d \ - dircmn.d \ - dynarray.d \ - dynlib.d \ - encconv.d \ - event.d \ - extended.d \ - ffile.d \ - file.d \ - fileconf.d \ - filefn.d \ - filename.d \ - filesys.d \ - fontmap.d \ - fs_inet.d \ - fs_mem.d \ - fs_zip.d \ - ftp.d \ - hash.d \ - http.d \ - intl.d \ - ipcbase.d \ - list.d \ - log.d \ - longlong.d \ - memory.d \ - mimecmn.d \ - module.d \ - mstream.d \ - object.d \ - objstrm.d \ - process.d \ - protocol.d \ - regex.d \ - sckaddr.d \ - sckfile.d \ - sckipc.d \ - sckstrm.d \ - serbase.d \ - socket.d \ - strconv.d \ - stream.d \ - string.d \ - sysopt.d \ - textfile.d \ - timercmn.d \ - tokenzr.d \ - txtstrm.d \ - unzip.d \ - url.d \ - utilscmn.d \ - variant.d \ - wfstream.d \ - wxchar.d \ - zipstrm.d \ - zstream.d - BASE_UNIX_OBJS = \ dir.o \ gsocket.o \ @@ -295,67 +244,18 @@ BASE_UNIX_OBJS = \ threadpsx.o \ utilsunx.o -BASE_DEPS = \ - init.d \ - appcmn.d \ - cmdline.d \ - config.d \ - datetime.d \ - datstrm.d \ - db.d \ - dbtable.d \ - dircmn.d \ - dynarray.d \ - dynlib.d \ - encconv.d \ - event.d \ - extended.d \ - ffile.d \ - file.d \ - fileconf.d \ - filefn.d \ - filename.d \ - filesys.d \ - fontmap.d \ - fs_inet.d \ - fs_mem.d \ - fs_zip.d \ - ftp.d \ - hash.d \ - http.d \ - intl.d \ - ipcbase.d \ - list.d \ - log.d \ - longlong.d \ - memory.d \ - mimecmn.d \ - module.d \ - mstream.d \ - object.d \ - objstrm.d \ - process.d \ - protocol.d \ - regex.d \ - sckaddr.d \ - sckfile.d \ - sckipc.d \ - sckstrm.d \ - serbase.d \ - socket.d \ - strconv.d \ - stream.d \ - string.d \ - sysopt.d \ - textfile.d \ - timercmn.d \ - tokenzr.d \ - txtstrm.d \ - unzip.d \ - url.d \ - utilscmn.d \ - variant.d \ - wfstream.d \ - wxchar.d \ - zipstrm.d \ - zstream.d +BASE_MSW_OBJS = \ + dde.o \ + dir.o \ + gsocket.o \ + gsockmsw.o \ + main.o \ + mimetype.o \ + regconf.o \ + registry.o \ + snglinst.o \ + thread.o \ + utils.o \ + utilsexc.o + + diff --git a/src/gtk/files.lst b/src/gtk/files.lst index df44067cef..132d0b30d9 100644 --- a/src/gtk/files.lst +++ b/src/gtk/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 14:54, 2001/09/26 +# This file was automatically generated by tmake at 16:51, 2001/09/21 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! ALL_SOURCES = \ generic/accel.cpp \ @@ -725,127 +725,6 @@ COMMONOBJS = \ zipstrm.o \ zstream.o -COMMONDEPS = \ - parser.d \ - appcmn.d \ - choiccmn.d \ - clipcmn.d \ - cmdline.d \ - cmdproc.d \ - cmndata.d \ - config.d \ - containr.d \ - cshelp.d \ - ctrlcmn.d \ - ctrlsub.d \ - datetime.d \ - datstrm.d \ - db.d \ - dbgrid.d \ - dbtable.d \ - dcbase.d \ - dircmn.d \ - dlgcmn.d \ - dndcmn.d \ - dobjcmn.d \ - docmdi.d \ - docview.d \ - dynarray.d \ - dynlib.d \ - effects.d \ - encconv.d \ - event.d \ - extended.d \ - fddlgcmn.d \ - ffile.d \ - file.d \ - fileconf.d \ - filefn.d \ - filename.d \ - filesys.d \ - fontcmn.d \ - fontmap.d \ - framecmn.d \ - fs_inet.d \ - fs_mem.d \ - fs_zip.d \ - ftp.d \ - gaugecmn.d \ - gdicmn.d \ - geometry.d \ - gifdecod.d \ - hash.d \ - helpbase.d \ - http.d \ - imagall.d \ - imagbmp.d \ - image.d \ - imaggif.d \ - imagjpeg.d \ - imagpcx.d \ - imagpng.d \ - imagpnm.d \ - imagtiff.d \ - imagxpm.d \ - intl.d \ - ipcbase.d \ - layout.d \ - lboxcmn.d \ - list.d \ - log.d \ - longlong.d \ - matrix.d \ - memory.d \ - menucmn.d \ - mimecmn.d \ - module.d \ - mstream.d \ - nbkbase.d \ - object.d \ - objstrm.d \ - paper.d \ - popupcmn.d \ - prntbase.d \ - process.d \ - protocol.d \ - quantize.d \ - radiocmn.d \ - regex.d \ - resource.d \ - sckaddr.d \ - sckfile.d \ - sckipc.d \ - sckstrm.d \ - serbase.d \ - sizer.d \ - socket.d \ - strconv.d \ - stream.d \ - string.d \ - sysopt.d \ - tbarbase.d \ - textcmn.d \ - textfile.d \ - timercmn.d \ - tokenzr.d \ - toplvcmn.d \ - treebase.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 \ - xpmdecod.d \ - zipstrm.d \ - zstream.d - GENERICOBJS = \ accel.o \ busyinfo.o \ @@ -895,55 +774,6 @@ GENERICOBJS = \ treelay.o \ wizard.o -GENERICDEPS = \ - accel.d \ - busyinfo.d \ - calctrl.d \ - caret.d \ - choicdgg.d \ - colrdlgg.d \ - dcpsg.d \ - dirctrlg.d \ - dirdlgg.d \ - dragimgg.d \ - fdrepdlg.d \ - filedlgg.d \ - fontdlgg.d \ - grid.d \ - gridctrl.d \ - gridsel.d \ - helpext.d \ - helphtml.d \ - helpwxht.d \ - imaglist.d \ - laywin.d \ - listctrl.d \ - logg.d \ - msgdlgg.d \ - numdlgg.d \ - paletteg.d \ - panelg.d \ - printps.d \ - prntdlgg.d \ - progdlgg.d \ - prop.d \ - propform.d \ - proplist.d \ - sashwin.d \ - scrlwing.d \ - spinctlg.d \ - splash.d \ - splitter.d \ - statusbr.d \ - tabg.d \ - tbarsmpl.d \ - textdlgg.d \ - tipdlg.d \ - tipwin.d \ - treectlg.d \ - treelay.d \ - wizard.d - GUIOBJS = \ app.o \ bitmap.o \ @@ -1008,70 +838,6 @@ GUIOBJS = \ win_gtk.o \ window.o -GUIDEPS = \ - 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 \ - evtloop.d \ - font.d \ - fontdlg.d \ - frame.d \ - gauge.d \ - gdiobj.d \ - gsockgtk.d \ - icon.d \ - joystick.d \ - listbox.d \ - main.d \ - mdi.d \ - menu.d \ - minifram.d \ - notebook.d \ - pen.d \ - popupwin.d \ - radiobox.d \ - radiobut.d \ - region.d \ - scrolbar.d \ - scrolwin.d \ - settings.d \ - slider.d \ - spinbutt.d \ - spinctrl.d \ - statbmp.d \ - statbox.d \ - statline.d \ - stattext.d \ - tbargtk.d \ - textctrl.d \ - tglbtn.d \ - timer.d \ - tooltip.d \ - toplevel.d \ - utilsgtk.d \ - utilsres.d \ - wave.d \ - win_gtk.d \ - window.d - GUI_LOWLEVEL_OBJS = \ app.o \ bitmap.o \ @@ -1105,39 +871,6 @@ GUI_LOWLEVEL_OBJS = \ win_gtk.o \ window.o -GUI_LOWLEVEL_DEPS = \ - app.d \ - bitmap.d \ - brush.d \ - choice.d \ - clipbrd.d \ - colour.d \ - combobox.d \ - cursor.d \ - data.d \ - dataobj.d \ - dc.d \ - dcclient.d \ - dcmemory.d \ - dcscreen.d \ - dnd.d \ - evtloop.d \ - font.d \ - gdiobj.d \ - gsockgtk.d \ - icon.d \ - main.d \ - pen.d \ - popupwin.d \ - region.d \ - settings.d \ - timer.d \ - tooltip.d \ - toplevel.d \ - utilsgtk.d \ - win_gtk.d \ - window.d - UNIXOBJS = \ dialup.o \ dir.o \ @@ -1149,17 +882,6 @@ UNIXOBJS = \ threadpsx.o \ utilsunx.o -UNIXDEPS = \ - dialup.d \ - dir.d \ - fontenum.d \ - fontutil.d \ - gsocket.d \ - mimetype.d \ - snglinst.d \ - threadpsx.d \ - utilsunx.d - HTMLOBJS = \ helpctrl.o \ helpdata.o \ @@ -1182,25 +904,3 @@ HTMLOBJS = \ m_tables.o \ winpars.o -HTMLDEPS = \ - helpctrl.d \ - helpdata.d \ - helpfrm.d \ - htmlcell.d \ - htmlfilt.d \ - htmlpars.d \ - htmltag.d \ - htmlwin.d \ - htmprint.d \ - m_dflist.d \ - m_fonts.d \ - m_hline.d \ - m_image.d \ - m_layout.d \ - m_links.d \ - m_list.d \ - m_meta.d \ - m_pre.d \ - m_tables.d \ - winpars.d - diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst index df44067cef..132d0b30d9 100644 --- a/src/gtk1/files.lst +++ b/src/gtk1/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 14:54, 2001/09/26 +# This file was automatically generated by tmake at 16:51, 2001/09/21 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! ALL_SOURCES = \ generic/accel.cpp \ @@ -725,127 +725,6 @@ COMMONOBJS = \ zipstrm.o \ zstream.o -COMMONDEPS = \ - parser.d \ - appcmn.d \ - choiccmn.d \ - clipcmn.d \ - cmdline.d \ - cmdproc.d \ - cmndata.d \ - config.d \ - containr.d \ - cshelp.d \ - ctrlcmn.d \ - ctrlsub.d \ - datetime.d \ - datstrm.d \ - db.d \ - dbgrid.d \ - dbtable.d \ - dcbase.d \ - dircmn.d \ - dlgcmn.d \ - dndcmn.d \ - dobjcmn.d \ - docmdi.d \ - docview.d \ - dynarray.d \ - dynlib.d \ - effects.d \ - encconv.d \ - event.d \ - extended.d \ - fddlgcmn.d \ - ffile.d \ - file.d \ - fileconf.d \ - filefn.d \ - filename.d \ - filesys.d \ - fontcmn.d \ - fontmap.d \ - framecmn.d \ - fs_inet.d \ - fs_mem.d \ - fs_zip.d \ - ftp.d \ - gaugecmn.d \ - gdicmn.d \ - geometry.d \ - gifdecod.d \ - hash.d \ - helpbase.d \ - http.d \ - imagall.d \ - imagbmp.d \ - image.d \ - imaggif.d \ - imagjpeg.d \ - imagpcx.d \ - imagpng.d \ - imagpnm.d \ - imagtiff.d \ - imagxpm.d \ - intl.d \ - ipcbase.d \ - layout.d \ - lboxcmn.d \ - list.d \ - log.d \ - longlong.d \ - matrix.d \ - memory.d \ - menucmn.d \ - mimecmn.d \ - module.d \ - mstream.d \ - nbkbase.d \ - object.d \ - objstrm.d \ - paper.d \ - popupcmn.d \ - prntbase.d \ - process.d \ - protocol.d \ - quantize.d \ - radiocmn.d \ - regex.d \ - resource.d \ - sckaddr.d \ - sckfile.d \ - sckipc.d \ - sckstrm.d \ - serbase.d \ - sizer.d \ - socket.d \ - strconv.d \ - stream.d \ - string.d \ - sysopt.d \ - tbarbase.d \ - textcmn.d \ - textfile.d \ - timercmn.d \ - tokenzr.d \ - toplvcmn.d \ - treebase.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 \ - xpmdecod.d \ - zipstrm.d \ - zstream.d - GENERICOBJS = \ accel.o \ busyinfo.o \ @@ -895,55 +774,6 @@ GENERICOBJS = \ treelay.o \ wizard.o -GENERICDEPS = \ - accel.d \ - busyinfo.d \ - calctrl.d \ - caret.d \ - choicdgg.d \ - colrdlgg.d \ - dcpsg.d \ - dirctrlg.d \ - dirdlgg.d \ - dragimgg.d \ - fdrepdlg.d \ - filedlgg.d \ - fontdlgg.d \ - grid.d \ - gridctrl.d \ - gridsel.d \ - helpext.d \ - helphtml.d \ - helpwxht.d \ - imaglist.d \ - laywin.d \ - listctrl.d \ - logg.d \ - msgdlgg.d \ - numdlgg.d \ - paletteg.d \ - panelg.d \ - printps.d \ - prntdlgg.d \ - progdlgg.d \ - prop.d \ - propform.d \ - proplist.d \ - sashwin.d \ - scrlwing.d \ - spinctlg.d \ - splash.d \ - splitter.d \ - statusbr.d \ - tabg.d \ - tbarsmpl.d \ - textdlgg.d \ - tipdlg.d \ - tipwin.d \ - treectlg.d \ - treelay.d \ - wizard.d - GUIOBJS = \ app.o \ bitmap.o \ @@ -1008,70 +838,6 @@ GUIOBJS = \ win_gtk.o \ window.o -GUIDEPS = \ - 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 \ - evtloop.d \ - font.d \ - fontdlg.d \ - frame.d \ - gauge.d \ - gdiobj.d \ - gsockgtk.d \ - icon.d \ - joystick.d \ - listbox.d \ - main.d \ - mdi.d \ - menu.d \ - minifram.d \ - notebook.d \ - pen.d \ - popupwin.d \ - radiobox.d \ - radiobut.d \ - region.d \ - scrolbar.d \ - scrolwin.d \ - settings.d \ - slider.d \ - spinbutt.d \ - spinctrl.d \ - statbmp.d \ - statbox.d \ - statline.d \ - stattext.d \ - tbargtk.d \ - textctrl.d \ - tglbtn.d \ - timer.d \ - tooltip.d \ - toplevel.d \ - utilsgtk.d \ - utilsres.d \ - wave.d \ - win_gtk.d \ - window.d - GUI_LOWLEVEL_OBJS = \ app.o \ bitmap.o \ @@ -1105,39 +871,6 @@ GUI_LOWLEVEL_OBJS = \ win_gtk.o \ window.o -GUI_LOWLEVEL_DEPS = \ - app.d \ - bitmap.d \ - brush.d \ - choice.d \ - clipbrd.d \ - colour.d \ - combobox.d \ - cursor.d \ - data.d \ - dataobj.d \ - dc.d \ - dcclient.d \ - dcmemory.d \ - dcscreen.d \ - dnd.d \ - evtloop.d \ - font.d \ - gdiobj.d \ - gsockgtk.d \ - icon.d \ - main.d \ - pen.d \ - popupwin.d \ - region.d \ - settings.d \ - timer.d \ - tooltip.d \ - toplevel.d \ - utilsgtk.d \ - win_gtk.d \ - window.d - UNIXOBJS = \ dialup.o \ dir.o \ @@ -1149,17 +882,6 @@ UNIXOBJS = \ threadpsx.o \ utilsunx.o -UNIXDEPS = \ - dialup.d \ - dir.d \ - fontenum.d \ - fontutil.d \ - gsocket.d \ - mimetype.d \ - snglinst.d \ - threadpsx.d \ - utilsunx.d - HTMLOBJS = \ helpctrl.o \ helpdata.o \ @@ -1182,25 +904,3 @@ HTMLOBJS = \ m_tables.o \ winpars.o -HTMLDEPS = \ - helpctrl.d \ - helpdata.d \ - helpfrm.d \ - htmlcell.d \ - htmlfilt.d \ - htmlpars.d \ - htmltag.d \ - htmlwin.d \ - htmprint.d \ - m_dflist.d \ - m_fonts.d \ - m_hline.d \ - m_image.d \ - m_layout.d \ - m_links.d \ - m_list.d \ - m_meta.d \ - m_pre.d \ - m_tables.d \ - winpars.d - diff --git a/src/make.env.in b/src/make.env.in index c835ab3fab..f085a09f1d 100644 --- a/src/make.env.in +++ b/src/make.env.in @@ -1,11 +1,12 @@ # # File: make.env -# Author: Julian Smart, Robert Roebling, Vadim Zeitlin +# Author: Julian Smart, Robert Roebling, Vadim Zeitlin, Ron Lee # Created: 1993 -# Updated: 1999 +# Updated: 2001 # Copyright:(c) 1993, AIAI, University of Edinburgh, # Copyright:(c) 1999, Vadim Zeitlin # Copyright:(c) 1999, Robert Roebling +# Copyright:(c) 2001, Ron Lee # ####################### GENERAL SETTINGS ############################ @@ -29,13 +30,8 @@ WX_RELEASE_NUMBER = @WX_RELEASE_NUMBER@ ########################### Programs ################################# -# C++ compiler -CC = @CXX@ -CCPP = @CXXCPP@ - -# C compiler -CCC = @CC@ -CCCPP = @CPP@ +CXX = @CXX@ +CC = @CC@ # Compiler for lex/yacc .c programs CCLEX = @CC@ @@ -57,15 +53,14 @@ SHARED_LD = @SHARED_LD@ RESFLAGS = @RESFLAGS@ RESCOMP = @RESCOMP@ -REZ = @REZ@ -REZFLAGS = @REZFLAGS@ + DEREZ = @DEREZ@ -DEREZFLAGS = @DEREZFLAGS@ + DLLTOOL = @DLLTOOL@ ########################### Flags ################################# -CPPFLAGS = ${APPEXTRACPPFLAGS} @CPPFLAGS@ @TOOLKIT_DEF@ @WXDEBUG_DEFINE@ +CPPFLAGS = ${APPEXTRACPPFLAGS} @CPPFLAGS@ @TOOLCHAIN_DEFS@ @WXDEBUG_DEFINE@ CFLAGS = ${APPEXTRACFLAGS} ${CPPFLAGS} @CODE_GEN_FLAGS@ @CFLAGS@ CXXFLAGS = ${APPEXTRACXXFLAGS} ${CPPFLAGS} \ @CODE_GEN_FLAGS@ @CODE_GEN_FLAGS_CXX@ @CXXFLAGS@ diff --git a/src/makelib.env.in b/src/makelib.env.in index 9ad3b1c625..f1bd294804 100644 --- a/src/makelib.env.in +++ b/src/makelib.env.in @@ -34,93 +34,88 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -TARGETLIB_STATIC = ${TARGET_LIBNAME}.a -TARGETLIB_SHARED = ${TARGET_LIBNAME}.so.${LIBVERSION_CURRENT}.${LIBVERSION_REVISION}.${LIBVERSION_AGE} -TARGETLIB_LINK1 = ${TARGET_LIBNAME}.so.${LIBVERSION_CURRENT} -TARGETLIB_LINK2 = ${TARGET_LIBNAME}.so +TARGETLIB_STATIC = $(TARGET_LIBNAME).a +TARGETLIB_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE) +TARGETLIB_LINK1 = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT) +TARGETLIB_LINK2 = $(TARGET_LIBNAME).so TARGETLIB_SONAME = @WX_TARGET_LIBRARY_SONAME@ -# Clears all default suffixes -.SUFFIXES: .o .cpp .c .cxx +%.o : %.c + $(CC) -c $(CFLAGS) $(PICFLAGS) -o $@ $< -.c.o : - ${CCC} -c @DEP_INFO_FLAGS@ ${CFLAGS} ${PICFLAGS} -o $@ $< +%.o : %.cpp + $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $< -.cpp.o : - ${CC} -c @DEP_INFO_FLAGS@ ${CXXFLAGS} ${PICFLAGS} -o $@ $< - -.cxx.o : - ${CC} -c @DEP_INFO_FLAGS@ ${CXXFLAGS} ${PICFLAGS} -o $@ $< +%.o : %.cxx + $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $< # the comment at the end of the next line is needed because otherwise autoconf # would remove this line completely - it contains a built-in hack to remove # any VPATH assignment not containing ':' -VPATH = @PATH_IFS@${top_srcdir}/${libsrc_dir} # ':' for autoconf +VPATH = @PATH_IFS@$(top_srcdir)/$(libsrc_dir) # ':' for autoconf -include ${top_builddir}/src/make.env +include $(top_builddir)/src/make.env all: libtype_@WX_TARGET_LIBRARY_TYPE@ -libtype_so: CREATE_LINKS +libtype_so: $(top_builddir)/lib/$(TARGETLIB_SHARED) -libtype_a: ${TARGETLIB_STATIC} +libtype_a: $(top_builddir)/lib/$(TARGETLIB_STATIC) -${TARGETLIB_SHARED}: ${OBJECTS} - @${INSTALL} -d ${top_builddir}/lib - ${SHARED_LD} ${top_builddir}/lib/$@ ${TARGETLIB_SONAME} ${OBJECTS} +$(top_builddir)/lib/$(TARGETLIB_SHARED): $(OBJECTS) + @$(INSTALL) -d $(top_builddir)/lib + $(SHARED_LD) $@ $(TARGETLIB_SONAME) $(OBJECTS) + cd $(top_builddir)/lib \ + && $(RM) $(TARGETLIB_LINK1) $(TARGETLIB_LINK2) \ + && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \ + && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2) -CREATE_LINKS: ${TARGETLIB_SHARED} - cd ${top_builddir}/lib \ - && ${RM} ${TARGETLIB_LINK1} ${TARGETLIB_LINK2} \ - && ${LN_S} ${TARGETLIB_SHARED} ${TARGETLIB_LINK1} \ - && ${LN_S} ${TARGETLIB_SHARED} ${TARGETLIB_LINK2} - -${TARGETLIB_STATIC}: ${OBJECTS} - @${INSTALL} -d ${top_builddir}/lib - ar ${AROPTIONS} ${top_builddir}/lib/$@ ${OBJECTS} - ${RANLIB} ${top_builddir}/lib/$@ +$(top_builddir)/lib/$(TARGETLIB_STATIC): $(OBJECTS) + @$(INSTALL) -d $(top_builddir)/lib + ar $(AROPTIONS) $@ $(OBJECTS) + $(RANLIB) $@ install: install_@WX_TARGET_LIBRARY_TYPE@ install_headers install_so: - ${INSTALL_PROGRAM} ${top_builddir}/lib/${TARGETLIB_SHARED} ${libdir}/${TARGETLIB_SHARED} - @${RM} ${libdir}/${TARGETLIB_LINK1} ${libdir}/${TARGETLIB_LINK2} - cd ${libdir} \ - && ${LN_S} ${TARGETLIB_SHARED} ${TARGETLIB_LINK1} \ - && ${LN_S} ${TARGETLIB_SHARED} ${TARGETLIB_LINK2} + $(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_SHARED) $(libdir)/$(TARGETLIB_SHARED) + @$(RM) $(libdir)/$(TARGETLIB_LINK1) $(libdir)/$(TARGETLIB_LINK2) + cd $(libdir) \ + && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \ + && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2) install_a: - ${INSTALL_PROGRAM} ${top_builddir}/lib/${TARGETLIB_STATIC} ${libdir}/${TARGETLIB_STATIC} + $(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_STATIC) $(libdir)/$(TARGETLIB_STATIC) install_headers: - ${INSTALL} -d ${includedir}/wx/${HEADER_SUBDIR} - @for h in ${HEADERS}; do \ - ${INSTALL_DATA} ${HEADER_PATH}/${HEADER_SUBDIR}/$$h ${includedir}/wx/${HEADER_SUBDIR}/$$h; \ - echo "installing ${includedir}/wx/${HEADER_SUBDIR}/$$h"; \ + $(INSTALL) -d $(includedir)/wx/$(HEADER_SUBDIR) + @for h in $(HEADERS); do \ + $(INSTALL_DATA) $(HEADER_PATH)/$(HEADER_SUBDIR)/$$h $(includedir)/wx/$(HEADER_SUBDIR)/$$h; \ + echo "installing $(includedir)/wx/$(HEADER_SUBDIR)/$$h"; \ done uninstall: - ${RM} ${libdir}/${TARGETLIB_STATIC} - ${RM} ${libdir}/${TARGETLIB_SHARED} - ${RM} ${libdir}/${TARGETLIB_LINK1} - ${RM} ${libdir}/${TARGETLIB_LINK2} + $(RM) $(libdir)/$(TARGETLIB_STATIC) + $(RM) $(libdir)/$(TARGETLIB_SHARED) + $(RM) $(libdir)/$(TARGETLIB_LINK1) + $(RM) $(libdir)/$(TARGETLIB_LINK2) @echo "removing headers" - @for h in ${HEADERS}; do \ - ${RM} ${includedir}/wx/${HEADER_SUBDIR}/$$h; \ + @for h in $(HEADERS); do \ + $(RM) $(includedir)/wx/$(HEADER_SUBDIR)/$$h; \ done - @if test -d ${includedir}/wx/${HEADER_SUBDIR}; then \ - rmdir ${includedir}/wx/${HEADER_SUBDIR}; \ + @if test -d $(includedir)/wx/$(HEADER_SUBDIR); then \ + rmdir $(includedir)/wx/$(HEADER_SUBDIR); \ fi - @-rmdir ${includedir}/wx + @-rmdir $(includedir)/wx clean: - ${RM} ${OBJECTS} ${top_builddir}/lib/${TARGETLIB_SHARED} \ - ${top_builddir}/lib/${TARGETLIB_LINK1} \ - ${top_builddir}/lib/${TARGETLIB_LINK2} \ - ${top_builddir}/lib/${TARGETLIB_STATIC} core + $(RM) $(OBJECTS) $(top_builddir)/lib/$(TARGETLIB_SHARED) \ + $(top_builddir)/lib/$(TARGETLIB_LINK1) \ + $(top_builddir)/lib/$(TARGETLIB_LINK2) \ + $(top_builddir)/lib/$(TARGETLIB_STATIC) core -.PHONY: all shared static clean install install_static install_shared uninstall +.PHONY: all libtype_so libtype_a install install_so install_a install_headers uninstall clean diff --git a/src/makeprog.env.in b/src/makeprog.env.in index 3e33e6a51d..9c0150e4c6 100644 --- a/src/makeprog.env.in +++ b/src/makeprog.env.in @@ -1,55 +1,50 @@ # Make environment for making samples on Unix -# Clears all default suffixes -.SUFFIXES: .o .cpp .c .cxx - -# The binary program extension, if any, including dots {e.g. '.exe'} +# The binary program extension, if any, including dots (e.g. '.exe') PROGRAM_EXT = @PROGRAM_EXT@ -BIN_PROGRAM = ${PROGRAM}${PROGRAM_EXT} -RES_PROGRAM = ${PROGRAM}_resources.o -RES_PROGRAM_OPT = @RESPROGRAM@ +BIN_PROGRAM = $(PROGRAM)$(PROGRAM_EXT) +RES_PROGRAM_OBJ = @RESPROGRAMOBJ@ -# To add resources to the Mac OS X applications -LIBWX_MACRES = ${top_builddir}/lib/lib@WX_LIBRARY@-${WX_MAJOR_VERSION_NUMBER}.${WX_MINOR_VERSION_NUMBER}.r -LIBWX_MACRESCOMP = ${RESCOMP} ${RESFLAGS} ${LIBWX_MACRES} -o ${BIN_PROGRAM} +%.o : %.c + $(CC) -c $(CFLAGS) $(APPEXTRADEFS) -o $@ $< -.c.o : - ${CCC} -c @DEP_INFO_FLAGS@ ${CFLAGS} ${APPEXTRADEFS} -o $@ $< +%.o : %.cpp + $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< -.cpp.o : - ${CC} -c @DEP_INFO_FLAGS@ ${CXXFLAGS} ${APPEXTRADEFS} -o $@ $< +%.o : %.cxx + $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< + +%_resources.o : %.rc + $(RESCOMP) -i $< -o $@ $(RESFLAGS) -.cxx.o : - ${CC} -c @DEP_INFO_FLAGS@ ${CXXFLAGS} ${APPEXTRADEFS} -o $@ $< # the comment at the end of the next line is needed because otherwise autoconf # would remove this line completely - it contains a built-in hack to remove # any VPATH assignment not containing ':' -VPATH = @PATH_IFS@${top_srcdir}/${program_dir} # ':' for autoconf +VPATH = @PATH_IFS@$(top_srcdir)/$(program_dir) # ':' for autoconf # Set defaults from configure -include ${top_builddir}/src/make.env +include $(top_builddir)/src/make.env -all: ${BIN_PROGRAM} install_dirs install_data +all: $(BIN_PROGRAM) install_dirs install_data -${BIN_PROGRAM}: ${OBJECTS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${RES_PROGRAM_OPT} @LIBWXMACRES@ - ${CC} ${LDFLAGS} -o ${BIN_PROGRAM} ${OBJECTS} ${LDLIBS} ${LIBRARIES} ${RES_PROGRAM_OPT} +$(BIN_PROGRAM): $(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(RES_PROGRAM_OBJ) @LIBWXMACRES@ + $(CXX) $(LDFLAGS) -o $(BIN_PROGRAM) $(OBJECTS) $(LDLIBS) $(LIBRARIES) $(RES_PROGRAM_OBJ) @LIBWXMACRESCOMP@ -${RES_PROGRAM}: ${PROGRAM}.rc - ${RESCOMP} ${RCINPUTSWITCH} ${top_srcdir}/${program_dir}/${PROGRAM}.rc ${RCOUTPUTSWITCH} ${PROGRAM}_resources.o ${RESFLAGS} install_dirs: - @list='${DATADIRS}'; for p in $$list; do \ - mkdir -p ${top_builddir}/${program_dir}/$$p; \ + @list='$(DATADIRS)'; for p in $$list; do \ + mkdir -p $(top_builddir)/$(program_dir)/$$p; \ done install_data: - @list='${DATAFILES}'; for p in $$list; do \ - if test ! -s ${top_builddir}/${program_dir}/$$p; then \ - cp -pRf ${top_srcdir}/${program_dir}/$$p ${top_builddir}/${program_dir}/$$p; \ + @list='$(DATAFILES)'; for p in $$list; do \ + if test ! -s $(top_builddir)/$(program_dir)/$$p; then \ + cp -pRf $(top_srcdir)/$(program_dir)/$$p $(top_builddir)/$(program_dir)/$$p; \ fi; \ done clean: - rm -f ${OBJECTS} ${BIN_PROGRAM} ${RES_PROGRAM} core + rm -f $(OBJECTS) $(BIN_PROGRAM) $(RES_PROGRAM_OBJ) core + diff --git a/src/mgl/files.lst b/src/mgl/files.lst index a941b47f77..80974c2970 100644 --- a/src/mgl/files.lst +++ b/src/mgl/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 00:50, 2001/09/19 +# This file was automatically generated by tmake at 16:53, 2001/09/21 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! ALL_SOURCES = \ generic/accel.cpp \ @@ -688,128 +688,6 @@ COMMONOBJS = \ zipstrm.o \ zstream.o -COMMONDEPS = \ - parser.d \ - appcmn.d \ - choiccmn.d \ - clipcmn.d \ - cmdline.d \ - cmdproc.d \ - cmndata.d \ - config.d \ - containr.d \ - cshelp.d \ - ctrlcmn.d \ - ctrlsub.d \ - datetime.d \ - datstrm.d \ - db.d \ - dbgrid.d \ - dbtable.d \ - dcbase.d \ - dircmn.d \ - dlgcmn.d \ - dndcmn.d \ - dobjcmn.d \ - docmdi.d \ - docview.d \ - dynarray.d \ - dynlib.d \ - effects.d \ - encconv.d \ - event.d \ - extended.d \ - fddlgcmn.d \ - ffile.d \ - file.d \ - fileconf.d \ - filefn.d \ - filename.d \ - filesys.d \ - fontcmn.d \ - fontmap.d \ - framecmn.d \ - fs_inet.d \ - fs_mem.d \ - fs_zip.d \ - ftp.d \ - gaugecmn.d \ - gdicmn.d \ - geometry.d \ - gifdecod.d \ - hash.d \ - helpbase.d \ - http.d \ - imagall.d \ - imagbmp.d \ - image.d \ - imaggif.d \ - imagjpeg.d \ - imagpcx.d \ - imagpng.d \ - imagpnm.d \ - imagtiff.d \ - imagxpm.d \ - intl.d \ - ipcbase.d \ - layout.d \ - lboxcmn.d \ - list.d \ - log.d \ - longlong.d \ - matrix.d \ - memory.d \ - menucmn.d \ - mimecmn.d \ - module.d \ - mstream.d \ - nbkbase.d \ - object.d \ - objstrm.d \ - odbc.d \ - paper.d \ - popupcmn.d \ - prntbase.d \ - process.d \ - protocol.d \ - quantize.d \ - radiocmn.d \ - regex.d \ - resource.d \ - sckaddr.d \ - sckfile.d \ - sckipc.d \ - sckstrm.d \ - serbase.d \ - sizer.d \ - socket.d \ - strconv.d \ - stream.d \ - string.d \ - sysopt.d \ - tbarbase.d \ - textcmn.d \ - textfile.d \ - timercmn.d \ - tokenzr.d \ - toplvcmn.d \ - treebase.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 \ - xpmdecod.d \ - zipstrm.d \ - zstream.d - GENERICOBJS = \ accel.o \ busyinfo.o \ @@ -858,55 +736,6 @@ GENERICOBJS = \ treelay.o \ wizard.o -GENERICDEPS = \ - accel.d \ - busyinfo.d \ - calctrl.d \ - caret.d \ - choicdgg.d \ - colrdlgg.d \ - dcpsg.d \ - dirctrlg.d \ - dirdlgg.d \ - dragimgg.d \ - fdrepdlg.d \ - filedlgg.d \ - fontdlgg.d \ - grid.d \ - gridctrl.d \ - gridsel.d \ - helpext.d \ - helphtml.d \ - helpwxht.d \ - imaglist.d \ - laywin.d \ - listctrl.d \ - logg.d \ - msgdlgg.d \ - numdlgg.d \ - panelg.d \ - printps.d \ - prntdlgg.d \ - progdlgg.d \ - prop.d \ - propform.d \ - proplist.d \ - sashwin.d \ - scrlwing.d \ - spinctlg.d \ - splash.d \ - splitter.d \ - statusbr.d \ - tabg.d \ - tbarsmpl.d \ - textdlgg.d \ - tipdlg.d \ - tipwin.d \ - treectlg.d \ - treelay.d \ - wizard.d - - GUI_LOWLEVEL_OBJS = \ app.o \ bitmap.o \ @@ -933,32 +762,6 @@ GUI_LOWLEVEL_OBJS = \ utils.o \ window.o -GUI_LOWLEVEL_DEPS = \ - app.d \ - bitmap.d \ - bmpbase.d \ - brush.d \ - clipbrd.d \ - colour.d \ - cursor.d \ - data.d \ - dc.d \ - dcclient.d \ - dcmemory.d \ - dcscreen.d \ - evtloop.d \ - font.d \ - gdiobj.d \ - icon.d \ - palette.d \ - pen.d \ - region.d \ - settings.d \ - timer.d \ - toplevel.d \ - utils.d \ - window.d - UNIXOBJS = \ dialup.o \ dir.o \ @@ -970,17 +773,6 @@ UNIXOBJS = \ threadpsx.o \ utilsunx.o -UNIXDEPS = \ - dialup.d \ - dir.d \ - fontenum.d \ - fontutil.d \ - gsocket.d \ - mimetype.d \ - snglinst.d \ - threadpsx.d \ - utilsunx.d - HTMLOBJS = \ helpctrl.o \ helpdata.o \ @@ -1003,25 +795,3 @@ HTMLOBJS = \ m_tables.o \ winpars.o -HTMLDEPS = \ - helpctrl.d \ - helpdata.d \ - helpfrm.d \ - htmlcell.d \ - htmlfilt.d \ - htmlpars.d \ - htmltag.d \ - htmlwin.d \ - htmprint.d \ - m_dflist.d \ - m_fonts.d \ - m_hline.d \ - m_image.d \ - m_layout.d \ - m_links.d \ - m_list.d \ - m_meta.d \ - m_pre.d \ - m_tables.d \ - winpars.d - diff --git a/src/motif/files.lst b/src/motif/files.lst index 1e88714bfa..852bdb32ee 100644 --- a/src/motif/files.lst +++ b/src/motif/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 14:54, 2001/09/26 +# This file was automatically generated by tmake at 16:55, 2001/09/21 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T! ALL_SOURCES = \ generic/busyinfo.cpp \ @@ -712,127 +712,6 @@ COMMONOBJS = \ zipstrm.o \ zstream.o -COMMONDEPS = \ - parser.d \ - appcmn.d \ - choiccmn.d \ - clipcmn.d \ - cmdline.d \ - cmdproc.d \ - cmndata.d \ - config.d \ - containr.d \ - cshelp.d \ - ctrlcmn.d \ - ctrlsub.d \ - datetime.d \ - datstrm.d \ - db.d \ - dbgrid.d \ - dbtable.d \ - dcbase.d \ - dircmn.d \ - dlgcmn.d \ - dndcmn.d \ - dobjcmn.d \ - docmdi.d \ - docview.d \ - dynarray.d \ - dynlib.d \ - effects.d \ - encconv.d \ - event.d \ - extended.d \ - fddlgcmn.d \ - ffile.d \ - file.d \ - fileconf.d \ - filefn.d \ - filename.d \ - filesys.d \ - fontcmn.d \ - fontmap.d \ - framecmn.d \ - fs_inet.d \ - fs_mem.d \ - fs_zip.d \ - ftp.d \ - gaugecmn.d \ - gdicmn.d \ - geometry.d \ - gifdecod.d \ - hash.d \ - helpbase.d \ - http.d \ - imagall.d \ - imagbmp.d \ - image.d \ - imaggif.d \ - imagjpeg.d \ - imagpcx.d \ - imagpng.d \ - imagpnm.d \ - imagtiff.d \ - imagxpm.d \ - intl.d \ - ipcbase.d \ - layout.d \ - lboxcmn.d \ - list.d \ - log.d \ - longlong.d \ - matrix.d \ - memory.d \ - menucmn.d \ - mimecmn.d \ - module.d \ - mstream.d \ - nbkbase.d \ - object.d \ - objstrm.d \ - paper.d \ - popupcmn.d \ - prntbase.d \ - process.d \ - protocol.d \ - quantize.d \ - radiocmn.d \ - regex.d \ - resource.d \ - sckaddr.d \ - sckfile.d \ - sckipc.d \ - sckstrm.d \ - serbase.d \ - sizer.d \ - socket.d \ - strconv.d \ - stream.d \ - string.d \ - sysopt.d \ - tbarbase.d \ - textcmn.d \ - textfile.d \ - timercmn.d \ - tokenzr.d \ - toplvcmn.d \ - treebase.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 \ - xpmdecod.d \ - zipstrm.d \ - zstream.d - GENERICOBJS = \ busyinfo.o \ calctrl.o \ @@ -881,54 +760,6 @@ GENERICOBJS = \ treelay.o \ wizard.o -GENERICDEPS = \ - busyinfo.d \ - calctrl.d \ - caret.d \ - choicdgg.d \ - colrdlgg.d \ - dcpsg.d \ - dirctrlg.d \ - dirdlgg.d \ - dragimgg.d \ - fdrepdlg.d \ - fontdlgg.d \ - grid.d \ - gridctrl.d \ - gridsel.d \ - helpext.d \ - helphtml.d \ - helpwxht.d \ - imaglist.d \ - laywin.d \ - listctrl.d \ - logg.d \ - msgdlgg.d \ - notebook.d \ - numdlgg.d \ - panelg.d \ - printps.d \ - prntdlgg.d \ - progdlgg.d \ - prop.d \ - propform.d \ - proplist.d \ - sashwin.d \ - scrlwing.d \ - spinctlg.d \ - splash.d \ - splitter.d \ - statline.d \ - statusbr.d \ - tabg.d \ - tbarsmpl.d \ - textdlgg.d \ - tipdlg.d \ - tipwin.d \ - treectlg.d \ - treelay.d \ - wizard.d - GUIOBJS = \ xmcombo.o \ accel.o \ @@ -985,61 +816,6 @@ GUIOBJS = \ utils.o \ window.o -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 \ - filedlg.d \ - font.d \ - frame.d \ - gauge.d \ - gdiobj.d \ - glcanvas.d \ - gsockmot.d \ - icon.d \ - listbox.d \ - main.d \ - mdi.d \ - menu.d \ - menuitem.d \ - minifram.d \ - msgdlg.d \ - palette.d \ - pen.d \ - radiobox.d \ - radiobut.d \ - region.d \ - scrolbar.d \ - settings.d \ - slider.d \ - spinbutt.d \ - statbmp.d \ - statbox.d \ - stattext.d \ - textctrl.d \ - timer.d \ - toolbar.d \ - utils.d \ - window.d - UNIXOBJS = \ dialup.o \ dir.o \ @@ -1051,17 +827,6 @@ UNIXOBJS = \ threadpsx.o \ utilsunx.o -UNIXDEPS = \ - dialup.d \ - dir.d \ - fontenum.d \ - fontutil.d \ - gsocket.d \ - mimetype.d \ - snglinst.d \ - threadpsx.d \ - utilsunx.d - HTMLOBJS = \ helpctrl.o \ helpdata.o \ @@ -1084,24 +849,3 @@ HTMLOBJS = \ m_tables.o \ winpars.o -HTMLDEPS = \ - helpctrl.d \ - helpdata.d \ - helpfrm.d \ - htmlcell.d \ - htmlfilt.d \ - htmlpars.d \ - htmltag.d \ - htmlwin.d \ - htmprint.d \ - m_dflist.d \ - m_fonts.d \ - m_hline.d \ - m_image.d \ - m_layout.d \ - m_links.d \ - m_list.d \ - m_meta.d \ - m_pre.d \ - m_tables.d \ - winpars.d diff --git a/src/msw/files.lst b/src/msw/files.lst index e70619ee1e..dd1f1bb9ec 100644 --- a/src/msw/files.lst +++ b/src/msw/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 14:54, 2001/09/26 +# This file was automatically generated by tmake at 04:14, 2001/09/27 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MSW.T! ALL_SOURCES = \ generic/busyinfo.cpp \ @@ -772,127 +772,6 @@ COMMONOBJS = \ zipstrm.o \ zstream.o -COMMONDEPS = \ - parser.d \ - appcmn.d \ - choiccmn.d \ - clipcmn.d \ - cmdline.d \ - cmdproc.d \ - cmndata.d \ - config.d \ - containr.d \ - cshelp.d \ - ctrlcmn.d \ - ctrlsub.d \ - datetime.d \ - datstrm.d \ - db.d \ - dbgrid.d \ - dbtable.d \ - dcbase.d \ - dircmn.d \ - dlgcmn.d \ - dndcmn.d \ - dobjcmn.d \ - docmdi.d \ - docview.d \ - dynarray.d \ - dynlib.d \ - effects.d \ - encconv.d \ - event.d \ - extended.d \ - fddlgcmn.d \ - ffile.d \ - file.d \ - fileconf.d \ - filefn.d \ - filename.d \ - filesys.d \ - fontcmn.d \ - fontmap.d \ - framecmn.d \ - fs_inet.d \ - fs_mem.d \ - fs_zip.d \ - ftp.d \ - gaugecmn.d \ - gdicmn.d \ - geometry.d \ - gifdecod.d \ - hash.d \ - helpbase.d \ - http.d \ - imagall.d \ - imagbmp.d \ - image.d \ - imaggif.d \ - imagjpeg.d \ - imagpcx.d \ - imagpng.d \ - imagpnm.d \ - imagtiff.d \ - imagxpm.d \ - intl.d \ - ipcbase.d \ - layout.d \ - lboxcmn.d \ - list.d \ - log.d \ - longlong.d \ - matrix.d \ - memory.d \ - menucmn.d \ - mimecmn.d \ - module.d \ - mstream.d \ - nbkbase.d \ - object.d \ - objstrm.d \ - paper.d \ - popupcmn.d \ - prntbase.d \ - process.d \ - protocol.d \ - quantize.d \ - radiocmn.d \ - regex.d \ - resource.d \ - sckaddr.d \ - sckfile.d \ - sckipc.d \ - sckstrm.d \ - serbase.d \ - sizer.d \ - socket.d \ - strconv.d \ - stream.d \ - string.d \ - sysopt.d \ - tbarbase.d \ - textcmn.d \ - textfile.d \ - timercmn.d \ - tokenzr.d \ - toplvcmn.d \ - treebase.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 \ - xpmdecod.d \ - zipstrm.d \ - zstream.d - GENERICOBJS = \ busyinfo.o \ calctrl.o \ @@ -924,37 +803,6 @@ GENERICOBJS = \ treelay.o \ wizard.o -GENERICDEPS = \ - busyinfo.d \ - calctrl.d \ - choicdgg.d \ - dirctrlg.d \ - dragimgg.d \ - grid.d \ - gridctrl.d \ - gridsel.d \ - laywin.d \ - logg.d \ - numdlgg.d \ - panelg.d \ - progdlgg.d \ - prop.d \ - propform.d \ - proplist.d \ - sashwin.d \ - scrlwing.d \ - spinctlg.d \ - splash.d \ - splitter.d \ - statusbr.d \ - tbarsmpl.d \ - textdlgg.d \ - tipdlg.d \ - tipwin.d \ - treectlg.d \ - treelay.d \ - wizard.d - GUIOBJS = \ accel.o \ app.o \ @@ -1057,112 +905,6 @@ GUIOBJS = \ wave.o \ window.o -GUIDEPS = \ - accel.d \ - app.d \ - bitmap.d \ - bmpbuttn.d \ - brush.d \ - button.d \ - caret.d \ - checkbox.d \ - checklst.d \ - choice.d \ - clipbrd.d \ - colordlg.d \ - colour.d \ - combobox.d \ - control.d \ - curico.d \ - cursor.d \ - data.d \ - dc.d \ - dcclient.d \ - dcmemory.d \ - dcprint.d \ - dcscreen.d \ - dde.d \ - dialog.d \ - dialup.d \ - dib.d \ - dibutils.d \ - dir.d \ - dirdlg.d \ - dragimag.d \ - enhmeta.d \ - evtloop.d \ - fdrepdlg.d \ - filedlg.d \ - font.d \ - fontdlg.d \ - fontenum.d \ - fontutil.d \ - frame.d \ - gauge95.d \ - gdiimage.d \ - gdiobj.d \ - glcanvas.d \ - gsocket.d \ - gsockmsw.d \ - helpbest.d \ - helpchm.d \ - helpwin.d \ - icon.d \ - imaglist.d \ - joystick.d \ - listbox.d \ - listctrl.d \ - main.d \ - mdi.d \ - menu.d \ - menuitem.d \ - metafile.d \ - mimetype.d \ - minifram.d \ - msgdlg.d \ - nativdlg.d \ - notebook.d \ - ownerdrw.d \ - palette.d \ - pen.d \ - penwin.d \ - printdlg.d \ - printwin.d \ - radiobox.d \ - radiobut.d \ - regconf.d \ - region.d \ - registry.d \ - scrolbar.d \ - settings.d \ - slider95.d \ - snglinst.d \ - spinbutt.d \ - spinctrl.d \ - statbmp.d \ - statbox.d \ - statbr95.d \ - statline.d \ - stattext.d \ - tabctrl.d \ - taskbar.d \ - tbar95.d \ - textctrl.d \ - tglbtn.d \ - thread.d \ - timer.d \ - tooltip.d \ - toplevel.d \ - treectrl.d \ - utils.d \ - utilsexc.d \ - wave.d \ - window.d - -UNIXOBJS = \ - -UNIXDEPS = \ - HTMLOBJS = \ helpctrl.o \ helpdata.o \ @@ -1185,28 +927,6 @@ HTMLOBJS = \ m_tables.o \ winpars.o -HTMLDEPS = \ - helpctrl.d \ - helpdata.d \ - helpfrm.d \ - htmlcell.d \ - htmlfilt.d \ - htmlpars.d \ - htmltag.d \ - htmlwin.d \ - htmprint.d \ - m_dflist.d \ - m_fonts.d \ - m_hline.d \ - m_image.d \ - m_layout.d \ - m_links.d \ - m_list.d \ - m_meta.d \ - m_pre.d \ - m_tables.d \ - winpars.d - OLEOBJS = \ automtn.o \ dataobj.o \ @@ -1215,14 +935,3 @@ OLEOBJS = \ oleutils.o \ uuid.o -OLEDEPS = \ - automtn.d \ - dataobj.d \ - dropsrc.d \ - droptgt.d \ - oleutils.d \ - uuid.d - -IODBCOBJS = \ - -IODBCDEPS = \ diff --git a/src/msw/gsocket.c b/src/msw/gsocket.c index a6e021bc68..55b8679987 100644 --- a/src/msw/gsocket.c +++ b/src/msw/gsocket.c @@ -1378,6 +1378,6 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf) * Translation unit shouldn't be empty, so include this typedef to make the * compiler (VC++ 6.0, for example) happy */ -typedef (*wxDummy)(); +typedef void (*wxDummy)(); #endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */ diff --git a/src/msw/gsockmsw.c b/src/msw/gsockmsw.c index 60d54c682c..e268519721 100644 --- a/src/msw/gsockmsw.c +++ b/src/msw/gsockmsw.c @@ -283,6 +283,6 @@ void _GSocket_Disable_Events(GSocket *socket) * Translation unit shouldn't be empty, so include this typedef to make the * compiler (VC++ 6.0, for example) happy */ -typedef (*wxDummy)(); +typedef void (*wxDummy)(); #endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */ diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index 4af6483229..7b2c2b569c 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -29,6 +29,8 @@ #endif #ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/toplevel.h" #include "wx/string.h" #include "wx/log.h" #include "wx/intl.h" diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index d8397b413f..d34d0ede3e 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -31,9 +31,11 @@ #ifndef WX_PRECOMP #include "wx/utils.h" #include "wx/app.h" - #include "wx/cursor.h" #include "wx/intl.h" #include "wx/log.h" +#if wxUSE_GUI + #include "wx/cursor.h" +#endif #endif //WX_PRECOMP // In some mingws there is a missing extern "C" int the winsock header, diff --git a/src/os2/files.lst b/src/os2/files.lst index 254b717c60..4c5962cecd 100644 --- a/src/os2/files.lst +++ b/src/os2/files.lst @@ -1,4 +1,4 @@ -# This file was automatically generated by tmake at 14:54, 2001/09/26 +# This file was automatically generated by tmake at 16:58, 2001/09/21 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE OS2.T! ALL_SOURCES = \ generic/busyinfo.cpp \ @@ -730,127 +730,6 @@ COMMONOBJS = \ zipstrm.o \ zstream.o -COMMONDEPS = \ - parser.d \ - appcmn.d \ - choiccmn.d \ - clipcmn.d \ - cmdline.d \ - cmdproc.d \ - cmndata.d \ - config.d \ - containr.d \ - cshelp.d \ - ctrlcmn.d \ - ctrlsub.d \ - datetime.d \ - datstrm.d \ - db.d \ - dbgrid.d \ - dbtable.d \ - dcbase.d \ - dircmn.d \ - dlgcmn.d \ - dndcmn.d \ - dobjcmn.d \ - docmdi.d \ - docview.d \ - dynarray.d \ - dynlib.d \ - effects.d \ - encconv.d \ - event.d \ - extended.d \ - fddlgcmn.d \ - ffile.d \ - file.d \ - fileconf.d \ - filefn.d \ - filename.d \ - filesys.d \ - fontcmn.d \ - fontmap.d \ - framecmn.d \ - fs_inet.d \ - fs_mem.d \ - fs_zip.d \ - ftp.d \ - gaugecmn.d \ - gdicmn.d \ - geometry.d \ - gifdecod.d \ - hash.d \ - helpbase.d \ - http.d \ - imagall.d \ - imagbmp.d \ - image.d \ - imaggif.d \ - imagjpeg.d \ - imagpcx.d \ - imagpng.d \ - imagpnm.d \ - imagtiff.d \ - imagxpm.d \ - intl.d \ - ipcbase.d \ - layout.d \ - lboxcmn.d \ - list.d \ - log.d \ - longlong.d \ - matrix.d \ - memory.d \ - menucmn.d \ - mimecmn.d \ - module.d \ - mstream.d \ - nbkbase.d \ - object.d \ - objstrm.d \ - paper.d \ - popupcmn.d \ - prntbase.d \ - process.d \ - protocol.d \ - quantize.d \ - radiocmn.d \ - regex.d \ - resource.d \ - sckaddr.d \ - sckfile.d \ - sckipc.d \ - sckstrm.d \ - serbase.d \ - sizer.d \ - socket.d \ - strconv.d \ - stream.d \ - string.d \ - sysopt.d \ - tbarbase.d \ - textcmn.d \ - textfile.d \ - timercmn.d \ - tokenzr.d \ - toplvcmn.d \ - treebase.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 \ - xpmdecod.d \ - zipstrm.d \ - zstream.d - GENERICOBJS = \ busyinfo.o \ calctrl.o \ @@ -893,48 +772,6 @@ GENERICOBJS = \ treelay.o \ wizard.o -GENERICDEPS = \ - busyinfo.d \ - calctrl.d \ - caret.d \ - choicdgg.d \ - colrdlgg.d \ - dcpsg.d \ - dirctrlg.d \ - fdrepdlg.d \ - grid.d \ - gridctrl.d \ - gridsel.d \ - helpext.d \ - helphtml.d \ - helpwxht.d \ - imaglist.d \ - laywin.d \ - listctrl.d \ - logg.d \ - msgdlgg.d \ - numdlgg.d \ - panelg.d \ - printps.d \ - prntdlgg.d \ - progdlgg.d \ - prop.d \ - propform.d \ - proplist.d \ - sashwin.d \ - scrlwing.d \ - spinctlg.d \ - splash.d \ - splitter.d \ - statusbr.d \ - tbarsmpl.d \ - textdlgg.d \ - tipdlg.d \ - tipwin.d \ - treectlg.d \ - treelay.d \ - wizard.d - GUIOBJS = \ accel.o \ app.o \ @@ -1015,90 +852,8 @@ GUIOBJS = \ wave.o \ window.o -GUIDEPS = \ - accel.d \ - app.d \ - bitmap.d \ - bmpbuttn.d \ - brush.d \ - button.d \ - checkbox.d \ - checklst.d \ - choice.d \ - clipbrd.d \ - colour.d \ - combobox.d \ - control.d \ - cursor.d \ - data.d \ - dataobj.d \ - dc.d \ - dcclient.d \ - dcmemory.d \ - dcprint.d \ - dcscreen.d \ - dialog.d \ - dir.d \ - dirdlg.d \ - dnd.d \ - filedlg.d \ - font.d \ - fontdlg.d \ - fontenum.d \ - fontutil.d \ - frame.d \ - gauge.d \ - gdiimage.d \ - gdiobj.d \ - gsocket.d \ - gsockpm.d \ - helpwin.d \ - icon.d \ - iniconf.d \ - joystick.d \ - listbox.d \ - main.d \ - mdi.d \ - menu.d \ - menuitem.d \ - metafile.d \ - mimetype.d \ - minifram.d \ - msgdlg.d \ - nativdlg.d \ - notebook.d \ - ownerdrw.d \ - palette.d \ - pen.d \ - print.d \ - radiobox.d \ - radiobut.d \ - region.d \ - scrolbar.d \ - settings.d \ - slider.d \ - spinbutt.d \ - spinctrl.d \ - statbmp.d \ - statbox.d \ - statline.d \ - stattext.d \ - tabctrl.d \ - taskbar.d \ - textctrl.d \ - thread.d \ - timer.d \ - toolbar.d \ - tooltip.d \ - utils.d \ - utilsexc.d \ - wave.d \ - window.d - UNIXOBJS = \ -UNIXDEPS = \ - HTMLOBJS = \ helpctrl.o \ helpdata.o \ @@ -1121,25 +876,3 @@ HTMLOBJS = \ m_tables.o \ winpars.o -HTMLDEPS = \ - helpctrl.d \ - helpdata.d \ - helpfrm.d \ - htmlcell.d \ - htmlfilt.d \ - htmlpars.d \ - htmltag.d \ - htmlwin.d \ - htmprint.d \ - m_dflist.d \ - m_fonts.d \ - m_hline.d \ - m_image.d \ - m_layout.d \ - m_links.d \ - m_list.d \ - m_meta.d \ - m_pre.d \ - m_tables.d \ - winpars.d - diff --git a/src/univ/files.lst b/src/univ/files.lst index d1686117f9..3610900231 100644 --- a/src/univ/files.lst +++ b/src/univ/files.lst @@ -1,5 +1,5 @@ -# This file was automatically generated by tmake at 14:54, 2001/09/26 -# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T! +# This file was automatically generated by tmake at 11:01, 2001/09/25 +# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNIV.T! UNIVOBJS = \ bmpbuttn.o \ button.o \ @@ -34,37 +34,3 @@ UNIVOBJS = \ win32.o \ winuniv.o -UNIVDEPS = \ - bmpbuttn.d \ - button.d \ - checkbox.d \ - checklst.d \ - colschem.d \ - control.d \ - dialog.d \ - framuniv.d \ - gauge.d \ - gtk.d \ - inpcons.d \ - inphand.d \ - listbox.d \ - menu.d \ - notebook.d \ - radiobox.d \ - radiobut.d \ - renderer.d \ - scrarrow.d \ - scrolbar.d \ - scrthumb.d \ - slider.d \ - spinbutt.d \ - statbmp.d \ - statbox.d \ - statline.d \ - stattext.d \ - textctrl.d \ - theme.d \ - topluniv.d \ - win32.d \ - winuniv.d - diff --git a/wx-config.in b/wx-config.in index 478a243796..7c9760b903 100755 --- a/wx-config.in +++ b/wx-config.in @@ -6,12 +6,13 @@ exec_prefix_set=no CC="@CC@" CXX="@CXX@" LD="@SHARED_LD@" +cross_compiling=@cross_compiling@ usage() { cat <&2 + usage 1 1>&2 fi while test $# -gt 0; do @@ -75,10 +77,15 @@ while test $# -gt 0; do echo `cppflags` @CODE_GEN_FLAGS@ @CODE_GEN_FLAGS_CXX@ ;; --libs) - if test @libdir@ != /usr/lib ; then - libs="-L@libdir@" + if test "${cross_compiling}" != "yes" \ + -a @libdir@ != /usr/lib ; + then + libs="-L@libdir@" fi - echo $libs -l@WX_LIBRARY@ @EXTRA_LIBS@ + echo $libs @WXCONFIG_LIBS@ @EXTRA_LIBS@ + ;; + --gl-libs) + echo @WXCONFIG_LIBS_GL@ ;; --cc) echo $CC diff --git a/wxBase.spec b/wxBase.spec index ad5752bc72..7c5b95e993 100644 --- a/wxBase.spec +++ b/wxBase.spec @@ -33,7 +33,7 @@ Header files for wxBase. You need them to develop programs using wxBase. %prep %setup -n wxBase-%{ver} -./configure --prefix=%{pref} --disable-gui --disable-std_iostreams +./configure --prefix=%{pref} --enable-soname --disable-gui --disable-std_iostreams %build if [ "$SMP" != "" ]; then diff --git a/wxGTK.spec b/wxGTK.spec index 3da722f282..a27b7bfcd5 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -47,7 +47,7 @@ OpenGl add-on library for wxGTK, the GTK+ 1.2 port of the wxWindows library. %prep %setup -n wxGTK-%{ver} -./configure --prefix=%{pref} --enable-burnt_name --with-odbc --with-opengl +./configure --prefix=%{pref} --enable-soname --with-odbc --with-opengl %build if [ "$SMP" != "" ]; then diff --git a/wxMotif.spec b/wxMotif.spec index 82b111a7aa..94744e220b 100644 --- a/wxMotif.spec +++ b/wxMotif.spec @@ -45,7 +45,7 @@ OpenGl add-on library for wxMotif, the Motif/Lesstif port of the wxWindows libra %prep %setup -n wxMotif -./configure --prefix=%{pref} --enable-burnt_name --with-odbc --with-opengl --with-motif +./configure --prefix=%{pref} --enable-soname --with-odbc --with-opengl --with-motif %build if [ "$SMP" != "" ]; then diff --git a/wxPython/setup.py b/wxPython/setup.py index a50801ba1f..1212a3f807 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -415,10 +415,8 @@ if BUILD_GLCANVAS or GL_ONLY: gl_libs = [] if os.name == 'posix': - if '-D__WXDEBUG__' in cflags: - gl_libs = ['wx_gtkd_gl', 'GL', 'GLU'] - else: - gl_libs = ['wx_gtk_gl', 'GL', 'GLU'] + gl_libs = os.popen(WX_CONFIG + ' --gl-libs', 'r').read()[:-1] + gl_libs = string.split(gl_libs) else: other_sources = [opj(location, 'msw/myglcanvas.cpp')] gl_libs = ['opengl32', 'glu32'] @@ -431,10 +429,10 @@ if BUILD_GLCANVAS or GL_ONLY: define_macros = defines, library_dirs = libdirs, - libraries = libs + gl_libs, + libraries = libs, extra_compile_args = cflags, - extra_link_args = lflags, + extra_link_args = gl_libs + lflags, ) wxpExtensions.append(ext)