From 754e9c2248c33e0f7b6e859f7337789acf742a9d Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 7 Jul 2015 11:23:46 +0000 Subject: Build system: Fixed --disable-bibtex[8u] and --disable-(x)dvipdfmx git-svn-id: svn://tug.org/texlive/trunk@37787 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/configure | 8 ++++---- Build/source/libs/configure | 8 ++++---- Build/source/texk/bibtex-x/ChangeLog | 5 +++++ Build/source/texk/bibtex-x/Makefile.am | 4 +++- Build/source/texk/bibtex-x/Makefile.in | 2 ++ Build/source/texk/bibtex-x/ac/bibtex-x.ac | 2 +- Build/source/texk/bibtex-x/configure | 4 ++-- Build/source/texk/configure | 8 ++++---- Build/source/texk/dvipdfm-x/ChangeLog | 6 ++++++ Build/source/texk/dvipdfm-x/Makefile.am | 9 ++++++--- Build/source/texk/dvipdfm-x/Makefile.in | 4 ++++ Build/source/texk/dvipdfm-x/ac/dvipdfm-x.ac | 2 +- Build/source/texk/dvipdfm-x/configure | 4 ++-- Build/source/texk/dvipdfm-x/xdvipdfmx.test | 8 ++++---- Build/source/utils/configure | 8 ++++---- 15 files changed, 52 insertions(+), 30 deletions(-) diff --git a/Build/source/configure b/Build/source/configure index 7b59e6de2e3..ec9be8a0ef3 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -4917,7 +4917,7 @@ if test "${enable_bibtex8+set}" = set; then : enableval=$enable_bibtex8; fi -case enable_bibtex8 in #( +case $enable_bibtex8 in #( yes | no) : ;; #( *) : @@ -4928,7 +4928,7 @@ if test "${enable_bibtexu+set}" = set; then : enableval=$enable_bibtexu; fi -case enable_bibtexu in #( +case $enable_bibtexu in #( yes | no) : ;; #( *) : @@ -5122,7 +5122,7 @@ if test "${enable_dvipdfmx+set}" = set; then : enableval=$enable_dvipdfmx; fi -case enable_dvipdfmx in #( +case $enable_dvipdfmx in #( yes | no) : ;; #( *) : @@ -5133,7 +5133,7 @@ if test "${enable_xdvipdfmx+set}" = set; then : enableval=$enable_xdvipdfmx; fi -case enable_xdvipdfmx in #( +case $enable_xdvipdfmx in #( yes | no) : ;; #( *) : diff --git a/Build/source/libs/configure b/Build/source/libs/configure index 48804f10259..94100689d95 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -4115,7 +4115,7 @@ if test "${enable_bibtex8+set}" = set; then : enableval=$enable_bibtex8; fi -case enable_bibtex8 in #( +case $enable_bibtex8 in #( yes | no) : ;; #( *) : @@ -4126,7 +4126,7 @@ if test "${enable_bibtexu+set}" = set; then : enableval=$enable_bibtexu; fi -case enable_bibtexu in #( +case $enable_bibtexu in #( yes | no) : ;; #( *) : @@ -4320,7 +4320,7 @@ if test "${enable_dvipdfmx+set}" = set; then : enableval=$enable_dvipdfmx; fi -case enable_dvipdfmx in #( +case $enable_dvipdfmx in #( yes | no) : ;; #( *) : @@ -4331,7 +4331,7 @@ if test "${enable_xdvipdfmx+set}" = set; then : enableval=$enable_xdvipdfmx; fi -case enable_xdvipdfmx in #( +case $enable_xdvipdfmx in #( yes | no) : ;; #( *) : diff --git a/Build/source/texk/bibtex-x/ChangeLog b/Build/source/texk/bibtex-x/ChangeLog index 5dfccedb0d7..bfc856986c9 100644 --- a/Build/source/texk/bibtex-x/ChangeLog +++ b/Build/source/texk/bibtex-x/ChangeLog @@ -1,3 +1,8 @@ +2015-07-07 Peter Breitenlohner + + * Makefile.am: Better dependencies for 'make check'. + * ac/bibtex-x.ac: Fixed a typo. + 2014-06-16 Peter Breitenlohner * Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS. diff --git a/Build/source/texk/bibtex-x/Makefile.am b/Build/source/texk/bibtex-x/Makefile.am index db27327c44e..9ee3fe6ff12 100644 --- a/Build/source/texk/bibtex-x/Makefile.am +++ b/Build/source/texk/bibtex-x/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/bibtex-x/ ## -## Copyright (C) 2009-2014 Peter Breitenlohner +## Copyright (C) 2009-2015 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. ## AM_CPPFLAGS = $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA @@ -78,9 +78,11 @@ TESTS = if BIBTEX8 TESTS += $(bibtex8_tests) endif BIBTEX8 +tests/bibtex8.log tests/bibtex8-mem.log tests/sort.log: bibtex8$(EXEEXT) if BIBTEXU TESTS += $(bibtexu_tests) endif BIBTEXU +tests/bibtexu.log: bibtexu$(EXEEXT) EXTRA_DIST = $(bibtex8_tests) $(bibtexu_tests) DISTCLEANFILES = diff --git a/Build/source/texk/bibtex-x/Makefile.in b/Build/source/texk/bibtex-x/Makefile.in index 6a0e5640027..4173b47508f 100644 --- a/Build/source/texk/bibtex-x/Makefile.in +++ b/Build/source/texk/bibtex-x/Makefile.in @@ -1578,6 +1578,8 @@ $(bibtexu_OBJECTS): $(KPATHSEA_DEPEND) $(ICU_DEPEND) @KPATHSEA_RULE@ @ICU_RULE@ +tests/bibtex8.log tests/bibtex8-mem.log tests/sort.log: bibtex8$(EXEEXT) +tests/bibtexu.log: bibtexu$(EXEEXT) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Build/source/texk/bibtex-x/ac/bibtex-x.ac b/Build/source/texk/bibtex-x/ac/bibtex-x.ac index 32ae33b0f8b..528b7b0ec29 100644 --- a/Build/source/texk/bibtex-x/ac/bibtex-x.ac +++ b/Build/source/texk/bibtex-x/ac/bibtex-x.ac @@ -11,7 +11,7 @@ AC_ARG_ENABLE(Kpse_Prog, AS_HELP_STRING([--disable-]Kpse_Prog, [do not build the ]Kpse_Prog[ program], kpse_indent_26)) -AS_CASE([enable_]Kpse_Prog, +AS_CASE([$enable_]Kpse_Prog, [yes | no], , [enable_]Kpse_Prog[=yes]) ]) diff --git a/Build/source/texk/bibtex-x/configure b/Build/source/texk/bibtex-x/configure index 6087f898a90..2ce6c6b80d9 100755 --- a/Build/source/texk/bibtex-x/configure +++ b/Build/source/texk/bibtex-x/configure @@ -13706,7 +13706,7 @@ if test "${enable_bibtex8+set}" = set; then : enableval=$enable_bibtex8; fi -case enable_bibtex8 in #( +case $enable_bibtex8 in #( yes | no) : ;; #( *) : @@ -13717,7 +13717,7 @@ if test "${enable_bibtexu+set}" = set; then : enableval=$enable_bibtexu; fi -case enable_bibtexu in #( +case $enable_bibtexu in #( yes | no) : ;; #( *) : diff --git a/Build/source/texk/configure b/Build/source/texk/configure index 1ea8e4fd21e..4bf86910f1c 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -4125,7 +4125,7 @@ if test "${enable_bibtex8+set}" = set; then : enableval=$enable_bibtex8; fi -case enable_bibtex8 in #( +case $enable_bibtex8 in #( yes | no) : ;; #( *) : @@ -4136,7 +4136,7 @@ if test "${enable_bibtexu+set}" = set; then : enableval=$enable_bibtexu; fi -case enable_bibtexu in #( +case $enable_bibtexu in #( yes | no) : ;; #( *) : @@ -4330,7 +4330,7 @@ if test "${enable_dvipdfmx+set}" = set; then : enableval=$enable_dvipdfmx; fi -case enable_dvipdfmx in #( +case $enable_dvipdfmx in #( yes | no) : ;; #( *) : @@ -4341,7 +4341,7 @@ if test "${enable_xdvipdfmx+set}" = set; then : enableval=$enable_xdvipdfmx; fi -case enable_xdvipdfmx in #( +case $enable_xdvipdfmx in #( yes | no) : ;; #( *) : diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index da3f8483dd1..9d042bc88d7 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,9 @@ +2015-07-07 Peter Breitenlohner + + * Makefile.am: Better dependencies for 'make check'. + * ac/dvipdfm-x.ac: Fixed a typo. + * xdvipdfmx.test: Fixed a typo. + 2015-07-06 Peter Breitenlohner * dpxcrypt.c: Bugfix: Replace byte => uint8_t. diff --git a/Build/source/texk/dvipdfm-x/Makefile.am b/Build/source/texk/dvipdfm-x/Makefile.am index 8e9dcbf254b..dda2efb1220 100644 --- a/Build/source/texk/dvipdfm-x/Makefile.am +++ b/Build/source/texk/dvipdfm-x/Makefile.am @@ -269,13 +269,16 @@ DISTCLEANFILES = config.force ## TESTS = dvipdfmx_tests = dvipdfmx.test dvipdfm-ann.test dvipdfm-bb.test dvipdfm-bkm.test dvipdfm-psz.test -dvipdfmx_tests += dvipdfm-res.test +dvipdfmx_tests += dvipdfm-res.test +dvipdfmx.log dvipdfm-ann.log dvipdfm-bb.log dvipdfm-bkm.log dvipdfm-psz.log \ + dvipdfm-res.log: dvipdfmx$(EXEEXT) if DVIPDFMX TESTS += $(dvipdfmx_tests) endif DVIPDFMX xdvipdfmx_tests = xdvipdfmx.test xdvipdfm-ann.test xdvipdfm-bb.test xdvipdfm-bkm.test xdvipdfm-psz.test -xdvipdfmx_tests += xdvipdfm-res.test -xdvipdfmx_tests += xdvipdfm-ttc.test +xdvipdfmx_tests += xdvipdfm-res.test xdvipdfm-ttc.test +xdvipdfmx.log xdvipdfm-ann.log xdvipdfm-bb.log xdvipdfm-bkm.log xdvipdfm-psz.log \ + xdvipdfm-res.log xdvipdfm-ttc.log: xdvipdfmx$(EXEEXT) if XDVIPDFMX TESTS += $(xdvipdfmx_tests) endif XDVIPDFMX diff --git a/Build/source/texk/dvipdfm-x/Makefile.in b/Build/source/texk/dvipdfm-x/Makefile.in index ad763f7dd74..c9e0a189c14 100644 --- a/Build/source/texk/dvipdfm-x/Makefile.in +++ b/Build/source/texk/dvipdfm-x/Makefile.in @@ -2923,6 +2923,10 @@ config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(LIBPAPER_DEPE @LIBPNG_RULE@ @ZLIB_RULE@ @LIBPAPER_RULE@ +dvipdfmx.log dvipdfm-ann.log dvipdfm-bb.log dvipdfm-bkm.log dvipdfm-psz.log \ + dvipdfm-res.log: dvipdfmx$(EXEEXT) +xdvipdfmx.log xdvipdfm-ann.log xdvipdfm-bb.log xdvipdfm-bkm.log xdvipdfm-psz.log \ + xdvipdfm-res.log xdvipdfm-ttc.log: xdvipdfmx$(EXEEXT) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Build/source/texk/dvipdfm-x/ac/dvipdfm-x.ac b/Build/source/texk/dvipdfm-x/ac/dvipdfm-x.ac index c465eb7c62e..f5822d4fe3d 100644 --- a/Build/source/texk/dvipdfm-x/ac/dvipdfm-x.ac +++ b/Build/source/texk/dvipdfm-x/ac/dvipdfm-x.ac @@ -11,7 +11,7 @@ AC_ARG_ENABLE(Kpse_Prog, AS_HELP_STRING([--disable-]Kpse_Prog, [do not build the ]Kpse_Prog[ program], kpse_indent_26)) -AS_CASE([enable_]Kpse_Prog, +AS_CASE([$enable_]Kpse_Prog, [yes | no], , [enable_]Kpse_Prog[=yes]) ]) diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure index af472e4cb1b..5f3474f5bdc 100755 --- a/Build/source/texk/dvipdfm-x/configure +++ b/Build/source/texk/dvipdfm-x/configure @@ -13694,7 +13694,7 @@ if test "${enable_dvipdfmx+set}" = set; then : enableval=$enable_dvipdfmx; fi -case enable_dvipdfmx in #( +case $enable_dvipdfmx in #( yes | no) : ;; #( *) : @@ -13705,7 +13705,7 @@ if test "${enable_xdvipdfmx+set}" = set; then : enableval=$enable_xdvipdfmx; fi -case enable_xdvipdfmx in #( +case $enable_xdvipdfmx in #( yes | no) : ;; #( *) : diff --git a/Build/source/texk/dvipdfm-x/xdvipdfmx.test b/Build/source/texk/dvipdfm-x/xdvipdfmx.test index 7911519a279..21b89bcdfc3 100755 --- a/Build/source/texk/dvipdfm-x/xdvipdfmx.test +++ b/Build/source/texk/dvipdfm-x/xdvipdfmx.test @@ -33,10 +33,10 @@ echo "*** xdvipdfmx -v -o image2.pdf image" && echo \ && echo && echo "xdvipdfmx-image tests OK" && echo \ || failed="$failed xdvipdfmx-image" -echo "*** dvipdfmx -v -o xbmc2.pdf xbmc" && echo \ - && ./dvipdfmx -v -o xbmc2.pdf $srcdir/tests/xbmc \ - && echo && echo "dvipdfmx-xbmc tests OK" && echo \ - || failed="$failed dvipdfmx-xbmc" +echo "*** xdvipdfmx -v -o xbmc2.pdf xbmc" && echo \ + && ./xdvipdfmx -v -o xbmc2.pdf $srcdir/tests/xbmc \ + && echo && echo "xdvipdfmx-xbmc tests OK" && echo \ + || failed="$failed xdvipdfmx-xbmc" test -z "$failed" && exit 0 echo diff --git a/Build/source/utils/configure b/Build/source/utils/configure index e19fde75a9f..d1cc6927a51 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -4107,7 +4107,7 @@ if test "${enable_bibtex8+set}" = set; then : enableval=$enable_bibtex8; fi -case enable_bibtex8 in #( +case $enable_bibtex8 in #( yes | no) : ;; #( *) : @@ -4118,7 +4118,7 @@ if test "${enable_bibtexu+set}" = set; then : enableval=$enable_bibtexu; fi -case enable_bibtexu in #( +case $enable_bibtexu in #( yes | no) : ;; #( *) : @@ -4312,7 +4312,7 @@ if test "${enable_dvipdfmx+set}" = set; then : enableval=$enable_dvipdfmx; fi -case enable_dvipdfmx in #( +case $enable_dvipdfmx in #( yes | no) : ;; #( *) : @@ -4323,7 +4323,7 @@ if test "${enable_xdvipdfmx+set}" = set; then : enableval=$enable_xdvipdfmx; fi -case enable_xdvipdfmx in #( +case $enable_xdvipdfmx in #( yes | no) : ;; #( *) : -- cgit v1.2.3