summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-09-09 10:07:08 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-09-09 10:07:08 +0000
commite981cdbd1662ed82436259f1046987c5b7204f1a (patch)
tree031a0f1bd753e2495237b10de7d1ff6fe5a1a909 /Build/source/texk
parent3ad3db6624b55ad14658410f68ab6cb878904c7c (diff)
Various updates of build system: Use AC_CONFIG_MACRO_DIRS instead of ACLOCAL_AMFLAGS,
Factor recursion into subdirs into .am fragment and m4 macros, Avoid unnecessary use of Libtool, Use z_const git-svn-id: svn://tug.org/texlive/trunk@31606 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/ChangeLog12
-rw-r--r--Build/source/texk/Makefile.am9
-rw-r--r--Build/source/texk/Makefile.in9
-rwxr-xr-xBuild/source/texk/configure190
-rw-r--r--Build/source/texk/configure.ac20
-rwxr-xr-xBuild/source/texk/dvipdf-x/configure4
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog5
-rw-r--r--Build/source/texk/dvipdfm-x/Makefile.am2
-rw-r--r--Build/source/texk/dvipdfm-x/Makefile.in48
-rwxr-xr-xBuild/source/texk/dvipdfm-x/configure4
-rw-r--r--Build/source/texk/dvipng/ChangeLog9
-rw-r--r--Build/source/texk/dvipng/Makefile.am2
-rw-r--r--Build/source/texk/dvipng/Makefile.in1
-rwxr-xr-xBuild/source/texk/dvipng/configure31
-rw-r--r--Build/source/texk/dvipng/configure.ac2
-rw-r--r--Build/source/texk/dvipng/m4/gs-device.m431
-rw-r--r--Build/source/texk/dvipng/m4/makeinfo.m483
-rwxr-xr-xBuild/source/texk/dvisvgm/configure4
-rw-r--r--Build/source/texk/lcdf-typetools/ChangeLog5
-rw-r--r--Build/source/texk/lcdf-typetools/Makefile.am2
-rw-r--r--Build/source/texk/lcdf-typetools/Makefile.in1
-rw-r--r--Build/source/texk/lcdf-typetools/configure.ac2
-rwxr-xr-xBuild/source/texk/ttf2pk2/configure4
-rw-r--r--Build/source/texk/web2c/ChangeLog5
-rw-r--r--Build/source/texk/web2c/Makefile.am2
-rw-r--r--Build/source/texk/web2c/Makefile.in1
-rwxr-xr-xBuild/source/texk/web2c/configure4
-rw-r--r--Build/source/texk/web2c/configure.ac2
-rw-r--r--Build/source/texk/xdvik/ChangeLog5
-rw-r--r--Build/source/texk/xdvik/Makefile.am2
-rw-r--r--Build/source/texk/xdvik/Makefile.in1
-rwxr-xr-xBuild/source/texk/xdvik/configure4
-rw-r--r--Build/source/texk/xdvik/configure.ac2
33 files changed, 177 insertions, 331 deletions
diff --git a/Build/source/texk/ChangeLog b/Build/source/texk/ChangeLog
index 70efea2480c..d4cb93e24ee 100644
--- a/Build/source/texk/ChangeLog
+++ b/Build/source/texk/ChangeLog
@@ -1,3 +1,15 @@
+2013-09-03 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Drop ACLOCAL_AMFLAGS.
+ * configure.ac: Use AC_CONFIG_MACRO_DIRS.
+ Use KPSE_RECURSE_PROGS in ../m4/kpse-setup.m4 to recurse into
+ all TeXk programs.
+
+2013-09-01 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Moved definition of cf_silent* from here ...
+ * ../am/recurse.am: ... to here
+
2013-07-06 Peter Breitenlohner <peb@mppmu.mpg.de>
* am/*.am: Moved Makefile fragments to ../am/.
diff --git a/Build/source/texk/Makefile.am b/Build/source/texk/Makefile.am
index 5ca4f2ab25a..6b691bc607d 100644
--- a/Build/source/texk/Makefile.am
+++ b/Build/source/texk/Makefile.am
@@ -3,18 +3,9 @@
## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
-## Use 'aclocal --force' (for "computed m4_sinclude")
-##
-ACLOCAL_AMFLAGS = -I ../m4 --force
-
SUBDIRS = . $(MAKE_SUBDIRS)
DIST_SUBDIRS = $(CONF_SUBDIRS)
-cf_silent = $(cf_silent_@AM_V@)
-cf_silent_ = $(cf_silent_@AM_DEFAULT_V@)
-cf_silent_0 = --silent
-cf_silent_1 =
-
# just in case a subdirectory has added directories
dist-hook:
rm -rf `find $(distdir) -name .svn`
diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in
index 8af34ab4ab4..dad9f035f09 100644
--- a/Build/source/texk/Makefile.in
+++ b/Build/source/texk/Makefile.in
@@ -393,13 +393,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-ACLOCAL_AMFLAGS = -I ../m4 --force
SUBDIRS = . $(MAKE_SUBDIRS)
DIST_SUBDIRS = $(CONF_SUBDIRS)
-cf_silent = $(cf_silent_@AM_V@)
-cf_silent_ = $(cf_silent_@AM_DEFAULT_V@)
-cf_silent_0 = --silent
-cf_silent_1 =
recurse_this = texk/
recurse_top = ../
@@ -408,6 +403,10 @@ recurse_top = ../
# we append '--disable-build' so they can skip tests that would
# fail because, e.g., some required libraries were not built.
# Code inspired by automake's way to handle recursive targets.
+cf_silent = $(cf_silent_@AM_V@)
+cf_silent_ = $(cf_silent_@AM_DEFAULT_V@)
+cf_silent_0 = --silent
+cf_silent_1 =
CONFIG_AUX = $(recurse_top)subsubdir-conf.cmd
# Common infrastructure for tests
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 450247af9b9..c1a3298c364 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -3386,7 +3386,6 @@ $as_echo "$as_me: Assuming \`--enable-biber=$enable_biber'" >&6;}
;;
esac
-
## utils/m-tx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/m-tx/
## configure options and TL libraries required for mtx
# Check whether --enable-m-tx was given.
@@ -3405,7 +3404,6 @@ $as_echo "$as_me: Assuming \`--enable-m-tx=$enable_m_tx'" >&6;}
;;
esac
-
## utils/pmx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/pmx/
## configure options and TL libraries required for pmx
# Check whether --enable-pmx was given.
@@ -3424,7 +3422,6 @@ $as_echo "$as_me: Assuming \`--enable-pmx=$enable_pmx'" >&6;}
;;
esac
-
## utils/ps2eps/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/ps2eps/
## configure options and TL libraries required for ps2eps
# Check whether --enable-ps2eps was given.
@@ -3443,7 +3440,6 @@ $as_echo "$as_me: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&6;}
;;
esac
-
## utils/psutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/psutils/
## configure options and TL libraries required for psutils
# Check whether --enable-psutils was given.
@@ -3462,7 +3458,6 @@ $as_echo "$as_me: Assuming \`--enable-psutils=$enable_psutils'" >&6;}
;;
esac
-
## utils/t1utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/t1utils/
## configure options and TL libraries required for t1utils
# Check whether --enable-t1utils was given.
@@ -3481,7 +3476,6 @@ $as_echo "$as_me: Assuming \`--enable-t1utils=$enable_t1utils'" >&6;}
;;
esac
-
## utils/texdoctk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/texdoctk/
## configure options and TL libraries required for texdoctk
# Check whether --enable-texdoctk was given.
@@ -3500,7 +3494,6 @@ $as_echo "$as_me: Assuming \`--enable-texdoctk=$enable_texdoctk'" >&6;}
;;
esac
-
## utils/tpic2pdftex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/tpic2pdftex/
## configure options and TL libraries required for tpic2pdftex
# Check whether --enable-tpic2pdftex was given.
@@ -3519,7 +3512,6 @@ $as_echo "$as_me: Assuming \`--enable-tpic2pdftex=$enable_tpic2pdftex'" >&6;}
;;
esac
-
## utils/vlna/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/vlna/
## configure options and TL libraries required for vlna
# Check whether --enable-vlna was given.
@@ -3538,7 +3530,6 @@ $as_echo "$as_me: Assuming \`--enable-vlna=$enable_vlna'" >&6;}
;;
esac
-
## utils/xindy/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xindy/
## configure options and TL libraries required for xindy
# Check whether --enable-xindy was given.
@@ -3611,7 +3602,6 @@ $as_echo "$as_me: Assuming \`--with-clisp-runtime=$with_clisp_runtime'" >&6;}
fi ;;
esac
-
## utils/xpdfopen/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/xpdfopen/
## configure options and TL libraries required for xpdfopen
# Check whether --enable-xpdfopen was given.
@@ -3644,7 +3634,6 @@ $as_echo "$as_me: Assuming \`--enable-xpdfopen=$enable_xpdfopen'" >&6;}
esac
-
## texk/web2c/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
## configure options and TL libraries required for web2c
# Check whether --enable-web2c was given.
@@ -3941,7 +3930,6 @@ if test "${enable_web_progs+set}" = set; then :
enableval=$enable_web_progs;
fi
-
## texk/afm2pl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/afm2pl/
## configure options and TL libraries required for afm2pl
# Check whether --enable-afm2pl was given.
@@ -3964,7 +3952,6 @@ test "x$enable_afm2pl" = xno || {
need_kpathsea=yes
}
-
## texk/bibtex-x/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/bibtex-x/
## configure options and TL libraries required for bibtex-x
# Check whether --enable-bibtex-x was given.
@@ -4013,7 +4000,6 @@ esac
test "x$enable_bibtex_x:$enable_bibtexu" = xyes:yes && need_icu=yes
-
## texk/chktex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/chktex/
## configure options and TL libraries required for chktex
# Check whether --enable-chktex was given.
@@ -4036,7 +4022,6 @@ test "x$enable_chktex" = xno || {
need_kpathsea=yes
}
-
## texk/cjkutils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/cjkutils/
## configure options and TL libraries required for cjkutils
# Check whether --enable-cjkutils was given.
@@ -4059,7 +4044,6 @@ test "x$enable_cjkutils" = xno || {
need_kpathsea=yes
}
-
## texk/detex/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/detex/
## configure options and TL libraries required for detex
# Check whether --enable-detex was given.
@@ -4082,7 +4066,6 @@ test "x$enable_detex" = xno || {
need_kpathsea=yes
}
-
## texk/devnag/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/devnag/
## configure options and TL libraries required for devnag
# Check whether --enable-devnag was given.
@@ -4101,7 +4084,6 @@ $as_echo "$as_me: Assuming \`--enable-devnag=$enable_devnag'" >&6;}
;;
esac
-
## texk/dtl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dtl/
## configure options and TL libraries required for dtl
# Check whether --enable-dtl was given.
@@ -4124,7 +4106,6 @@ test "x$enable_dtl" = xno || {
need_kpathsea=yes
}
-
## texk/dvi2tty/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvi2tty/
## configure options and TL libraries required for dvi2tty
# Check whether --enable-dvi2tty was given.
@@ -4147,7 +4128,6 @@ test "x$enable_dvi2tty" = xno || {
need_ptexenc=yes
}
-
## texk/dvidvi/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvidvi/
## configure options and TL libraries required for dvidvi
# Check whether --enable-dvidvi was given.
@@ -4170,7 +4150,6 @@ test "x$enable_dvidvi" = xno || {
need_kpathsea=yes
}
-
## texk/dviljk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dviljk/
## configure options and TL libraries required for dviljk
# Check whether --enable-dviljk was given.
@@ -4193,7 +4172,6 @@ test "x$enable_dviljk" = xno || {
need_kpathsea=yes
}
-
## texk/dvipdf-x/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdf-x/
## configure options and TL libraries required for dvipdf-x
# Check whether --enable-dvipdf-x was given.
@@ -4243,7 +4221,6 @@ esac
test "x$enable_dvipdf_x:$enable_xdvipdf" = xyes:yes && need_freetype2=yes
-
## texk/dvipdfm-x/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipdfm-x/
## configure options and TL libraries required for dvipdfm-x
# Check whether --enable-dvipdfm-x was given.
@@ -4293,7 +4270,6 @@ 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
# Check whether --enable-dvipng was given.
@@ -4336,7 +4312,6 @@ if test "${with_gs+set}" = set; then :
fi
-
## texk/dvipos/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipos/
## configure options and TL libraries required for dvipos
# Check whether --enable-dvipos was given.
@@ -4359,7 +4334,6 @@ test "x$enable_dvipos" = xno || {
need_kpathsea=yes
}
-
## texk/dvipsk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvipsk/
## configure options and TL libraries required for dvipsk
# Check whether --enable-dvipsk was given.
@@ -4382,7 +4356,6 @@ test "x$enable_dvipsk" = xno || {
need_kpathsea=yes
}
-
## texk/dvisvgm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/
## configure options and TL libraries required for dvisvgm
# Check whether --enable-dvisvgm was given.
@@ -4435,7 +4408,6 @@ if test "x$enable_native_texlive_build:$with_system_libgs" = xyes:yes; then
as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5
fi
-
## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/
## configure options and TL libraries required for gsftopk
# Check whether --enable-gsftopk was given.
@@ -4458,7 +4430,6 @@ test "x$enable_gsftopk" = xno || {
need_kpathsea=yes
}
-
## texk/lacheck/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/lacheck/
## configure options and TL libraries required for lacheck
# Check whether --enable-lacheck was given.
@@ -4477,7 +4448,6 @@ $as_echo "$as_me: Assuming \`--enable-lacheck=$enable_lacheck'" >&6;}
;;
esac
-
## texk/lcdf-typetools/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/lcdf-typetools/
## configure options and TL libraries required for lcdf-typetools
# Check whether --enable-lcdf-typetools was given.
@@ -4565,7 +4535,6 @@ if test "${enable_updmap+set}" = set; then :
fi
-
## texk/makeindexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makeindexk/
## configure options and TL libraries required for makeindexk
# Check whether --enable-makeindexk was given.
@@ -4588,7 +4557,6 @@ test "x$enable_makeindexk" = xno || {
need_kpathsea=yes
}
-
## texk/makejvf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/makejvf/
## configure options and TL libraries required for makejvf
# Check whether --enable-makejvf was given.
@@ -4611,7 +4579,6 @@ test "x$enable_makejvf" = xno || {
need_ptexenc=yes
}
-
## texk/mendexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/mendexk/
## configure options and TL libraries required for mendexk
# Check whether --enable-mendexk was given.
@@ -4634,7 +4601,6 @@ test "x$enable_mendexk" = xno || {
need_ptexenc=yes
}
-
## texk/ps2pkm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pkm/
## configure options and TL libraries required for ps2pkm
# Check whether --enable-ps2pkm was given.
@@ -4657,7 +4623,6 @@ test "x$enable_ps2pkm" = xno || {
need_kpathsea=yes
}
-
## texk/seetexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/seetexk/
## configure options and TL libraries required for seetexk
# Check whether --enable-seetexk was given.
@@ -4680,7 +4645,6 @@ test "x$enable_seetexk" = xno || {
need_kpathsea=yes
}
-
## texk/tex4htk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/tex4htk/
## configure options and TL libraries required for tex4htk
# Check whether --enable-tex4htk was given.
@@ -4703,7 +4667,6 @@ test "x$enable_tex4htk" = xno || {
need_kpathsea=yes
}
-
## texk/ttf2pk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttf2pk/
## configure options and TL libraries required for ttf2pk
# Check whether --enable-ttf2pk was given.
@@ -4727,7 +4690,6 @@ test "x$enable_ttf2pk" = xno || {
need_freetype=yes
}
-
## texk/ttf2pk2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttf2pk2/
## configure options and TL libraries required for ttf2pk
# Check whether --enable-ttf2pk2 was given.
@@ -4751,7 +4713,6 @@ test "x$enable_ttf2pk2" = xno || {
need_freetype2=yes
}
-
## texk/ttfdump/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttfdump/
## configure options and TL libraries required for ttfdump
# Check whether --enable-ttfdump was given.
@@ -4770,7 +4731,6 @@ $as_echo "$as_me: Assuming \`--enable-ttfdump=$enable_ttfdump'" >&6;}
;;
esac
-
## texk/xdvik/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/xdvik/
## configure options and TL libraries required for xdvik
# Check whether --enable-xdvik was given.
@@ -4816,7 +4776,6 @@ if test "${with_xdvi_x_toolkit+set}" = set; then :
fi
-
## texk/texlive/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/texlive/
## configure options and TL libraries required for texlive
# Check whether --enable-texlive was given.
@@ -4836,7 +4795,6 @@ $as_echo "$as_me: Assuming \`--enable-texlive=$enable_texlive'" >&6;}
esac
-
## libs/harfbuzz/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/harfbuzz/
## configure options and TL libraries required for harfbuzz
@@ -4880,7 +4838,6 @@ test "x$need_harfbuzz" = xyes && {
need_icu=yes
}
-
## libs/icu/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/icu/
## configure options and TL libraries required for icu (modified for XeTeX)
@@ -4901,7 +4858,6 @@ $as_echo "$as_me: Assuming installed \`icu' headers and library" >&6;}
ac_configure_args="$ac_configure_args '--with-system-icu=$with_system_icu'"
fi
-
## libs/teckit/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/teckit/
## configure options and TL libraries required for teckit
@@ -4946,7 +4902,6 @@ test "x$need_teckit" = xyes && {
need_zlib=yes
}
-
## libs/graphite2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/graphite2/
## configure options and TL libraries required for graphite2
@@ -4967,7 +4922,6 @@ $as_echo "$as_me: Assuming installed \`graphite2' headers and library" >&6;}
ac_configure_args="$ac_configure_args '--with-system-graphite2=$with_system_graphite2'"
fi
-
## libs/zziplib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zziplib/
## configure options and TL libraries required for zziplib
@@ -5002,7 +4956,6 @@ test "x$need_zziplib" = xyes && {
need_zlib=yes
}
-
## libs/xpdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/
## configure options and TL libraries required for xpdf
@@ -5023,7 +4976,6 @@ $as_echo "$as_me: Assuming installed \`xpdf' headers and library" >&6;}
ac_configure_args="$ac_configure_args '--with-system-xpdf=$with_system_xpdf'"
fi
-
## libs/poppler/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/poppler/
## configure options and TL libraries required for poppler
@@ -5058,7 +5010,6 @@ test "x$need_poppler" = xyes && {
need_zlib=yes
}
-
## libs/cairo/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/cairo/
## configure options and TL libraries required for cairo
@@ -5093,7 +5044,6 @@ test "x$need_cairo" = xyes && {
need_pixman=yes
}
-
## libs/pixman/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/pixman/
## configure options and TL libraries required for pixman
@@ -5114,7 +5064,6 @@ $as_echo "$as_me: Assuming installed \`pixman' headers and library" >&6;}
ac_configure_args="$ac_configure_args '--with-system-pixman=$with_system_pixman'"
fi
-
## libs/potrace/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/potrace/
## configure options and TL libraries required for potrace
@@ -5145,7 +5094,6 @@ $as_echo "$as_me: Assuming installed \`potrace' headers and library" >&6;}
ac_configure_args="$ac_configure_args '--with-system-potrace=$with_system_potrace'"
fi
-
## libs/gd/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/
## configure options and TL libraries required for gd
@@ -5199,7 +5147,6 @@ test "x$need_gd" = xyes && {
need_freetype2=yes
}
-
## libs/freetype2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype2/
## configure options and TL libraries required for freetype2
@@ -5234,7 +5181,6 @@ test "x$need_freetype2" = xyes && {
need_zlib=yes
}
-
## libs/freetype/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype/
## configure options and TL libraries required for freetype
@@ -5265,7 +5211,6 @@ $as_echo "$as_me: Assuming installed \`freetype' headers and library" >&6;}
ac_configure_args="$ac_configure_args '--with-system-freetype=$with_system_freetype'"
fi
-
## libs/libpng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/
## configure options and TL libraries required for libpng
@@ -5300,11 +5245,9 @@ test "x$need_libpng" = xyes && {
need_zlib=yes
}
-
## libs/lua52/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/lua52/
## configure options and TL libraries required for lua52
-
## libs/zlib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zlib/
## configure options and TL libraries required for zlib
@@ -5336,7 +5279,6 @@ $as_echo "$as_me: Assuming installed \`zlib' headers and library" >&6;}
fi
-
## texk/ptexenc/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ptexenc/
## configure options and TL libraries required for ptexenc
@@ -5381,7 +5323,6 @@ test "x$need_ptexenc" = xyes && {
need_kpathsea=yes
}
-
## texk/kpathsea/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
## configure options and TL libraries required for kpathsea
@@ -5447,7 +5388,6 @@ fi
-
am__api_version='1.14'
# Find a good install program. We prefer a C program (faster),
@@ -6340,315 +6280,254 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TeXk programs to build" >&5
$as_echo_n "checking for TeXk programs to build... " >&6; }
MAKE_SUBDIRS=
CONF_SUBDIRS=
-
-
-
if test -x $srcdir/web2c/configure; then
- test "x$enable_web2c" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS web2c"
+ test "x$enable_web2c" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS web2c"
CONF_SUBDIRS="$CONF_SUBDIRS web2c"
if false; then
subdirs="$subdirs web2c"
fi
fi
-
-
if test -x $srcdir/afm2pl/configure; then
- test "x$enable_afm2pl" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS afm2pl"
+ test "x$enable_afm2pl" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS afm2pl"
CONF_SUBDIRS="$CONF_SUBDIRS afm2pl"
if false; then
subdirs="$subdirs afm2pl"
fi
fi
-
-
if test -x $srcdir/bibtex-x/configure; then
- test "x$enable_bibtex_x" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS bibtex-x"
+ test "x$enable_bibtex_x" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS bibtex-x"
CONF_SUBDIRS="$CONF_SUBDIRS bibtex-x"
if false; then
subdirs="$subdirs bibtex-x"
fi
fi
-
-
if test -x $srcdir/chktex/configure; then
- test "x$enable_chktex" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS chktex"
+ test "x$enable_chktex" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS chktex"
CONF_SUBDIRS="$CONF_SUBDIRS chktex"
if false; then
subdirs="$subdirs chktex"
fi
fi
-
-
if test -x $srcdir/cjkutils/configure; then
- test "x$enable_cjkutils" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS cjkutils"
+ test "x$enable_cjkutils" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS cjkutils"
CONF_SUBDIRS="$CONF_SUBDIRS cjkutils"
if false; then
subdirs="$subdirs cjkutils"
fi
fi
-
-
if test -x $srcdir/detex/configure; then
- test "x$enable_detex" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS detex"
+ test "x$enable_detex" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS detex"
CONF_SUBDIRS="$CONF_SUBDIRS detex"
if false; then
subdirs="$subdirs detex"
fi
fi
-
-
if test -x $srcdir/devnag/configure; then
- test "x$enable_devnag" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS devnag"
+ test "x$enable_devnag" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS devnag"
CONF_SUBDIRS="$CONF_SUBDIRS devnag"
if false; then
subdirs="$subdirs devnag"
fi
fi
-
-
if test -x $srcdir/dtl/configure; then
- test "x$enable_dtl" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS dtl"
+ test "x$enable_dtl" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dtl"
CONF_SUBDIRS="$CONF_SUBDIRS dtl"
if false; then
subdirs="$subdirs dtl"
fi
fi
-
-
if test -x $srcdir/dvi2tty/configure; then
- test "x$enable_dvi2tty" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS dvi2tty"
+ test "x$enable_dvi2tty" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvi2tty"
CONF_SUBDIRS="$CONF_SUBDIRS dvi2tty"
if false; then
subdirs="$subdirs dvi2tty"
fi
fi
-
-
if test -x $srcdir/dvidvi/configure; then
- test "x$enable_dvidvi" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS dvidvi"
+ test "x$enable_dvidvi" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvidvi"
CONF_SUBDIRS="$CONF_SUBDIRS dvidvi"
if false; then
subdirs="$subdirs dvidvi"
fi
fi
-
-
if test -x $srcdir/dviljk/configure; then
- test "x$enable_dviljk" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS dviljk"
+ test "x$enable_dviljk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dviljk"
CONF_SUBDIRS="$CONF_SUBDIRS dviljk"
if false; then
subdirs="$subdirs dviljk"
fi
fi
-
-
if test -x $srcdir/dvipdf-x/configure; then
- test "x$enable_dvipdf_x" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS dvipdf-x"
+ test "x$enable_dvipdf_x" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvipdf-x"
CONF_SUBDIRS="$CONF_SUBDIRS dvipdf-x"
if false; then
subdirs="$subdirs dvipdf-x"
fi
fi
-
-
if test -x $srcdir/dvipdfm-x/configure; then
- test "x$enable_dvipdfm_x" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS dvipdfm-x"
+ test "x$enable_dvipdfm_x" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvipdfm-x"
CONF_SUBDIRS="$CONF_SUBDIRS dvipdfm-x"
if false; then
subdirs="$subdirs dvipdfm-x"
fi
fi
-
-
if test -x $srcdir/dvipng/configure; then
- test "x$enable_dvipng" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS dvipng"
+ test "x$enable_dvipng" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvipng"
CONF_SUBDIRS="$CONF_SUBDIRS dvipng"
if false; then
subdirs="$subdirs dvipng"
fi
fi
-
-
if test -x $srcdir/dvipos/configure; then
- test "x$enable_dvipos" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS dvipos"
+ test "x$enable_dvipos" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvipos"
CONF_SUBDIRS="$CONF_SUBDIRS dvipos"
if false; then
subdirs="$subdirs dvipos"
fi
fi
-
-
if test -x $srcdir/dvipsk/configure; then
- test "x$enable_dvipsk" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS dvipsk"
+ test "x$enable_dvipsk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvipsk"
CONF_SUBDIRS="$CONF_SUBDIRS dvipsk"
if false; then
subdirs="$subdirs dvipsk"
fi
fi
-
-
if test -x $srcdir/dvisvgm/configure; then
- test "x$enable_dvisvgm" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS dvisvgm"
+ test "x$enable_dvisvgm" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvisvgm"
CONF_SUBDIRS="$CONF_SUBDIRS dvisvgm"
if false; then
subdirs="$subdirs dvisvgm"
fi
fi
-
-
if test -x $srcdir/gsftopk/configure; then
- test "x$enable_gsftopk" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS gsftopk"
+ test "x$enable_gsftopk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS gsftopk"
CONF_SUBDIRS="$CONF_SUBDIRS gsftopk"
if false; then
subdirs="$subdirs gsftopk"
fi
fi
-
-
if test -x $srcdir/lacheck/configure; then
- test "x$enable_lacheck" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS lacheck"
+ test "x$enable_lacheck" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS lacheck"
CONF_SUBDIRS="$CONF_SUBDIRS lacheck"
if false; then
subdirs="$subdirs lacheck"
fi
fi
-
-
if test -x $srcdir/lcdf-typetools/configure; then
- test "x$enable_lcdf_typetools" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS lcdf-typetools"
+ test "x$enable_lcdf_typetools" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS lcdf-typetools"
CONF_SUBDIRS="$CONF_SUBDIRS lcdf-typetools"
if false; then
subdirs="$subdirs lcdf-typetools"
fi
fi
-
-
if test -x $srcdir/makeindexk/configure; then
- test "x$enable_makeindexk" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS makeindexk"
+ test "x$enable_makeindexk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS makeindexk"
CONF_SUBDIRS="$CONF_SUBDIRS makeindexk"
if false; then
subdirs="$subdirs makeindexk"
fi
fi
-
-
if test -x $srcdir/makejvf/configure; then
- test "x$enable_makejvf" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS makejvf"
+ test "x$enable_makejvf" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS makejvf"
CONF_SUBDIRS="$CONF_SUBDIRS makejvf"
if false; then
subdirs="$subdirs makejvf"
fi
fi
-
-
if test -x $srcdir/mendexk/configure; then
- test "x$enable_mendexk" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS mendexk"
+ test "x$enable_mendexk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS mendexk"
CONF_SUBDIRS="$CONF_SUBDIRS mendexk"
if false; then
subdirs="$subdirs mendexk"
fi
fi
-
-
if test -x $srcdir/ps2pkm/configure; then
- test "x$enable_ps2pkm" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS ps2pkm"
+ test "x$enable_ps2pkm" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ps2pkm"
CONF_SUBDIRS="$CONF_SUBDIRS ps2pkm"
if false; then
subdirs="$subdirs ps2pkm"
fi
fi
-
-
if test -x $srcdir/seetexk/configure; then
- test "x$enable_seetexk" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS seetexk"
+ test "x$enable_seetexk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS seetexk"
CONF_SUBDIRS="$CONF_SUBDIRS seetexk"
if false; then
subdirs="$subdirs seetexk"
fi
fi
-
-
if test -x $srcdir/tex4htk/configure; then
- test "x$enable_tex4htk" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS tex4htk"
+ test "x$enable_tex4htk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS tex4htk"
CONF_SUBDIRS="$CONF_SUBDIRS tex4htk"
if false; then
subdirs="$subdirs tex4htk"
fi
fi
-
-
if test -x $srcdir/ttf2pk/configure; then
- test "x$enable_ttf2pk" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS ttf2pk"
+ test "x$enable_ttf2pk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ttf2pk"
CONF_SUBDIRS="$CONF_SUBDIRS ttf2pk"
if false; then
subdirs="$subdirs ttf2pk"
fi
fi
-
-
if test -x $srcdir/ttf2pk2/configure; then
- test "x$enable_ttf2pk2" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS ttf2pk2"
+ test "x$enable_ttf2pk2" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ttf2pk2"
CONF_SUBDIRS="$CONF_SUBDIRS ttf2pk2"
if false; then
subdirs="$subdirs ttf2pk2"
fi
fi
-
-
if test -x $srcdir/ttfdump/configure; then
- test "x$enable_ttfdump" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS ttfdump"
+ test "x$enable_ttfdump" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ttfdump"
CONF_SUBDIRS="$CONF_SUBDIRS ttfdump"
if false; then
subdirs="$subdirs ttfdump"
fi
fi
-
-
if test -x $srcdir/xdvik/configure; then
- test "x$enable_xdvik" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS xdvik"
+ test "x$enable_xdvik" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS xdvik"
CONF_SUBDIRS="$CONF_SUBDIRS xdvik"
if false; then
subdirs="$subdirs xdvik"
fi
fi
-
-
if test -x $srcdir/texlive/configure; then
- test "x$enable_texlive" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS texlive"
+ test "x$enable_texlive" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS texlive"
CONF_SUBDIRS="$CONF_SUBDIRS texlive"
if false; then
subdirs="$subdirs texlive"
@@ -6656,9 +6535,6 @@ if test -x $srcdir/texlive/configure; then
fi
fi
-
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5
$as_echo "$MAKE_SUBDIRS" >&6; }
diff --git a/Build/source/texk/configure.ac b/Build/source/texk/configure.ac
index 58ccbac524d..d2d02a940c1 100644
--- a/Build/source/texk/configure.ac
+++ b/Build/source/texk/configure.ac
@@ -11,7 +11,7 @@ AC_INIT([TeX Live texk], tex_live_version(), [peb@mppmu.mpg.de])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([../build-aux/missing])
AC_CONFIG_AUX_DIR([../build-aux])
-AC_CONFIG_MACRO_DIR([../m4])
+AC_CONFIG_MACRO_DIRS([../m4])
dnl See comment in ../configure.ac
KPSE_SETUP([../])
@@ -20,23 +20,7 @@ KPSE_BASIC([texk])
AC_PROG_MKDIR_P
-AC_MSG_CHECKING([for TeXk programs to build])
-MAKE_SUBDIRS=
-CONF_SUBDIRS=
-KPSE_FOR_PKGS([texk], [
-if test -x $srcdir/Kpse_Pkg/configure; then
- test "x$enable_[]Kpse_pkg" = xno || MAKE_SUBDIRS="$MAKE_SUBDIRS Kpse_Pkg"
-dnl Cause 'make dist' to recurse into all subtexk dirs
- CONF_SUBDIRS="$CONF_SUBDIRS Kpse_Pkg"
-dnl Cause 'configure -hr' and 'autoreconf' to recurse into all subtexk dirs
- if false; then
- AC_CONFIG_SUBDIRS(Kpse_Pkg)
- fi
-fi
-])
-AC_SUBST([MAKE_SUBDIRS])
-AC_SUBST([CONF_SUBDIRS])
-AC_MSG_RESULT([$MAKE_SUBDIRS])
+KPSE_RECURSE_PROGS([texk], [TeXk])
AC_CONFIG_FILES([Makefile])
diff --git a/Build/source/texk/dvipdf-x/configure b/Build/source/texk/dvipdf-x/configure
index 6ac4efff518..bd59ba4c949 100755
--- a/Build/source/texk/dvipdf-x/configure
+++ b/Build/source/texk/dvipdf-x/configure
@@ -15746,8 +15746,8 @@ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
fi
else
FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2"
- FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.la"
- FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.la'
+ FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a"
+ FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a'
FREETYPE2_RULE='# Rebuild libfreetype
$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h
cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 994159c78e3..890e5dd005c 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-01 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * spc_util.c: This file is identical for dvipdfmx and xdvipdfmx,
+ now part of libutil.a.
+
2013-08-18 Peter Breitenlohner <peb@mppmu.mpg.de>
* epdf.c (add_stream_flate): Use z_const.
diff --git a/Build/source/texk/dvipdfm-x/Makefile.am b/Build/source/texk/dvipdfm-x/Makefile.am
index 421d9bedcaf..c0499ff366e 100644
--- a/Build/source/texk/dvipdfm-x/Makefile.am
+++ b/Build/source/texk/dvipdfm-x/Makefile.am
@@ -99,6 +99,7 @@ libutil_a_SOURCES = \
spc_pdfm.h \
spc_tpic.h \
spc_util.h \
+ spc_util.c \
specials.h \
subfont.c \
subfont.h \
@@ -158,7 +159,6 @@ dvipdfmx_SOURCES = \
spc_html.c \
spc_pdfm.c \
spc_tpic.c \
- spc_util.c \
spc_xtx.c \
spc_xtx.h \
specials.c \
diff --git a/Build/source/texk/dvipdfm-x/Makefile.in b/Build/source/texk/dvipdfm-x/Makefile.in
index 13aecc8a62c..bbaa4d997dc 100644
--- a/Build/source/texk/dvipdfm-x/Makefile.in
+++ b/Build/source/texk/dvipdfm-x/Makefile.in
@@ -153,9 +153,9 @@ am_libutil_a_OBJECTS = agl.$(OBJEXT) cidtype0.$(OBJEXT) \
numbers.$(OBJEXT) otl_conf.$(OBJEXT) otl_opt.$(OBJEXT) \
pdfcolor.$(OBJEXT) pdfencrypt.$(OBJEXT) pdfencoding.$(OBJEXT) \
pdfresource.$(OBJEXT) pngimage.$(OBJEXT) pst.$(OBJEXT) \
- pst_obj.$(OBJEXT) spc_misc.$(OBJEXT) subfont.$(OBJEXT) \
- tfm.$(OBJEXT) type1c.$(OBJEXT) unicode.$(OBJEXT) vf.$(OBJEXT) \
- xbb.$(OBJEXT)
+ pst_obj.$(OBJEXT) spc_misc.$(OBJEXT) spc_util.$(OBJEXT) \
+ subfont.$(OBJEXT) tfm.$(OBJEXT) type1c.$(OBJEXT) \
+ unicode.$(OBJEXT) vf.$(OBJEXT) xbb.$(OBJEXT)
libutil_a_OBJECTS = $(am_libutil_a_OBJECTS)
@DVIPDFMX_TRUE@am__EXEEXT_1 = dvipdfmx$(EXEEXT)
@XDVIPDFMX_TRUE@am__EXEEXT_2 = xdvipdfmx$(EXEEXT)
@@ -180,12 +180,11 @@ am_dvipdfmx_OBJECTS = bmpimage.$(OBJEXT) cff.$(OBJEXT) \
pdfnames.$(OBJEXT) pdfobj.$(OBJEXT) pdfparse.$(OBJEXT) \
pdfximage.$(OBJEXT) pkfont.$(OBJEXT) sfnt.$(OBJEXT) \
spc_color.$(OBJEXT) spc_dvips.$(OBJEXT) spc_html.$(OBJEXT) \
- spc_pdfm.$(OBJEXT) spc_tpic.$(OBJEXT) spc_util.$(OBJEXT) \
- spc_xtx.$(OBJEXT) specials.$(OBJEXT) t1_char.$(OBJEXT) \
- t1_load.$(OBJEXT) truetype.$(OBJEXT) tt_aux.$(OBJEXT) \
- tt_cmap.$(OBJEXT) tt_glyf.$(OBJEXT) tt_gsub.$(OBJEXT) \
- tt_post.$(OBJEXT) tt_table.$(OBJEXT) type0.$(OBJEXT) \
- type1.$(OBJEXT)
+ spc_pdfm.$(OBJEXT) spc_tpic.$(OBJEXT) spc_xtx.$(OBJEXT) \
+ specials.$(OBJEXT) t1_char.$(OBJEXT) t1_load.$(OBJEXT) \
+ truetype.$(OBJEXT) tt_aux.$(OBJEXT) tt_cmap.$(OBJEXT) \
+ tt_glyf.$(OBJEXT) tt_gsub.$(OBJEXT) tt_post.$(OBJEXT) \
+ tt_table.$(OBJEXT) type0.$(OBJEXT) type1.$(OBJEXT)
dvipdfmx_OBJECTS = $(am_dvipdfmx_OBJECTS)
am__DEPENDENCIES_1 =
dvipdfmx_DEPENDENCIES = libutil.a $(am__DEPENDENCIES_1) \
@@ -205,13 +204,13 @@ am__objects_1 = xdvipdfmx-bmpimage.$(OBJEXT) xdvipdfmx-cff.$(OBJEXT) \
xdvipdfmx-sfnt.$(OBJEXT) xdvipdfmx-spc_color.$(OBJEXT) \
xdvipdfmx-spc_dvips.$(OBJEXT) xdvipdfmx-spc_html.$(OBJEXT) \
xdvipdfmx-spc_pdfm.$(OBJEXT) xdvipdfmx-spc_tpic.$(OBJEXT) \
- xdvipdfmx-spc_util.$(OBJEXT) xdvipdfmx-spc_xtx.$(OBJEXT) \
- xdvipdfmx-specials.$(OBJEXT) xdvipdfmx-t1_char.$(OBJEXT) \
- xdvipdfmx-t1_load.$(OBJEXT) xdvipdfmx-truetype.$(OBJEXT) \
- xdvipdfmx-tt_aux.$(OBJEXT) xdvipdfmx-tt_cmap.$(OBJEXT) \
- xdvipdfmx-tt_glyf.$(OBJEXT) xdvipdfmx-tt_gsub.$(OBJEXT) \
- xdvipdfmx-tt_post.$(OBJEXT) xdvipdfmx-tt_table.$(OBJEXT) \
- xdvipdfmx-type0.$(OBJEXT) xdvipdfmx-type1.$(OBJEXT)
+ xdvipdfmx-spc_xtx.$(OBJEXT) xdvipdfmx-specials.$(OBJEXT) \
+ xdvipdfmx-t1_char.$(OBJEXT) xdvipdfmx-t1_load.$(OBJEXT) \
+ xdvipdfmx-truetype.$(OBJEXT) xdvipdfmx-tt_aux.$(OBJEXT) \
+ xdvipdfmx-tt_cmap.$(OBJEXT) xdvipdfmx-tt_glyf.$(OBJEXT) \
+ xdvipdfmx-tt_gsub.$(OBJEXT) xdvipdfmx-tt_post.$(OBJEXT) \
+ xdvipdfmx-tt_table.$(OBJEXT) xdvipdfmx-type0.$(OBJEXT) \
+ xdvipdfmx-type1.$(OBJEXT)
nodist_xdvipdfmx_OBJECTS = $(am__objects_1)
xdvipdfmx_OBJECTS = $(nodist_xdvipdfmx_OBJECTS)
am__DEPENDENCIES_2 = libutil.a $(am__DEPENDENCIES_1) \
@@ -722,6 +721,7 @@ libutil_a_SOURCES = \
spc_pdfm.h \
spc_tpic.h \
spc_util.h \
+ spc_util.c \
specials.h \
subfont.c \
subfont.h \
@@ -781,7 +781,6 @@ dvipdfmx_SOURCES = \
spc_html.c \
spc_pdfm.c \
spc_tpic.c \
- spc_util.c \
spc_xtx.c \
spc_xtx.h \
specials.c \
@@ -1102,7 +1101,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-spc_html.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-spc_pdfm.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-spc_tpic.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-spc_util.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-spc_xtx.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-specials.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdvipdfmx-t1_char.Po@am__quote@
@@ -1547,20 +1545,6 @@ xdvipdfmx-spc_tpic.obj: spc_tpic.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-spc_tpic.obj `if test -f 'spc_tpic.c'; then $(CYGPATH_W) 'spc_tpic.c'; else $(CYGPATH_W) '$(srcdir)/spc_tpic.c'; fi`
-xdvipdfmx-spc_util.o: spc_util.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-spc_util.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-spc_util.Tpo -c -o xdvipdfmx-spc_util.o `test -f 'spc_util.c' || echo '$(srcdir)/'`spc_util.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-spc_util.Tpo $(DEPDIR)/xdvipdfmx-spc_util.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='spc_util.c' object='xdvipdfmx-spc_util.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-spc_util.o `test -f 'spc_util.c' || echo '$(srcdir)/'`spc_util.c
-
-xdvipdfmx-spc_util.obj: spc_util.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-spc_util.obj -MD -MP -MF $(DEPDIR)/xdvipdfmx-spc_util.Tpo -c -o xdvipdfmx-spc_util.obj `if test -f 'spc_util.c'; then $(CYGPATH_W) 'spc_util.c'; else $(CYGPATH_W) '$(srcdir)/spc_util.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-spc_util.Tpo $(DEPDIR)/xdvipdfmx-spc_util.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='spc_util.c' object='xdvipdfmx-spc_util.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xdvipdfmx-spc_util.obj `if test -f 'spc_util.c'; then $(CYGPATH_W) 'spc_util.c'; else $(CYGPATH_W) '$(srcdir)/spc_util.c'; fi`
-
xdvipdfmx-spc_xtx.o: spc_xtx.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xdvipdfmx_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xdvipdfmx-spc_xtx.o -MD -MP -MF $(DEPDIR)/xdvipdfmx-spc_xtx.Tpo -c -o xdvipdfmx-spc_xtx.o `test -f 'spc_xtx.c' || echo '$(srcdir)/'`spc_xtx.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xdvipdfmx-spc_xtx.Tpo $(DEPDIR)/xdvipdfmx-spc_xtx.Po
diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure
index 6e5804f4521..1c916481e4a 100755
--- a/Build/source/texk/dvipdfm-x/configure
+++ b/Build/source/texk/dvipdfm-x/configure
@@ -15747,8 +15747,8 @@ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
fi
else
FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2"
- FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.la"
- FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.la'
+ FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a"
+ FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a'
FREETYPE2_RULE='# Rebuild libfreetype
$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h
cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog
index eede51b66d7..9add50dd773 100644
--- a/Build/source/texk/dvipng/ChangeLog
+++ b/Build/source/texk/dvipng/ChangeLog
@@ -1,3 +1,12 @@
+2013-09-03 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * gs-device.m4, makeinfo.m4: Slightly rewrite, update Copyright.
+
+2013-09-02 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Drop ACLOCAL_AMFLAGS.
+ * configure.ac: Use AC_CONFIG_MACRO_DIRS.
+
2013-07-05 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am, doc/Makefile.am:
diff --git a/Build/source/texk/dvipng/Makefile.am b/Build/source/texk/dvipng/Makefile.am
index 641a39d92d6..d382ac58fb6 100644
--- a/Build/source/texk/dvipng/Makefile.am
+++ b/Build/source/texk/dvipng/Makefile.am
@@ -10,8 +10,6 @@
#
#************************************************************************
##
-ACLOCAL_AMFLAGS = -I ../../m4 -I m4
-
## We want to re-distribute the whole original dvipng source tree.
##
## With current automake (1.10.2) 'make distcheck' fails when
diff --git a/Build/source/texk/dvipng/Makefile.in b/Build/source/texk/dvipng/Makefile.in
index 33c42843e63..ffcd12b84f4 100644
--- a/Build/source/texk/dvipng/Makefile.in
+++ b/Build/source/texk/dvipng/Makefile.in
@@ -628,7 +628,6 @@ top_srcdir = @top_srcdir@
# Copyright (C) 2002-2008 Jan-Åke Larsson
#
#************************************************************************
-ACLOCAL_AMFLAGS = -I ../../m4 -I m4
EXTRA_DIST = $(DVIPNG_TREE) $(DVIPNG_TREE)-PATCHES dvipng.test \
dvipng-test.dvi
AM_CPPFLAGS = -I$(top_srcdir)/$(DVIPNG_TREE) $(KPATHSEA_INCLUDES) \
diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure
index 0d501ada4ed..2eb91bcc143 100755
--- a/Build/source/texk/dvipng/configure
+++ b/Build/source/texk/dvipng/configure
@@ -14457,25 +14457,24 @@ $as_echo "no" >&6; }
fi
-for ac_macro in acronym env option; do
- if test -n "$MAKEINFO" -a "$MAKEINFO" != ":"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MAKEINFO understands @$ac_macro{}" >&5
+if test -n "$MAKEINFO" -a "$MAKEINFO" != ":"; then
+ for ac_macro in acronym env option; do
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MAKEINFO understands @$ac_macro{}" >&5
$as_echo_n "checking if $MAKEINFO understands @$ac_macro{}... " >&6; }
- echo \\\\input texinfo > conftest.texi
- echo @$ac_macro{test} >> conftest.texi
- if $MAKEINFO conftest.texi > /dev/null 2> /dev/null; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+echo \\\\input texinfo > conftest.texi
+echo @$ac_macro{test} >> conftest.texi
+if $MAKEINFO conftest.texi > /dev/null 2> /dev/null; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- AM_MAKEINFOFLAGS="-D no-$ac_macro $AM_MAKEINFOFLAGS"
-
- fi
- rm -f conftest.texi conftest.info
+ AM_MAKEINFOFLAGS="-D no-$ac_macro $AM_MAKEINFOFLAGS"
fi
+rm -f conftest.texi conftest.info
-done
+ done
+fi
# Extract the first word of "install-info", so it can be a program name with args.
@@ -16283,8 +16282,8 @@ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
fi
else
FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2"
- FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.la"
- FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.la'
+ FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a"
+ FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a'
FREETYPE2_RULE='# Rebuild libfreetype
$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h
cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
diff --git a/Build/source/texk/dvipng/configure.ac b/Build/source/texk/dvipng/configure.ac
index 5a42a748d86..488fb866063 100644
--- a/Build/source/texk/dvipng/configure.ac
+++ b/Build/source/texk/dvipng/configure.ac
@@ -18,7 +18,7 @@ AC_INIT([dvipng (TeX Live)], dvipng_version, [tex-k@tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([dvipng-]dvipng_version[/dvipng.c])
AC_CONFIG_AUX_DIR([../../build-aux])
-AC_CONFIG_MACRO_DIR([../../m4])
+AC_CONFIG_MACRO_DIRS([../../m4 m4])
# Common code for all programs using libkpathsea.
KPSE_COMMON([dvipng])
diff --git a/Build/source/texk/dvipng/m4/gs-device.m4 b/Build/source/texk/dvipng/m4/gs-device.m4
index 77d34808f7e..6b726f2e91f 100644
--- a/Build/source/texk/dvipng/m4/gs-device.m4
+++ b/Build/source/texk/dvipng/m4/gs-device.m4
@@ -1,23 +1,18 @@
-# gs-device.m4 - Macros to check for GS devices.
-## Copyright (C) 20xx Some One <someone@somewhere.net>
-## Some affiliation
-##
-## Notice:
-## I extracted these macros from aclocal.m4 in the dvipng-1.12 distribution
-## and renamed one in order not to violate the Autoconf (AC_) namespace.
-## 26 Mar 2008, Peter Breitenlohner <tex-live@tug.org>
-##
-## This file is free software; the copyright holder gives unlimited
-## permission to copy and/or distribute it, with or without
-## modifications, as long as this notice is preserved.
-
-# serial 1
+# Autoconf macros for dvipng.
+# Copyright (C) 2002-2010 Jan-Åke Larsson <jan-ake.larsson@liu.se>
+# Copyright (C) 2010-2013 Peter Breitenlohner <tex-live@tug.org>
+#
+# This file is free software; the copyright holders
+# give unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+#
+# Extracted from dvipng-1.12/aclocal.m4 and adapted for use in TeX Live.
# GS_CHECK_DEVICES
# ----------------
# Check GS (ghostscript) devices.
-AC_DEFUN([GS_CHECK_DEVICES],
-[GS_WARN=
+AC_DEFUN([GS_CHECK_DEVICES], [dnl
+GS_WARN=
_GS_HAS_DEVICE([pngalpha],
[GS_WARN="Your EPS inclusions will be cropped to the
boundingbox, and rendered on an opaque background.
@@ -34,8 +29,8 @@ fi
# ----------------------------------------
# Internal subroutine. Check if GS has the device DEVICE and
# execute the shell code ACTION-IF-FAILED if not.
-m4_define([_GS_HAS_DEVICE],
-[AC_MSG_CHECKING([whether $GS has the $1 device])
+m4_define([_GS_HAS_DEVICE], [dnl
+AC_MSG_CHECKING([whether $GS has the $1 device])
if $GS -h | grep $1 >/dev/null; then
AC_MSG_RESULT([yes])
else
diff --git a/Build/source/texk/dvipng/m4/makeinfo.m4 b/Build/source/texk/dvipng/m4/makeinfo.m4
index 86d52d2e495..0ddff45ecde 100644
--- a/Build/source/texk/dvipng/m4/makeinfo.m4
+++ b/Build/source/texk/dvipng/m4/makeinfo.m4
@@ -1,52 +1,41 @@
-# makeinfo.m4 - Macros to determine makeinfo features.
-## Copyright (C) 20xx Some One <someone@somewhere.net>
-## Some affiliation
-##
-## Temporary notice:
-## I extracted these macros from aclocal.m4 in the dvipng-1.9 distribution
-## and slightly modified them for use with Automake.
-## 26 Mar 2008, Peter Breitenlohner <tex-live@tug.org>
-##
-## This file is free software; the copyright holder gives unlimited
-## permission to copy and/or distribute it, with or without
-## modifications, as long as this notice is preserved.
+# Autoconf macros for dvipng.
+# Copyright (C) 2002-2008 Jan-Åke Larsson <jan-ake.larsson@liu.se>
+# Copyright (C) 2008-2013 Peter Breitenlohner <tex-live@tug.org>
+#
+# This file is free software; the copyright holders
+# give unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+#
+# Extracted from dvipng-1.9/aclocal.m4 and adapted for use in TeX Live.
-# serial 1
-
-# MAKEINFO_CHECK_MACRO( MACRO, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# ----------------------------------------------------------------------
-# Check if makeinfo understands the macro @MACRO{}. Execute the shell
-# code ACTION-IF-FOUND if so, or ACTION-IF-NOT-FOUND otherwise.
-AC_DEFUN([MAKEINFO_CHECK_MACRO],
-[if test -n "$MAKEINFO" -a "$MAKEINFO" != ":"; then
- AC_MSG_CHECKING([if $MAKEINFO understands @$1{}])
- echo \\\\input texinfo > conftest.texi
- echo @$1{test} >> conftest.texi
- if $MAKEINFO conftest.texi > /dev/null 2> /dev/null; then
- AC_MSG_RESULT(yes)
- m4_ifval([$2], [$2
-])[]dnl
- else
- AC_MSG_RESULT(no)
- m4_ifval([$3], [$3
-])[]dnl
- fi
- rm -f conftest.texi conftest.info
+# MAKEINFO_CHECK_MACROS(MACRO ...)
+# --------------------------------
+# For each MACRO check if makeinfo understands @MACRO{}.
+# Prepend '-D no-MACRO' for each MACRO not understood to the
+# output variable AM_MAKEINFOFLAGS.
+AC_DEFUN([MAKEINFO_CHECK_MACROS], [dnl
+if test -n "$MAKEINFO" -a "$MAKEINFO" != ":"; then
+ for ac_macro in $1; do
+ _MAKEINFO_CHECK_MACRO([$ac_macro])
+ done
fi
-])# MAKEINFO_CHECK_MACRO
-
-# MAKEINFO_CHECK_MACROS( MACRO ..., [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# ----------------------------------------------------------------------------
-# For each MACRO check if makeinfo understands @MACRO{}. Execute the shell
-# code ACTION-IF-FOUND for each macro understood, or ACTION-IF-NOT-FOUND
-# for each macro not understood. Prepend '-D no-MACRO' for each MACRO
-#not understood to the output variable AM_MAKEINFOFLAGS.
-AC_DEFUN([MAKEINFO_CHECK_MACROS],
-[for ac_macro in $1; do
- MAKEINFO_CHECK_MACRO([$ac_macro], [$2],
- [AM_MAKEINFOFLAGS="-D no-$ac_macro $AM_MAKEINFOFLAGS"
- $3])
-done
AC_SUBST([AM_MAKEINFOFLAGS])
])# MAKEINFO_CHECK_MACROS
+# _MAKEINFO_CHECK_MACRO(MACRO)
+# ----------------------------
+# Internal subroutine. Check if makeinfo understands @MACRO{}
+# and prepend '-D no-MACRO' to AM_MAKEINFOFLAGS if not.
+m4_define([_MAKEINFO_CHECK_MACRO], [dnl
+AC_MSG_CHECKING([if $MAKEINFO understands @$1{}])
+echo \\\\input texinfo > conftest.texi
+echo @$1{test} >> conftest.texi
+if $MAKEINFO conftest.texi > /dev/null 2> /dev/null; then
+ AC_MSG_RESULT([yes])
+else
+ AC_MSG_RESULT([no])
+ AM_MAKEINFOFLAGS="-D no-$1 $AM_MAKEINFOFLAGS"
+fi
+rm -f conftest.texi conftest.info
+])# _MAKEINFO_CHECK_MACRO
+
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index f040ac95c3b..52b25ce67f3 100755
--- a/Build/source/texk/dvisvgm/configure
+++ b/Build/source/texk/dvisvgm/configure
@@ -19237,8 +19237,8 @@ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
fi
else
FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2"
- FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.la"
- FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.la'
+ FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a"
+ FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a'
FREETYPE2_RULE='# Rebuild libfreetype
$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h
cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
diff --git a/Build/source/texk/lcdf-typetools/ChangeLog b/Build/source/texk/lcdf-typetools/ChangeLog
index b8ea9ed4909..92424172495 100644
--- a/Build/source/texk/lcdf-typetools/ChangeLog
+++ b/Build/source/texk/lcdf-typetools/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-02 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Drop ACLOCAL_AMFLAGS.
+ * configure.ac: Use AC_CONFIG_MACRO_DIRS.
+
2013-04-11 Peter Breitenlohner <peb@mppmu.mpg.de>
Import lcdf-typetools-2.98.
diff --git a/Build/source/texk/lcdf-typetools/Makefile.am b/Build/source/texk/lcdf-typetools/Makefile.am
index 6fc60a02503..fc3903844b3 100644
--- a/Build/source/texk/lcdf-typetools/Makefile.am
+++ b/Build/source/texk/lcdf-typetools/Makefile.am
@@ -10,8 +10,6 @@
#
#************************************************************************
##
-ACLOCAL_AMFLAGS = -I ../../m4 -I m4
-
## We use the original lcdf-typetools source tree.
##
SUBDIRS = . $(LCDF_TYPETOOLS_TREE)
diff --git a/Build/source/texk/lcdf-typetools/Makefile.in b/Build/source/texk/lcdf-typetools/Makefile.in
index 8c8e99a2e20..94d3ebd2202 100644
--- a/Build/source/texk/lcdf-typetools/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/Makefile.in
@@ -553,7 +553,6 @@ top_srcdir = @top_srcdir@
# Copyright (c) 2003-2011 Eddie Kohler
#
#************************************************************************
-ACLOCAL_AMFLAGS = -I ../../m4 -I m4
SUBDIRS = . $(LCDF_TYPETOOLS_TREE)
DIST_SUBDIRS = $(SUBDIRS)
EXTRA_DIST = $(LCDF_TYPETOOLS_TREE)-PATCHES \
diff --git a/Build/source/texk/lcdf-typetools/configure.ac b/Build/source/texk/lcdf-typetools/configure.ac
index 4e9ccab946a..68f03c0eb11 100644
--- a/Build/source/texk/lcdf-typetools/configure.ac
+++ b/Build/source/texk/lcdf-typetools/configure.ac
@@ -18,7 +18,7 @@ AC_INIT([LCDF typetools (TeX Live)], lcdf_typetools_version, [tex-k@tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([lcdf-typetools-]lcdf_typetools_version[/NEWS])
AC_CONFIG_AUX_DIR([../../build-aux])
-AC_CONFIG_MACRO_DIR([../../m4])
+AC_CONFIG_MACRO_DIRS([../../m4 m4])
dnl Common code for all programs using libkpathsea.
KPSE_COMMON([lcdf-typetools])
diff --git a/Build/source/texk/ttf2pk2/configure b/Build/source/texk/ttf2pk2/configure
index 37c43c2664d..c8585282a1f 100755
--- a/Build/source/texk/ttf2pk2/configure
+++ b/Build/source/texk/ttf2pk2/configure
@@ -14624,8 +14624,8 @@ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
fi
else
FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2"
- FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.la"
- FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.la'
+ FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a"
+ FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a'
FREETYPE2_RULE='# Rebuild libfreetype
$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h
cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 78d8d6e2aa2..10f7533833a 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-02 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Drop ACLOCAL_AMFLAGS.
+ * configure.ac: Use AC_CONFIG_MACRO_DIRS.
+
2013-07-12 Peter Breitenlohner <peb@mppmu.mpg.de>
* tests/B.pdf (new):
diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am
index 83eae378c1e..daecdb0e460 100644
--- a/Build/source/texk/web2c/Makefile.am
+++ b/Build/source/texk/web2c/Makefile.am
@@ -3,8 +3,6 @@
## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
-ACLOCAL_AMFLAGS = -I ../../m4 -I m4
-
AM_CPPFLAGS = $(KPATHSEA_INCLUDES)
## Not yet for C, C++, and ObjC++ (too many warnings or not yet implemented)
AM_CFLAGS = $(WARNING_CFLAGS)
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 1c056e49471..5141fb95ccc 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1714,7 +1714,6 @@ top_srcdir = @top_srcdir@
wlibs = @wlibs@
x_ext_lib = @x_ext_lib@
x_tool_libs = @x_tool_libs@
-ACLOCAL_AMFLAGS = -I ../../m4 -I m4
AM_CPPFLAGS = $(KPATHSEA_INCLUDES)
AM_CFLAGS = $(WARNING_CFLAGS)
AM_CXXFLAGS = ## $(WARNING_CXXFLAGS)
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 2329aa0ea91..faabb6bc4ee 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -23200,8 +23200,8 @@ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
fi
else
FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2"
- FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.la"
- FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.la'
+ FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a"
+ FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a'
FREETYPE2_RULE='# Rebuild libfreetype
$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h
cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index 5a36dd1e1cb..460728f3542 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -28,7 +28,7 @@ dnl to build part of the distribution may not have any given program.
dnl Even cpascal.h isn't guaranteed, but then nothing is, really ...
AC_CONFIG_SRCDIR([cpascal.h])
AC_CONFIG_AUX_DIR([../../build-aux])
-AC_CONFIG_MACRO_DIR([../../m4])
+AC_CONFIG_MACRO_DIRS([../../m4 m4])
WEB2CVERSION=tex_live_version()
AC_SUBST([WEB2CVERSION])
diff --git a/Build/source/texk/xdvik/ChangeLog b/Build/source/texk/xdvik/ChangeLog
index 574be1ef09d..180ec6456c3 100644
--- a/Build/source/texk/xdvik/ChangeLog
+++ b/Build/source/texk/xdvik/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-02 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Drop ACLOCAL_AMFLAGS.
+ * configure.ac: Use AC_CONFIG_MACRO_DIRS.
+
2013-07-02 Peter Breitenlohner <peb@mppmu.mpg.de>
* *.[ch], gui/*.[ch], tests/*.[ch]: Include "xdvi-config.h"
diff --git a/Build/source/texk/xdvik/Makefile.am b/Build/source/texk/xdvik/Makefile.am
index 99654a44206..f9e926e0d9f 100644
--- a/Build/source/texk/xdvik/Makefile.am
+++ b/Build/source/texk/xdvik/Makefile.am
@@ -3,8 +3,6 @@
## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
-ACLOCAL_AMFLAGS = -I ../../m4 -I m4
-
AM_CFLAGS = $(WARNING_CFLAGS)
SUBDIRS = squeeze . tests
diff --git a/Build/source/texk/xdvik/Makefile.in b/Build/source/texk/xdvik/Makefile.in
index 9b53ebba455..91c31625de8 100644
--- a/Build/source/texk/xdvik/Makefile.in
+++ b/Build/source/texk/xdvik/Makefile.in
@@ -493,7 +493,6 @@ x_linker_options = @x_linker_options@
x_tool_libs = @x_tool_libs@
x_xmu_lib = @x_xmu_lib@
x_xpm_libs = @x_xpm_libs@
-ACLOCAL_AMFLAGS = -I ../../m4 -I m4
AM_CFLAGS = $(WARNING_CFLAGS)
SUBDIRS = squeeze . tests
x_cppflags = $(X_CFLAGS) $(iconv_includes)
diff --git a/Build/source/texk/xdvik/configure b/Build/source/texk/xdvik/configure
index ef148f28b72..b6cf8461c73 100755
--- a/Build/source/texk/xdvik/configure
+++ b/Build/source/texk/xdvik/configure
@@ -18347,8 +18347,8 @@ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
fi
else
FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2 -I$kpse_BLD/libs/freetype2"
- FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.la"
- FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.la'
+ FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a"
+ FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a'
FREETYPE2_RULE='# Rebuild libfreetype
$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/ft2build.h
cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild
diff --git a/Build/source/texk/xdvik/configure.ac b/Build/source/texk/xdvik/configure.ac
index 7f416fa76aa..8ac60c71915 100644
--- a/Build/source/texk/xdvik/configure.ac
+++ b/Build/source/texk/xdvik/configure.ac
@@ -11,7 +11,7 @@ AC_INIT([xdvik (TeX Live)], xdvik_version, [tex-k@tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([xdvi.c])
AC_CONFIG_AUX_DIR([../../build-aux])
-AC_CONFIG_MACRO_DIR([../../m4])
+AC_CONFIG_MACRO_DIRS([../../m4 m4])
dnl Common code for all programs using libkpathsea.
KPSE_COMMON([xdvik])