texk/dvipdfm-x: Update the build system

                xdvipdfm-ttc.test may fail

git-svn-id: svn://tug.org/texlive/trunk@36359 c570f23f-e606-0410-a88d-b1316a301751

10 files changed, 34 insertions, 23 deletions

diff --git a/Build/source/texk/bibtex-x/ac/bibtex-x.ac b/Build/source/texk/bibtex-x/ac/bibtex-x.ac
index 28d780523ba..32ae33b0f8b 100644
--- a/Build/source/texk/bibtex-x/ac/bibtex-x.ac
+++ b/Build/source/texk/bibtex-x/ac/bibtex-x.ac
@@ -1,4 +1,9 @@
-## Define configure options for bibtex-x.
+## texk/bibtex-x/ac/bibtex-x.ac: configure.ac fragment for the TeX Live subdirectory texk/bibtex-x/
+dnl
+dnl Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
+## configure options for bibtex-x
 m4_define_default([kpse_indent_26], [26])[]dnl
 m4_define([kpse_bibtex_x_progs], [bibtex8 bibtexu])[]dnl
 AC_FOREACH([Kpse_Prog], kpse_bibtex_x_progs, [dnl
diff --git a/Build/source/texk/bibtex-x/configure b/Build/source/texk/bibtex-x/configure
index 89174788249..483aa6d4ba4 100755
--- a/Build/source/texk/bibtex-x/configure
+++ b/Build/source/texk/bibtex-x/configure
@@ -13646,7 +13646,8 @@ fi
 
 
 
-## Define configure options for bibtex-x.
+## texk/bibtex-x/ac/bibtex-x.ac: configure.ac fragment for the TeX Live subdirectory texk/bibtex-x/
+## configure options for bibtex-x
 # Check whether --enable-bibtex8 was given.
 if test "${enable_bibtex8+set}" = set; then :
   enableval=$enable_bibtex8;
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 36a6438575d..0f57c73f4a7 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -4043,7 +4043,8 @@ test "x$enable_bibtex_x" = xno || {
   need_kpathsea=yes
 }
 
-## Define configure options for bibtex-x.
+## texk/bibtex-x/ac/bibtex-x.ac: configure.ac fragment for the TeX Live subdirectory texk/bibtex-x/
+## configure options for bibtex-x
 # Check whether --enable-bibtex8 was given.
 if test "${enable_bibtex8+set}" = set; then :
   enableval=$enable_bibtex8;
@@ -4247,7 +4248,8 @@ test "x$enable_dvipdfm_x" = xno || {
   need_libpaper=yes
 }
 
-## Define configure options for dvipdfm-x.
+## texk/dvipdfm-x/ac/dvipdfm-x.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfm-x/
+## configure options for dvipdfm-x
 # Check whether --enable-dvipdfmx was given.
 if test "${enable_dvipdfmx+set}" = set; then :
   enableval=$enable_dvipdfmx;
@@ -4271,7 +4273,6 @@ case enable_xdvipdfmx in #(
     enable_xdvipdfmx=yes ;;
 esac
 
-test "x$enable_dvipdfm_x:$enable_xdvipdfmx" = xyes:yes && need_freetype2=yes
 
 ## texk/dvipng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipng/
 ## configure options and TL libraries required for dvipng
diff --git a/Build/source/texk/dvipdfm-x/Makefile.am b/Build/source/texk/dvipdfm-x/Makefile.am
index 4c062e04bc3..8e9dcbf254b 100644
--- a/Build/source/texk/dvipdfm-x/Makefile.am
+++ b/Build/source/texk/dvipdfm-x/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for the TeX Live subdirectory texk/dvipdfm-x/
 ##
-## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 bin_PROGRAMS =
@@ -173,8 +173,7 @@ dvipdfmx_SOURCES = \
 
 nodist_xdvipdfmx_SOURCES = $(dvipdfmx_SOURCES)
 
-dvipdfmx_LDADD = $(KPATHSEA_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(LIBPAPER_LIBS)
-xdvipdfmx_LDADD = $(dvipdfmx_LDADD)
+LDADD = $(KPATHSEA_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(LIBPAPER_LIBS)
 
 $(dvipdfmx_OBJECTS) $(xdvipdfmx_OBJECTS): config.force
 
@@ -295,4 +294,4 @@ EXTRA_DIST += tests/bookm.dvi tests/bookm.tex tests/paper.dvi tests/paper.tex
 EXTRA_DIST += tests/resrc.dvi tests/resrc.tex
 EXTRA_DIST += tests/xbmc.dvi tests/xbmc.tex tests/xbmc10.600pk tests/xbmc10.tfm
 EXTRA_DIST += tests/ttc.dvi tests/ttc.tex tests/test.ttc
-DISTCLEANFILES += img*.* pic*.* image*.pdf annot*.pdf bookm*.pdf paper*.pdf resrc*.pdf xbmc*.pdf
+DISTCLEANFILES += img*.* pic*.* image*.pdf annot*.pdf bookm*.pdf paper*.pdf resrc*.pdf xbmc*.pdf ttc*.pdf
diff --git a/Build/source/texk/dvipdfm-x/Makefile.in b/Build/source/texk/dvipdfm-x/Makefile.in
index 7730e1ad754..ad763f7dd74 100644
--- a/Build/source/texk/dvipdfm-x/Makefile.in
+++ b/Build/source/texk/dvipdfm-x/Makefile.in
@@ -107,7 +107,6 @@ EXTRA_PROGRAMS = dvipdfmx$(EXEEXT) xdvipdfmx$(EXEEXT)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
-	$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-libpaper-flags.m4 \
 	$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
@@ -143,6 +142,10 @@ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 nodist_call_dvipdfmx_OBJECTS = call_dvipdfmx-callexe.$(OBJEXT)
 call_dvipdfmx_OBJECTS = $(nodist_call_dvipdfmx_OBJECTS)
 call_dvipdfmx_LDADD = $(LDADD)
+am__DEPENDENCIES_1 =
+call_dvipdfmx_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -172,7 +175,7 @@ am_dvipdfmx_OBJECTS = agl.$(OBJEXT) bmpimage.$(OBJEXT) cff.$(OBJEXT) \
 	type1.$(OBJEXT) type1c.$(OBJEXT) unicode.$(OBJEXT) \
 	vf.$(OBJEXT) xbb.$(OBJEXT)
 dvipdfmx_OBJECTS = $(am_dvipdfmx_OBJECTS)
-am__DEPENDENCIES_1 =
+dvipdfmx_LDADD = $(LDADD)
 dvipdfmx_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am__objects_1 = xdvipdfmx-agl.$(OBJEXT) xdvipdfmx-bmpimage.$(OBJEXT) \
@@ -213,9 +216,9 @@ am__objects_1 = xdvipdfmx-agl.$(OBJEXT) xdvipdfmx-bmpimage.$(OBJEXT) \
 	xdvipdfmx-xbb.$(OBJEXT)
 nodist_xdvipdfmx_OBJECTS = $(am__objects_1)
 xdvipdfmx_OBJECTS = $(nodist_xdvipdfmx_OBJECTS)
-am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+xdvipdfmx_LDADD = $(LDADD)
+xdvipdfmx_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-xdvipdfmx_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am__dist_bin_SCRIPTS_DIST = dvipdft
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -811,8 +814,7 @@ dvipdfmx_SOURCES = \
 	xbb.c
 
 nodist_xdvipdfmx_SOURCES = $(dvipdfmx_SOURCES)
-dvipdfmx_LDADD = $(KPATHSEA_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(LIBPAPER_LIBS)
-xdvipdfmx_LDADD = $(dvipdfmx_LDADD)
+LDADD = $(KPATHSEA_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(LIBPAPER_LIBS)
 bin_links = $(am__append_3)
 call_dvipdfmx_CPPFLAGS = -DEXEPROG=\"dvipdfmx.exe\"
 nodist_call_dvipdfmx_SOURCES = callexe.c
@@ -827,7 +829,7 @@ dist_mapdata_DATA = data/cid-x.map
 cmapdatadir = $(datarootdir)/texmf-dist/fonts/cmap/dvipdfmx
 dist_cmapdata_DATA = data/EUC-UCS2
 DISTCLEANFILES = config.force img*.* pic*.* image*.pdf annot*.pdf \
-	bookm*.pdf paper*.pdf resrc*.pdf xbmc*.pdf
+	bookm*.pdf paper*.pdf resrc*.pdf xbmc*.pdf ttc*.pdf
 TESTS = $(am__append_6) $(am__append_7)
 dvipdfmx_tests = dvipdfmx.test dvipdfm-ann.test dvipdfm-bb.test \
 	dvipdfm-bkm.test dvipdfm-psz.test dvipdfm-res.test
diff --git a/Build/source/texk/dvipdfm-x/ac/dvipdfm-x.ac b/Build/source/texk/dvipdfm-x/ac/dvipdfm-x.ac
index f5499b12a85..c465eb7c62e 100644
--- a/Build/source/texk/dvipdfm-x/ac/dvipdfm-x.ac
+++ b/Build/source/texk/dvipdfm-x/ac/dvipdfm-x.ac
@@ -1,4 +1,9 @@
-## Define configure options for dvipdfm-x.
+## texk/dvipdfm-x/ac/dvipdfm-x.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfm-x/
+dnl
+dnl Copyright (C) 2013-2015 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
+## configure options for dvipdfm-x
 m4_define_default([kpse_indent_26], [26])[]dnl
 m4_define([kpse_dvipdfm_x_progs], [dvipdfmx xdvipdfmx])[]dnl
 AC_FOREACH([Kpse_Prog], kpse_dvipdfm_x_progs, [dnl
@@ -10,4 +15,3 @@ AS_CASE([enable_]Kpse_Prog,
         [yes | no], ,
         [enable_]Kpse_Prog[=yes])
 ])
-test "x$enable_dvipdfm_x:$enable_xdvipdfmx" = xyes:yes && need_freetype2=yes
diff --git a/Build/source/texk/dvipdfm-x/aclocal.m4 b/Build/source/texk/dvipdfm-x/aclocal.m4
index f26e26ba929..a5134955e51 100644
--- a/Build/source/texk/dvipdfm-x/aclocal.m4
+++ b/Build/source/texk/dvipdfm-x/aclocal.m4
@@ -1224,7 +1224,6 @@ AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
 m4_include([../../m4/kpse-common.m4])
-m4_include([../../m4/kpse-freetype2-flags.m4])
 m4_include([../../m4/kpse-kpathsea-flags.m4])
 m4_include([../../m4/kpse-libpaper-flags.m4])
 m4_include([../../m4/kpse-libpng-flags.m4])
diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure
index 5751ab1866a..f05488c46a9 100755
--- a/Build/source/texk/dvipdfm-x/configure
+++ b/Build/source/texk/dvipdfm-x/configure
@@ -13681,7 +13681,8 @@ fi
 
 
 
-## Define configure options for dvipdfm-x.
+## texk/dvipdfm-x/ac/dvipdfm-x.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfm-x/
+## configure options for dvipdfm-x
 # Check whether --enable-dvipdfmx was given.
 if test "${enable_dvipdfmx+set}" = set; then :
   enableval=$enable_dvipdfmx;
@@ -13705,7 +13706,6 @@ case enable_xdvipdfmx in #(
     enable_xdvipdfmx=yes ;;
 esac
 
-test "x$enable_dvipdfm_x:$enable_xdvipdfmx" = xyes:yes && need_freetype2=yes
 
 
 ac_config_headers="$ac_config_headers config.h"
diff --git a/Build/source/texk/dvipdfm-x/configure.ac b/Build/source/texk/dvipdfm-x/configure.ac
index 33a67c6c836..151b608435c 100644
--- a/Build/source/texk/dvipdfm-x/configure.ac
+++ b/Build/source/texk/dvipdfm-x/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
diff --git a/Build/source/texk/dvipdfm-x/xdvipdfm-ttc.test b/Build/source/texk/dvipdfm-x/xdvipdfm-ttc.test
index c3e85770370..24e044d2393 100755
--- a/Build/source/texk/dvipdfm-x/xdvipdfm-ttc.test
+++ b/Build/source/texk/dvipdfm-x/xdvipdfm-ttc.test
@@ -22,5 +22,5 @@ echo "*** xdvipdfmx -v -z0 -o ttc2.pdf ttc" && echo \
 test -z "$failed" && exit 0
 echo
 echo "failed tests:$failed"
-exit 1
+exit 77