From a410fdbbe84e08ba3539ec562129997ed74b7a41 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Wed, 15 Jul 2009 09:49:07 +0000 Subject: build fix: dependencies for "make check" git-svn-id: svn://tug.org/texlive/trunk@14268 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/README.config | 2 +- Build/source/configure | 20 +++++++------- Build/source/configure.ac | 2 +- Build/source/texk/web2c/ChangeLog | 5 ++++ Build/source/texk/web2c/Makefile.am | 5 ++++ Build/source/texk/web2c/Makefile.in | 54 +++++++++++++++++++------------------ 6 files changed, 50 insertions(+), 38 deletions(-) diff --git a/Build/source/README.config b/Build/source/README.config index 1811bdd7629..2b4502afdbe 100644 --- a/Build/source/README.config +++ b/Build/source/README.config @@ -192,7 +192,7 @@ Use libpoppler instead of xpdf (and pkg-config to obtain the required flags). 4. Interesting and/or important VAR=value configure arguments -========================================== +============================================================= Used instead of searching for programs in PATH. 4.1. FT2_CONFIG=/path/to/freetype-config diff --git a/Build/source/configure b/Build/source/configure index bf57c179ac0..ac69e789ba2 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for TeX Live 2009-06-12. +# Generated by GNU Autoconf 2.63 for TeX Live 2009-07-13. # # Report bugs to . # @@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='TeX Live' PACKAGE_TARNAME='tex-live' -PACKAGE_VERSION='2009-06-12' -PACKAGE_STRING='TeX Live 2009-06-12' +PACKAGE_VERSION='2009-07-13' +PACKAGE_STRING='TeX Live 2009-07-13' PACKAGE_BUGREPORT='tex-k@tug.org' ac_unique_file="m4/kpse-pkgs.m4" @@ -1619,7 +1619,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures TeX Live 2009-06-12 to adapt to many kinds of systems. +\`configure' configures TeX Live 2009-07-13 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1693,7 +1693,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of TeX Live 2009-06-12:";; + short | recursive ) echo "Configuration of TeX Live 2009-07-13:";; esac cat <<\_ACEOF @@ -1953,7 +1953,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -TeX Live configure 2009-06-12 +TeX Live configure 2009-07-13 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1967,7 +1967,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by TeX Live $as_me 2009-06-12, which was +It was created by TeX Live $as_me 2009-07-13, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -8810,7 +8810,7 @@ fi # Define the identity of the package. PACKAGE='tex-live' - VERSION='2009-06-12' + VERSION='2009-07-13' cat >>confdefs.h <<_ACEOF @@ -23943,7 +23943,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by TeX Live $as_me 2009-06-12, which was +This file was extended by TeX Live $as_me 2009-07-13, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23997,7 +23997,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -TeX Live config.status 2009-06-12 +TeX Live config.status 2009-07-13 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/Build/source/configure.ac b/Build/source/configure.ac index 3ad3585a9e9..89ba8421650 100644 --- a/Build/source/configure.ac +++ b/Build/source/configure.ac @@ -6,7 +6,7 @@ dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -AC_INIT([TeX Live], [2009-06-12], [tex-k@tug.org]) +AC_INIT([TeX Live], [2009-07-13], [tex-k@tug.org]) AC_PREREQ([2.63]) AC_CONFIG_SRCDIR([m4/kpse-pkgs.m4]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index c49dceabb74..fe37d6de6cf 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,8 @@ +2009-07-14 Peter Breitenlohner + + * Makefile.am (check_PROGRAMS): pltotf and tftopl are required + by both omegafonts/omfonts.test and omegaware/omfonts.test. + 2009-07-13 Peter Breitenlohner * cpascal.h: recover definition of kpsesrccmdline. diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am index b6fb3ac0708..f99992ccdbf 100644 --- a/Build/source/texk/web2c/Makefile.am +++ b/Build/source/texk/web2c/Makefile.am @@ -158,6 +158,11 @@ include $(srcdir)/xetexdir/am/xetex.am ## omegaware web programs include $(srcdir)/omegaware/am/omegaware.am +## programs required for 'make check' in omegafonts/ and omegaware/ +if OTANGLE +check_PROGRAMS += pltotf tftopl +endif OTANGLE + ## Aleph include $(srcdir)/alephdir/am/aleph.am diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 1989af2e707..eab0bbc3bf7 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -47,8 +47,8 @@ bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \ $(am__EXEEXT_16) synctex$(EXEEXT) noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) check_PROGRAMS = $(am__EXEEXT_17) $(am__EXEEXT_18) $(am__EXEEXT_19) \ - $(am__EXEEXT_20) md5main$(EXEEXT) -TESTS = tangle.test $(am__EXEEXT_23) ctiedir/ctie.test \ + $(am__EXEEXT_20) $(am__EXEEXT_21) md5main$(EXEEXT) +TESTS = tangle.test $(am__EXEEXT_24) ctiedir/ctie.test \ cwebdir/cweave.test tiedir/tie.test $(am__append_4) \ $(am__append_8) $(am__append_11) $(am__append_14) \ $(am__append_19) $(am__append_35) $(am__append_36) \ @@ -151,23 +151,24 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \ @OMFONTS_FALSE@@OTANGLE_TRUE@am__append_34 = $(omegaware_font_tools) @OTANGLE_TRUE@am__append_35 = omegaware/otangle.test @OMFONTS_FALSE@@OTANGLE_TRUE@am__append_36 = omegaware/level1.test omegaware/omfonts.test -@ALEPH_TRUE@am__append_37 = aleph -@TEX_SYNCTEX_TRUE@am__append_38 = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -@TEX_SYNCTEX_TRUE@am__append_39 = $(ZLIB_LIBS) -@TEX_SYNCTEX_TRUE@am__append_40 = \ +@OTANGLE_TRUE@am__append_37 = pltotf tftopl +@ALEPH_TRUE@am__append_38 = aleph +@TEX_SYNCTEX_TRUE@am__append_39 = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) +@TEX_SYNCTEX_TRUE@am__append_40 = $(ZLIB_LIBS) +@TEX_SYNCTEX_TRUE@am__append_41 = \ @TEX_SYNCTEX_TRUE@ synctex.c -@ETEX_SYNCTEX_TRUE@am__append_41 = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -@ETEX_SYNCTEX_TRUE@am__append_42 = $(ZLIB_LIBS) -@ETEX_SYNCTEX_TRUE@am__append_43 = \ +@ETEX_SYNCTEX_TRUE@am__append_42 = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) +@ETEX_SYNCTEX_TRUE@am__append_43 = $(ZLIB_LIBS) +@ETEX_SYNCTEX_TRUE@am__append_44 = \ @ETEX_SYNCTEX_TRUE@ synctex-e.c -@PDFTEX_SYNCTEX_TRUE@am__append_44 = -I$(srcdir)/synctexdir -@PDFTEX_SYNCTEX_TRUE@am__append_45 = \ +@PDFTEX_SYNCTEX_TRUE@am__append_45 = -I$(srcdir)/synctexdir +@PDFTEX_SYNCTEX_TRUE@am__append_46 = \ @PDFTEX_SYNCTEX_TRUE@ synctex-pdf.c -@XETEX_SYNCTEX_TRUE@am__append_46 = -I$(srcdir)/synctexdir -@XETEX_SYNCTEX_TRUE@am__append_47 = \ +@XETEX_SYNCTEX_TRUE@am__append_47 = -I$(srcdir)/synctexdir +@XETEX_SYNCTEX_TRUE@am__append_48 = \ @XETEX_SYNCTEX_TRUE@ synctex-xe.c subdir = . @@ -467,6 +468,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ @MP_TRUE@am__EXEEXT_19 = pltotf$(EXEEXT) tftopl$(EXEEXT) @ETEX_TRUE@am__EXEEXT_20 = dvitype$(EXEEXT) pltotf$(EXEEXT) \ @ETEX_TRUE@ tftopl$(EXEEXT) +@OTANGLE_TRUE@am__EXEEXT_21 = pltotf$(EXEEXT) tftopl$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am_aleph_OBJECTS = aleph-aleph.$(OBJEXT) aleph-alephbis.$(OBJEXT) am__objects_9 = aleph-alephini.$(OBJEXT) aleph-aleph0.$(OBJEXT) \ @@ -803,12 +805,12 @@ ETAGS = etags CTAGS = ctags am__tty_colors = \ red=; grn=; lgn=; blu=; std= -am__EXEEXT_21 = bibtex.test dvicopy.test dvitype.test gftodvi.test \ +am__EXEEXT_22 = bibtex.test dvicopy.test dvitype.test gftodvi.test \ gftopk.test gftype.test mft.test patgen.test pktogf.test \ pktype.test pltotf.test pooltype.test tftopl.test vftovp.test \ vptovf.test weave.test -am__EXEEXT_22 = $(am__EXEEXT_21) -@WEB_TRUE@am__EXEEXT_23 = $(am__EXEEXT_22) +am__EXEEXT_23 = $(am__EXEEXT_22) +@WEB_TRUE@am__EXEEXT_24 = $(am__EXEEXT_23) DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -1327,14 +1329,14 @@ web_tests = $(web_programs:=.test) nodist_ctie_SOURCES = ctie.c nodist_cweave_SOURCES = cweave.c cweb.c nodist_tie_SOURCES = tie.c -tex_CPPFLAGS = $(am__append_38) +tex_CPPFLAGS = $(am__append_39) # With --enable-ipc, TeX may need to link with -lsocket. -tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_39) +tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_40) # TeX C sources 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_40) +nodist_tex_SOURCES = $(tex_c_h) tex-pool.c texextra.c $(am__append_41) tex_ch_srcs = \ tex.web \ tex.ch \ @@ -1373,15 +1375,15 @@ psout_c_h = mppsout.h psout.c mplibps.h svgout_c_h = mplibsvg.h mpsvgout.h svgout.c libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \ mplibdir/memio.w mplibdir/tfmin.w -etex_CPPFLAGS = $(am__append_41) +etex_CPPFLAGS = $(am__append_42) # With --enable-ipc, e-TeX may need to link with -lsocket. -etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_42) +etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_43) # e-TeX C sources 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_43) + etexdir/etexextra.h $(am__append_44) etex_web_srcs = \ tex.web \ etexdir/etex.ch \ @@ -1407,12 +1409,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_44) +pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_45) pdftex_LDADD = libpdftex.a $(pdftex_ldadd) $(LDADD) $(ipc_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_45) + pdftexdir/pdftexextra.h $(am__append_46) pdftex_ch_srcs = \ pdftexdir/pdftex.web \ pdftexdir/tex.ch0 \ @@ -1855,12 +1857,12 @@ xetex_dependencies = $(proglib) $(ICU_DEPEND) $(TECKIT_DEPEND) \ $(am__append_26) $(am__append_29) $(FREETYPE2_DEPEND) \ $(ZLIB_DEPEND) @XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework Carbon -framework Cocoa -framework QuickTime -xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_46) +xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_47) xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs) xetex_DEPENDENCIES = $(xetex_dependencies) $(libxetex) xetex_c_h = xetexini.c xetex0.c xetex1.c xetex2.c xetexcoerce.h xetexd.h nodist_xetex_SOURCES = $(xetex_c_h) xetex_pool.c xetexextra.c \ - xetexdir/xetexextra.h $(am__append_47) + xetexdir/xetexextra.h $(am__append_48) xetex_web_srcs = \ tex.web \ etexdir/etex.ch \ -- cgit v1.2.3