diff --git a/source/Makefile.in b/source/Makefile.in
index ed7b3d6e61ad0ea79746bd4d86c7c0928733469c..3d7e5614a84e742c3c8e0f86fc2bba455c441a0c 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -77,18 +87,6 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = $(srcdir)/am/recurse.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(top_srcdir)/configure \
- $(am__configure_deps) ChangeLog README build-aux/compile \
- build-aux/config.guess build-aux/config.sub build-aux/depcomp \
- build-aux/install-sh build-aux/missing build-aux/texinfo.tex \
- build-aux/ylwrap build-aux/ltmain.sh \
- $(top_srcdir)/build-aux/compile \
- $(top_srcdir)/build-aux/config.guess \
- $(top_srcdir)/build-aux/config.sub \
- $(top_srcdir)/build-aux/install-sh \
- $(top_srcdir)/build-aux/ltmain.sh \
- $(top_srcdir)/build-aux/missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-cairo-flags.m4 \
@@ -151,6 +149,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-cairo-flags.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -211,6 +211,16 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/am/recurse.am \
+ $(top_srcdir)/build-aux/compile \
+ $(top_srcdir)/build-aux/config.guess \
+ $(top_srcdir)/build-aux/config.sub \
+ $(top_srcdir)/build-aux/install-sh \
+ $(top_srcdir)/build-aux/ltmain.sh \
+ $(top_srcdir)/build-aux/missing ChangeLog README \
+ build-aux/compile build-aux/config.guess build-aux/config.sub \
+ build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \
+ build-aux/missing build-aux/texinfo.tex build-aux/ylwrap
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -444,7 +454,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/am
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -454,7 +463,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/am/recurse.am:
+$(srcdir)/am/recurse.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -663,15 +672,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -707,17 +716,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -894,6 +903,8 @@ uninstall-am:
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am
+.PRECIOUS: Makefile
+
# just in case a subdirectory has added directories
dist-hook:
diff --git a/source/aclocal.m4 b/source/aclocal.m4
index d0fdac2804917a71f1e4a281394727c124b9fc7c..b09a671d84b57762dd24acaa0d3e5668f3048c91 100644
--- a/source/aclocal.m4
+++ b/source/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -573,7 +572,11 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -602,7 +605,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -645,7 +648,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -680,7 +683,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -730,7 +733,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -769,7 +772,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -798,7 +801,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -845,7 +848,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -864,7 +867,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -945,7 +948,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1005,7 +1008,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1033,7 +1036,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1052,7 +1055,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/source/auxdir/auxsub/Makefile.in b/source/auxdir/auxsub/Makefile.in
index b2f611f1be3bda79cf380a8a327fff3e03d2c5c7..f7771a2576835299d8ba70db53579d81a85fc0ca 100644
--- a/source/auxdir/auxsub/Makefile.in
+++ b/source/auxdir/auxsub/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -76,19 +86,12 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/configure $(am__configure_deps) README \
- ../../build-aux/compile ../../build-aux/config.guess \
- ../../build-aux/config.sub ../../build-aux/depcomp \
- ../../build-aux/install-sh ../../build-aux/missing \
- ../../build-aux/texinfo.tex ../../build-aux/ylwrap \
- ../../build-aux/ltmain.sh \
- $(top_srcdir)/../../build-aux/install-sh \
- $(top_srcdir)/../../build-aux/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -114,6 +117,13 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/../../build-aux/install-sh \
+ $(top_srcdir)/../../build-aux/missing ../../build-aux/compile \
+ ../../build-aux/config.guess ../../build-aux/config.sub \
+ ../../build-aux/depcomp ../../build-aux/install-sh \
+ ../../build-aux/ltmain.sh ../../build-aux/missing \
+ ../../build-aux/texinfo.tex ../../build-aux/ylwrap README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -224,7 +234,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -306,15 +315,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -350,17 +359,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -533,6 +542,8 @@ uninstall-am:
mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am
+.PRECIOUS: Makefile
+
# 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/source/auxdir/auxsub/aclocal.m4 b/source/auxdir/auxsub/aclocal.m4
index ff2f2d93107ef550a83c4f0cb8a6200f31d09929..1800a62935d30bfd3ecf52872d0aa96723b3ae80 100644
--- a/source/auxdir/auxsub/aclocal.m4
+++ b/source/auxdir/auxsub/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -144,7 +143,7 @@ fi])])
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -234,8 +233,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -308,7 +307,11 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -337,7 +340,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -348,7 +351,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -358,7 +361,7 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -380,7 +383,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -415,7 +418,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -454,7 +457,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -485,7 +488,7 @@ AC_DEFUN([_AM_IF_OPTION],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -566,7 +569,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -626,7 +629,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -654,7 +657,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -673,7 +676,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/source/auxdir/auxsub/configure b/source/auxdir/auxsub/configure
index b94459cb5fdac087a4a0d30e46e026c45a69e1fb..021909a11859f671f920a4c41e4f42ee5574197e 100755
--- a/source/auxdir/auxsub/configure
+++ b/source/auxdir/auxsub/configure
@@ -1745,7 +1745,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-am__api_version='1.14'
+am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -1917,8 +1917,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -1937,7 +1937,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -2265,8 +2265,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -2324,6 +2324,7 @@ END
fi
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
diff --git a/source/build-aux/config.guess b/source/build-aux/config.guess
index 6c32c8645c8b2edba2b8fe66c2b1f06c68613c23..dbfb9786cb6f9b8003367505d49dcadb2145610a 100644
--- a/source/build-aux/config.guess
+++ b/source/build-aux/config.guess
@@ -1,8 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2014 Free Software Foundation, Inc.
+# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2014-11-04'
+timestamp='2015-01-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
diff --git a/source/build-aux/config.sub b/source/build-aux/config.sub
index bf654c7ec87ff345b2643c19f8504eaef24e0412..6d2e94c8bf9ea6925b96846aade1fd64074985d3 100644
--- a/source/build-aux/config.sub
+++ b/source/build-aux/config.sub
@@ -1,8 +1,8 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2014 Free Software Foundation, Inc.
+# Copyright 1992-2015 Free Software Foundation, Inc.
-timestamp='2014-12-21'
+timestamp='2015-01-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -68,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
diff --git a/source/build-aux/depcomp b/source/build-aux/depcomp
index 31788017b8f041f1d63dfb80ace66a4aa6b1c1d6..fda2463f383d20627d7fc33888fc95ac1f8d7f76 100644
--- a/source/build-aux/depcomp
+++ b/source/build-aux/depcomp
@@ -3,7 +3,7 @@
scriptversion=2013-05-30.07; # UTC
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2015 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/source/configure b/source/configure
index 8860165e41a9d6e2ab8be38f94d5cf3d787c00b1..f77d9bcfdbc65a27b804f69dfa493a75913a6f83 100755
--- a/source/configure
+++ b/source/configure
@@ -2902,8 +2902,8 @@ if test "${enable_missing+set}" = set; then :
enableval=$enable_missing;
fi
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -3928,7 +3928,7 @@ case $enable_luajittex in #(
: ;; #(
*) :
case $host in #(
- alpha* | sparc* | x86_64-*-cygwin) :
+ alpha* | sparc* | x86_64-*-cygwin | powerpc-*-darwin* ) :
{ $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-luajittex'" >&5
$as_echo "$as_me: $host -> \`--disable-luajittex'" >&6;}
ac_configure_args="$ac_configure_args '--disable-luajittex'" ;; #(
@@ -4739,7 +4739,7 @@ fi
-am__api_version='1.14'
+am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -4928,7 +4928,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -8976,8 +8976,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -9248,6 +9248,7 @@ END
fi
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
diff --git a/source/doc/Makefile.in b/source/doc/Makefile.in
index 7af3f790170128f5f9f5bdb88f5fb22d8d40fc75..9dfa813113500ad4ec2e21c1f363dde62b7d00df 100644
--- a/source/doc/Makefile.in
+++ b/source/doc/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -78,9 +88,6 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(tlbuild_TEXINFOS) $(top_srcdir)/build-aux/texinfo.tex \
- ChangeLog
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-cairo-flags.m4 \
$(top_srcdir)/m4/kpse-common.m4 \
@@ -142,6 +149,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-cairo-flags.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -234,6 +242,8 @@ am__uninstall_files_from_dir = { \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(tlbuild_TEXINFOS) \
+ $(top_srcdir)/build-aux/texinfo.tex ChangeLog
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -421,7 +431,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign doc/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -840,6 +849,8 @@ uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
uninstall-dvi-am uninstall-html-am uninstall-info-am \
uninstall-pdf-am uninstall-ps-am
+.PRECIOUS: Makefile
+
# autogenerate the top-level README files.
readme-files: tlbuild.info
diff --git a/source/doc/build-tools.txt b/source/doc/build-tools.txt
index d1fa38ca6c7aeea5682a100e59eaf950a22f443e..451fbd905583cb4eac33472b2d28637c2986e539 100644
--- a/source/doc/build-tools.txt
+++ b/source/doc/build-tools.txt
@@ -1,5 +1,5 @@
autoconf (GNU Autoconf) 2.69
-automake (GNU automake) 1.14.1
+automake (GNU automake) 1.15
bison (GNU Bison) 3.0.2
flex 2.5.39
ltmain.sh (GNU libtool) 2.4.4
diff --git a/source/doc/tlbuild.info b/source/doc/tlbuild.info
index df237eaf4be2424b021b35da26097dfa006f2017..385ffc2174018d32a74612be374191d3dcf86477 100644
--- a/source/doc/tlbuild.info
+++ b/source/doc/tlbuild.info
@@ -555,7 +555,7 @@ many extra hassles, so don't do that, tempting as it may be.
Currently the versions we use are:
autoconf (GNU Autoconf) 2.69
- automake (GNU automake) 1.14.1
+ automake (GNU automake) 1.15
bison (GNU Bison) 3.0.2
flex 2.5.39
ltmain.sh (GNU libtool) 2.4.4
@@ -4898,297 +4898,297 @@ Node: Linked scripts16966
Node: Distro builds18447
Node: Layout and infrastructure20837
Node: Build system tools21626
-Node: Top-level directories23638
-Node: Autoconf macros25693
-Node: General setup macros26394
-Node: Macros for programs27261
-Node: Macros for compilers28073
-Node: Macros for libraries29507
-Node: Macros for library and header flags29933
-Node: Macros for Windows31805
-Node: Library modules33382
-Node: 'png' library33879
-Node: 'zlib' library36172
-Node: 'freetype' library36693
-Node: 'kpathsea' library37227
-Node: Program modules38652
-Node: 't1utils' package39088
-Node: 'xindy' package39655
-Node: 'xdvik' package40834
-Node: 'asymptote'41913
-Node: Extending TeX Live42368
-Node: Adding a new program module42736
-Node: Adding a new generic library module44255
-Node: Adding a new TeX-specific library module46468
-Node: Configure options47155
-Node: Global configure options48546
-Node: '--disable-native-texlive-build'49114
-Node: '--prefix' '--bindir' ...50110
-Node: '--disable-largefile'50658
-Node: '--disable-missing'51351
-Node: '--enable-compiler-warnings='LEVEL51758
-Node: '--enable-cxx-runtime-hack'52503
-Node: '--enable-maintainer-mode'52936
-Node: '--enable-multiplatform'53471
-Node: '--enable-shared'54032
-Node: '--enable-silent-rules'54409
-Node: '--without-ln-s'54871
-Node: '--without-x'55228
-Node: Program-specific configure options55420
-Node: '--enable-PROG' '--disable-PROG'56083
-Node: '--disable-all-pkgs'56366
-Node: Configure options for 'texk/web2c'57360
-Node: Configure options for 'texk/bibtex-x'59818
-Node: Configure options for 'texk/dvipdfm-x'60374
-Node: Configure options for 'texk/dvisvgm'61213
-Node: Configure options for 'texk/texlive'62105
-Node: Configure options for 'texk/xdvik'62532
-Node: Configure options for 'utils/xindy'63142
-Node: Library-specific configure options64047
-Node: Configure options for 'kpathsea'65062
-Node: Configure options for system 'poppler'65775
-Node: Variables for configure66572
-Node: Cross compilation68000
-Node: Cross configuring69299
-Node: Cross problems70972
-Node: Coding conventions72833
-Node: Declarations and definitions73502
-Node: Const75685
-Node: install-tl77548
-Node: install-tl NAME77889
-Node: install-tl SYNOPSIS78047
-Node: install-tl DESCRIPTION78255
-Node: install-tl REFERENCES79256
-Node: install-tl OPTIONS79772
-Ref: install-tl *-gui* [[=]_module_]80126
-Ref: install-tl 'text'80335
-Ref: install-tl 'wizard'80458
-Ref: install-tl 'perltk'80612
-Ref: install-tl *-no-gui*81046
-Ref: install-tl *-lang* _llcode_81127
-Ref: install-tl *-repository* _url|path_81814
-Ref: install-tl *-select-repository*83625
-Ref: install-tl *-all-options*84061
-Ref: install-tl *-custom-bin* _path_84368
-Ref: install-tl *-debug-translation*85023
-Ref: install-tl *-force-platform* _platform_85242
-Ref: install-tl *-help*, *--help*, *-?*85486
-Ref: install-tl *-in-place*85879
-Ref: install-tl *-logfile* _file_86406
-Ref: install-tl *-no-cls*86757
-Ref: install-tl *-non-admin*86888
-Ref: install-tl *--persistent-downloads*86993
-Ref: install-tl *--no-persistent-downloads*87021
-Ref: install-tl *-portable*87629
-Ref: install-tl *-print-platform*87768
-Ref: install-tl *-profile* _profile_87961
-Ref: install-tl *-q*89455
-Ref: install-tl *-scheme* _scheme_89517
-Ref: install-tl *-v*89991
-Ref: install-tl *-version*, *--version*90152
-Node: install-tl ENVIRONMENT VARIABLES90283
-Ref: install-tl 'TEXLIVE_INSTALL_ENV_NOCHECK'90672
-Ref: install-tl 'TEXLIVE_INSTALL_NO_CONTEXT_CACHE'90874
-Ref: install-tl 'TEXLIVE_INSTALL_PREFIX'90980
-Ref: install-tl 'TEXLIVE_INSTALL_TEXMFCONFIG'91011
-Ref: install-tl 'TEXLIVE_INSTALL_TEXMFHOME'91040
-Ref: install-tl 'TEXLIVE_INSTALL_TEXMFLOCAL'91070
-Ref: install-tl 'TEXLIVE_INSTALL_TEXMFSYSCONFIG'91104
-Ref: install-tl 'TEXLIVE_INSTALL_TEXMFSYSVAR'91135
-Ref: install-tl 'TEXLIVE_INSTALL_TEXMFVAR'91163
-Ref: install-tl 'NOPERLDOC'91218
-Node: install-tl AUTHORS AND COPYRIGHT91282
-Node: tlmgr91640
-Node: tlmgr NAME92077
-Node: tlmgr SYNOPSIS92202
-Node: tlmgr DESCRIPTION92392
-Node: tlmgr EXAMPLES93488
-Ref: tlmgr 'tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet'93779
-Ref: tlmgr 'tlmgr update --list'93960
-Ref: tlmgr 'tlmgr update --all'94053
-Ref: tlmgr 'tlmgr info' _pkg_94209
-Node: tlmgr OPTIONS94415
-Ref: tlmgr *--repository* _url|path_94935
-Ref: tlmgr *--gui* [_action_]95660
-Ref: tlmgr *--gui-lang* _llcode_96067
-Ref: tlmgr *--debug-translation*96750
-Ref: tlmgr *--machine-readable*96953
-Ref: tlmgr *--no-execute-actions*97221
-Ref: tlmgr *--package-logfile* _file_97414
-Ref: tlmgr *--pause*97669
-Ref: tlmgr *--persistent-downloads*97824
-Ref: tlmgr *--no-persistent-downloads*97852
-Ref: tlmgr *--pin-file*98346
-Ref: tlmgr *--usermode*98564
-Ref: tlmgr *--usertree* _dir_98684
-Node: tlmgr ACTIONS99234
-Node: tlmgr help100466
-Node: tlmgr version100942
-Node: tlmgr backup [--clean[=_N_]] [--backupdir _dir_] [--all | _pkg_]...101260
-Ref: tlmgr *--backupdir* _directory_102354
-Ref: tlmgr *--all*102551
-Ref: tlmgr *--clean*[=_N_]102773
-Ref: tlmgr *--dry-run*103070
-Node: tlmgr candidates _pkg_103190
-Ref: tlmgr *candidates _pkg_* 1103477
-Node: tlmgr check [_option_]... [files|depends|executes|runfiles|all]103621
-Ref: tlmgr *files*104064
-Ref: tlmgr *depends*104199
-Ref: tlmgr *executes*104541
-Ref: tlmgr *runfiles*104659
-Ref: tlmgr *--use-svn*104771
-Node: tlmgr conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]104888
-Node: tlmgr dump-tlpdb [--local|--remote]106960
-Ref: tlmgr *--local*107470
-Ref: tlmgr *--remote*107509
-Node: tlmgr generate [_option_]... _what_107931
-Ref: tlmgr *generate language*108172
-Ref: tlmgr *generate language.dat*108197
-Ref: tlmgr *generate language.def*108222
-Ref: tlmgr *generate language.dat.lua*108251
-Ref: tlmgr *generate fmtutil*108271
-Ref: tlmgr *--dest* _output_file_110508
-Ref: tlmgr *--localcfg* _local_conf_file_111084
-Ref: tlmgr *--rebuild-sys*111207
-Node: tlmgr gui112068
-Node: tlmgr info [_option_...] [collections|schemes|_pkg_...]112312
-Ref: tlmgr *--list*113517
-Ref: tlmgr *--only-installed*113796
-Ref: tlmgr *--taxonomy*114011
-Ref: tlmgr *--keyword*114023
-Ref: tlmgr *--functionality*114041
-Ref: tlmgr *--characterization*114062
-Node: tlmgr init-usertree114275
-Node: tlmgr install [_option_]... _pkg_...114701
-Ref: tlmgr *--file*115065
-Ref: tlmgr *--reinstall*115291
-Ref: tlmgr *--no-depends*115671
-Ref: tlmgr *--no-depends-at-all*115830
-Ref: tlmgr *--dry-run* 1116228
-Ref: tlmgr *--force*116346
-Node: tlmgr option116552
-Ref: tlmgr *option [show]*116725
-Ref: tlmgr *option showall*116743
-Ref: tlmgr *option _key_ [_value_]*116769
-Node: tlmgr paper120617
-Ref: tlmgr *paper [a4|letter]*120802
-Ref: tlmgr *[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*120876
-Node: tlmgr path [--w32mode=user|admin] [add|remove]121903
-Node: tlmgr pinning123386
-Ref: tlmgr 'pinning show'123693
-Ref: tlmgr 'pinning add' _repo_ _pkgglob_...123766
-Ref: tlmgr 'pinning remove' _repo_ _pkgglob_...123885
-Ref: tlmgr 'pinning remove _repo_ --all'124038
-Node: tlmgr platform list|add|remove _platform_...124092
-Node: tlmgr platform set _platform_124340
-Node: tlmgr platform set auto124568
-Ref: tlmgr *--dry-run* 2125685
-Node: tlmgr postaction [--w32mode=user|admin] [--fileassocmode=1|2] [--all] [install|remove] [shortcut|fileassoc|script] [_pkg_]...125794
-Node: tlmgr print-platform127096
-Node: tlmgr restore [--backupdir _dir_] [--all | _pkg_ [_rev_]]127568
-Ref: tlmgr *--all* 1128464
-Ref: tlmgr *--backupdir* _directory_ 1128658
-Ref: tlmgr *--dry-run* 3128814
-Ref: tlmgr *--force* 1128931
-Node: tlmgr remove [_option_]... _pkg_...128959
-Ref: tlmgr *--no-depends* 1129482
-Ref: tlmgr *--no-depends-at-all* 1129544
-Ref: tlmgr *--force* 2129600
-Ref: tlmgr *--dry-run* 4130072
-Node: tlmgr repository130179
-Ref: tlmgr *repository list*130387
-Ref: tlmgr *repository list _path|tag_*130417
-Ref: tlmgr *repository add _path_ [_tag_]*130450
-Ref: tlmgr *repository remove _path|tag_*130482
-Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*130536
-Node: tlmgr search [_option_...] _what_131620
-Node: tlmgr search [_option_...] --file _what_132131
-Node: tlmgr search [_option_...] --taxonomy _what_132382
-Node: tlmgr search [_option_...] --keyword _what_132693
-Node: tlmgr search [_option_...] --functionality _what_133011
-Node: tlmgr search [_option_...] --characterization _what_133349
-Node: tlmgr search [_option_...] --all _what_133689
-Ref: tlmgr *--global*134137
-Ref: tlmgr *--word*134249
-Ref: tlmgr *--list* 1134488
-Ref: tlmgr *--file* 1134834
-Ref: tlmgr *--taxonomy* 1134891
-Ref: tlmgr *--keyword* 1134903
-Ref: tlmgr *--functionality* 1134921
-Ref: tlmgr *--characterization* 1134942
-Ref: tlmgr *--all* 2135097
-Node: tlmgr uninstall135180
-Ref: tlmgr *--force* 3135434
-Node: tlmgr update [_option_]... [_pkg_]...135490
-Ref: tlmgr *--all* 3135861
-Ref: tlmgr *--self*137602
-Ref: tlmgr *--dry-run* 5138366
-Ref: tlmgr *--list* [_pkg_]138543
-Ref: tlmgr *--exclude* _pkg_139232
-Ref: tlmgr *--no-auto-remove* [_pkg_]...139925
-Ref: tlmgr *--no-auto-install* [_pkg_]...140376
-Ref: tlmgr *--reinstall-forcibly-removed*141032
-Ref: tlmgr *--backup* and *--backupdir* _directory_141596
-Ref: tlmgr *--no-depends* 2142777
-Ref: tlmgr *--no-depends-at-all* 2142980
-Ref: tlmgr *--force* 4143036
-Node: tlmgr USER MODE143462
-Node: tlmgr user mode install146273
-Node: tlmgr user mode backup; restore; remove; update147220
-Node: tlmgr user mode generate; option; paper147662
-Node: tlmgr CONFIGURATION FILE FOR TLMGR148038
-Node: tlmgr TAXONOMIES149129
-Ref: tlmgr '--keyword' 2149755
-Ref: tlmgr '--functionality' 2149840
-Ref: tlmgr '--characterization' 2149996
-Ref: tlmgr '--taxonomy' 2150137
-Node: tlmgr MULTIPLE REPOSITORIES150678
-Node: tlmgr Pinning152399
-Node: tlmgr GUI FOR TLMGR154374
-Node: tlmgr Main display155596
-Node: tlmgr Display configuration area155848
-Ref: tlmgr Status156209
-Ref: tlmgr Category156373
-Ref: tlmgr Match156559
-Ref: tlmgr Selection156819
-Ref: tlmgr Display configuration buttons157023
-Node: tlmgr Package list area157206
-Ref: tlmgr a checkbox157790
-Ref: tlmgr package name157926
-Ref: tlmgr local revision (and version)158025
-Ref: tlmgr remote revision (and version)158400
-Ref: tlmgr short description158697
-Node: tlmgr Main display action buttons158742
-Ref: tlmgr Update all installed159008
-Ref: tlmgr Update159380
-Ref: tlmgr Install159430
-Ref: tlmgr Remove159616
-Ref: tlmgr Backup159794
-Node: tlmgr Menu bar159951
-Ref: tlmgr 'tlmgr' menu160148
-Ref: tlmgr 'Options menu'160456
-Ref: tlmgr 'Actions menu'161539
-Ref: tlmgr 'Help menu'161967
-Node: tlmgr MACHINE-READABLE OUTPUT162100
-Node: tlmgr Machine-readable 'update' and 'install' output162916
-Ref: tlmgr 'location-url' _location_164198
-Ref: tlmgr 'total-bytes' _count_164414
-Ref: tlmgr _pkgname_164824
-Ref: tlmgr _status_165034
-Ref: tlmgr 'd'165112
-Ref: tlmgr 'f'165172
-Ref: tlmgr 'u'165351
-Ref: tlmgr 'r'165397
-Ref: tlmgr 'a'165520
-Ref: tlmgr 'i'165698
-Ref: tlmgr 'I'165817
-Ref: tlmgr _localrev_165919
-Ref: tlmgr _serverrev_166026
-Ref: tlmgr _size_166138
-Ref: tlmgr _runtime_166307
-Ref: tlmgr _esttot_166377
-Node: tlmgr Machine-readable 'option' output166410
-Node: tlmgr AUTHORS AND COPYRIGHT166928
-Node: Index167275
+Node: Top-level directories23636
+Node: Autoconf macros25691
+Node: General setup macros26392
+Node: Macros for programs27259
+Node: Macros for compilers28071
+Node: Macros for libraries29505
+Node: Macros for library and header flags29931
+Node: Macros for Windows31803
+Node: Library modules33380
+Node: 'png' library33877
+Node: 'zlib' library36170
+Node: 'freetype' library36691
+Node: 'kpathsea' library37225
+Node: Program modules38650
+Node: 't1utils' package39086
+Node: 'xindy' package39653
+Node: 'xdvik' package40832
+Node: 'asymptote'41911
+Node: Extending TeX Live42366
+Node: Adding a new program module42734
+Node: Adding a new generic library module44253
+Node: Adding a new TeX-specific library module46466
+Node: Configure options47153
+Node: Global configure options48544
+Node: '--disable-native-texlive-build'49112
+Node: '--prefix' '--bindir' ...50108
+Node: '--disable-largefile'50656
+Node: '--disable-missing'51349
+Node: '--enable-compiler-warnings='LEVEL51756
+Node: '--enable-cxx-runtime-hack'52501
+Node: '--enable-maintainer-mode'52934
+Node: '--enable-multiplatform'53469
+Node: '--enable-shared'54030
+Node: '--enable-silent-rules'54407
+Node: '--without-ln-s'54869
+Node: '--without-x'55226
+Node: Program-specific configure options55418
+Node: '--enable-PROG' '--disable-PROG'56081
+Node: '--disable-all-pkgs'56364
+Node: Configure options for 'texk/web2c'57358
+Node: Configure options for 'texk/bibtex-x'59816
+Node: Configure options for 'texk/dvipdfm-x'60372
+Node: Configure options for 'texk/dvisvgm'61211
+Node: Configure options for 'texk/texlive'62103
+Node: Configure options for 'texk/xdvik'62530
+Node: Configure options for 'utils/xindy'63140
+Node: Library-specific configure options64045
+Node: Configure options for 'kpathsea'65060
+Node: Configure options for system 'poppler'65773
+Node: Variables for configure66570
+Node: Cross compilation67998
+Node: Cross configuring69297
+Node: Cross problems70970
+Node: Coding conventions72831
+Node: Declarations and definitions73500
+Node: Const75683
+Node: install-tl77546
+Node: install-tl NAME77887
+Node: install-tl SYNOPSIS78045
+Node: install-tl DESCRIPTION78253
+Node: install-tl REFERENCES79254
+Node: install-tl OPTIONS79770
+Ref: install-tl *-gui* [[=]_module_]80124
+Ref: install-tl 'text'80333
+Ref: install-tl 'wizard'80456
+Ref: install-tl 'perltk'80610
+Ref: install-tl *-no-gui*81044
+Ref: install-tl *-lang* _llcode_81125
+Ref: install-tl *-repository* _url|path_81812
+Ref: install-tl *-select-repository*83623
+Ref: install-tl *-all-options*84059
+Ref: install-tl *-custom-bin* _path_84366
+Ref: install-tl *-debug-translation*85021
+Ref: install-tl *-force-platform* _platform_85240
+Ref: install-tl *-help*, *--help*, *-?*85484
+Ref: install-tl *-in-place*85877
+Ref: install-tl *-logfile* _file_86404
+Ref: install-tl *-no-cls*86755
+Ref: install-tl *-non-admin*86886
+Ref: install-tl *--persistent-downloads*86991
+Ref: install-tl *--no-persistent-downloads*87019
+Ref: install-tl *-portable*87627
+Ref: install-tl *-print-platform*87766
+Ref: install-tl *-profile* _profile_87959
+Ref: install-tl *-q*89453
+Ref: install-tl *-scheme* _scheme_89515
+Ref: install-tl *-v*89989
+Ref: install-tl *-version*, *--version*90150
+Node: install-tl ENVIRONMENT VARIABLES90281
+Ref: install-tl 'TEXLIVE_INSTALL_ENV_NOCHECK'90670
+Ref: install-tl 'TEXLIVE_INSTALL_NO_CONTEXT_CACHE'90872
+Ref: install-tl 'TEXLIVE_INSTALL_PREFIX'90978
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFCONFIG'91009
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFHOME'91038
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFLOCAL'91068
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFSYSCONFIG'91102
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFSYSVAR'91133
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFVAR'91161
+Ref: install-tl 'NOPERLDOC'91216
+Node: install-tl AUTHORS AND COPYRIGHT91280
+Node: tlmgr91638
+Node: tlmgr NAME92075
+Node: tlmgr SYNOPSIS92200
+Node: tlmgr DESCRIPTION92390
+Node: tlmgr EXAMPLES93486
+Ref: tlmgr 'tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet'93777
+Ref: tlmgr 'tlmgr update --list'93958
+Ref: tlmgr 'tlmgr update --all'94051
+Ref: tlmgr 'tlmgr info' _pkg_94207
+Node: tlmgr OPTIONS94413
+Ref: tlmgr *--repository* _url|path_94933
+Ref: tlmgr *--gui* [_action_]95658
+Ref: tlmgr *--gui-lang* _llcode_96065
+Ref: tlmgr *--debug-translation*96748
+Ref: tlmgr *--machine-readable*96951
+Ref: tlmgr *--no-execute-actions*97219
+Ref: tlmgr *--package-logfile* _file_97412
+Ref: tlmgr *--pause*97667
+Ref: tlmgr *--persistent-downloads*97822
+Ref: tlmgr *--no-persistent-downloads*97850
+Ref: tlmgr *--pin-file*98344
+Ref: tlmgr *--usermode*98562
+Ref: tlmgr *--usertree* _dir_98682
+Node: tlmgr ACTIONS99232
+Node: tlmgr help100464
+Node: tlmgr version100940
+Node: tlmgr backup [--clean[=_N_]] [--backupdir _dir_] [--all | _pkg_]...101258
+Ref: tlmgr *--backupdir* _directory_102352
+Ref: tlmgr *--all*102549
+Ref: tlmgr *--clean*[=_N_]102771
+Ref: tlmgr *--dry-run*103068
+Node: tlmgr candidates _pkg_103188
+Ref: tlmgr *candidates _pkg_* 1103475
+Node: tlmgr check [_option_]... [files|depends|executes|runfiles|all]103619
+Ref: tlmgr *files*104062
+Ref: tlmgr *depends*104197
+Ref: tlmgr *executes*104539
+Ref: tlmgr *runfiles*104657
+Ref: tlmgr *--use-svn*104769
+Node: tlmgr conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]104886
+Node: tlmgr dump-tlpdb [--local|--remote]106958
+Ref: tlmgr *--local*107468
+Ref: tlmgr *--remote*107507
+Node: tlmgr generate [_option_]... _what_107929
+Ref: tlmgr *generate language*108170
+Ref: tlmgr *generate language.dat*108195
+Ref: tlmgr *generate language.def*108220
+Ref: tlmgr *generate language.dat.lua*108249
+Ref: tlmgr *generate fmtutil*108269
+Ref: tlmgr *--dest* _output_file_110506
+Ref: tlmgr *--localcfg* _local_conf_file_111082
+Ref: tlmgr *--rebuild-sys*111205
+Node: tlmgr gui112066
+Node: tlmgr info [_option_...] [collections|schemes|_pkg_...]112310
+Ref: tlmgr *--list*113515
+Ref: tlmgr *--only-installed*113794
+Ref: tlmgr *--taxonomy*114009
+Ref: tlmgr *--keyword*114021
+Ref: tlmgr *--functionality*114039
+Ref: tlmgr *--characterization*114060
+Node: tlmgr init-usertree114273
+Node: tlmgr install [_option_]... _pkg_...114699
+Ref: tlmgr *--file*115063
+Ref: tlmgr *--reinstall*115289
+Ref: tlmgr *--no-depends*115669
+Ref: tlmgr *--no-depends-at-all*115828
+Ref: tlmgr *--dry-run* 1116226
+Ref: tlmgr *--force*116344
+Node: tlmgr option116550
+Ref: tlmgr *option [show]*116723
+Ref: tlmgr *option showall*116741
+Ref: tlmgr *option _key_ [_value_]*116767
+Node: tlmgr paper120615
+Ref: tlmgr *paper [a4|letter]*120800
+Ref: tlmgr *[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*120874
+Node: tlmgr path [--w32mode=user|admin] [add|remove]121901
+Node: tlmgr pinning123384
+Ref: tlmgr 'pinning show'123691
+Ref: tlmgr 'pinning add' _repo_ _pkgglob_...123764
+Ref: tlmgr 'pinning remove' _repo_ _pkgglob_...123883
+Ref: tlmgr 'pinning remove _repo_ --all'124036
+Node: tlmgr platform list|add|remove _platform_...124090
+Node: tlmgr platform set _platform_124338
+Node: tlmgr platform set auto124566
+Ref: tlmgr *--dry-run* 2125683
+Node: tlmgr postaction [--w32mode=user|admin] [--fileassocmode=1|2] [--all] [install|remove] [shortcut|fileassoc|script] [_pkg_]...125792
+Node: tlmgr print-platform127094
+Node: tlmgr restore [--backupdir _dir_] [--all | _pkg_ [_rev_]]127566
+Ref: tlmgr *--all* 1128462
+Ref: tlmgr *--backupdir* _directory_ 1128656
+Ref: tlmgr *--dry-run* 3128812
+Ref: tlmgr *--force* 1128929
+Node: tlmgr remove [_option_]... _pkg_...128957
+Ref: tlmgr *--no-depends* 1129480
+Ref: tlmgr *--no-depends-at-all* 1129542
+Ref: tlmgr *--force* 2129598
+Ref: tlmgr *--dry-run* 4130070
+Node: tlmgr repository130177
+Ref: tlmgr *repository list*130385
+Ref: tlmgr *repository list _path|tag_*130415
+Ref: tlmgr *repository add _path_ [_tag_]*130448
+Ref: tlmgr *repository remove _path|tag_*130480
+Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*130534
+Node: tlmgr search [_option_...] _what_131618
+Node: tlmgr search [_option_...] --file _what_132129
+Node: tlmgr search [_option_...] --taxonomy _what_132380
+Node: tlmgr search [_option_...] --keyword _what_132691
+Node: tlmgr search [_option_...] --functionality _what_133009
+Node: tlmgr search [_option_...] --characterization _what_133347
+Node: tlmgr search [_option_...] --all _what_133687
+Ref: tlmgr *--global*134135
+Ref: tlmgr *--word*134247
+Ref: tlmgr *--list* 1134486
+Ref: tlmgr *--file* 1134832
+Ref: tlmgr *--taxonomy* 1134889
+Ref: tlmgr *--keyword* 1134901
+Ref: tlmgr *--functionality* 1134919
+Ref: tlmgr *--characterization* 1134940
+Ref: tlmgr *--all* 2135095
+Node: tlmgr uninstall135178
+Ref: tlmgr *--force* 3135432
+Node: tlmgr update [_option_]... [_pkg_]...135488
+Ref: tlmgr *--all* 3135859
+Ref: tlmgr *--self*137600
+Ref: tlmgr *--dry-run* 5138364
+Ref: tlmgr *--list* [_pkg_]138541
+Ref: tlmgr *--exclude* _pkg_139230
+Ref: tlmgr *--no-auto-remove* [_pkg_]...139923
+Ref: tlmgr *--no-auto-install* [_pkg_]...140374
+Ref: tlmgr *--reinstall-forcibly-removed*141030
+Ref: tlmgr *--backup* and *--backupdir* _directory_141594
+Ref: tlmgr *--no-depends* 2142775
+Ref: tlmgr *--no-depends-at-all* 2142978
+Ref: tlmgr *--force* 4143034
+Node: tlmgr USER MODE143460
+Node: tlmgr user mode install146271
+Node: tlmgr user mode backup; restore; remove; update147218
+Node: tlmgr user mode generate; option; paper147660
+Node: tlmgr CONFIGURATION FILE FOR TLMGR148036
+Node: tlmgr TAXONOMIES149127
+Ref: tlmgr '--keyword' 2149753
+Ref: tlmgr '--functionality' 2149838
+Ref: tlmgr '--characterization' 2149994
+Ref: tlmgr '--taxonomy' 2150135
+Node: tlmgr MULTIPLE REPOSITORIES150676
+Node: tlmgr Pinning152397
+Node: tlmgr GUI FOR TLMGR154372
+Node: tlmgr Main display155594
+Node: tlmgr Display configuration area155846
+Ref: tlmgr Status156207
+Ref: tlmgr Category156371
+Ref: tlmgr Match156557
+Ref: tlmgr Selection156817
+Ref: tlmgr Display configuration buttons157021
+Node: tlmgr Package list area157204
+Ref: tlmgr a checkbox157788
+Ref: tlmgr package name157924
+Ref: tlmgr local revision (and version)158023
+Ref: tlmgr remote revision (and version)158398
+Ref: tlmgr short description158695
+Node: tlmgr Main display action buttons158740
+Ref: tlmgr Update all installed159006
+Ref: tlmgr Update159378
+Ref: tlmgr Install159428
+Ref: tlmgr Remove159614
+Ref: tlmgr Backup159792
+Node: tlmgr Menu bar159949
+Ref: tlmgr 'tlmgr' menu160146
+Ref: tlmgr 'Options menu'160454
+Ref: tlmgr 'Actions menu'161537
+Ref: tlmgr 'Help menu'161965
+Node: tlmgr MACHINE-READABLE OUTPUT162098
+Node: tlmgr Machine-readable 'update' and 'install' output162914
+Ref: tlmgr 'location-url' _location_164196
+Ref: tlmgr 'total-bytes' _count_164412
+Ref: tlmgr _pkgname_164822
+Ref: tlmgr _status_165032
+Ref: tlmgr 'd'165110
+Ref: tlmgr 'f'165170
+Ref: tlmgr 'u'165349
+Ref: tlmgr 'r'165395
+Ref: tlmgr 'a'165518
+Ref: tlmgr 'i'165696
+Ref: tlmgr 'I'165815
+Ref: tlmgr _localrev_165917
+Ref: tlmgr _serverrev_166024
+Ref: tlmgr _size_166136
+Ref: tlmgr _runtime_166305
+Ref: tlmgr _esttot_166375
+Node: tlmgr Machine-readable 'option' output166408
+Node: tlmgr AUTHORS AND COPYRIGHT166926
+Node: Index167273
End Tag Table
diff --git a/source/libs/Makefile.in b/source/libs/Makefile.in
index af2430e74676ac277d25d28c35145b1da931403e..9b4d2338d0ead36ecd7311d8d2aef003771cd5f8 100644
--- a/source/libs/Makefile.in
+++ b/source/libs/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -77,18 +87,6 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = $(srcdir)/../am/recurse.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(top_srcdir)/configure \
- $(am__configure_deps) ChangeLog README ../build-aux/compile \
- ../build-aux/config.guess ../build-aux/config.sub \
- ../build-aux/depcomp ../build-aux/install-sh \
- ../build-aux/missing ../build-aux/texinfo.tex \
- ../build-aux/ylwrap ../build-aux/ltmain.sh \
- $(top_srcdir)/../build-aux/compile \
- $(top_srcdir)/../build-aux/config.guess \
- $(top_srcdir)/../build-aux/config.sub \
- $(top_srcdir)/../build-aux/install-sh \
- $(top_srcdir)/../build-aux/missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
@@ -130,6 +128,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -190,6 +190,16 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
+am__DIST_COMMON = $(srcdir)/../am/recurse.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/../build-aux/compile \
+ $(top_srcdir)/../build-aux/config.guess \
+ $(top_srcdir)/../build-aux/config.sub \
+ $(top_srcdir)/../build-aux/install-sh \
+ $(top_srcdir)/../build-aux/missing ../build-aux/compile \
+ ../build-aux/config.guess ../build-aux/config.sub \
+ ../build-aux/depcomp ../build-aux/install-sh \
+ ../build-aux/ltmain.sh ../build-aux/missing \
+ ../build-aux/texinfo.tex ../build-aux/ylwrap ChangeLog README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -362,7 +372,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/..
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -372,7 +381,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../am/recurse.am:
+$(srcdir)/../am/recurse.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -573,15 +582,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -617,17 +626,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -801,6 +810,8 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
# just in case a subdirectory has added directories
dist-hook:
diff --git a/source/libs/README b/source/libs/README
index 168c10c748d16843bfd7912b93ff509d72d362c2..c9ca3abd585230cdea85e5104513a037d659682e 100644
--- a/source/libs/README
+++ b/source/libs/README
@@ -1,4 +1,4 @@
-$Id: README 35880 2014-12-22 08:37:56Z peter $
+$Id: README 36054 2015-01-14 10:59:36Z peter $
Public domain. Originally created by Karl Berry, 2005.
Libraries we compile for TeX Live.
@@ -12,10 +12,10 @@ See also comments in ../texk/README.
cairo 1.14.0 - checked 15oct14
http://cairographics.org/releases/
-freetype2 2.5.4 - checked 7dec14
+freetype2 2.5.5 - checked 7jan15
http://savannah.nongnu.org/download/freetype/
-gd 2.1.0 - checked 26jun13
+gd 2.1.1 - checked 14jan15
https://bitbucket.org/libgd/gd-libgd/downloads/
gmp 6.0.0 - checked 25mar14
@@ -49,7 +49,7 @@ mpfr 3.1.2 - checked 13mar13
pixman 0.32.6 - checked 7jul14
http://cairographics.org/releases/
-poppler 0.29.0 - checked 5dec14
+poppler 0.30.0 - checked 7jan15
http://poppler.freedesktop.org/ - used by luatex and xetex
potrace 1.11 - checked 12apr13
diff --git a/source/libs/aclocal.m4 b/source/libs/aclocal.m4
index eb2029d0b5dc806bf045321019150c4680b39a44..4415289d78cc49af68e39e5d25ba3298a5ac6650 100644
--- a/source/libs/aclocal.m4
+++ b/source/libs/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -573,7 +572,11 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -602,7 +605,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -645,7 +648,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -680,7 +683,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -730,7 +733,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -769,7 +772,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -798,7 +801,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -845,7 +848,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -864,7 +867,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -945,7 +948,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1005,7 +1008,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1033,7 +1036,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1052,7 +1055,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/source/libs/cairo/Makefile.in b/source/libs/cairo/Makefile.in
index f6b60db855b477a79469c7d76b64d7ed90bc311a..d7913edc4edc078e0824da9a5e3b92dcf3496f58 100644
--- a/source/libs/cairo/Makefile.in
+++ b/source/libs/cairo/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -135,23 +145,6 @@ host_triplet = @host@
@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_10 = @CAIRO_TREE@/src/cairo-svg-surface.c
@build_TRUE@check_PROGRAMS = cairotst$(EXEEXT)
-DIST_COMMON = $(srcdir)/../../am/reconfig.am \
- $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(top_srcdir)/configure \
- $(am__configure_deps) $(srcdir)/config.h.in \
- $(srcdir)/cairo-features.h.in $(am__dist_check_SCRIPTS_DIST) \
- $(top_srcdir)/../../build-aux/depcomp \
- $(top_srcdir)/../../build-aux/test-driver ChangeLog README \
- ../../build-aux/compile ../../build-aux/config.guess \
- ../../build-aux/config.sub ../../build-aux/depcomp \
- ../../build-aux/install-sh ../../build-aux/missing \
- ../../build-aux/texinfo.tex ../../build-aux/ylwrap \
- ../../build-aux/ltmain.sh \
- $(top_srcdir)/../../build-aux/compile \
- $(top_srcdir)/../../build-aux/config.guess \
- $(top_srcdir)/../../build-aux/config.sub \
- $(top_srcdir)/../../build-aux/install-sh \
- $(top_srcdir)/../../build-aux/missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/cairo-bigendian.m4 \
@@ -163,6 +156,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/cairo-bigendian.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(am__dist_check_SCRIPTS_DIST) \
+ $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -755,6 +751,21 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
+ $(srcdir)/../../am/reconfig.am $(srcdir)/Makefile.in \
+ $(srcdir)/cairo-features.h.in $(srcdir)/config.h.in \
+ $(top_srcdir)/../../build-aux/compile \
+ $(top_srcdir)/../../build-aux/config.guess \
+ $(top_srcdir)/../../build-aux/config.sub \
+ $(top_srcdir)/../../build-aux/depcomp \
+ $(top_srcdir)/../../build-aux/install-sh \
+ $(top_srcdir)/../../build-aux/missing \
+ $(top_srcdir)/../../build-aux/test-driver \
+ ../../build-aux/compile ../../build-aux/config.guess \
+ ../../build-aux/config.sub ../../build-aux/depcomp \
+ ../../build-aux/install-sh ../../build-aux/ltmain.sh \
+ ../../build-aux/missing ../../build-aux/texinfo.tex \
+ ../../build-aux/ylwrap ChangeLog README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -1042,7 +1053,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/..
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -1052,7 +1062,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am:
+$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1857,7 +1867,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
if test -n "$$am__remaking_logs"; then \
echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
"recursion detected" >&2; \
- else \
+ elif test -n "$$redo_logs"; then \
am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
fi; \
if $(am__make_dryrun); then :; else \
@@ -2067,15 +2077,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -2111,17 +2121,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -2312,6 +2322,8 @@ uninstall-am:
mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
recheck tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
# in case of an SVN repository
dist-hook:
diff --git a/source/libs/cairo/aclocal.m4 b/source/libs/cairo/aclocal.m4
index e125205b2321979034802c6d5ae7b0dc58613002..dd0c689297631adf62c05487a3ec7edb1e308b95 100644
--- a/source/libs/cairo/aclocal.m4
+++ b/source/libs/cairo/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -573,7 +572,11 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -602,7 +605,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -645,7 +648,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -680,7 +683,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -730,7 +733,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -769,7 +772,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -798,7 +801,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -845,7 +848,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -864,7 +867,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -945,7 +948,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1005,7 +1008,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1033,7 +1036,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1052,7 +1055,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/source/libs/cairo/cairo/Makefile.in b/source/libs/cairo/cairo/Makefile.in
index 61371cf925599badfefbcc954051c1c7e96f8c66..40d5fc14a563c323992a729b8b8757b1dba82844 100644
--- a/source/libs/cairo/cairo/Makefile.in
+++ b/source/libs/cairo/cairo/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -85,8 +95,6 @@ host_triplet = @host@
@CAIRO_HAS_OS2_SURFACE_TRUE@am__append_6 = $(CAIRO_SRC)/src/cairo-os2.h
@CAIRO_HAS_GL_SURFACE_TRUE@am__append_7 = $(CAIRO_SRC)/src/cairo-gl.h
@CAIRO_HAS_SVG_SURFACE_TRUE@am__append_8 = $(CAIRO_SRC)/src/cairo-svg.h
-DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \
- $(srcdir)/Makefile.in $(srcdir)/Makefile.am
subdir = cairo
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/cairo-bigendian.m4 \
@@ -98,6 +106,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/cairo-bigendian.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h \
$(top_builddir)/cairo-features.h
@@ -123,6 +132,8 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/../../am/hdr_links.am
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -253,7 +264,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign cairo/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign cairo/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -262,7 +272,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
-$(top_srcdir)/../../am/hdr_links.am:
+$(top_srcdir)/../../am/hdr_links.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -423,6 +433,8 @@ uninstall-am:
mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am
+.PRECIOUS: Makefile
+
all-local:
@for file in $(hdr_links); do \
test -f $$file || continue; \
diff --git a/source/libs/cairo/configure b/source/libs/cairo/configure
index fce04bd99161d2a9d7ec1f653c93d23845d4a9a0..092dfb28e909e4dcbc0be1bb6e75fba1ce9066ab 100755
--- a/source/libs/cairo/configure
+++ b/source/libs/cairo/configure
@@ -2510,8 +2510,8 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -3821,7 +3821,7 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
-am__api_version='1.14'
+am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -4010,7 +4010,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -4417,8 +4417,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -4604,6 +4604,7 @@ END
fi
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
diff --git a/source/libs/configure b/source/libs/configure
index e6554e4b6d89d35b5bf2b1c428886a48b6b750eb..2800262aaf05ffea2e976a58e7e4a8c78a15ba0b 100755
--- a/source/libs/configure
+++ b/source/libs/configure
@@ -2142,8 +2142,8 @@ if test "${enable_missing+set}" = set; then :
enableval=$enable_missing;
fi
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -3168,7 +3168,7 @@ case $enable_luajittex in #(
: ;; #(
*) :
case $host in #(
- alpha* | sparc* | x86_64-*-cygwin) :
+ alpha* | sparc* | x86_64-*-cygwin | powerpc-*-darwin* ) :
{ $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-luajittex'" >&5
$as_echo "$as_me: $host -> \`--disable-luajittex'" >&6;}
ac_configure_args="$ac_configure_args '--disable-luajittex'" ;; #(
@@ -3889,7 +3889,7 @@ fi
-am__api_version='1.14'
+am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -4078,7 +4078,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -4485,8 +4485,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -4672,6 +4672,7 @@ END
fi
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
diff --git a/source/libs/gmp/Makefile.in b/source/libs/gmp/Makefile.in
index 69efc80c3b45e5bf00c94a31d491c715e6052c29..f7639eeca342d1c211f2ef6fd4fcb71cf9828408 100644
--- a/source/libs/gmp/Makefile.in
+++ b/source/libs/gmp/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -79,24 +89,6 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@build_TRUE@check_PROGRAMS = gmptest$(EXEEXT)
-DIST_COMMON = $(srcdir)/../../am/reconfig.am \
- $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(top_srcdir)/configure \
- $(am__configure_deps) $(srcdir)/config.h.in \
- $(top_srcdir)/gmp-6.0.0/gmp-h.in \
- $(am__dist_check_SCRIPTS_DIST) \
- $(top_srcdir)/../../build-aux/depcomp \
- $(top_srcdir)/../../build-aux/test-driver ChangeLog README \
- ../../build-aux/compile ../../build-aux/config.guess \
- ../../build-aux/config.sub ../../build-aux/depcomp \
- ../../build-aux/install-sh ../../build-aux/missing \
- ../../build-aux/texinfo.tex ../../build-aux/ylwrap \
- ../../build-aux/ltmain.sh \
- $(top_srcdir)/../../build-aux/compile \
- $(top_srcdir)/../../build-aux/config.guess \
- $(top_srcdir)/../../build-aux/config.sub \
- $(top_srcdir)/../../build-aux/install-sh \
- $(top_srcdir)/../../build-aux/missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gmp-alloca.m4 \
@@ -109,6 +101,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gmp-alloca.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(am__dist_check_SCRIPTS_DIST) \
+ $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -556,6 +551,21 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
+ $(srcdir)/../../am/reconfig.am $(srcdir)/Makefile.in \
+ $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
+ $(top_srcdir)/../../build-aux/config.guess \
+ $(top_srcdir)/../../build-aux/config.sub \
+ $(top_srcdir)/../../build-aux/depcomp \
+ $(top_srcdir)/../../build-aux/install-sh \
+ $(top_srcdir)/../../build-aux/missing \
+ $(top_srcdir)/../../build-aux/test-driver \
+ $(top_srcdir)/gmp-6.0.0/gmp-h.in ../../build-aux/compile \
+ ../../build-aux/config.guess ../../build-aux/config.sub \
+ ../../build-aux/depcomp ../../build-aux/install-sh \
+ ../../build-aux/ltmain.sh ../../build-aux/missing \
+ ../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog \
+ README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -1121,7 +1131,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/..
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -1131,7 +1140,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am:
+$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1958,7 +1967,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
if test -n "$$am__remaking_logs"; then \
echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
"recursion detected" >&2; \
- else \
+ elif test -n "$$redo_logs"; then \
am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
fi; \
if $(am__make_dryrun); then :; else \
@@ -2168,15 +2177,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -2212,17 +2221,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -2417,6 +2426,8 @@ uninstall-am:
mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
recheck tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
# in case of an SVN repository
dist-hook:
diff --git a/source/libs/gmp/aclocal.m4 b/source/libs/gmp/aclocal.m4
index f1aa7f89b21501f3a134a530642d3771da696f4b..a59121ecfaaf48c2260dd5bcbefac212e643e199 100644
--- a/source/libs/gmp/aclocal.m4
+++ b/source/libs/gmp/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -573,7 +572,11 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -602,7 +605,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -645,7 +648,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -680,7 +683,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -730,7 +733,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -769,7 +772,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -798,7 +801,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -845,7 +848,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -864,7 +867,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -945,7 +948,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1005,7 +1008,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1033,7 +1036,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1052,7 +1055,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/source/libs/gmp/configure b/source/libs/gmp/configure
index 519c82425ad1b21ec6144ca660a1fba04932420d..aa35d22fc530808aa665ba7296fc348837c32557 100755
--- a/source/libs/gmp/configure
+++ b/source/libs/gmp/configure
@@ -2357,7 +2357,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-am__api_version='1.14'
+am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2529,8 +2529,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -2549,7 +2549,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -3933,8 +3933,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -3992,6 +3992,7 @@ END
fi
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
diff --git a/source/libs/gmp/include/Makefile.in b/source/libs/gmp/include/Makefile.in
index 2325b2a5b29656021f6411f76923898cb996676d..7c09a7a5f4dfe2cd5b6604860d6364ce0576b967 100644
--- a/source/libs/gmp/include/Makefile.in
+++ b/source/libs/gmp/include/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -77,8 +87,6 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \
- $(srcdir)/Makefile.in $(srcdir)/Makefile.am
subdir = include
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gmp-alloca.m4 \
@@ -91,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gmp-alloca.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -115,6 +124,8 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/../../am/hdr_links.am
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -244,7 +255,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign include/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -253,7 +263,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
-$(top_srcdir)/../../am/hdr_links.am:
+$(top_srcdir)/../../am/hdr_links.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -414,6 +424,8 @@ uninstall-am:
mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am
+.PRECIOUS: Makefile
+
all-local:
@for file in $(hdr_links); do \
test -f $$file || continue; \
diff --git a/source/libs/gmp/native/Makefile.in b/source/libs/gmp/native/Makefile.in
index b2b7d43b78081bed1effca8c8ad24f1faa14a630..5c8069211a2847ffda44826e7d25d5a509af3918 100644
--- a/source/libs/gmp/native/Makefile.in
+++ b/source/libs/gmp/native/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -79,17 +89,6 @@ EXTRA_PROGRAMS = gen-bases$(EXEEXT) gen-fac$(EXEEXT) gen-fib$(EXEEXT) \
gen-jacobitab$(EXEEXT) gen-psqr$(EXEEXT) \
gen-trialdivtab$(EXEEXT)
subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/configure $(am__configure_deps) \
- $(srcdir)/config.h.in $(top_srcdir)/../../../build-aux/depcomp \
- ../../../build-aux/compile ../../../build-aux/config.guess \
- ../../../build-aux/config.sub ../../../build-aux/depcomp \
- ../../../build-aux/install-sh ../../../build-aux/missing \
- ../../../build-aux/texinfo.tex ../../../build-aux/ylwrap \
- ../../../build-aux/ltmain.sh \
- $(top_srcdir)/../../../build-aux/compile \
- $(top_srcdir)/../../../build-aux/install-sh \
- $(top_srcdir)/../../../build-aux/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../../m4/kpse-common.m4 \
$(top_srcdir)/../../../m4/kpse-search-libs.m4 \
@@ -97,6 +96,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../../../m4/kpse-common.m4 \
$(top_srcdir)/../version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -181,6 +182,16 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
AM_RECURSIVE_TARGETS = cscope
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(top_srcdir)/../../../build-aux/compile \
+ $(top_srcdir)/../../../build-aux/depcomp \
+ $(top_srcdir)/../../../build-aux/install-sh \
+ $(top_srcdir)/../../../build-aux/missing \
+ ../../../build-aux/compile ../../../build-aux/config.guess \
+ ../../../build-aux/config.sub ../../../build-aux/depcomp \
+ ../../../build-aux/install-sh ../../../build-aux/ltmain.sh \
+ ../../../build-aux/missing ../../../build-aux/texinfo.tex \
+ ../../../build-aux/ylwrap
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -322,7 +333,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -528,15 +538,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -572,17 +582,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -761,6 +771,8 @@ uninstall-am:
mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am
+.PRECIOUS: Makefile
+
dist-hook:
rm -rf `find $(distdir) -name '*.c'`
diff --git a/source/libs/gmp/native/aclocal.m4 b/source/libs/gmp/native/aclocal.m4
index 6ff51315444a543fbd5244c2fb7332df3d1c6f99..3dbe6fd29ea9f0be3752c3cbd20e4666309b18d7 100644
--- a/source/libs/gmp/native/aclocal.m4
+++ b/source/libs/gmp/native/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -573,7 +572,11 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -602,7 +605,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -645,7 +648,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -680,7 +683,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -730,7 +733,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -769,7 +772,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -798,7 +801,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -845,7 +848,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -864,7 +867,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -945,7 +948,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1005,7 +1008,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1033,7 +1036,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1052,7 +1055,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/source/libs/gmp/native/configure b/source/libs/gmp/native/configure
index 015478625125ef51a0aa924ce561e634d48057d7..b0b6fac3c861c0f2a9ba5dffcaece9261a48e649 100755
--- a/source/libs/gmp/native/configure
+++ b/source/libs/gmp/native/configure
@@ -1878,7 +1878,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-am__api_version='1.14'
+am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2050,8 +2050,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -2070,7 +2070,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -3454,8 +3454,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -3513,6 +3513,7 @@ END
fi
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
diff --git a/source/libs/libpng/Makefile.in b/source/libs/libpng/Makefile.in
index d5b6c7ac28285bca39504fbd90347bba555a227a..6bd236659b33117681da63bde6c02b781d0ea72f 100644
--- a/source/libs/libpng/Makefile.in
+++ b/source/libs/libpng/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -77,21 +87,6 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
@build_TRUE@check_PROGRAMS = pngtest$(EXEEXT)
-DIST_COMMON = $(srcdir)/../../am/reconfig.am \
- $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(top_srcdir)/configure \
- $(am__configure_deps) $(srcdir)/config.h.in \
- $(am__dist_check_SCRIPTS_DIST) \
- $(top_srcdir)/../../build-aux/depcomp \
- $(top_srcdir)/../../build-aux/test-driver ChangeLog README \
- ../../build-aux/compile ../../build-aux/config.guess \
- ../../build-aux/config.sub ../../build-aux/depcomp \
- ../../build-aux/install-sh ../../build-aux/missing \
- ../../build-aux/texinfo.tex ../../build-aux/ylwrap \
- ../../build-aux/ltmain.sh \
- $(top_srcdir)/../../build-aux/compile \
- $(top_srcdir)/../../build-aux/install-sh \
- $(top_srcdir)/../../build-aux/missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -101,6 +96,9 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(am__dist_check_SCRIPTS_DIST) \
+ $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -410,6 +408,18 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
+ $(srcdir)/../../am/reconfig.am $(srcdir)/Makefile.in \
+ $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
+ $(top_srcdir)/../../build-aux/depcomp \
+ $(top_srcdir)/../../build-aux/install-sh \
+ $(top_srcdir)/../../build-aux/missing \
+ $(top_srcdir)/../../build-aux/test-driver \
+ ../../build-aux/compile ../../build-aux/config.guess \
+ ../../build-aux/config.sub ../../build-aux/depcomp \
+ ../../build-aux/install-sh ../../build-aux/ltmain.sh \
+ ../../build-aux/missing ../../build-aux/texinfo.tex \
+ ../../build-aux/ylwrap ChangeLog README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -606,7 +616,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/..
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -616,7 +625,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am:
+$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -871,7 +880,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
if test -n "$$am__remaking_logs"; then \
echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
"recursion detected" >&2; \
- else \
+ elif test -n "$$redo_logs"; then \
am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
fi; \
if $(am__make_dryrun); then :; else \
@@ -1081,15 +1090,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -1125,17 +1134,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -1326,6 +1335,8 @@ uninstall-am:
mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
recheck tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
# in case of an SVN repository
dist-hook:
diff --git a/source/libs/libpng/aclocal.m4 b/source/libs/libpng/aclocal.m4
index ad0c53db51b514b93aa7b6269b0718c847187483..8b4a5da0f295be889e00762b1d52882e0434330a 100644
--- a/source/libs/libpng/aclocal.m4
+++ b/source/libs/libpng/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -573,7 +572,11 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -602,7 +605,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -645,7 +648,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -680,7 +683,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -730,7 +733,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -769,7 +772,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -798,7 +801,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -845,7 +848,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -864,7 +867,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -945,7 +948,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1005,7 +1008,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1033,7 +1036,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1052,7 +1055,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/source/libs/libpng/configure b/source/libs/libpng/configure
index 36d268b41e4f332443f1c113d9202d80a9f3dba4..88766f48be3853b4ad1662d16aebc5681fece184 100755
--- a/source/libs/libpng/configure
+++ b/source/libs/libpng/configure
@@ -2263,7 +2263,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-am__api_version='1.14'
+am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2435,8 +2435,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -2455,7 +2455,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -3839,8 +3839,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -3898,6 +3898,7 @@ END
fi
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
diff --git a/source/libs/libpng/include/Makefile.in b/source/libs/libpng/include/Makefile.in
index 9274414f9cabfffef9a19f8440a62fa8dd75466a..5f8532ed93b9fec142f0744011c282754cfbd0d5 100644
--- a/source/libs/libpng/include/Makefile.in
+++ b/source/libs/libpng/include/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -75,8 +85,6 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \
- $(srcdir)/Makefile.in $(srcdir)/Makefile.am
subdir = include
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -86,6 +94,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -110,6 +119,8 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/../../am/hdr_links.am
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -230,7 +241,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign include/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -239,7 +249,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
-$(top_srcdir)/../../am/hdr_links.am:
+$(top_srcdir)/../../am/hdr_links.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -400,6 +410,8 @@ uninstall-am:
mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am
+.PRECIOUS: Makefile
+
all-local:
@for file in $(hdr_links); do \
test -f $$file || continue; \
diff --git a/source/libs/lua52/Makefile.in b/source/libs/lua52/Makefile.in
index 38a1c77a63d427ce729de5c7de57091ca5fedc35..13a1a440fd73eaf0330c0f125925e299691895f6 100644
--- a/source/libs/lua52/Makefile.in
+++ b/source/libs/lua52/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -81,23 +91,6 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@build_TRUE@check_PROGRAMS = luatest$(EXEEXT) luatry$(EXEEXT)
-DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(top_srcdir)/configure \
- $(am__configure_deps) $(srcdir)/config.h.in \
- $(srcdir)/texlua52.pc.in $(am__dist_check_SCRIPTS_DIST) \
- $(top_srcdir)/../../build-aux/depcomp $(lua52include_HEADERS) \
- $(top_srcdir)/../../build-aux/test-driver ChangeLog \
- ../../build-aux/compile ../../build-aux/config.guess \
- ../../build-aux/config.sub ../../build-aux/depcomp \
- ../../build-aux/install-sh ../../build-aux/missing \
- ../../build-aux/texinfo.tex ../../build-aux/ylwrap \
- ../../build-aux/ltmain.sh \
- $(top_srcdir)/../../build-aux/compile \
- $(top_srcdir)/../../build-aux/config.guess \
- $(top_srcdir)/../../build-aux/config.sub \
- $(top_srcdir)/../../build-aux/install-sh \
- $(top_srcdir)/../../build-aux/ltmain.sh \
- $(top_srcdir)/../../build-aux/missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -115,6 +108,9 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(am__dist_check_SCRIPTS_DIST) \
+ $(lua52include_HEADERS) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -444,6 +440,21 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+ $(srcdir)/config.h.in $(srcdir)/texlua52.pc.in \
+ $(top_srcdir)/../../build-aux/compile \
+ $(top_srcdir)/../../build-aux/config.guess \
+ $(top_srcdir)/../../build-aux/config.sub \
+ $(top_srcdir)/../../build-aux/depcomp \
+ $(top_srcdir)/../../build-aux/install-sh \
+ $(top_srcdir)/../../build-aux/ltmain.sh \
+ $(top_srcdir)/../../build-aux/missing \
+ $(top_srcdir)/../../build-aux/test-driver \
+ ../../build-aux/compile ../../build-aux/config.guess \
+ ../../build-aux/config.sub ../../build-aux/depcomp \
+ ../../build-aux/install-sh ../../build-aux/ltmain.sh \
+ ../../build-aux/missing ../../build-aux/texinfo.tex \
+ ../../build-aux/ylwrap ChangeLog
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -690,7 +701,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/..
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -700,7 +710,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../../am/rebuild.am:
+$(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1139,7 +1149,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
if test -n "$$am__remaking_logs"; then \
echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
"recursion detected" >&2; \
- else \
+ elif test -n "$$redo_logs"; then \
am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
fi; \
if $(am__make_dryrun); then :; else \
@@ -1349,15 +1359,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -1393,17 +1403,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -1602,6 +1612,8 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-lua52includeHEADERS \
uninstall-libLTLIBRARIES uninstall-lua52includeHEADERS \
uninstall-pkgconfigDATA
+.PRECIOUS: Makefile
+
# in case of an SVN repository
dist-hook:
diff --git a/source/libs/lua52/aclocal.m4 b/source/libs/lua52/aclocal.m4
index f7e2fb0c091327f4e8c4b8fda71b7da3779b974f..457e4ee7dfa1c459449497ed955a9a266ebbc0a3 100644
--- a/source/libs/lua52/aclocal.m4
+++ b/source/libs/lua52/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -573,7 +572,11 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -602,7 +605,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -645,7 +648,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -680,7 +683,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -730,7 +733,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -769,7 +772,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -798,7 +801,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -845,7 +848,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -864,7 +867,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -945,7 +948,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1005,7 +1008,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1033,7 +1036,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1052,7 +1055,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/source/libs/lua52/configure b/source/libs/lua52/configure
index 86d13fb3a30d24b3942ceb9822c1be9cd30d8d53..369302bec0e200f771ecc14f85963097e6b03a99 100755
--- a/source/libs/lua52/configure
+++ b/source/libs/lua52/configure
@@ -2353,7 +2353,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-am__api_version='1.14'
+am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2525,8 +2525,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -2545,7 +2545,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -3929,8 +3929,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -3988,6 +3988,7 @@ END
fi
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
diff --git a/source/libs/lua52/include/Makefile.in b/source/libs/lua52/include/Makefile.in
index 5118ca69a1b2c9833b8b318224699fa89cf84640..89eb54a6252cbc7ab07874c3c4acdf011bfaa832 100644
--- a/source/libs/lua52/include/Makefile.in
+++ b/source/libs/lua52/include/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -77,8 +87,6 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \
- $(srcdir)/Makefile.in $(srcdir)/Makefile.am
subdir = include
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -96,6 +104,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -120,6 +129,8 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/../../am/hdr_links.am
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -286,7 +297,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign include/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -295,7 +305,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
-$(top_srcdir)/../../am/hdr_links.am:
+$(top_srcdir)/../../am/hdr_links.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -464,6 +474,8 @@ uninstall-am:
mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am
+.PRECIOUS: Makefile
+
all-local:
@for file in $(hdr_links); do \
test -f $$file || continue; \
diff --git a/source/libs/luajit/Makefile.in b/source/libs/luajit/Makefile.in
index 71999b66dcf75022c278c510f0c40e905f0961f4..be442c3be8afb9b1366d16877ebd12a276a52b41 100644
--- a/source/libs/luajit/Makefile.in
+++ b/source/libs/luajit/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -82,24 +92,6 @@ build_triplet = @build@
host_triplet = @host@
@PEOBJ_FALSE@am__append_1 = lj_vm_asm.s
@build_TRUE@check_PROGRAMS = jittest$(EXEEXT) luajittry$(EXEEXT)
-DIST_COMMON = $(srcdir)/../../am/reconfig.am \
- $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(top_srcdir)/configure \
- $(am__configure_deps) $(srcdir)/config.h.in \
- $(srcdir)/texluajit.pc.in $(am__dist_check_SCRIPTS_DIST) \
- $(top_srcdir)/../../build-aux/depcomp $(luajitinclude_HEADERS) \
- $(top_srcdir)/../../build-aux/test-driver ChangeLog \
- ../../build-aux/compile ../../build-aux/config.guess \
- ../../build-aux/config.sub ../../build-aux/depcomp \
- ../../build-aux/install-sh ../../build-aux/missing \
- ../../build-aux/texinfo.tex ../../build-aux/ylwrap \
- ../../build-aux/ltmain.sh \
- $(top_srcdir)/../../build-aux/compile \
- $(top_srcdir)/../../build-aux/config.guess \
- $(top_srcdir)/../../build-aux/config.sub \
- $(top_srcdir)/../../build-aux/install-sh \
- $(top_srcdir)/../../build-aux/ltmain.sh \
- $(top_srcdir)/../../build-aux/missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/lj-system.m4 \
@@ -117,6 +109,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/lj-system.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(am__dist_check_SCRIPTS_DIST) \
+ $(luajitinclude_HEADERS) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -475,6 +470,22 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
+ $(srcdir)/../../am/reconfig.am $(srcdir)/Makefile.in \
+ $(srcdir)/config.h.in $(srcdir)/texluajit.pc.in \
+ $(top_srcdir)/../../build-aux/compile \
+ $(top_srcdir)/../../build-aux/config.guess \
+ $(top_srcdir)/../../build-aux/config.sub \
+ $(top_srcdir)/../../build-aux/depcomp \
+ $(top_srcdir)/../../build-aux/install-sh \
+ $(top_srcdir)/../../build-aux/ltmain.sh \
+ $(top_srcdir)/../../build-aux/missing \
+ $(top_srcdir)/../../build-aux/test-driver \
+ ../../build-aux/compile ../../build-aux/config.guess \
+ ../../build-aux/config.sub ../../build-aux/depcomp \
+ ../../build-aux/install-sh ../../build-aux/ltmain.sh \
+ ../../build-aux/missing ../../build-aux/texinfo.tex \
+ ../../build-aux/ylwrap ChangeLog
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -747,7 +758,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/..
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -757,7 +767,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am:
+$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1273,7 +1283,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
if test -n "$$am__remaking_logs"; then \
echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
"recursion detected" >&2; \
- else \
+ elif test -n "$$redo_logs"; then \
am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
fi; \
if $(am__make_dryrun); then :; else \
@@ -1483,15 +1493,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -1527,17 +1537,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -1737,6 +1747,8 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-luajitincludeHEADERS \
uninstall-libLTLIBRARIES uninstall-luajitincludeHEADERS \
uninstall-pkgconfigDATA
+.PRECIOUS: Makefile
+
# in case of an SVN repository
dist-hook:
diff --git a/source/libs/luajit/aclocal.m4 b/source/libs/luajit/aclocal.m4
index 925c4d326b7c02daf269d0c6278c01a0a3fbf4cf..b01b5a7535f40d61dcfe0ab37ca4952be289d59d 100644
--- a/source/libs/luajit/aclocal.m4
+++ b/source/libs/luajit/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# Figure out how to run the assembler. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -78,7 +78,7 @@ _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -123,15 +123,14 @@ _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -162,7 +161,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -353,7 +352,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -429,7 +428,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -519,8 +518,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -593,7 +592,11 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -622,7 +625,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -633,7 +636,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -643,7 +646,7 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -665,7 +668,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -700,7 +703,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -750,7 +753,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -789,7 +792,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -818,7 +821,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -865,7 +868,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -884,7 +887,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -965,7 +968,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1025,7 +1028,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1053,7 +1056,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1072,7 +1075,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/source/libs/luajit/configure b/source/libs/luajit/configure
index 66a55f6f5ba38ae822d1170bcb93fe7a3c25b3c8..93f67d2c757143d5f8d207b704575524f0da35ba 100755
--- a/source/libs/luajit/configure
+++ b/source/libs/luajit/configure
@@ -2371,7 +2371,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-am__api_version='1.14'
+am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2543,8 +2543,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -2563,7 +2563,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -3947,8 +3947,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -4006,6 +4006,7 @@ END
fi
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
diff --git a/source/libs/luajit/include/Makefile.in b/source/libs/luajit/include/Makefile.in
index fffe6cdb910a3214f1c623f979c1d26dbb7bc44b..9f76550c46a18fb463dd7f0fa8c3e6814755960c 100644
--- a/source/libs/luajit/include/Makefile.in
+++ b/source/libs/luajit/include/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -77,8 +87,6 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \
- $(srcdir)/Makefile.in $(srcdir)/Makefile.am
subdir = include
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/lj-system.m4 \
@@ -96,6 +104,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/lj-system.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -120,6 +129,8 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/../../am/hdr_links.am
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -278,7 +289,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign include/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -287,7 +297,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
-$(top_srcdir)/../../am/hdr_links.am:
+$(top_srcdir)/../../am/hdr_links.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -455,6 +465,8 @@ uninstall-am:
mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am
+.PRECIOUS: Makefile
+
all-local:
@for file in $(hdr_links); do \
test -f $$file || continue; \
diff --git a/source/libs/luajit/native/Makefile.in b/source/libs/luajit/native/Makefile.in
index 10010091ffbb81d677512772d26deac8ae389985..bfb677c2e08407f4631ac557c3dbe93483435ed4 100644
--- a/source/libs/luajit/native/Makefile.in
+++ b/source/libs/luajit/native/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -79,19 +89,6 @@ build_triplet = @build@
host_triplet = @host@
EXTRA_PROGRAMS = buildvm$(EXEEXT) minilua$(EXEEXT)
subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/configure $(am__configure_deps) \
- $(srcdir)/config.h.in $(top_srcdir)/../../../build-aux/depcomp \
- ../../../build-aux/compile ../../../build-aux/config.guess \
- ../../../build-aux/config.sub ../../../build-aux/depcomp \
- ../../../build-aux/install-sh ../../../build-aux/missing \
- ../../../build-aux/texinfo.tex ../../../build-aux/ylwrap \
- ../../../build-aux/ltmain.sh \
- $(top_srcdir)/../../../build-aux/compile \
- $(top_srcdir)/../../../build-aux/config.guess \
- $(top_srcdir)/../../../build-aux/config.sub \
- $(top_srcdir)/../../../build-aux/install-sh \
- $(top_srcdir)/../../../build-aux/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../../m4/kpse-common.m4 \
$(top_srcdir)/../../../m4/kpse-luajit-flags.m4 \
@@ -100,6 +97,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../../../m4/kpse-common.m4 \
$(top_srcdir)/../version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -180,6 +179,18 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
AM_RECURSIVE_TARGETS = cscope
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(top_srcdir)/../../../build-aux/compile \
+ $(top_srcdir)/../../../build-aux/config.guess \
+ $(top_srcdir)/../../../build-aux/config.sub \
+ $(top_srcdir)/../../../build-aux/depcomp \
+ $(top_srcdir)/../../../build-aux/install-sh \
+ $(top_srcdir)/../../../build-aux/missing \
+ ../../../build-aux/compile ../../../build-aux/config.guess \
+ ../../../build-aux/config.sub ../../../build-aux/depcomp \
+ ../../../build-aux/install-sh ../../../build-aux/ltmain.sh \
+ ../../../build-aux/missing ../../../build-aux/texinfo.tex \
+ ../../../build-aux/ylwrap
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -336,7 +347,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -618,15 +628,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -662,17 +672,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -852,6 +862,8 @@ uninstall-am:
mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am
+.PRECIOUS: Makefile
+
all-local: buildvm-stamp
diff --git a/source/libs/luajit/native/aclocal.m4 b/source/libs/luajit/native/aclocal.m4
index 6da5fe3f569ddaa59c736ff52fc7de82059bdbe9..f8f53e2fae8302a26e4cb7d0b78ce81c2258369b 100644
--- a/source/libs/luajit/native/aclocal.m4
+++ b/source/libs/luajit/native/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -573,7 +572,11 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -602,7 +605,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -645,7 +648,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -680,7 +683,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -730,7 +733,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -769,7 +772,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -798,7 +801,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -845,7 +848,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -864,7 +867,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -945,7 +948,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1005,7 +1008,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1033,7 +1036,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1052,7 +1055,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/source/libs/luajit/native/configure b/source/libs/luajit/native/configure
index 5d7e5bcc2ae6a09380c1bac3668330f1b83471b9..f63d59fe317bfed92dc98d618536e8263f58b1b5 100755
--- a/source/libs/luajit/native/configure
+++ b/source/libs/luajit/native/configure
@@ -2228,7 +2228,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-am__api_version='1.14'
+am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2400,8 +2400,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -2420,7 +2420,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -3804,8 +3804,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -3863,6 +3863,7 @@ END
fi
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
diff --git a/source/libs/mpfr/Makefile.in b/source/libs/mpfr/Makefile.in
index 7fa22b89f21b5ff35903280d8519bd77774e2f9f..e19a86afdec23d51a82334a0c27b0e26ab3eee0b 100644
--- a/source/libs/mpfr/Makefile.in
+++ b/source/libs/mpfr/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -79,24 +89,6 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@build_TRUE@check_PROGRAMS = mpfrtest$(EXEEXT)
-DIST_COMMON = $(srcdir)/../../am/reconfig.am \
- $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(top_srcdir)/configure \
- $(am__configure_deps) $(srcdir)/config.h.in \
- $(top_srcdir)/mpfr-3.1.2/src/mparam_h.in \
- $(am__dist_check_SCRIPTS_DIST) \
- $(top_srcdir)/../../build-aux/depcomp \
- $(top_srcdir)/../../build-aux/test-driver ChangeLog README \
- ../../build-aux/compile ../../build-aux/config.guess \
- ../../build-aux/config.sub ../../build-aux/depcomp \
- ../../build-aux/install-sh ../../build-aux/missing \
- ../../build-aux/texinfo.tex ../../build-aux/ylwrap \
- ../../build-aux/ltmain.sh \
- $(top_srcdir)/../../build-aux/compile \
- $(top_srcdir)/../../build-aux/config.guess \
- $(top_srcdir)/../../build-aux/config.sub \
- $(top_srcdir)/../../build-aux/install-sh \
- $(top_srcdir)/../../build-aux/missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/mpfr-check-printf-spec.m4 \
@@ -111,6 +103,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/mpfr-check-printf-spec.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(am__dist_check_SCRIPTS_DIST) \
+ $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -494,6 +489,21 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
+ $(srcdir)/../../am/reconfig.am $(srcdir)/Makefile.in \
+ $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
+ $(top_srcdir)/../../build-aux/config.guess \
+ $(top_srcdir)/../../build-aux/config.sub \
+ $(top_srcdir)/../../build-aux/depcomp \
+ $(top_srcdir)/../../build-aux/install-sh \
+ $(top_srcdir)/../../build-aux/missing \
+ $(top_srcdir)/../../build-aux/test-driver \
+ $(top_srcdir)/mpfr-3.1.2/src/mparam_h.in \
+ ../../build-aux/compile ../../build-aux/config.guess \
+ ../../build-aux/config.sub ../../build-aux/depcomp \
+ ../../build-aux/install-sh ../../build-aux/ltmain.sh \
+ ../../build-aux/missing ../../build-aux/texinfo.tex \
+ ../../build-aux/ylwrap ChangeLog README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -904,7 +914,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/..
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -914,7 +923,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am:
+$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1435,7 +1444,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
if test -n "$$am__remaking_logs"; then \
echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
"recursion detected" >&2; \
- else \
+ elif test -n "$$redo_logs"; then \
am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
fi; \
if $(am__make_dryrun); then :; else \
@@ -1645,15 +1654,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -1689,17 +1698,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -1890,6 +1899,8 @@ uninstall-am:
mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
recheck tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
# in case of an SVN repository
dist-hook:
diff --git a/source/libs/mpfr/aclocal.m4 b/source/libs/mpfr/aclocal.m4
index be6474dfaa9884e4461f7c0fe160abe58de2d7c9..96798d99cb359ecec96ee7e83f65bb0ad1595ffc 100644
--- a/source/libs/mpfr/aclocal.m4
+++ b/source/libs/mpfr/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -573,7 +572,11 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -602,7 +605,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -645,7 +648,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -680,7 +683,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -730,7 +733,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -769,7 +772,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -798,7 +801,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -845,7 +848,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -864,7 +867,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -945,7 +948,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1005,7 +1008,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1033,7 +1036,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1052,7 +1055,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/source/libs/mpfr/configure b/source/libs/mpfr/configure
index 0733c3c2e36fffea559cfd36e6791ffe51111974..45a9bb5c850ec11d46a272552cdcc13349cc9c5d 100755
--- a/source/libs/mpfr/configure
+++ b/source/libs/mpfr/configure
@@ -2319,7 +2319,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-am__api_version='1.14'
+am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2491,8 +2491,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -2511,7 +2511,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -3895,8 +3895,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -3954,6 +3954,7 @@ END
fi
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
diff --git a/source/libs/mpfr/include/Makefile.in b/source/libs/mpfr/include/Makefile.in
index 596e7fd3fb7958890da6b114e172a3fcfdd3b3b4..1519add358482d79c1db23147074a33fe8c8e6b0 100644
--- a/source/libs/mpfr/include/Makefile.in
+++ b/source/libs/mpfr/include/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -77,8 +87,6 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \
- $(srcdir)/Makefile.in $(srcdir)/Makefile.am
subdir = include
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/mpfr-check-printf-spec.m4 \
@@ -93,6 +101,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/mpfr-check-printf-spec.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -117,6 +126,8 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/../../am/hdr_links.am
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
@@ -244,7 +255,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign include/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -253,7 +263,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
-$(top_srcdir)/../../am/hdr_links.am:
+$(top_srcdir)/../../am/hdr_links.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -414,6 +424,8 @@ uninstall-am:
mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am
+.PRECIOUS: Makefile
+
all-local:
@for file in $(hdr_links); do \
test -f $$file || continue; \
diff --git a/source/libs/pixman/Makefile.in b/source/libs/pixman/Makefile.in
index d93c4474a221281c6fac2c4856b4a76169a38ce8..03318995aa6b5c86ef9c3d7960be9f37408ccdc8 100644
--- a/source/libs/pixman/Makefile.in
+++ b/source/libs/pixman/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -76,22 +86,6 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/sources.am $(srcdir)/../../am/rebuild.am \
- $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/configure $(am__configure_deps) \
- $(srcdir)/config.h.in \
- $(top_srcdir)/pixman-0.32.6/pixman/pixman-version.h.in \
- $(am__dist_check_SCRIPTS_DIST) \
- $(top_srcdir)/../../build-aux/depcomp \
- $(top_srcdir)/../../build-aux/test-driver ChangeLog README \
- ../../build-aux/compile ../../build-aux/config.guess \
- ../../build-aux/config.sub ../../build-aux/depcomp \
- ../../build-aux/install-sh ../../build-aux/missing \
- ../../build-aux/texinfo.tex ../../build-aux/ylwrap \
- ../../build-aux/ltmain.sh \
- $(top_srcdir)/../../build-aux/compile \
- $(top_srcdir)/../../build-aux/install-sh \
- $(top_srcdir)/../../build-aux/missing
@build_TRUE@check_PROGRAMS = pixtest$(EXEEXT)
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -103,6 +97,9 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(am__dist_check_SCRIPTS_DIST) \
+ $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -435,6 +432,19 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+ $(srcdir)/config.h.in $(srcdir)/sources.am \
+ $(top_srcdir)/../../build-aux/compile \
+ $(top_srcdir)/../../build-aux/depcomp \
+ $(top_srcdir)/../../build-aux/install-sh \
+ $(top_srcdir)/../../build-aux/missing \
+ $(top_srcdir)/../../build-aux/test-driver \
+ $(top_srcdir)/pixman-0.32.6/pixman/pixman-version.h.in \
+ ../../build-aux/compile ../../build-aux/config.guess \
+ ../../build-aux/config.sub ../../build-aux/depcomp \
+ ../../build-aux/install-sh ../../build-aux/ltmain.sh \
+ ../../build-aux/missing ../../build-aux/texinfo.tex \
+ ../../build-aux/ylwrap ChangeLog README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -651,7 +661,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/so
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -661,7 +670,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/sources.am $(srcdir)/../../am/rebuild.am:
+$(srcdir)/sources.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1005,7 +1014,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
if test -n "$$am__remaking_logs"; then \
echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
"recursion detected" >&2; \
- else \
+ elif test -n "$$redo_logs"; then \
am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
fi; \
if $(am__make_dryrun); then :; else \
@@ -1215,15 +1224,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -1259,17 +1268,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -1459,6 +1468,8 @@ uninstall-am:
mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
recheck tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
# in case of an SVN repository
dist-hook:
diff --git a/source/libs/pixman/aclocal.m4 b/source/libs/pixman/aclocal.m4
index 0ebf296045d079c5633908263a0307f1b31cc0ef..62ce5bd33f0be446f4e2c60a471c64fa02b751c4 100644
--- a/source/libs/pixman/aclocal.m4
+++ b/source/libs/pixman/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -573,7 +572,11 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -602,7 +605,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -645,7 +648,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -680,7 +683,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -730,7 +733,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -769,7 +772,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -798,7 +801,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -845,7 +848,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -864,7 +867,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -945,7 +948,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1005,7 +1008,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1033,7 +1036,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1052,7 +1055,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/source/libs/pixman/configure b/source/libs/pixman/configure
index 1f1784f974c5c7c9ddda74e8fc0e27f4dc0577f0..68f3b9aa10b916de6cdd0a0015e0a48b30c92254 100755
--- a/source/libs/pixman/configure
+++ b/source/libs/pixman/configure
@@ -2333,7 +2333,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-am__api_version='1.14'
+am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2505,8 +2505,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -2525,7 +2525,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -3909,8 +3909,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -3968,6 +3968,7 @@ END
fi
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
diff --git a/source/libs/pixman/include/Makefile.in b/source/libs/pixman/include/Makefile.in
index 034802af22821496ddb363c95f076bb55f7bf967..fdff37c51c45d2516e1b19ad679e10a1e4f3eeac 100644
--- a/source/libs/pixman/include/Makefile.in
+++ b/source/libs/pixman/include/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -75,8 +85,6 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \
- $(srcdir)/Makefile.in $(srcdir)/Makefile.am
subdir = include
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -87,6 +95,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -111,6 +120,8 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/../../am/hdr_links.am
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -229,7 +240,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign include/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -238,7 +248,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
-$(top_srcdir)/../../am/hdr_links.am:
+$(top_srcdir)/../../am/hdr_links.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -399,6 +409,8 @@ uninstall-am:
mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am
+.PRECIOUS: Makefile
+
all-local:
@for file in $(hdr_links); do \
test -f $$file || continue; \
diff --git a/source/libs/poppler/ChangeLog b/source/libs/poppler/ChangeLog
index 3db0f80f441f60871e9e7824f6b1356cc077b0d7..cc2a804da49817a370a5d44723203da740e58896 100644
--- a/source/libs/poppler/ChangeLog
+++ b/source/libs/poppler/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import poppler-0.30.0.
+ * version.ac: Adjust.
+
2014-12-05 Peter Breitenlohner <peb@mppmu.mpg.de>
Import poppler-0.29.0.
diff --git a/source/libs/poppler/Makefile.in b/source/libs/poppler/Makefile.in
index 9f37ff095c593df16ee0b7a1d1385477d39c4793..059a93b93bc805e2348a4dc7c5e74a589ce49d61 100644
--- a/source/libs/poppler/Makefile.in
+++ b/source/libs/poppler/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -76,20 +86,6 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/../../am/reconfig.am \
- $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(top_srcdir)/configure \
- $(am__configure_deps) $(srcdir)/config.h.in \
- $(top_srcdir)/poppler-0.29.0/poppler/poppler-config.h.in \
- $(top_srcdir)/../../build-aux/depcomp ChangeLog \
- ../../build-aux/compile ../../build-aux/config.guess \
- ../../build-aux/config.sub ../../build-aux/depcomp \
- ../../build-aux/install-sh ../../build-aux/missing \
- ../../build-aux/texinfo.tex ../../build-aux/ylwrap \
- ../../build-aux/ltmain.sh \
- $(top_srcdir)/../../build-aux/compile \
- $(top_srcdir)/../../build-aux/install-sh \
- $(top_srcdir)/../../build-aux/missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -100,6 +96,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -271,6 +269,18 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
+ $(srcdir)/../../am/reconfig.am $(srcdir)/Makefile.in \
+ $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
+ $(top_srcdir)/../../build-aux/depcomp \
+ $(top_srcdir)/../../build-aux/install-sh \
+ $(top_srcdir)/../../build-aux/missing \
+ $(top_srcdir)/poppler-0.30.0/poppler/poppler-config.h.in \
+ ../../build-aux/compile ../../build-aux/config.guess \
+ ../../build-aux/config.sub ../../build-aux/depcomp \
+ ../../build-aux/install-sh ../../build-aux/ltmain.sh \
+ ../../build-aux/missing ../../build-aux/texinfo.tex \
+ ../../build-aux/ylwrap ChangeLog
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -544,7 +554,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/..
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -554,7 +563,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am:
+$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -581,7 +590,7 @@ poppler-config.h: stamp-h2
@test -f $@ || rm -f stamp-h2
@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h2
-stamp-h2: $(top_srcdir)/poppler-0.29.0/poppler/poppler-config.h.in $(top_builddir)/config.status
+stamp-h2: $(top_srcdir)/poppler-0.30.0/poppler/poppler-config.h.in $(top_builddir)/config.status
@rm -f stamp-h2
cd $(top_builddir) && $(SHELL) ./config.status poppler-config.h
@@ -1157,15 +1166,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -1201,17 +1210,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -1398,6 +1407,8 @@ uninstall-am:
mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
# in case of an SVN repository
dist-hook:
diff --git a/source/libs/poppler/aclocal.m4 b/source/libs/poppler/aclocal.m4
index 4d694ecb52dd928218ab503a0eea6bf9d401c33d..cc8ede0bbd901e55a591f155c60d55e11874a7e0 100644
--- a/source/libs/poppler/aclocal.m4
+++ b/source/libs/poppler/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -573,7 +572,11 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -602,7 +605,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -645,7 +648,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -680,7 +683,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -730,7 +733,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -769,7 +772,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -798,7 +801,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -845,7 +848,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -864,7 +867,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -945,7 +948,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1005,7 +1008,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1033,7 +1036,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1052,7 +1055,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/source/libs/poppler/configure b/source/libs/poppler/configure
index 7c323259a6bb2046cc96098af4203c4032078b15..12f413b1e73316da2235f551599a2ed5c0ddde05 100755
--- a/source/libs/poppler/configure
+++ b/source/libs/poppler/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.29.0.
+# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.30.0.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -580,12 +580,12 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='poppler (TeX Live)'
PACKAGE_TARNAME='poppler--tex-live-'
-PACKAGE_VERSION='0.29.0'
-PACKAGE_STRING='poppler (TeX Live) 0.29.0'
+PACKAGE_VERSION='0.30.0'
+PACKAGE_STRING='poppler (TeX Live) 0.30.0'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
-ac_unique_file="poppler-0.29.0/poppler/Array.cc"
+ac_unique_file="poppler-0.30.0/poppler/Array.cc"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -1306,7 +1306,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 poppler (TeX Live) 0.29.0 to adapt to many kinds of systems.
+\`configure' configures poppler (TeX Live) 0.30.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1373,7 +1373,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of poppler (TeX Live) 0.29.0:";;
+ short | recursive ) echo "Configuration of poppler (TeX Live) 0.30.0:";;
esac
cat <<\_ACEOF
@@ -1486,7 +1486,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-poppler (TeX Live) configure 0.29.0
+poppler (TeX Live) configure 0.30.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2076,7 +2076,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 poppler (TeX Live) $as_me 0.29.0, which was
+It was created by poppler (TeX Live) $as_me 0.30.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2457,7 +2457,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-am__api_version='1.14'
+am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2629,8 +2629,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -2649,7 +2649,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -3999,7 +3999,7 @@ fi
# Define the identity of the package.
PACKAGE='poppler--tex-live-'
- VERSION='0.29.0'
+ VERSION='0.30.0'
# Some tools Automake needs.
@@ -4024,8 +4024,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -4083,6 +4083,7 @@ END
fi
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
@@ -6572,12 +6573,12 @@ fi
ac_config_headers="$ac_config_headers config.h"
-ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.29.0/poppler/poppler-config.h.in"
+ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.30.0/poppler/poppler-config.h.in"
cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.29.0"
+#define POPPLER_VERSION "0.30.0"
_ACEOF
@@ -6711,7 +6712,7 @@ fi
$as_echo "#define ENABLE_ZLIB 1" >>confdefs.h
-POPPLER_TREE=poppler-0.29.0
+POPPLER_TREE=poppler-0.30.0
ac_config_files="$ac_config_files Makefile include/Makefile include/goo/Makefile include/fofi/Makefile"
@@ -7271,7 +7272,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by poppler (TeX Live) $as_me 0.29.0, which was
+This file was extended by poppler (TeX Live) $as_me 0.30.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7337,7 +7338,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-poppler (TeX Live) config.status 0.29.0
+poppler (TeX Live) config.status 0.30.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -7468,7 +7469,7 @@ do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
- "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.29.0/poppler/poppler-config.h.in" ;;
+ "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.30.0/poppler/poppler-config.h.in" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"include/goo/Makefile") CONFIG_FILES="$CONFIG_FILES include/goo/Makefile" ;;
diff --git a/source/libs/poppler/include/Makefile.in b/source/libs/poppler/include/Makefile.in
index 8b7e4637d1231d23bf3b33c5b250539d82ad42ad..2170921214a5b5bc97241e9266cefe52b61fb255 100644
--- a/source/libs/poppler/include/Makefile.in
+++ b/source/libs/poppler/include/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -75,8 +85,6 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \
- $(srcdir)/Makefile.in $(srcdir)/Makefile.am
subdir = include
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -87,6 +95,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h \
$(top_builddir)/poppler-config.h
@@ -147,6 +156,8 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/../../am/hdr_links.am
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -293,7 +304,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign include/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -302,7 +312,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
-$(top_srcdir)/../../am/hdr_links.am:
+$(top_srcdir)/../../am/hdr_links.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -584,6 +594,8 @@ uninstall-am:
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
all-local:
@for file in $(hdr_links); do \
test -f $$file || continue; \
diff --git a/source/libs/poppler/include/fofi/Makefile.in b/source/libs/poppler/include/fofi/Makefile.in
index 896aa75f00a075e9e2d528b0e5e0f662c4a129cd..301a6f633c9f08c91a43324ae987fc6b0b060615 100644
--- a/source/libs/poppler/include/fofi/Makefile.in
+++ b/source/libs/poppler/include/fofi/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -75,8 +85,6 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \
- $(srcdir)/Makefile.in $(srcdir)/Makefile.am
subdir = include/fofi
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -87,6 +95,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h \
$(top_builddir)/poppler-config.h
@@ -112,6 +121,8 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/../../am/hdr_links.am
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -232,7 +243,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/fofi/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign include/fofi/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -241,7 +251,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
-$(top_srcdir)/../../am/hdr_links.am:
+$(top_srcdir)/../../am/hdr_links.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -402,6 +412,8 @@ uninstall-am:
mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am
+.PRECIOUS: Makefile
+
all-local:
@for file in $(hdr_links); do \
test -f $$file || continue; \
diff --git a/source/libs/poppler/include/goo/Makefile.in b/source/libs/poppler/include/goo/Makefile.in
index 25370991459f2b8608a4c998a5066746d0c7d90e..27c0f34beaf93a98e9a27d79d63bfeed9ec21f35 100644
--- a/source/libs/poppler/include/goo/Makefile.in
+++ b/source/libs/poppler/include/goo/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -75,8 +85,6 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \
- $(srcdir)/Makefile.in $(srcdir)/Makefile.am
subdir = include/goo
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -87,6 +95,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h \
$(top_builddir)/poppler-config.h
@@ -112,6 +121,8 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/../../am/hdr_links.am
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -232,7 +243,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/goo/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign include/goo/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -241,7 +251,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
-$(top_srcdir)/../../am/hdr_links.am:
+$(top_srcdir)/../../am/hdr_links.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -402,6 +412,8 @@ uninstall-am:
mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am
+.PRECIOUS: Makefile
+
all-local:
@for file in $(hdr_links); do \
test -f $$file || continue; \
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/JPEG2000Stream.cc b/source/libs/poppler/poppler-0.29.0/poppler/JPEG2000Stream.cc
deleted file mode 100644
index 703d471c99a5139f41b5dbcbc30713e57564f964..0000000000000000000000000000000000000000
--- a/source/libs/poppler/poppler-0.29.0/poppler/JPEG2000Stream.cc
+++ /dev/null
@@ -1,197 +0,0 @@
-//========================================================================
-//
-// JPEG2000Stream.cc
-//
-// A JPX stream decoder using OpenJPEG
-//
-// Copyright 2008-2010, 2012 Albert Astals Cid <aacid@kde.org>
-// Copyright 2011 Daniel Glöckner <daniel-gl@gmx.net>
-// Copyright 2013 Adrian Johnson <ajohnson@redneon.com>
-//
-// Licensed under GPLv2 or later
-//
-//========================================================================
-
-#include "JPEG2000Stream.h"
-
-#include "config.h"
-
-JPXStream::JPXStream(Stream *strA) : FilterStream(strA)
-{
- inited = gFalse;
- image = NULL;
- dinfo = NULL;
- npixels = 0;
- ncomps = 0;
-}
-
-JPXStream::~JPXStream() {
- delete str;
- close();
-}
-
-void JPXStream::reset() {
- counter = 0;
- ccounter = 0;
-}
-
-void JPXStream::close() {
- if (image != NULL) {
- opj_image_destroy(image);
- image = NULL;
- npixels = 0;
- }
- if (dinfo != NULL) {
- opj_destroy_decompress(dinfo);
- dinfo = NULL;
- }
-}
-
-Goffset JPXStream::getPos() {
- return counter * ncomps + ccounter;
-}
-
-int JPXStream::getChars(int nChars, Guchar *buffer) {
- for (int i = 0; i < nChars; ++i) {
- const int c = doGetChar();
- if (likely(c != EOF)) buffer[i] = c;
- else return i;
- }
- return nChars;
-}
-
-int JPXStream::getChar() {
- return doGetChar();
-}
-
-#define BUFFER_INITIAL_SIZE 4096
-
-void JPXStream::init()
-{
- Object oLen;
- if (getDict()) getDict()->lookup("Length", &oLen);
-
- int bufSize = BUFFER_INITIAL_SIZE;
- if (oLen.isInt()) bufSize = oLen.getInt();
- oLen.free();
-
-
- int length = 0;
- unsigned char *buf = str->toUnsignedChars(&length, bufSize);
- init2(buf, length, CODEC_JP2);
- free(buf);
-
- if (image) {
- npixels = image->comps[0].w * image->comps[0].h;
- ncomps = image->numcomps;
- for (int component = 0; component < ncomps; component++) {
- if (image->comps[component].data == NULL) {
- close();
- break;
- }
- unsigned char *cdata = (unsigned char *)image->comps[component].data;
- int adjust = 0;
- if (image->comps[component].prec > 8)
- adjust = image->comps[component].prec - 8;
- int sgndcorr = 0;
- if (image->comps[component].sgnd)
- sgndcorr = 1 << (image->comps[0].prec - 1);
- for (int i = 0; i < npixels; i++) {
- int r = image->comps[component].data[i];
- r += sgndcorr;
- if (adjust) {
- r = (r >> adjust)+((r >> (adjust-1))%2);
- if (unlikely(r > 255))
- r = 255;
- }
- *(cdata++) = r;
- }
- }
- } else
- npixels = 0;
-
- counter = 0;
- ccounter = 0;
- inited = gTrue;
-}
-
-static void libopenjpeg_error_callback(const char *msg, void * /*client_data*/) {
- error(errSyntaxError, -1, "{0:s}", msg);
-}
-
-static void libopenjpeg_warning_callback(const char *msg, void * /*client_data*/) {
- error(errSyntaxWarning, -1, "{0:s}", msg);
-}
-
-void JPXStream::init2(unsigned char *buf, int bufLen, OPJ_CODEC_FORMAT format)
-{
- opj_cio_t *cio = NULL;
-
- /* Use default decompression parameters */
- opj_dparameters_t parameters;
- opj_set_default_decoder_parameters(¶meters);
-#ifdef WITH_OPENJPEG_IGNORE_PCLR_CMAP_CDEF_FLAG
- parameters.flags = OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG;
-#endif
-
- /* Configure the event manager to receive errors and warnings */
- opj_event_mgr_t event_mgr;
- memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
- event_mgr.error_handler = libopenjpeg_error_callback;
- event_mgr.warning_handler = libopenjpeg_warning_callback;
-
- /* Get the decoder handle of the format */
- dinfo = opj_create_decompress(format);
- if (dinfo == NULL) goto error;
-
- /* Catch events using our callbacks */
- opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, NULL);
-
- /* Setup the decoder decoding parameters */
- opj_setup_decoder(dinfo, ¶meters);
-
- /* Open a byte stream */
- cio = opj_cio_open((opj_common_ptr)dinfo, buf, bufLen);
- if (cio == NULL) goto error;
-
- /* Decode the stream and fill the image structure */
- image = opj_decode(dinfo, cio);
-
- /* Close the byte stream */
- opj_cio_close(cio);
-
- if (image == NULL) goto error;
- else return;
-
-error:
- if (format == CODEC_JP2) {
- error(errSyntaxWarning, -1, "Did no succeed opening JPX Stream as JP2, trying as J2K.");
- init2(buf, bufLen, CODEC_J2K);
- } else if (format == CODEC_J2K) {
- error(errSyntaxWarning, -1, "Did no succeed opening JPX Stream as J2K, trying as JPT.");
- init2(buf, bufLen, CODEC_JPT);
- } else {
- error(errSyntaxError, -1, "Did no succeed opening JPX Stream.");
- }
-}
-
-int JPXStream::lookChar() {
- return doLookChar();
-}
-
-GooString *JPXStream::getPSFilter(int psLevel, const char *indent) {
- return NULL;
-}
-
-GBool JPXStream::isBinary(GBool last) {
- return str->isBinary(gTrue);
-}
-
-void JPXStream::getImageParams(int *bitsPerComponent, StreamColorSpaceMode *csMode) {
- if (inited == gFalse) init();
-
- *bitsPerComponent = 8;
- if (image && image->numcomps == 3) *csMode = streamCSDeviceRGB;
- else *csMode = streamCSDeviceGray;
-}
-
diff --git a/source/libs/poppler/poppler-0.29.0-PATCHES/ChangeLog b/source/libs/poppler/poppler-0.30.0-PATCHES/ChangeLog
old mode 100644
new mode 100755
similarity index 97%
rename from source/libs/poppler/poppler-0.29.0-PATCHES/ChangeLog
rename to source/libs/poppler/poppler-0.30.0-PATCHES/ChangeLog
index 16ffd02b874042e64a7da77ebd5f17c8bf2be7dd..9e1c0a106200416a1dca7fab5cef90fe061c9f53
--- a/source/libs/poppler/poppler-0.29.0-PATCHES/ChangeLog
+++ b/source/libs/poppler/poppler-0.30.0-PATCHES/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-07 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Imported poppler-0.30.0 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
2014-12-05 Peter Breitenlohner <peb@mppmu.mpg.de>
Imported poppler-0.29.0 source tree from:
diff --git a/source/libs/poppler/poppler-0.29.0-PATCHES/TL-Changes b/source/libs/poppler/poppler-0.30.0-PATCHES/TL-Changes
old mode 100644
new mode 100755
similarity index 83%
rename from source/libs/poppler/poppler-0.29.0-PATCHES/TL-Changes
rename to source/libs/poppler/poppler-0.30.0-PATCHES/TL-Changes
index 92980bc4b1cabb17f6b27b056149e7b4ceb0254e..bf53ad987abd29459778699fde34901c8d4f6456
--- a/source/libs/poppler/poppler-0.29.0-PATCHES/TL-Changes
+++ b/source/libs/poppler/poppler-0.30.0-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the poppler-0.29.0 tree as obtained from:
+Changes applied to the poppler-0.30.0 tree as obtained from:
http://poppler.freedesktop.org/
Removed:
diff --git a/source/libs/poppler/poppler-0.29.0-PATCHES/patch-02-LLONG_MAX b/source/libs/poppler/poppler-0.30.0-PATCHES/patch-02-LLONG_MAX
old mode 100644
new mode 100755
similarity index 76%
rename from source/libs/poppler/poppler-0.29.0-PATCHES/patch-02-LLONG_MAX
rename to source/libs/poppler/poppler-0.30.0-PATCHES/patch-02-LLONG_MAX
index 57e7fe17d210d76cef688c98b5a15a68740d0e14..89a45ee3774a6d71868dc827aed86c9b0166e4cf
--- a/source/libs/poppler/poppler-0.29.0-PATCHES/patch-02-LLONG_MAX
+++ b/source/libs/poppler/poppler-0.30.0-PATCHES/patch-02-LLONG_MAX
@@ -1,6 +1,6 @@
-diff -ur poppler-0.29.0.orig/goo/GooString.h poppler-0.29.0/goo/GooString.h
---- poppler-0.29.0.orig/goo/GooString.h 2014-10-07 22:41:15.000000000 +0200
-+++ poppler-0.29.0/goo/GooString.h 2014-11-04 10:20:40.567904859 +0100
+diff -ur poppler-0.30.0.orig/goo/GooString.h poppler-0.30.0/goo/GooString.h
+--- poppler-0.30.0.orig/goo/GooString.h 2014-10-07 22:41:15.000000000 +0200
++++ poppler-0.30.0/goo/GooString.h 2014-11-04 10:20:40.567904859 +0100
@@ -34,6 +34,21 @@
#endif
diff --git a/source/libs/poppler/poppler-0.29.0/AUTHORS b/source/libs/poppler/poppler-0.30.0/AUTHORS
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/AUTHORS
rename to source/libs/poppler/poppler-0.30.0/AUTHORS
diff --git a/source/libs/poppler/poppler-0.29.0/CMakeLists.txt b/source/libs/poppler/poppler-0.30.0/CMakeLists.txt
old mode 100644
new mode 100755
similarity index 92%
rename from source/libs/poppler/poppler-0.29.0/CMakeLists.txt
rename to source/libs/poppler/poppler-0.30.0/CMakeLists.txt
index 7fdb49a178d3aceea535a3ee849aac83569002bc..5ed0b4490db214fb37ccc4aa8ef58a2e0d9234e5
--- a/source/libs/poppler/poppler-0.29.0/CMakeLists.txt
+++ b/source/libs/poppler/poppler-0.30.0/CMakeLists.txt
@@ -17,7 +17,7 @@ include(CheckFileOffsetBits)
CHECK_FILE_OFFSET_BITS()
set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "29")
+set(POPPLER_MINOR_VERSION "30")
set(POPPLER_MICRO_VERSION "0")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
@@ -30,7 +30,7 @@ option(BUILD_CPP_TESTS "Whether compile the CPP test programs." ON)
option(ENABLE_SPLASH "Build the Splash graphics backend." ON)
option(ENABLE_UTILS "Compile poppler command line utils." ON)
option(ENABLE_CPP "Compile poppler cpp wrapper." ON)
-option(ENABLE_LIBOPENJPEG "Use libopenjpeg for JPX streams." ON)
+set(ENABLE_LIBOPENJPEG "auto" CACHE STRING "Use libopenjpeg for JPX streams. Possible values: auto, openjpeg1, openjpeg2. 'auto' prefers openjpeg1 over openjpeg2 if both are available. Unset to not use openjpeg.")
set(ENABLE_CMS "auto" CACHE STRING "Use color management system. Possible values: auto, lcms1, lcms2. 'auto' prefers lcms2 over lcms1 if both are available. Unset to disable color management system.")
option(ENABLE_LIBCURL "Build libcurl based HTTP support." OFF)
option(ENABLE_ZLIB "Build with zlib (not totally safe)." OFF)
@@ -151,11 +151,26 @@ if(ENABLE_ZLIB)
endif(ZLIB_FOUND)
set(ENABLE_ZLIB ${ZLIB_FOUND})
endif(ENABLE_ZLIB)
-if(ENABLE_LIBOPENJPEG)
+set(USE_OPENJPEG1 FALSE)
+set(USE_OPENJPEG2 FALSE)
+if(ENABLE_LIBOPENJPEG STREQUAL "auto")
find_package(LIBOPENJPEG)
- set(ENABLE_LIBOPENJPEG ${LIBOPENJPEG_FOUND})
- set(HAVE_OPENJPEG_H ON)
-endif(ENABLE_LIBOPENJPEG)
+ set(USE_OPENJPEG1 ${LIBOPENJPEG_FOUND})
+ set(WITH_OPENJPEG ${LIBOPENJPEG_FOUND})
+ if(NOT LIBOPENJPEG_FOUND)
+ find_package(LIBOPENJPEG2)
+ set(USE_OPENJPEG2 ${LIBOPENJPEG2_FOUND})
+ set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND})
+ endif()
+elseif(ENABLE_LIBOPENJPEG STREQUAL "openjpeg1")
+ find_package(LIBOPENJPEG)
+ set(USE_OPENJPEG1 ${LIBOPENJPEG_FOUND})
+ set(WITH_OPENJPEG ${LIBOPENJPEG_FOUND})
+elseif(ENABLE_LIBOPENJPEG STREQUAL "openjpeg2")
+ find_package(LIBOPENJPEG2)
+ set(USE_OPENJPEG2 ${LIBOPENJPEG2_FOUND})
+ set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND})
+endif()
if(ENABLE_CMS STREQUAL "auto")
find_package(LCMS2)
set(USE_CMS ${LCMS2_FOUND})
@@ -225,6 +240,9 @@ endif(TIFF_FOUND)
if(LIBOPENJPEG_FOUND)
include_directories(${LIBOPENJPEG_INCLUDE_DIR})
endif(LIBOPENJPEG_FOUND)
+if(LIBOPENJPEG2_FOUND)
+ include_directories(${LIBOPENJPEG2_INCLUDE_DIRS})
+endif()
if(LCMS_FOUND)
include_directories(${LCMS_INCLUDE_DIR})
endif(LCMS_FOUND)
@@ -409,11 +427,19 @@ if(LIBOPENJPEG_FOUND)
poppler/JPEG2000Stream.cc
)
set(poppler_LIBS ${poppler_LIBS} ${LIBOPENJPEG_LIBRARIES})
-else (LIBOPENJPEG_FOUND)
+ add_definitions(-DUSE_OPENJPEG1)
+elseif (LIBOPENJPEG2_FOUND)
+ set(poppler_SRCS ${poppler_SRCS}
+ poppler/JPEG2000Stream.cc
+ )
+ add_definitions(-DUSE_OPENJPEG2)
+MESSAGE(${LIBOPENJPEG2_LIBRARIES})
+ set(poppler_LIBS ${poppler_LIBS} ${LIBOPENJPEG2_LIBRARIES})
+else ()
set(poppler_SRCS ${poppler_SRCS}
poppler/JPXStream.cc
)
-endif(LIBOPENJPEG_FOUND)
+endif()
if(USE_CMS)
if(LCMS_FOUND)
set(poppler_LIBS ${poppler_LIBS} ${LCMS_LIBRARIES})
@@ -443,7 +469,7 @@ add_library(poppler STATIC ${poppler_SRCS})
else(MSVC)
add_library(poppler SHARED ${poppler_SRCS})
endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 48.0.0 SOVERSION 48)
+set_target_properties(poppler PROPERTIES VERSION 49.0.0 SOVERSION 49)
target_link_libraries(poppler ${poppler_LIBS})
target_link_libraries(poppler LINK_INTERFACE_LIBRARIES "")
install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
@@ -574,11 +600,15 @@ if(ENABLE_XPDF_HEADERS)
install(FILES
poppler/JPEG2000Stream.h
DESTINATION include/poppler)
- else(LIBOPENJPEG_FOUND)
+ elseif(LIBOPENJPEG2_FOUND)
+ install(FILES
+ poppler/JPEG2000Stream.h
+ DESTINATION include/poppler)
+ else()
install(FILES
poppler/JPXStream.h
DESTINATION include/poppler)
- endif(LIBOPENJPEG_FOUND)
+ endif()
if(ENABLE_SPLASH)
install(FILES
poppler/SplashOutputDev.h
@@ -678,7 +708,13 @@ show_end_message_yesno("use libpng" ENABLE_LIBPNG)
show_end_message_yesno("use libtiff" ENABLE_LIBTIFF)
show_end_message_yesno("use zlib" ENABLE_ZLIB)
show_end_message_yesno("use curl" ENABLE_LIBCURL)
-show_end_message_yesno("use libopenjpeg" LIBOPENJPEG_FOUND)
+show_end_message_yesno("use libopenjpeg" WITH_OPENJPEG)
+if(USE_OPENJPEG1)
+ message(" with openjpeg1")
+endif()
+if(USE_OPENJPEG2)
+ message(" with openjpeg2")
+endif()
show_end_message_yesno("use cms" USE_CMS)
if(LCMS_FOUND)
message(" with lcms1")
diff --git a/source/libs/poppler/poppler-0.29.0/COPYING b/source/libs/poppler/poppler-0.30.0/COPYING
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/COPYING
rename to source/libs/poppler/poppler-0.30.0/COPYING
diff --git a/source/libs/poppler/poppler-0.29.0/ChangeLog b/source/libs/poppler/poppler-0.30.0/ChangeLog
old mode 100644
new mode 100755
similarity index 99%
rename from source/libs/poppler/poppler-0.29.0/ChangeLog
rename to source/libs/poppler/poppler-0.30.0/ChangeLog
index 01c35a0078356c182772963545d8c8e11ef30934..cccf0001f42179f9b7e0a6d6a06c9d77519c19b4
--- a/source/libs/poppler/poppler-0.29.0/ChangeLog
+++ b/source/libs/poppler/poppler-0.30.0/ChangeLog
@@ -1,3 +1,189 @@
+commit c13bffe92963c4969037695992f4c2776bbe973f
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 4 23:17:42 2015 +0100
+
+ 0.30
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 18 ++++++++++++++++++
+ configure.ac | 2 +-
+ cpp/CMakeLists.txt | 2 +-
+ cpp/Doxyfile | 2 +-
+ cpp/Makefile.am | 2 +-
+ poppler/Makefile.am | 2 +-
+ poppler/PDFDoc.cc | 1 +
+ poppler/TextOutputDev.cc | 2 +-
+ poppler/poppler-config.h.cmake | 2 +-
+ poppler/poppler-config.h.in | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ 13 files changed, 31 insertions(+), 12 deletions(-)
+
+commit e499fdab2e96cb3069db7ac8ffa0df20ccccddc9
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Sun Jan 4 20:23:39 2015 +0100
+
+ extended openjpeg2 support
+
+ poppler/JPEG2000Stream.cc | 101
+ +++++++++++++++++++++++++++++++++++-----------
+ 1 file changed, 78 insertions(+), 23 deletions(-)
+
+commit 2841f3c34dd6366a70e4d6d307a08b3fbc3e9897
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sun Jan 4 20:22:47 2015 +0100
+
+ Cmake support for openjpeg2
+
+ With some tweaks from Albert
+
+ CMakeLists.txt | 56
+ +++++++++++++++++++++++++++++-------
+ cmake/modules/FindLIBOPENJPEG2.cmake | 30 +++++++++++++++++++
+ 2 files changed, 76 insertions(+), 10 deletions(-)
+
+commit 117af9c6bbd923954ef7de63adec8c22d51da1e4
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Sun Jan 4 19:42:34 2015 +0100
+
+ Initial attempt at libopenjpeg2 support
+
+ OpenJPEG 2 has a new pkg-config name and API.
+
+ - Update configure.ac to find openjpeg 2 and provide V1/v2 macros
+ - Update JPEG2000Stream to use new API depending on openjpeg v1/v2
+ macros
+ - OpenJPEG 2.1 changed the API so provide a version macro to make
+ it easier
+ to handle the the 2.1 change and any future changes.
+ - Move openjpeg.h into the .cc file
+
+ configure.ac | 80 ++++++++----
+ poppler/JPEG2000Stream.cc | 313
+ +++++++++++++++++++++++++++++++++++++---------
+ poppler/JPEG2000Stream.h | 41 ++----
+ 3 files changed, 323 insertions(+), 111 deletions(-)
+
+commit 9caf7525409d699c16896653528486451123b485
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Sun Jan 4 18:48:02 2015 +0100
+
+ Make PSOutputDev accept a list of pages indeces
+
+ Instead of first, last
+
+ Bug #84833
+
+ Reviewed in the mailing list, see "Can anyone have a look at my
+ patch?"
+
+ glib/poppler-page.cc | 10 ++++++---
+ poppler/PSOutputDev.cc | 50
+ ++++++++++++++++++++++++-----------------
+ poppler/PSOutputDev.h | 14 +++++++-----
+ qt4/src/poppler-ps-converter.cc | 11 ++++++---
+ qt5/src/poppler-ps-converter.cc | 11 ++++++---
+ utils/pdftops.cc | 15 +++++++++----
+ 6 files changed, 71 insertions(+), 40 deletions(-)
+
+commit 173f182fb568843f97e7d45d1b16bebbd2aa7413
+Author: Li Junling <lijunling@sina.com>
+Date: Fri Jan 2 17:23:24 2015 +0100
+
+ Find last 'startxref' in the last 24K instead of the last 1K
+
+ Bug #85919
+
+ poppler/PDFDoc.cc | 38 ++++++++++++++++++++++----------------
+ 1 file changed, 22 insertions(+), 16 deletions(-)
+
+commit 0b1cd9403b8a240e58ec4f1832588d25f8295278
+Author: Jason Crain <jason@aquaticape.us>
+Date: Sat Dec 20 03:22:23 2014 -0600
+
+ Free BBox object on error
+
+ poppler/Gfx.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit acc33a6950031ac4a5c759d043d24df0cfa7e8b6
+Author: Jason Crain <jason@aquaticape.us>
+Date: Sat Dec 20 02:24:49 2014 -0600
+
+ Check for invalid matrix in annotation
+
+ Bug #84990
+
+ poppler/Gfx.cc | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+commit 56aff7d78658f586e3c4cd41685f189dafb3098a
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Tue Dec 23 15:49:15 2014 +0100
+
+ pdfunite: Support output intents, optional content and acroform
+
+ utils/pdfunite.cc | 116
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 116 insertions(+)
+
+commit 9e734063e6a6a4b9743c9aa27d3d3127b5a960d7
+Author: Jason Crain <jason@aquaticape.us>
+Date: Fri Dec 19 01:56:45 2014 -0600
+
+ Move array reallocation from visitLine to startLine
+
+ Fixes potential memory corruption from writing after end of lines
+ array.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=84555
+
+ poppler/TextOutputDev.cc | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+commit 0c47b769a77795bd866b6686b79fd20ad6f554bf
+Author: Daniel Macks <dmacks@netspace.org>
+Date: Sun Dec 14 18:52:48 2014 +0100
+
+ Only consider adding -fno-check-new if compiler supports it
+
+ Helps compiling on old clang's
+
+ Bug #76963
+
+ configure.ac | 18 ++++++++++++++++--
+ 1 file changed, 16 insertions(+), 2 deletions(-)
+
+commit c9c90d50e3708f6fac313aa8b458aef6dba5dcfb
+Author: Hans-Peter Deifel <hpdeifel@gmx.de>
+Date: Fri Dec 12 13:09:51 2014 +0100
+
+ cpp: New API to set debug output function
+
+ Adds the global function set_debug_error_function, that allows users
+ to install their own function to print internal poppler errors.
+
+ cpp/poppler-global.cpp | 29 +++++++++++++++++++++++++++++
+ cpp/poppler-global.h | 5 +++++
+ cpp/poppler-private.cpp | 15 ++++++++++++---
+ cpp/poppler-private.h | 3 +++
+ 4 files changed, 49 insertions(+), 3 deletions(-)
+
+commit fa8f276a10911c97d2777fff3270771802bc3892
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Thu Dec 4 23:11:12 2014 +0100
+
+ 0.29.0
+
+ CMakeLists.txt | 4 ++--
+ NEWS | 15 +++++++++++++++
+ configure.ac | 4 ++--
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ 7 files changed, 23 insertions(+), 8 deletions(-)
+
commit fee700cfecb9d7d5fa938704a5f457f15aaa4676
Author: Albert Astals Cid <aacid@kde.org>
Date: Mon Dec 1 20:52:42 2014 +0100
diff --git a/source/libs/poppler/poppler-0.29.0/ConfigureChecks.cmake b/source/libs/poppler/poppler-0.30.0/ConfigureChecks.cmake
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/ConfigureChecks.cmake
rename to source/libs/poppler/poppler-0.30.0/ConfigureChecks.cmake
diff --git a/source/libs/poppler/poppler-0.29.0/INSTALL b/source/libs/poppler/poppler-0.30.0/INSTALL
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/INSTALL
rename to source/libs/poppler/poppler-0.30.0/INSTALL
diff --git a/source/libs/poppler/poppler-0.29.0/Makefile.am b/source/libs/poppler/poppler-0.30.0/Makefile.am
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/Makefile.am
rename to source/libs/poppler/poppler-0.30.0/Makefile.am
diff --git a/source/libs/poppler/poppler-0.29.0/NEWS b/source/libs/poppler/poppler-0.30.0/NEWS
old mode 100644
new mode 100755
similarity index 99%
rename from source/libs/poppler/poppler-0.29.0/NEWS
rename to source/libs/poppler/poppler-0.30.0/NEWS
index 4bfd589d6e32bf882bd8ffa46dfe5a36ee8858cf..2ff8e1797bceeb1f62a8217d143fa295815ac3b9
--- a/source/libs/poppler/poppler-0.29.0/NEWS
+++ b/source/libs/poppler/poppler-0.30.0/NEWS
@@ -1,3 +1,21 @@
+Release 0.30.0
+ core:
+ * Openjpeg2 support (openjpeg 1 is preferred). Bug #58906
+ * Fix potential memory corruption on TextSelectionDumper. Bug #84555
+ * Check for invalid matrix in annotation. Bug #84990
+ * Open some not conforming files. Bug #85919
+ * PSOutputDev: Accept a list of pages indeces instead of first, last. Bug #84833
+ * Fix memory leak on error condition
+
+ cpp:
+ * New API to set debug output function
+
+ build system:
+ * configure: Improve support with older clang versions. Bug #76963
+
+ utils:
+ * pdfunite: Support output intents, optional content and acroform
+
Release 0.29.0
core:
* Use correct LAB byte array for lcms input. Bug #86388
diff --git a/source/libs/poppler/poppler-0.29.0/README b/source/libs/poppler/poppler-0.30.0/README
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/README
rename to source/libs/poppler/poppler-0.30.0/README
diff --git a/source/libs/poppler/poppler-0.29.0/README-XPDF b/source/libs/poppler/poppler-0.30.0/README-XPDF
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/README-XPDF
rename to source/libs/poppler/poppler-0.30.0/README-XPDF
diff --git a/source/libs/poppler/poppler-0.29.0/TODO b/source/libs/poppler/poppler-0.30.0/TODO
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/TODO
rename to source/libs/poppler/poppler-0.30.0/TODO
diff --git a/source/libs/poppler/poppler-0.29.0/config.h.cmake b/source/libs/poppler/poppler-0.30.0/config.h.cmake
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/config.h.cmake
rename to source/libs/poppler/poppler-0.30.0/config.h.cmake
diff --git a/source/libs/poppler/poppler-0.29.0/config.h.in b/source/libs/poppler/poppler-0.30.0/config.h.in
old mode 100644
new mode 100755
similarity index 98%
rename from source/libs/poppler/poppler-0.29.0/config.h.in
rename to source/libs/poppler/poppler-0.30.0/config.h.in
index 12fb1a09ec6b96219d26ba2b72c9c3c5f997ec44..c47d66d3e525fa5d7d880970c12695a3f688aede
--- a/source/libs/poppler/poppler-0.29.0/config.h.in
+++ b/source/libs/poppler/poppler-0.30.0/config.h.in
@@ -215,6 +215,12 @@
/* Defines if use lcms1 */
#undef USE_LCMS1
+/* Defined if using openjpeg1 */
+#undef USE_OPENJPEG1
+
+/* Defined if using openjpeg2 */
+#undef USE_OPENJPEG2
+
/* Version number of package */
#undef VERSION
diff --git a/source/libs/poppler/poppler-0.29.0/configure.ac b/source/libs/poppler/poppler-0.30.0/configure.ac
old mode 100644
new mode 100755
similarity index 91%
rename from source/libs/poppler/poppler-0.29.0/configure.ac
rename to source/libs/poppler/poppler-0.30.0/configure.ac
index 3bf36e0336b0149a1f86e6fd606c0ddec22a6ef5..b6429cf8ba148f6fc424f06c2afb7b9679aed3b4
--- a/source/libs/poppler/poppler-0.29.0/configure.ac
+++ b/source/libs/poppler/poppler-0.30.0/configure.ac
@@ -1,5 +1,5 @@
m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[29])
+m4_define([poppler_version_minor],[30])
m4_define([poppler_version_micro],[0])
m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
@@ -147,32 +147,57 @@ then
fi
-dnl Test for libopenjpeg. Versions prior to 1.4 do not provide a pkgconfig file.
+dnl ##### Test for libopenjpeg. Versions prior to 1.4 do not provide a pkgconfig file.
+openjpeg1="no"
+openjpeg2="no"
AC_ARG_ENABLE(libopenjpeg,
- AC_HELP_STRING([--disable-libopenjpeg],
- [Don't build against libopenjpeg.]),
- enable_libopenjpeg=$enableval,
- enable_libopenjpeg="try")
-if test x$enable_libopenjpeg = xyes; then
- PKG_CHECK_MODULES(LIBOPENJPEG, libopenjpeg,
- [],
- [AC_CHECK_LIB([openjpeg], [opj_cio_open],
- LIBOPENJPEG_LIBS="-lopenjpeg",
- AC_MSG_ERROR("*** libopenjpeg library not found ***"))
- AC_CHECK_HEADERS([openjpeg.h],,
- AC_MSG_ERROR("*** libopenjpeg headers not found ***"))])
-elif test x$enable_libopenjpeg = xtry; then
+ AC_HELP_STRING([--enable-libopenjpeg=@<:@auto/openjpeg1/openjpeg2/none@:>@],
+ [Use openjpeg for JPEG2000 images. 'auto' prefers openjpeg1 over openjpeg2 if both are available due to regressions in openjpeg2 [[default=auto]]]),
+ [enable_libopenjpeg=$enableval],
+ [enable_libopenjpeg="auto"])
+
+openjpeg_header=yes
+
+dnl test for libopenjpeg1
+if test x$enable_libopenjpeg = xopenjpeg1 || test x$enable_libopenjpeg = xauto; then
PKG_CHECK_MODULES(LIBOPENJPEG, libopenjpeg,
- [enable_libopenjpeg="yes"],
- [AC_CHECK_LIB([openjpeg], [opj_cio_open],
- [enable_libopenjpeg="yes"
- LIBOPENJPEG_LIBS="-lopenjpeg"],
- [enable_libopenjpeg="no"])
- AC_CHECK_HEADERS([openjpeg.h],,
- [enable_libopenjpeg="no"])])
+ [openjpeg1="yes"],
+ [AC_CHECK_LIB([openjpeg], [opj_cio_open],
+ [openjpeg1="yes"
+ LIBOPENJPEG_LIBS="-lopenjpeg"],[openjpeg_header=no])
+ AC_CHECK_HEADERS([openjpeg.h],,
+ [openjpeg="no"])])
+fi
+
+dnl test for libopenjpeg2
+if test x$openjpeg1 = xno; then
+ if test x$enable_libopenjpeg = xopenjpeg2 || test x$enable_libopenjpeg = xauto; then
+ PKG_CHECK_MODULES(LIBOPENJPEG, libopenjp2,
+ [openjpeg2=yes],[])
+ fi
+fi
+
+if test x$enable_libopenjpeg = xopenjpeg1 && test x$openjpeg1 = xno; then
+ if test x$openjpeg_header = xno; then
+ AC_MSG_ERROR("*** libopenjpeg headers not found ***")
+ else
+ AC_MSG_ERROR("*** libopenjpeg library not found ***")
+ fi
+fi
+
+if test x$enable_libopenjpeg = xopenjpeg2 && test x$openjpeg2 = xno; then
+ AC_MSG_ERROR("*** libopenjp2 library not found ***")
fi
-if test x$enable_libopenjpeg = xyes; then
+if test x$openjpeg1 = xyes || test x$openjpeg2 = xyes; then
+ enable_libopenjpeg=yes
+ if test x$openjpeg1 = xyes; then
+ AC_DEFINE(USE_OPENJPEG1, 1, [Defined if using openjpeg1])
+ fi
+ if test x$openjpeg2 = xyes; then
+ AC_DEFINE(USE_OPENJPEG2, 1, [Defined if using openjpeg2])
+ fi
+
AC_SUBST(LIBOPENJPEG_CFLAGS)
AC_SUBST(LIBOPENJPEG_LIBS)
AC_DEFINE(ENABLE_LIBOPENJPEG)
@@ -182,9 +207,11 @@ if test x$enable_libopenjpeg = xyes; then
[AC_DEFINE(WITH_OPENJPEG_IGNORE_PCLR_CMAP_CDEF_FLAG, 1, [OpenJPEG with the OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG flag.])],
[])
])
+else
+ enable_libopenjpeg=no
fi
-AM_CONDITIONAL(BUILD_LIBOPENJPEG, test x$enable_libopenjpeg = xyes)
+AM_CONDITIONAL(BUILD_LIBOPENJPEG, test x$openjpeg1 = xyes || test x$openjpeg2 = xyes)
AH_TEMPLATE([ENABLE_LIBOPENJPEG],
[Use libopenjpeg instead of builtin jpeg2000 decoder.])
@@ -810,18 +837,32 @@ else
fi
AC_SUBST(TESTDATADIR)
+# some compilers do not support this flag (see bug #76963)
+fno_check_new=
+AC_MSG_CHECKING([for -fno-check-new compiler flag])
+AC_LANG_PUSH([C++])
+saved_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="-fno-check-new $CXXFLAGS"
+AC_TRY_COMPILE([], [],
+ [AC_MSG_RESULT([yes])
+ fno_check_new="-fno-check-new"],
+ AC_MSG_RESULT([no])
+)
+CXXFLAGS=$saved_CXXFLAGS
+AC_LANG_POP
+
if test "x$GCC" != xyes; then
enable_compile_warnings=no
fi
case "$enable_compile_warnings" in
no) ;;
- yes) CXXFLAGS="-Wall -Woverloaded-virtual -Wnon-virtual-dtor -Wcast-align -fno-exceptions -fno-check-new -fno-common $CXXFLAGS";
+ yes) CXXFLAGS="-Wall -Woverloaded-virtual -Wnon-virtual-dtor -Wcast-align -fno-exceptions $fno_check_new -fno-common $CXXFLAGS";
CFLAGS="-Wall $CFLAGS" ;;
kde) CXXFLAGS="-Wnon-virtual-dtor -Wno-long-long -Wundef \
-D_XOPEN_SOURCE=600 -D_BSD_SOURCE -Wcast-align \
-Wconversion -Wall -W -Wpointer-arith \
-Wwrite-strings -O2 -Wformat-security \
- -Wmissing-format-attribute -fno-exceptions -fno-check-new \
+ -Wmissing-format-attribute -fno-exceptions $fno_check_new \
-fno-common $CXXFLAGS" ;;
esac
@@ -910,6 +951,13 @@ echo " use libtiff: $enable_libtiff"
echo " use zlib: $enable_zlib"
echo " use libcurl: $enable_libcurl"
echo " use libopenjpeg: $enable_libopenjpeg"
+if test x$enable_libopenjpeg = xyes;then
+ if test x$openjpeg1 = xyes;then
+ echo " with openjpeg1"
+ else
+ echo " with openjpeg2"
+ fi
+fi
echo " use cms: $enable_cms"
if test x$enable_cms = xyes;then
if test x$lcms1 = xyes;then
diff --git a/source/libs/poppler/poppler-0.29.0/fofi/FoFiBase.cc b/source/libs/poppler/poppler-0.30.0/fofi/FoFiBase.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/fofi/FoFiBase.cc
rename to source/libs/poppler/poppler-0.30.0/fofi/FoFiBase.cc
diff --git a/source/libs/poppler/poppler-0.29.0/fofi/FoFiBase.h b/source/libs/poppler/poppler-0.30.0/fofi/FoFiBase.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/fofi/FoFiBase.h
rename to source/libs/poppler/poppler-0.30.0/fofi/FoFiBase.h
diff --git a/source/libs/poppler/poppler-0.29.0/fofi/FoFiEncodings.cc b/source/libs/poppler/poppler-0.30.0/fofi/FoFiEncodings.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/fofi/FoFiEncodings.cc
rename to source/libs/poppler/poppler-0.30.0/fofi/FoFiEncodings.cc
diff --git a/source/libs/poppler/poppler-0.29.0/fofi/FoFiEncodings.h b/source/libs/poppler/poppler-0.30.0/fofi/FoFiEncodings.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/fofi/FoFiEncodings.h
rename to source/libs/poppler/poppler-0.30.0/fofi/FoFiEncodings.h
diff --git a/source/libs/poppler/poppler-0.29.0/fofi/FoFiIdentifier.cc b/source/libs/poppler/poppler-0.30.0/fofi/FoFiIdentifier.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/fofi/FoFiIdentifier.cc
rename to source/libs/poppler/poppler-0.30.0/fofi/FoFiIdentifier.cc
diff --git a/source/libs/poppler/poppler-0.29.0/fofi/FoFiIdentifier.h b/source/libs/poppler/poppler-0.30.0/fofi/FoFiIdentifier.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/fofi/FoFiIdentifier.h
rename to source/libs/poppler/poppler-0.30.0/fofi/FoFiIdentifier.h
diff --git a/source/libs/poppler/poppler-0.29.0/fofi/FoFiTrueType.cc b/source/libs/poppler/poppler-0.30.0/fofi/FoFiTrueType.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/fofi/FoFiTrueType.cc
rename to source/libs/poppler/poppler-0.30.0/fofi/FoFiTrueType.cc
diff --git a/source/libs/poppler/poppler-0.29.0/fofi/FoFiTrueType.h b/source/libs/poppler/poppler-0.30.0/fofi/FoFiTrueType.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/fofi/FoFiTrueType.h
rename to source/libs/poppler/poppler-0.30.0/fofi/FoFiTrueType.h
diff --git a/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1.cc b/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/fofi/FoFiType1.cc
rename to source/libs/poppler/poppler-0.30.0/fofi/FoFiType1.cc
diff --git a/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1.h b/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/fofi/FoFiType1.h
rename to source/libs/poppler/poppler-0.30.0/fofi/FoFiType1.h
diff --git a/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1C.cc b/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1C.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/fofi/FoFiType1C.cc
rename to source/libs/poppler/poppler-0.30.0/fofi/FoFiType1C.cc
diff --git a/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1C.h b/source/libs/poppler/poppler-0.30.0/fofi/FoFiType1C.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/fofi/FoFiType1C.h
rename to source/libs/poppler/poppler-0.30.0/fofi/FoFiType1C.h
diff --git a/source/libs/poppler/poppler-0.29.0/fofi/Makefile.am b/source/libs/poppler/poppler-0.30.0/fofi/Makefile.am
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/fofi/Makefile.am
rename to source/libs/poppler/poppler-0.30.0/fofi/Makefile.am
diff --git a/source/libs/poppler/poppler-0.29.0/goo/FixedPoint.cc b/source/libs/poppler/poppler-0.30.0/goo/FixedPoint.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/FixedPoint.cc
rename to source/libs/poppler/poppler-0.30.0/goo/FixedPoint.cc
diff --git a/source/libs/poppler/poppler-0.29.0/goo/FixedPoint.h b/source/libs/poppler/poppler-0.30.0/goo/FixedPoint.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/FixedPoint.h
rename to source/libs/poppler/poppler-0.30.0/goo/FixedPoint.h
diff --git a/source/libs/poppler/poppler-0.29.0/goo/GooHash.cc b/source/libs/poppler/poppler-0.30.0/goo/GooHash.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/GooHash.cc
rename to source/libs/poppler/poppler-0.30.0/goo/GooHash.cc
diff --git a/source/libs/poppler/poppler-0.29.0/goo/GooHash.h b/source/libs/poppler/poppler-0.30.0/goo/GooHash.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/GooHash.h
rename to source/libs/poppler/poppler-0.30.0/goo/GooHash.h
diff --git a/source/libs/poppler/poppler-0.29.0/goo/GooLikely.h b/source/libs/poppler/poppler-0.30.0/goo/GooLikely.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/GooLikely.h
rename to source/libs/poppler/poppler-0.30.0/goo/GooLikely.h
diff --git a/source/libs/poppler/poppler-0.29.0/goo/GooList.cc b/source/libs/poppler/poppler-0.30.0/goo/GooList.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/GooList.cc
rename to source/libs/poppler/poppler-0.30.0/goo/GooList.cc
diff --git a/source/libs/poppler/poppler-0.29.0/goo/GooList.h b/source/libs/poppler/poppler-0.30.0/goo/GooList.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/GooList.h
rename to source/libs/poppler/poppler-0.30.0/goo/GooList.h
diff --git a/source/libs/poppler/poppler-0.29.0/goo/GooMutex.h b/source/libs/poppler/poppler-0.30.0/goo/GooMutex.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/GooMutex.h
rename to source/libs/poppler/poppler-0.30.0/goo/GooMutex.h
diff --git a/source/libs/poppler/poppler-0.29.0/goo/GooString.cc b/source/libs/poppler/poppler-0.30.0/goo/GooString.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/GooString.cc
rename to source/libs/poppler/poppler-0.30.0/goo/GooString.cc
diff --git a/source/libs/poppler/poppler-0.29.0/goo/GooString.h b/source/libs/poppler/poppler-0.30.0/goo/GooString.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/GooString.h
rename to source/libs/poppler/poppler-0.30.0/goo/GooString.h
diff --git a/source/libs/poppler/poppler-0.29.0/goo/GooTimer.cc b/source/libs/poppler/poppler-0.30.0/goo/GooTimer.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/GooTimer.cc
rename to source/libs/poppler/poppler-0.30.0/goo/GooTimer.cc
diff --git a/source/libs/poppler/poppler-0.29.0/goo/GooTimer.h b/source/libs/poppler/poppler-0.30.0/goo/GooTimer.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/GooTimer.h
rename to source/libs/poppler/poppler-0.30.0/goo/GooTimer.h
diff --git a/source/libs/poppler/poppler-0.29.0/goo/ImgWriter.cc b/source/libs/poppler/poppler-0.30.0/goo/ImgWriter.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/ImgWriter.cc
rename to source/libs/poppler/poppler-0.30.0/goo/ImgWriter.cc
diff --git a/source/libs/poppler/poppler-0.29.0/goo/ImgWriter.h b/source/libs/poppler/poppler-0.30.0/goo/ImgWriter.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/ImgWriter.h
rename to source/libs/poppler/poppler-0.30.0/goo/ImgWriter.h
diff --git a/source/libs/poppler/poppler-0.29.0/goo/JpegWriter.cc b/source/libs/poppler/poppler-0.30.0/goo/JpegWriter.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/JpegWriter.cc
rename to source/libs/poppler/poppler-0.30.0/goo/JpegWriter.cc
diff --git a/source/libs/poppler/poppler-0.29.0/goo/JpegWriter.h b/source/libs/poppler/poppler-0.30.0/goo/JpegWriter.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/JpegWriter.h
rename to source/libs/poppler/poppler-0.30.0/goo/JpegWriter.h
diff --git a/source/libs/poppler/poppler-0.29.0/goo/Makefile.am b/source/libs/poppler/poppler-0.30.0/goo/Makefile.am
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/Makefile.am
rename to source/libs/poppler/poppler-0.30.0/goo/Makefile.am
diff --git a/source/libs/poppler/poppler-0.29.0/goo/NetPBMWriter.cc b/source/libs/poppler/poppler-0.30.0/goo/NetPBMWriter.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/NetPBMWriter.cc
rename to source/libs/poppler/poppler-0.30.0/goo/NetPBMWriter.cc
diff --git a/source/libs/poppler/poppler-0.29.0/goo/NetPBMWriter.h b/source/libs/poppler/poppler-0.30.0/goo/NetPBMWriter.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/NetPBMWriter.h
rename to source/libs/poppler/poppler-0.30.0/goo/NetPBMWriter.h
diff --git a/source/libs/poppler/poppler-0.29.0/goo/PNGWriter.cc b/source/libs/poppler/poppler-0.30.0/goo/PNGWriter.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/PNGWriter.cc
rename to source/libs/poppler/poppler-0.30.0/goo/PNGWriter.cc
diff --git a/source/libs/poppler/poppler-0.29.0/goo/PNGWriter.h b/source/libs/poppler/poppler-0.30.0/goo/PNGWriter.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/PNGWriter.h
rename to source/libs/poppler/poppler-0.30.0/goo/PNGWriter.h
diff --git a/source/libs/poppler/poppler-0.29.0/goo/TiffWriter.cc b/source/libs/poppler/poppler-0.30.0/goo/TiffWriter.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/TiffWriter.cc
rename to source/libs/poppler/poppler-0.30.0/goo/TiffWriter.cc
diff --git a/source/libs/poppler/poppler-0.29.0/goo/TiffWriter.h b/source/libs/poppler/poppler-0.30.0/goo/TiffWriter.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/TiffWriter.h
rename to source/libs/poppler/poppler-0.30.0/goo/TiffWriter.h
diff --git a/source/libs/poppler/poppler-0.29.0/goo/gfile.cc b/source/libs/poppler/poppler-0.30.0/goo/gfile.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/gfile.cc
rename to source/libs/poppler/poppler-0.30.0/goo/gfile.cc
diff --git a/source/libs/poppler/poppler-0.29.0/goo/gfile.h b/source/libs/poppler/poppler-0.30.0/goo/gfile.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/gfile.h
rename to source/libs/poppler/poppler-0.30.0/goo/gfile.h
diff --git a/source/libs/poppler/poppler-0.29.0/goo/gmem.cc b/source/libs/poppler/poppler-0.30.0/goo/gmem.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/gmem.cc
rename to source/libs/poppler/poppler-0.30.0/goo/gmem.cc
diff --git a/source/libs/poppler/poppler-0.29.0/goo/gmem.h b/source/libs/poppler/poppler-0.30.0/goo/gmem.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/gmem.h
rename to source/libs/poppler/poppler-0.30.0/goo/gmem.h
diff --git a/source/libs/poppler/poppler-0.29.0/goo/gmempp.cc b/source/libs/poppler/poppler-0.30.0/goo/gmempp.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/gmempp.cc
rename to source/libs/poppler/poppler-0.30.0/goo/gmempp.cc
diff --git a/source/libs/poppler/poppler-0.29.0/goo/grandom.cc b/source/libs/poppler/poppler-0.30.0/goo/grandom.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/grandom.cc
rename to source/libs/poppler/poppler-0.30.0/goo/grandom.cc
diff --git a/source/libs/poppler/poppler-0.29.0/goo/grandom.h b/source/libs/poppler/poppler-0.30.0/goo/grandom.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/grandom.h
rename to source/libs/poppler/poppler-0.30.0/goo/grandom.h
diff --git a/source/libs/poppler/poppler-0.29.0/goo/gstrtod.cc b/source/libs/poppler/poppler-0.30.0/goo/gstrtod.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/gstrtod.cc
rename to source/libs/poppler/poppler-0.30.0/goo/gstrtod.cc
diff --git a/source/libs/poppler/poppler-0.29.0/goo/gstrtod.h b/source/libs/poppler/poppler-0.30.0/goo/gstrtod.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/gstrtod.h
rename to source/libs/poppler/poppler-0.30.0/goo/gstrtod.h
diff --git a/source/libs/poppler/poppler-0.29.0/goo/gtypes.h b/source/libs/poppler/poppler-0.30.0/goo/gtypes.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/gtypes.h
rename to source/libs/poppler/poppler-0.30.0/goo/gtypes.h
diff --git a/source/libs/poppler/poppler-0.29.0/goo/gtypes_p.h b/source/libs/poppler/poppler-0.30.0/goo/gtypes_p.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/goo/gtypes_p.h
rename to source/libs/poppler/poppler-0.30.0/goo/gtypes_p.h
diff --git a/source/libs/poppler/poppler-0.29.0/gtk-doc.make b/source/libs/poppler/poppler-0.30.0/gtk-doc.make
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/gtk-doc.make
rename to source/libs/poppler/poppler-0.30.0/gtk-doc.make
diff --git a/source/libs/poppler/poppler-0.29.0/poppler-cairo-uninstalled.pc.in b/source/libs/poppler/poppler-0.30.0/poppler-cairo-uninstalled.pc.in
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler-cairo-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.30.0/poppler-cairo-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.29.0/poppler-cairo.pc.cmake b/source/libs/poppler/poppler-0.30.0/poppler-cairo.pc.cmake
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler-cairo.pc.cmake
rename to source/libs/poppler/poppler-0.30.0/poppler-cairo.pc.cmake
diff --git a/source/libs/poppler/poppler-0.29.0/poppler-cairo.pc.in b/source/libs/poppler/poppler-0.30.0/poppler-cairo.pc.in
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler-cairo.pc.in
rename to source/libs/poppler/poppler-0.30.0/poppler-cairo.pc.in
diff --git a/source/libs/poppler/poppler-0.29.0/poppler-cpp-uninstalled.pc.in b/source/libs/poppler/poppler-0.30.0/poppler-cpp-uninstalled.pc.in
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler-cpp-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.30.0/poppler-cpp-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.29.0/poppler-cpp.pc.cmake b/source/libs/poppler/poppler-0.30.0/poppler-cpp.pc.cmake
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler-cpp.pc.cmake
rename to source/libs/poppler/poppler-0.30.0/poppler-cpp.pc.cmake
diff --git a/source/libs/poppler/poppler-0.29.0/poppler-cpp.pc.in b/source/libs/poppler/poppler-0.30.0/poppler-cpp.pc.in
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler-cpp.pc.in
rename to source/libs/poppler/poppler-0.30.0/poppler-cpp.pc.in
diff --git a/source/libs/poppler/poppler-0.29.0/poppler-glib-uninstalled.pc.in b/source/libs/poppler/poppler-0.30.0/poppler-glib-uninstalled.pc.in
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler-glib-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.30.0/poppler-glib-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.29.0/poppler-glib.pc.cmake b/source/libs/poppler/poppler-0.30.0/poppler-glib.pc.cmake
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler-glib.pc.cmake
rename to source/libs/poppler/poppler-0.30.0/poppler-glib.pc.cmake
diff --git a/source/libs/poppler/poppler-0.29.0/poppler-glib.pc.in b/source/libs/poppler/poppler-0.30.0/poppler-glib.pc.in
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler-glib.pc.in
rename to source/libs/poppler/poppler-0.30.0/poppler-glib.pc.in
diff --git a/source/libs/poppler/poppler-0.29.0/poppler-qt4-uninstalled.pc.in b/source/libs/poppler/poppler-0.30.0/poppler-qt4-uninstalled.pc.in
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler-qt4-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.30.0/poppler-qt4-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.29.0/poppler-qt4.pc.cmake b/source/libs/poppler/poppler-0.30.0/poppler-qt4.pc.cmake
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler-qt4.pc.cmake
rename to source/libs/poppler/poppler-0.30.0/poppler-qt4.pc.cmake
diff --git a/source/libs/poppler/poppler-0.29.0/poppler-qt4.pc.in b/source/libs/poppler/poppler-0.30.0/poppler-qt4.pc.in
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler-qt4.pc.in
rename to source/libs/poppler/poppler-0.30.0/poppler-qt4.pc.in
diff --git a/source/libs/poppler/poppler-0.29.0/poppler-qt5-uninstalled.pc.in b/source/libs/poppler/poppler-0.30.0/poppler-qt5-uninstalled.pc.in
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler-qt5-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.30.0/poppler-qt5-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.29.0/poppler-qt5.pc.cmake b/source/libs/poppler/poppler-0.30.0/poppler-qt5.pc.cmake
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler-qt5.pc.cmake
rename to source/libs/poppler/poppler-0.30.0/poppler-qt5.pc.cmake
diff --git a/source/libs/poppler/poppler-0.29.0/poppler-qt5.pc.in b/source/libs/poppler/poppler-0.30.0/poppler-qt5.pc.in
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler-qt5.pc.in
rename to source/libs/poppler/poppler-0.30.0/poppler-qt5.pc.in
diff --git a/source/libs/poppler/poppler-0.29.0/poppler-splash-uninstalled.pc.in b/source/libs/poppler/poppler-0.30.0/poppler-splash-uninstalled.pc.in
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler-splash-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.30.0/poppler-splash-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.29.0/poppler-splash.pc.cmake b/source/libs/poppler/poppler-0.30.0/poppler-splash.pc.cmake
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler-splash.pc.cmake
rename to source/libs/poppler/poppler-0.30.0/poppler-splash.pc.cmake
diff --git a/source/libs/poppler/poppler-0.29.0/poppler-splash.pc.in b/source/libs/poppler/poppler-0.30.0/poppler-splash.pc.in
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler-splash.pc.in
rename to source/libs/poppler/poppler-0.30.0/poppler-splash.pc.in
diff --git a/source/libs/poppler/poppler-0.29.0/poppler-uninstalled.pc.in b/source/libs/poppler/poppler-0.30.0/poppler-uninstalled.pc.in
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.30.0/poppler-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.29.0/poppler.pc.cmake b/source/libs/poppler/poppler-0.30.0/poppler.pc.cmake
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler.pc.cmake
rename to source/libs/poppler/poppler-0.30.0/poppler.pc.cmake
diff --git a/source/libs/poppler/poppler-0.29.0/poppler.pc.in b/source/libs/poppler/poppler-0.30.0/poppler.pc.in
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler.pc.in
rename to source/libs/poppler/poppler-0.30.0/poppler.pc.in
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Annot.cc b/source/libs/poppler/poppler-0.30.0/poppler/Annot.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Annot.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/Annot.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Annot.h b/source/libs/poppler/poppler-0.30.0/poppler/Annot.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Annot.h
rename to source/libs/poppler/poppler-0.30.0/poppler/Annot.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Array.cc b/source/libs/poppler/poppler-0.30.0/poppler/Array.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Array.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/Array.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Array.h b/source/libs/poppler/poppler-0.30.0/poppler/Array.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Array.h
rename to source/libs/poppler/poppler-0.30.0/poppler/Array.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFont.cc b/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFont.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/BuiltinFont.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/BuiltinFont.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFont.h b/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFont.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/BuiltinFont.h
rename to source/libs/poppler/poppler-0.30.0/poppler/BuiltinFont.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFontTables.cc b/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFontTables.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/BuiltinFontTables.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/BuiltinFontTables.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFontTables.h b/source/libs/poppler/poppler-0.30.0/poppler/BuiltinFontTables.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/BuiltinFontTables.h
rename to source/libs/poppler/poppler-0.30.0/poppler/BuiltinFontTables.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/CMap.cc b/source/libs/poppler/poppler-0.30.0/poppler/CMap.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/CMap.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/CMap.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/CMap.h b/source/libs/poppler/poppler-0.30.0/poppler/CMap.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/CMap.h
rename to source/libs/poppler/poppler-0.30.0/poppler/CMap.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/CachedFile.cc b/source/libs/poppler/poppler-0.30.0/poppler/CachedFile.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/CachedFile.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/CachedFile.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/CachedFile.h b/source/libs/poppler/poppler-0.30.0/poppler/CachedFile.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/CachedFile.h
rename to source/libs/poppler/poppler-0.30.0/poppler/CachedFile.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/CairoFontEngine.cc b/source/libs/poppler/poppler-0.30.0/poppler/CairoFontEngine.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/CairoFontEngine.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/CairoFontEngine.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/CairoFontEngine.h b/source/libs/poppler/poppler-0.30.0/poppler/CairoFontEngine.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/CairoFontEngine.h
rename to source/libs/poppler/poppler-0.30.0/poppler/CairoFontEngine.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/CairoOutputDev.cc b/source/libs/poppler/poppler-0.30.0/poppler/CairoOutputDev.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/CairoOutputDev.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/CairoOutputDev.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/CairoOutputDev.h b/source/libs/poppler/poppler-0.30.0/poppler/CairoOutputDev.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/CairoOutputDev.h
rename to source/libs/poppler/poppler-0.30.0/poppler/CairoOutputDev.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/CairoRescaleBox.cc b/source/libs/poppler/poppler-0.30.0/poppler/CairoRescaleBox.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/CairoRescaleBox.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/CairoRescaleBox.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/CairoRescaleBox.h b/source/libs/poppler/poppler-0.30.0/poppler/CairoRescaleBox.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/CairoRescaleBox.h
rename to source/libs/poppler/poppler-0.30.0/poppler/CairoRescaleBox.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Catalog.cc b/source/libs/poppler/poppler-0.30.0/poppler/Catalog.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Catalog.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/Catalog.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Catalog.h b/source/libs/poppler/poppler-0.30.0/poppler/Catalog.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Catalog.h
rename to source/libs/poppler/poppler-0.30.0/poppler/Catalog.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/CharCodeToUnicode.cc b/source/libs/poppler/poppler-0.30.0/poppler/CharCodeToUnicode.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/CharCodeToUnicode.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/CharCodeToUnicode.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/CharCodeToUnicode.h b/source/libs/poppler/poppler-0.30.0/poppler/CharCodeToUnicode.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/CharCodeToUnicode.h
rename to source/libs/poppler/poppler-0.30.0/poppler/CharCodeToUnicode.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/CharTypes.h b/source/libs/poppler/poppler-0.30.0/poppler/CharTypes.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/CharTypes.h
rename to source/libs/poppler/poppler-0.30.0/poppler/CharTypes.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/CompactFontTables.h b/source/libs/poppler/poppler-0.30.0/poppler/CompactFontTables.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/CompactFontTables.h
rename to source/libs/poppler/poppler-0.30.0/poppler/CompactFontTables.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/CurlCachedFile.cc b/source/libs/poppler/poppler-0.30.0/poppler/CurlCachedFile.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/CurlCachedFile.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/CurlCachedFile.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/CurlCachedFile.h b/source/libs/poppler/poppler-0.30.0/poppler/CurlCachedFile.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/CurlCachedFile.h
rename to source/libs/poppler/poppler-0.30.0/poppler/CurlCachedFile.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/CurlPDFDocBuilder.cc b/source/libs/poppler/poppler-0.30.0/poppler/CurlPDFDocBuilder.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/CurlPDFDocBuilder.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/CurlPDFDocBuilder.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/CurlPDFDocBuilder.h b/source/libs/poppler/poppler-0.30.0/poppler/CurlPDFDocBuilder.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/CurlPDFDocBuilder.h
rename to source/libs/poppler/poppler-0.30.0/poppler/CurlPDFDocBuilder.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/DCTStream.cc b/source/libs/poppler/poppler-0.30.0/poppler/DCTStream.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/DCTStream.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/DCTStream.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/DCTStream.h b/source/libs/poppler/poppler-0.30.0/poppler/DCTStream.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/DCTStream.h
rename to source/libs/poppler/poppler-0.30.0/poppler/DCTStream.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/DateInfo.cc b/source/libs/poppler/poppler-0.30.0/poppler/DateInfo.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/DateInfo.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/DateInfo.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/DateInfo.h b/source/libs/poppler/poppler-0.30.0/poppler/DateInfo.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/DateInfo.h
rename to source/libs/poppler/poppler-0.30.0/poppler/DateInfo.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Decrypt.cc b/source/libs/poppler/poppler-0.30.0/poppler/Decrypt.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Decrypt.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/Decrypt.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Decrypt.h b/source/libs/poppler/poppler-0.30.0/poppler/Decrypt.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Decrypt.h
rename to source/libs/poppler/poppler-0.30.0/poppler/Decrypt.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Dict.cc b/source/libs/poppler/poppler-0.30.0/poppler/Dict.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Dict.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/Dict.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Dict.h b/source/libs/poppler/poppler-0.30.0/poppler/Dict.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Dict.h
rename to source/libs/poppler/poppler-0.30.0/poppler/Dict.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Error.cc b/source/libs/poppler/poppler-0.30.0/poppler/Error.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Error.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/Error.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Error.h b/source/libs/poppler/poppler-0.30.0/poppler/Error.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Error.h
rename to source/libs/poppler/poppler-0.30.0/poppler/Error.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/ErrorCodes.h b/source/libs/poppler/poppler-0.30.0/poppler/ErrorCodes.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/ErrorCodes.h
rename to source/libs/poppler/poppler-0.30.0/poppler/ErrorCodes.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/FileSpec.cc b/source/libs/poppler/poppler-0.30.0/poppler/FileSpec.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/FileSpec.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/FileSpec.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/FileSpec.h b/source/libs/poppler/poppler-0.30.0/poppler/FileSpec.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/FileSpec.h
rename to source/libs/poppler/poppler-0.30.0/poppler/FileSpec.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/FlateStream.cc b/source/libs/poppler/poppler-0.30.0/poppler/FlateStream.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/FlateStream.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/FlateStream.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/FlateStream.h b/source/libs/poppler/poppler-0.30.0/poppler/FlateStream.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/FlateStream.h
rename to source/libs/poppler/poppler-0.30.0/poppler/FlateStream.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/FontEncodingTables.cc b/source/libs/poppler/poppler-0.30.0/poppler/FontEncodingTables.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/FontEncodingTables.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/FontEncodingTables.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/FontEncodingTables.h b/source/libs/poppler/poppler-0.30.0/poppler/FontEncodingTables.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/FontEncodingTables.h
rename to source/libs/poppler/poppler-0.30.0/poppler/FontEncodingTables.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/FontInfo.cc b/source/libs/poppler/poppler-0.30.0/poppler/FontInfo.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/FontInfo.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/FontInfo.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/FontInfo.h b/source/libs/poppler/poppler-0.30.0/poppler/FontInfo.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/FontInfo.h
rename to source/libs/poppler/poppler-0.30.0/poppler/FontInfo.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Form.cc b/source/libs/poppler/poppler-0.30.0/poppler/Form.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Form.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/Form.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Form.h b/source/libs/poppler/poppler-0.30.0/poppler/Form.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Form.h
rename to source/libs/poppler/poppler-0.30.0/poppler/Form.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Function.cc b/source/libs/poppler/poppler-0.30.0/poppler/Function.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Function.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/Function.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Function.h b/source/libs/poppler/poppler-0.30.0/poppler/Function.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Function.h
rename to source/libs/poppler/poppler-0.30.0/poppler/Function.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Gfx.cc b/source/libs/poppler/poppler-0.30.0/poppler/Gfx.cc
old mode 100644
new mode 100755
similarity index 99%
rename from source/libs/poppler/poppler-0.29.0/poppler/Gfx.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/Gfx.cc
index 64a9d7ba3b47e35634ada369f541264aa5f5e489..6ad1b2c2884a02af7136268c8e2e6b04f6e779eb
--- a/source/libs/poppler/poppler-0.29.0/poppler/Gfx.cc
+++ b/source/libs/poppler/poppler-0.30.0/poppler/Gfx.cc
@@ -37,6 +37,7 @@
// Copyright (C) 2012 Even Rouault <even.rouault@mines-paris.org>
// Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
// Copyright (C) 2012 Lu Wang <coolwanglu@gmail.com>
+// Copyright (C) 2014 Jason Crain <jason@aquaticape.us>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -5277,6 +5278,7 @@ void Gfx::drawAnnot(Object *str, AnnotBorder *border, AnnotColor *aColor,
obj1.free();
} else {
obj1.free();
+ bboxObj.free();
error(errSyntaxError, getPos(), "Bad form bounding box value");
return;
}
@@ -5288,8 +5290,15 @@ void Gfx::drawAnnot(Object *str, AnnotBorder *border, AnnotColor *aColor,
if (matrixObj.isArray() && matrixObj.arrayGetLength() >= 6) {
for (i = 0; i < 6; ++i) {
matrixObj.arrayGet(i, &obj1);
- m[i] = obj1.getNum();
- obj1.free();
+ if (likely(obj1.isNum())) {
+ m[i] = obj1.getNum();
+ obj1.free();
+ } else {
+ obj1.free();
+ matrixObj.free();
+ error(errSyntaxError, getPos(), "Bad form matrix");
+ return;
+ }
}
} else {
m[0] = 1; m[1] = 0;
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Gfx.h b/source/libs/poppler/poppler-0.30.0/poppler/Gfx.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Gfx.h
rename to source/libs/poppler/poppler-0.30.0/poppler/Gfx.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/GfxFont.cc b/source/libs/poppler/poppler-0.30.0/poppler/GfxFont.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/GfxFont.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/GfxFont.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/GfxFont.h b/source/libs/poppler/poppler-0.30.0/poppler/GfxFont.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/GfxFont.h
rename to source/libs/poppler/poppler-0.30.0/poppler/GfxFont.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/GfxState.cc b/source/libs/poppler/poppler-0.30.0/poppler/GfxState.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/GfxState.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/GfxState.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/GfxState.h b/source/libs/poppler/poppler-0.30.0/poppler/GfxState.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/GfxState.h
rename to source/libs/poppler/poppler-0.30.0/poppler/GfxState.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/GfxState_helpers.h b/source/libs/poppler/poppler-0.30.0/poppler/GfxState_helpers.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/GfxState_helpers.h
rename to source/libs/poppler/poppler-0.30.0/poppler/GfxState_helpers.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/GlobalParams.cc b/source/libs/poppler/poppler-0.30.0/poppler/GlobalParams.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/GlobalParams.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/GlobalParams.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/GlobalParams.h b/source/libs/poppler/poppler-0.30.0/poppler/GlobalParams.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/GlobalParams.h
rename to source/libs/poppler/poppler-0.30.0/poppler/GlobalParams.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/GlobalParamsWin.cc b/source/libs/poppler/poppler-0.30.0/poppler/GlobalParamsWin.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/GlobalParamsWin.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/GlobalParamsWin.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Hints.cc b/source/libs/poppler/poppler-0.30.0/poppler/Hints.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Hints.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/Hints.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Hints.h b/source/libs/poppler/poppler-0.30.0/poppler/Hints.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Hints.h
rename to source/libs/poppler/poppler-0.30.0/poppler/Hints.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/JArithmeticDecoder.cc b/source/libs/poppler/poppler-0.30.0/poppler/JArithmeticDecoder.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/JArithmeticDecoder.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/JArithmeticDecoder.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/JArithmeticDecoder.h b/source/libs/poppler/poppler-0.30.0/poppler/JArithmeticDecoder.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/JArithmeticDecoder.h
rename to source/libs/poppler/poppler-0.30.0/poppler/JArithmeticDecoder.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/JBIG2Stream.cc b/source/libs/poppler/poppler-0.30.0/poppler/JBIG2Stream.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/JBIG2Stream.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/JBIG2Stream.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/JBIG2Stream.h b/source/libs/poppler/poppler-0.30.0/poppler/JBIG2Stream.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/JBIG2Stream.h
rename to source/libs/poppler/poppler-0.30.0/poppler/JBIG2Stream.h
diff --git a/source/libs/poppler/poppler-0.30.0/poppler/JPEG2000Stream.cc b/source/libs/poppler/poppler-0.30.0/poppler/JPEG2000Stream.cc
new file mode 100755
index 0000000000000000000000000000000000000000..2d48899904e5f656fdad5af1d9cb3717ea669192
--- /dev/null
+++ b/source/libs/poppler/poppler-0.30.0/poppler/JPEG2000Stream.cc
@@ -0,0 +1,445 @@
+//========================================================================
+//
+// JPEG2000Stream.cc
+//
+// A JPX stream decoder using OpenJPEG
+//
+// Copyright 2008-2010, 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright 2011 Daniel Glöckner <daniel-gl@gmx.net>
+// Copyright 2014 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright 2013,2014 Adrian Johnson <ajohnson@redneon.com>
+//
+// Licensed under GPLv2 or later
+//
+//========================================================================
+
+#include "config.h"
+#include "JPEG2000Stream.h"
+#include <openjpeg.h>
+
+#define OPENJPEG_VERSION_ENCODE(major, minor, micro) ( \
+ ((major) * 10000) \
+ + ((minor) * 100) \
+ + ((micro) * 1))
+
+#ifdef USE_OPENJPEG2
+#ifdef OPJ_VERSION_MAJOR
+#define OPENJPEG_VERSION OPENJPEG_VERSION_ENCODE(OPJ_VERSION_MAJOR, OPJ_VERSION_MINOR, OPJ_VERSION_BUILD)
+#else
+// OpenJPEG started providing version macros in version 2.1.
+// If the version macro is not found, set the version to 2.0.0 and
+// assume there will be no API changes in 2.0.x.
+#define OPENJPEG_VERSION OPENJPEG_VERSION_ENCODE(2, 0, 0)
+#endif
+#endif
+
+struct JPXStreamPrivate {
+ opj_image_t *image;
+ int counter;
+ int ccounter;
+ int npixels;
+ int ncomps;
+ GBool inited;
+#ifdef USE_OPENJPEG1
+ opj_dinfo_t *dinfo;
+ void init2(unsigned char *buf, int bufLen, OPJ_CODEC_FORMAT format);
+#endif
+#ifdef USE_OPENJPEG2
+ void init2(OPJ_CODEC_FORMAT format, unsigned char *data, int length);
+#endif
+};
+
+JPXStream::JPXStream(Stream *strA) : FilterStream(strA) {
+ priv = new JPXStreamPrivate;
+ priv->inited = gFalse;
+ priv->image = NULL;
+ priv->npixels = 0;
+ priv->ncomps = 0;
+#ifdef USE_OPENJPEG1
+ priv->dinfo = NULL;
+#endif
+}
+
+JPXStream::~JPXStream() {
+ delete str;
+ close();
+ delete priv;
+}
+
+void JPXStream::reset() {
+ priv->counter = 0;
+ priv->ccounter = 0;
+}
+
+void JPXStream::close() {
+ if (priv->image != NULL) {
+ opj_image_destroy(priv->image);
+ priv->image = NULL;
+ priv->npixels = 0;
+ }
+
+#ifdef USE_OPENJPEG1
+ if (priv->dinfo != NULL) {
+ opj_destroy_decompress(priv->dinfo);
+ priv->dinfo = NULL;
+ }
+#endif
+}
+
+Goffset JPXStream::getPos() {
+ return priv->counter * priv->ncomps + priv->ccounter;
+}
+
+int JPXStream::getChars(int nChars, Guchar *buffer) {
+ for (int i = 0; i < nChars; ++i) {
+ const int c = doGetChar();
+ if (likely(c != EOF)) buffer[i] = c;
+ else return i;
+ }
+ return nChars;
+}
+
+int JPXStream::getChar() {
+ return doGetChar();
+}
+
+int JPXStream::doLookChar() {
+ if (unlikely(priv->inited == gFalse))
+ init();
+
+ if (unlikely(priv->counter >= priv->npixels))
+ return EOF;
+
+ return ((unsigned char *)priv->image->comps[priv->ccounter].data)[priv->counter];
+}
+
+int JPXStream::lookChar() {
+ return doLookChar();
+}
+
+int JPXStream::doGetChar() {
+ int result = doLookChar();
+ if (++priv->ccounter == priv->ncomps) {
+ priv->ccounter = 0;
+ ++priv->counter;
+ }
+ return result;
+}
+
+GooString *JPXStream::getPSFilter(int psLevel, const char *indent) {
+ return NULL;
+}
+
+GBool JPXStream::isBinary(GBool last) {
+ return str->isBinary(gTrue);
+}
+
+void JPXStream::getImageParams(int *bitsPerComponent, StreamColorSpaceMode *csMode) {
+ if (priv->inited == gFalse)
+ init();
+
+ *bitsPerComponent = 8;
+ if (priv->image && priv->image->numcomps == 3)
+ *csMode = streamCSDeviceRGB;
+ else if (priv->image && priv->image->numcomps == 4)
+ *csMode = streamCSDeviceCMYK;
+ else
+ *csMode = streamCSDeviceGray;
+}
+
+
+static void libopenjpeg_error_callback(const char *msg, void * /*client_data*/) {
+ error(errSyntaxError, -1, "{0:s}", msg);
+}
+
+static void libopenjpeg_warning_callback(const char *msg, void * /*client_data*/) {
+ error(errSyntaxWarning, -1, "{0:s}", msg);
+}
+
+#ifdef USE_OPENJPEG1
+
+#define BUFFER_INITIAL_SIZE 4096
+
+void JPXStream::init()
+{
+ Object oLen;
+ if (getDict()) getDict()->lookup("Length", &oLen);
+
+ int bufSize = BUFFER_INITIAL_SIZE;
+ if (oLen.isInt()) bufSize = oLen.getInt();
+ oLen.free();
+
+ int length = 0;
+ unsigned char *buf = str->toUnsignedChars(&length, bufSize);
+ priv->init2(buf, length, CODEC_JP2);
+ free(buf);
+
+ if (priv->image) {
+ priv->npixels = priv->image->comps[0].w * priv->image->comps[0].h;
+ priv->ncomps = priv->image->numcomps;
+ for (int component = 0; component < priv->ncomps; component++) {
+ if (priv->image->comps[component].data == NULL) {
+ close();
+ break;
+ }
+ unsigned char *cdata = (unsigned char *)priv->image->comps[component].data;
+ int adjust = 0;
+ if (priv->image->comps[component].prec > 8)
+ adjust = priv->image->comps[component].prec - 8;
+ int sgndcorr = 0;
+ if (priv->image->comps[component].sgnd)
+ sgndcorr = 1 << (priv->image->comps[0].prec - 1);
+ for (int i = 0; i < priv->npixels; i++) {
+ int r = priv->image->comps[component].data[i];
+ r += sgndcorr;
+ if (adjust) {
+ r = (r >> adjust)+((r >> (adjust-1))%2);
+ if (unlikely(r > 255))
+ r = 255;
+ }
+ *(cdata++) = r;
+ }
+ }
+ } else
+ priv->npixels = 0;
+
+ priv->counter = 0;
+ priv->ccounter = 0;
+ priv->inited = gTrue;
+}
+
+void JPXStreamPrivate::init2(unsigned char *buf, int bufLen, OPJ_CODEC_FORMAT format)
+{
+ opj_cio_t *cio = NULL;
+
+ /* Use default decompression parameters */
+ opj_dparameters_t parameters;
+ opj_set_default_decoder_parameters(¶meters);
+#ifdef WITH_OPENJPEG_IGNORE_PCLR_CMAP_CDEF_FLAG
+ parameters.flags = OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG;
+#endif
+
+ /* Configure the event manager to receive errors and warnings */
+ opj_event_mgr_t event_mgr;
+ memset(&event_mgr, 0, sizeof(opj_event_mgr_t));
+ event_mgr.error_handler = libopenjpeg_error_callback;
+ event_mgr.warning_handler = libopenjpeg_warning_callback;
+
+ /* Get the decoder handle of the format */
+ dinfo = opj_create_decompress(format);
+ if (dinfo == NULL) goto error;
+ /* Catch events using our callbacks */
+ opj_set_event_mgr((opj_common_ptr)dinfo, &event_mgr, NULL);
+
+ /* Setup the decoder decoding parameters */
+ opj_setup_decoder(dinfo, ¶meters);
+
+ /* Open a byte stream */
+ cio = opj_cio_open((opj_common_ptr)dinfo, buf, bufLen);
+ if (cio == NULL) goto error;
+
+ /* Decode the stream and fill the image structure */
+ image = opj_decode(dinfo, cio);
+
+ /* Close the byte stream */
+ opj_cio_close(cio);
+
+ if (image == NULL) goto error;
+ else return;
+
+error:
+ if (format == CODEC_JP2) {
+ error(errSyntaxWarning, -1, "Did no succeed opening JPX Stream as JP2, trying as J2K.");
+ init2(buf, bufLen, CODEC_J2K);
+ } else if (format == CODEC_J2K) {
+ error(errSyntaxWarning, -1, "Did no succeed opening JPX Stream as J2K, trying as JPT.");
+ init2(buf, bufLen, CODEC_JPT);
+ } else {
+ error(errSyntaxError, -1, "Did no succeed opening JPX Stream.");
+ }
+}
+#endif
+
+
+#ifdef USE_OPENJPEG2
+typedef struct JPXData_s
+{
+ unsigned char *data;
+ int size;
+ int pos;
+} JPXData;
+
+#define BUFFER_INITIAL_SIZE 4096
+
+static OPJ_SIZE_T jpxRead_callback(void * p_buffer, OPJ_SIZE_T p_nb_bytes, void * p_user_data)
+{
+ JPXData *jpxData = (JPXData *)p_user_data;
+ int len;
+
+ len = jpxData->size - jpxData->pos;
+ if (len < 0)
+ len = 0;
+ if (len == 0)
+ return (OPJ_SIZE_T)-1; /* End of file! */
+ if ((OPJ_SIZE_T)len > p_nb_bytes)
+ len = p_nb_bytes;
+ memcpy(p_buffer, jpxData->data + jpxData->pos, len);
+ jpxData->pos += len;
+ return len;
+}
+
+static OPJ_OFF_T jpxSkip_callback(OPJ_OFF_T skip, void * p_user_data)
+{
+ JPXData *jpxData = (JPXData *)p_user_data;
+
+ jpxData->pos += (skip > jpxData->size - jpxData->pos) ? jpxData->size - jpxData->pos : skip;
+ /* Always return input value to avoid "Problem with skipping JPEG2000 box, stream error" */
+ return skip;
+}
+
+static OPJ_BOOL jpxSeek_callback(OPJ_OFF_T seek_pos, void * p_user_data)
+{
+ JPXData *jpxData = (JPXData *)p_user_data;
+
+ if (seek_pos > jpxData->size)
+ return OPJ_FALSE;
+ jpxData->pos = seek_pos;
+ return OPJ_TRUE;
+}
+
+void JPXStream::init()
+{
+ Object oLen;
+ if (getDict()) getDict()->lookup("Length", &oLen);
+
+ int bufSize = BUFFER_INITIAL_SIZE;
+ if (oLen.isInt()) bufSize = oLen.getInt();
+ oLen.free();
+
+ int length = 0;
+ unsigned char *buf = str->toUnsignedChars(&length, bufSize);
+ priv->init2(OPJ_CODEC_JP2, buf, length);
+ gfree(buf);
+
+ if (priv->image) {
+ priv->npixels = priv->image->comps[0].w * priv->image->comps[0].h;
+ priv->ncomps = priv->image->numcomps;
+ for (int component = 0; component < priv->ncomps; component++) {
+ if (priv->image->comps[component].data == NULL) {
+ close();
+ break;
+ }
+ unsigned char *cdata = (unsigned char *)priv->image->comps[component].data;
+ int adjust = 0;
+ if (priv->image->comps[component].prec > 8)
+ adjust = priv->image->comps[component].prec - 8;
+ int sgndcorr = 0;
+ if (priv->image->comps[component].sgnd)
+ sgndcorr = 1 << (priv->image->comps[0].prec - 1);
+ for (int i = 0; i < priv->npixels; i++) {
+ int r = priv->image->comps[component].data[i];
+ r += sgndcorr;
+ if (adjust) {
+ r = (r >> adjust)+((r >> (adjust-1))%2);
+ if (unlikely(r > 255))
+ r = 255;
+ }
+ *(cdata++) = r;
+ }
+ }
+ } else {
+ priv->npixels = 0;
+ }
+
+ priv->counter = 0;
+ priv->ccounter = 0;
+ priv->inited = gTrue;
+}
+
+void JPXStreamPrivate::init2(OPJ_CODEC_FORMAT format, unsigned char *buf, int length)
+{
+ JPXData jpxData;
+
+ jpxData.data = buf;
+ jpxData.pos = 0;
+ jpxData.size = length;
+
+ opj_stream_t *stream;
+
+ stream = opj_stream_default_create(OPJ_TRUE);
+
+#if OPENJPEG_VERSION >= OPENJPEG_VERSION_ENCODE(2, 1, 0)
+ opj_stream_set_user_data (stream, &jpxData, NULL);
+#else
+ opj_stream_set_user_data (stream, &jpxData);
+#endif
+
+ opj_stream_set_read_function(stream, jpxRead_callback);
+ opj_stream_set_skip_function(stream, jpxSkip_callback);
+ opj_stream_set_seek_function(stream, jpxSeek_callback);
+ /* Set the length to avoid an assert */
+ opj_stream_set_user_data_length(stream, length);
+
+ opj_codec_t *decoder;
+
+ /* Use default decompression parameters */
+ opj_dparameters_t parameters;
+ opj_set_default_decoder_parameters(¶meters);
+ parameters.flags |= OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG;
+
+ /* Get the decoder handle of the format */
+ decoder = opj_create_decompress(format);
+ if (decoder == NULL) {
+ error(errSyntaxWarning, -1, "Unable to create decoder");
+ goto error;
+ }
+
+ /* Catch events using our callbacks */
+ opj_set_warning_handler(decoder, libopenjpeg_warning_callback, NULL);
+ opj_set_error_handler(decoder, libopenjpeg_error_callback, NULL);
+
+ /* Setup the decoder decoding parameters */
+ if (!opj_setup_decoder(decoder, ¶meters)) {
+ error(errSyntaxWarning, -1, "Unable to set decoder parameters");
+ goto error;
+ }
+
+ /* Decode the stream and fill the image structure */
+ image = NULL;
+ if (!opj_read_header(stream, decoder, &image)) {
+ error(errSyntaxWarning, -1, "Unable to read header");
+ goto error;
+ }
+
+ /* Optional if you want decode the entire image */
+ if (!opj_set_decode_area(decoder, image, parameters.DA_x0,
+ parameters.DA_y0, parameters.DA_x1, parameters.DA_y1)){
+ error(errSyntaxWarning, -1, "X2");
+ goto error;
+ }
+
+ /* Get the decoded image */
+ if (!(opj_decode(decoder, stream, image) && opj_end_decompress(decoder, stream))) {
+ error(errSyntaxWarning, -1, "Unable to decode image");
+ goto error;
+ }
+
+ opj_destroy_codec(decoder);
+ opj_stream_destroy(stream);
+
+ if (image != NULL)
+ return;
+
+error:
+ opj_destroy_codec(decoder);
+ if (format == OPJ_CODEC_JP2) {
+ error(errSyntaxWarning, -1, "Did no succeed opening JPX Stream as JP2, trying as J2K.");
+ init2(OPJ_CODEC_J2K, buf, length);
+ } else if (format == OPJ_CODEC_J2K) {
+ error(errSyntaxWarning, -1, "Did no succeed opening JPX Stream as J2K, trying as JPT.");
+ init2(OPJ_CODEC_JPT, buf, length);
+ } else {
+ error(errSyntaxError, -1, "Did no succeed opening JPX Stream.");
+ }
+}
+#endif
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/JPEG2000Stream.h b/source/libs/poppler/poppler-0.30.0/poppler/JPEG2000Stream.h
old mode 100644
new mode 100755
similarity index 64%
rename from source/libs/poppler/poppler-0.29.0/poppler/JPEG2000Stream.h
rename to source/libs/poppler/poppler-0.30.0/poppler/JPEG2000Stream.h
index 3feccbef06d16d4dd06f4e9cf9ad1e9667f89cb7..50b758608dc6b29115b3e6f2c66c29f856f2ed2b
--- a/source/libs/poppler/poppler-0.29.0/poppler/JPEG2000Stream.h
+++ b/source/libs/poppler/poppler-0.30.0/poppler/JPEG2000Stream.h
@@ -6,7 +6,7 @@
//
// Copyright 2008, 2010 Albert Astals Cid <aacid@kde.org>
// Copyright 2011 Daniel Glöckner <daniel-gl@gmx.net>
-// Copyright 2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright 2013,2014 Adrian Johnson <ajohnson@redneon.com>
//
// Licensed under GPLv2 or later
//
@@ -16,12 +16,13 @@
#ifndef JPEG2000STREAM_H
#define JPEG2000STREAM_H
-#include <openjpeg.h>
-
+#include "config.h"
#include "goo/gtypes.h"
#include "Object.h"
#include "Stream.h"
+struct JPXStreamPrivate;
+
class JPXStream: public FilterStream {
public:
@@ -37,37 +38,21 @@ public:
virtual GBool isBinary(GBool last = gTrue);
virtual void getImageParams(int *bitsPerComponent, StreamColorSpaceMode *csMode);
+ int readStream(int nChars, Guchar *buffer) {
+ return str->doGetChars(nChars, buffer);
+ }
private:
- void init();
- void init2(unsigned char *buf, int bufLen, OPJ_CODEC_FORMAT format);
+ JPXStream(const JPXStream &other);
+ JPXStream& operator=(const JPXStream &other);
+ JPXStreamPrivate *priv;
+ void init();
virtual GBool hasGetChars() { return true; }
virtual int getChars(int nChars, Guchar *buffer);
- inline int doGetChar() {
- int result = doLookChar();
- if (++ccounter == ncomps) {
- ccounter = 0;
- ++counter;
- }
- return result;
- }
-
- inline int doLookChar() {
- if (unlikely(inited == gFalse)) init();
-
- if (unlikely(counter >= npixels)) return EOF;
-
- return ((unsigned char *)image->comps[ccounter].data)[counter];
- }
+ int doGetChar();
- opj_image_t *image;
- opj_dinfo_t *dinfo;
- int counter;
- int ccounter;
- int npixels;
- int ncomps;
- GBool inited;
+ int doLookChar();
};
#endif
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/JPXStream.cc b/source/libs/poppler/poppler-0.30.0/poppler/JPXStream.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/JPXStream.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/JPXStream.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/JPXStream.h b/source/libs/poppler/poppler-0.30.0/poppler/JPXStream.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/JPXStream.h
rename to source/libs/poppler/poppler-0.30.0/poppler/JPXStream.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Lexer.cc b/source/libs/poppler/poppler-0.30.0/poppler/Lexer.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Lexer.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/Lexer.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Lexer.h b/source/libs/poppler/poppler-0.30.0/poppler/Lexer.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Lexer.h
rename to source/libs/poppler/poppler-0.30.0/poppler/Lexer.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Linearization.cc b/source/libs/poppler/poppler-0.30.0/poppler/Linearization.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Linearization.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/Linearization.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Linearization.h b/source/libs/poppler/poppler-0.30.0/poppler/Linearization.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Linearization.h
rename to source/libs/poppler/poppler-0.30.0/poppler/Linearization.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Link.cc b/source/libs/poppler/poppler-0.30.0/poppler/Link.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Link.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/Link.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Link.h b/source/libs/poppler/poppler-0.30.0/poppler/Link.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Link.h
rename to source/libs/poppler/poppler-0.30.0/poppler/Link.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/LocalPDFDocBuilder.cc b/source/libs/poppler/poppler-0.30.0/poppler/LocalPDFDocBuilder.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/LocalPDFDocBuilder.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/LocalPDFDocBuilder.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/LocalPDFDocBuilder.h b/source/libs/poppler/poppler-0.30.0/poppler/LocalPDFDocBuilder.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/LocalPDFDocBuilder.h
rename to source/libs/poppler/poppler-0.30.0/poppler/LocalPDFDocBuilder.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Makefile.am b/source/libs/poppler/poppler-0.30.0/poppler/Makefile.am
old mode 100644
new mode 100755
similarity index 99%
rename from source/libs/poppler/poppler-0.29.0/poppler/Makefile.am
rename to source/libs/poppler/poppler-0.30.0/poppler/Makefile.am
index 01fe01e585d316a55f74609aa9a0c7ee3a254d4e..e0c98d805e8bd4acb258ba266f4d177f641446cd
--- a/source/libs/poppler/poppler-0.29.0/poppler/Makefile.am
+++ b/source/libs/poppler/poppler-0.30.0/poppler/Makefile.am
@@ -296,7 +296,7 @@ libpoppler_la_LIBADD = \
$(win32_libs)
libpoppler_la_LDFLAGS = \
- -version-info 48:0:0 \
+ -version-info 49:0:0 \
@create_shared_lib@ \
@auto_import_flags@
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/MarkedContentOutputDev.cc b/source/libs/poppler/poppler-0.30.0/poppler/MarkedContentOutputDev.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/MarkedContentOutputDev.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/MarkedContentOutputDev.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/MarkedContentOutputDev.h b/source/libs/poppler/poppler-0.30.0/poppler/MarkedContentOutputDev.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/MarkedContentOutputDev.h
rename to source/libs/poppler/poppler-0.30.0/poppler/MarkedContentOutputDev.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Movie.cc b/source/libs/poppler/poppler-0.30.0/poppler/Movie.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Movie.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/Movie.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Movie.h b/source/libs/poppler/poppler-0.30.0/poppler/Movie.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Movie.h
rename to source/libs/poppler/poppler-0.30.0/poppler/Movie.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/NameToCharCode.cc b/source/libs/poppler/poppler-0.30.0/poppler/NameToCharCode.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/NameToCharCode.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/NameToCharCode.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/NameToCharCode.h b/source/libs/poppler/poppler-0.30.0/poppler/NameToCharCode.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/NameToCharCode.h
rename to source/libs/poppler/poppler-0.30.0/poppler/NameToCharCode.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/NameToUnicodeTable.h b/source/libs/poppler/poppler-0.30.0/poppler/NameToUnicodeTable.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/NameToUnicodeTable.h
rename to source/libs/poppler/poppler-0.30.0/poppler/NameToUnicodeTable.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Object.cc b/source/libs/poppler/poppler-0.30.0/poppler/Object.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Object.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/Object.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Object.h b/source/libs/poppler/poppler-0.30.0/poppler/Object.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Object.h
rename to source/libs/poppler/poppler-0.30.0/poppler/Object.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/OptionalContent.cc b/source/libs/poppler/poppler-0.30.0/poppler/OptionalContent.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/OptionalContent.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/OptionalContent.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/OptionalContent.h b/source/libs/poppler/poppler-0.30.0/poppler/OptionalContent.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/OptionalContent.h
rename to source/libs/poppler/poppler-0.30.0/poppler/OptionalContent.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Outline.cc b/source/libs/poppler/poppler-0.30.0/poppler/Outline.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Outline.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/Outline.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Outline.h b/source/libs/poppler/poppler-0.30.0/poppler/Outline.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Outline.h
rename to source/libs/poppler/poppler-0.30.0/poppler/Outline.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/OutputDev.cc b/source/libs/poppler/poppler-0.30.0/poppler/OutputDev.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/OutputDev.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/OutputDev.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/OutputDev.h b/source/libs/poppler/poppler-0.30.0/poppler/OutputDev.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/OutputDev.h
rename to source/libs/poppler/poppler-0.30.0/poppler/OutputDev.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/PDFDoc.cc b/source/libs/poppler/poppler-0.30.0/poppler/PDFDoc.cc
old mode 100644
new mode 100755
similarity index 98%
rename from source/libs/poppler/poppler-0.29.0/poppler/PDFDoc.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/PDFDoc.cc
index ec8d3df18d8548963c20865899bf099033a33f47..71a1efe269d2e6f3b90b63b5c7e43ee3281fda08
--- a/source/libs/poppler/poppler-0.29.0/poppler/PDFDoc.cc
+++ b/source/libs/poppler/poppler-0.30.0/poppler/PDFDoc.cc
@@ -31,6 +31,7 @@
// Copyright (C) 2013, 2014 Adrian Johnson <ajohnson@redneon.com>
// Copyright (C) 2013 Adam Reichold <adamreichold@myopera.com>
// Copyright (C) 2014 Bogdan Cristea <cristeab@gmail.com>
+// Copyright (C) 2015 Li Junling <lijunling@sina.com>
//
// To see a description of the changes please see the Changelog file that
// came with your tarball or type make ChangeLog if you are building from git
@@ -1820,27 +1821,33 @@ Goffset PDFDoc::getStartXRef(GBool tryingToReconstruct)
int c, n, i;
// read last xrefSearchSize bytes
- str->setPos(xrefSearchSize, -1);
- for (n = 0; n < xrefSearchSize; ++n) {
- if ((c = str->getChar()) == EOF) {
- break;
+ int segnum = 0;
+ int maxXRefSearch = 24576;
+ if (str->getLength() < maxXRefSearch) maxXRefSearch = str->getLength();
+ for (; (xrefSearchSize - 16) * segnum < maxXRefSearch; segnum++) {
+ str->setPos((xrefSearchSize - 16) * segnum + xrefSearchSize, -1);
+ for (n = 0; n < xrefSearchSize; ++n) {
+ if ((c = str->getChar()) == EOF) {
+ break;
+ }
+ buf[n] = c;
}
- buf[n] = c;
- }
- buf[n] = '\0';
+ buf[n] = '\0';
- // find startxref
- for (i = n - 9; i >= 0; --i) {
- if (!strncmp(&buf[i], "startxref", 9)) {
+ // find startxref
+ for (i = n - 9; i >= 0; --i) {
+ if (!strncmp(&buf[i], "startxref", 9)) {
+ break;
+ }
+ }
+ if (i < 0) {
+ startXRefPos = 0;
+ } else {
+ for (p = &buf[i + 9]; isspace(*p); ++p);
+ startXRefPos = strToLongLong(p);
break;
}
}
- if (i < 0) {
- startXRefPos = 0;
- } else {
- for (p = &buf[i+9]; isspace(*p); ++p) ;
- startXRefPos = strToLongLong(p);
- }
}
}
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/PDFDoc.h b/source/libs/poppler/poppler-0.30.0/poppler/PDFDoc.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/PDFDoc.h
rename to source/libs/poppler/poppler-0.30.0/poppler/PDFDoc.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/PDFDocBuilder.h b/source/libs/poppler/poppler-0.30.0/poppler/PDFDocBuilder.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/PDFDocBuilder.h
rename to source/libs/poppler/poppler-0.30.0/poppler/PDFDocBuilder.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/PDFDocEncoding.cc b/source/libs/poppler/poppler-0.30.0/poppler/PDFDocEncoding.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/PDFDocEncoding.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/PDFDocEncoding.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/PDFDocEncoding.h b/source/libs/poppler/poppler-0.30.0/poppler/PDFDocEncoding.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/PDFDocEncoding.h
rename to source/libs/poppler/poppler-0.30.0/poppler/PDFDocEncoding.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/PDFDocFactory.cc b/source/libs/poppler/poppler-0.30.0/poppler/PDFDocFactory.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/PDFDocFactory.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/PDFDocFactory.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/PDFDocFactory.h b/source/libs/poppler/poppler-0.30.0/poppler/PDFDocFactory.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/PDFDocFactory.h
rename to source/libs/poppler/poppler-0.30.0/poppler/PDFDocFactory.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/PSOutputDev.cc b/source/libs/poppler/poppler-0.30.0/poppler/PSOutputDev.cc
old mode 100644
new mode 100755
similarity index 99%
rename from source/libs/poppler/poppler-0.29.0/poppler/PSOutputDev.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/PSOutputDev.cc
index 149bb620df200f62845009b081bf6ff8ba5287b0..b95df31066f0f4efc0ea77791535522c1990d466
--- a/source/libs/poppler/poppler-0.29.0/poppler/PSOutputDev.cc
+++ b/source/libs/poppler/poppler-0.30.0/poppler/PSOutputDev.cc
@@ -15,7 +15,7 @@
//
// Copyright (C) 2005 Martin Kretzschmar <martink@gnome.org>
// Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2006-2009, 2011-2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006-2009, 2011-2013, 2015 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2006 Jeff Muizelaar <jeff@infidigm.net>
// Copyright (C) 2007, 2008 Brad Hards <bradh@kde.org>
// Copyright (C) 2008, 2009 Koji Otani <sho@bbr.jp>
@@ -1074,7 +1074,7 @@ static void outputToFile(void *stream, const char *data, int len) {
PSOutputDev::PSOutputDev(const char *fileName, PDFDoc *doc,
char *psTitle,
- int firstPage, int lastPage, PSOutMode modeA,
+ const std::vector<int> &pages, PSOutMode modeA,
int paperWidthA, int paperHeightA,
GBool noCropA, GBool duplexA,
int imgLLXA, int imgLLYA, int imgURXA, int imgURYA,
@@ -1136,7 +1136,7 @@ PSOutputDev::PSOutputDev(const char *fileName, PDFDoc *doc,
}
init(outputToFile, f, fileTypeA, psTitle,
- doc, firstPage, lastPage, modeA,
+ doc, pages, modeA,
imgLLXA, imgLLYA, imgURXA, imgURYA, manualCtrlA,
paperWidthA, paperHeightA, noCropA, duplexA);
}
@@ -1144,7 +1144,7 @@ PSOutputDev::PSOutputDev(const char *fileName, PDFDoc *doc,
PSOutputDev::PSOutputDev(PSOutputFunc outputFuncA, void *outputStreamA,
char *psTitle,
PDFDoc *doc,
- int firstPage, int lastPage, PSOutMode modeA,
+ const std::vector<int> &pages, PSOutMode modeA,
int paperWidthA, int paperHeightA,
GBool noCropA, GBool duplexA,
int imgLLXA, int imgLLYA, int imgURXA, int imgURYA,
@@ -1174,7 +1174,7 @@ PSOutputDev::PSOutputDev(PSOutputFunc outputFuncA, void *outputStreamA,
forceRasterize = forceRasterizeA;
init(outputFuncA, outputStreamA, psGeneric, psTitle,
- doc, firstPage, lastPage, modeA,
+ doc, pages, modeA,
imgLLXA, imgLLYA, imgURXA, imgURYA, manualCtrlA,
paperWidthA, paperHeightA, noCropA, duplexA);
}
@@ -1214,7 +1214,7 @@ static bool pageDimensionEqual(int a, int b) {
void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
PSFileType fileTypeA, char *pstitle, PDFDoc *docA,
- int firstPage, int lastPage, PSOutMode modeA,
+ const std::vector<int> &pagesA, PSOutMode modeA,
int imgLLXA, int imgLLYA, int imgURXA, int imgURYA,
GBool manualCtrlA, int paperWidthA, int paperHeightA,
GBool noCropA, GBool duplexA) {
@@ -1222,7 +1222,12 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
PDFRectangle *box;
PSOutPaperSize *size;
GooList *names;
- int pg, w, h, i;
+ int w, h, i;
+
+ if (pagesA.empty()) {
+ ok = gFalse;
+ return;
+ }
// initialize
displayText = gTrue;
@@ -1249,9 +1254,8 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
}
Page *page;
paperSizes = new GooList();
- for (pg = (firstPage >= 1) ? firstPage : 1;
- pg <= lastPage && pg <= catalog->getNumPages();
- ++pg) {
+ for (size_t pgi = 0; pgi < pagesA.size(); ++pgi) {
+ const int pg = pagesA[pgi];
page = catalog->getPage(pg);
if (page == NULL)
paperMatch = gFalse;
@@ -1313,8 +1317,11 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
imgURY = paperHeight;
}
manualCtrl = manualCtrlA;
+ std::vector<int> pages;
if (mode == psModeForm) {
- lastPage = firstPage;
+ pages.push_back(pagesA[0]);
+ } else {
+ pages = pagesA;
}
processColors = 0;
inType3Char = gFalse;
@@ -1367,16 +1374,16 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
if (!manualCtrl) {
Page *page;
// this check is needed in case the document has zero pages
- if ((page = doc->getPage(firstPage))) {
- writeHeader(firstPage, lastPage,
+ if ((page = doc->getPage(pages[0]))) {
+ writeHeader(pages,
page->getMediaBox(),
page->getCropBox(),
page->getRotate(),
pstitle);
} else {
- error(errSyntaxError, -1, "Invalid page {0:d}", firstPage);
+ error(errSyntaxError, -1, "Invalid page {0:d}", pages[0]);
box = new PDFRectangle(0, 0, 1, 1);
- writeHeader(firstPage, lastPage, box, box, 0, pstitle);
+ writeHeader(pages, box, box, 0, pstitle);
delete box;
}
if (mode != psModeForm) {
@@ -1387,7 +1394,7 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
writePS("%%EndProlog\n");
writePS("%%BeginSetup\n");
}
- writeDocSetup(doc, catalog, firstPage, lastPage, duplexA);
+ writeDocSetup(doc, catalog, pages, duplexA);
if (mode != psModeForm) {
writePS("%%EndSetup\n");
}
@@ -1463,7 +1470,7 @@ PSOutputDev::~PSOutputDev() {
}
}
-void PSOutputDev::writeHeader(int firstPage, int lastPage,
+void PSOutputDev::writeHeader(const std::vector<int> &pages,
PDFRectangle *mediaBox, PDFRectangle *cropBox,
int pageRotate, char *psTitle) {
Object info, obj1;
@@ -1520,7 +1527,7 @@ void PSOutputDev::writeHeader(int firstPage, int lastPage,
i==0 ? "DocumentMedia:" : "+", size->name, size->w, size->h);
}
writePSFmt("%%BoundingBox: 0 0 {0:d} {1:d}\n", paperWidth, paperHeight);
- writePSFmt("%%Pages: {0:d}\n", lastPage - firstPage + 1);
+ writePSFmt("%%Pages: {0:d}\n", static_cast<int>(pages.size()));
writePS("%%EndComments\n");
if (!paperMatch) {
size = (PSOutPaperSize *)paperSizes->get(0);
@@ -1603,7 +1610,7 @@ void PSOutputDev::writeXpdfProcset() {
}
void PSOutputDev::writeDocSetup(PDFDoc *doc, Catalog *catalog,
- int firstPage, int lastPage,
+ const std::vector<int> &pages,
GBool duplexA) {
Page *page;
Dict *resDict;
@@ -1611,7 +1618,7 @@ void PSOutputDev::writeDocSetup(PDFDoc *doc, Catalog *catalog,
Object *acroForm;
Object obj1, obj2, obj3;
GooString *s;
- int pg, i;
+ int i;
if (mode == psModeForm) {
// swap the form and xpdf dicts
@@ -1619,7 +1626,8 @@ void PSOutputDev::writeDocSetup(PDFDoc *doc, Catalog *catalog,
} else {
writePS("xpdf begin\n");
}
- for (pg = firstPage; pg <= lastPage; ++pg) {
+ for (size_t pgi = 0; pgi < pages.size(); ++pgi) {
+ const int pg = pages[pgi];
page = doc->getPage(pg);
if (!page) {
error(errSyntaxError, -1, "Failed writing resources for page {0:d}", pg);
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/PSOutputDev.h b/source/libs/poppler/poppler-0.30.0/poppler/PSOutputDev.h
old mode 100644
new mode 100755
similarity index 97%
rename from source/libs/poppler/poppler-0.29.0/poppler/PSOutputDev.h
rename to source/libs/poppler/poppler-0.30.0/poppler/PSOutputDev.h
index f30204deeb59f0b50a93d42c7caf25fca0c3bbe6..262ce14caabac4afbdb5c3191c198068f94175f0
--- a/source/libs/poppler/poppler-0.29.0/poppler/PSOutputDev.h
+++ b/source/libs/poppler/poppler-0.30.0/poppler/PSOutputDev.h
@@ -15,7 +15,7 @@
//
// Copyright (C) 2005 Martin Kretzschmar <martink@gnome.org>
// Copyright (C) 2005 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2006-2008, 2012, 2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2006-2008, 2012, 2013, 2015 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2007 Brad Hards <bradh@kde.org>
// Copyright (C) 2009-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2009 Till Kamppeter <till.kamppeter@gmail.com>
@@ -93,9 +93,10 @@ class PSOutputDev: public OutputDev {
public:
// Open a PostScript output file, and write the prolog.
+ // pages has to be sorted in increasing order
PSOutputDev(const char *fileName, PDFDoc *docA,
char *psTitle,
- int firstPage, int lastPage, PSOutMode modeA,
+ const std::vector<int> &pages, PSOutMode modeA,
int paperWidthA = -1, int paperHeightA = -1,
GBool noCrop = gFalse,
GBool duplexA = gTrue,
@@ -107,10 +108,11 @@ public:
void *customCodeCbkDataA = NULL);
// Open a PSOutputDev that will write to a generic stream.
+ // pages has to be sorted in increasing order
PSOutputDev(PSOutputFunc outputFuncA, void *outputStreamA,
char *psTitle,
PDFDoc *docA,
- int firstPage, int lastPage, PSOutMode modeA,
+ const std::vector<int> &pages, PSOutMode modeA,
int paperWidthA = -1, int paperHeightA = -1,
GBool noCrop = gFalse,
GBool duplexA = gTrue,
@@ -160,7 +162,7 @@ public:
//----- header/trailer (used only if manualCtrl is true)
// Write the document-level header.
- void writeHeader(int firstPage, int lastPage,
+ void writeHeader(const std::vector<int> &pages,
PDFRectangle *mediaBox, PDFRectangle *cropBox,
int pageRotate, char *pstitle);
@@ -310,7 +312,7 @@ private:
void init(PSOutputFunc outputFuncA, void *outputStreamA,
PSFileType fileTypeA, char *pstitle, PDFDoc *doc,
- int firstPage, int lastPage, PSOutMode modeA,
+ const std::vector<int> &pages, PSOutMode modeA,
int imgLLXA, int imgLLYA, int imgURXA, int imgURYA,
GBool manualCtrlA, int paperWidthA, int paperHeightA,
GBool noCropA, GBool duplexA);
@@ -386,7 +388,7 @@ private:
GooString *filterPSName(GooString *name);
// Write the document-level setup.
- void writeDocSetup(PDFDoc *doc, Catalog *catalog, int firstPage, int lastPage, GBool duplexA);
+ void writeDocSetup(PDFDoc *doc, Catalog *catalog, const std::vector<int> &pages, GBool duplexA);
void writePSChar(char c);
void writePS(const char *s);
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/PSTokenizer.cc b/source/libs/poppler/poppler-0.30.0/poppler/PSTokenizer.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/PSTokenizer.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/PSTokenizer.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/PSTokenizer.h b/source/libs/poppler/poppler-0.30.0/poppler/PSTokenizer.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/PSTokenizer.h
rename to source/libs/poppler/poppler-0.30.0/poppler/PSTokenizer.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Page.cc b/source/libs/poppler/poppler-0.30.0/poppler/Page.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Page.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/Page.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Page.h b/source/libs/poppler/poppler-0.30.0/poppler/Page.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Page.h
rename to source/libs/poppler/poppler-0.30.0/poppler/Page.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo.cc b/source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo.h b/source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo.h
rename to source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo_p.h b/source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo_p.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo_p.h
rename to source/libs/poppler/poppler-0.30.0/poppler/PageLabelInfo_p.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/PageTransition.cc b/source/libs/poppler/poppler-0.30.0/poppler/PageTransition.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/PageTransition.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/PageTransition.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/PageTransition.h b/source/libs/poppler/poppler-0.30.0/poppler/PageTransition.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/PageTransition.h
rename to source/libs/poppler/poppler-0.30.0/poppler/PageTransition.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Parser.cc b/source/libs/poppler/poppler-0.30.0/poppler/Parser.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Parser.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/Parser.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Parser.h b/source/libs/poppler/poppler-0.30.0/poppler/Parser.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Parser.h
rename to source/libs/poppler/poppler-0.30.0/poppler/Parser.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/PopplerCache.cc b/source/libs/poppler/poppler-0.30.0/poppler/PopplerCache.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/PopplerCache.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/PopplerCache.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/PopplerCache.h b/source/libs/poppler/poppler-0.30.0/poppler/PopplerCache.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/PopplerCache.h
rename to source/libs/poppler/poppler-0.30.0/poppler/PopplerCache.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/PreScanOutputDev.cc b/source/libs/poppler/poppler-0.30.0/poppler/PreScanOutputDev.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/PreScanOutputDev.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/PreScanOutputDev.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/PreScanOutputDev.h b/source/libs/poppler/poppler-0.30.0/poppler/PreScanOutputDev.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/PreScanOutputDev.h
rename to source/libs/poppler/poppler-0.30.0/poppler/PreScanOutputDev.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/ProfileData.cc b/source/libs/poppler/poppler-0.30.0/poppler/ProfileData.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/ProfileData.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/ProfileData.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/ProfileData.h b/source/libs/poppler/poppler-0.30.0/poppler/ProfileData.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/ProfileData.h
rename to source/libs/poppler/poppler-0.30.0/poppler/ProfileData.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Rendition.cc b/source/libs/poppler/poppler-0.30.0/poppler/Rendition.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Rendition.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/Rendition.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Rendition.h b/source/libs/poppler/poppler-0.30.0/poppler/Rendition.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Rendition.h
rename to source/libs/poppler/poppler-0.30.0/poppler/Rendition.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/SecurityHandler.cc b/source/libs/poppler/poppler-0.30.0/poppler/SecurityHandler.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/SecurityHandler.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/SecurityHandler.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/SecurityHandler.h b/source/libs/poppler/poppler-0.30.0/poppler/SecurityHandler.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/SecurityHandler.h
rename to source/libs/poppler/poppler-0.30.0/poppler/SecurityHandler.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Sound.cc b/source/libs/poppler/poppler-0.30.0/poppler/Sound.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Sound.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/Sound.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Sound.h b/source/libs/poppler/poppler-0.30.0/poppler/Sound.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Sound.h
rename to source/libs/poppler/poppler-0.30.0/poppler/Sound.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/SplashOutputDev.cc b/source/libs/poppler/poppler-0.30.0/poppler/SplashOutputDev.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/SplashOutputDev.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/SplashOutputDev.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/SplashOutputDev.h b/source/libs/poppler/poppler-0.30.0/poppler/SplashOutputDev.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/SplashOutputDev.h
rename to source/libs/poppler/poppler-0.30.0/poppler/SplashOutputDev.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/StdinCachedFile.cc b/source/libs/poppler/poppler-0.30.0/poppler/StdinCachedFile.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/StdinCachedFile.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/StdinCachedFile.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/StdinCachedFile.h b/source/libs/poppler/poppler-0.30.0/poppler/StdinCachedFile.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/StdinCachedFile.h
rename to source/libs/poppler/poppler-0.30.0/poppler/StdinCachedFile.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/StdinPDFDocBuilder.cc b/source/libs/poppler/poppler-0.30.0/poppler/StdinPDFDocBuilder.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/StdinPDFDocBuilder.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/StdinPDFDocBuilder.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/StdinPDFDocBuilder.h b/source/libs/poppler/poppler-0.30.0/poppler/StdinPDFDocBuilder.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/StdinPDFDocBuilder.h
rename to source/libs/poppler/poppler-0.30.0/poppler/StdinPDFDocBuilder.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Stream-CCITT.h b/source/libs/poppler/poppler-0.30.0/poppler/Stream-CCITT.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Stream-CCITT.h
rename to source/libs/poppler/poppler-0.30.0/poppler/Stream-CCITT.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Stream.cc b/source/libs/poppler/poppler-0.30.0/poppler/Stream.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Stream.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/Stream.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/Stream.h b/source/libs/poppler/poppler-0.30.0/poppler/Stream.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/Stream.h
rename to source/libs/poppler/poppler-0.30.0/poppler/Stream.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/StructElement.cc b/source/libs/poppler/poppler-0.30.0/poppler/StructElement.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/StructElement.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/StructElement.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/StructElement.h b/source/libs/poppler/poppler-0.30.0/poppler/StructElement.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/StructElement.h
rename to source/libs/poppler/poppler-0.30.0/poppler/StructElement.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/StructTreeRoot.cc b/source/libs/poppler/poppler-0.30.0/poppler/StructTreeRoot.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/StructTreeRoot.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/StructTreeRoot.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/StructTreeRoot.h b/source/libs/poppler/poppler-0.30.0/poppler/StructTreeRoot.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/StructTreeRoot.h
rename to source/libs/poppler/poppler-0.30.0/poppler/StructTreeRoot.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/TextOutputDev.cc b/source/libs/poppler/poppler-0.30.0/poppler/TextOutputDev.cc
old mode 100644
new mode 100755
similarity index 99%
rename from source/libs/poppler/poppler-0.29.0/poppler/TextOutputDev.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/TextOutputDev.cc
index 4b7ff406c3eb22cc3081ae46f4ab95c0731c4797..c9db1e7d19f3a66d08423dd546942f23c5405b0f
--- a/source/libs/poppler/poppler-0.29.0/poppler/TextOutputDev.cc
+++ b/source/libs/poppler/poppler-0.30.0/poppler/TextOutputDev.cc
@@ -30,7 +30,7 @@
// Copyright (C) 2010 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
// Copyright (C) 2011 Sam Liao <phyomh@gmail.com>
// Copyright (C) 2012 Horst Prote <prote@fmi.uni-stuttgart.de>
-// Copyright (C) 2012, 2013 Jason Crain <jason@aquaticape.us>
+// Copyright (C) 2012, 2013, 2014 Jason Crain <jason@aquaticape.us>
// Copyright (C) 2012 Peter Breitenlohner <peb@mppmu.mpg.de>
// Copyright (C) 2013 José Aliste <jaliste@src.gnome.org>
// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
@@ -4072,6 +4072,11 @@ void TextSelectionDumper::startLine()
void TextSelectionDumper::finishLine()
{
+ if (nLines == linesSize) {
+ linesSize *= 2;
+ lines = (GooList **)grealloc(lines, linesSize * sizeof(GooList *));
+ }
+
if (words && words->getLength() > 0)
lines[nLines++] = words;
else if (words)
@@ -4088,11 +4093,6 @@ void TextSelectionDumper::visitLine (TextLine *line,
{
TextLineFrag frag;
- if (nLines == linesSize) {
- linesSize *= 2;
- lines = (GooList **)grealloc(lines, linesSize * sizeof(GooList *));
- }
-
frag.init(line, edge_begin, edge_end - edge_begin);
if (tableId >= 0 && frag.line->blk->tableId < 0) {
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/TextOutputDev.h b/source/libs/poppler/poppler-0.30.0/poppler/TextOutputDev.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/TextOutputDev.h
rename to source/libs/poppler/poppler-0.30.0/poppler/TextOutputDev.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/UTF.cc b/source/libs/poppler/poppler-0.30.0/poppler/UTF.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/UTF.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/UTF.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/UTF.h b/source/libs/poppler/poppler-0.30.0/poppler/UTF.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/UTF.h
rename to source/libs/poppler/poppler-0.30.0/poppler/UTF.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/UTF8.h b/source/libs/poppler/poppler-0.30.0/poppler/UTF8.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/UTF8.h
rename to source/libs/poppler/poppler-0.30.0/poppler/UTF8.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/UnicodeCClassTables.h b/source/libs/poppler/poppler-0.30.0/poppler/UnicodeCClassTables.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/UnicodeCClassTables.h
rename to source/libs/poppler/poppler-0.30.0/poppler/UnicodeCClassTables.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/UnicodeCompTables.h b/source/libs/poppler/poppler-0.30.0/poppler/UnicodeCompTables.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/UnicodeCompTables.h
rename to source/libs/poppler/poppler-0.30.0/poppler/UnicodeCompTables.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/UnicodeDecompTables.h b/source/libs/poppler/poppler-0.30.0/poppler/UnicodeDecompTables.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/UnicodeDecompTables.h
rename to source/libs/poppler/poppler-0.30.0/poppler/UnicodeDecompTables.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/UnicodeMap.cc b/source/libs/poppler/poppler-0.30.0/poppler/UnicodeMap.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/UnicodeMap.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/UnicodeMap.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/UnicodeMap.h b/source/libs/poppler/poppler-0.30.0/poppler/UnicodeMap.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/UnicodeMap.h
rename to source/libs/poppler/poppler-0.30.0/poppler/UnicodeMap.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/UnicodeMapTables.h b/source/libs/poppler/poppler-0.30.0/poppler/UnicodeMapTables.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/UnicodeMapTables.h
rename to source/libs/poppler/poppler-0.30.0/poppler/UnicodeMapTables.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/UnicodeTypeTable.cc b/source/libs/poppler/poppler-0.30.0/poppler/UnicodeTypeTable.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/UnicodeTypeTable.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/UnicodeTypeTable.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/UnicodeTypeTable.h b/source/libs/poppler/poppler-0.30.0/poppler/UnicodeTypeTable.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/UnicodeTypeTable.h
rename to source/libs/poppler/poppler-0.30.0/poppler/UnicodeTypeTable.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/ViewerPreferences.cc b/source/libs/poppler/poppler-0.30.0/poppler/ViewerPreferences.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/ViewerPreferences.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/ViewerPreferences.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/ViewerPreferences.h b/source/libs/poppler/poppler-0.30.0/poppler/ViewerPreferences.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/ViewerPreferences.h
rename to source/libs/poppler/poppler-0.30.0/poppler/ViewerPreferences.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/XRef.cc b/source/libs/poppler/poppler-0.30.0/poppler/XRef.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/XRef.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/XRef.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/XRef.h b/source/libs/poppler/poppler-0.30.0/poppler/XRef.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/XRef.h
rename to source/libs/poppler/poppler-0.30.0/poppler/XRef.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/XpdfPluginAPI.cc b/source/libs/poppler/poppler-0.30.0/poppler/XpdfPluginAPI.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/XpdfPluginAPI.cc
rename to source/libs/poppler/poppler-0.30.0/poppler/XpdfPluginAPI.cc
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/XpdfPluginAPI.h b/source/libs/poppler/poppler-0.30.0/poppler/XpdfPluginAPI.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/XpdfPluginAPI.h
rename to source/libs/poppler/poppler-0.30.0/poppler/XpdfPluginAPI.h
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/gen-unicode-tables.py b/source/libs/poppler/poppler-0.30.0/poppler/gen-unicode-tables.py
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/gen-unicode-tables.py
rename to source/libs/poppler/poppler-0.30.0/poppler/gen-unicode-tables.py
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/poppler-config.h.cmake b/source/libs/poppler/poppler-0.30.0/poppler/poppler-config.h.cmake
old mode 100644
new mode 100755
similarity index 98%
rename from source/libs/poppler/poppler-0.29.0/poppler/poppler-config.h.cmake
rename to source/libs/poppler/poppler-0.30.0/poppler/poppler-config.h.cmake
index d7918bc4e5db6446f5f04fbf0d29ad21d21887d8..b087a693f9230ced66b21b816e1560c4f023a034
--- a/source/libs/poppler/poppler-0.29.0/poppler/poppler-config.h.cmake
+++ b/source/libs/poppler/poppler-0.30.0/poppler/poppler-config.h.cmake
@@ -134,7 +134,7 @@
//------------------------------------------------------------------------
// copyright notice
-#define popplerCopyright "Copyright 2005-2014 The Poppler Developers - http://poppler.freedesktop.org"
+#define popplerCopyright "Copyright 2005-2015 The Poppler Developers - http://poppler.freedesktop.org"
#define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC"
//------------------------------------------------------------------------
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/poppler-config.h.in b/source/libs/poppler/poppler-0.30.0/poppler/poppler-config.h.in
old mode 100644
new mode 100755
similarity index 98%
rename from source/libs/poppler/poppler-0.29.0/poppler/poppler-config.h.in
rename to source/libs/poppler/poppler-0.30.0/poppler/poppler-config.h.in
index a7d2efeb96d0f2d86574b4035173c0c6259c192f..f73d0f66ee925958985d92f1c39b7f3624f6e3a7
--- a/source/libs/poppler/poppler-0.29.0/poppler/poppler-config.h.in
+++ b/source/libs/poppler/poppler-0.30.0/poppler/poppler-config.h.in
@@ -134,7 +134,7 @@
//------------------------------------------------------------------------
// copyright notice
-#define popplerCopyright "Copyright 2005-2014 The Poppler Developers - http://poppler.freedesktop.org"
+#define popplerCopyright "Copyright 2005-2015 The Poppler Developers - http://poppler.freedesktop.org"
#define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC"
//------------------------------------------------------------------------
diff --git a/source/libs/poppler/poppler-0.29.0/poppler/strtok_r.cpp b/source/libs/poppler/poppler-0.30.0/poppler/strtok_r.cpp
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/poppler/strtok_r.cpp
rename to source/libs/poppler/poppler-0.30.0/poppler/strtok_r.cpp
diff --git a/source/libs/poppler/poppler-0.29.0/splash/Makefile.am b/source/libs/poppler/poppler-0.30.0/splash/Makefile.am
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/Makefile.am
rename to source/libs/poppler/poppler-0.30.0/splash/Makefile.am
diff --git a/source/libs/poppler/poppler-0.29.0/splash/Splash.cc b/source/libs/poppler/poppler-0.30.0/splash/Splash.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/Splash.cc
rename to source/libs/poppler/poppler-0.30.0/splash/Splash.cc
diff --git a/source/libs/poppler/poppler-0.29.0/splash/Splash.h b/source/libs/poppler/poppler-0.30.0/splash/Splash.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/Splash.h
rename to source/libs/poppler/poppler-0.30.0/splash/Splash.h
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashBitmap.cc b/source/libs/poppler/poppler-0.30.0/splash/SplashBitmap.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashBitmap.cc
rename to source/libs/poppler/poppler-0.30.0/splash/SplashBitmap.cc
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashBitmap.h b/source/libs/poppler/poppler-0.30.0/splash/SplashBitmap.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashBitmap.h
rename to source/libs/poppler/poppler-0.30.0/splash/SplashBitmap.h
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashClip.cc b/source/libs/poppler/poppler-0.30.0/splash/SplashClip.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashClip.cc
rename to source/libs/poppler/poppler-0.30.0/splash/SplashClip.cc
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashClip.h b/source/libs/poppler/poppler-0.30.0/splash/SplashClip.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashClip.h
rename to source/libs/poppler/poppler-0.30.0/splash/SplashClip.h
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashErrorCodes.h b/source/libs/poppler/poppler-0.30.0/splash/SplashErrorCodes.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashErrorCodes.h
rename to source/libs/poppler/poppler-0.30.0/splash/SplashErrorCodes.h
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashFTFont.cc b/source/libs/poppler/poppler-0.30.0/splash/SplashFTFont.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashFTFont.cc
rename to source/libs/poppler/poppler-0.30.0/splash/SplashFTFont.cc
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashFTFont.h b/source/libs/poppler/poppler-0.30.0/splash/SplashFTFont.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashFTFont.h
rename to source/libs/poppler/poppler-0.30.0/splash/SplashFTFont.h
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontEngine.cc b/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontEngine.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashFTFontEngine.cc
rename to source/libs/poppler/poppler-0.30.0/splash/SplashFTFontEngine.cc
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontEngine.h b/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontEngine.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashFTFontEngine.h
rename to source/libs/poppler/poppler-0.30.0/splash/SplashFTFontEngine.h
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontFile.cc b/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontFile.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashFTFontFile.cc
rename to source/libs/poppler/poppler-0.30.0/splash/SplashFTFontFile.cc
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontFile.h b/source/libs/poppler/poppler-0.30.0/splash/SplashFTFontFile.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashFTFontFile.h
rename to source/libs/poppler/poppler-0.30.0/splash/SplashFTFontFile.h
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashFont.cc b/source/libs/poppler/poppler-0.30.0/splash/SplashFont.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashFont.cc
rename to source/libs/poppler/poppler-0.30.0/splash/SplashFont.cc
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashFont.h b/source/libs/poppler/poppler-0.30.0/splash/SplashFont.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashFont.h
rename to source/libs/poppler/poppler-0.30.0/splash/SplashFont.h
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashFontEngine.cc b/source/libs/poppler/poppler-0.30.0/splash/SplashFontEngine.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashFontEngine.cc
rename to source/libs/poppler/poppler-0.30.0/splash/SplashFontEngine.cc
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashFontEngine.h b/source/libs/poppler/poppler-0.30.0/splash/SplashFontEngine.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashFontEngine.h
rename to source/libs/poppler/poppler-0.30.0/splash/SplashFontEngine.h
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashFontFile.cc b/source/libs/poppler/poppler-0.30.0/splash/SplashFontFile.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashFontFile.cc
rename to source/libs/poppler/poppler-0.30.0/splash/SplashFontFile.cc
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashFontFile.h b/source/libs/poppler/poppler-0.30.0/splash/SplashFontFile.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashFontFile.h
rename to source/libs/poppler/poppler-0.30.0/splash/SplashFontFile.h
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashFontFileID.cc b/source/libs/poppler/poppler-0.30.0/splash/SplashFontFileID.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashFontFileID.cc
rename to source/libs/poppler/poppler-0.30.0/splash/SplashFontFileID.cc
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashFontFileID.h b/source/libs/poppler/poppler-0.30.0/splash/SplashFontFileID.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashFontFileID.h
rename to source/libs/poppler/poppler-0.30.0/splash/SplashFontFileID.h
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashGlyphBitmap.h b/source/libs/poppler/poppler-0.30.0/splash/SplashGlyphBitmap.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashGlyphBitmap.h
rename to source/libs/poppler/poppler-0.30.0/splash/SplashGlyphBitmap.h
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashMath.h b/source/libs/poppler/poppler-0.30.0/splash/SplashMath.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashMath.h
rename to source/libs/poppler/poppler-0.30.0/splash/SplashMath.h
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashPath.cc b/source/libs/poppler/poppler-0.30.0/splash/SplashPath.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashPath.cc
rename to source/libs/poppler/poppler-0.30.0/splash/SplashPath.cc
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashPath.h b/source/libs/poppler/poppler-0.30.0/splash/SplashPath.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashPath.h
rename to source/libs/poppler/poppler-0.30.0/splash/SplashPath.h
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashPattern.cc b/source/libs/poppler/poppler-0.30.0/splash/SplashPattern.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashPattern.cc
rename to source/libs/poppler/poppler-0.30.0/splash/SplashPattern.cc
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashPattern.h b/source/libs/poppler/poppler-0.30.0/splash/SplashPattern.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashPattern.h
rename to source/libs/poppler/poppler-0.30.0/splash/SplashPattern.h
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashScreen.cc b/source/libs/poppler/poppler-0.30.0/splash/SplashScreen.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashScreen.cc
rename to source/libs/poppler/poppler-0.30.0/splash/SplashScreen.cc
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashScreen.h b/source/libs/poppler/poppler-0.30.0/splash/SplashScreen.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashScreen.h
rename to source/libs/poppler/poppler-0.30.0/splash/SplashScreen.h
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashState.cc b/source/libs/poppler/poppler-0.30.0/splash/SplashState.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashState.cc
rename to source/libs/poppler/poppler-0.30.0/splash/SplashState.cc
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashState.h b/source/libs/poppler/poppler-0.30.0/splash/SplashState.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashState.h
rename to source/libs/poppler/poppler-0.30.0/splash/SplashState.h
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashT1Font.cc b/source/libs/poppler/poppler-0.30.0/splash/SplashT1Font.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashT1Font.cc
rename to source/libs/poppler/poppler-0.30.0/splash/SplashT1Font.cc
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashT1Font.h b/source/libs/poppler/poppler-0.30.0/splash/SplashT1Font.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashT1Font.h
rename to source/libs/poppler/poppler-0.30.0/splash/SplashT1Font.h
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontEngine.cc b/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontEngine.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashT1FontEngine.cc
rename to source/libs/poppler/poppler-0.30.0/splash/SplashT1FontEngine.cc
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontEngine.h b/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontEngine.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashT1FontEngine.h
rename to source/libs/poppler/poppler-0.30.0/splash/SplashT1FontEngine.h
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontFile.cc b/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontFile.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashT1FontFile.cc
rename to source/libs/poppler/poppler-0.30.0/splash/SplashT1FontFile.cc
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontFile.h b/source/libs/poppler/poppler-0.30.0/splash/SplashT1FontFile.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashT1FontFile.h
rename to source/libs/poppler/poppler-0.30.0/splash/SplashT1FontFile.h
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashTypes.h b/source/libs/poppler/poppler-0.30.0/splash/SplashTypes.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashTypes.h
rename to source/libs/poppler/poppler-0.30.0/splash/SplashTypes.h
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashXPath.cc b/source/libs/poppler/poppler-0.30.0/splash/SplashXPath.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashXPath.cc
rename to source/libs/poppler/poppler-0.30.0/splash/SplashXPath.cc
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashXPath.h b/source/libs/poppler/poppler-0.30.0/splash/SplashXPath.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashXPath.h
rename to source/libs/poppler/poppler-0.30.0/splash/SplashXPath.h
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashXPathScanner.cc b/source/libs/poppler/poppler-0.30.0/splash/SplashXPathScanner.cc
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashXPathScanner.cc
rename to source/libs/poppler/poppler-0.30.0/splash/SplashXPathScanner.cc
diff --git a/source/libs/poppler/poppler-0.29.0/splash/SplashXPathScanner.h b/source/libs/poppler/poppler-0.30.0/splash/SplashXPathScanner.h
old mode 100644
new mode 100755
similarity index 100%
rename from source/libs/poppler/poppler-0.29.0/splash/SplashXPathScanner.h
rename to source/libs/poppler/poppler-0.30.0/splash/SplashXPathScanner.h
diff --git a/source/libs/poppler/version.ac b/source/libs/poppler/version.ac
index 27dab4080f096f773d4c269a97470505c51498e3..aac07c92affc1339a3c680348cf52177040d3b67 100644
--- a/source/libs/poppler/version.ac
+++ b/source/libs/poppler/version.ac
@@ -1,5 +1,5 @@
dnl
-dnl Copyright (C) 2011-2014 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2011-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,
@@ -8,4 +8,4 @@ dnl
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current poppler version
-m4_define([poppler_version], [0.29.0])
+m4_define([poppler_version], [0.30.0])
diff --git a/source/libs/zlib/Makefile.in b/source/libs/zlib/Makefile.in
index 7e8f05ca083ddaedf96dccd9c82879b5e20bc569..d612feceb2eb1982e035856de0c54c48573d1659 100644
--- a/source/libs/zlib/Makefile.in
+++ b/source/libs/zlib/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -77,20 +87,6 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
@build_TRUE@check_PROGRAMS = example$(EXEEXT) minigzip$(EXEEXT)
-DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(top_srcdir)/configure \
- $(am__configure_deps) $(srcdir)/config.h.in \
- $(am__dist_check_SCRIPTS_DIST) \
- $(top_srcdir)/../../build-aux/depcomp \
- $(top_srcdir)/../../build-aux/test-driver ChangeLog README \
- ../../build-aux/compile ../../build-aux/config.guess \
- ../../build-aux/config.sub ../../build-aux/depcomp \
- ../../build-aux/install-sh ../../build-aux/missing \
- ../../build-aux/texinfo.tex ../../build-aux/ylwrap \
- ../../build-aux/ltmain.sh \
- $(top_srcdir)/../../build-aux/compile \
- $(top_srcdir)/../../build-aux/install-sh \
- $(top_srcdir)/../../build-aux/missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -101,6 +97,9 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(am__dist_check_SCRIPTS_DIST) \
+ $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -410,6 +409,17 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+ $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
+ $(top_srcdir)/../../build-aux/depcomp \
+ $(top_srcdir)/../../build-aux/install-sh \
+ $(top_srcdir)/../../build-aux/missing \
+ $(top_srcdir)/../../build-aux/test-driver \
+ ../../build-aux/compile ../../build-aux/config.guess \
+ ../../build-aux/config.sub ../../build-aux/depcomp \
+ ../../build-aux/install-sh ../../build-aux/ltmain.sh \
+ ../../build-aux/missing ../../build-aux/texinfo.tex \
+ ../../build-aux/ylwrap ChangeLog README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -608,7 +618,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/..
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -618,7 +627,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../../am/rebuild.am:
+$(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -887,7 +896,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
if test -n "$$am__remaking_logs"; then \
echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
"recursion detected" >&2; \
- else \
+ elif test -n "$$redo_logs"; then \
am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
fi; \
if $(am__make_dryrun); then :; else \
@@ -1097,15 +1106,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -1141,17 +1150,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -1344,6 +1353,8 @@ uninstall-am:
mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
recheck tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
# in case of an SVN repository
dist-hook:
diff --git a/source/libs/zlib/aclocal.m4 b/source/libs/zlib/aclocal.m4
index a53f80373166d3a69fe90171732b69dc58a6301d..099c60c33d94b6b87534dc12d40873c94bb8bde4 100644
--- a/source/libs/zlib/aclocal.m4
+++ b/source/libs/zlib/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -573,7 +572,11 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -602,7 +605,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -645,7 +648,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -680,7 +683,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -730,7 +733,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -769,7 +772,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -798,7 +801,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -845,7 +848,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -864,7 +867,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -945,7 +948,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1005,7 +1008,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1033,7 +1036,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1052,7 +1055,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/source/libs/zlib/configure b/source/libs/zlib/configure
index f55d179936d86149403f3112a713a3e2c8adabfd..c514ba7157dd301491f6a0928b8497de932c3317 100755
--- a/source/libs/zlib/configure
+++ b/source/libs/zlib/configure
@@ -2127,7 +2127,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-am__api_version='1.14'
+am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2299,8 +2299,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -2319,7 +2319,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -3703,8 +3703,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -3762,6 +3762,7 @@ END
fi
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
diff --git a/source/libs/zlib/include/Makefile.in b/source/libs/zlib/include/Makefile.in
index a81158544954c93aff06edc8b36b4ced62fc1007..11f375f5787f86566225d7aa609a66c129c69310 100644
--- a/source/libs/zlib/include/Makefile.in
+++ b/source/libs/zlib/include/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -75,8 +85,6 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \
- $(srcdir)/Makefile.in $(srcdir)/Makefile.am
subdir = include
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -87,6 +95,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -111,6 +120,8 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/../../am/hdr_links.am
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -227,7 +238,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign include/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -236,7 +246,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
-$(top_srcdir)/../../am/hdr_links.am:
+$(top_srcdir)/../../am/hdr_links.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -397,6 +407,8 @@ uninstall-am:
mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am
+.PRECIOUS: Makefile
+
all-local:
@for file in $(hdr_links); do \
test -f $$file || continue; \
diff --git a/source/libs/zziplib/Makefile.in b/source/libs/zziplib/Makefile.in
index f6cce8de7a2f099fae263eaf04e2743af5d95412..afc93b6b05c757cca6a28a2a185c05e880335c0d 100644
--- a/source/libs/zziplib/Makefile.in
+++ b/source/libs/zziplib/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -79,23 +89,6 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@build_TRUE@check_PROGRAMS = unzzip$(EXEEXT)
-DIST_COMMON = $(srcdir)/../../am/reconfig.am \
- $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(top_srcdir)/configure \
- $(am__configure_deps) $(srcdir)/config.h.in \
- $(am__dist_check_SCRIPTS_DIST) \
- $(top_srcdir)/../../build-aux/depcomp \
- $(top_srcdir)/../../build-aux/test-driver ChangeLog README \
- ../../build-aux/compile ../../build-aux/config.guess \
- ../../build-aux/config.sub ../../build-aux/depcomp \
- ../../build-aux/install-sh ../../build-aux/missing \
- ../../build-aux/texinfo.tex ../../build-aux/ylwrap \
- ../../build-aux/ltmain.sh \
- $(top_srcdir)/../../build-aux/compile \
- $(top_srcdir)/../../build-aux/config.guess \
- $(top_srcdir)/../../build-aux/config.sub \
- $(top_srcdir)/../../build-aux/install-sh \
- $(top_srcdir)/../../build-aux/missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_sys_largefile_sensitive.m4 \
@@ -108,6 +101,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_sys_largefile_sensitive.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(am__dist_check_SCRIPTS_DIST) \
+ $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -413,6 +409,20 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/../../am/rebuild.am \
+ $(srcdir)/../../am/reconfig.am $(srcdir)/Makefile.in \
+ $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
+ $(top_srcdir)/../../build-aux/config.guess \
+ $(top_srcdir)/../../build-aux/config.sub \
+ $(top_srcdir)/../../build-aux/depcomp \
+ $(top_srcdir)/../../build-aux/install-sh \
+ $(top_srcdir)/../../build-aux/missing \
+ $(top_srcdir)/../../build-aux/test-driver \
+ ../../build-aux/compile ../../build-aux/config.guess \
+ ../../build-aux/config.sub ../../build-aux/depcomp \
+ ../../build-aux/install-sh ../../build-aux/ltmain.sh \
+ ../../build-aux/missing ../../build-aux/texinfo.tex \
+ ../../build-aux/ylwrap ChangeLog README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -611,7 +621,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/..
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -621,7 +630,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am:
+$(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -875,7 +884,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
if test -n "$$am__remaking_logs"; then \
echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
"recursion detected" >&2; \
- else \
+ elif test -n "$$redo_logs"; then \
am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
fi; \
if $(am__make_dryrun); then :; else \
@@ -1085,15 +1094,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -1129,17 +1138,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -1332,6 +1341,8 @@ uninstall-am:
mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
ps ps-am recheck tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
# in case of an SVN repository
dist-hook:
diff --git a/source/libs/zziplib/aclocal.m4 b/source/libs/zziplib/aclocal.m4
index 045726fd96bc61b288e88cc92fcf1a99142059af..55ae5b42347d7685a5d1e0a40b9985519b5cbe72 100644
--- a/source/libs/zziplib/aclocal.m4
+++ b/source/libs/zziplib/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -573,7 +572,11 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -602,7 +605,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -645,7 +648,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -680,7 +683,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -730,7 +733,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -769,7 +772,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -798,7 +801,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -845,7 +848,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -864,7 +867,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -945,7 +948,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1005,7 +1008,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1033,7 +1036,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1052,7 +1055,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/source/libs/zziplib/configure b/source/libs/zziplib/configure
index 2674f1c84e50c8fd357b819725a091491fa869bb..6dc3cb694b9cbcf1db4a0afc2723d61744776add 100755
--- a/source/libs/zziplib/configure
+++ b/source/libs/zziplib/configure
@@ -2459,7 +2459,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-am__api_version='1.14'
+am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2631,8 +2631,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -2651,7 +2651,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -4035,8 +4035,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -4094,6 +4094,7 @@ END
fi
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
diff --git a/source/libs/zziplib/include/zzip/Makefile.in b/source/libs/zziplib/include/zzip/Makefile.in
index 02cf02f12793cf472c54d0dc84e991c951dd1fd0..1da168ebe0890dadbcfd01a6df8c967caf3e0635 100644
--- a/source/libs/zziplib/include/zzip/Makefile.in
+++ b/source/libs/zziplib/include/zzip/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -77,8 +87,6 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \
- $(srcdir)/Makefile.in $(srcdir)/Makefile.am
subdir = include/zzip
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_sys_largefile_sensitive.m4 \
@@ -91,6 +99,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_sys_largefile_sensitive.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@@ -115,6 +124,8 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/../../am/hdr_links.am
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -251,7 +262,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/zzip/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign include/zzip/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -260,7 +270,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
-$(top_srcdir)/../../am/hdr_links.am:
+$(top_srcdir)/../../am/hdr_links.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -421,6 +431,8 @@ uninstall-am:
mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am
+.PRECIOUS: Makefile
+
all-local:
@for file in $(hdr_links); do \
test -f $$file || continue; \
diff --git a/source/m4/ChangeLog b/source/m4/ChangeLog
index dac6ec2b3b65d07906308e5d56f620631a9174ab..f6292b4d1c78a5ac0530df0bb8ed5c0afca13d17 100644
--- a/source/m4/ChangeLog
+++ b/source/m4/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-14 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kpse-setup.m4: Disable LuaJITTeX for powerpc-*-darwin*.
+
2014-12-24 Peter Breitenlohner <peb@mppmu.mpg.de>
* kpse-pkgs.m4 (kpse_texk_pkgs): Move lacheck from here ...
diff --git a/source/m4/kpse-setup.m4 b/source/m4/kpse-setup.m4
index 8767c3f59df9363fa18a8511274c0062e3f389fe..b9c9bcce005888d860d22e015ce0706366529eba 100644
--- a/source/m4/kpse-setup.m4
+++ b/source/m4/kpse-setup.m4
@@ -1,5 +1,5 @@
# Private macros for the TeX Live (TL) tree.
-# Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
@@ -84,7 +84,7 @@ AS_CASE([$with_x:$kpse_cv_have_win32],
AS_CASE([$enable_luajittex],
[yes | no], [:],
[AS_CASE([$host],
- [alpha* | sparc* | x86_64-*-cygwin],
+ [alpha* | sparc* | x86_64-*-cygwin | powerpc-*-darwin* ],
[AC_MSG_NOTICE([$host -> `--disable-luajittex'])
ac_configure_args="$ac_configure_args '--disable-luajittex'"])])
KPSE_FOR_PKGS([utils], [m4_sinclude(kpse_TL[utils/]Kpse_Pkg[/ac/withenable.ac])])
diff --git a/source/texk/Makefile.in b/source/texk/Makefile.in
index d7518aec0bf769634fd69ca8a79f6247ebf24bd2..be272880a05f36f5a8def25c3dc3fc5cd38cc70e 100644
--- a/source/texk/Makefile.in
+++ b/source/texk/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -77,18 +87,6 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = $(srcdir)/../am/recurse.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(top_srcdir)/configure \
- $(am__configure_deps) ChangeLog README ../build-aux/compile \
- ../build-aux/config.guess ../build-aux/config.sub \
- ../build-aux/depcomp ../build-aux/install-sh \
- ../build-aux/missing ../build-aux/texinfo.tex \
- ../build-aux/ylwrap ../build-aux/ltmain.sh \
- $(top_srcdir)/../build-aux/compile \
- $(top_srcdir)/../build-aux/config.guess \
- $(top_srcdir)/../build-aux/config.sub \
- $(top_srcdir)/../build-aux/install-sh \
- $(top_srcdir)/../build-aux/missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
@@ -130,6 +128,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -190,6 +190,16 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
+am__DIST_COMMON = $(srcdir)/../am/recurse.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/../build-aux/compile \
+ $(top_srcdir)/../build-aux/config.guess \
+ $(top_srcdir)/../build-aux/config.sub \
+ $(top_srcdir)/../build-aux/install-sh \
+ $(top_srcdir)/../build-aux/missing ../build-aux/compile \
+ ../build-aux/config.guess ../build-aux/config.sub \
+ ../build-aux/depcomp ../build-aux/install-sh \
+ ../build-aux/ltmain.sh ../build-aux/missing \
+ ../build-aux/texinfo.tex ../build-aux/ylwrap ChangeLog README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -365,7 +375,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/..
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -375,7 +384,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../am/recurse.am:
+$(srcdir)/../am/recurse.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -576,15 +585,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -620,17 +629,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -804,6 +813,8 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
# just in case a subdirectory has added directories
dist-hook:
diff --git a/source/texk/README b/source/texk/README
index ad95c2df638c7796b989fdb29751b1adcbe6ab70..a5bd95895f792ee62b200d7b23ece4ed59f63d62 100644
--- a/source/texk/README
+++ b/source/texk/README
@@ -1,4 +1,4 @@
-$Id: README 35896 2014-12-24 11:25:20Z peter $
+$Id: README 36016 2015-01-11 00:03:55Z karl $
Copyright 2006-2012 TeX Users Group.
You may freely use, modify and/or distribute this file.
@@ -43,11 +43,11 @@ dvi2tty 5.3.4 - checked 10may12
http://www.mesa.nl/pub/dvi2tty/
ftp://ftp.mesa.nl/pub/dvi2tty/
-dvidvi - ?
+dvidvi - maintained here.
dviljk - maintained here, by Joachim Schrod
-dvipdfm-x - maintained here, by Khaled Hosny, Jonathan Kew, contains
+dvipdfm-x - maintained here, by Khaled Hosny, Akira Kakuto, et al., contains
dvipdfmx
xdvipdfmx
@@ -59,7 +59,7 @@ dvipos - ?
dvipsk - maintained here, by us
-dvisvgm 1.8.1 - checked 15sep14
+dvisvgm 1.9 - checked 7jan15
http://downloads.sourceforge.net/dvisvgm/
gsftopk - from Paul Vojta's xdvi?
diff --git a/source/texk/aclocal.m4 b/source/texk/aclocal.m4
index eb2029d0b5dc806bf045321019150c4680b39a44..4415289d78cc49af68e39e5d25ba3298a5ac6650 100644
--- a/source/texk/aclocal.m4
+++ b/source/texk/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -573,7 +572,11 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -602,7 +605,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -645,7 +648,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -680,7 +683,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -730,7 +733,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -769,7 +772,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -798,7 +801,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -845,7 +848,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -864,7 +867,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -945,7 +948,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1005,7 +1008,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1033,7 +1036,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1052,7 +1055,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/source/texk/configure b/source/texk/configure
index 595aad1f88a3dc85226cb8cc3206eaa5593351c3..1b013965e780019ed4ee18d75f2720bdf7c6f69d 100755
--- a/source/texk/configure
+++ b/source/texk/configure
@@ -2134,8 +2134,8 @@ if test "${enable_missing+set}" = set; then :
enableval=$enable_missing;
fi
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -3160,7 +3160,7 @@ case $enable_luajittex in #(
: ;; #(
*) :
case $host in #(
- alpha* | sparc* | x86_64-*-cygwin) :
+ alpha* | sparc* | x86_64-*-cygwin | powerpc-*-darwin* ) :
{ $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-luajittex'" >&5
$as_echo "$as_me: $host -> \`--disable-luajittex'" >&6;}
ac_configure_args="$ac_configure_args '--disable-luajittex'" ;; #(
@@ -3881,7 +3881,7 @@ fi
-am__api_version='1.14'
+am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -4070,7 +4070,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -4477,8 +4477,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -4664,6 +4664,7 @@ END
fi
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
diff --git a/source/texk/kpathsea/Makefile.in b/source/texk/kpathsea/Makefile.in
index 64ef4be4aeccc2c2a499b60a608f4f434bb69418..c6aba409dfdf18bfdf22b9d39d873fd97ce43e0d 100644
--- a/source/texk/kpathsea/Makefile.in
+++ b/source/texk/kpathsea/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -19,7 +19,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -106,26 +116,6 @@ host_triplet = @host@
bin_PROGRAMS = kpseaccess$(EXEEXT) kpsereadlink$(EXEEXT) \
kpsestat$(EXEEXT) kpsewhich$(EXEEXT)
EXTRA_PROGRAMS = progname-test$(EXEEXT) xdirtest$(EXEEXT)
-DIST_COMMON = $(top_srcdir)/../../am/bin_links.am \
- $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(top_srcdir)/configure \
- $(am__configure_deps) $(srcdir)/c-auto.in \
- $(srcdir)/kpathsea.pc.in strtol.c strcasecmp.c strstr.c \
- putenv.c $(dist_noinst_SCRIPTS) $(dist_web2c_SCRIPTS) \
- $(top_srcdir)/../../build-aux/depcomp $(dist_noinst_DATA) \
- $(dist_web2c_DATA) $(kpseinclude_HEADERS) $(noinst_HEADERS) \
- $(top_srcdir)/../../build-aux/test-driver AUTHORS ChangeLog \
- NEWS README ../../build-aux/compile \
- ../../build-aux/config.guess ../../build-aux/config.sub \
- ../../build-aux/depcomp ../../build-aux/install-sh \
- ../../build-aux/missing ../../build-aux/texinfo.tex \
- ../../build-aux/ylwrap ../../build-aux/ltmain.sh \
- $(top_srcdir)/../../build-aux/compile \
- $(top_srcdir)/../../build-aux/config.guess \
- $(top_srcdir)/../../build-aux/config.sub \
- $(top_srcdir)/../../build-aux/install-sh \
- $(top_srcdir)/../../build-aux/ltmain.sh \
- $(top_srcdir)/../../build-aux/missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -142,6 +132,10 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(dist_noinst_SCRIPTS) \
+ $(dist_web2c_SCRIPTS) $(dist_noinst_DATA) $(dist_web2c_DATA) \
+ $(kpseinclude_HEADERS) $(noinst_HEADERS) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -518,6 +512,23 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = . doc man win32
+am__DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
+ $(srcdir)/c-auto.in $(srcdir)/kpathsea.pc.in \
+ $(top_srcdir)/../../am/bin_links.am \
+ $(top_srcdir)/../../build-aux/compile \
+ $(top_srcdir)/../../build-aux/config.guess \
+ $(top_srcdir)/../../build-aux/config.sub \
+ $(top_srcdir)/../../build-aux/depcomp \
+ $(top_srcdir)/../../build-aux/install-sh \
+ $(top_srcdir)/../../build-aux/ltmain.sh \
+ $(top_srcdir)/../../build-aux/missing \
+ $(top_srcdir)/../../build-aux/test-driver \
+ ../../build-aux/compile ../../build-aux/config.guess \
+ ../../build-aux/config.sub ../../build-aux/depcomp \
+ ../../build-aux/install-sh ../../build-aux/ltmain.sh \
+ ../../build-aux/missing ../../build-aux/texinfo.tex \
+ ../../build-aux/ylwrap AUTHORS ChangeLog NEWS README putenv.c \
+ strcasecmp.c strstr.c strtol.c
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -816,7 +827,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -826,7 +836,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(top_srcdir)/../../am/bin_links.am $(srcdir)/../../am/rebuild.am:
+$(top_srcdir)/../../am/bin_links.am $(srcdir)/../../am/rebuild.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -1748,7 +1758,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
if test -n "$$am__remaking_logs"; then \
echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
"recursion detected" >&2; \
- else \
+ elif test -n "$$redo_logs"; then \
am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
fi; \
if $(am__make_dryrun); then :; else \
@@ -1955,15 +1965,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -1999,17 +2009,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -2224,6 +2234,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_web2cDATA \
uninstall-local uninstall-nodist_kpseincludeHEADERS \
uninstall-pkgconfigDATA
+.PRECIOUS: Makefile
+
$(libkpathsea_la_OBJECTS): paths.h kpathsea.h
diff --git a/source/texk/kpathsea/aclocal.m4 b/source/texk/kpathsea/aclocal.m4
index 664e3d5d21c2de312f551e81a3ed5179c51ee75e..67397b7c2e8bf28f2d44da6006874c975ea46ab4 100644
--- a/source/texk/kpathsea/aclocal.m4
+++ b/source/texk/kpathsea/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -573,7 +572,11 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -602,7 +605,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -645,7 +648,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -680,7 +683,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -730,7 +733,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -769,7 +772,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -798,7 +801,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -845,7 +848,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -864,7 +867,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -945,7 +948,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1005,7 +1008,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1033,7 +1036,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1052,7 +1055,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/source/texk/kpathsea/configure b/source/texk/kpathsea/configure
index b7e640ad13926ecf2b5ccea120e4c2c8f5115eeb..48bca90c18e91cae0b39ef62f631b0a8c7ba799d 100755
--- a/source/texk/kpathsea/configure
+++ b/source/texk/kpathsea/configure
@@ -2763,7 +2763,7 @@ KPSE_LT_VERSINFO=8:1:2
WEB2CVERSION=2015/dev
-am__api_version='1.14'
+am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2935,8 +2935,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -2955,7 +2955,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -8051,8 +8051,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -8110,6 +8110,7 @@ END
fi
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
diff --git a/source/texk/kpathsea/doc/Makefile.in b/source/texk/kpathsea/doc/Makefile.in
index c71d20e611cdbcebbd6cc454c0f1e6d54efcd836..b4dd4082c6c58b411ec55ea6279650815ad061b4 100644
--- a/source/texk/kpathsea/doc/Makefile.in
+++ b/source/texk/kpathsea/doc/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -78,8 +88,6 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(kpathsea_TEXINFOS) $(top_srcdir)/../../build-aux/texinfo.tex
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-lib-version.m4 \
@@ -95,6 +103,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/c-auto.h
CONFIG_CLEAN_FILES =
@@ -188,6 +197,8 @@ am__uninstall_files_from_dir = { \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(kpathsea_TEXINFOS) $(srcdir)/Makefile.in \
+ $(top_srcdir)/../../build-aux/texinfo.tex
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -328,7 +339,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign doc/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -747,6 +757,8 @@ uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
uninstall-dvi-am uninstall-html-am uninstall-info-am \
uninstall-pdf-am uninstall-ps-am
+.PRECIOUS: Makefile
+
# 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/source/texk/kpathsea/man/Makefile.in b/source/texk/kpathsea/man/Makefile.in
index 6f8e27033dc20ec8ed9e35e3dbdd0907bb346ccc..a8efdc53314dfb61a9f6170a4e0c7748bab1b662 100644
--- a/source/texk/kpathsea/man/Makefile.in
+++ b/source/texk/kpathsea/man/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -77,9 +87,6 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/../../am/man.am \
- $(top_srcdir)/../../am/man1_links.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am
subdir = man
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -96,6 +103,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/c-auto.h
CONFIG_CLEAN_FILES =
@@ -151,6 +159,8 @@ am__installdirs = "$(DESTDIR)$(man1dir)"
NROFF = nroff
MANS = $(nodist_man1_MANS)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/../../am/man.am \
+ $(top_srcdir)/../../am/man1_links.am
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -313,7 +323,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign man/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -322,7 +331,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
-$(top_srcdir)/../../am/man.am $(top_srcdir)/../../am/man1_links.am:
+$(top_srcdir)/../../am/man.am $(top_srcdir)/../../am/man1_links.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -539,6 +548,8 @@ uninstall-man: uninstall-man1
mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am uninstall-hook uninstall-man uninstall-man1
+.PRECIOUS: Makefile
+
.man.1:
$(AM_V_GEN)sed -f sedscript $< >$@
diff --git a/source/texk/kpathsea/win32/Makefile.in b/source/texk/kpathsea/win32/Makefile.in
index e677faea362a947d8e879f744bd6e89519000781..27e0fe14a1311860ce83bb22a90378f27bbec074 100644
--- a/source/texk/kpathsea/win32/Makefile.in
+++ b/source/texk/kpathsea/win32/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -82,8 +92,6 @@ bin_PROGRAMS = fmtutil$(EXEEXT) mktexfmt$(EXEEXT) mktexlsr$(EXEEXT) \
mktexmf$(EXEEXT) mktexpk$(EXEEXT) mktextfm$(EXEEXT) \
mktexupd$(EXEEXT)
subdir = win32
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/../../build-aux/depcomp ChangeLog
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-lib-version.m4 \
@@ -99,6 +107,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/c-auto.h
CONFIG_CLEAN_FILES =
@@ -205,6 +214,8 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/../../build-aux/depcomp ChangeLog
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -396,7 +407,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign win32/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign win32/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -747,6 +757,8 @@ uninstall-am: uninstall-binPROGRAMS
pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-hook
+.PRECIOUS: Makefile
+
install-exec-hook:
cp -p $(DESTDIR)$(bindir)/mktexlsr$(EXEEXT) $(DESTDIR)$(bindir)/texhash$(EXEEXT)
diff --git a/source/texk/texlive/Makefile.in b/source/texk/texlive/Makefile.in
index aed50619a9951e5656686dfe4a944c1562446d5d..c2dba56531d2d698bd1fd75e07cf5fb94ca2a759 100644
--- a/source/texk/texlive/Makefile.in
+++ b/source/texk/texlive/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -77,23 +87,14 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
@LINKED_SCRIPTS_TRUE@am__append_1 = linked_scripts
subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/configure $(am__configure_deps) \
- $(top_srcdir)/../../build-aux/test-driver ChangeLog \
- ../../build-aux/compile ../../build-aux/config.guess \
- ../../build-aux/config.sub ../../build-aux/depcomp \
- ../../build-aux/install-sh ../../build-aux/missing \
- ../../build-aux/texinfo.tex ../../build-aux/ylwrap \
- ../../build-aux/ltmain.sh \
- $(top_srcdir)/../../build-aux/compile \
- $(top_srcdir)/../../build-aux/install-sh \
- $(top_srcdir)/../../build-aux/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-win32.m4 \
$(top_srcdir)/../../version.ac $(top_srcdir)/ac/texlive.ac \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -358,6 +359,16 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver
TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
$(TEST_LOG_FLAGS)
DIST_SUBDIRS = tl_scripts linked_scripts
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/../../build-aux/compile \
+ $(top_srcdir)/../../build-aux/install-sh \
+ $(top_srcdir)/../../build-aux/missing \
+ $(top_srcdir)/../../build-aux/test-driver \
+ ../../build-aux/compile ../../build-aux/config.guess \
+ ../../build-aux/config.sub ../../build-aux/depcomp \
+ ../../build-aux/install-sh ../../build-aux/ltmain.sh \
+ ../../build-aux/missing ../../build-aux/texinfo.tex \
+ ../../build-aux/ylwrap ChangeLog
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -509,7 +520,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -665,7 +675,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
if test -n "$$am__remaking_logs"; then \
echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
"recursion detected" >&2; \
- else \
+ elif test -n "$$redo_logs"; then \
am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
fi; \
if $(am__make_dryrun); then :; else \
@@ -879,15 +889,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -923,17 +933,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -1112,6 +1122,8 @@ uninstall-am:
mostlyclean-generic pdf pdf-am ps ps-am recheck tags tags-am \
uninstall uninstall-am
+.PRECIOUS: Makefile
+
# 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/source/texk/texlive/aclocal.m4 b/source/texk/texlive/aclocal.m4
index 471a6565005d47db792ed7c09c1144392ee32f50..cdd9baa3b5d79d0c7fd16f7d17bb2727717379e8 100644
--- a/source/texk/texlive/aclocal.m4
+++ b/source/texk/texlive/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -573,7 +572,11 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -602,7 +605,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -645,7 +648,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -680,7 +683,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -730,7 +733,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -769,7 +772,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -798,7 +801,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -845,7 +848,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -864,7 +867,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -945,7 +948,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1005,7 +1008,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1033,7 +1036,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1052,7 +1055,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/source/texk/texlive/configure b/source/texk/texlive/configure
index 664a58b451f4ac832541886df4e528b16234594f..2731e246a22651b4ba4d05376ef931f649d96e0c 100755
--- a/source/texk/texlive/configure
+++ b/source/texk/texlive/configure
@@ -1836,7 +1836,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-am__api_version='1.14'
+am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2008,8 +2008,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -2028,7 +2028,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -2356,8 +2356,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -2415,6 +2415,7 @@ END
fi
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
diff --git a/source/texk/texlive/linked_scripts/Makefile.in b/source/texk/texlive/linked_scripts/Makefile.in
index 0e6f7e409848c43325c08caf2ab6be3f1f800a5e..e8bec9350162fd5beddfcfcfa63e9bb4143f55ea 100644
--- a/source/texk/texlive/linked_scripts/Makefile.in
+++ b/source/texk/texlive/linked_scripts/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -77,14 +87,14 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = linked_scripts
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(nobase_dist_texmf_scripts_SCRIPTS) ChangeLog
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-win32.m4 \
$(top_srcdir)/../../version.ac $(top_srcdir)/ac/texlive.ac \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am \
+ $(nobase_dist_texmf_scripts_SCRIPTS) $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -137,6 +147,7 @@ am__can_run_installinfo = \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in ChangeLog
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -420,7 +431,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign linked_scripts/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign linked_scripts/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -639,6 +649,8 @@ uninstall-am: uninstall-nobase_dist_texmf_scriptsSCRIPTS
uninstall-am uninstall-hook \
uninstall-nobase_dist_texmf_scriptsSCRIPTS
+.PRECIOUS: Makefile
+
scripts-list: Makefile
@echo "Create $@"
diff --git a/source/texk/texlive/tl_scripts/Makefile.in b/source/texk/texlive/tl_scripts/Makefile.in
index 63eec8946564d5a640e409bd39564629292b9c76..ea263ed8bc25588c1f34673c820aaa9707bbbab1 100644
--- a/source/texk/texlive/tl_scripts/Makefile.in
+++ b/source/texk/texlive/tl_scripts/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -16,7 +16,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -77,12 +87,6 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(top_srcdir)/../../am/script_links.am \
- $(top_srcdir)/../../am/bin_links.am \
- $(top_srcdir)/../../am/man1_links.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(dist_texconfig_SCRIPTS) \
- $(dist_texmf_SCRIPTS) $(dist_man_MANS) $(dist_texconfig_DATA) \
- $(dist_web2c_DATA) ChangeLog README
@WIN32_TRUE@@WIN32_WRAP_TRUE@am__append_1 = $(wrappers)
subdir = tl_scripts
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -91,6 +95,9 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-win32.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(dist_texconfig_SCRIPTS) \
+ $(dist_texmf_SCRIPTS) $(dist_texconfig_DATA) \
+ $(dist_web2c_DATA) $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
@@ -152,6 +159,10 @@ NROFF = nroff
MANS = $(dist_man_MANS)
DATA = $(dist_texconfig_DATA) $(dist_web2c_DATA)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \
+ $(top_srcdir)/../../am/bin_links.am \
+ $(top_srcdir)/../../am/man1_links.am \
+ $(top_srcdir)/../../am/script_links.am ChangeLog README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -338,7 +349,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tl_scripts/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign tl_scripts/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -347,7 +357,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
-$(top_srcdir)/../../am/script_links.am $(top_srcdir)/../../am/bin_links.am $(top_srcdir)/../../am/man1_links.am:
+$(top_srcdir)/../../am/script_links.am $(top_srcdir)/../../am/bin_links.am $(top_srcdir)/../../am/man1_links.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -760,6 +770,8 @@ uninstall-man: uninstall-man1 uninstall-man5
uninstall-dist_web2cDATA uninstall-hook uninstall-man \
uninstall-man1 uninstall-man5 uninstall-nodist_binSCRIPTS
+.PRECIOUS: Makefile
+
scripts-list: Makefile
@echo "Create $@"
diff --git a/source/texk/web2c/ChangeLog b/source/texk/web2c/ChangeLog
index 560dbdea7fcfcb8fcdc3f6bd790272fe53c743a2..c3be77464ebd826ec033a0c9f6248821c0f74f53 100644
--- a/source/texk/web2c/ChangeLog
+++ b/source/texk/web2c/ChangeLog
@@ -1,3 +1,33 @@
+2015-01-14 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * mf.ch: Revert the previous change (^Z is again invalid).
+
+ * dvitype.ch: Cosmetic changes.
+
+2015-01-13 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * mf.ch: Ignore ^Z in input files (as tab and form_feed).
+
+2015-01-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * tftopl.ch, vftovp.ch: Use ^byte and x*alloc_array().
+ * cpascal.h: Remove casttobytepointer and pointertobyte.
+
+2015-01-10 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * tftopl.ch: Non-zero return code in case of problems.
+ * tftopl.test, vftovp.test: Add more tests.
+ * tests/badtfm.tfm, tests/badvf.{tfm,vf}: New test input files.
+ * am/web.am: Adjust for additional test input and output files.
+
+2015-01-09 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * pltotf.ch, vptovf.ch: Send diagnostic messages to stderr.
+ Non-zero return code in case of problems.
+ * pltotf.test, vptovf.test: Add more tests.
+ * tests/badpl.pl, tests/badvpl.vpl: New test input files.
+ * am/web.am: Adjust for additional test input and output files.
+
2014-12-11 Karl Berry <karl@tug.org>
* triptest,
diff --git a/source/texk/web2c/Makefile.in b/source/texk/web2c/Makefile.in
index c69b351a8bcb1610a406f2ca4099072c86a9c75d..02c6c7285ac69501c94fbfee461a1c283e157e54 100644
--- a/source/texk/web2c/Makefile.in
+++ b/source/texk/web2c/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -19,7 +19,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -114,55 +124,6 @@ TESTS = tangle.test $(am__EXEEXT_45) ctiedir/ctie.test \
$(am__append_81) $(am__append_82) $(am__append_90) \
$(am__append_92) $(am__append_95) $(am__append_125) \
libmd5/md5.test
-DIST_COMMON = $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am \
- $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am \
- $(srcdir)/mplibdir/am/mplib.am \
- $(srcdir)/pmpostdir/am/pmpost.am \
- $(srcdir)/mplibdir/am/libmputil.am \
- $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am \
- $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am \
- $(srcdir)/uptexdir/am/uptex.am \
- $(srcdir)/euptexdir/am/euptex.am \
- $(srcdir)/pdftexdir/am/libpdftex.am \
- $(srcdir)/pdftexdir/am/pdftex.am \
- $(srcdir)/pdftexdir/am/ttf2afm.am \
- $(srcdir)/pdftexdir/am/pdftosrc.am \
- $(srcdir)/luatexdir/am/luasocket.am \
- $(srcdir)/luatexdir/am/luamisc.am \
- $(srcdir)/luatexdir/am/libunilib.am \
- $(srcdir)/luatexdir/am/luafontforge.am \
- $(srcdir)/luatexdir/am/libluatex.am \
- $(srcdir)/luatexdir/am/luatex.am \
- $(srcdir)/luatexdir/am/txt2zlib.am \
- $(srcdir)/xetexdir/am/xetex.am \
- $(srcdir)/omegaware/am/omegaware.am \
- $(srcdir)/alephdir/am/aleph.am \
- $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am \
- $(srcdir)/../../am/bin_links.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(top_srcdir)/configure \
- $(am__configure_deps) $(srcdir)/c-auto.in \
- $(top_srcdir)/luatexdir/luafontloader/ff-config.in \
- $(top_srcdir)/omegafonts/Makefile.in \
- $(top_srcdir)/otps/Makefile.in \
- $(top_srcdir)/otps/win32/Makefile.in \
- $(top_srcdir)/window/Makefile.in $(srcdir)/web2c-sh.in \
- $(srcdir)/tangle-sh.in $(srcdir)/ctangleboot-sh.in \
- $(srcdir)/silent-sh.in $(top_srcdir)/synctexdir/synctex.pc.in \
- $(top_srcdir)/../texlive/w32_wrapper/callexe.c \
- $(top_srcdir)/../../build-aux/depcomp $(dist_man_MANS) \
- $(am__syncinclude_HEADERS_DIST) \
- $(top_srcdir)/../../build-aux/test-driver AUTHORS ChangeLog \
- NEWS README ../../build-aux/compile \
- ../../build-aux/config.guess ../../build-aux/config.sub \
- ../../build-aux/depcomp ../../build-aux/install-sh \
- ../../build-aux/missing ../../build-aux/texinfo.tex \
- ../../build-aux/ylwrap ../../build-aux/ltmain.sh \
- $(top_srcdir)/../../build-aux/compile \
- $(top_srcdir)/../../build-aux/config.guess \
- $(top_srcdir)/../../build-aux/config.sub \
- $(top_srcdir)/../../build-aux/install-sh \
- $(top_srcdir)/../../build-aux/ltmain.sh \
- $(top_srcdir)/../../build-aux/missing
@WEB_TRUE@am__append_1 = $(web_programs)
@WEB_TRUE@am__append_2 = $(web_tests)
@TEX_TRUE@am__append_3 = tex
@@ -402,6 +363,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(am__syncinclude_HEADERS_DIST) \
+ $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -1799,6 +1763,51 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver
TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
$(TEST_LOG_FLAGS)
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/../../am/bin_links.am \
+ $(srcdir)/Makefile.in $(srcdir)/alephdir/am/aleph.am \
+ $(srcdir)/am/bootstrap.am $(srcdir)/am/cweb.am \
+ $(srcdir)/am/texmf.am $(srcdir)/am/web.am $(srcdir)/c-auto.in \
+ $(srcdir)/ctangleboot-sh.in $(srcdir)/eptexdir/am/eptex.am \
+ $(srcdir)/etexdir/am/etex.am $(srcdir)/euptexdir/am/euptex.am \
+ $(srcdir)/libmd5/am/md5.am $(srcdir)/luatexdir/am/libluatex.am \
+ $(srcdir)/luatexdir/am/libunilib.am \
+ $(srcdir)/luatexdir/am/luafontforge.am \
+ $(srcdir)/luatexdir/am/luamisc.am \
+ $(srcdir)/luatexdir/am/luasocket.am \
+ $(srcdir)/luatexdir/am/luatex.am \
+ $(srcdir)/luatexdir/am/txt2zlib.am \
+ $(srcdir)/mplibdir/am/libmplib.am \
+ $(srcdir)/mplibdir/am/libmputil.am \
+ $(srcdir)/mplibdir/am/mplib.am \
+ $(srcdir)/omegaware/am/omegaware.am \
+ $(srcdir)/pdftexdir/am/libpdftex.am \
+ $(srcdir)/pdftexdir/am/pdftex.am \
+ $(srcdir)/pdftexdir/am/pdftosrc.am \
+ $(srcdir)/pdftexdir/am/ttf2afm.am \
+ $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/ptexdir/am/ptex.am \
+ $(srcdir)/silent-sh.in $(srcdir)/synctexdir/am/synctex.am \
+ $(srcdir)/tangle-sh.in $(srcdir)/uptexdir/am/uptex.am \
+ $(srcdir)/web2c-sh.in $(srcdir)/xetexdir/am/xetex.am \
+ $(top_srcdir)/../../build-aux/compile \
+ $(top_srcdir)/../../build-aux/config.guess \
+ $(top_srcdir)/../../build-aux/config.sub \
+ $(top_srcdir)/../../build-aux/depcomp \
+ $(top_srcdir)/../../build-aux/install-sh \
+ $(top_srcdir)/../../build-aux/ltmain.sh \
+ $(top_srcdir)/../../build-aux/missing \
+ $(top_srcdir)/../../build-aux/test-driver \
+ $(top_srcdir)/../texlive/w32_wrapper/callexe.c \
+ $(top_srcdir)/luatexdir/luafontloader/ff-config.in \
+ $(top_srcdir)/omegafonts/Makefile.in \
+ $(top_srcdir)/otps/Makefile.in \
+ $(top_srcdir)/otps/win32/Makefile.in \
+ $(top_srcdir)/synctexdir/synctex.pc.in \
+ $(top_srcdir)/window/Makefile.in ../../build-aux/compile \
+ ../../build-aux/config.guess ../../build-aux/config.sub \
+ ../../build-aux/depcomp ../../build-aux/install-sh \
+ ../../build-aux/ltmain.sh ../../build-aux/missing \
+ ../../build-aux/texinfo.tex ../../build-aux/ylwrap AUTHORS \
+ ChangeLog NEWS README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -2079,11 +2088,12 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
$(web_programs:=.web) $(web_programs:=.ch) $(web_tests) \
tests/memdata1.bst tests/memdata2.bst tests/memdata3.bst \
tests/allbib.aux tests/allbib.tex tests/apalike.bst \
- tests/batch.tex tests/check.log tests/cmr10.600gf \
- tests/cmr10.pk tests/cmr10.pl tests/cmr10.tfm tests/cmr7.tfm \
- tests/cmr8.tfm tests/cmti10.tfm tests/cmtt10.tfm \
- tests/cmtt8.tfm tests/dict tests/eight.tex tests/end.tex \
- tests/exampl.aux tests/exampl.tex tests/gray.tfm \
+ tests/badpl.pl tests/badtfm.tfm tests/badvf.tfm tests/badvf.vf \
+ tests/badvpl.vpl tests/batch.tex tests/check.log \
+ tests/cmr10.600gf tests/cmr10.pk tests/cmr10.pl \
+ tests/cmr10.tfm tests/cmr7.tfm tests/cmr8.tfm tests/cmti10.tfm \
+ tests/cmtt10.tfm tests/cmtt8.tfm tests/dict tests/eight.tex \
+ tests/end.tex tests/exampl.aux tests/exampl.tex tests/gray.tfm \
tests/hello.tex tests/io.mf tests/just.texi tests/label.mp \
tests/label.mpx tests/logo8.tfm tests/longline.aux \
tests/longline.bib tests/longline.tex tests/longtfm.tex \
@@ -2274,47 +2284,50 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
omegaware/ovf2ovp.up omegaware/ovf2ovp.ch \
omegaware/ovp2ovf.web omegaware/ovp2ovf.up \
omegaware/ovp2ovf.ch $(OTANGLE_tests) $(OMFONTS_tests) \
- omegaware/tests/charwd-r.pl omegaware/tests/charwd-v.vpl \
- omegaware/tests/check.ofm omegaware/tests/check.opl \
- omegaware/tests/checked.opl omegaware/tests/level1.opl \
- omegaware/tests/ligall.opl omegaware/tests/ligbch.opl \
- omegaware/tests/ligbdy.opl omegaware/tests/ligblb.opl \
- omegaware/tests/ligblv.opl omegaware/tests/ligblv.ovp \
- omegaware/tests/ligloop1.ofm omegaware/tests/ligloop1.opl \
- omegaware/tests/ligloop2.opl omegaware/tests/liguse.opl \
- omegaware/tests/liguse1.opl omegaware/tests/liguse2.opl \
- omegaware/tests/ofontd1.dvi omegaware/tests/ofontd1.typ \
- omegaware/tests/ofontd2.dvi omegaware/tests/ofontd2.typ \
- omegaware/tests/ofontd3.dvi omegaware/tests/ofontd3.typ \
- omegaware/tests/ofontr1.vf omegaware/tests/ofontr2.ovf \
- omegaware/tests/ofontr3.ovf omegaware/tests/ofontv4.vf \
- omegaware/tests/ofontv5.ovf omegaware/tests/ofontv6.ovf \
- omegaware/tests/ofontd0.dtl omegaware/tests/ofontd0.dvi \
- omegaware/tests/ofontd0.typ omegaware/tests/ofontr0.tfm \
- omegaware/tests/ofontr1.tfm omegaware/tests/ofontr2.ofm \
- omegaware/tests/ofontr3.ofm omegaware/tests/ofontv4.tfm \
- omegaware/tests/ofontv5.ofm omegaware/tests/ofontv6.ofm \
- omegaware/tests/ofontr0.pl omegaware/tests/ofontr1.pl \
- omegaware/tests/ofontr1.vpl omegaware/tests/ofontr2.opl \
- omegaware/tests/ofontr2.ovp omegaware/tests/ofontr3.opl \
- omegaware/tests/ofontr3.ovp omegaware/tests/ofontv4.pl \
- omegaware/tests/ofontv4.vpl omegaware/tests/ofontv5.opl \
- omegaware/tests/ofontv5.ovp omegaware/tests/ofontv6.opl \
- omegaware/tests/ofontv6.ovp omegaware/tests/Cherokee.pl \
- omegaware/tests/OCherokee.ovp omegaware/tests/inbmp.opl \
- omegaware/tests/overbmp.opl omegaware/tests/overbmp.ovp \
- omegaware/tests/realnum.opl omegaware/tests/realnum.out \
- omegaware/tests/repeat.opl omegaware/tests/repeated.opl \
- omegaware/tests/sample.out omegaware/tests/sample.ovp \
- omegaware/tests/sample0-h.opl omegaware/tests/shorten.opl \
- omegaware/tests/specialhex.ovp omegaware/tests/vrepeat0.ofm \
- omegaware/tests/vrepeat0.opl omegaware/tests/vrepeat1.ofm \
- omegaware/tests/vrepeat1.opl omegaware/tests/vrepeat1.ovf \
- omegaware/tests/vrepeat1.ovp omegaware/tests/arabicr.pl \
- omegaware/tests/arabic.ovp $(aleph_web_srcs) $(aleph_ch_srcs) \
- alephdir/ChangeLog alephdir/aleph.defines \
- alephdir/aleph.version $(aleph_tests) synctexdir/ChangeLog \
- synctexdir/README.txt synctexdir/synctex_parser_readme.txt \
+ omegaware/tests/badofm.ofm omegaware/tests/badopl.opl \
+ omegaware/tests/badovf.ofm omegaware/tests/badovf.ovf \
+ omegaware/tests/badovp.ovp omegaware/tests/charwd-r.pl \
+ omegaware/tests/charwd-v.vpl omegaware/tests/check.ofm \
+ omegaware/tests/check.opl omegaware/tests/checked.opl \
+ omegaware/tests/level1.opl omegaware/tests/ligall.opl \
+ omegaware/tests/ligbch.opl omegaware/tests/ligbdy.opl \
+ omegaware/tests/ligblb.opl omegaware/tests/ligblv.opl \
+ omegaware/tests/ligblv.ovp omegaware/tests/ligloop1.ofm \
+ omegaware/tests/ligloop1.opl omegaware/tests/ligloop2.opl \
+ omegaware/tests/liguse.opl omegaware/tests/liguse1.opl \
+ omegaware/tests/liguse2.opl omegaware/tests/ofontd1.dvi \
+ omegaware/tests/ofontd1.typ omegaware/tests/ofontd2.dvi \
+ omegaware/tests/ofontd2.typ omegaware/tests/ofontd3.dvi \
+ omegaware/tests/ofontd3.typ omegaware/tests/ofontr1.vf \
+ omegaware/tests/ofontr2.ovf omegaware/tests/ofontr3.ovf \
+ omegaware/tests/ofontv4.vf omegaware/tests/ofontv5.ovf \
+ omegaware/tests/ofontv6.ovf omegaware/tests/ofontd0.dtl \
+ omegaware/tests/ofontd0.dvi omegaware/tests/ofontd0.typ \
+ omegaware/tests/ofontr0.tfm omegaware/tests/ofontr1.tfm \
+ omegaware/tests/ofontr2.ofm omegaware/tests/ofontr3.ofm \
+ omegaware/tests/ofontv4.tfm omegaware/tests/ofontv5.ofm \
+ omegaware/tests/ofontv6.ofm omegaware/tests/ofontr0.pl \
+ omegaware/tests/ofontr1.pl omegaware/tests/ofontr1.vpl \
+ omegaware/tests/ofontr2.opl omegaware/tests/ofontr2.ovp \
+ omegaware/tests/ofontr3.opl omegaware/tests/ofontr3.ovp \
+ omegaware/tests/ofontv4.pl omegaware/tests/ofontv4.vpl \
+ omegaware/tests/ofontv5.opl omegaware/tests/ofontv5.ovp \
+ omegaware/tests/ofontv6.opl omegaware/tests/ofontv6.ovp \
+ omegaware/tests/Cherokee.pl omegaware/tests/OCherokee.ovp \
+ omegaware/tests/inbmp.opl omegaware/tests/overbmp.opl \
+ omegaware/tests/overbmp.ovp omegaware/tests/realnum.opl \
+ omegaware/tests/realnum.out omegaware/tests/repeat.opl \
+ omegaware/tests/repeated.opl omegaware/tests/sample.out \
+ omegaware/tests/sample.ovp omegaware/tests/sample0-h.opl \
+ omegaware/tests/shorten.opl omegaware/tests/specialhex.ovp \
+ omegaware/tests/vrepeat0.ofm omegaware/tests/vrepeat0.opl \
+ omegaware/tests/vrepeat1.ofm omegaware/tests/vrepeat1.opl \
+ omegaware/tests/vrepeat1.ovf omegaware/tests/vrepeat1.ovp \
+ omegaware/tests/arabicr.pl omegaware/tests/arabic.ovp \
+ $(aleph_web_srcs) $(aleph_ch_srcs) alephdir/ChangeLog \
+ alephdir/aleph.defines alephdir/aleph.version $(aleph_tests) \
+ synctexdir/ChangeLog synctexdir/README.txt \
+ synctexdir/synctex_parser_readme.txt \
synctexdir/synctex_parser_version.txt synctexdir/tests \
synctexdir/synctex-common.h synctexdir/synctex.c \
synctexdir/synctex.defines synctexdir/synctex.h \
@@ -2339,24 +2352,25 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) CXXLD.sh tangle.c tangle.h \
tests/xpagenum.typ cmr10.dvi tests/xcmr10.dvi cmr10.pk \
tests/xcmr10.pk tests/xcmr10.gft1 tests/xcmr10.gft2 io.tex \
tests/io.tex tests/xpatout pattmp.4 cmr10.gf \
- tests/xcmr10.600gf tests/xcmr10.pktyp tests/xcmr10.tfm \
- tests/xtexpool.typ tests/xcmr10.pl tests/xptmr.vpl \
- tests/yptmr*.* pooltype.tex ctie.c cweave.c tie.c ctie.outc \
- ctie.outm common.tex common.scn common.idx tie.outc tie.outm \
- $(nodist_tex_SOURCES) tex-final.ch tex-web2c tex.p tex.pool \
- tex-tangle trip.diffs write18-quote.log mftrap.diffs \
- $(nodist_libmf_a_SOURCES) mf-final.ch mf-web2c mf.p mf.pool \
- mf-tangle $(nodist_mpost_SOURCES) mpxout-tangle mptrap.diffs \
- ptmr.mpx tests/xptmr.mpx tests/xstory.mpx \
- $(nodist_pmpost_SOURCES) pmp.w pmpost.w pmpxout.w ppsout.w \
- psvgout.w ptfmin.w pmp-tangle pmpxout-tangle ppsout-tangle \
- psvgout-tangle pmpsamp.* upmpsamp.* \
- $(nodist_libmplib_a_SOURCES) mp-tangle mpmath-tangle \
- mpmathbinary-tangle mpmathdecimal-tangle mpmathdouble-tangle \
- mpstrings-tangle psout-tangle svgout-tangle pngout-tangle \
- $(nodist_etex_SOURCES) etex.web etex.ch etex-web2c etex.p \
- etex.pool etex-tangle etrip.diffs ewprob.log ewprob.tex \
- $(pweb_programs:=.c) $(pweb_programs:=.h) $(pweb_programs:=.p) \
+ tests/xcmr10.600gf tests/xcmr10.pktyp badpl.* tests/xcmr10.tfm \
+ tests/xtexpool.typ badtfm.* tests/xcmr10*.pl badvf.* \
+ tests/xptmr*.vpl badvpl.* tests/yptmr*.* pooltype.tex ctie.c \
+ cweave.c tie.c ctie.outc ctie.outm common.tex common.scn \
+ common.idx tie.outc tie.outm $(nodist_tex_SOURCES) \
+ tex-final.ch tex-web2c tex.p tex.pool tex-tangle trip.diffs \
+ write18-quote.log mftrap.diffs $(nodist_libmf_a_SOURCES) \
+ mf-final.ch mf-web2c mf.p mf.pool mf-tangle \
+ $(nodist_mpost_SOURCES) mpxout-tangle mptrap.diffs ptmr.mpx \
+ tests/xptmr.mpx tests/xstory.mpx $(nodist_pmpost_SOURCES) \
+ pmp.w pmpost.w pmpxout.w ppsout.w psvgout.w ptfmin.w \
+ pmp-tangle pmpxout-tangle ppsout-tangle psvgout-tangle \
+ pmpsamp.* upmpsamp.* $(nodist_libmplib_a_SOURCES) mp-tangle \
+ mpmath-tangle mpmathbinary-tangle mpmathdecimal-tangle \
+ mpmathdouble-tangle mpstrings-tangle psout-tangle \
+ svgout-tangle pngout-tangle $(nodist_etex_SOURCES) etex.web \
+ etex.ch etex-web2c etex.p etex.pool etex-tangle etrip.diffs \
+ ewprob.log ewprob.tex $(pweb_programs:=.c) \
+ $(pweb_programs:=.h) $(pweb_programs:=.p) \
$(pweb_programs:=-web2c) $(pweb_programs:=.web) \
$(nodist_ptex_SOURCES) ptex.web ptex.ch ptex-web2c ptex.p \
ptex.pool ptex-tangle ptests/nissya_bib.* ptests/xexampl.aux \
@@ -2384,22 +2398,22 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) CXXLD.sh tangle.c tangle.h \
bug73.log bug73.out bug73.tex $(omegaware_programs:=.c) \
$(omegaware_programs:=.h) $(omegaware_programs:=.p) \
$(omegaware_programs:=-web2c) ofm2opl.web opl2ofm.web \
- ovf2ovp.web ovp2ovf.web omegaware/tests/charwdr.* \
- omegaware/tests/charwdv.* omegaware/tests/xcheck* \
- omegaware/tests/xlevel1.* omegaware/tests/xlig*.* ofont*vf \
- omegaware/tests/xofont* omegaware/tests/Cherokee.tfm \
- omegaware/tests/OCherokee.ofm omegaware/tests/OCherokee.opl \
- omegaware/tests/OCherokee.ovf omegaware/tests/xCherokee.* \
- omegaware/tests/xOCherokee.* omegaware/tests/xinbmp* \
- omegaware/tests/xoverbmp* ocftest.* omegaware/tests/xrealnum.* \
- omegaware/tests/xrepeated.* omegaware/tests/sample*.ofm \
- omegaware/tests/sample*.ovf omegaware/tests/sample1-h.opl \
- omegaware/tests/xsample*.out omegaware/tests/shortend.* \
- omegaware/tests/specialhex.ofm omegaware/tests/specialhex.opl \
- omegaware/tests/specialhex.ovf omegaware/tests/xspecialhex.* \
- omegaware/tests/yrepeat* omegaware/tests/*yarabic* \
- $(nodist_aleph_SOURCES) aleph.web aleph.ch aleph-web2c aleph.p \
- aleph.pool aleph-tangle
+ ovf2ovp.web ovp2ovf.web omegaware/bad*.* \
+ omegaware/tests/charwdr.* omegaware/tests/charwdv.* \
+ omegaware/tests/xcheck* omegaware/tests/xlevel1.* \
+ omegaware/tests/xlig*.* ofont*vf omegaware/tests/xofont* \
+ omegaware/tests/Cherokee.tfm omegaware/tests/OCherokee.ofm \
+ omegaware/tests/OCherokee.opl omegaware/tests/OCherokee.ovf \
+ omegaware/tests/xCherokee.* omegaware/tests/xOCherokee.* \
+ ocftest.* omegaware/tests/xinbmp* omegaware/tests/xoverbmp* \
+ omegaware/tests/xrealnum.* omegaware/tests/xrepeated.* \
+ omegaware/tests/sample*.ofm omegaware/tests/sample*.ovf \
+ omegaware/tests/sample1-h.opl omegaware/tests/xsample*.out \
+ omegaware/tests/shortend.* omegaware/tests/specialhex.ofm \
+ omegaware/tests/specialhex.opl omegaware/tests/specialhex.ovf \
+ omegaware/tests/xspecialhex.* omegaware/tests/yrepeat* \
+ omegaware/tests/*yarabic* $(nodist_aleph_SOURCES) aleph.web \
+ aleph.ch aleph-web2c aleph.p aleph.pool aleph-tangle
CLEANFILES =
TRIPTRAP_CLEAN = $(am__append_9) $(am__append_17) $(am__append_26) \
$(am__append_43) $(am__append_49) $(am__append_55) \
@@ -3438,13 +3452,14 @@ nodist_wovp2ovf_SOURCES = ovp2ovf.c ovp2ovf.h
OTANGLE_tests = omegaware/odvicopy.test omegaware/odvitype.test \
omegaware/otangle.test
-OMFONTS_tests = omegaware/charwd.test omegaware/check.test \
- omegaware/help.test omegaware/level1.test \
- omegaware/ligkern.test omegaware/ofonts.test \
- omegaware/omfonts.test omegaware/overbmp.test \
- omegaware/realnum.test omegaware/repeat.test \
- omegaware/selectfont.test omegaware/shorten.test \
- omegaware/specialhex.test omegaware/vrepeat.test \
+OMFONTS_tests = omegaware/bad.test omegaware/charwd.test \
+ omegaware/check.test omegaware/help.test \
+ omegaware/level1.test omegaware/ligkern.test \
+ omegaware/ofonts.test omegaware/omfonts.test \
+ omegaware/overbmp.test omegaware/realnum.test \
+ omegaware/repeat.test omegaware/selectfont.test \
+ omegaware/shorten.test omegaware/specialhex.test \
+ omegaware/version.test omegaware/vrepeat.test \
omegaware/yannis.test
al_tangle = WEBINPUTS=.:$(srcdir) AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(OTANGLE)
@@ -3658,7 +3673,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/txt2zlib.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am:
+$(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/txt2zlib.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -13965,7 +13980,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
if test -n "$$am__remaking_logs"; then \
echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
"recursion detected" >&2; \
- else \
+ elif test -n "$$redo_logs"; then \
am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
fi; \
if $(am__make_dryrun); then :; else \
@@ -14266,15 +14281,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -14310,17 +14325,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -14589,6 +14604,8 @@ uninstall-man: uninstall-man1 uninstall-man5
uninstall-man1 uninstall-man5 uninstall-pkgconfigDATA \
uninstall-syncincludeHEADERS
+.PRECIOUS: Makefile
+
dist-hook:
cd "$(distdir)" && rm -rf $(NEVER_DIST)
diff --git a/source/texk/web2c/aclocal.m4 b/source/texk/web2c/aclocal.m4
index 18fbfb555eeeefc7ee22776d4e1f249a89472e09..4dcb26da29c50493ff807c027e3a8b2587ad7e4d 100644
--- a/source/texk/web2c/aclocal.m4
+++ b/source/texk/web2c/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_COND_IF -*- Autoconf -*-
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -148,7 +147,7 @@ fi[]dnl
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -179,7 +178,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -370,7 +369,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -446,7 +445,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -536,8 +535,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -610,7 +609,11 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -639,7 +642,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -650,7 +653,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -660,7 +663,7 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -682,7 +685,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -717,7 +720,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -767,7 +770,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -806,7 +809,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -835,7 +838,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -882,7 +885,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -901,7 +904,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -982,7 +985,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1042,7 +1045,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1070,7 +1073,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1089,7 +1092,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/source/texk/web2c/am/web.am b/source/texk/web2c/am/web.am
index 1efa64b198f6b15a492f480438a7db4b6b92448e..2448409ca34409cce6bf6731215dda6df357d811 100644
--- a/source/texk/web2c/am/web.am
+++ b/source/texk/web2c/am/web.am
@@ -1,6 +1,6 @@
## texk/web2c/am/web.am: Makefile fragment for normal web programs (except tangle).
##
-## Copyright (C) 2009-2013 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.
web_programs = bibtex dvicopy dvitype gftodvi gftopk gftype mft \
@@ -182,16 +182,16 @@ DISTCLEANFILES += tests/xpatout pattmp.4
DISTCLEANFILES += cmr10.gf tests/xcmr10.600gf
## pktype.test
DISTCLEANFILES += tests/xcmr10.pktyp
-## pltotf.tes
-DISTCLEANFILES += tests/xcmr10.tfm
+## pltotf.test
+DISTCLEANFILES += badpl.* tests/xcmr10.tfm
## pooltype.test
DISTCLEANFILES += tests/xtexpool.typ
## tftopl.test
-DISTCLEANFILES += tests/xcmr10.pl
+DISTCLEANFILES += badtfm.* tests/xcmr10*.pl
## vftovp.test
-DISTCLEANFILES += tests/xptmr.vpl
+DISTCLEANFILES += badvf.* tests/xptmr*.vpl
## vptovf.test
-DISTCLEANFILES += tests/yptmr*.*
+DISTCLEANFILES += badvpl.* tests/yptmr*.*
## weave.test
DISTCLEANFILES += pooltype.tex
@@ -201,6 +201,11 @@ EXTRA_DIST += \
tests/allbib.aux \
tests/allbib.tex \
tests/apalike.bst \
+ tests/badpl.pl \
+ tests/badtfm.tfm \
+ tests/badvf.tfm \
+ tests/badvf.vf \
+ tests/badvpl.vpl \
tests/batch.tex \
tests/check.log \
tests/cmr10.600gf \
diff --git a/source/texk/web2c/configure b/source/texk/web2c/configure
index ea8a26464a67f8e74565a45f919dac935cbfde1f..00d53b48fe7950da42c9b0245b25b27d0f78e10c 100755
--- a/source/texk/web2c/configure
+++ b/source/texk/web2c/configure
@@ -3372,7 +3372,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
WEB2CVERSION=2015/dev
-am__api_version='1.14'
+am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -3544,8 +3544,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -3564,7 +3564,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -8660,8 +8660,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -8719,6 +8719,7 @@ END
fi
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
diff --git a/source/texk/web2c/cpascal.h b/source/texk/web2c/cpascal.h
index 785f81a4e2358ec82a25581c18febdde1da86e91..903ebfdfa2191cee5562c5f0eecdeaeed8619920 100644
--- a/source/texk/web2c/cpascal.h
+++ b/source/texk/web2c/cpascal.h
@@ -142,10 +142,6 @@ typedef FILE *text;
#define aopenout(f) open_output (&(f), FOPEN_W_MODE)
#define aclose close_file
-/* For faking arrays in tftopl. */
-typedef unsigned char *pointertobyte;
-#define casttobytepointer(e) ((pointertobyte) e)
-
/* How to output to the GF or DVI file. */
#define WRITE_OUT(a, b) \
if ((size_t) fwrite ((char *) &OUT_BUF[a], sizeof (OUT_BUF[a]), \
diff --git a/source/texk/web2c/doc/Makefile.in b/source/texk/web2c/doc/Makefile.in
index 0f66c96b90e48662ae6ea9982bd73b86daf3ec2d..8b3b6006c6d5cdd52aa6fba2622353bec47fe431 100644
--- a/source/texk/web2c/doc/Makefile.in
+++ b/source/texk/web2c/doc/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -78,9 +88,6 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(web2c_TEXINFOS) $(top_srcdir)/../../build-aux/texinfo.tex \
- README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-asm.m4 \
@@ -125,6 +132,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/w2c/c-auto.h \
$(top_builddir)/ff-config.h
@@ -219,6 +227,9 @@ am__uninstall_files_from_dir = { \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/../../build-aux/texinfo.tex $(web2c_TEXINFOS) \
+ README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -457,7 +468,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign doc/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -876,6 +886,8 @@ uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
uninstall-dvi-am uninstall-html-am uninstall-info-am \
uninstall-pdf-am uninstall-ps-am
+.PRECIOUS: Makefile
+
# 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/source/texk/web2c/lib/Makefile.in b/source/texk/web2c/lib/Makefile.in
index ba53b1c38857f1f54e272f3890c34d9973f2a7a9..ee2c4707f6d33c3d25ffd795da840d9bd8efb760 100644
--- a/source/texk/web2c/lib/Makefile.in
+++ b/source/texk/web2c/lib/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -80,8 +90,6 @@ build_triplet = @build@
host_triplet = @host@
@PTEX_TRUE@am__append_1 = libp.a
subdir = lib
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/../../build-aux/depcomp ChangeLog README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-asm.m4 \
@@ -126,6 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/w2c/c-auto.h \
$(top_builddir)/ff-config.h
@@ -215,6 +224,8 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/../../build-aux/depcomp ChangeLog README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -479,7 +490,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign lib/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -796,6 +806,8 @@ uninstall-am:
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
@KPATHSEA_RULE@
diff --git a/source/texk/web2c/luatexdir/ChangeLog b/source/texk/web2c/luatexdir/ChangeLog
index 6ce736f5a90258281c974a7426cd7c9a1907b5c4..914a0f99b725cc2c4ba94fdd0a4f3408473ae7b0 100644
--- a/source/texk/web2c/luatexdir/ChangeLog
+++ b/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,12 @@
+2015-01-14 Luigi Scarso <luigi.scarso@gmail.com>
+
+ tex/mlist.w: mlist_to_hlist(pointer mlist, boolean penalties, int cur_style)
+ HH-LS: was cur_mu = x_over_n(get_math_quad(cur_size), 18);
+ This is an old bug so the fix can influence outcome
+ The current mu is instead
+ cur_mu = x_over_n(get_math_quad(cur_style), 18);
+ Thanks to joseph.wright <joseph.wright@morningstar2.co.uk>
+
2014-12-21 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* lua/lnodelib.c: Sync with the upstream. Luigi fixes 'print' for
diff --git a/source/texk/web2c/luatexdir/tex/mlist.w b/source/texk/web2c/luatexdir/tex/mlist.w
index 89a9933b60fe93c1a5de89b9f00947c442482bd8..3c186b9e278f69a666c08abc9c1003dbf9c323b1 100644
--- a/source/texk/web2c/luatexdir/tex/mlist.w
+++ b/source/texk/web2c/luatexdir/tex/mlist.w
@@ -3333,7 +3333,9 @@ static void mlist_to_hlist(pointer mlist, boolean penalties, int cur_style)
case style_node:
cur_style = subtype(q);
setup_cur_size(cur_style);
- cur_mu = x_over_n(get_math_quad(cur_size), 18);
+ /* HH-LS: was cur_mu = x_over_n(get_math_quad(cur_size), 18);*/
+ /* This is an old bug so the fix can influence outcome */
+ cur_mu = x_over_n(get_math_quad(cur_style), 18);
goto DONE_WITH_NODE;
break;
case choice_node:
diff --git a/source/texk/web2c/man/Makefile.in b/source/texk/web2c/man/Makefile.in
index 0920773a57a1d34baf1ac2624b132c6105f989da..57a742b2660e6700f11a889c304d92c4acaa3387 100644
--- a/source/texk/web2c/man/Makefile.in
+++ b/source/texk/web2c/man/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -92,9 +102,6 @@ host_triplet = @host@
@OTANGLE_TRUE@am__append_13 = dvicopy:odvicopy dvitype:odvitype tangle:otangle
@ALEPH_TRUE@am__append_14 = aleph.man
@ALEPH_TRUE@am__append_15 = aleph:lamed
-DIST_COMMON = $(top_srcdir)/../../am/man.am \
- $(top_srcdir)/../../am/man1_links.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am ChangeLog README
subdir = man
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
@@ -140,6 +147,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/w2c/c-auto.h \
$(top_builddir)/ff-config.h
@@ -196,6 +204,8 @@ am__installdirs = "$(DESTDIR)$(man1dir)"
NROFF = nroff
MANS = $(nodist_man1_MANS)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/../../am/man.am \
+ $(top_srcdir)/../../am/man1_links.am ChangeLog README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -464,7 +474,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign man/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -473,7 +482,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
-$(top_srcdir)/../../am/man.am $(top_srcdir)/../../am/man1_links.am:
+$(top_srcdir)/../../am/man.am $(top_srcdir)/../../am/man1_links.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -690,6 +699,8 @@ uninstall-man: uninstall-man1
mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am uninstall-hook uninstall-man uninstall-man1
+.PRECIOUS: Makefile
+
.man.1:
$(AM_V_GEN)sed -f sedscript $< >$@
diff --git a/source/texk/web2c/mplibdir/ChangeLog b/source/texk/web2c/mplibdir/ChangeLog
index 2b91f635e35127c2835bedd74cb40fa0901f1007..8f33b682d885ad891661e6b127e2d11704ff98b6 100644
--- a/source/texk/web2c/mplibdir/ChangeLog
+++ b/source/texk/web2c/mplibdir/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-15 Luigi Scarso <luigi.scarso@gmail.com>
+ mpmathdecimal.w: better management for static data in mpmathdecimal.w
+ (thanks to Philipp Gesang <phg@phi-gamma.net>)
+
2014-12-04 Luigi Scarso <luigi.scarso@gmail.com>
* mpost.w: fixed exit values to match metafont/old metapost behavior.
diff --git a/source/texk/web2c/mplibdir/mpmathdecimal.w b/source/texk/web2c/mplibdir/mpmathdecimal.w
index b530d0986d091c3552f92b73c4be4b3fcee201fa..c65e2a5a420d1e085cd865c0aa5f74cfbc9db4d2 100644
--- a/source/texk/web2c/mplibdir/mpmathdecimal.w
+++ b/source/texk/web2c/mplibdir/mpmathdecimal.w
@@ -358,7 +358,7 @@ static decNumber epsilon_decNumber;
static decNumber EL_GORDO_decNumber;
static decNumber **factorials = NULL;
static int last_cached_factorial = 0;
-
+static boolean initialized = false ;
@ @c
void * mp_initialize_decimal_math (MP mp) {
math_data *math = (math_data *)mp_xmalloc(mp,1,sizeof(math_data));
@@ -371,22 +371,25 @@ void * mp_initialize_decimal_math (MP mp) {
limitedset.emin = -999999;
set.digits = DECPRECISION_DEFAULT;
limitedset.digits = DECPRECISION_DEFAULT;
- decNumberFromInt32(&one, 1);
- decNumberFromInt32(&minusone, -1);
- decNumberFromInt32(&zero, 0);
- decNumberFromInt32(&two_decNumber, two);
- decNumberFromInt32(&three_decNumber, three);
- decNumberFromInt32(&four_decNumber, four);
- decNumberFromInt32(&fraction_multiplier_decNumber, fraction_multiplier);
- decNumberFromInt32(&fraction_one_decNumber, fraction_one);
- decNumberFromInt32(&fraction_one_plus_decNumber, (fraction_one+1));
- decNumberFromInt32(&angle_multiplier_decNumber, angle_multiplier);
- decNumberFromString(&PI_decNumber, PI_STRING, &set);
- decNumberFromString(&epsilon_decNumber, epsilon, &set);
- decNumberFromString(&EL_GORDO_decNumber, EL_GORDO, &set);
- factorials = (decNumber **)mp_xmalloc(mp,PRECALC_FACTORIALS_CACHESIZE,sizeof(decNumber *));
- factorials[0] = (decNumber *)mp_xmalloc(mp,1,sizeof(decNumber));
- decNumberCopy(factorials[0], &one);
+ if (!initialized) {
+ initialized = true ;
+ decNumberFromInt32(&one, 1);
+ decNumberFromInt32(&minusone, -1);
+ decNumberFromInt32(&zero, 0);
+ decNumberFromInt32(&two_decNumber, two);
+ decNumberFromInt32(&three_decNumber, three);
+ decNumberFromInt32(&four_decNumber, four);
+ decNumberFromInt32(&fraction_multiplier_decNumber, fraction_multiplier);
+ decNumberFromInt32(&fraction_one_decNumber, fraction_one);
+ decNumberFromInt32(&fraction_one_plus_decNumber, (fraction_one+1));
+ decNumberFromInt32(&angle_multiplier_decNumber, angle_multiplier);
+ decNumberFromString(&PI_decNumber, PI_STRING, &set);
+ decNumberFromString(&epsilon_decNumber, epsilon, &set);
+ decNumberFromString(&EL_GORDO_decNumber, EL_GORDO, &set);
+ factorials = (decNumber **)mp_xmalloc(mp,PRECALC_FACTORIALS_CACHESIZE,sizeof(decNumber *));
+ factorials[0] = (decNumber *)mp_xmalloc(mp,1,sizeof(decNumber));
+ decNumberCopy(factorials[0], &one);
+ }
/* alloc */
math->allocate = mp_new_number;
diff --git a/source/texk/web2c/omegafonts/Makefile.in b/source/texk/web2c/omegafonts/Makefile.in
index 0a214f48c68d4f140581567759c650e659e19de1..ee9fb2646261cfcdc1fa6f7ab5ce1cdc89e0a084 100644
--- a/source/texk/web2c/omegafonts/Makefile.in
+++ b/source/texk/web2c/omegafonts/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -82,11 +92,6 @@ bin_PROGRAMS = $(am__EXEEXT_1)
@OTANGLE_TRUE@am__append_1 = omfonts
@OTANGLE_TRUE@@WIN32_TRUE@noinst_PROGRAMS = call_omfonts$(EXEEXT)
EXTRA_PROGRAMS = omfonts$(EXEEXT)
-DIST_COMMON = $(top_srcdir)/../../am/bin_links.am \
- $(srcdir)/Makefile.in $(srcdir)/Makefile.am pl-parser.h \
- pl-parser.c pl-lexer.c $(top_srcdir)/../../build-aux/depcomp \
- $(top_srcdir)/../../build-aux/ylwrap \
- $(top_srcdir)/../../build-aux/test-driver ChangeLog
subdir = omegafonts
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
@@ -132,6 +137,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/w2c/c-auto.h \
$(top_builddir)/ff-config.h
@@ -440,6 +446,12 @@ am__set_b = \
*) \
b='$*';; \
esac
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/../../am/bin_links.am \
+ $(top_srcdir)/../../build-aux/depcomp \
+ $(top_srcdir)/../../build-aux/test-driver \
+ $(top_srcdir)/../../build-aux/ylwrap ChangeLog pl-lexer.c \
+ pl-parser.c pl-parser.h
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -704,15 +716,15 @@ omfonts_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND)
call_omfonts_CPPFLAGS = -DEXEPROG=\"omfonts.exe\"
nodist_call_omfonts_SOURCES = ../callexe.c
call_omfonts_LDADD =
-DISTCLEANFILES = pl-parser.output tests/charwdr.* tests/charwdv.* \
- tests/xcheck* tests/xlevel1.* tests/xlig*.* tests/xofont* \
- tests/Cherokee.tfm tests/OCherokee.ofm tests/OCherokee.opl \
- tests/OCherokee.ovf tests/xCherokee.* tests/xOCherokee.* \
- tests/xinbmp* tests/xoverbmp* tests/realnum.* \
- tests/xrepeated.* tests/sample*.ofm tests/sample*.ovf \
- tests/sample1-h.opl tests/xsample*.out tests/shortend.* \
- tests/specialhex.ofm tests/specialhex.opl tests/specialhex.ovf \
- tests/xspecialhex.* tests/*yarabic*
+DISTCLEANFILES = pl-parser.output bad*.* tests/charwdr.* \
+ tests/charwdv.* tests/xcheck* tests/xlevel1.* tests/xlig*.* \
+ tests/xofont* tests/Cherokee.tfm tests/OCherokee.ofm \
+ tests/OCherokee.opl tests/OCherokee.ovf tests/xCherokee.* \
+ tests/xOCherokee.* tests/xinbmp* tests/xoverbmp* \
+ tests/realnum.* tests/xrepeated.* tests/sample*.ofm \
+ tests/sample*.ovf tests/sample1-h.opl tests/xsample*.out \
+ tests/shortend.* tests/specialhex.ofm tests/specialhex.opl \
+ tests/specialhex.ovf tests/xspecialhex.* tests/*yarabic*
linked_programs = ofm2opl opl2ofm ovf2ovp ovp2ovf
bin_links = \
omfonts$(EXEEXT):ofm2opl \
@@ -720,27 +732,29 @@ bin_links = \
omfonts$(EXEEXT):ovf2ovp \
omfonts$(EXEEXT):ovp2ovf
-OMFONTS_tests = charwd.test check.test help.test level1.test ligkern.test \
+OMFONTS_tests = bad.test charwd.test check.test help.test level1.test ligkern.test \
ofonts.test omfonts.test overbmp.test realnum.test repeat.test \
- selectfont.test shorten.test specialhex.test yannis.test
+ selectfont.test shorten.test specialhex.test version.test yannis.test
@OTANGLE_TRUE@TESTS = $(OMFONTS_tests)
-EXTRA_DIST = $(OMFONTS_tests) tests/charwd-r.pl tests/charwd-v.vpl \
- tests/check.ofm tests/check.opl tests/checked.opl \
- tests/level1.opl tests/ligall.opl tests/ligbch.opl \
- tests/ligbdy.opl tests/ligblb.opl tests/ligblv.opl \
- tests/ligblv.ovp tests/ligloop1.ofm tests/ligloop1.opl \
- tests/ligloop2.opl tests/liguse.opl tests/liguse1.opl \
- tests/liguse2.opl tests/ofontr0.pl tests/ofontr1.pl \
- tests/ofontr1.vpl tests/ofontr2.opl tests/ofontr2.ovp \
- tests/ofontr3.opl tests/ofontr3.ovp tests/ofontv4.pl \
- tests/ofontv4.vpl tests/ofontv5.opl tests/ofontv5.ovp \
- tests/ofontv6.opl tests/ofontv6.ovp tests/Cherokee.pl \
- tests/OCherokee.ovp tests/inbmp.opl tests/overbmp.opl \
- tests/overbmp.ovp tests/realnum.opl tests/realnum.out \
- tests/repeat.opl tests/repeated.opl tests/sample.out \
- tests/sample.ovp tests/sample0-h.opl tests/shorten.opl \
- tests/specialhex.ovp tests/arabicr.pl tests/arabic.ovp
+EXTRA_DIST = $(OMFONTS_tests) tests/badofm.ofm tests/badopl.opl \
+ tests/badovf.ofm tests/badovf.ovf tests/badovp.ovp \
+ tests/charwd-r.pl tests/charwd-v.vpl tests/check.ofm \
+ tests/check.opl tests/checked.opl tests/level1.opl \
+ tests/ligall.opl tests/ligbch.opl tests/ligbdy.opl \
+ tests/ligblb.opl tests/ligblv.opl tests/ligblv.ovp \
+ tests/ligloop1.ofm tests/ligloop1.opl tests/ligloop2.opl \
+ tests/liguse.opl tests/liguse1.opl tests/liguse2.opl \
+ tests/ofontr0.pl tests/ofontr1.pl tests/ofontr1.vpl \
+ tests/ofontr2.opl tests/ofontr2.ovp tests/ofontr3.opl \
+ tests/ofontr3.ovp tests/ofontv4.pl tests/ofontv4.vpl \
+ tests/ofontv5.opl tests/ofontv5.ovp tests/ofontv6.opl \
+ tests/ofontv6.ovp tests/Cherokee.pl tests/OCherokee.ovp \
+ tests/inbmp.opl tests/overbmp.opl tests/overbmp.ovp \
+ tests/realnum.opl tests/realnum.out tests/repeat.opl \
+ tests/repeated.opl tests/sample.out tests/sample.ovp \
+ tests/sample0-h.opl tests/shorten.opl tests/specialhex.ovp \
+ tests/arabicr.pl tests/arabic.ovp
all: all-am
.SUFFIXES:
@@ -757,7 +771,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign omegafonts/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign omegafonts/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -766,7 +779,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
-$(top_srcdir)/../../am/bin_links.am:
+$(top_srcdir)/../../am/bin_links.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -1011,7 +1024,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
if test -n "$$am__remaking_logs"; then \
echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
"recursion detected" >&2; \
- else \
+ elif test -n "$$redo_logs"; then \
am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
fi; \
if $(am__make_dryrun); then :; else \
@@ -1307,6 +1320,8 @@ uninstall-am: uninstall-binPROGRAMS
recheck tags tags-am uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-hook
+.PRECIOUS: Makefile
+
# Rebuild $(proglib)
$(proglib): ${top_srcdir}/lib/*.c
diff --git a/source/texk/web2c/omegaware/am/omegaware.am b/source/texk/web2c/omegaware/am/omegaware.am
index 342f973fb861d51c82062f1581ed506db631069c..ab72856fe4f111272a543a4d9bbda8d2c4f14a70 100644
--- a/source/texk/web2c/omegaware/am/omegaware.am
+++ b/source/texk/web2c/omegaware/am/omegaware.am
@@ -99,13 +99,14 @@ DISTCLEANFILES += ovp2ovf.web
##
OTANGLE_tests = omegaware/odvicopy.test omegaware/odvitype.test \
omegaware/otangle.test
-OMFONTS_tests = omegaware/charwd.test omegaware/check.test \
- omegaware/help.test omegaware/level1.test \
- omegaware/ligkern.test omegaware/ofonts.test \
- omegaware/omfonts.test omegaware/overbmp.test \
- omegaware/realnum.test omegaware/repeat.test \
- omegaware/selectfont.test omegaware/shorten.test \
- omegaware/specialhex.test omegaware/vrepeat.test \
+OMFONTS_tests = omegaware/bad.test omegaware/charwd.test \
+ omegaware/check.test omegaware/help.test \
+ omegaware/level1.test omegaware/ligkern.test \
+ omegaware/ofonts.test omegaware/omfonts.test \
+ omegaware/overbmp.test omegaware/realnum.test \
+ omegaware/repeat.test omegaware/selectfont.test \
+ omegaware/shorten.test omegaware/specialhex.test \
+ omegaware/version.test omegaware/vrepeat.test \
omegaware/yannis.test
EXTRA_DIST += $(OTANGLE_tests) $(OMFONTS_tests)
@@ -113,6 +114,11 @@ if OTANGLE
TESTS += $(OTANGLE_tests) $(OMFONTS_tests)
endif OTANGLE
+## omegaware/bad.test
+EXTRA_DIST += \
+ omegaware/tests/badofm.ofm omegaware/tests/badopl.opl \
+ omegaware/tests/badovf.ofm omegaware/tests/badovf.ovf omegaware/tests/badovp.ovp
+DISTCLEANFILES += omegaware/bad*.*
## omegaware/charwd.test
EXTRA_DIST += omegaware/tests/charwd-r.pl omegaware/tests/charwd-v.vpl
DISTCLEANFILES += omegaware/tests/charwdr.* omegaware/tests/charwdv.*
@@ -159,12 +165,12 @@ EXTRA_DIST += omegaware/tests/Cherokee.pl omegaware/tests/OCherokee.ovp
DISTCLEANFILES += omegaware/tests/Cherokee.tfm omegaware/tests/OCherokee.ofm \
omegaware/tests/OCherokee.opl omegaware/tests/OCherokee.ovf \
omegaware/tests/xCherokee.* omegaware/tests/xOCherokee.*
+## omegaware/otangle.test
+DISTCLEANFILES += ocftest.*
## omegaware/overbmp.test
EXTRA_DIST += omegaware/tests/inbmp.opl omegaware/tests/overbmp.opl \
omegaware/tests/overbmp.ovp
DISTCLEANFILES += omegaware/tests/xinbmp* omegaware/tests/xoverbmp*
-## omegaware/otangle.test
-DISTCLEANFILES += ocftest.*
## omegaware/realnum.test
EXTRA_DIST += omegaware/tests/realnum.opl omegaware/tests/realnum.out
DISTCLEANFILES += omegaware/tests/xrealnum.*
diff --git a/source/texk/web2c/otps/Makefile.in b/source/texk/web2c/otps/Makefile.in
index 0b39797f55550ba824552c195d42d04e465ea8c5..79f6fbba5fc336caac83e7c55a811bc33ad6079d 100644
--- a/source/texk/web2c/otps/Makefile.in
+++ b/source/texk/web2c/otps/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -83,11 +93,6 @@ host_triplet = @host@
@OTANGLE_TRUE@bin_PROGRAMS = $(am__EXEEXT_1)
EXTRA_PROGRAMS = $(am__EXEEXT_1)
subdir = otps
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am otp-parser.h \
- otp-parser.c otp-lexer.c $(top_srcdir)/../../build-aux/depcomp \
- $(top_srcdir)/../../build-aux/ylwrap $(dist_man1_MANS) \
- $(noinst_HEADERS) $(top_srcdir)/../../build-aux/test-driver \
- ChangeLog
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-asm.m4 \
@@ -132,6 +137,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
+ $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/w2c/c-auto.h \
$(top_builddir)/ff-config.h
@@ -455,6 +462,11 @@ am__set_b = \
b='$*';; \
esac
DIST_SUBDIRS = win32
+am__DIST_COMMON = $(dist_man1_MANS) $(srcdir)/Makefile.in \
+ $(top_srcdir)/../../build-aux/depcomp \
+ $(top_srcdir)/../../build-aux/test-driver \
+ $(top_srcdir)/../../build-aux/ylwrap ChangeLog otp-lexer.c \
+ otp-parser.c otp-parser.h
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
dir0=`pwd`; \
@@ -743,7 +755,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign otps/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign otps/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -1075,7 +1086,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
if test -n "$$am__remaking_logs"; then \
echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
"recursion detected" >&2; \
- else \
+ elif test -n "$$redo_logs"; then \
am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
fi; \
if $(am__make_dryrun); then :; else \
@@ -1394,6 +1405,8 @@ uninstall-man: uninstall-man1
uninstall uninstall-am uninstall-binPROGRAMS \
uninstall-binSCRIPTS uninstall-man uninstall-man1
+.PRECIOUS: Makefile
+
# Rebuild $(proglib)
$(proglib): ${top_srcdir}/lib/*.c
diff --git a/source/texk/web2c/otps/win32/Makefile.in b/source/texk/web2c/otps/win32/Makefile.in
index 95bbe1cf3b1a6d0e902859eb97e549a9949351c2..f9ae3bd549e8367a3b4f306633598097df2e0408 100644
--- a/source/texk/web2c/otps/win32/Makefile.in
+++ b/source/texk/web2c/otps/win32/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -80,8 +90,6 @@ build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = mkocp$(EXEEXT) mkofm$(EXEEXT)
subdir = otps/win32
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/../../build-aux/depcomp ChangeLog
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-asm.m4 \
@@ -126,6 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/w2c/c-auto.h \
$(top_builddir)/ff-config.h
@@ -203,6 +212,8 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/../../build-aux/depcomp ChangeLog
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -444,7 +455,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign otps/win32/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign otps/win32/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -778,6 +788,8 @@ uninstall-am: uninstall-binPROGRAMS
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
+.PRECIOUS: Makefile
+
@KPATHSEA_RULE@
diff --git a/source/texk/web2c/pltotf.test b/source/texk/web2c/pltotf.test
index 2ce47359be4b8c45024e2659327da258b5de797a..5e8aeeb38eef5df95fbc9362ec7409c2ff3796c1 100644
--- a/source/texk/web2c/pltotf.test
+++ b/source/texk/web2c/pltotf.test
@@ -1,10 +1,16 @@
#! /bin/sh
-# Copyright (C) 2009-2013 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.
test -d tests || mkdir -p tests
+./pltotf -help || exit 1
+
+./pltotf -version || exit 1
+
+./pltotf -verbose $srcdir/tests/badpl && exit 1
+
./pltotf -verbose $srcdir/tests/cmr10 tests/xcmr10 || exit 1
cmp $srcdir/tests/cmr10.tfm tests/xcmr10.tfm || exit 1
diff --git a/source/texk/web2c/tftopl.test b/source/texk/web2c/tftopl.test
index 19c4e9f120398e211b257bfd15ef43382a031282..49237d2f982267df4f25691e635bdbda863dd894 100644
--- a/source/texk/web2c/tftopl.test
+++ b/source/texk/web2c/tftopl.test
@@ -1,12 +1,22 @@
#! /bin/sh
-# Copyright (C) 2009-2013 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.
test -d tests || mkdir -p tests
-TEXMFCNF=$srcdir/../kpathsea \
- ./tftopl -verbose $srcdir/tests/cmr10 tests/xcmr10 || exit 1
+./tftopl -version || exit 1
-diff $srcdir/tests/cmr10.pl tests/xcmr10.pl || exit 1
+TEXMFCNF=$srcdir/../kpathsea
+export TEXMFCNF
+
+./tftopl -verbose $srcdir/tests/badtfm && exit 1
+
+./tftopl -verbose $srcdir/tests/cmr10 tests/xcmr10a || exit 1
+
+diff $srcdir/tests/cmr10.pl tests/xcmr10a.pl || exit 1
+
+./tftopl -verbose $srcdir/tests/cmr10 >tests/xcmr10b.pl || exit 1
+
+diff $srcdir/tests/cmr10.pl tests/xcmr10b.pl || exit 1
diff --git a/source/texk/web2c/vftovp.test b/source/texk/web2c/vftovp.test
index 614361300a48392b8df5b09537f52f66cc4b38a8..9623525d52fd9b3d09686a1ba501d3593fd839bd 100644
--- a/source/texk/web2c/vftovp.test
+++ b/source/texk/web2c/vftovp.test
@@ -1,13 +1,23 @@
#! /bin/sh
-# Copyright (C) 2009-2013 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.
test -d tests || mkdir -p tests
-TEXMFCNF=$srcdir/../kpathsea \
- TFMFONTS=$srcdir/tests \
- ./vftovp -verbose $srcdir/tests/ptmr ptmr tests/xptmr || exit 1
+./vftovp -version || exit 1
-diff $srcdir/tests/ptmr.vpl tests/xptmr.vpl || exit 1
+TEXMFCNF=$srcdir/../kpathsea
+TFMFONTS=$srcdir/tests
+export TEXMFCNF TFMFONTS
+
+./vftovp -verbose $srcdir/tests/badvf && exit 1
+
+./vftovp -verbose $srcdir/tests/ptmr ptmr tests/xptmra || exit 1
+
+diff $srcdir/tests/ptmr.vpl tests/xptmra.vpl || exit 1
+
+./vftovp -verbose $srcdir/tests/ptmr ptmr >tests/xptmrb.vpl || exit 1
+
+diff $srcdir/tests/ptmr.vpl tests/xptmrb.vpl || exit 1
diff --git a/source/texk/web2c/vptovf.test b/source/texk/web2c/vptovf.test
index 922a62b8cd81b013885596e0117320348c3f6b92..55dfdb26fed294aaf1c37c9a40abcab81746fd9c 100644
--- a/source/texk/web2c/vptovf.test
+++ b/source/texk/web2c/vptovf.test
@@ -1,19 +1,26 @@
#! /bin/sh
-# Copyright (C) 2009-2013 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.
test -d tests || mkdir -p tests
-TEXMFCNF=$srcdir/../kpathsea \
- ./vptovf $srcdir/tests/ptmr tests/yptmr tests/yptmr || exit 1
+./vptovf -help || exit 1
+
+./vptovf -version || exit 1
+
+TEXMFCNF=$srcdir/../kpathsea
+export TEXMFCNF
+
+./vptovf -verbose $srcdir/tests/badvpl && exit 1
+
+./vptovf -verbose $srcdir/tests/ptmr tests/yptmr tests/yptmr || exit 1
cmp $srcdir/tests/ptmr.vf tests/yptmr.vf || exit 1
cmp $srcdir/tests/ptmr.tfm tests/yptmr.tfm || exit 1
-TEXMFCNF=$srcdir/../kpathsea \
- ./vptovf $srcdir/tests/ptmr tests/yptmr2.vf || exit 1
+./vptovf -verbose $srcdir/tests/ptmr tests/yptmr2.vf || exit 1
cmp $srcdir/tests/ptmr.vf tests/yptmr2.vf || exit 1
diff --git a/source/texk/web2c/web2c/ChangeLog b/source/texk/web2c/web2c/ChangeLog
index 15c7b6ac10eb35452d929bdbb0cfc665823b60df..87ebc2ab88bb458e533da1a4bc6381eeb6cecb08 100644
--- a/source/texk/web2c/web2c/ChangeLog
+++ b/source/texk/web2c/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * common.defines: Remove casttobytepointer and pointertobyte.
+
2014-11-06 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Add AC_CHECK_SIZEOF([long]),
diff --git a/source/texk/web2c/web2c/Makefile.in b/source/texk/web2c/web2c/Makefile.in
index 40dd458e3f02c045fd60828e49612a28a496e2c4..d51d24ca4f04ca729176ab252342267200e8b1bc 100644
--- a/source/texk/web2c/web2c/Makefile.in
+++ b/source/texk/web2c/web2c/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -18,7 +18,17 @@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -84,23 +94,6 @@ host_triplet = @host@
noinst_PROGRAMS = web2c$(EXEEXT) fixwrites$(EXEEXT) splitup$(EXEEXT) \
makecpool$(EXEEXT)
subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/configure $(am__configure_deps) \
- $(srcdir)/c-auto.in web2c-parser.h web2c-parser.c \
- web2c-lexer.c $(dist_noinst_SCRIPTS) \
- $(top_srcdir)/../../../build-aux/depcomp \
- $(top_srcdir)/../../../build-aux/ylwrap $(dist_noinst_DATA) \
- $(noinst_HEADERS) ChangeLog README ../../../build-aux/compile \
- ../../../build-aux/config.guess ../../../build-aux/config.sub \
- ../../../build-aux/depcomp ../../../build-aux/install-sh \
- ../../../build-aux/missing ../../../build-aux/texinfo.tex \
- ../../../build-aux/ylwrap ../../../build-aux/ltmain.sh \
- $(top_srcdir)/../../../build-aux/compile \
- $(top_srcdir)/../../../build-aux/config.guess \
- $(top_srcdir)/../../../build-aux/config.sub \
- $(top_srcdir)/../../../build-aux/install-sh \
- $(top_srcdir)/../../../build-aux/ltmain.sh \
- $(top_srcdir)/../../../build-aux/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../../m4/kpse-common.m4 \
$(top_srcdir)/../../../m4/kpse-lex.m4 \
@@ -113,6 +106,9 @@ am__aclocal_m4_deps = $(top_srcdir)/../../../m4/kpse-common.m4 \
$(top_srcdir)/../../../version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(dist_noinst_SCRIPTS) \
+ $(dist_noinst_DATA) $(noinst_HEADERS) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -234,6 +230,21 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
AM_RECURSIVE_TARGETS = cscope
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/c-auto.in \
+ $(top_srcdir)/../../../build-aux/compile \
+ $(top_srcdir)/../../../build-aux/config.guess \
+ $(top_srcdir)/../../../build-aux/config.sub \
+ $(top_srcdir)/../../../build-aux/depcomp \
+ $(top_srcdir)/../../../build-aux/install-sh \
+ $(top_srcdir)/../../../build-aux/ltmain.sh \
+ $(top_srcdir)/../../../build-aux/missing \
+ $(top_srcdir)/../../../build-aux/ylwrap \
+ ../../../build-aux/compile ../../../build-aux/config.guess \
+ ../../../build-aux/config.sub ../../../build-aux/depcomp \
+ ../../../build-aux/install-sh ../../../build-aux/ltmain.sh \
+ ../../../build-aux/missing ../../../build-aux/texinfo.tex \
+ ../../../build-aux/ylwrap ChangeLog README web2c-lexer.c \
+ web2c-parser.c web2c-parser.h
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -432,7 +443,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -668,15 +678,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -712,17 +722,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -910,6 +920,8 @@ uninstall-am:
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
# Don't include our <c-auto.h>.
w2c/config.h: ../w2c/config.h
diff --git a/source/texk/web2c/web2c/aclocal.m4 b/source/texk/web2c/web2c/aclocal.m4
index 4f5f0a13fde48924f7ba8e423cb5533465d4e5c5..34553b46eb0661a39d66f7efd311aba0c40507d8 100644
--- a/source/texk/web2c/web2c/aclocal.m4
+++ b/source/texk/web2c/web2c/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -573,7 +572,11 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -602,7 +605,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -645,7 +648,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -680,7 +683,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -730,7 +733,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -769,7 +772,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -798,7 +801,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -845,7 +848,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -864,7 +867,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -945,7 +948,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1005,7 +1008,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1033,7 +1036,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1052,7 +1055,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/source/texk/web2c/web2c/common.defines b/source/texk/web2c/web2c/common.defines
index af0543a05148e63774f41789714335067d956bdc..a729af037204b258473a459b341ad89f6539e9ae 100644
--- a/source/texk/web2c/web2c/common.defines
+++ b/source/texk/web2c/web2c/common.defines
@@ -103,7 +103,6 @@
@define function atou ();
@define function basename ();
@define function basenamechangesuffix ();
-@define function casttobytepointer ();
@define function chartostring ();
@define function chr ();
@define function cmdline ();
@@ -211,7 +210,6 @@
@define type integer64;
@define type longinteger;
@define type memoryword; {for gftodvi, TeX, and Metafont}
-@define type pointertobyte;
@define type real;
@define type text;
@define type w2custring;
diff --git a/source/texk/web2c/web2c/configure b/source/texk/web2c/web2c/configure
index 6e1f42d1f7ce1e6ac632e97b4301c3a0f47c4994..7d15f6bc2e3685614e55f470fa3393ea898c90da 100755
--- a/source/texk/web2c/web2c/configure
+++ b/source/texk/web2c/web2c/configure
@@ -2691,7 +2691,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-am__api_version='1.14'
+am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -2863,8 +2863,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -2883,7 +2883,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -7979,8 +7979,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -8038,6 +8038,7 @@ END
fi
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
diff --git a/source/texk/web2c/window/Makefile.in b/source/texk/web2c/window/Makefile.in
index 2722189b2301a7b69aba32c649154668bd089f8c..9ac8a04e709da612127a297a01035143743e17b3 100644
--- a/source/texk/web2c/window/Makefile.in
+++ b/source/texk/web2c/window/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -80,8 +90,6 @@ host_triplet = @host@
@MFXT_TRUE@am__append_1 = x11-Xt.c
@MFXT_FALSE@am__append_2 = x11-Xlib.c
subdir = window
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/../../build-aux/depcomp ChangeLog README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-asm.m4 \
@@ -126,6 +134,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/w2c/c-auto.h \
$(top_builddir)/ff-config.h
@@ -213,6 +222,8 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+ $(top_srcdir)/../../build-aux/depcomp ChangeLog README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -456,7 +467,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign window/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign window/Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -732,6 +742,8 @@ uninstall-am:
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
@KPATHSEA_RULE@
diff --git a/source/utils/Makefile.in b/source/utils/Makefile.in
index e67d448a221bbf4fcc64a14d1f06822c8c74cb06..ba43dc76e9458ed77693b8c0fc6fa78b7ece254f 100644
--- a/source/utils/Makefile.in
+++ b/source/utils/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
@SET_MAKE@
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -77,18 +87,6 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = $(srcdir)/../am/recurse.am $(srcdir)/Makefile.in \
- $(srcdir)/Makefile.am $(top_srcdir)/configure \
- $(am__configure_deps) ChangeLog README ../build-aux/compile \
- ../build-aux/config.guess ../build-aux/config.sub \
- ../build-aux/depcomp ../build-aux/install-sh \
- ../build-aux/missing ../build-aux/texinfo.tex \
- ../build-aux/ylwrap ../build-aux/ltmain.sh \
- $(top_srcdir)/../build-aux/compile \
- $(top_srcdir)/../build-aux/config.guess \
- $(top_srcdir)/../build-aux/config.sub \
- $(top_srcdir)/../build-aux/install-sh \
- $(top_srcdir)/../build-aux/missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
@@ -130,6 +128,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -190,6 +190,16 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
+am__DIST_COMMON = $(srcdir)/../am/recurse.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/../build-aux/compile \
+ $(top_srcdir)/../build-aux/config.guess \
+ $(top_srcdir)/../build-aux/config.sub \
+ $(top_srcdir)/../build-aux/install-sh \
+ $(top_srcdir)/../build-aux/missing ../build-aux/compile \
+ ../build-aux/config.guess ../build-aux/config.sub \
+ ../build-aux/depcomp ../build-aux/install-sh \
+ ../build-aux/ltmain.sh ../build-aux/missing \
+ ../build-aux/texinfo.tex ../build-aux/ylwrap ChangeLog README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -361,7 +371,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/..
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -371,7 +380,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
-$(srcdir)/../am/recurse.am:
+$(srcdir)/../am/recurse.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -572,15 +581,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -616,17 +625,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure \
+ && $(am__cd) $(distdir)/_build/sub \
+ && ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=.. --prefix="$$dc_install_base" \
+ --srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -800,6 +809,8 @@ uninstall-am:
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am tags tags-am uninstall uninstall-am
+.PRECIOUS: Makefile
+
# just in case a subdirectory has added directories
dist-hook:
diff --git a/source/utils/README b/source/utils/README
index c3160113f259bf969520f511c4e813b45fe9d10b..653bb2c213f891e82604d26e2be57397da70da67 100644
--- a/source/utils/README
+++ b/source/utils/README
@@ -1,9 +1,10 @@
-$Id: README 35896 2014-12-24 11:25:20Z peter $
+$Id: README 36016 2015-01-11 00:03:55Z karl $
Public domain. Originally written 2005 by Karl Berry.
Extra utilities we (optionally) compile for TeX Live.
See comments in ../texk/README.
+
asymptote 2.31 - checked 17may14
update to TL from CTAN, to include prebuilt doc.
see http://tug.org/texlive/build.html#asymptote
diff --git a/source/utils/aclocal.m4 b/source/utils/aclocal.m4
index eb2029d0b5dc806bf045321019150c4680b39a44..4415289d78cc49af68e39e5d25ba3298a5ac6650 100644
--- a/source/utils/aclocal.m4
+++ b/source/utils/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -573,7 +572,11 @@ to "yes", and re-run configure.
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -602,7 +605,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -613,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -623,7 +626,7 @@ if test x"${install_sh}" != xset; then
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -645,7 +648,7 @@ AC_SUBST([am__leading_dot])])
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -680,7 +683,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -730,7 +733,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -769,7 +772,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -798,7 +801,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -845,7 +848,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -864,7 +867,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -945,7 +948,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1005,7 +1008,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1033,7 +1036,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1052,7 +1055,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/source/utils/configure b/source/utils/configure
index be3b5ba005e50e806dfe3275f73f95c4a4ce0a79..55b55260f8811e0ba2cd092ff74a0a41dee89767 100755
--- a/source/utils/configure
+++ b/source/utils/configure
@@ -2131,8 +2131,8 @@ if test "${enable_missing+set}" = set; then :
enableval=$enable_missing;
fi
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -3157,7 +3157,7 @@ case $enable_luajittex in #(
: ;; #(
*) :
case $host in #(
- alpha* | sparc* | x86_64-*-cygwin) :
+ alpha* | sparc* | x86_64-*-cygwin | powerpc-*-darwin* ) :
{ $as_echo "$as_me:${as_lineno-$LINENO}: $host -> \`--disable-luajittex'" >&5
$as_echo "$as_me: $host -> \`--disable-luajittex'" >&6;}
ac_configure_args="$ac_configure_args '--disable-luajittex'" ;; #(
@@ -3878,7 +3878,7 @@ fi
-am__api_version='1.14'
+am__api_version='1.15'
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -4067,7 +4067,7 @@ else
$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -4474,8 +4474,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
mkdir_p='$(MKDIR_P)'
-# We need awk for the "check" target. The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver). The
+# system "awk" is bad on some platforms.
# Always define AMTAR for backward compatibility. Yes, it's still used
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
@@ -4661,6 +4661,7 @@ END
fi
fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.