From 6d5dd95b5e099dd28dae2c52de1e9f470d5e55e5 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 31 Mar 2009 11:15:06 +0000 Subject: better handling of $(EXEEXT) git-svn-id: svn://tug.org/texlive/trunk@12585 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/Makefile.in | 200 ++-- Build/source/texk/web2c/alephdir/am/aleph.am | 11 +- Build/source/texk/web2c/am/bootstrap.am | 28 +- Build/source/texk/web2c/am/cweb.am | 6 +- Build/source/texk/web2c/am/web.am | 34 +- Build/source/texk/web2c/configure | 1289 +++++++++------------ Build/source/texk/web2c/configure.ac | 55 +- Build/source/texk/web2c/etexdir/am/etex.am | 2 +- Build/source/texk/web2c/luatexdir/am/luatex.am | 18 +- Build/source/texk/web2c/mpdir/am/mp.am | 6 +- Build/source/texk/web2c/omegaware/am/omegaware.am | 19 +- Build/source/texk/web2c/pdftexdir/am/pdftex.am | 9 +- 12 files changed, 722 insertions(+), 955 deletions(-) (limited to 'Build/source') diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 8662f31840a..f58be76c7ed 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -68,34 +68,32 @@ DIST_COMMON = README $(am__configure_deps) $(dist_check_SCRIPTS) \ ../../build-aux/ltmain.sh ../../build-aux/missing \ ../../build-aux/texinfo.tex ../../build-aux/ylwrap AUTHORS \ ChangeLog INSTALL NEWS -@HAVE_EXEEXT_TRUE@am__append_2 = tangle tangleboot ctangle ctangleboot \ -@HAVE_EXEEXT_TRUE@ luatangle otangle -@WEB_TRUE@am__append_3 = $(web_programs) -@TEX_TRUE@am__append_4 = tex -@MF_TRUE@am__append_5 = mf -@MFN_TRUE@@MF_TRUE@am__append_6 = mf-nowin -@MP_TRUE@am__append_7 = mpost -@ETEX_TRUE@am__append_8 = etex -@PDFTEX_TRUE@am__append_9 = pdftex -@LUATEX_TRUE@am__append_10 = luatex luatangle -@MINGW32_FALSE@am__append_11 = -DLUA_USE_POSIX -@LUATEX_TRUE@am__append_12 = luatexdir/luatangle.test -@OTANGLE_TRUE@am__append_13 = $(omegaware_tools) -@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_14 = $(omegaware_font_tools) -@OTANGLE_TRUE@am__append_15 = omegaware/otangle.test -@ALEPH_TRUE@am__append_16 = aleph -@TEX_SYNCTEX_TRUE@am__append_17 = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -@TEX_SYNCTEX_TRUE@am__append_18 = $(ZLIB_LIBS) -@TEX_SYNCTEX_TRUE@am__append_19 = \ +@WEB_TRUE@am__append_2 = $(web_programs) +@TEX_TRUE@am__append_3 = tex +@MF_TRUE@am__append_4 = mf +@MFN_TRUE@@MF_TRUE@am__append_5 = mf-nowin +@MP_TRUE@am__append_6 = mpost +@ETEX_TRUE@am__append_7 = etex +@PDFTEX_TRUE@am__append_8 = pdftex +@LUATEX_TRUE@am__append_9 = luatex luatangle +@MINGW32_FALSE@am__append_10 = -DLUA_USE_POSIX +@LUATEX_TRUE@am__append_11 = luatexdir/luatangle.test +@OTANGLE_TRUE@am__append_12 = $(omegaware_tools) +@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_13 = $(omegaware_font_tools) +@OTANGLE_TRUE@am__append_14 = omegaware/otangle.test +@ALEPH_TRUE@am__append_15 = aleph +@TEX_SYNCTEX_TRUE@am__append_16 = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) +@TEX_SYNCTEX_TRUE@am__append_17 = $(ZLIB_LIBS) +@TEX_SYNCTEX_TRUE@am__append_18 = \ @TEX_SYNCTEX_TRUE@ synctex.c -@ETEX_SYNCTEX_TRUE@am__append_20 = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -@ETEX_SYNCTEX_TRUE@am__append_21 = $(ZLIB_LIBS) -@ETEX_SYNCTEX_TRUE@am__append_22 = \ +@ETEX_SYNCTEX_TRUE@am__append_19 = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) +@ETEX_SYNCTEX_TRUE@am__append_20 = $(ZLIB_LIBS) +@ETEX_SYNCTEX_TRUE@am__append_21 = \ @ETEX_SYNCTEX_TRUE@ synctex-e.c -@PDFTEX_SYNCTEX_TRUE@am__append_23 = -I$(srcdir)/synctexdir -@PDFTEX_SYNCTEX_TRUE@am__append_24 = \ +@PDFTEX_SYNCTEX_TRUE@am__append_22 = -I$(srcdir)/synctexdir +@PDFTEX_SYNCTEX_TRUE@am__append_23 = \ @PDFTEX_SYNCTEX_TRUE@ synctex-pdf.c subdir = . @@ -788,7 +786,7 @@ dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5 nodist_man_MANS = ctiedir/ctie.1 tiedir/tie.1 dist_check_SCRIPTS = tangle.test luatexdir/luatangle.test \ omegaware/otangle.test libmd5/md5.test -TESTS = tangle.test tiedir/tie.test $(am__append_12) $(am__append_15) \ +TESTS = tangle.test tiedir/tie.test $(am__append_11) $(am__append_14) \ libmd5/md5.test EXTRA_LIBRARIES = libmf.a libmpost.a libpdftex.a liblua51.a libzzip.a \ libluasocket.a libluamisc.a libff.a libluatex.a libmd5.a @@ -995,7 +993,7 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \ $(omegaware_programs:=.p) $(omegaware_programs:=-web2c) \ cftest.p $(nodist_aleph_SOURCES) aleph.web aleph.ch \ aleph-web2c aleph.p aleph.pool aleph-tangle -CLEANFILES = $(am__append_2) +CLEANFILES = web2c = srcdir=$(srcdir) $(SHELL) $(srcdir)/web2c/convert makecpool = ./web2c/makecpool web2c_common = web2c/convert web2c/common.defines @@ -1040,10 +1038,10 @@ nodist_weave_SOURCES = weave.c weave.h nodist_ctie_SOURCES = ctie.c nodist_cweave_SOURCES = cweave.c cweb.c nodist_tie_SOURCES = tie.c -tex_CPPFLAGS = $(am__append_17) -tex_LDADD = $(LDADD) $(socketlibs) $(am__append_18) +tex_CPPFLAGS = $(am__append_16) +tex_LDADD = $(LDADD) $(socketlibs) $(am__append_17) tex_c_h = texini.c tex0.c tex1.c tex2.c texcoerce.h texd.h -nodist_tex_SOURCES = $(tex_c_h) tex-pool.c texextra.c $(am__append_19) +nodist_tex_SOURCES = $(tex_c_h) tex-pool.c texextra.c $(am__append_18) tex_ch_srcs = \ tex.web \ tex.ch \ @@ -1079,11 +1077,11 @@ libmpost_a_SOURCES = \ mpdir/writefont.c \ mpdir/writet1.c -etex_CPPFLAGS = $(am__append_20) -etex_LDADD = $(LDADD) $(socketlibs) $(am__append_21) +etex_CPPFLAGS = $(am__append_19) +etex_LDADD = $(LDADD) $(socketlibs) $(am__append_20) etex_c_h = etexini.c etex0.c etex1.c etex2.c etexcoerce.h etexd.h nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexextra.c \ - etexdir/etexextra.h $(am__append_22) + etexdir/etexextra.h $(am__append_21) etex_web_srcs = \ tex.web \ etexdir/etex.ch \ @@ -1106,12 +1104,12 @@ pdftex_dependencies = $(proglib) $(LIBPNG_DEPEND) $(ZLIB_DEPEND) \ $(XPDF_DEPEND) $(OBSDCOMPAT_DEPEND) libmd5.a nodist_EXTRA_pdftex_SOURCES = dummy.cxx pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir $(buildenv) $(TANGLE) -pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_23) +pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_22) pdftex_LDADD = $(pdftex_ldadd) $(LDADD) $(socketlibs) pdftex_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a pdftex_c_h = pdftexini.c pdftex0.c pdftex1.c pdftex2.c pdftex3.c pdftexcoerce.h pdftexd.h nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c pdftexextra.c \ - pdftexdir/pdftexextra.h $(am__append_24) + pdftexdir/pdftexextra.h $(am__append_23) pdftex_ch_srcs = \ pdftexdir/pdftex.web \ pdftexdir/tex.ch0 \ @@ -1178,7 +1176,7 @@ nodist_luatex_SOURCES = $(luatex_c_h) luatex-pool.c luatexextra.c luatexdir/luat luatex_sources = luatexdir/luatex.web luatexdir/luatex.ch nodist_luatangle_SOURCES = luatangle.c luatangle.h luatangle_sources = luatexdir/luatangle.web luatexdir/luatangle.ch -liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_11) +liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_10) liblua51_a_SOURCES = \ luatexdir/lua51/lapi.c \ luatexdir/lua51/lapi.h \ @@ -1841,12 +1839,12 @@ aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES) bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) @rm -f bibtex$(EXEEXT) $(LINK) $(bibtex_OBJECTS) $(bibtex_LDADD) $(LIBS) -@HAVE_EXEEXT_FALSE@ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) -@HAVE_EXEEXT_FALSE@ @rm -f ctangle$(EXEEXT) -@HAVE_EXEEXT_FALSE@ $(LINK) $(ctangle_OBJECTS) $(ctangle_LDADD) $(LIBS) -@HAVE_EXEEXT_FALSE@ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) -@HAVE_EXEEXT_FALSE@ @rm -f ctangleboot$(EXEEXT) -@HAVE_EXEEXT_FALSE@ $(LINK) $(ctangleboot_OBJECTS) $(ctangleboot_LDADD) $(LIBS) +ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) + @rm -f ctangle$(EXEEXT) + $(LINK) $(ctangle_OBJECTS) $(ctangle_LDADD) $(LIBS) +ctangleboot$(EXEEXT): $(ctangleboot_OBJECTS) $(ctangleboot_DEPENDENCIES) + @rm -f ctangleboot$(EXEEXT) + $(LINK) $(ctangleboot_OBJECTS) $(ctangleboot_LDADD) $(LIBS) ctie$(EXEEXT): $(ctie_OBJECTS) $(ctie_DEPENDENCIES) @rm -f ctie$(EXEEXT) $(LINK) $(ctie_OBJECTS) $(ctie_LDADD) $(LIBS) @@ -1874,9 +1872,9 @@ gftopk$(EXEEXT): $(gftopk_OBJECTS) $(gftopk_DEPENDENCIES) gftype$(EXEEXT): $(gftype_OBJECTS) $(gftype_DEPENDENCIES) @rm -f gftype$(EXEEXT) $(LINK) $(gftype_OBJECTS) $(gftype_LDADD) $(LIBS) -@HAVE_EXEEXT_FALSE@luatangle$(EXEEXT): $(luatangle_OBJECTS) $(luatangle_DEPENDENCIES) -@HAVE_EXEEXT_FALSE@ @rm -f luatangle$(EXEEXT) -@HAVE_EXEEXT_FALSE@ $(LINK) $(luatangle_OBJECTS) $(luatangle_LDADD) $(LIBS) +luatangle$(EXEEXT): $(luatangle_OBJECTS) $(luatangle_DEPENDENCIES) + @rm -f luatangle$(EXEEXT) + $(LINK) $(luatangle_OBJECTS) $(luatangle_LDADD) $(LIBS) luatex$(EXEEXT): $(luatex_OBJECTS) $(luatex_DEPENDENCIES) @rm -f luatex$(EXEEXT) $(CXXLINK) $(luatex_OBJECTS) $(luatex_LDADD) $(LIBS) @@ -1907,9 +1905,9 @@ ofm2opl$(EXEEXT): $(ofm2opl_OBJECTS) $(ofm2opl_DEPENDENCIES) opl2ofm$(EXEEXT): $(opl2ofm_OBJECTS) $(opl2ofm_DEPENDENCIES) @rm -f opl2ofm$(EXEEXT) $(LINK) $(opl2ofm_OBJECTS) $(opl2ofm_LDADD) $(LIBS) -@HAVE_EXEEXT_FALSE@otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) -@HAVE_EXEEXT_FALSE@ @rm -f otangle$(EXEEXT) -@HAVE_EXEEXT_FALSE@ $(LINK) $(otangle_OBJECTS) $(otangle_LDADD) $(LIBS) +otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) + @rm -f otangle$(EXEEXT) + $(LINK) $(otangle_OBJECTS) $(otangle_LDADD) $(LIBS) ovf2ovp$(EXEEXT): $(ovf2ovp_OBJECTS) $(ovf2ovp_DEPENDENCIES) @rm -f ovf2ovp$(EXEEXT) $(LINK) $(ovf2ovp_OBJECTS) $(ovf2ovp_LDADD) $(LIBS) @@ -1940,12 +1938,12 @@ pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) @rm -f synctex$(EXEEXT) $(LINK) $(synctex_OBJECTS) $(synctex_LDADD) $(LIBS) -@HAVE_EXEEXT_FALSE@tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) -@HAVE_EXEEXT_FALSE@ @rm -f tangle$(EXEEXT) -@HAVE_EXEEXT_FALSE@ $(LINK) $(tangle_OBJECTS) $(tangle_LDADD) $(LIBS) -@HAVE_EXEEXT_FALSE@tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) -@HAVE_EXEEXT_FALSE@ @rm -f tangleboot$(EXEEXT) -@HAVE_EXEEXT_FALSE@ $(LINK) $(tangleboot_OBJECTS) $(tangleboot_LDADD) $(LIBS) +tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) + @rm -f tangle$(EXEEXT) + $(LINK) $(tangle_OBJECTS) $(tangle_LDADD) $(LIBS) +tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) + @rm -f tangleboot$(EXEEXT) + $(LINK) $(tangleboot_OBJECTS) $(tangleboot_LDADD) $(LIBS) tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) @rm -f tex$(EXEEXT) $(LINK) $(tex_OBJECTS) $(tex_LDADD) $(LIBS) @@ -7020,7 +7018,7 @@ tangle-web2c: tangle.p $(web2c) tangle echo timestamp >$@ touch tangle.c tangle.h -tangle.p: tangleboot tangle.web tangle.ch +tangle.p: tangleboot$(EXEEXT) tangle.web tangle.ch WEBINPUTS=.:$(srcdir) $(tangleboot) tangle tangle tangle.web: @echo "You seem to be missing tangle.web, perhaps because you" >&2 @@ -7032,8 +7030,6 @@ tangle.web: @echo "In any case, you can get it from" >&2 @echo "ftp://ftp.tug.org/tex/web.tar.gz." >&2 false -@HAVE_EXEEXT_TRUE@tangle: tangle$(EXEEXT) -@HAVE_EXEEXT_TRUE@ echo timestamp >$@ tangleboot.c tangleboot.h: stamp-tangle $(web2c_programs) $(web2c_common) $(web2c) tangleboot stamp-tangle: tangleboot.p @@ -7049,14 +7045,10 @@ tangleboot.p: tangle.web tangle.ch fi date >stamp-tangle $(MAKE) $(AM_MAKEFLAGS) tangle$(EXEEXT) -@HAVE_EXEEXT_TRUE@tangleboot: tangleboot$(EXEEXT) -@HAVE_EXEEXT_TRUE@ echo timestamp >$@ -ctangle.c: ctangleboot cwebdir/ctangle.w cwebdir/ctang-w2c.ch +ctangle.c: ctangleboot$(EXEEXT) cwebdir/ctangle.w cwebdir/ctang-w2c.ch CWEBINPUTS=$(srcdir)/cwebdir $(ctangleboot) ctangle ctang-w2c -cweb.c: ctangleboot cwebdir/common.w cwebdir/comm-w2c.ch +cweb.c: ctangleboot$(EXEEXT) cwebdir/common.w cwebdir/comm-w2c.ch CWEBINPUTS=$(srcdir)/cwebdir $(ctangleboot) common comm-w2c cweb.c -@HAVE_EXEEXT_TRUE@ctangle: ctangle$(EXEEXT) -@HAVE_EXEEXT_TRUE@ echo timestamp >$@ stamp-ctangle: ctangleboot.c cwebboot.c date >stamp-ctangle ctangleboot.c: cwebdir/ctangle.w cwebdir/ctang-w2c.ch @@ -7081,132 +7073,130 @@ cwebboot.c: cwebdir/common.w cwebdir/comm-w2c.ch fi date >stamp-ctangle $(MAKE) $(AM_MAKEFLAGS) ctangle$(EXEEXT) -@HAVE_EXEEXT_TRUE@ctangleboot: ctangleboot$(EXEEXT) -@HAVE_EXEEXT_TRUE@ echo timestamp >$@ bibtex.c bibtex.h: bibtex-web2c bibtex-web2c: $(web2c_common) $(web2c_programs) web2c/cvtbib.sed bibtex.p $(web2c) bibtex echo timestamp >$@ touch bibtex.c bibtex.h -bibtex.p: tangle bibtex.web bibtex.ch +bibtex.p: tangle$(EXEEXT) bibtex.web bibtex.ch $(tangle) bibtex bibtex dvicopy.c dvicopy.h: dvicopy-web2c dvicopy-web2c: $(web2c_common) $(web2c_programs) dvicopy.p $(web2c) dvicopy echo timestamp >$@ touch dvicopy.c dvicopy.h -dvicopy.p: tangle dvicopy.web dvicopy.ch +dvicopy.p: tangle$(EXEEXT) dvicopy.web dvicopy.ch $(tangle) dvicopy dvicopy dvitomp.c dvitomp.h: dvitomp-web2c dvitomp-web2c: $(web2c_common) $(web2c_programs) dvitomp.p $(web2c) dvitomp echo timestamp >$@ touch dvitomp.c dvitomp.h -dvitomp.p: tangle dvitomp.web dvitomp.ch +dvitomp.p: tangle$(EXEEXT) dvitomp.web dvitomp.ch $(tangle) dvitomp dvitomp dvitype.c dvitype.h: dvitype-web2c dvitype-web2c: $(web2c_common) $(web2c_programs) dvitype.p $(web2c) dvitype echo timestamp >$@ touch dvitype.c dvitype.h -dvitype.p: tangle dvitype.web dvitype.ch +dvitype.p: tangle$(EXEEXT) dvitype.web dvitype.ch $(tangle) dvitype dvitype gftodvi.c gftodvi.h: gftodvi-web2c gftodvi-web2c: $(web2c_common) $(web2c_programs) gftodvi.p $(web2c) gftodvi echo timestamp >$@ touch gftodvi.c gftodvi.h -gftodvi.p: tangle gftodvi.web gftodvi.ch +gftodvi.p: tangle$(EXEEXT) gftodvi.web gftodvi.ch $(tangle) gftodvi gftodvi gftopk.c gftopk.h: gftopk-web2c gftopk-web2c: $(web2c_common) $(web2c_programs) gftopk.p $(web2c) gftopk echo timestamp >$@ touch gftopk.c gftopk.h -gftopk.p: tangle gftopk.web gftopk.ch +gftopk.p: tangle$(EXEEXT) gftopk.web gftopk.ch $(tangle) gftopk gftopk gftype.c gftype.h: gftype-web2c gftype-web2c: $(web2c_common) $(web2c_programs) gftype.p $(web2c) gftype echo timestamp >$@ touch gftype.c gftype.h -gftype.p: tangle gftype.web gftype.ch +gftype.p: tangle$(EXEEXT) gftype.web gftype.ch $(tangle) gftype gftype mft.c mft.h: mft-web2c mft-web2c: $(web2c_common) $(web2c_programs) mft.p $(web2c) mft echo timestamp >$@ touch mft.c mft.h -mft.p: tangle mft.web mft.ch +mft.p: tangle$(EXEEXT) mft.web mft.ch $(tangle) mft mft patgen.c patgen.h: patgen-web2c patgen-web2c: $(web2c_common) $(web2c_programs) patgen.p $(web2c) patgen echo timestamp >$@ touch patgen.c patgen.h -patgen.p: tangle patgen.web patgen.ch +patgen.p: tangle$(EXEEXT) patgen.web patgen.ch $(tangle) patgen patgen pktogf.c pktogf.h: pktogf-web2c pktogf-web2c: $(web2c_common) $(web2c_programs) pktogf.p $(web2c) pktogf echo timestamp >$@ touch pktogf.c pktogf.h -pktogf.p: tangle pktogf.web pktogf.ch +pktogf.p: tangle$(EXEEXT) pktogf.web pktogf.ch $(tangle) pktogf pktogf pktype.c pktype.h: pktype-web2c pktype-web2c: $(web2c_common) $(web2c_programs) pktype.p $(web2c) pktype echo timestamp >$@ touch pktype.c pktype.h -pktype.p: tangle pktype.web pktype.ch +pktype.p: tangle$(EXEEXT) pktype.web pktype.ch $(tangle) pktype pktype pltotf.c pltotf.h: pltotf-web2c pltotf-web2c: $(web2c_common) $(web2c_programs) pltotf.p $(web2c) pltotf echo timestamp >$@ touch pltotf.c pltotf.h -pltotf.p: tangle pltotf.web pltotf.ch +pltotf.p: tangle$(EXEEXT) pltotf.web pltotf.ch $(tangle) pltotf pltotf pooltype.c pooltype.h: pooltype-web2c pooltype-web2c: $(web2c_common) $(web2c_programs) pooltype.p $(web2c) pooltype echo timestamp >$@ touch pooltype.c pooltype.h -pooltype.p: tangle pooltype.web pooltype.ch +pooltype.p: tangle$(EXEEXT) pooltype.web pooltype.ch $(tangle) pooltype pooltype tftopl.c tftopl.h: tftopl-web2c tftopl-web2c: $(web2c_common) $(web2c_programs) tftopl.p $(web2c) tftopl echo timestamp >$@ touch tftopl.c tftopl.h -tftopl.p: tangle tftopl.web tftopl.ch +tftopl.p: tangle$(EXEEXT) tftopl.web tftopl.ch $(tangle) tftopl tftopl vftovp.c vftovp.h: vftovp-web2c vftovp-web2c: $(web2c_common) $(web2c_programs) vftovp.p $(web2c) vftovp echo timestamp >$@ touch vftovp.c vftovp.h -vftovp.p: tangle vftovp.web vftovp.ch +vftovp.p: tangle$(EXEEXT) vftovp.web vftovp.ch $(tangle) vftovp vftovp vptovf.c vptovf.h: vptovf-web2c vptovf-web2c: $(web2c_common) $(web2c_programs) vptovf.p $(web2c) vptovf echo timestamp >$@ touch vptovf.c vptovf.h -vptovf.p: tangle vptovf.web vptovf.ch +vptovf.p: tangle$(EXEEXT) vptovf.web vptovf.ch $(tangle) vptovf vptovf weave.c weave.h: weave-web2c weave-web2c: $(web2c_common) $(web2c_programs) weave.p $(web2c) weave echo timestamp >$@ touch weave.c weave.h -weave.p: tangle weave.web weave.ch +weave.p: tangle$(EXEEXT) weave.web weave.ch $(tangle) weave weave -ctie.c: ctangle ctiedir/ctie.w ctiedir/ctie-k.ch +ctie.c: ctangle$(EXEEXT) ctiedir/ctie.w ctiedir/ctie-k.ch CWEBINPUTS=$(srcdir)/ctiedir $(ctangle) ctie.w ctie-k.ch -cweave.c: ctangle cwebdir/cweave.w cwebdir/cweav-w2c.ch +cweave.c: ctangle$(EXEEXT) cwebdir/cweave.w cwebdir/cweav-w2c.ch CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) cweave cweav-w2c -tie.c: ctangle tiedir/tie.w tiedir/tie-w2c.ch +tie.c: ctangle$(EXEEXT) tiedir/tie.w tiedir/tie-w2c.ch CWEBINPUTS=$(srcdir)/tiedir $(ctangle) tie.w tie-w2c.ch $(tex_c_h): tex-web2c tex-web2c: tex.p $(web2c_texmf) @@ -7251,14 +7241,14 @@ mp-web2c: mp.p $(web2c_texmf) mpdir/mp.defines web2c/cvtmf1.sed web2c/cvtmf2.sed mpextra.c: lib/texmfmp.c mpd.h sed s/TEX-OR-MF-OR-MP/mp/ $(srcdir)/lib/texmfmp.c >$@ mp.p mp.pool: mp-tangle -mp-tangle: tangle mp.web mp.ch +mp-tangle: tangle$(EXEEXT) mp.web mp.ch $(tangle) mp mp echo timestamp >$@ touch mp.p mp.pool mp-pool.c: mp.pool $(makecpool) mpdir/mplib.h $(makecpool) mp.pool $(srcdir)/mpdir/mplib.h >$@ || rm -f $@ -$(libmpost_a_SOURCES): mpd.h +$(libmpost_a_OBJECTS): mpd.h $(etex_c_h): etex-web2c etex-web2c: etex.p $(web2c_texmf) $(web2c) etex @@ -7268,7 +7258,7 @@ etex-web2c: etex.p $(web2c_texmf) etexextra.c: etexdir/etexextra.h lib/texmfmp.c etexd.h sed s/TEX-OR-MF-OR-MP/etex/ $(srcdir)/lib/texmfmp.c >$@ etex.p etex.pool: etex-tangle -etex-tangle: tangle etex.web etex.ch +etex-tangle: tangle$(EXEEXT) etex.web etex.ch $(tangle) etex etex echo timestamp >$@ touch etex.p etex.pool @@ -7294,7 +7284,7 @@ pdftex-web2c: pdftex.p $(web2c_texmf) pdftexdir/pdftex.defines pdftexextra.c: pdftexd.h pdftexdir/pdftexextra.h lib/texmfmp.c pdftexd.h sed s/TEX-OR-MF-OR-MP/pdftex/ $(srcdir)/lib/texmfmp.c >$@ pdftex.p pdftex.pool: pdftex-tangle -pdftex-tangle: tangle pdftexdir/pdftex.web pdftex.ch +pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex.ch $(pdf_tangle) pdftex pdftex echo timestamp >$@ touch pdftex.p pdftex.pool @@ -7311,7 +7301,7 @@ pdftexdir/pdftexextra.h: pdftexdir/pdftexextra.in pdftexdir/pdftex.version etexd pdftex.ch: $(TIE) $(pdftex_ch_srcs) $(tie) -c pdftex.ch $(pdftex_ch_srcs) -@PDFTEX_TRUE@$(libpdftex_a_SOURCES): pdftexd.h +$(libpdftex_a_OBJECTS): pdftexd.h $(luatex_c_h): luatex-web2c luatex-web2c: luatex.p $(web2c_texmf) luatexdir/luatex.defines $(web2c) luatex @@ -7320,7 +7310,7 @@ luatex-web2c: luatex.p $(web2c_texmf) luatexdir/luatex.defines luatexextra.c: luatexd.h luatexdir/luatexextra.h lib/texmfmp.c sed s/TEX-OR-MF-OR-MP/luatex/ $(srcdir)/lib/texmfmp.c >$@ luatex.p luatex.pool: luatex-tangle -luatex-tangle: luatangle $(luatex_sources) +luatex-tangle: luatangle$(EXEEXT) $(luatex_sources) $(luatex_tangle) --underlines luatex luatex echo timestamp >$@ touch luatex.p luatex.pool @@ -7335,14 +7325,12 @@ luatexdir/luatexextra.h: luatexdir/luatexextra.in luatexdir/luatex.version $(srcdir)/luatexdir/luatexextra.in >$@ luatangle.c luatangle.h: $(web2c_common) $(web2c_programs) luatangle.p $(web2c) luatangle -luatangle.p: tangle $(luatangle_sources) +luatangle.p: tangle$(EXEEXT) $(luatangle_sources) WEBINPUTS=$(srcdir)/luatexdir $(buildenv) $(TANGLE) luatangle luatangle -@HAVE_EXEEXT_TRUE@luatangle: luatangle$(EXEEXT) -@HAVE_EXEEXT_TRUE@ echo timestamp >$@ -@LUATEX_TRUE@$(libluatex_a_SOURCES): $(lua_mp_c_h) +$(libluatex_a_OBJECTS): $(lua_mp_c_h) $(lua_mp_c_h): mp-ctangle -mp-ctangle: ctangle $(lua_mp_web) luatexd.h +mp-ctangle: ctangle$(EXEEXT) $(lua_mp_web) luatexd.h $(mkdir_p) luatexdir CWEBINPUTS=$(srcdir)/luatexdir/mp $(ctangle) mp.w CWEBINPUTS=$(srcdir)/luatexdir/mp $(ctangle) psout.w @@ -7357,53 +7345,53 @@ odvicopy-web2c: $(web2c_common) $(web2c_programs) odvicopy.p $(web2c) odvicopy echo timestamp >$@ touch odvicopy.c odvicopy.h -odvicopy.p: tangle $(odvicopy_sources) +odvicopy.p: tangle$(EXEEXT) $(odvicopy_sources) $(ow_tangle) odvicopy odvicopy odvitype.c odvitype.h: odvitype-web2c odvitype-web2c: $(web2c_common) $(web2c_programs) odvitype.p $(web2c) odvitype echo timestamp >$@ touch odvitype.c odvitype.h -odvitype.p: tangle $(odvitype_sources) +odvitype.p: tangle$(EXEEXT) $(odvitype_sources) $(ow_tangle) odvitype odvitype ofm2opl.c ofm2opl.h: ofm2opl-web2c ofm2opl-web2c: $(web2c_common) $(web2c_programs) ofm2opl.p $(web2c) ofm2opl echo timestamp >$@ touch ofm2opl.c ofm2opl.h -ofm2opl.p: tangle $(ofm2opl_sources) +ofm2opl.p: tangle$(EXEEXT) $(ofm2opl_sources) $(ow_tangle) ofm2opl ofm2opl opl2ofm.c opl2ofm.h: opl2ofm-web2c opl2ofm-web2c: $(web2c_common) $(web2c_programs) opl2ofm.p $(web2c) opl2ofm echo timestamp >$@ touch opl2ofm.c opl2ofm.h -opl2ofm.p: tangle $(opl2ofm_sources) +opl2ofm.p: tangle$(EXEEXT) $(opl2ofm_sources) $(ow_tangle) opl2ofm opl2ofm otangle.c otangle.h: otangle-web2c otangle-web2c: $(web2c_common) $(web2c_programs) otangle.p $(web2c) otangle echo timestamp >$@ touch otangle.c otangle.h -otangle.p: tangle $(otangle_sources) +otangle.p: tangle$(EXEEXT) $(otangle_sources) $(ow_tangle) otangle otangle -@HAVE_EXEEXT_TRUE@otangle: otangle$(EXEEXT) -@HAVE_EXEEXT_TRUE@ echo timestamp >$@ ovf2ovp.c ovf2ovp.h: ovf2ovp-web2c ovf2ovp-web2c: $(web2c_common) $(web2c_programs) ovf2ovp.p $(web2c) ovf2ovp echo timestamp >$@ touch ovf2ovp.c ovf2ovp.h -ovf2ovp.p: tangle $(ovf2ovp_sources) +ovf2ovp.p: tangle$(EXEEXT) $(ovf2ovp_sources) $(ow_tangle) ovf2ovp ovf2ovp ovp2ovf.c ovp2ovf.h: ovp2ovf-web2c ovp2ovf-web2c: $(web2c_common) $(web2c_programs) ovp2ovf.p $(web2c) ovp2ovf echo timestamp >$@ touch ovp2ovf.c ovp2ovf.h -ovp2ovf.p: tangle $(ovp2ovf_sources) +ovp2ovf.p: tangle$(EXEEXT) $(ovp2ovf_sources) $(ow_tangle) ovp2ovf ovp2ovf -@ALEPH_TRUE@$(aleph_SOURCES): alephd.h + +$(aleph_OBJECTS): alephd.h + $(aleph_c_h): aleph-web2c aleph-web2c: aleph.p $(web2c_texmf) alephdir/aleph.defines $(web2c) aleph @@ -7412,7 +7400,7 @@ aleph-web2c: aleph.p $(web2c_texmf) alephdir/aleph.defines alephextra.c: lib/texmfmp.c alephdir/alephextra.h alephd.h sed s/TEX-OR-MF-OR-MP/aleph/ $(srcdir)/lib/texmfmp.c >$@ aleph.p aleph.pool: aleph-tangle -aleph-tangle: otangle aleph.web aleph.ch +aleph-tangle: otangle$(EXEEXT) aleph.web aleph.ch $(otangle) aleph aleph echo timestamp >$@ touch aleph.p aleph.pool diff --git a/Build/source/texk/web2c/alephdir/am/aleph.am b/Build/source/texk/web2c/alephdir/am/aleph.am index f658f50d07d..6b3ec3846e5 100644 --- a/Build/source/texk/web2c/alephdir/am/aleph.am +++ b/Build/source/texk/web2c/alephdir/am/aleph.am @@ -19,11 +19,10 @@ aleph_SOURCES = \ alephdir/alephextra.h \ alephdir/alephmem.h \ alephdir/aleph-pool.h -## We must create alephd.h before compiling the aleph_SOURCES, -## but certainly don't want to create alephd.h if Aleph is not built. -if ALEPH -$(aleph_SOURCES): alephd.h -endif ALEPH + +## We must create alephd.h before building the aleph_OBJECTS. +$(aleph_OBJECTS): alephd.h + $(aleph_c_h): aleph-web2c aleph-web2c: aleph.p $(web2c_texmf) alephdir/aleph.defines $(web2c) aleph @@ -32,7 +31,7 @@ aleph-web2c: aleph.p $(web2c_texmf) alephdir/aleph.defines alephextra.c: lib/texmfmp.c alephdir/alephextra.h alephd.h sed s/TEX-OR-MF-OR-MP/aleph/ $(srcdir)/lib/texmfmp.c >$@ aleph.p aleph.pool: aleph-tangle -aleph-tangle: otangle aleph.web aleph.ch +aleph-tangle: otangle$(EXEEXT) aleph.web aleph.ch $(otangle) aleph aleph echo timestamp >$@ touch aleph.p aleph.pool diff --git a/Build/source/texk/web2c/am/bootstrap.am b/Build/source/texk/web2c/am/bootstrap.am index 734d059c83b..3b91ffe67c5 100644 --- a/Build/source/texk/web2c/am/bootstrap.am +++ b/Build/source/texk/web2c/am/bootstrap.am @@ -14,7 +14,7 @@ tangle-web2c: tangle.p ## which we use to make the other programs. We depend on tangleboot, even ## though we might not use it. EXTRA_DIST += tangle.web tangle.ch -tangle.p: tangleboot tangle.web tangle.ch +tangle.p: tangleboot$(EXEEXT) tangle.web tangle.ch WEBINPUTS=.:$(srcdir) $(tangleboot) tangle tangle tangle.web: @echo "You seem to be missing tangle.web, perhaps because you" >&2 @@ -27,11 +27,6 @@ tangle.web: @echo "ftp://ftp.tug.org/tex/web.tar.gz." >&2 false DISTCLEANFILES += tangle.c tangle.h tangle.p tangle-web2c -if HAVE_EXEEXT -tangle: tangle$(EXEEXT) - echo timestamp >$@ -CLEANFILES += tangle -endif HAVE_EXEEXT noinst_PROGRAMS += tangleboot nodist_tangleboot_SOURCES = tangleboot.c tangleboot.h @@ -56,11 +51,6 @@ tangleboot.p: tangle.web tangle.ch date >stamp-tangle $(MAKE) $(AM_MAKEFLAGS) tangle$(EXEEXT) DISTCLEANFILES += stamp-tangle tangleboot.c tangleboot.h -if HAVE_EXEEXT -tangleboot: tangleboot$(EXEEXT) - echo timestamp >$@ -CLEANFILES += tangleboot -endif HAVE_EXEEXT ## Bootstrapping ctangle requires making it with itself. We use the opportunity ## to create an up-to-date ctangleboot as well. @@ -71,16 +61,11 @@ nodist_ctangle_SOURCES = ctangle.c cweb.c EXTRA_DIST += cwebdir ## We install man/cweb.man, not cwebdir/cweb.1 ## nodist_man_MANS += cwebdir/cweb.1 -ctangle.c: ctangleboot cwebdir/ctangle.w cwebdir/ctang-w2c.ch +ctangle.c: ctangleboot$(EXEEXT) cwebdir/ctangle.w cwebdir/ctang-w2c.ch CWEBINPUTS=$(srcdir)/cwebdir $(ctangleboot) ctangle ctang-w2c -cweb.c: ctangleboot cwebdir/common.w cwebdir/comm-w2c.ch +cweb.c: ctangleboot$(EXEEXT) cwebdir/common.w cwebdir/comm-w2c.ch CWEBINPUTS=$(srcdir)/cwebdir $(ctangleboot) common comm-w2c cweb.c DISTCLEANFILES += ctangle.c cweb.c -if HAVE_EXEEXT -ctangle: ctangle$(EXEEXT) - echo timestamp >$@ -CLEANFILES += ctangle -endif HAVE_EXEEXT noinst_PROGRAMS += ctangleboot nodist_ctangleboot_SOURCES = ctangleboot.c cwebboot.c @@ -114,14 +99,9 @@ cwebboot.c: cwebdir/common.w cwebdir/comm-w2c.ch date >stamp-ctangle $(MAKE) $(AM_MAKEFLAGS) ctangle$(EXEEXT) DISTCLEANFILES += stamp-ctangle -if HAVE_EXEEXT -ctangleboot: ctangleboot$(EXEEXT) - echo timestamp >$@ -CLEANFILES += ctangleboot -endif HAVE_EXEEXT ## Tests - +## dist_check_SCRIPTS += tangle.test TESTS += tangle.test diff --git a/Build/source/texk/web2c/am/cweb.am b/Build/source/texk/web2c/am/cweb.am index 7bdbde25a19..9cb6692121d 100644 --- a/Build/source/texk/web2c/am/cweb.am +++ b/Build/source/texk/web2c/am/cweb.am @@ -4,13 +4,13 @@ bin_PROGRAMS += ctie nodist_ctie_SOURCES = ctie.c EXTRA_DIST += ctiedir nodist_man_MANS += ctiedir/ctie.1 -ctie.c: ctangle ctiedir/ctie.w ctiedir/ctie-k.ch +ctie.c: ctangle$(EXEEXT) ctiedir/ctie.w ctiedir/ctie-k.ch CWEBINPUTS=$(srcdir)/ctiedir $(ctangle) ctie.w ctie-k.ch DISTCLEANFILES += ctie.c bin_PROGRAMS += cweave nodist_cweave_SOURCES = cweave.c cweb.c -cweave.c: ctangle cwebdir/cweave.w cwebdir/cweav-w2c.ch +cweave.c: ctangle$(EXEEXT) cwebdir/cweave.w cwebdir/cweav-w2c.ch CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) cweave cweav-w2c DISTCLEANFILES += cweave.c @@ -18,7 +18,7 @@ bin_PROGRAMS += tie nodist_tie_SOURCES = tie.c EXTRA_DIST += tiedir nodist_man_MANS += tiedir/tie.1 -tie.c: ctangle tiedir/tie.w tiedir/tie-w2c.ch +tie.c: ctangle$(EXEEXT) tiedir/tie.w tiedir/tie-w2c.ch CWEBINPUTS=$(srcdir)/tiedir $(ctangle) tie.w tie-w2c.ch DISTCLEANFILES += tie.c diff --git a/Build/source/texk/web2c/am/web.am b/Build/source/texk/web2c/am/web.am index 809dfb61238..6e479078515 100644 --- a/Build/source/texk/web2c/am/web.am +++ b/Build/source/texk/web2c/am/web.am @@ -18,7 +18,7 @@ bibtex-web2c: $(web2c_common) $(web2c_programs) web2c/cvtbib.sed bibtex.p $(web2c) bibtex echo timestamp >$@ touch bibtex.c bibtex.h -bibtex.p: tangle bibtex.web bibtex.ch +bibtex.p: tangle$(EXEEXT) bibtex.web bibtex.ch $(tangle) bibtex bibtex nodist_dvicopy_SOURCES = dvicopy.c dvicopy.h @@ -27,7 +27,7 @@ dvicopy-web2c: $(web2c_common) $(web2c_programs) dvicopy.p $(web2c) dvicopy echo timestamp >$@ touch dvicopy.c dvicopy.h -dvicopy.p: tangle dvicopy.web dvicopy.ch +dvicopy.p: tangle$(EXEEXT) dvicopy.web dvicopy.ch $(tangle) dvicopy dvicopy nodist_dvitomp_SOURCES = dvitomp.c dvitomp.h @@ -36,7 +36,7 @@ dvitomp-web2c: $(web2c_common) $(web2c_programs) dvitomp.p $(web2c) dvitomp echo timestamp >$@ touch dvitomp.c dvitomp.h -dvitomp.p: tangle dvitomp.web dvitomp.ch +dvitomp.p: tangle$(EXEEXT) dvitomp.web dvitomp.ch $(tangle) dvitomp dvitomp nodist_dvitype_SOURCES = dvitype.c dvitype.h @@ -45,7 +45,7 @@ dvitype-web2c: $(web2c_common) $(web2c_programs) dvitype.p $(web2c) dvitype echo timestamp >$@ touch dvitype.c dvitype.h -dvitype.p: tangle dvitype.web dvitype.ch +dvitype.p: tangle$(EXEEXT) dvitype.web dvitype.ch $(tangle) dvitype dvitype nodist_gftodvi_SOURCES = gftodvi.c gftodvi.h @@ -54,7 +54,7 @@ gftodvi-web2c: $(web2c_common) $(web2c_programs) gftodvi.p $(web2c) gftodvi echo timestamp >$@ touch gftodvi.c gftodvi.h -gftodvi.p: tangle gftodvi.web gftodvi.ch +gftodvi.p: tangle$(EXEEXT) gftodvi.web gftodvi.ch $(tangle) gftodvi gftodvi gftodvi_SOURCES = gftodmem.h @@ -64,7 +64,7 @@ gftopk-web2c: $(web2c_common) $(web2c_programs) gftopk.p $(web2c) gftopk echo timestamp >$@ touch gftopk.c gftopk.h -gftopk.p: tangle gftopk.web gftopk.ch +gftopk.p: tangle$(EXEEXT) gftopk.web gftopk.ch $(tangle) gftopk gftopk nodist_gftype_SOURCES = gftype.c gftype.h @@ -73,7 +73,7 @@ gftype-web2c: $(web2c_common) $(web2c_programs) gftype.p $(web2c) gftype echo timestamp >$@ touch gftype.c gftype.h -gftype.p: tangle gftype.web gftype.ch +gftype.p: tangle$(EXEEXT) gftype.web gftype.ch $(tangle) gftype gftype nodist_mft_SOURCES = mft.c mft.h @@ -82,7 +82,7 @@ mft-web2c: $(web2c_common) $(web2c_programs) mft.p $(web2c) mft echo timestamp >$@ touch mft.c mft.h -mft.p: tangle mft.web mft.ch +mft.p: tangle$(EXEEXT) mft.web mft.ch $(tangle) mft mft nodist_patgen_SOURCES = patgen.c patgen.h @@ -91,7 +91,7 @@ patgen-web2c: $(web2c_common) $(web2c_programs) patgen.p $(web2c) patgen echo timestamp >$@ touch patgen.c patgen.h -patgen.p: tangle patgen.web patgen.ch +patgen.p: tangle$(EXEEXT) patgen.web patgen.ch $(tangle) patgen patgen nodist_pktogf_SOURCES = pktogf.c pktogf.h @@ -100,7 +100,7 @@ pktogf-web2c: $(web2c_common) $(web2c_programs) pktogf.p $(web2c) pktogf echo timestamp >$@ touch pktogf.c pktogf.h -pktogf.p: tangle pktogf.web pktogf.ch +pktogf.p: tangle$(EXEEXT) pktogf.web pktogf.ch $(tangle) pktogf pktogf nodist_pktype_SOURCES = pktype.c pktype.h @@ -109,7 +109,7 @@ pktype-web2c: $(web2c_common) $(web2c_programs) pktype.p $(web2c) pktype echo timestamp >$@ touch pktype.c pktype.h -pktype.p: tangle pktype.web pktype.ch +pktype.p: tangle$(EXEEXT) pktype.web pktype.ch $(tangle) pktype pktype nodist_pltotf_SOURCES = pltotf.c pltotf.h @@ -118,7 +118,7 @@ pltotf-web2c: $(web2c_common) $(web2c_programs) pltotf.p $(web2c) pltotf echo timestamp >$@ touch pltotf.c pltotf.h -pltotf.p: tangle pltotf.web pltotf.ch +pltotf.p: tangle$(EXEEXT) pltotf.web pltotf.ch $(tangle) pltotf pltotf nodist_pooltype_SOURCES = pooltype.c pooltype.h @@ -127,7 +127,7 @@ pooltype-web2c: $(web2c_common) $(web2c_programs) pooltype.p $(web2c) pooltype echo timestamp >$@ touch pooltype.c pooltype.h -pooltype.p: tangle pooltype.web pooltype.ch +pooltype.p: tangle$(EXEEXT) pooltype.web pooltype.ch $(tangle) pooltype pooltype nodist_tftopl_SOURCES = tftopl.c tftopl.h @@ -136,7 +136,7 @@ tftopl-web2c: $(web2c_common) $(web2c_programs) tftopl.p $(web2c) tftopl echo timestamp >$@ touch tftopl.c tftopl.h -tftopl.p: tangle tftopl.web tftopl.ch +tftopl.p: tangle$(EXEEXT) tftopl.web tftopl.ch $(tangle) tftopl tftopl nodist_vftovp_SOURCES = vftovp.c vftovp.h @@ -145,7 +145,7 @@ vftovp-web2c: $(web2c_common) $(web2c_programs) vftovp.p $(web2c) vftovp echo timestamp >$@ touch vftovp.c vftovp.h -vftovp.p: tangle vftovp.web vftovp.ch +vftovp.p: tangle$(EXEEXT) vftovp.web vftovp.ch $(tangle) vftovp vftovp nodist_vptovf_SOURCES = vptovf.c vptovf.h @@ -154,7 +154,7 @@ vptovf-web2c: $(web2c_common) $(web2c_programs) vptovf.p $(web2c) vptovf echo timestamp >$@ touch vptovf.c vptovf.h -vptovf.p: tangle vptovf.web vptovf.ch +vptovf.p: tangle$(EXEEXT) vptovf.web vptovf.ch $(tangle) vptovf vptovf nodist_weave_SOURCES = weave.c weave.h @@ -163,5 +163,5 @@ weave-web2c: $(web2c_common) $(web2c_programs) weave.p $(web2c) weave echo timestamp >$@ touch weave.c weave.h -weave.p: tangle weave.web weave.ch +weave.p: tangle$(EXEEXT) weave.web weave.ch $(tangle) weave weave diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 67984200eb3..7ab4b31d77e 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -874,8 +874,6 @@ MINGW32_FALSE MINGW32_TRUE WIN32_FALSE WIN32_TRUE -HAVE_EXEEXT_FALSE -HAVE_EXEEXT_TRUE FMU_FALSE FMU_TRUE CXX_HACK_LIBS @@ -4359,13 +4357,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4362: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4360: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4365: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4363: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4368: output\"" >&5) + (eval echo "\"\$as_me:4366: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5571,7 +5569,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5574 "configure"' > conftest.$ac_ext + echo '#line 5572 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7618,11 +7616,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7621: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7619: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7625: \$? = $ac_status" >&5 + echo "$as_me:7623: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7957,11 +7955,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7960: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7958: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7964: \$? = $ac_status" >&5 + echo "$as_me:7962: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8062,11 +8060,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8065: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8063: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8069: \$? = $ac_status" >&5 + echo "$as_me:8067: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8117,11 +8115,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8120: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8118: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8124: \$? = $ac_status" >&5 + echo "$as_me:8122: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10917,7 +10915,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10920 "configure" +#line 10918 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11013,7 +11011,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11016 "configure" +#line 11014 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16029,11 +16027,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16032: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16030: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16036: \$? = $ac_status" >&5 + echo "$as_me:16034: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16128,11 +16126,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16131: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16129: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16135: \$? = $ac_status" >&5 + echo "$as_me:16133: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16180,11 +16178,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16183: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16181: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16187: \$? = $ac_status" >&5 + echo "$as_me:16185: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17690,15 +17688,6 @@ else fi - if test "x$(EXEEXT)" != x ; then - HAVE_EXEEXT_TRUE= - HAVE_EXEEXT_FALSE='#' -else - HAVE_EXEEXT_TRUE='#' - HAVE_EXEEXT_FALSE= -fi - - { $as_echo "$as_me:$LINENO: checking for native WIN32 or MINGW32" >&5 $as_echo_n "checking for native WIN32 or MINGW32... " >&6; } if test "${kpse_cv_have_win32+set}" = set; then @@ -20782,6 +20771,93 @@ cat >>confdefs.h <<_ACEOF _ACEOF +{ $as_echo "$as_me:$LINENO: checking for library containing pow" >&5 +$as_echo_n "checking for library containing pow... " >&6; } +if test "${ac_cv_search_pow+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pow (); +int +main () +{ +return pow (); + ; + return 0; +} +_ACEOF +for ac_lib in '' m; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + ac_cv_search_pow=$ac_res +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_pow+set}" = set; then + break +fi +done +if test "${ac_cv_search_pow+set}" = set; then + : +else + ac_cv_search_pow=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_pow" >&5 +$as_echo "$ac_cv_search_pow" >&6; } +ac_res=$ac_cv_search_pow +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + @@ -20888,7 +20964,8 @@ done -for ac_header in errno.h sys/timeb.h sys/wait.h + +for ac_header in errno.h langinfo.h sys/timeb.h sys/wait.h do as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then @@ -21039,32 +21116,33 @@ fi done - -for ac_header in time.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for long double" >&5 +$as_echo_n "checking for long double... " >&6; } +if test "${ac_cv_type_long_double+set}" = set; then $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF + if test "$GCC" = yes; then + ac_cv_type_long_double=yes + else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> +/* The Stardent Vistra knows sizeof (long double), but does + not support it. */ + long double foo = 0.0L; +int +main () +{ +static int test_array [1 - 2 * !(/* On Ultrix 4.3 cc, long double is 4 and double is 8. */ + sizeof (double) <= sizeof (long double))]; +test_array [0] = 0 + + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -21084,149 +21162,127 @@ $as_echo "$ac_try_echo") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + ac_cv_type_long_double=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + ac_cv_type_long_double=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } + fi +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_long_double" >&5 +$as_echo "$ac_cv_type_long_double" >&6; } + if test $ac_cv_type_long_double = yes; then -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ +cat >>confdefs.h <<\_ACEOF +#define HAVE_LONG_DOUBLE 1 +_ACEOF + + fi + + + { $as_echo "$as_me:$LINENO: checking for long long int" >&5 +$as_echo_n "checking for long long int... " >&6; } +if test "${ac_cv_type_long_long_int+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF + + /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <$ac_header> +/* Test preprocessor. */ + #if ! (-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) + error in preprocessor; + #endif + #if ! (18446744073709551615ULL <= -1ull) + error in preprocessor; + #endif + /* Test literals. */ + long long int ll = 9223372036854775807ll; + long long int nll = -9223372036854775807LL; + unsigned long long int ull = 18446744073709551615ULL; + /* Test constant expressions. */ + typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) + ? 1 : -1)]; + typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 + ? 1 : -1)]; + int i = 63; +int +main () +{ +/* Test availability of runtime routines for shift and division. */ + long long int llmax = 9223372036854775807ll; + unsigned long long int ullmax = 18446744073709551615ull; + return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) + | (llmax / ll) | (llmax % ll) + | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) + | (ullmax / ull) | (ullmax % ull)); + ; + return 0; +} + _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" $as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ---------------------------- ## -## Report this to tex-k@tug.org ## -## ---------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 + if test "$cross_compiling" = yes; then + ac_cv_type_long_long_int=yes else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -{ $as_echo "$as_me:$LINENO: checking for library containing pow" >&5 -$as_echo_n "checking for library containing pow... " >&6; } -if test "${ac_cv_search_pow+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char pow (); +#include + #ifndef LLONG_MAX + # define HALF \ + (1LL << (sizeof (long long int) * CHAR_BIT - 2)) + # define LLONG_MAX (HALF - 1 + HALF) + #endif int main () { -return pow (); +long long int n = 1; + int i; + for (i = 0; ; i++) + { + long long int m = n << i; + if (m >> i != n) + return 1; + if (LLONG_MAX / 2 < m) + break; + } + return 0; ; return 0; } _ACEOF -for ac_lib in '' m; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - rm -f conftest.$ac_objext conftest$ac_exeext +rm -f conftest$ac_exeext if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; @@ -21234,72 +21290,82 @@ case "(($ac_try" in esac eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" $as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 + (eval "$ac_link") 2>&5 ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_search_pow=$ac_res + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_long_long_int=yes else - $as_echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - +( exit $ac_status ) +ac_cv_type_long_long_int=no fi - rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_pow+set}" = set; then - break +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -done -if test "${ac_cv_search_pow+set}" = set; then - : + + else - ac_cv_search_pow=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_long_long_int=no fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_pow" >&5 -$as_echo "$ac_cv_search_pow" >&6; } -ac_res=$ac_cv_search_pow -if test "$ac_res" != no; then - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5 +$as_echo "$ac_cv_type_long_long_int" >&6; } + if test $ac_cv_type_long_long_int = yes; then +cat >>confdefs.h <<\_ACEOF +#define HAVE_LONG_LONG_INT 1 +_ACEOF -{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -$as_echo_n "checking return type of signal handlers... " >&6; } -if test "${ac_cv_type_signal+set}" = set; then + fi + + + +for ac_header in time.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then $as_echo_n "(cached) " >&6 +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } else - cat >conftest.$ac_ext <<_ACEOF + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include -#include - -int -main () -{ -return *(signal (0, 0)) (0) == 1; - ; - return 0; -} +$ac_includes_default +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -21319,77 +21385,224 @@ $as_echo "$ac_try_echo") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_type_signal=int + ac_header_compiler=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_signal=void + ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -$as_echo "$ac_cv_type_signal" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } -cat >>confdefs.h <<_ACEOF -#define RETSIGTYPE $ac_cv_type_signal +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF - - - -## _KPSE_INIT: Initialize TL infrastructure -kpse_BLD=`(cd "./../../." && pwd)` -kpse_SRC=`(cd "$srcdir/../../." && pwd)` - -## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests -: ${CONFIG_LT=./config.lt} -{ $as_echo "$as_me:$LINENO: creating $CONFIG_LT" >&5 -$as_echo "$as_me: creating $CONFIG_LT" >&6;} -cat >"$CONFIG_LT" <<_LTEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate a libtool stub with the current configuration. - -lt_cl_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_LTEOF - -cat >>"$CONFIG_LT" <<\_LTEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -as_nl=' -' -export as_nl +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( cat <<\_ASBOX +## ---------------------------- ## +## Report this to tex-k@tug.org ## +## ---------------------------- ## +_ASBOX + ) | sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + +fi +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + +{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5 +$as_echo_n "checking return type of signal handlers... " >&6; } +if test "${ac_cv_type_signal+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include + +int +main () +{ +return *(signal (0, 0)) (0) == 1; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_type_signal=int +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_signal=void +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 +$as_echo "$ac_cv_type_signal" >&6; } + +cat >>confdefs.h <<_ACEOF +#define RETSIGTYPE $ac_cv_type_signal +_ACEOF + + + +## _KPSE_INIT: Initialize TL infrastructure +kpse_BLD=`(cd "./../../." && pwd)` +kpse_SRC=`(cd "$srcdir/../../." && pwd)` + +## _KPSE_USE_LIBTOOL: Generate a libtool script for use in configure tests +: ${CONFIG_LT=./config.lt} +{ $as_echo "$as_me:$LINENO: creating $CONFIG_LT" >&5 +$as_echo "$as_me: creating $CONFIG_LT" >&6;} +cat >"$CONFIG_LT" <<_LTEOF +#! $SHELL +# Generated by $as_me. +# Run this file to recreate a libtool stub with the current configuration. + +lt_cl_silent=false +SHELL=\${CONFIG_SHELL-$SHELL} +_LTEOF + +cat >>"$CONFIG_LT" <<\_LTEOF +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +as_nl=' +' +export as_nl # Printing a long string crashes Solaris 7 /usr/bin/printf. as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo @@ -22961,484 +23174,105 @@ if test "x$with_system_zlib" = xyes; then fi ZLIB_LIBS="-lz" if test "x$with_zlib_libdir" != x && test "x$with_zlib_libdir" != xyes; then - ZLIB_LIBS="-L$with_zlib_libdir $ZLIB_LIBS" -fi -else - ZLIB_INCLUDES=`echo '-IBLD/libs/zlib' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - ZLIB_RULE='# Rebuild libz -$(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/zlib.h ${top_builddir}/../../libs/zlib/zconf.h - cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) -${top_builddir}/../../libs/zlib/zlib.h ${top_builddir}/../../libs/zlib/zconf.h: - cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS)' -fi - -## _KPSE_LIB_FLAGS: Setup libpng (-lpng) flags - -# Check whether --with-system-libpng was given. -if test "${with_system_libpng+set}" = set; then - withval=$with_system_libpng; -fi - -# Check whether --with-libpng-includes was given. -if test "${with_libpng_includes+set}" = set; then - withval=$with_libpng_includes; -fi - -# Check whether --with-libpng-libdir was given. -if test "${with_libpng_libdir+set}" = set; then - withval=$with_libpng_libdir; -fi -if test "x$with_system_libpng" = xyes; then - if test "x$with_libpng_includes" != x && test "x$with_libpng_includes" != xyes; then - LIBPNG_INCLUDES="-I$with_libpng_includes" -fi -LIBPNG_LIBS="-lpng" -if test "x$with_libpng_libdir" != x && test "x$with_libpng_libdir" != xyes; then - LIBPNG_LIBS="-L$with_libpng_libdir $LIBPNG_LIBS" -fi -else - LIBPNG_INCLUDES=`echo '-IBLD/libs/libpng' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - LIBPNG_LIBS=`echo 'BLD/libs/libpng/libpng.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - LIBPNG_DEPEND=`echo 'BLD/libs/libpng/libpng.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - LIBPNG_RULE='# Rebuild libpng -$(LIBPNG_DEPEND): ${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngconf.h - cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) -${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngconf.h: - cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS)' -fi - -## _KPSE_LIB_FLAGS: Setup xpdf (-lxpdf) flags - XPDF_INCLUDES=`echo '-DPDF_PARSER_ONLY -IBLD/libs/xpdf -IBLD/libs/xpdf/goo -IBLD/libs/xpdf/fofi -IBLD/libs/xpdf/xpdf' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - XPDF_LIBS=`echo 'BLD/libs/xpdf/libxpdf.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - XPDF_DEPEND=`echo 'BLD/libs/xpdf/libxpdf.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - XPDF_RULE='# Rebuild libxpdf -$(XPDF_DEPEND): ${top_builddir}/../../libs/xpdf/xpdf/Stream.h - cd ${top_builddir}/../../libs/xpdf && $(MAKE) $(AM_MAKEFLAGS) -${top_builddir}/../../libs/xpdf/xpdf/Stream.h: - cd ${top_builddir}/../../libs/xpdf && $(MAKE) $(AM_MAKEFLAGS)' - -## _KPSE_LIB_FLAGS: Setup obsdcompat (-lopenbsd-compat) flags - OBSDCOMPAT_INCLUDES=`echo '-IBLD/libs/obsdcompat -ISRC/libs/obsdcompat' | sed \ - -e "s,SRC/,$kpse_SRC/,g" \ - -e "s,BLD/,$kpse_BLD/,g"` - OBSDCOMPAT_LIBS=`echo 'BLD/libs/obsdcompat/libopenbsd-compat.a' | sed \ - -e "s,BLD/,$kpse_BLD/,g"` - OBSDCOMPAT_DEPEND=`echo 'BLD/libs/obsdcompat/libopenbsd-compat.a' | sed \ - -e 's,BLD/,${top_builddir}/../../,g'` - OBSDCOMPAT_RULE='# Rebuild libopenbsd-compat -$(OBSDCOMPAT_DEPEND): ${top_srcdir}/../../libs/obsdcompat/*.[ch] - cd ${top_builddir}/../../libs/obsdcompat && $(MAKE) $(AM_MAKEFLAGS)' - - -ac_config_headers="$ac_config_headers c-auto.h:c-auto.in" - - - - - - - -if test "x$enable_luatex" = xyes; then - ac_config_headers="$ac_config_headers ff-config.h:luatexdir/luafontloader/ff-config.in" - - -for ac_header in langinfo.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ---------------------------- ## -## Report this to tex-k@tug.org ## -## ---------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - { $as_echo "$as_me:$LINENO: checking for long double" >&5 -$as_echo_n "checking for long double... " >&6; } -if test "${ac_cv_type_long_double+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test "$GCC" = yes; then - ac_cv_type_long_double=yes - else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* The Stardent Vistra knows sizeof (long double), but does - not support it. */ - long double foo = 0.0L; -int -main () -{ -static int test_array [1 - 2 * !(/* On Ultrix 4.3 cc, long double is 4 and double is 8. */ - sizeof (double) <= sizeof (long double))]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_long_double=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_long_double=no + ZLIB_LIBS="-L$with_zlib_libdir $ZLIB_LIBS" fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi +else + ZLIB_INCLUDES=`echo '-IBLD/libs/zlib' | sed \ + -e "s,SRC/,$kpse_SRC/,g" \ + -e "s,BLD/,$kpse_BLD/,g"` + ZLIB_LIBS=`echo 'BLD/libs/zlib/libz.a' | sed \ + -e "s,BLD/,$kpse_BLD/,g"` + ZLIB_DEPEND=`echo 'BLD/libs/zlib/libz.a' | sed \ + -e 's,BLD/,${top_builddir}/../../,g'` + ZLIB_RULE='# Rebuild libz +$(ZLIB_DEPEND): ${top_builddir}/../../libs/zlib/zlib.h ${top_builddir}/../../libs/zlib/zconf.h + cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS) +${top_builddir}/../../libs/zlib/zlib.h ${top_builddir}/../../libs/zlib/zconf.h: + cd ${top_builddir}/../../libs/zlib && $(MAKE) $(AM_MAKEFLAGS)' fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_long_double" >&5 -$as_echo "$ac_cv_type_long_double" >&6; } - if test $ac_cv_type_long_double = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_LONG_DOUBLE 1 -_ACEOF +## _KPSE_LIB_FLAGS: Setup libpng (-lpng) flags - fi +# Check whether --with-system-libpng was given. +if test "${with_system_libpng+set}" = set; then + withval=$with_system_libpng; +fi +# Check whether --with-libpng-includes was given. +if test "${with_libpng_includes+set}" = set; then + withval=$with_libpng_includes; +fi - { $as_echo "$as_me:$LINENO: checking for long long int" >&5 -$as_echo_n "checking for long long int... " >&6; } -if test "${ac_cv_type_long_long_int+set}" = set; then - $as_echo_n "(cached) " >&6 +# Check whether --with-libpng-libdir was given. +if test "${with_libpng_libdir+set}" = set; then + withval=$with_libpng_libdir; +fi +if test "x$with_system_libpng" = xyes; then + if test "x$with_libpng_includes" != x && test "x$with_libpng_includes" != xyes; then + LIBPNG_INCLUDES="-I$with_libpng_includes" +fi +LIBPNG_LIBS="-lpng" +if test "x$with_libpng_libdir" != x && test "x$with_libpng_libdir" != xyes; then + LIBPNG_LIBS="-L$with_libpng_libdir $LIBPNG_LIBS" +fi else - cat >conftest.$ac_ext <<_ACEOF + LIBPNG_INCLUDES=`echo '-IBLD/libs/libpng' | sed \ + -e "s,SRC/,$kpse_SRC/,g" \ + -e "s,BLD/,$kpse_BLD/,g"` + LIBPNG_LIBS=`echo 'BLD/libs/libpng/libpng.a' | sed \ + -e "s,BLD/,$kpse_BLD/,g"` + LIBPNG_DEPEND=`echo 'BLD/libs/libpng/libpng.a' | sed \ + -e 's,BLD/,${top_builddir}/../../,g'` + LIBPNG_RULE='# Rebuild libpng +$(LIBPNG_DEPEND): ${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngconf.h + cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) +${top_builddir}/../../libs/libpng/png.h ${top_builddir}/../../libs/libpng/pngconf.h: + cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS)' +fi - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Test preprocessor. */ - #if ! (-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) - error in preprocessor; - #endif - #if ! (18446744073709551615ULL <= -1ull) - error in preprocessor; - #endif - /* Test literals. */ - long long int ll = 9223372036854775807ll; - long long int nll = -9223372036854775807LL; - unsigned long long int ull = 18446744073709551615ULL; - /* Test constant expressions. */ - typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll) - ? 1 : -1)]; - typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1 - ? 1 : -1)]; - int i = 63; -int -main () -{ -/* Test availability of runtime routines for shift and division. */ - long long int llmax = 9223372036854775807ll; - unsigned long long int ullmax = 18446744073709551615ull; - return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) - | (llmax / ll) | (llmax % ll) - | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i) - | (ullmax / ull) | (ullmax % ull)); - ; - return 0; -} +## _KPSE_LIB_FLAGS: Setup xpdf (-lxpdf) flags + XPDF_INCLUDES=`echo '-DPDF_PARSER_ONLY -IBLD/libs/xpdf -IBLD/libs/xpdf/goo -IBLD/libs/xpdf/fofi -IBLD/libs/xpdf/xpdf' | sed \ + -e "s,SRC/,$kpse_SRC/,g" \ + -e "s,BLD/,$kpse_BLD/,g"` + XPDF_LIBS=`echo 'BLD/libs/xpdf/libxpdf.a' | sed \ + -e "s,BLD/,$kpse_BLD/,g"` + XPDF_DEPEND=`echo 'BLD/libs/xpdf/libxpdf.a' | sed \ + -e 's,BLD/,${top_builddir}/../../,g'` + XPDF_RULE='# Rebuild libxpdf +$(XPDF_DEPEND): ${top_builddir}/../../libs/xpdf/xpdf/Stream.h + cd ${top_builddir}/../../libs/xpdf && $(MAKE) $(AM_MAKEFLAGS) +${top_builddir}/../../libs/xpdf/xpdf/Stream.h: + cd ${top_builddir}/../../libs/xpdf && $(MAKE) $(AM_MAKEFLAGS)' -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - if test "$cross_compiling" = yes; then - ac_cv_type_long_long_int=yes -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - #ifndef LLONG_MAX - # define HALF \ - (1LL << (sizeof (long long int) * CHAR_BIT - 2)) - # define LLONG_MAX (HALF - 1 + HALF) - #endif -int -main () -{ -long long int n = 1; - int i; - for (i = 0; ; i++) - { - long long int m = n << i; - if (m >> i != n) - return 1; - if (LLONG_MAX / 2 < m) - break; - } - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_long_long_int=yes -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +## _KPSE_LIB_FLAGS: Setup obsdcompat (-lopenbsd-compat) flags + OBSDCOMPAT_INCLUDES=`echo '-IBLD/libs/obsdcompat -ISRC/libs/obsdcompat' | sed \ + -e "s,SRC/,$kpse_SRC/,g" \ + -e "s,BLD/,$kpse_BLD/,g"` + OBSDCOMPAT_LIBS=`echo 'BLD/libs/obsdcompat/libopenbsd-compat.a' | sed \ + -e "s,BLD/,$kpse_BLD/,g"` + OBSDCOMPAT_DEPEND=`echo 'BLD/libs/obsdcompat/libopenbsd-compat.a' | sed \ + -e 's,BLD/,${top_builddir}/../../,g'` + OBSDCOMPAT_RULE='# Rebuild libopenbsd-compat +$(OBSDCOMPAT_DEPEND): ${top_srcdir}/../../libs/obsdcompat/*.[ch] + cd ${top_builddir}/../../libs/obsdcompat && $(MAKE) $(AM_MAKEFLAGS)' -( exit $ac_status ) -ac_cv_type_long_long_int=no -fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi +ac_config_headers="$ac_config_headers c-auto.h:c-auto.in" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_long_long_int=no -fi -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5 -$as_echo "$ac_cv_type_long_long_int" >&6; } - if test $ac_cv_type_long_long_int = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_LONG_LONG_INT 1 -_ACEOF - fi -fi +ac_config_headers="$ac_config_headers ff-config.h:luatexdir/luafontloader/ff-config.in" # For cross-compilation. Put at the end so there is a fair chance # these are still visible when the configure script has finished. # The supporting programs we need to have available on the build machine. -# make variable cross native +# make variable cross native if test "x$cross_compiling" = xyes; then # Extract the first word of "tangle", so it can be a program name with args. set dummy tangle; ac_word=$2 @@ -23699,8 +23533,7 @@ else TIE=./tie fi -if test "x$enable_otangle" = xyes; then - if test "x$cross_compiling" = xyes; then +if test "x$cross_compiling" = xyes; then # Extract the first word of "otangle", so it can be a program name with args. set dummy otangle; ac_word=$2 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -23752,10 +23585,7 @@ else OTANGLE=./otangle fi -fi - -if test "x$enable_luatex" = xyes; then - if test "x$cross_compiling" = xyes; then +if test "x$cross_compiling" = xyes; then # Extract the first word of "luatangle", so it can be a program name with args. set dummy luatangle; ac_word=$2 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -23807,16 +23637,6 @@ else LUATANGLE=./luatangle fi -fi - - - - -subdirs="$subdirs web2c" - - -ac_config_files="$ac_config_files Makefile doc/Makefile lib/Makefile man/Makefile mpware/Makefile omegafonts/Makefile otps/Makefile window/Makefile" - if test "x$cross_compiling" = xyes; then { $as_echo "$as_me:$LINENO: checking if your tie supports WEBINPUTS" >&5 @@ -23883,6 +23703,14 @@ fi +subdirs="$subdirs web2c" + + +ac_config_files="$ac_config_files Makefile doc/Makefile lib/Makefile man/Makefile mpware/Makefile omegafonts/Makefile otps/Makefile window/Makefile" + + + + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -24022,13 +23850,6 @@ $as_echo "$as_me: error: conditional \"FMU\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${HAVE_EXEEXT_TRUE}" && test -z "${HAVE_EXEEXT_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_EXEEXT\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"HAVE_EXEEXT\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then { { $as_echo "$as_me:$LINENO: error: conditional \"WIN32\" was never defined. Usually this means the macro was only invoked conditionally." >&5 diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index 5f1a67ffd2f..f75959c1839 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -61,8 +61,6 @@ AS_IF([test "x$enable_dump_share" = xno], AM_CONDITIONAL([FMU], [test "x$enable_fmtutil" = xyes]) -AM_CONDITIONAL([HAVE_EXEEXT], [test "x$(EXEEXT)" != x ]) - KPSE_CHECK_WIN32 AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno]) AM_CONDITIONAL([MINGW32], [test "x$kpse_cv_have_win32" = xmingw32]) @@ -128,7 +126,7 @@ AC_SUBST([x_ext_lib]) AC_SUBST([x_tool_libs]) AC_SUBST([wlibs]) -dnl Generate *WIN defines. +dnl Generate MetaFont *WIN defines. m4_foreach([Kpse_Win], [kpse_mf_win], [m4_ifset([Kpse_Win], [KPSE_MFWIN_DEFINE(Kpse_Win)])])[]dnl @@ -172,16 +170,19 @@ if test `(uname) 2>/dev/null` = aux; then AC_CHECK_LIB([posix], [sigemptyset]) fi +dnl FIXME: luaTeX requires , access, and atoi +dnl AC_CHECK_SIZEOF([int]) AC_CHECK_SIZEOF([long]) +AC_SEARCH_LIBS([pow], [m]) AC_CHECK_FUNCS([access atoi strerror]) -AC_CHECK_HEADERS([errno.h sys/timeb.h sys/wait.h]) +AC_CHECK_HEADERS([errno.h langinfo.h sys/timeb.h sys/wait.h]) +AC_TYPE_LONG_DOUBLE +AC_TYPE_LONG_LONG_INT dnl FIXME: needed for libpdf -> xpdf ? AC_CHECK_HEADERS([time.h]) -AC_SEARCH_LIBS([pow], [m]) - dnl FIXME: obsolete AC_TYPE_SIGNAL @@ -222,35 +223,23 @@ AH_TOP([/* c-auto.h: defines for web2c, as determined by configure. #define WEB2CVERSION "REPLACE-WITH-WEB2CVERSION"]) AH_BOTTOM([#endif /* !WEB2C_C_AUTO_H */]) -dnl FIXME: luaTeX requires , access, and atoi -dnl -AS_IF([test "x$enable_luatex" = xyes], -[AC_CONFIG_HEADERS([ff-config.h:luatexdir/luafontloader/ff-config.in]) -AC_CHECK_HEADERS([langinfo.h]) -AC_TYPE_LONG_DOUBLE -AC_TYPE_LONG_LONG_INT -]) +dnl Additional config header for luaTeX +AC_CONFIG_HEADERS([ff-config.h:luatexdir/luafontloader/ff-config.in]) # For cross-compilation. Put at the end so there is a fair chance # these are still visible when the configure script has finished. # The supporting programs we need to have available on the build machine. -# make variable cross native -KPSE_CROSS_PATH_PROG([TANGLEBOOT], [tangle], [./tangleboot]) -KPSE_CROSS_PATH_PROG([TANGLE], [tangle], [./tangle]) -KPSE_CROSS_PATH_PROG([CTANGLEBOOT], [ctangle], [./ctangleboot]) -KPSE_CROSS_PATH_PROG([CTANGLE], [ctangle], [./ctangle]) -KPSE_CROSS_PATH_PROG([TIE], [tie], [./tie]) -AS_IF([test "x$enable_otangle" = xyes], - [KPSE_CROSS_PATH_PROG([OTANGLE], [otangle], [./otangle])]) -AS_IF([test "x$enable_luatex" = xyes], - [KPSE_CROSS_PATH_PROG([LUATANGLE], [luatangle], [./luatangle])]) - -AC_CONFIG_SUBDIRS([web2c]) - -AC_CONFIG_FILES([Makefile doc/Makefile lib/Makefile man/Makefile - mpware/Makefile omegafonts/Makefile otps/Makefile - window/Makefile]) +# make variable cross native +KPSE_CROSS_PATH_PROG([TANGLEBOOT], [tangle], [./tangleboot]) +KPSE_CROSS_PATH_PROG([TANGLE], [tangle], [./tangle]) +KPSE_CROSS_PATH_PROG([CTANGLEBOOT], [ctangle], [./ctangleboot]) +KPSE_CROSS_PATH_PROG([CTANGLE], [ctangle], [./ctangle]) +KPSE_CROSS_PATH_PROG([TIE], [tie], [./tie]) +dnl Required for Aleph and XeTeX +KPSE_CROSS_PATH_PROG([OTANGLE], [otangle], [./otangle]) +dnl Required for luaTeX +KPSE_CROSS_PATH_PROG([LUATANGLE], [luatangle], [./luatangle]) if test "x$cross_compiling" = xyes; then AC_MSG_CHECKING([if your tie supports WEBINPUTS]) @@ -303,6 +292,12 @@ if test "x$cross_compiling" = xyes; then fi fi +AC_CONFIG_SUBDIRS([web2c]) + +AC_CONFIG_FILES([Makefile doc/Makefile lib/Makefile man/Makefile + mpware/Makefile omegafonts/Makefile otps/Makefile + window/Makefile]) + dnl The subdirectory web2c must be configured for the build system. dnl Can not share the cache file with the subdirectory! AC_CONFIG_COMMANDS_POST([AS_IF([test "x$cross_compiling" = xyes], diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am index 9ec5f82e154..29c033eb7c7 100644 --- a/Build/source/texk/web2c/etexdir/am/etex.am +++ b/Build/source/texk/web2c/etexdir/am/etex.am @@ -23,7 +23,7 @@ etex-web2c: etex.p $(web2c_texmf) etexextra.c: etexdir/etexextra.h lib/texmfmp.c etexd.h sed s/TEX-OR-MF-OR-MP/etex/ $(srcdir)/lib/texmfmp.c >$@ etex.p etex.pool: etex-tangle -etex-tangle: tangle etex.web etex.ch +etex-tangle: tangle$(EXEEXT) etex.web etex.ch $(tangle) etex etex echo timestamp >$@ touch etex.p etex.pool diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am index 04b3a0d7033..cbaf040e13d 100644 --- a/Build/source/texk/web2c/luatexdir/am/luatex.am +++ b/Build/source/texk/web2c/luatexdir/am/luatex.am @@ -38,7 +38,7 @@ luatexextra.c: luatexd.h luatexdir/luatexextra.h lib/texmfmp.c sed s/TEX-OR-MF-OR-MP/luatex/ $(srcdir)/lib/texmfmp.c >$@ luatex_sources = luatexdir/luatex.web luatexdir/luatex.ch luatex.p luatex.pool: luatex-tangle -luatex-tangle: luatangle $(luatex_sources) +luatex-tangle: luatangle$(EXEEXT) $(luatex_sources) $(luatex_tangle) --underlines luatex luatex echo timestamp >$@ touch luatex.p luatex.pool @@ -73,14 +73,9 @@ luatangle.c luatangle.h: $(web2c_common) $(web2c_programs) luatangle.p $(web2c) luatangle EXTRA_DIST += $(luatangle_sources) luatangle_sources = luatexdir/luatangle.web luatexdir/luatangle.ch -luatangle.p: tangle $(luatangle_sources) +luatangle.p: tangle$(EXEEXT) $(luatangle_sources) WEBINPUTS=$(srcdir)/luatexdir $(buildenv) $(TANGLE) luatangle luatangle DISTCLEANFILES += luatangle.c luatangle.h luatangle.p -if HAVE_EXEEXT -luatangle: luatangle$(EXEEXT) - echo timestamp >$@ -CLEANFILES += luatangle -endif HAVE_EXEEXT ## liblua51 ## @@ -669,11 +664,8 @@ libluatex_a_SOURCES = \ nodist_libluatex_a_SOURCES = $(lua_mp_c_h) -## We must create lua_mp_c_h before compiling the libluatex_a_SOURCES, -## but certainly don't want to create lua_mp_c_h if luaTeX is not built. -if LUATEX -$(libluatex_a_SOURCES): $(lua_mp_c_h) -endif LUATEX +## We must create lua_mp_c_h before building the libluatex_a_SOURCES. +$(libluatex_a_OBJECTS): $(lua_mp_c_h) ## These files are mutually dependent lua_mp_c_h = luatexdir/mp.c luatexdir/mplib.h luatexdir/mpmp.h @@ -683,7 +675,7 @@ lua_mp_web = luatexdir/mp/avl.h luatexdir/mp/avl.c luatexdir/mp/mp.w luatexdir/ lua_mp_web += luatexdir/mp/memio.w luatexdir/mp/tfmin.w libluatex_a_CPPFLAGS += -I$(srcdir)/luatexdir/mp $(lua_mp_c_h): mp-ctangle -mp-ctangle: ctangle $(lua_mp_web) luatexd.h +mp-ctangle: ctangle$(EXEEXT) $(lua_mp_web) luatexd.h $(mkdir_p) luatexdir CWEBINPUTS=$(srcdir)/luatexdir/mp $(ctangle) mp.w CWEBINPUTS=$(srcdir)/luatexdir/mp $(ctangle) psout.w diff --git a/Build/source/texk/web2c/mpdir/am/mp.am b/Build/source/texk/web2c/mpdir/am/mp.am index 1240c4f0d06..f237c8c8d9a 100644 --- a/Build/source/texk/web2c/mpdir/am/mp.am +++ b/Build/source/texk/web2c/mpdir/am/mp.am @@ -20,7 +20,7 @@ EXTRA_DIST += mp.web mp.ch lib/texmfmp.c mpdir/mp.defines mpdir/mplib.h mpextra.c: lib/texmfmp.c mpd.h sed s/TEX-OR-MF-OR-MP/mp/ $(srcdir)/lib/texmfmp.c >$@ mp.p mp.pool: mp-tangle -mp-tangle: tangle mp.web mp.ch +mp-tangle: tangle$(EXEEXT) mp.web mp.ch $(tangle) mp mp echo timestamp >$@ touch mp.p mp.pool @@ -48,8 +48,8 @@ libmpost_a_SOURCES = \ mpdir/writefont.c \ mpdir/writet1.c -## We must create mpd.h before compiling the libmpost_a_SOURCES. -$(libmpost_a_SOURCES): mpd.h +## We must create mpd.h before building the libmpost_a_OBJECTS. +$(libmpost_a_OBJECTS): mpd.h ## Eventually delete these files ## diff --git a/Build/source/texk/web2c/omegaware/am/omegaware.am b/Build/source/texk/web2c/omegaware/am/omegaware.am index 24599f8b82d..e54c8096fd0 100644 --- a/Build/source/texk/web2c/omegaware/am/omegaware.am +++ b/Build/source/texk/web2c/omegaware/am/omegaware.am @@ -26,7 +26,7 @@ odvicopy-web2c: $(web2c_common) $(web2c_programs) odvicopy.p touch odvicopy.c odvicopy.h EXTRA_DIST += $(odvicopy_sources) odvicopy_sources = omegaware/odvicopy.web omegaware/odvicopy.ch -odvicopy.p: tangle $(odvicopy_sources) +odvicopy.p: tangle$(EXEEXT) $(odvicopy_sources) $(ow_tangle) odvicopy odvicopy nodist_odvitype_SOURCES = odvitype.c odvitype.h @@ -37,7 +37,7 @@ odvitype-web2c: $(web2c_common) $(web2c_programs) odvitype.p touch odvitype.c odvitype.h EXTRA_DIST += $(odvitype_sources) odvitype_sources = omegaware/odvitype.web omegaware/odvitype.ch -odvitype.p: tangle $(odvitype_sources) +odvitype.p: tangle$(EXEEXT) $(odvitype_sources) $(ow_tangle) odvitype odvitype nodist_ofm2opl_SOURCES = ofm2opl.c ofm2opl.h @@ -48,7 +48,7 @@ ofm2opl-web2c: $(web2c_common) $(web2c_programs) ofm2opl.p touch ofm2opl.c ofm2opl.h EXTRA_DIST += $(ofm2opl_sources) ofm2opl_sources = omegaware/ofm2opl.web omegaware/ofm2opl.ch -ofm2opl.p: tangle $(ofm2opl_sources) +ofm2opl.p: tangle$(EXEEXT) $(ofm2opl_sources) $(ow_tangle) ofm2opl ofm2opl nodist_opl2ofm_SOURCES = opl2ofm.c opl2ofm.h @@ -59,7 +59,7 @@ opl2ofm-web2c: $(web2c_common) $(web2c_programs) opl2ofm.p touch opl2ofm.c opl2ofm.h EXTRA_DIST += $(opl2ofm_sources) opl2ofm_sources = omegaware/opl2ofm.web omegaware/opl2ofm.ch -opl2ofm.p: tangle $(opl2ofm_sources) +opl2ofm.p: tangle$(EXEEXT) $(opl2ofm_sources) $(ow_tangle) opl2ofm opl2ofm nodist_otangle_SOURCES = otangle.c otangle.h @@ -70,13 +70,8 @@ otangle-web2c: $(web2c_common) $(web2c_programs) otangle.p touch otangle.c otangle.h EXTRA_DIST += $(otangle_sources) otangle_sources = omegaware/otangle.web omegaware/otangle.ch -otangle.p: tangle $(otangle_sources) +otangle.p: tangle$(EXEEXT) $(otangle_sources) $(ow_tangle) otangle otangle -if HAVE_EXEEXT -otangle: otangle$(EXEEXT) - echo timestamp >$@ -CLEANFILES += otangle -endif HAVE_EXEEXT nodist_ovf2ovp_SOURCES = ovf2ovp.c ovf2ovp.h ovf2ovp.c ovf2ovp.h: ovf2ovp-web2c @@ -86,7 +81,7 @@ ovf2ovp-web2c: $(web2c_common) $(web2c_programs) ovf2ovp.p touch ovf2ovp.c ovf2ovp.h EXTRA_DIST += $(ovf2ovp_sources) ovf2ovp_sources = omegaware/ovf2ovp.web omegaware/ovf2ovp.ch -ovf2ovp.p: tangle $(ovf2ovp_sources) +ovf2ovp.p: tangle$(EXEEXT) $(ovf2ovp_sources) $(ow_tangle) ovf2ovp ovf2ovp nodist_ovp2ovf_SOURCES = ovp2ovf.c ovp2ovf.h @@ -97,7 +92,7 @@ ovp2ovf-web2c: $(web2c_common) $(web2c_programs) ovp2ovf.p touch ovp2ovf.c ovp2ovf.h EXTRA_DIST += $(ovp2ovf_sources) ovp2ovf_sources = omegaware/ovp2ovf.web omegaware/ovp2ovf.ch -ovp2ovf.p: tangle $(ovp2ovf_sources) +ovp2ovf.p: tangle$(EXEEXT) $(ovp2ovf_sources) $(ow_tangle) ovp2ovf ovp2ovf ## Tests diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am index 73e4dbc0053..6082ff503d2 100644 --- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am +++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am @@ -40,7 +40,7 @@ pdftex-web2c: pdftex.p $(web2c_texmf) pdftexdir/pdftex.defines pdftexextra.c: pdftexd.h pdftexdir/pdftexextra.h lib/texmfmp.c pdftexd.h sed s/TEX-OR-MF-OR-MP/pdftex/ $(srcdir)/lib/texmfmp.c >$@ pdftex.p pdftex.pool: pdftex-tangle -pdftex-tangle: tangle pdftexdir/pdftex.web pdftex.ch +pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex.ch $(pdf_tangle) pdftex pdftex echo timestamp >$@ touch pdftex.p pdftex.pool @@ -134,11 +134,8 @@ libpdftex_a_SOURCES = \ pdftexdir/writettf.h \ pdftexdir/writezip.c -## We must create pdftexd.h before compiling the libpdftex_a_SOURCES, -## but certainly don't want to create pdftexd.h if pdfTeX is not built. -if PDFTEX -$(libpdftex_a_SOURCES): pdftexd.h -endif PDFTEX +## We must create pdftexd.h before building the libpdftex_a_OBJECTS. +$(libpdftex_a_OBJECTS): pdftexd.h ## included by pdftexdir/writettf.c EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c -- cgit v1.2.3