diff --git a/manual/luatexref-t.pdf b/manual/luatexref-t.pdf
index c8342e895fc3e543562f82c4ff4d3f9d6cdcebc7..da475c49575d0b8790d277dd00977edf88611a29 100644
Binary files a/manual/luatexref-t.pdf and b/manual/luatexref-t.pdf differ
diff --git a/manual/luatexref-t.tex b/manual/luatexref-t.tex
index 0548af163e16a598521c505b4e1e26d13027770f..506c80aaa90051506f60c65aa98cddd82861da62 100644
--- a/manual/luatexref-t.tex
+++ b/manual/luatexref-t.tex
@@ -3387,7 +3387,6 @@ The \type{pfminfo} table contains most of the OS/2 information:
\NC vlinegap \NC number \NC \NC\NR
\NC hhead_ascent \NC number \NC \NC\NR
\NC hhead_descent \NC number \NC \NC\NR
-\NC hhead_descent \NC number \NC \NC\NR
\NC os2_typoascent \NC number \NC \NC\NR
\NC os2_typodescent \NC number \NC \NC\NR
\NC os2_typolinegap \NC number \NC \NC\NR
diff --git a/source/Build b/source/Build
old mode 100755
new mode 100644
diff --git a/source/ChangeLog b/source/ChangeLog
index a3a1768bd2c45eadbe91699a4df68aca13f24330..1ec0ee5162b19797f233aa4d81d155bae43358cf 100644
--- a/source/ChangeLog
+++ b/source/ChangeLog
@@ -1,3 +1,11 @@
+2014-11-24 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * tardate.ac: Switch to 2014-11-24.
+
+2014-11-17 Karl Berry <karl@tug.org>
+
+ * am/script_links.am: Use w32_wrapper or w64_wrapper.
+
2014-10-21 Karl Berry <karl@tug.org>
* configure.ac: report CC/CXX values, with --version output
diff --git a/source/README.2building b/source/README.2building
index 65549a2d5ac1c09cc76b0a1599106e6cea5156cc..92f8a3ee5a843086aead116654751b025776c0f5 100644
--- a/source/README.2building
+++ b/source/README.2building
@@ -118,11 +118,11 @@ finish for working on 'dvipdfmx'.
Then you modify source files in 'mydir/texk/dvipdfm-x' and rerun
'make' in 'mydir/Work/texk/dvipdfm-x' to rebuild.
- The second line the 'configure' are invocation shows examples of
-extra things you likely want to specify if you intend to hack the
-sources (and not just build binaries): the '-C' speeds up 'configure',
-and the 'CFLAGS' and 'CXXFLAGS' are to eliminate compiler optimization
-for debugging purposes.
+ The second line the 'configure' invocation shows examples of extra
+things you likely want to specify if you intend to hack the sources (and
+not just build binaries): the '-C' speeds up 'configure', and the
+'CFLAGS' and 'CXXFLAGS' are to eliminate compiler optimization for
+debugging purposes.
Of course, one should actually look at the output and check that
things are working. There are many 'configure' options you can tweak as
diff --git a/source/README.4layout b/source/README.4layout
index 7abdeae15f9a8d47b3c643fe24ddc2a7e942a252..6efad1bf877c35a2464efe3117e2e8b0f9f5063b 100644
--- a/source/README.4layout
+++ b/source/README.4layout
@@ -31,7 +31,7 @@ many extra hassles, so don't do that, tempting as it may be.
automake (GNU automake) 1.14.1
bison (GNU Bison) 3.0.2
flex 2.5.39
- ltmain.sh (GNU libtool) 2.4.2
+ ltmain.sh (GNU libtool) 2.4.4
m4 (GNU M4) 1.4.17
makeinfo (GNU texinfo) 5.2
@@ -60,7 +60,7 @@ source tree.
As mentioned at the beginning of the chapter (*note Overview of build
system::), the main source directories are 'texk/' (TeX-specific
-programs and libraries), 'utils/' (additional programs), and 'libs'
+programs and libraries), 'utils/' (additional programs), and 'libs/'
(generic libraries).
The top-level directories 'am/' and 'm4/' contain 'Makefile.am'
@@ -197,11 +197,11 @@ library. E.g., for 'libs/libpng':
Provide the configure option '--with-system-libpng'. Set and
'AC_SUBST' 'make' variables for modules using this library (either
an installed version or from the TeX Live tree): 'LIBPNG_INCLUDES'
- for use in CPPFLAGS, LIBPNG_LIBS for use in LDADD, LIBPNG_DEPEND
- for use as dependency, and LIBPNG_RULE defining 'make' rules to
- rebuild the library.
+ for use in CPPFLAGS, 'LIBPNG_LIBS' for use in LDADD,
+ 'LIBPNG_DEPEND' for use as dependency, and 'LIBPNG_RULE' defining
+ 'make' rules to rebuild the library.
- -- Macro: KPSE_ADD_FLAGS (LIBNAME)
+ -- Macro: KPSE_ADD_FLAGS (NAME)
Temporarily extend CPPFLAGS and LIBS with the values required for
the library module 'NAME'.
@@ -355,7 +355,7 @@ however, not part of the TL DVD as distributed by TeX user groups, and
have never been officially released for standalone use.
It is possible, and possibly even useful for distro builds (*note
-Distro builds::, to specify the configure option
+Distro builds::), to specify the configure option
'--with-system-kpathsea' in order to use a system version of the library
and it may then be necessary to specify '--with-kpathsea-includes'
and/or '--with-kpathsea-libdir'.
diff --git a/source/README.5configure b/source/README.5configure
index f597fc5415ed102a095f9a8cc02011342fb69164..2919ed847c5ace28b1eb69315ebe0c1a19a7eef6 100644
--- a/source/README.5configure
+++ b/source/README.5configure
@@ -245,7 +245,7 @@ module 'bibtex-x' (extended BibTeX).
'--disable-bibtex8'
Do not build the 'bibtex8' program.
- -disable-bibtexu '--disable-bibtexu'
+'--disable-bibtexu'
Do not build the 'bibtexu' program (building 'bibtexu' requires 'ICU'
libraries).
@@ -276,8 +276,8 @@ PostScript specials.
'--without-libgs'
Build 'dvisvgm' without PostScript support at all. Because the dynamic
-loading just mention defeats all attempts at static linking, the result
-can crash due to library incompatibilities, e.g., on CentOS 5.
+loading just mentioned defeats all attempts at static linking, the
+result can crash due to library incompatibilities, e.g., on CentOS 5.
'--with-libgs-includes=DIR', '--with-libgs-libdir=DIR'
Specify non-standard locations of the Ghostscript headers and library.
@@ -337,8 +337,8 @@ Using a system version implies also using the system versions of all
libraries (if any) that LIB depends on.
For many libraries '--with-LIB-includes=DIR' and
-'--with-LIB-libdir=DIR' to specify non-standard search locations; others
-use 'pkg-config' or similar to determine the required flags.
+'--with-LIB-libdir=DIR' can specify non-standard search locations;
+others use 'pkg-config' or similar to determine the required flags.
The top-level 'configure' script performs a consistency check for all
required system libraries and bails out if tests fail.
@@ -369,13 +369,14 @@ overridden by the user in any case.
7.3.2 Configure options for system 'poppler'
--------------------------------------------
-Building LuaTeX and XeTeX requires 'poppler', either from the TL tree or
-system headers and library. Building pdfTeX requires either 'xpdf' from
-the TeX Live tree or system 'poppler' headers and library.
+Building LuaTeX (or LuaJITTeX) and XeTeX requires 'poppler', either from
+the TL tree or system headers and library. Building pdfTeX requires
+either 'xpdf' from the TeX Live tree or system 'poppler' headers and
+library.
'--with-system-poppler'
-Use a system version (0.18 or newer) of 'poppler' for LuaTeX and XeTeX,
-and use 'pkg-config' to obtain the required flags.
+Use a system version (0.18 or newer) of 'poppler' for LuaTeX (or
+LuaJITTeX) and XeTeX, and use 'pkg-config' to obtain the required flags.
'--with-system-xpdf'
Use a system version (0.12 or better) of 'poppler' (and 'pkg-config')
diff --git a/source/am/script_links.am b/source/am/script_links.am
index 102d56707d03f40b76aa52a85c75475446087e3d..e12e09edc9cc26a1abc5a790af27bbdb76c6288e 100644
--- a/source/am/script_links.am
+++ b/source/am/script_links.am
@@ -1,6 +1,6 @@
## am/script_links.am: Makefile fragment for lua/perl/shell script links.
##
-## Copyright (C) 2011-2013 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2011-2014 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
## Install/uninstall 'linked scripts' or win32 wrappers:
@@ -29,7 +29,7 @@ if WIN32_WRAP
## We treat the WIN32 wrappers as SCRIPTS to avoid automatic build rules
wrappers = $(all_scripts:=.exe)
nodist_bin_SCRIPTS += $(wrappers)
-runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
+runscript = $(top_srcdir)/../../texk/texlive/$(WIN_WRAPPER)/runscript.exe
$(wrappers): $(runscript)
$(AM_V_GEN)$(LN_S) $(runscript) $@
endif WIN32_WRAP
diff --git a/source/build-aux/config.guess b/source/build-aux/config.guess
index 1f5c50c0d1529d50b94dc3533ca72a47f0fa5849..6c32c8645c8b2edba2b8fe66c2b1f06c68613c23 100644
--- a/source/build-aux/config.guess
+++ b/source/build-aux/config.guess
@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2014 Free Software Foundation, Inc.
-timestamp='2014-03-23'
+timestamp='2014-11-04'
# 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
@@ -24,12 +24,12 @@ timestamp='2014-03-23'
# program. This Exception is an additional permission under section 7
# of the GNU General Public License, version 3 ("GPLv3").
#
-# Originally written by Per Bothner.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
#
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
#
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
me=`echo "$0" | sed -e 's,.*/,,'`
@@ -579,8 +579,9 @@ EOF
else
IBM_ARCH=powerpc
fi
- if [ -x /usr/bin/oslevel ] ; then
- IBM_REV=`/usr/bin/oslevel`
+ if [ -x /usr/bin/lslpp ] ; then
+ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
else
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
diff --git a/source/build-aux/config.sub b/source/build-aux/config.sub
index d4c83385f73c2c09c11d43dd32d1417f097fd15b..7ffe37378428816992ba3a143d5bbd891701b395 100644
--- a/source/build-aux/config.sub
+++ b/source/build-aux/config.sub
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2014 Free Software Foundation, Inc.
-timestamp='2014-09-26'
+timestamp='2014-12-03'
# 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
@@ -25,7 +25,7 @@ timestamp='2014-09-26'
# of the GNU General Public License, version 3 ("GPLv3").
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
@@ -313,6 +313,7 @@ case $basic_machine in
| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+ | visium \
| we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
@@ -440,6 +441,7 @@ case $basic_machine in
| ubicom32-* \
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
| vax-* \
+ | visium-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
diff --git a/source/build-aux/ltmain.sh b/source/build-aux/ltmain.sh
index 555b7637c07f80c83d665505260a6fbd798ab235..5eca4aeaae90a2bda398109ce85cc87b66c99666 100755
--- a/source/build-aux/ltmain.sh
+++ b/source/build-aux/ltmain.sh
@@ -2,7 +2,7 @@
## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
## by inline-source v2014-01-03.01
-# libtool (GNU libtool) 2.4.3
+# libtool (GNU libtool) 2.4.4
# Provide generalized library-building support services.
# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
@@ -31,8 +31,8 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION=2.4.3
-package_revision=2.4.3
+VERSION=2.4.4
+package_revision=2.4.4
## ------ ##
@@ -1977,7 +1977,7 @@ func_version ()
# End:
# Set a version string.
-scriptversion='(GNU libtool) 2.4.3'
+scriptversion='(GNU libtool) 2.4.4'
# func_echo ARG...
@@ -2063,7 +2063,7 @@ include the following information:
compiler: $LTCC
compiler flags: $LTCFLAGS
linker: $LD (gnu? $with_gnu_ld)
- version: $progname (GNU libtool) 2.4.3
+ version: $progname (GNU libtool) 2.4.4
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
@@ -2411,7 +2411,7 @@ libtool_validate_options ()
case $host in
# Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
# see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
- *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2*)
+ *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
# don't eliminate duplications in $postdeps and $predeps
opt_duplicate_compiler_generated_deps=:
;;
@@ -3730,7 +3730,8 @@ The following components of LINK-COMMAND are treated specially:
-no-install link a not-installable executable
-no-undefined declare that a library does not refer to external symbols
-o OUTPUT-FILE create OUTPUT-FILE from the specified objects
- -objectlist FILE Use a list of object files found in FILE to specify objects
+ -objectlist FILE use a list of object files found in FILE to specify objects
+ -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes)
-precious-files-regex REGEX
don't remove output files matching REGEX
-release RELEASE specify package release information
@@ -4312,6 +4313,13 @@ func_mode_install ()
;;
esac
;;
+ os2*)
+ case $realname in
+ *_dll.a)
+ tstripme=
+ ;;
+ esac
+ ;;
esac
if test -n "$tstripme" && test -n "$striplib"; then
func_show_eval "$striplib $destdir/$realname" 'exit $?'
@@ -5153,7 +5161,7 @@ func_extract_archives ()
$RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
done # $darwin_arches
## Okay now we've a bunch of thin objects, gotta fatten them up :)
- darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
darwin_file=
darwin_files=
for darwin_file in $darwin_filelist; do
@@ -6511,6 +6519,7 @@ func_mode_link ()
module=no
no_install=no
objs=
+ os2dllname=
non_pic_objects=
precious_files_regex=
prefer_static_libs=no
@@ -6768,6 +6777,11 @@ func_mode_link ()
prev=
continue
;;
+ os2dllname)
+ os2dllname=$arg
+ prev=
+ continue
+ ;;
precious_regex)
precious_files_regex=$arg
prev=
@@ -7077,6 +7091,11 @@ func_mode_link ()
continue
;;
+ -os2dllname)
+ prev=os2dllname
+ continue
+ ;;
+
-o) prev=output ;;
-precious-files-regex)
@@ -7240,6 +7259,25 @@ func_mode_link ()
continue
;;
+ -Z*)
+ if test os2 = "`expr $host : '.*\(os2\)'`"; then
+ # OS/2 uses -Zxxx to specify OS/2-specific options
+ compiler_flags="$compiler_flags $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+ case $arg in
+ -Zlinker | -Zstack)
+ prev=xcompiler
+ ;;
+ esac
+ continue
+ else
+ # Otherwise treat like 'Some other compiler flag' below
+ func_quote_for_eval "$arg"
+ arg=$func_quote_for_eval_result
+ fi
+ ;;
+
# Some other compiler flag.
-* | +*)
func_quote_for_eval "$arg"
@@ -8066,7 +8104,7 @@ func_mode_link ()
if test -n "$library_names" &&
{ test no = "$use_static_libs" || test -z "$old_library"; }; then
case $host in
- *cygwin* | *mingw* | *cegcc*)
+ *cygwin* | *mingw* | *cegcc* | *os2*)
# No point in relinking DLLs because paths are not encoded
func_append notinst_deplibs " $lib"
need_relink=no
@@ -8136,7 +8174,7 @@ func_mode_link ()
elif test -n "$soname_spec"; then
# bleh windows
case $host in
- *cygwin* | mingw* | *cegcc*)
+ *cygwin* | mingw* | *cegcc* | *os2*)
func_arith $current - $age
major=$func_arith_result
versuffix=-$major
@@ -8708,13 +8746,13 @@ func_mode_link ()
#
case $version_type in
# correct linux to gnu/linux during the next big refactor
- darwin|linux|osf|windows|none)
+ darwin|freebsd-elf|linux|osf|windows|none)
func_arith $number_major + $number_minor
current=$func_arith_result
age=$number_minor
revision=$number_revision
;;
- freebsd-aout|freebsd-elf|qnx|sunos)
+ freebsd-aout|qnx|sunos)
current=$number_major
revision=$number_minor
age=0
@@ -8800,8 +8838,9 @@ func_mode_link ()
;;
freebsd-elf)
- major=.$current
- versuffix=.$current
+ func_arith $current - $age
+ major=.$func_arith_result
+ versuffix=$major.$age.$revision
;;
irix | nonstopux)
@@ -8864,6 +8903,11 @@ func_mode_link ()
versuffix=.$current
;;
+ sco)
+ major=.$current
+ versuffix=.$current
+ ;;
+
sunos)
major=.$current
versuffix=.$current.$revision
diff --git a/source/build-aux/texinfo.tex b/source/build-aux/texinfo.tex
index 72c8cf4eed7d512a247bd3327f965cba927f478a..54cf66787d59510ce9153e591dd3863744c19c64 100644
--- a/source/build-aux/texinfo.tex
+++ b/source/build-aux/texinfo.tex
@@ -3,7 +3,7 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2014-10-29.10}
+\def\texinfoversion{2014-11-14.07}
%
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
@@ -1010,24 +1010,15 @@ where each line of input produces a line of output.}
% paragraph.
%
\gdef\dosuppressfirstparagraphindent{%
- \gdef\indent{%
- \restorefirstparagraphindent
- \indent
- }%
- \gdef\noindent{%
- \restorefirstparagraphindent
- \noindent
- }%
- \global\everypar = {%
- \kern -\parindent
- \restorefirstparagraphindent
- }%
+ \gdef\indent {\restorefirstparagraphindent \indent}%
+ \gdef\noindent{\restorefirstparagraphindent \noindent}%
+ \global\everypar = {\kern -\parindent \restorefirstparagraphindent}%
}
-
+%
\gdef\restorefirstparagraphindent{%
- \global \let \indent = \ptexindent
- \global \let \noindent = \ptexnoindent
- \global \everypar = {}%
+ \global\let\indent = \ptexindent
+ \global\let\noindent = \ptexnoindent
+ \global\everypar = {}%
}
@@ -5801,6 +5792,7 @@ end
%
{%
\chapfonts \rmisbold
+ \let\footnote=\errfootnoteheading % give better error message
%
% Have to define \lastsection before calling \donoderef, because the
% xref code eventually uses it. On the other hand, it has to be called
@@ -5912,6 +5904,7 @@ end
\ifx\temptype\Yomitfromtockeyword\else
\checkenv{}% non-@*heading should not be in an environment.
\fi
+ \let\footnote=\errfootnoteheading
%
% Switch to the right set of fonts.
\csname #2fonts\endcsname \rmisbold
@@ -8368,9 +8361,6 @@ end
%
% Auto-number footnotes. Otherwise like plain.
\gdef\footnote{%
- \let\indent=\ptexindent
- \let\noindent=\ptexnoindent
- %
\global\advance\footnoteno by \@ne
\edef\thisfootno{$^{\the\footnoteno}$}%
%
@@ -8397,7 +8387,7 @@ end
%
% Nested footnotes are not supported in TeX, that would take a lot
% more work. (\startsavinginserts does not suffice.)
- \let\footnote=\errfootnote
+ \let\footnote=\errfootnotenest
%
% We want to typeset this text as a normal paragraph, even if the
% footnote reference occurs in (for example) a display environment.
@@ -8436,12 +8426,17 @@ end
}
}%end \catcode `\@=11
-\def\errfootnote{%
+\def\errfootnotenest{%
\errhelp=\EMsimple
\errmessage{Nested footnotes not supported in texinfo.tex,
even though they work in makeinfo; sorry}
}
+\def\errfootnoteheading{%
+ \errhelp=\EMsimple
+ \errmessage{Footnotes in chapters, sections, etc., are not supported}
+}
+
% In case a @footnote appears in a vbox, save the footnote text and create
% the real \insert just after the vbox finished. Otherwise, the insertion
% would be lost.
diff --git a/source/configure b/source/configure
index 8f44815e07ac05417827266589c4c9036c20d412..8860165e41a9d6e2ab8be38f94d5cf3d787c00b1 100755
--- a/source/configure
+++ b/source/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for TeX Live 2014-08-22.
+# Generated by GNU Autoconf 2.69 for TeX Live 2014-11-24.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='TeX Live'
PACKAGE_TARNAME='tex-live'
-PACKAGE_VERSION='2014-08-22'
-PACKAGE_STRING='TeX Live 2014-08-22'
+PACKAGE_VERSION='2014-11-24'
+PACKAGE_STRING='TeX Live 2014-11-24'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
@@ -859,6 +859,7 @@ enable_shared
enable_static
with_pic
enable_fast_install
+with_aix_soname
with_gnu_ld
with_sysroot
enable_libtool_lock
@@ -1421,7 +1422,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures TeX Live 2014-08-22 to adapt to many kinds of systems.
+\`configure' configures TeX Live 2014-11-24 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1495,7 +1496,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of TeX Live 2014-08-22:";;
+ short | recursive ) echo "Configuration of TeX Live 2014-11-24:";;
esac
cat <<\_ACEOF
@@ -1616,6 +1617,9 @@ Optional Packages:
kpathsea library installed in DIR
--with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
both]
+ --with-aix-soname=aix|svr4|both
+ shared library versioning (aka "SONAME") variant to
+ provide on AIX, [default=aix].
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-sysroot[=DIR] Search for dependent libraries within DIR (or the
compiler's sysroot if not specified).
@@ -1702,7 +1706,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-TeX Live configure 2014-08-22
+TeX Live configure 2014-11-24
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2433,7 +2437,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by TeX Live $as_me 2014-08-22, which was
+It was created by TeX Live $as_me 2014-11-24, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3835,11 +3839,11 @@ if test "${enable_multiplatform+set}" = set; then :
fi
if test "x$enable_multiplatform" = xyes; then
if test "x$bindir" = 'x${exec_prefix}/bin'; then
- bindir="$bindir/$host"
+ bindir="$bindir/${host_alias-$host}"
ac_configure_args="$ac_configure_args '--bindir=$bindir'"
fi
if test "x$libdir" = 'x${exec_prefix}/lib'; then
- libdir="$libdir/$host"
+ libdir="$libdir/${host_alias-$host}"
ac_configure_args="$ac_configure_args '--libdir=$libdir'"
fi
fi
@@ -5282,8 +5286,8 @@ esac
-macro_version='2.4.2.458.26-92994'
-macro_revision='2.4.3'
+macro_version='2.4.4'
+macro_revision='2.4.4'
@@ -6581,6 +6585,9 @@ sysv4 | sysv4.3*)
tpf*)
lt_cv_deplibs_check_method=pass_all
;;
+os2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
fi
@@ -8935,7 +8942,7 @@ fi
# Define the identity of the package.
PACKAGE='tex-live'
- VERSION='2014-08-22'
+ VERSION='2014-11-24'
cat >>confdefs.h <<_ACEOF
@@ -9782,6 +9789,58 @@ fi
+ shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[5-9]*,yes)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+
+# Check whether --with-aix-soname was given.
+if test "${with_aix_soname+set}" = set; then :
+ withval=$with_aix_soname; case $withval in
+ aix|svr4|both)
+ ;;
+ *)
+ as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+ ;;
+ esac
+ lt_cv_with_aix_soname=$with_aix_soname
+else
+ if ${lt_cv_with_aix_soname+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_with_aix_soname=aix
+fi
+
+ with_aix_soname=$lt_cv_with_aix_soname
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
+ if test aix != "$with_aix_soname"; then
+ # For the AIX way of multilib, we name the shared archive member
+ # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+ # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+ # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+ # the AIX toolchain works better with OBJECT_MODE set (default 32).
+ if test 64 = "${OBJECT_MODE-32}"; then
+ shared_archive_member_spec=shr_64
+ else
+ shared_archive_member_spec=shr
+ fi
+ fi
+ ;;
+*)
+ with_aix_soname=aix
+ ;;
+esac
+
+
+
+
+
+
+
@@ -10220,6 +10279,11 @@ lt_prog_compiler_static=
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
lt_prog_compiler_pic='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
@@ -10316,6 +10380,11 @@ lt_prog_compiler_static=
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static='$wl-static'
+ ;;
+ esac
;;
hpux9* | hpux10* | hpux11*)
@@ -10956,6 +11025,34 @@ _LT_EOF
link_all_deplibs=yes
;;
+ os2*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ allow_undefined_flag=unsupported
+ shrext_cmds=.dll
+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes=yes
+ ;;
+
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
@@ -11029,6 +11126,9 @@ _LT_EOF
fi
case $cc_basename in
+ tcc*)
+ export_dynamic_flag_spec='-rdynamic'
+ ;;
xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
@@ -11158,19 +11258,35 @@ _LT_EOF
no_entry_flag=
else
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global
- # defined symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
@@ -11178,6 +11294,13 @@ _LT_EOF
break
fi
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -11197,6 +11320,14 @@ _LT_EOF
hardcode_libdir_separator=':'
link_all_deplibs=yes
file_list_spec='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # traditional, no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ hardcode_direct=no
+ hardcode_direct_absolute=no
+ ;;
+ esac
if test yes = "$GCC"; then
case $host_os in aix4.[012]|aix4.[012].*)
@@ -11224,6 +11355,11 @@ _LT_EOF
if test yes = "$aix_use_runtimelinking"; then
shared_flag="$shared_flag "'$wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
if test ia64 = "$host_cpu"; then
@@ -11236,6 +11372,8 @@ _LT_EOF
else
shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
@@ -11243,7 +11381,7 @@ _LT_EOF
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to export.
always_export_symbols=yes
- if test yes = "$aix_use_runtimelinking"; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
allow_undefined_flag='-berok'
@@ -11358,8 +11496,20 @@ fi
whole_archive_flag_spec='$convenience'
fi
archive_cmds_need_lc=yes
- # This is similar to how AIX traditionally builds its shared libraries.
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $wl-bnoentry $compiler_flags $wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+ else
+ # used by -dlpreopen to get the symbols
+ archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -11678,6 +11828,16 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
link_all_deplibs=yes
;;
+ linux*)
+ case $cc_basename in
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ ld_shlibs=yes
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+
netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
@@ -11723,8 +11883,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ shrext_cmds=.dll
+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes=yes
;;
osf3*)
@@ -12283,20 +12463,70 @@ aix[4-9]*)
fi
;;
esac
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
# AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
# soname into executable. Probably we can add versioning support to
# collect2, so additional links can be useful in future.
- if test yes = "$aix_use_runtimelinking"; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
# instead of lib<name>.a to let people know that these are not
# typical AIX shared libraries.
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
- else
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a(lib.so.V)'
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
library_names_spec='$libname$release.a $libname.a'
soname_spec='$libname$release$shared_ext$major'
- fi
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
shlibpath_var=LIBPATH
fi
;;
@@ -12484,7 +12714,7 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
need_version=no
need_lib_prefix=no
;;
@@ -12768,11 +12998,32 @@ openbsd* | bitrig*)
os2*)
libname_spec='$name'
+ version_type=windows
shrext_cmds=.dll
+ need_version=no
need_lib_prefix=no
- library_names_spec='$libname$shared_ext $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
;;
osf3* | osf4* | osf5*)
@@ -12848,7 +13099,7 @@ sysv4*MP*)
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
need_lib_prefix=no
need_version=no
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
@@ -13377,7 +13628,7 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
@@ -13483,7 +13734,7 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
@@ -13632,8 +13883,12 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
;;
aix[4-9]*)
- if test ia64 != "$host_cpu" && test no = "$aix_use_runtimelinking"; then
- test yes = "$enable_shared" && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -16048,7 +16303,19 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
@@ -16058,6 +16325,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
;;
esac
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -16077,6 +16351,14 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
hardcode_libdir_separator_CXX=':'
link_all_deplibs_CXX=yes
file_list_spec_CXX='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ hardcode_direct_CXX=no
+ hardcode_direct_absolute_CXX=no
+ ;;
+ esac
if test yes = "$GXX"; then
case $host_os in aix4.[012]|aix4.[012].*)
@@ -16103,6 +16385,11 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
if test yes = "$aix_use_runtimelinking"; then
shared_flag=$shared_flag' $wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
if test ia64 = "$host_cpu"; then
@@ -16115,6 +16402,8 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
else
shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
@@ -16123,10 +16412,11 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
# underscore (_), so it is better to generate a list of symbols to
# export.
always_export_symbols_CXX=yes
- if test yes = "$aix_use_runtimelinking"; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
- allow_undefined_flag_CXX='-berok'
+ # The "-G" linker flag allows undefined symbols.
+ no_undefined_flag_CXX='-bernotok'
# Determine the default libpath from the value encoded in an empty
# executable.
if test set = "${lt_cv_aix_libpath+set}"; then
@@ -16239,9 +16529,21 @@ fi
whole_archive_flag_spec_CXX='$convenience'
fi
archive_cmds_need_lc_CXX=yes
- # This is similar to how AIX traditionally builds its shared
- # libraries.
- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $wl-bnoentry $compiler_flags $wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ archive_expsym_cmds_CXX='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared
+ # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+ else
+ # used by -dlpreopen to get the symbols
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -16373,6 +16675,34 @@ fi
;;
+ os2*)
+ hardcode_libdir_flag_spec_CXX='-L$libdir'
+ hardcode_minus_L_CXX=yes
+ allow_undefined_flag_CXX=unsupported
+ shrext_cmds=.dll
+ archive_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes_CXX=yes
+ ;;
+
dgux*)
case $cc_basename in
ec++*)
@@ -17299,6 +17629,11 @@ lt_prog_compiler_static_CXX=
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static_CXX='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
# PIC is the default on this platform
@@ -17836,13 +18171,17 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
case $host_os in
aix[4-9]*)
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global defined
- # symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
;;
pw32*)
@@ -18064,20 +18403,70 @@ aix[4-9]*)
fi
;;
esac
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
# AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
# soname into executable. Probably we can add versioning support to
# collect2, so additional links can be useful in future.
- if test yes = "$aix_use_runtimelinking"; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
# instead of lib<name>.a to let people know that these are not
# typical AIX shared libraries.
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
- else
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a(lib.so.V)'
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
library_names_spec='$libname$release.a $libname.a'
soname_spec='$libname$release$shared_ext$major'
- fi
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
shlibpath_var=LIBPATH
fi
;;
@@ -18263,7 +18652,7 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
need_version=no
need_lib_prefix=no
;;
@@ -18547,11 +18936,32 @@ openbsd* | bitrig*)
os2*)
libname_spec='$name'
+ version_type=windows
shrext_cmds=.dll
+ need_version=no
need_lib_prefix=no
- library_names_spec='$libname$shared_ext $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
;;
osf3* | osf4* | osf5*)
@@ -18627,7 +19037,7 @@ sysv4*MP*)
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
need_lib_prefix=no
need_version=no
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
@@ -20176,7 +20586,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 TeX Live $as_me 2014-08-22, which was
+This file was extended by TeX Live $as_me 2014-11-24, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20233,7 +20643,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="\\
-TeX Live config.status 2014-08-22
+TeX Live config.status 2014-11-24
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -20360,6 +20770,7 @@ enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
@@ -21332,6 +21743,9 @@ pic_mode=$pic_mode
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
# Shell to use when invoking shell scripts.
SHELL=$lt_SHELL
diff --git a/source/doc/ChangeLog b/source/doc/ChangeLog
index 3c89dce08ef495cd5cea0f0570ef6aad9cb738d7..bc633d03ab632c0efaba700dc38fe18ad7380aef 100644
--- a/source/doc/ChangeLog
+++ b/source/doc/ChangeLog
@@ -1,3 +1,11 @@
+2014-12-09 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * tlbuild.texi: Fixed a few typos.
+
+2014-12-08 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * build-tools.txt: Using libtool 2.4.4.
+
2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* tlbuild.texi: Drop '--with-xindy-recode'.
diff --git a/source/doc/build-tools.txt b/source/doc/build-tools.txt
index 02aa8082d1ff037612c44cbcc5777c9070154501..d1fa38ca6c7aeea5682a100e59eaf950a22f443e 100644
--- a/source/doc/build-tools.txt
+++ b/source/doc/build-tools.txt
@@ -2,6 +2,6 @@ autoconf (GNU Autoconf) 2.69
automake (GNU automake) 1.14.1
bison (GNU Bison) 3.0.2
flex 2.5.39
-ltmain.sh (GNU libtool) 2.4.3
+ltmain.sh (GNU libtool) 2.4.4
m4 (GNU M4) 1.4.17
makeinfo (GNU texinfo) 5.2
diff --git a/source/doc/tlbuild.info b/source/doc/tlbuild.info
index 3e0ca5d76a784716cc485c86b9e23f8656035767..d86ab94466ea1921a1f38cf5f839b0f10ef11900 100644
--- a/source/doc/tlbuild.info
+++ b/source/doc/tlbuild.info
@@ -332,11 +332,11 @@ finish for working on 'dvipdfmx'.
Then you modify source files in 'mydir/texk/dvipdfm-x' and rerun
'make' in 'mydir/Work/texk/dvipdfm-x' to rebuild.
- The second line the 'configure' are invocation shows examples of
-extra things you likely want to specify if you intend to hack the
-sources (and not just build binaries): the '-C' speeds up 'configure',
-and the 'CFLAGS' and 'CXXFLAGS' are to eliminate compiler optimization
-for debugging purposes.
+ The second line the 'configure' invocation shows examples of extra
+things you likely want to specify if you intend to hack the sources (and
+not just build binaries): the '-C' speeds up 'configure', and the
+'CFLAGS' and 'CXXFLAGS' are to eliminate compiler optimization for
+debugging purposes.
Of course, one should actually look at the output and check that
things are working. There are many 'configure' options you can tweak as
@@ -558,7 +558,7 @@ many extra hassles, so don't do that, tempting as it may be.
automake (GNU automake) 1.14.1
bison (GNU Bison) 3.0.2
flex 2.5.39
- ltmain.sh (GNU libtool) 2.4.3
+ ltmain.sh (GNU libtool) 2.4.4
m4 (GNU M4) 1.4.17
makeinfo (GNU texinfo) 5.2
@@ -590,7 +590,7 @@ source tree.
As mentioned at the beginning of the chapter (*note Overview of build
system::), the main source directories are 'texk/' (TeX-specific
-programs and libraries), 'utils/' (additional programs), and 'libs'
+programs and libraries), 'utils/' (additional programs), and 'libs/'
(generic libraries).
The top-level directories 'am/' and 'm4/' contain 'Makefile.am'
@@ -754,11 +754,11 @@ library. E.g., for 'libs/libpng':
Provide the configure option '--with-system-libpng'. Set and
'AC_SUBST' 'make' variables for modules using this library (either
an installed version or from the TeX Live tree): 'LIBPNG_INCLUDES'
- for use in CPPFLAGS, LIBPNG_LIBS for use in LDADD, LIBPNG_DEPEND
- for use as dependency, and LIBPNG_RULE defining 'make' rules to
- rebuild the library.
+ for use in CPPFLAGS, 'LIBPNG_LIBS' for use in LDADD,
+ 'LIBPNG_DEPEND' for use as dependency, and 'LIBPNG_RULE' defining
+ 'make' rules to rebuild the library.
- -- Macro: KPSE_ADD_FLAGS (LIBNAME)
+ -- Macro: KPSE_ADD_FLAGS (NAME)
Temporarily extend CPPFLAGS and LIBS with the values required for
the library module 'NAME'.
@@ -937,7 +937,7 @@ however, not part of the TL DVD as distributed by TeX user groups, and
have never been officially released for standalone use.
It is possible, and possibly even useful for distro builds (*note
-Distro builds::, to specify the configure option
+Distro builds::), to specify the configure option
'--with-system-kpathsea' in order to use a system version of the library
and it may then be necessary to specify '--with-kpathsea-includes'
and/or '--with-kpathsea-libdir'.
@@ -1485,7 +1485,7 @@ module 'bibtex-x' (extended BibTeX).
'--disable-bibtex8'
Do not build the 'bibtex8' program.
- -disable-bibtexu '--disable-bibtexu'
+'--disable-bibtexu'
Do not build the 'bibtexu' program (building 'bibtexu' requires 'ICU'
libraries).
@@ -1522,8 +1522,8 @@ PostScript specials.
'--without-libgs'
Build 'dvisvgm' without PostScript support at all. Because the dynamic
-loading just mention defeats all attempts at static linking, the result
-can crash due to library incompatibilities, e.g., on CentOS 5.
+loading just mentioned defeats all attempts at static linking, the
+result can crash due to library incompatibilities, e.g., on CentOS 5.
'--with-libgs-includes=DIR', '--with-libgs-libdir=DIR'
Specify non-standard locations of the Ghostscript headers and library.
@@ -1595,8 +1595,8 @@ Using a system version implies also using the system versions of all
libraries (if any) that LIB depends on.
For many libraries '--with-LIB-includes=DIR' and
-'--with-LIB-libdir=DIR' to specify non-standard search locations; others
-use 'pkg-config' or similar to determine the required flags.
+'--with-LIB-libdir=DIR' can specify non-standard search locations;
+others use 'pkg-config' or similar to determine the required flags.
The top-level 'configure' script performs a consistency check for all
required system libraries and bails out if tests fail.
@@ -1638,13 +1638,14 @@ File: tlbuild.info, Node: Configure options for system 'poppler', Prev: Config
7.3.2 Configure options for system 'poppler'
--------------------------------------------
-Building LuaTeX and XeTeX requires 'poppler', either from the TL tree or
-system headers and library. Building pdfTeX requires either 'xpdf' from
-the TeX Live tree or system 'poppler' headers and library.
+Building LuaTeX (or LuaJITTeX) and XeTeX requires 'poppler', either from
+the TL tree or system headers and library. Building pdfTeX requires
+either 'xpdf' from the TeX Live tree or system 'poppler' headers and
+library.
'--with-system-poppler'
-Use a system version (0.18 or newer) of 'poppler' for LuaTeX and XeTeX,
-and use 'pkg-config' to obtain the required flags.
+Use a system version (0.18 or newer) of 'poppler' for LuaTeX (or
+LuaJITTeX) and XeTeX, and use 'pkg-config' to obtain the required flags.
'--with-system-xpdf'
Use a system version (0.12 or better) of 'poppler' (and 'pkg-config')
@@ -4362,6 +4363,8 @@ Index
* --disable-all-pkgs: '--disable-all-pkgs'. (line 6)
* --disable-bibtex8: Configure options for 'texk/bibtex-x'.
(line 9)
+* --disable-bibtexu: Configure options for 'texk/bibtex-x'.
+ (line 12)
* --disable-dump-share: Configure options for 'texk/web2c'.
(line 27)
* --disable-dvipdfmx: Configure options for 'texk/dvipdfm-x'.
@@ -4451,9 +4454,9 @@ Index
* --with-system-libgs: Configure options for 'texk/dvisvgm'.
(line 6)
* --with-system-poppler: Configure options for system 'poppler'.
- (line 10)
+ (line 11)
* --with-system-xpdf: Configure options for system 'poppler'.
- (line 14)
+ (line 15)
* --with-xdvi-x-toolkit: 'xdvik' package. (line 21)
* --with-xdvi-x-toolkit=KIT: Configure options for 'texk/xdvik'.
(line 9)
@@ -4886,303 +4889,303 @@ Node: Build problems9801
Node: Build in parallel10194
Node: Build distribution10786
Node: Build one package11357
-Node: Installing14130
-Node: Installation directories15145
-Node: Linked scripts16965
-Node: Distro builds18446
-Node: Layout and infrastructure20836
-Node: Build system tools21625
-Node: Top-level directories23637
-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: Installing14126
+Node: Installation directories15141
+Node: Linked scripts16961
+Node: Distro builds18442
+Node: Layout and infrastructure20832
+Node: Build system tools21621
+Node: Top-level directories23633
+Node: Autoconf macros25688
+Node: General setup macros26389
+Node: Macros for programs27256
+Node: Macros for compilers28068
+Node: Macros for libraries29502
+Node: Macros for library and header flags29928
Node: Macros for Windows31800
Node: Library modules33377
Node: 'png' library33874
Node: 'zlib' library36167
Node: 'freetype' library36688
Node: 'kpathsea' library37222
-Node: Program modules38646
-Node: 't1utils' package39082
-Node: 'xindy' package39649
-Node: 'xdvik' package40828
-Node: 'asymptote'41907
-Node: Extending TeX Live42362
-Node: Adding a new program module42730
-Node: Adding a new generic library module44249
-Node: Adding a new TeX-specific library module46462
-Node: Configure options47149
-Node: Global configure options48540
-Node: '--disable-native-texlive-build'49108
-Node: '--prefix' '--bindir' ...50104
-Node: '--disable-largefile'50652
-Node: '--disable-missing'51345
-Node: '--enable-compiler-warnings='LEVEL51752
-Node: '--enable-cxx-runtime-hack'52497
-Node: '--enable-maintainer-mode'52930
-Node: '--enable-multiplatform'53465
-Node: '--enable-shared'54026
-Node: '--enable-silent-rules'54403
-Node: '--without-ln-s'54865
-Node: '--without-x'55222
-Node: Program-specific configure options55414
-Node: '--enable-PROG' '--disable-PROG'56077
-Node: '--disable-all-pkgs'56360
-Node: Configure options for 'texk/web2c'57354
-Node: Configure options for 'texk/bibtex-x'59812
-Node: Configure options for 'texk/dvipdfm-x'60388
-Node: Configure options for 'texk/dvisvgm'61227
-Node: Configure options for 'texk/texlive'62117
-Node: Configure options for 'texk/xdvik'62544
-Node: Configure options for 'utils/xindy'63154
-Node: Library-specific configure options64059
-Node: Configure options for 'kpathsea'65073
-Node: Configure options for system 'poppler'65786
-Node: Variables for configure66553
-Node: Cross compilation67981
-Node: Cross configuring69246
-Node: Cross problems70919
-Node: Coding conventions72780
-Node: Declarations and definitions73449
-Node: Const75632
-Node: install-tl77495
-Node: install-tl NAME77836
-Node: install-tl SYNOPSIS77994
-Node: install-tl DESCRIPTION78202
-Node: install-tl REFERENCES79203
-Node: install-tl OPTIONS79719
-Ref: install-tl *-gui* [[=]_module_]80073
-Ref: install-tl 'text'80282
-Ref: install-tl 'wizard'80405
-Ref: install-tl 'perltk'80559
-Ref: install-tl *-no-gui*80993
-Ref: install-tl *-lang* _llcode_81074
-Ref: install-tl *-repository* _url|path_81761
-Ref: install-tl *-select-repository*83572
-Ref: install-tl *-all-options*84008
-Ref: install-tl *-custom-bin* _path_84315
-Ref: install-tl *-debug-translation*84970
-Ref: install-tl *-force-platform* _platform_85189
-Ref: install-tl *-help*, *--help*, *-?*85433
-Ref: install-tl *-in-place*85826
-Ref: install-tl *-logfile* _file_86353
-Ref: install-tl *-no-cls*86704
-Ref: install-tl *-non-admin*86835
-Ref: install-tl *--persistent-downloads*86940
-Ref: install-tl *--no-persistent-downloads*86968
-Ref: install-tl *-portable*87576
-Ref: install-tl *-print-platform*87715
-Ref: install-tl *-profile* _profile_87908
-Ref: install-tl *-q*89402
-Ref: install-tl *-scheme* _scheme_89464
-Ref: install-tl *-v*89938
-Ref: install-tl *-version*, *--version*90099
-Node: install-tl ENVIRONMENT VARIABLES90230
-Ref: install-tl 'TEXLIVE_INSTALL_ENV_NOCHECK'90619
-Ref: install-tl 'TEXLIVE_INSTALL_NO_CONTEXT_CACHE'90821
-Ref: install-tl 'TEXLIVE_INSTALL_PREFIX'90927
-Ref: install-tl 'TEXLIVE_INSTALL_TEXMFCONFIG'90958
-Ref: install-tl 'TEXLIVE_INSTALL_TEXMFHOME'90987
-Ref: install-tl 'TEXLIVE_INSTALL_TEXMFLOCAL'91017
-Ref: install-tl 'TEXLIVE_INSTALL_TEXMFSYSCONFIG'91051
-Ref: install-tl 'TEXLIVE_INSTALL_TEXMFSYSVAR'91082
-Ref: install-tl 'TEXLIVE_INSTALL_TEXMFVAR'91110
-Ref: install-tl 'NOPERLDOC'91165
-Node: install-tl AUTHORS AND COPYRIGHT91229
-Node: tlmgr91587
-Node: tlmgr NAME92024
-Node: tlmgr SYNOPSIS92149
-Node: tlmgr DESCRIPTION92339
-Node: tlmgr EXAMPLES93435
-Ref: tlmgr 'tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet'93726
-Ref: tlmgr 'tlmgr update --list'93907
-Ref: tlmgr 'tlmgr update --all'94000
-Ref: tlmgr 'tlmgr info' _pkg_94156
-Node: tlmgr OPTIONS94362
-Ref: tlmgr *--repository* _url|path_94882
-Ref: tlmgr *--gui* [_action_]95607
-Ref: tlmgr *--gui-lang* _llcode_96014
-Ref: tlmgr *--debug-translation*96697
-Ref: tlmgr *--machine-readable*96900
-Ref: tlmgr *--no-execute-actions*97168
-Ref: tlmgr *--package-logfile* _file_97361
-Ref: tlmgr *--pause*97616
-Ref: tlmgr *--persistent-downloads*97771
-Ref: tlmgr *--no-persistent-downloads*97799
-Ref: tlmgr *--pin-file*98293
-Ref: tlmgr *--usermode*98511
-Ref: tlmgr *--usertree* _dir_98631
-Node: tlmgr ACTIONS99181
-Node: tlmgr help100413
-Node: tlmgr version100889
-Node: tlmgr backup [--clean[=_N_]] [--backupdir _dir_] [--all | _pkg_]...101207
-Ref: tlmgr *--backupdir* _directory_102301
-Ref: tlmgr *--all*102498
-Ref: tlmgr *--clean*[=_N_]102720
-Ref: tlmgr *--dry-run*103017
-Node: tlmgr candidates _pkg_103137
-Ref: tlmgr *candidates _pkg_* 1103424
-Node: tlmgr check [_option_]... [files|depends|executes|runfiles|all]103568
-Ref: tlmgr *files*104011
-Ref: tlmgr *depends*104146
-Ref: tlmgr *executes*104488
-Ref: tlmgr *runfiles*104606
-Ref: tlmgr *--use-svn*104718
-Node: tlmgr conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]104835
-Node: tlmgr dump-tlpdb [--local|--remote]106907
-Ref: tlmgr *--local*107417
-Ref: tlmgr *--remote*107456
-Node: tlmgr generate [_option_]... _what_107878
-Ref: tlmgr *generate language*108119
-Ref: tlmgr *generate language.dat*108144
-Ref: tlmgr *generate language.def*108169
-Ref: tlmgr *generate language.dat.lua*108198
-Ref: tlmgr *generate fmtutil*108218
-Ref: tlmgr *--dest* _output_file_110455
-Ref: tlmgr *--localcfg* _local_conf_file_111031
-Ref: tlmgr *--rebuild-sys*111154
-Node: tlmgr gui112015
-Node: tlmgr info [_option_...] [collections|schemes|_pkg_...]112259
-Ref: tlmgr *--list*113464
-Ref: tlmgr *--only-installed*113743
-Ref: tlmgr *--taxonomy*113958
-Ref: tlmgr *--keyword*113970
-Ref: tlmgr *--functionality*113988
-Ref: tlmgr *--characterization*114009
-Node: tlmgr init-usertree114222
-Node: tlmgr install [_option_]... _pkg_...114648
-Ref: tlmgr *--file*115012
-Ref: tlmgr *--reinstall*115238
-Ref: tlmgr *--no-depends*115618
-Ref: tlmgr *--no-depends-at-all*115777
-Ref: tlmgr *--dry-run* 1116175
-Ref: tlmgr *--force*116293
-Node: tlmgr option116499
-Ref: tlmgr *option [show]*116672
-Ref: tlmgr *option showall*116690
-Ref: tlmgr *option _key_ [_value_]*116716
-Node: tlmgr paper120564
-Ref: tlmgr *paper [a4|letter]*120749
-Ref: tlmgr *[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*120823
-Node: tlmgr path [--w32mode=user|admin] [add|remove]121850
-Node: tlmgr pinning123333
-Ref: tlmgr 'pinning show'123640
-Ref: tlmgr 'pinning add' _repo_ _pkgglob_...123713
-Ref: tlmgr 'pinning remove' _repo_ _pkgglob_...123832
-Ref: tlmgr 'pinning remove _repo_ --all'123985
-Node: tlmgr platform list|add|remove _platform_...124039
-Node: tlmgr platform set _platform_124287
-Node: tlmgr platform set auto124515
-Ref: tlmgr *--dry-run* 2125632
-Node: tlmgr postaction [--w32mode=user|admin] [--fileassocmode=1|2] [--all] [install|remove] [shortcut|fileassoc|script] [_pkg_]...125741
-Node: tlmgr print-platform127043
-Node: tlmgr restore [--backupdir _dir_] [--all | _pkg_ [_rev_]]127515
-Ref: tlmgr *--all* 1128411
-Ref: tlmgr *--backupdir* _directory_ 1128605
-Ref: tlmgr *--dry-run* 3128761
-Ref: tlmgr *--force* 1128878
-Node: tlmgr remove [_option_]... _pkg_...128906
-Ref: tlmgr *--no-depends* 1129429
-Ref: tlmgr *--no-depends-at-all* 1129491
-Ref: tlmgr *--force* 2129547
-Ref: tlmgr *--dry-run* 4130019
-Node: tlmgr repository130126
-Ref: tlmgr *repository list*130334
-Ref: tlmgr *repository list _path|tag_*130364
-Ref: tlmgr *repository add _path_ [_tag_]*130397
-Ref: tlmgr *repository remove _path|tag_*130429
-Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*130483
-Node: tlmgr search [_option_...] _what_131567
-Node: tlmgr search [_option_...] --file _what_132078
-Node: tlmgr search [_option_...] --taxonomy _what_132329
-Node: tlmgr search [_option_...] --keyword _what_132640
-Node: tlmgr search [_option_...] --functionality _what_132958
-Node: tlmgr search [_option_...] --characterization _what_133296
-Node: tlmgr search [_option_...] --all _what_133636
-Ref: tlmgr *--global*134084
-Ref: tlmgr *--word*134196
-Ref: tlmgr *--list* 1134435
-Ref: tlmgr *--file* 1134781
-Ref: tlmgr *--taxonomy* 1134838
-Ref: tlmgr *--keyword* 1134850
-Ref: tlmgr *--functionality* 1134868
-Ref: tlmgr *--characterization* 1134889
-Ref: tlmgr *--all* 2135044
-Node: tlmgr uninstall135127
-Ref: tlmgr *--force* 3135381
-Node: tlmgr update [_option_]... [_pkg_]...135437
-Ref: tlmgr *--all* 3135808
-Ref: tlmgr *--self*137549
-Ref: tlmgr *--dry-run* 5138313
-Ref: tlmgr *--list* [_pkg_]138490
-Ref: tlmgr *--exclude* _pkg_139179
-Ref: tlmgr *--no-auto-remove* [_pkg_]...139872
-Ref: tlmgr *--no-auto-install* [_pkg_]...140323
-Ref: tlmgr *--reinstall-forcibly-removed*140979
-Ref: tlmgr *--backup* and *--backupdir* _directory_141543
-Ref: tlmgr *--no-depends* 2142724
-Ref: tlmgr *--no-depends-at-all* 2142927
-Ref: tlmgr *--force* 4142983
-Node: tlmgr USER MODE143409
-Node: tlmgr user mode install146220
-Node: tlmgr user mode backup; restore; remove; update147167
-Node: tlmgr user mode generate; option; paper147609
-Node: tlmgr CONFIGURATION FILE FOR TLMGR147985
-Node: tlmgr TAXONOMIES149076
-Ref: tlmgr '--keyword' 2149702
-Ref: tlmgr '--functionality' 2149787
-Ref: tlmgr '--characterization' 2149943
-Ref: tlmgr '--taxonomy' 2150084
-Node: tlmgr MULTIPLE REPOSITORIES150625
-Node: tlmgr Pinning152346
-Node: tlmgr GUI FOR TLMGR154321
-Node: tlmgr Main display155543
-Node: tlmgr Display configuration area155795
-Ref: tlmgr Status156156
-Ref: tlmgr Category156320
-Ref: tlmgr Match156506
-Ref: tlmgr Selection156766
-Ref: tlmgr Display configuration buttons156970
-Node: tlmgr Package list area157153
-Ref: tlmgr a checkbox157737
-Ref: tlmgr package name157873
-Ref: tlmgr local revision (and version)157972
-Ref: tlmgr remote revision (and version)158347
-Ref: tlmgr short description158644
-Node: tlmgr Main display action buttons158689
-Ref: tlmgr Update all installed158955
-Ref: tlmgr Update159327
-Ref: tlmgr Install159377
-Ref: tlmgr Remove159563
-Ref: tlmgr Backup159741
-Node: tlmgr Menu bar159898
-Ref: tlmgr 'tlmgr' menu160095
-Ref: tlmgr 'Options menu'160403
-Ref: tlmgr 'Actions menu'161486
-Ref: tlmgr 'Help menu'161914
-Node: tlmgr MACHINE-READABLE OUTPUT162047
-Node: tlmgr Machine-readable 'update' and 'install' output162863
-Ref: tlmgr 'location-url' _location_164145
-Ref: tlmgr 'total-bytes' _count_164361
-Ref: tlmgr _pkgname_164771
-Ref: tlmgr _status_164981
-Ref: tlmgr 'd'165059
-Ref: tlmgr 'f'165119
-Ref: tlmgr 'u'165298
-Ref: tlmgr 'r'165344
-Ref: tlmgr 'a'165467
-Ref: tlmgr 'i'165645
-Ref: tlmgr 'I'165764
-Ref: tlmgr _localrev_165866
-Ref: tlmgr _serverrev_165973
-Ref: tlmgr _size_166085
-Ref: tlmgr _runtime_166254
-Ref: tlmgr _esttot_166324
-Node: tlmgr Machine-readable 'option' output166357
-Node: tlmgr AUTHORS AND COPYRIGHT166875
-Node: Index167222
+Node: Program modules38647
+Node: 't1utils' package39083
+Node: 'xindy' package39650
+Node: 'xdvik' package40829
+Node: 'asymptote'41908
+Node: Extending TeX Live42363
+Node: Adding a new program module42731
+Node: Adding a new generic library module44250
+Node: Adding a new TeX-specific library module46463
+Node: Configure options47150
+Node: Global configure options48541
+Node: '--disable-native-texlive-build'49109
+Node: '--prefix' '--bindir' ...50105
+Node: '--disable-largefile'50653
+Node: '--disable-missing'51346
+Node: '--enable-compiler-warnings='LEVEL51753
+Node: '--enable-cxx-runtime-hack'52498
+Node: '--enable-maintainer-mode'52931
+Node: '--enable-multiplatform'53466
+Node: '--enable-shared'54027
+Node: '--enable-silent-rules'54404
+Node: '--without-ln-s'54866
+Node: '--without-x'55223
+Node: Program-specific configure options55415
+Node: '--enable-PROG' '--disable-PROG'56078
+Node: '--disable-all-pkgs'56361
+Node: Configure options for 'texk/web2c'57355
+Node: Configure options for 'texk/bibtex-x'59813
+Node: Configure options for 'texk/dvipdfm-x'60369
+Node: Configure options for 'texk/dvisvgm'61208
+Node: Configure options for 'texk/texlive'62100
+Node: Configure options for 'texk/xdvik'62527
+Node: Configure options for 'utils/xindy'63137
+Node: Library-specific configure options64042
+Node: Configure options for 'kpathsea'65057
+Node: Configure options for system 'poppler'65770
+Node: Variables for configure66567
+Node: Cross compilation67995
+Node: Cross configuring69260
+Node: Cross problems70933
+Node: Coding conventions72794
+Node: Declarations and definitions73463
+Node: Const75646
+Node: install-tl77509
+Node: install-tl NAME77850
+Node: install-tl SYNOPSIS78008
+Node: install-tl DESCRIPTION78216
+Node: install-tl REFERENCES79217
+Node: install-tl OPTIONS79733
+Ref: install-tl *-gui* [[=]_module_]80087
+Ref: install-tl 'text'80296
+Ref: install-tl 'wizard'80419
+Ref: install-tl 'perltk'80573
+Ref: install-tl *-no-gui*81007
+Ref: install-tl *-lang* _llcode_81088
+Ref: install-tl *-repository* _url|path_81775
+Ref: install-tl *-select-repository*83586
+Ref: install-tl *-all-options*84022
+Ref: install-tl *-custom-bin* _path_84329
+Ref: install-tl *-debug-translation*84984
+Ref: install-tl *-force-platform* _platform_85203
+Ref: install-tl *-help*, *--help*, *-?*85447
+Ref: install-tl *-in-place*85840
+Ref: install-tl *-logfile* _file_86367
+Ref: install-tl *-no-cls*86718
+Ref: install-tl *-non-admin*86849
+Ref: install-tl *--persistent-downloads*86954
+Ref: install-tl *--no-persistent-downloads*86982
+Ref: install-tl *-portable*87590
+Ref: install-tl *-print-platform*87729
+Ref: install-tl *-profile* _profile_87922
+Ref: install-tl *-q*89416
+Ref: install-tl *-scheme* _scheme_89478
+Ref: install-tl *-v*89952
+Ref: install-tl *-version*, *--version*90113
+Node: install-tl ENVIRONMENT VARIABLES90244
+Ref: install-tl 'TEXLIVE_INSTALL_ENV_NOCHECK'90633
+Ref: install-tl 'TEXLIVE_INSTALL_NO_CONTEXT_CACHE'90835
+Ref: install-tl 'TEXLIVE_INSTALL_PREFIX'90941
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFCONFIG'90972
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFHOME'91001
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFLOCAL'91031
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFSYSCONFIG'91065
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFSYSVAR'91096
+Ref: install-tl 'TEXLIVE_INSTALL_TEXMFVAR'91124
+Ref: install-tl 'NOPERLDOC'91179
+Node: install-tl AUTHORS AND COPYRIGHT91243
+Node: tlmgr91601
+Node: tlmgr NAME92038
+Node: tlmgr SYNOPSIS92163
+Node: tlmgr DESCRIPTION92353
+Node: tlmgr EXAMPLES93449
+Ref: tlmgr 'tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet'93740
+Ref: tlmgr 'tlmgr update --list'93921
+Ref: tlmgr 'tlmgr update --all'94014
+Ref: tlmgr 'tlmgr info' _pkg_94170
+Node: tlmgr OPTIONS94376
+Ref: tlmgr *--repository* _url|path_94896
+Ref: tlmgr *--gui* [_action_]95621
+Ref: tlmgr *--gui-lang* _llcode_96028
+Ref: tlmgr *--debug-translation*96711
+Ref: tlmgr *--machine-readable*96914
+Ref: tlmgr *--no-execute-actions*97182
+Ref: tlmgr *--package-logfile* _file_97375
+Ref: tlmgr *--pause*97630
+Ref: tlmgr *--persistent-downloads*97785
+Ref: tlmgr *--no-persistent-downloads*97813
+Ref: tlmgr *--pin-file*98307
+Ref: tlmgr *--usermode*98525
+Ref: tlmgr *--usertree* _dir_98645
+Node: tlmgr ACTIONS99195
+Node: tlmgr help100427
+Node: tlmgr version100903
+Node: tlmgr backup [--clean[=_N_]] [--backupdir _dir_] [--all | _pkg_]...101221
+Ref: tlmgr *--backupdir* _directory_102315
+Ref: tlmgr *--all*102512
+Ref: tlmgr *--clean*[=_N_]102734
+Ref: tlmgr *--dry-run*103031
+Node: tlmgr candidates _pkg_103151
+Ref: tlmgr *candidates _pkg_* 1103438
+Node: tlmgr check [_option_]... [files|depends|executes|runfiles|all]103582
+Ref: tlmgr *files*104025
+Ref: tlmgr *depends*104160
+Ref: tlmgr *executes*104502
+Ref: tlmgr *runfiles*104620
+Ref: tlmgr *--use-svn*104732
+Node: tlmgr conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]104849
+Node: tlmgr dump-tlpdb [--local|--remote]106921
+Ref: tlmgr *--local*107431
+Ref: tlmgr *--remote*107470
+Node: tlmgr generate [_option_]... _what_107892
+Ref: tlmgr *generate language*108133
+Ref: tlmgr *generate language.dat*108158
+Ref: tlmgr *generate language.def*108183
+Ref: tlmgr *generate language.dat.lua*108212
+Ref: tlmgr *generate fmtutil*108232
+Ref: tlmgr *--dest* _output_file_110469
+Ref: tlmgr *--localcfg* _local_conf_file_111045
+Ref: tlmgr *--rebuild-sys*111168
+Node: tlmgr gui112029
+Node: tlmgr info [_option_...] [collections|schemes|_pkg_...]112273
+Ref: tlmgr *--list*113478
+Ref: tlmgr *--only-installed*113757
+Ref: tlmgr *--taxonomy*113972
+Ref: tlmgr *--keyword*113984
+Ref: tlmgr *--functionality*114002
+Ref: tlmgr *--characterization*114023
+Node: tlmgr init-usertree114236
+Node: tlmgr install [_option_]... _pkg_...114662
+Ref: tlmgr *--file*115026
+Ref: tlmgr *--reinstall*115252
+Ref: tlmgr *--no-depends*115632
+Ref: tlmgr *--no-depends-at-all*115791
+Ref: tlmgr *--dry-run* 1116189
+Ref: tlmgr *--force*116307
+Node: tlmgr option116513
+Ref: tlmgr *option [show]*116686
+Ref: tlmgr *option showall*116704
+Ref: tlmgr *option _key_ [_value_]*116730
+Node: tlmgr paper120578
+Ref: tlmgr *paper [a4|letter]*120763
+Ref: tlmgr *[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*120837
+Node: tlmgr path [--w32mode=user|admin] [add|remove]121864
+Node: tlmgr pinning123347
+Ref: tlmgr 'pinning show'123654
+Ref: tlmgr 'pinning add' _repo_ _pkgglob_...123727
+Ref: tlmgr 'pinning remove' _repo_ _pkgglob_...123846
+Ref: tlmgr 'pinning remove _repo_ --all'123999
+Node: tlmgr platform list|add|remove _platform_...124053
+Node: tlmgr platform set _platform_124301
+Node: tlmgr platform set auto124529
+Ref: tlmgr *--dry-run* 2125646
+Node: tlmgr postaction [--w32mode=user|admin] [--fileassocmode=1|2] [--all] [install|remove] [shortcut|fileassoc|script] [_pkg_]...125755
+Node: tlmgr print-platform127057
+Node: tlmgr restore [--backupdir _dir_] [--all | _pkg_ [_rev_]]127529
+Ref: tlmgr *--all* 1128425
+Ref: tlmgr *--backupdir* _directory_ 1128619
+Ref: tlmgr *--dry-run* 3128775
+Ref: tlmgr *--force* 1128892
+Node: tlmgr remove [_option_]... _pkg_...128920
+Ref: tlmgr *--no-depends* 1129443
+Ref: tlmgr *--no-depends-at-all* 1129505
+Ref: tlmgr *--force* 2129561
+Ref: tlmgr *--dry-run* 4130033
+Node: tlmgr repository130140
+Ref: tlmgr *repository list*130348
+Ref: tlmgr *repository list _path|tag_*130378
+Ref: tlmgr *repository add _path_ [_tag_]*130411
+Ref: tlmgr *repository remove _path|tag_*130443
+Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*130497
+Node: tlmgr search [_option_...] _what_131581
+Node: tlmgr search [_option_...] --file _what_132092
+Node: tlmgr search [_option_...] --taxonomy _what_132343
+Node: tlmgr search [_option_...] --keyword _what_132654
+Node: tlmgr search [_option_...] --functionality _what_132972
+Node: tlmgr search [_option_...] --characterization _what_133310
+Node: tlmgr search [_option_...] --all _what_133650
+Ref: tlmgr *--global*134098
+Ref: tlmgr *--word*134210
+Ref: tlmgr *--list* 1134449
+Ref: tlmgr *--file* 1134795
+Ref: tlmgr *--taxonomy* 1134852
+Ref: tlmgr *--keyword* 1134864
+Ref: tlmgr *--functionality* 1134882
+Ref: tlmgr *--characterization* 1134903
+Ref: tlmgr *--all* 2135058
+Node: tlmgr uninstall135141
+Ref: tlmgr *--force* 3135395
+Node: tlmgr update [_option_]... [_pkg_]...135451
+Ref: tlmgr *--all* 3135822
+Ref: tlmgr *--self*137563
+Ref: tlmgr *--dry-run* 5138327
+Ref: tlmgr *--list* [_pkg_]138504
+Ref: tlmgr *--exclude* _pkg_139193
+Ref: tlmgr *--no-auto-remove* [_pkg_]...139886
+Ref: tlmgr *--no-auto-install* [_pkg_]...140337
+Ref: tlmgr *--reinstall-forcibly-removed*140993
+Ref: tlmgr *--backup* and *--backupdir* _directory_141557
+Ref: tlmgr *--no-depends* 2142738
+Ref: tlmgr *--no-depends-at-all* 2142941
+Ref: tlmgr *--force* 4142997
+Node: tlmgr USER MODE143423
+Node: tlmgr user mode install146234
+Node: tlmgr user mode backup; restore; remove; update147181
+Node: tlmgr user mode generate; option; paper147623
+Node: tlmgr CONFIGURATION FILE FOR TLMGR147999
+Node: tlmgr TAXONOMIES149090
+Ref: tlmgr '--keyword' 2149716
+Ref: tlmgr '--functionality' 2149801
+Ref: tlmgr '--characterization' 2149957
+Ref: tlmgr '--taxonomy' 2150098
+Node: tlmgr MULTIPLE REPOSITORIES150639
+Node: tlmgr Pinning152360
+Node: tlmgr GUI FOR TLMGR154335
+Node: tlmgr Main display155557
+Node: tlmgr Display configuration area155809
+Ref: tlmgr Status156170
+Ref: tlmgr Category156334
+Ref: tlmgr Match156520
+Ref: tlmgr Selection156780
+Ref: tlmgr Display configuration buttons156984
+Node: tlmgr Package list area157167
+Ref: tlmgr a checkbox157751
+Ref: tlmgr package name157887
+Ref: tlmgr local revision (and version)157986
+Ref: tlmgr remote revision (and version)158361
+Ref: tlmgr short description158658
+Node: tlmgr Main display action buttons158703
+Ref: tlmgr Update all installed158969
+Ref: tlmgr Update159341
+Ref: tlmgr Install159391
+Ref: tlmgr Remove159577
+Ref: tlmgr Backup159755
+Node: tlmgr Menu bar159912
+Ref: tlmgr 'tlmgr' menu160109
+Ref: tlmgr 'Options menu'160417
+Ref: tlmgr 'Actions menu'161500
+Ref: tlmgr 'Help menu'161928
+Node: tlmgr MACHINE-READABLE OUTPUT162061
+Node: tlmgr Machine-readable 'update' and 'install' output162877
+Ref: tlmgr 'location-url' _location_164159
+Ref: tlmgr 'total-bytes' _count_164375
+Ref: tlmgr _pkgname_164785
+Ref: tlmgr _status_164995
+Ref: tlmgr 'd'165073
+Ref: tlmgr 'f'165133
+Ref: tlmgr 'u'165312
+Ref: tlmgr 'r'165358
+Ref: tlmgr 'a'165481
+Ref: tlmgr 'i'165659
+Ref: tlmgr 'I'165778
+Ref: tlmgr _localrev_165880
+Ref: tlmgr _serverrev_165987
+Ref: tlmgr _size_166099
+Ref: tlmgr _runtime_166268
+Ref: tlmgr _esttot_166338
+Node: tlmgr Machine-readable 'option' output166371
+Node: tlmgr AUTHORS AND COPYRIGHT166889
+Node: Index167236
End Tag Table
diff --git a/source/doc/tlbuild.texi b/source/doc/tlbuild.texi
index 5ca4d1c4dc1c8f6468b9b1ddd671c72e66b19a1a..54d0756c4e704a6f74fe1196bf8805568654ef40 100644
--- a/source/doc/tlbuild.texi
+++ b/source/doc/tlbuild.texi
@@ -441,7 +441,7 @@ make check
Then you modify source files in @file{mydir/texk/dvipdfm-x} and rerun
@code{make} in @file{mydir/Work/texk/dvipdfm-x} to rebuild.
-The second line the @code{configure} are invocation shows examples of
+The second line the @code{configure} invocation shows examples of
extra things you likely want to specify if you intend to hack the
sources (and not just build binaries): the @code{-C} speeds up
@code{configure}, and the @code{CFLAGS} and @code{CXXFLAGS} are to
@@ -757,7 +757,7 @@ source tree.
As mentioned at the beginning of the chapter (@pxref{Overview of build
system}), the main source directories are @file{texk/}
(@TeX{}-specific programs and libraries), @file{utils/} (additional
-programs), and @file{libs} (generic libraries).
+programs), and @file{libs/} (generic libraries).
@cindex @file{am/} top-level directory
@cindex @file{m4/} top-level directory
@@ -958,14 +958,14 @@ that provides make variables for that library. E.g., for
@defmac KPSE_LIBPNG_FLAGS
Provide the configure option @code{--with-system-libpng}. Set and
-@code{AC_SUBST} @code{make} variables for modules using this library
-(either an installed version or from the @TL{} tree): @code{LIBPNG_INCLUDES}
-for use in CPPFLAGS, LIBPNG_LIBS for use in LDADD, LIBPNG_DEPEND for
-use as dependency, and LIBPNG_RULE defining @code{make} rules to
+@code{AC_SUBST} @code{make} variables for modules using this library (either
+an installed version or from the @TL{} tree): @code{LIBPNG_INCLUDES} for use
+in CPPFLAGS, @code{LIBPNG_LIBS} for use in LDADD, @code{LIBPNG_DEPEND} for
+use as dependency, and @code{LIBPNG_RULE} defining @code{make} rules to
rebuild the library.
@end defmac
-@defmac KPSE_ADD_FLAGS (@var{libname})
+@defmac KPSE_ADD_FLAGS (@var{name})
Temporarily extend CPPFLAGS and LIBS with the values required for the
library module @code{@var{name}}.
@end defmac
@@ -1185,7 +1185,7 @@ released for standalone use.
@pindex --with-system-kpathsea
It is possible, and possibly even useful for distro builds
-(@pxref{Distro builds}, to specify the configure option
+(@pxref{Distro builds}), to specify the configure option
@code{--with-system-kpathsea} in order to use a system version of the
library and it may then be necessary to specify
@code{--with-kpathsea-includes} and/or @code{--with-kpathsea-libdir}.
@@ -1821,7 +1821,7 @@ into the module @code{bibtex-x} (extended Bib@TeX{}).
@vindex --disable-bibtex8
@noindent @code{--disable-bibtex8}@*Do not build the @file{bibtex8} program.
---disable-bibtexu
+@vindex --disable-bibtexu
@noindent @code{--disable-bibtexu}@*Do not build the @file{bibtexu} program
(building @file{bibtexu} requires @code{ICU} libraries).
@@ -1863,7 +1863,7 @@ possible, or otherwise disable support for PostScript specials.
@vindex --without-libgs
@noindent @code{--without-libgs}@*Build @file{dvisvgm} without PostScript
-support at all. Because the dynamic loading just mention defeats all
+support at all. Because the dynamic loading just mentioned defeats all
attempts at static linking, the result can crash due to library
incompatibilities, e.g., on CentOS 5.
@@ -1952,7 +1952,7 @@ versions of all libraries (if any) that @var{lib} depends on.
@vindex --with-@var{lib}-includes=@var{dir}@r{,} -libdir
For many libraries @code{--with-@var{lib}-includes=@var{dir}} and
-@code{--with-@var{lib}-libdir=@var{dir}} to specify non-standard
+@code{--with-@var{lib}-libdir=@var{dir}} can specify non-standard
search locations; others use @file{pkg-config} or similar to determine
the required flags.
@@ -2001,15 +2001,15 @@ The default can be overridden by the user in any case.
@pindex poppler
@pindex xpdf @r{as library}
-Building Lua@TeX{} and Xe@TeX{} requires @code{poppler}, either from
-the TL tree or system headers and library. Building pdf@TeX{}
-requires either @code{xpdf} from the @TL{} tree or system
-@code{poppler} headers and library.
+Building Lua@TeX{} (or LuaJIT@TeX{}) and Xe@TeX{} requires
+@code{poppler}, either from the TL tree or system headers and
+library. Building pdf@TeX{} requires either @code{xpdf} from
+the @TL{} tree or system @code{poppler} headers and library.
@vindex --with-system-poppler
@noindent @code{--with-system-poppler}@*Use a system version (0.18 or
-newer) of @code{poppler} for Lua@TeX{} and Xe@TeX{}, and use
-@file{pkg-config} to obtain the required flags.
+newer) of @code{poppler} for Lua@TeX{} (or LuaJIT@TeX{}) and Xe@TeX{},
+and use @file{pkg-config} to obtain the required flags.
@vindex --with-system-xpdf
@noindent @code{--with-system-xpdf}@*Use a system version (0.12 or better)
diff --git a/source/libs/README b/source/libs/README
index d87f2991ef4f46e18008f16e5dfce4c23ab8aa1a..354f1b0469e5d54b516235b7a3093fb990d9b65b 100644
--- a/source/libs/README
+++ b/source/libs/README
@@ -1,4 +1,4 @@
-$Id: README 35508 2014-11-04 09:50:53Z peter $
+$Id: README 35761 2014-12-07 13:04:51Z peter $
Public domain. Originally created by Karl Berry, 2005.
Libraries we compile for TeX Live.
@@ -12,7 +12,7 @@ See also comments in ../texk/README.
cairo 1.14.0 - checked 15oct14
http://cairographics.org/releases/
-freetype2 2.5.3 - checked 8mar14
+freetype2 2.5.4 - checked 7dec14
http://savannah.nongnu.org/download/freetype/
gd 2.1.0 - checked 26jun13
@@ -24,7 +24,7 @@ gmp 6.0.0 - checked 25mar14
graphite2 1.2.4 - checked 2dec13
http://sourceforge.net/projects/silgraphite/files/graphite2/
-harfbuzz 0.9.35 - checked 14aug14
+harfbuzz 0.9.36 - checked 11nov14
http://www.freedesktop.org/software/harfbuzz/release/
icu 54.1 (release) - checked 2oct14
@@ -33,7 +33,7 @@ icu 54.1 (release) - checked 2oct14
libpaper 1.1.24+nmu2 - checked 24oct13
ftp://ftp.de.debian.org/debian/pool/main/libp/libpaper/
-libpng 1.6.14 - checked 23oct14
+libpng 1.6.15 - checked 11nov14
http://www.libpng.org/ - used by many
http://www.libpng.org/pub/png/pngcode.html
@@ -49,7 +49,7 @@ mpfr 3.1.2 - checked 13mar13
pixman 0.32.6 - checked 7jul14
http://cairographics.org/releases/
-poppler 0.28.0 - checked 4nov14
+poppler 0.29.0 - checked 5dec14
http://poppler.freedesktop.org/ - used by luatex and xetex
potrace 1.11 - checked 12apr13
diff --git a/source/libs/cairo/ChangeLog b/source/libs/cairo/ChangeLog
index e3152846b47944d7c7d89c8aa5108ab07b0456bb..1fa7b8e2bdeaa22407e57c92f87fb5ee9987cea3 100644
--- a/source/libs/cairo/ChangeLog
+++ b/source/libs/cairo/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-02 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Added KPSE_COMPILER_VISIBILITY.
+ * Makefile.am [AM_CFLAGS]: Added $(VISIBILITY_CFLAGS).
+
2014-10-15 Peter Breitenlohner <peb@mppmu.mpg.de>
Import cairo-1.14.0.
diff --git a/source/libs/cairo/Makefile.am b/source/libs/cairo/Makefile.am
index 148d5365c9953af36855b0e35c399da50ab2a05c..64fd506021f2c63940e2161fc8ff1b12b7fb41d4 100644
--- a/source/libs/cairo/Makefile.am
+++ b/source/libs/cairo/Makefile.am
@@ -24,7 +24,7 @@ dist-hook:
SUBDIRS = . cairo
AM_CPPFLAGS = -I$(top_srcdir)/$(CAIRO_SRC) $(PIXMAN_INCLUDES) -DCAIRO_NO_MUTEX
-AM_CFLAGS = $(CAIRO_ATTRIBUTE_FLAG)
+AM_CFLAGS = $(CAIRO_ATTRIBUTE_FLAG) $(VISIBILITY_CFLAGS) # $(WARNING_CFLAGS)
noinst_LIBRARIES = libcairo.a
diff --git a/source/libs/cairo/Makefile.in b/source/libs/cairo/Makefile.in
index be9496be88606bcd189077543f4e8f1cdda93366..f6b60db855b477a79469c7d76b64d7ed90bc311a 100644
--- a/source/libs/cairo/Makefile.in
+++ b/source/libs/cairo/Makefile.in
@@ -158,6 +158,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/cairo-bigendian.m4 \
$(top_srcdir)/m4/cairo-features.m4 $(top_srcdir)/m4/float.m4 \
$(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-pixman-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-visibility.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -850,6 +851,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -905,7 +907,7 @@ EXTRA_DIST = $(CAIRO_TREE) $(CAIRO_TREE)-PATCHES
CAIRO_SRC = $(CAIRO_TREE)/src
SUBDIRS = . cairo
AM_CPPFLAGS = -I$(top_srcdir)/$(CAIRO_SRC) $(PIXMAN_INCLUDES) -DCAIRO_NO_MUTEX
-AM_CFLAGS = $(CAIRO_ATTRIBUTE_FLAG)
+AM_CFLAGS = $(CAIRO_ATTRIBUTE_FLAG) $(VISIBILITY_CFLAGS) # $(WARNING_CFLAGS)
noinst_LIBRARIES = libcairo.a
libcairo_a_SOURCES = @CAIRO_TREE@/src/cairo-analysis-surface.c \
@CAIRO_TREE@/src/cairo-arc.c @CAIRO_TREE@/src/cairo-array.c \
diff --git a/source/libs/cairo/aclocal.m4 b/source/libs/cairo/aclocal.m4
index 4ef8628bf14ce54442aa718627537e6cd4b84851..e125205b2321979034802c6d5ae7b0dc58613002 100644
--- a/source/libs/cairo/aclocal.m4
+++ b/source/libs/cairo/aclocal.m4
@@ -1188,4 +1188,5 @@ m4_include([m4/cairo-features.m4])
m4_include([m4/float.m4])
m4_include([../../m4/kpse-common.m4])
m4_include([../../m4/kpse-pixman-flags.m4])
+m4_include([../../m4/kpse-visibility.m4])
m4_include([../../m4/kpse-warnings.m4])
diff --git a/source/libs/cairo/cairo/Makefile.in b/source/libs/cairo/cairo/Makefile.in
index a77fd8e87cecc7bd1b560a9304965e5f7bff2fd0..61371cf925599badfefbcc954051c1c7e96f8c66 100644
--- a/source/libs/cairo/cairo/Makefile.in
+++ b/source/libs/cairo/cairo/Makefile.in
@@ -93,6 +93,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/cairo-bigendian.m4 \
$(top_srcdir)/m4/cairo-features.m4 $(top_srcdir)/m4/float.m4 \
$(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-pixman-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-visibility.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -177,6 +178,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
diff --git a/source/libs/cairo/configure b/source/libs/cairo/configure
index c7c69947a0ac23364bc73be9667f830fdeb56046..fce04bd99161d2a9d7ec1f653c93d23845d4a9a0 100755
--- a/source/libs/cairo/configure
+++ b/source/libs/cairo/configure
@@ -699,6 +699,7 @@ CAIRO_HAS_FC_FONT_TRUE
build_FALSE
build_TRUE
CAIRO_ATTRIBUTE_FLAG
+VISIBILITY_CFLAGS
LN_S
RANLIB
WARNING_CFLAGS
@@ -5709,6 +5710,56 @@ esac
esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for C to hide external symbols" >&5
+$as_echo_n "checking CFLAGS for C to hide external symbols... " >&6; }
+if ${kpse_cv_visibility_cflags+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+kpse_cv_visibility_cflags=unknown
+kpse_save_flags=$CFLAGS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
+ extern void foo(void);
+ void foo(void){printf("foo\n");}
+_ACEOF
+# FIXME: Add tests for non-GNU compilers
+for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do
+ CFLAGS="$kpse_save_flags -Werror $kpse_flag"
+ if ac_fn_c_try_compile "$LINENO"; then :
+ kpse_cv_visibility_cflags=$kpse_flag; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+done
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_visibility_cflags" >&5
+$as_echo "$kpse_cv_visibility_cflags" >&6; }
+CFLAGS=$kpse_save_flags
+case $kpse_cv_visibility_cflags in #(
+ unknown) :
+ ;; #(
+ *) :
+ VISIBILITY_CFLAGS=$kpse_cv_visibility_cflags
+ ;;
+esac
+
+
+
+
+
cairo_attribute_flag=
if test "x$GCC" = xyes; then
case `$CC -dumpversion` in #(
diff --git a/source/libs/cairo/configure.ac b/source/libs/cairo/configure.ac
index 27fe9c7c35e5afbecf9264cb3d352e5f0ae3b916..8818bcc142b13370443b6b8d2b46db8fc199bb03 100644
--- a/source/libs/cairo/configure.ac
+++ b/source/libs/cairo/configure.ac
@@ -22,10 +22,12 @@ AC_PROG_RANLIB
AC_PROG_LN_S
CAIRO_BIGENDIAN
+KPSE_COMPILER_VISIBILITY
+
cairo_attribute_flag=
if test "x$GCC" = xyes; then
AS_CASE([`$CC -dumpversion`],
- [4.@<:@01@:>@.* ], [],
+ [4.[[01]].* ], [],
[4.* | 5.*], [cairo_attribute_flag=-Wno-attributes])
fi
AC_SUBST([CAIRO_ATTRIBUTE_FLAG], [$cairo_attribute_flag])
diff --git a/source/libs/configure b/source/libs/configure
index 97794838c57568b06fd508edf9e423ebc8a6aff4..e6554e4b6d89d35b5bf2b1c428886a48b6b750eb 100755
--- a/source/libs/configure
+++ b/source/libs/configure
@@ -3079,11 +3079,11 @@ if test "${enable_multiplatform+set}" = set; then :
fi
if test "x$enable_multiplatform" = xyes; then
if test "x$bindir" = 'x${exec_prefix}/bin'; then
- bindir="$bindir/$host"
+ bindir="$bindir/${host_alias-$host}"
ac_configure_args="$ac_configure_args '--bindir=$bindir'"
fi
if test "x$libdir" = 'x${exec_prefix}/lib'; then
- libdir="$libdir/$host"
+ libdir="$libdir/${host_alias-$host}"
ac_configure_args="$ac_configure_args '--libdir=$libdir'"
fi
fi
diff --git a/source/libs/gmp/ChangeLog b/source/libs/gmp/ChangeLog
index 09d9f0a4bbde95b420cc8ecf2aa85406e33e3e1e..e001801a5913e759fda8cea3b64906288debe824 100644
--- a/source/libs/gmp/ChangeLog
+++ b/source/libs/gmp/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-03 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Added KPSE_COMPILER_VISIBILITY.
+ * Makefile.am [AM_CFLAGS]: Added $(VISIBILITY_CFLAGS).
+
2014-06-26 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Add some files required with CFLAGS='-g3 -g -O0'.
diff --git a/source/libs/gmp/Makefile.am b/source/libs/gmp/Makefile.am
index 0e9e8a3b3fa42f2d3dd3737824361fc6851b0e92..fcc5ebd969ea604dd04029d68f1e0fb29c59173e 100644
--- a/source/libs/gmp/Makefile.am
+++ b/source/libs/gmp/Makefile.am
@@ -22,7 +22,7 @@ dist-hook:
SUBDIRS = native . include
AM_CPPFLAGS = -I$(srcdir)/$(GMP_TREE) -I$(srcdir)/$(GMP_TREE)/mpn/generic -DNO_ASM
-AM_CFLAGS = # $(WARNING_CFLAGS)
+AM_CFLAGS = $(VISIBILITY_CFLAGS) # $(WARNING_CFLAGS)
noinst_LIBRARIES = libgmp.a
$(libgmp_a_OBJECTS): mp_bases.h fac_table.h fib_table.h
diff --git a/source/libs/gmp/Makefile.in b/source/libs/gmp/Makefile.in
index 9863123f52bfd75ed917938da83cf9b3c6d11dcc..c9cc5f917c52ed4bd42d8722e57641ca39c6df5b 100644
--- a/source/libs/gmp/Makefile.in
+++ b/source/libs/gmp/Makefile.in
@@ -103,6 +103,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gmp-alloca.m4 \
$(top_srcdir)/m4/gmp-attribute.m4 \
$(top_srcdir)/m4/gmp-double-format.m4 \
$(top_srcdir)/../../m4/kpse-common.m4 \
+ $(top_srcdir)/../../m4/kpse-visibility.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -651,6 +652,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -706,7 +708,7 @@ top_srcdir = @top_srcdir@
EXTRA_DIST = $(GMP_TREE) $(GMP_TREE)-PATCHES
SUBDIRS = native . include
AM_CPPFLAGS = -I$(srcdir)/$(GMP_TREE) -I$(srcdir)/$(GMP_TREE)/mpn/generic -DNO_ASM
-AM_CFLAGS = # $(WARNING_CFLAGS)
+AM_CFLAGS = $(VISIBILITY_CFLAGS) # $(WARNING_CFLAGS)
noinst_LIBRARIES = libgmp.a
nodist_libgmp_a_SOURCES = \
$(basic_sources) \
diff --git a/source/libs/gmp/aclocal.m4 b/source/libs/gmp/aclocal.m4
index 03e96b7b9b3bc3ae9a6afc3abccb33bbdbdd7022..567fd654e0def4d66de2552ef39d47872bf0072a 100644
--- a/source/libs/gmp/aclocal.m4
+++ b/source/libs/gmp/aclocal.m4
@@ -1187,4 +1187,5 @@ m4_include([m4/gmp-alloca.m4])
m4_include([m4/gmp-attribute.m4])
m4_include([m4/gmp-double-format.m4])
m4_include([../../m4/kpse-common.m4])
+m4_include([../../m4/kpse-visibility.m4])
m4_include([../../m4/kpse-warnings.m4])
diff --git a/source/libs/gmp/configure b/source/libs/gmp/configure
index 986e461c85f9a19fd42ac6a63db2d477c193409a..ae050b150440e1579352e233fd959a4d113ddd12 100755
--- a/source/libs/gmp/configure
+++ b/source/libs/gmp/configure
@@ -648,6 +648,7 @@ build_os
build_vendor
build_cpu
build
+VISIBILITY_CFLAGS
LN_S
RANLIB
WARNING_CFLAGS
@@ -4928,6 +4929,56 @@ $as_echo "no, using $LN_S" >&6; }
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for C to hide external symbols" >&5
+$as_echo_n "checking CFLAGS for C to hide external symbols... " >&6; }
+if ${kpse_cv_visibility_cflags+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+kpse_cv_visibility_cflags=unknown
+kpse_save_flags=$CFLAGS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
+ extern void foo(void);
+ void foo(void){printf("foo\n");}
+_ACEOF
+# FIXME: Add tests for non-GNU compilers
+for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do
+ CFLAGS="$kpse_save_flags -Werror $kpse_flag"
+ if ac_fn_c_try_compile "$LINENO"; then :
+ kpse_cv_visibility_cflags=$kpse_flag; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+done
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_visibility_cflags" >&5
+$as_echo "$kpse_cv_visibility_cflags" >&6; }
+CFLAGS=$kpse_save_flags
+case $kpse_cv_visibility_cflags in #(
+ unknown) :
+ ;; #(
+ *) :
+ VISIBILITY_CFLAGS=$kpse_cv_visibility_cflags
+ ;;
+esac
+
+
+
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
if ${ac_cv_prog_cc_c99+:} false; then :
diff --git a/source/libs/gmp/configure.ac b/source/libs/gmp/configure.ac
index fd31f005203e267c6c51dabd3aebc6eb8b918797..4bbb2733f028d2ffd9097fd561af498a5f07395b 100644
--- a/source/libs/gmp/configure.ac
+++ b/source/libs/gmp/configure.ac
@@ -20,6 +20,8 @@ AC_PROG_CC
AC_PROG_RANLIB
AC_PROG_LN_S
+KPSE_COMPILER_VISIBILITY
+
AC_PROG_CC_C99
CFLAGS="$CFLAGS -DNO_ASM"
diff --git a/source/libs/gmp/gmp-6.0.0-PATCHES/TL-Changes b/source/libs/gmp/gmp-6.0.0-PATCHES/TL-Changes
index 13f45565ee9c1c51d4137087ce057c660556bcf6..1c101730169b21b73a8445423de36c7de9370ac6 100644
--- a/source/libs/gmp/gmp-6.0.0-PATCHES/TL-Changes
+++ b/source/libs/gmp/gmp-6.0.0-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the gmp-6.0.6/ tree as obtained from:
+Changes applied to the gmp-6.0.0/ tree as obtained from:
http://ftp.gnu.org/gnu/gmp/
Removed:
diff --git a/source/libs/gmp/include/Makefile.in b/source/libs/gmp/include/Makefile.in
index 43c481ae0ff229aa3e155244f3ad6035ad29530d..fc501181695ce91c623b7f5f942bbfd323154735 100644
--- a/source/libs/gmp/include/Makefile.in
+++ b/source/libs/gmp/include/Makefile.in
@@ -85,6 +85,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gmp-alloca.m4 \
$(top_srcdir)/m4/gmp-attribute.m4 \
$(top_srcdir)/m4/gmp-double-format.m4 \
$(top_srcdir)/../../m4/kpse-common.m4 \
+ $(top_srcdir)/../../m4/kpse-visibility.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -169,6 +170,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
diff --git a/source/libs/libpng/ChangeLog b/source/libs/libpng/ChangeLog
index 5b6426b7bea0631a2e2d7773909c6f94c9b4dd8e..f9933c355195e7405398ac39e36ec4a61b42ce8b 100644
--- a/source/libs/libpng/ChangeLog
+++ b/source/libs/libpng/ChangeLog
@@ -1,3 +1,13 @@
+2014-12-03 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Added KPSE_COMPILER_VISIBILITY.
+ * Makefile.am [AM_CFLAGS]: Added $(VISIBILITY_CFLAGS).
+
+2014-11-21 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import libpng-1.6.15.
+ * version.ac: Adjust.
+
2014-10-23 Peter Breitenlohner <peb@mppmu.mpg.de>
Import libpng-1.6.14.
diff --git a/source/libs/libpng/Makefile.am b/source/libs/libpng/Makefile.am
index 788ea70edc695c0c21d405bc46201732bc29d380..35b76dc7006e7387e3a8d563778cc8721b741876 100644
--- a/source/libs/libpng/Makefile.am
+++ b/source/libs/libpng/Makefile.am
@@ -28,7 +28,7 @@ dist-hook:
SUBDIRS = . include
AM_CPPFLAGS = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES) $(LIBPNG_DEFINES)
-AM_CFLAGS = $(WARNING_CFLAGS)
+AM_CFLAGS = $(VISIBILITY_CFLAGS) $(WARNING_CFLAGS)
noinst_LIBRARIES=libpng.a
diff --git a/source/libs/libpng/Makefile.in b/source/libs/libpng/Makefile.in
index bc059db68d8f0630bf2cc1f6be981c6f09a578f2..d5b6c7ac28285bca39504fbd90347bba555a227a 100644
--- a/source/libs/libpng/Makefile.in
+++ b/source/libs/libpng/Makefile.in
@@ -95,6 +95,7 @@ DIST_COMMON = $(srcdir)/../../am/reconfig.am \
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
+ $(top_srcdir)/../../m4/kpse-visibility.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
@@ -502,6 +503,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
ZLIB_DEPEND = @ZLIB_DEPEND@
ZLIB_INCLUDES = @ZLIB_INCLUDES@
@@ -551,7 +553,7 @@ top_srcdir = @top_srcdir@
EXTRA_DIST = $(LIBPNG_TREE) $(LIBPNG_TREE)-PATCHES
SUBDIRS = . include
AM_CPPFLAGS = -I$(top_srcdir)/$(LIBPNG_TREE) $(ZLIB_INCLUDES) $(LIBPNG_DEFINES)
-AM_CFLAGS = $(WARNING_CFLAGS)
+AM_CFLAGS = $(VISIBILITY_CFLAGS) $(WARNING_CFLAGS)
noinst_LIBRARIES = libpng.a
nodist_libpng_a_SOURCES = \
@LIBPNG_TREE@/png.c \
diff --git a/source/libs/libpng/aclocal.m4 b/source/libs/libpng/aclocal.m4
index 9db986d04fdaeeebbf1f1e04e247c05d9ad4fea6..ad0c53db51b514b93aa7b6269b0718c847187483 100644
--- a/source/libs/libpng/aclocal.m4
+++ b/source/libs/libpng/aclocal.m4
@@ -1184,5 +1184,6 @@ AC_SUBST([am__untar])
]) # _AM_PROG_TAR
m4_include([../../m4/kpse-common.m4])
+m4_include([../../m4/kpse-visibility.m4])
m4_include([../../m4/kpse-warnings.m4])
m4_include([../../m4/kpse-zlib-flags.m4])
diff --git a/source/libs/libpng/configure b/source/libs/libpng/configure
index d4b45b7a13f7915ca425aec774440fb3d8ef41c8..2eeb27b362ce94ace46c9a306e56caef84b3762b 100755
--- a/source/libs/libpng/configure
+++ b/source/libs/libpng/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libpng (TeX Live) 1.6.14.
+# Generated by GNU Autoconf 2.69 for libpng (TeX Live) 1.6.15.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -580,12 +580,12 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libpng (TeX Live)'
PACKAGE_TARNAME='libpng--tex-live-'
-PACKAGE_VERSION='1.6.14'
-PACKAGE_STRING='libpng (TeX Live) 1.6.14'
+PACKAGE_VERSION='1.6.15'
+PACKAGE_STRING='libpng (TeX Live) 1.6.15'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
-ac_unique_file="libpng-1.6.14/pngget.c"
+ac_unique_file="libpng-1.6.15/pngget.c"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -638,6 +638,7 @@ POW_LIB
EGREP
GREP
CPP
+VISIBILITY_CFLAGS
LN_S
RANLIB
WARNING_CFLAGS
@@ -1286,7 +1287,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 libpng (TeX Live) 1.6.14 to adapt to many kinds of systems.
+\`configure' configures libpng (TeX Live) 1.6.15 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1353,7 +1354,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libpng (TeX Live) 1.6.14:";;
+ short | recursive ) echo "Configuration of libpng (TeX Live) 1.6.15:";;
esac
cat <<\_ACEOF
@@ -1458,7 +1459,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libpng (TeX Live) configure 1.6.14
+libpng (TeX Live) configure 1.6.15
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1881,7 +1882,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 libpng (TeX Live) $as_me 1.6.14, which was
+It was created by libpng (TeX Live) $as_me 1.6.15, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3804,7 +3805,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng--tex-live-'
- VERSION='1.6.14'
+ VERSION='1.6.15'
cat >>confdefs.h <<_ACEOF
@@ -4834,6 +4835,56 @@ $as_echo "no, using $LN_S" >&6; }
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for C to hide external symbols" >&5
+$as_echo_n "checking CFLAGS for C to hide external symbols... " >&6; }
+if ${kpse_cv_visibility_cflags+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+kpse_cv_visibility_cflags=unknown
+kpse_save_flags=$CFLAGS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
+ extern void foo(void);
+ void foo(void){printf("foo\n");}
+_ACEOF
+# FIXME: Add tests for non-GNU compilers
+for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do
+ CFLAGS="$kpse_save_flags -Werror $kpse_flag"
+ if ac_fn_c_try_compile "$LINENO"; then :
+ kpse_cv_visibility_cflags=$kpse_flag; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+done
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_visibility_cflags" >&5
+$as_echo "$kpse_cv_visibility_cflags" >&6; }
+CFLAGS=$kpse_save_flags
+case $kpse_cv_visibility_cflags in #(
+ unknown) :
+ ;; #(
+ *) :
+ VISIBILITY_CFLAGS=$kpse_cv_visibility_cflags
+ ;;
+esac
+
+
+
+
+
ac_config_headers="$ac_config_headers config.h"
@@ -5722,7 +5773,7 @@ LIBS=$kpse_save_LIBS
echo timestamp >config.force
fi
-LIBPNG_TREE=libpng-1.6.14
+LIBPNG_TREE=libpng-1.6.15
LIBPNG_DEFINES='-DPNG_CONFIGURE_LIBPNG -DPNG_NO_MMX_CODE'
@@ -6273,7 +6324,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 libpng (TeX Live) $as_me 1.6.14, which was
+This file was extended by libpng (TeX Live) $as_me 1.6.15, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6339,7 +6390,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="\\
-libpng (TeX Live) config.status 1.6.14
+libpng (TeX Live) config.status 1.6.15
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/source/libs/libpng/configure.ac b/source/libs/libpng/configure.ac
index f7847972e30d1606e046cf1fd825e72623e253e5..8c815a8d753e889a008989672384ff5493f28be9 100644
--- a/source/libs/libpng/configure.ac
+++ b/source/libs/libpng/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009-2014 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,
@@ -19,6 +19,8 @@ AC_PROG_CC
AC_PROG_RANLIB
AC_PROG_LN_S
+KPSE_COMPILER_VISIBILITY
+
AC_CONFIG_HEADERS([config.h])
# Checks for header files.
diff --git a/source/libs/libpng/include/Makefile.in b/source/libs/libpng/include/Makefile.in
index 20858230cc02ab663760736ac0c1a8ba635d6f46..9274414f9cabfffef9a19f8440a62fa8dd75466a 100644
--- a/source/libs/libpng/include/Makefile.in
+++ b/source/libs/libpng/include/Makefile.in
@@ -80,6 +80,7 @@ DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \
subdir = include
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
+ $(top_srcdir)/../../m4/kpse-visibility.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
@@ -161,6 +162,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
ZLIB_DEPEND = @ZLIB_DEPEND@
ZLIB_INCLUDES = @ZLIB_INCLUDES@
diff --git a/source/libs/libpng/libpng-1.6.14/ANNOUNCE b/source/libs/libpng/libpng-1.6.14/ANNOUNCE
deleted file mode 100644
index 5dfc7596700a1cbebbe0f760c3361cbe55ebc9e4..0000000000000000000000000000000000000000
--- a/source/libs/libpng/libpng-1.6.14/ANNOUNCE
+++ /dev/null
@@ -1,63 +0,0 @@
-Libpng 1.6.14 - October 23, 2014
-
-This is a public release of libpng, intended for use in production codes.
-
-Files available for download:
-
-Source files with LF line endings (for Unix/Linux) and with a
-"configure" script
-
- libpng-1.6.14.tar.xz (LZMA-compressed, recommended)
- libpng-1.6.14.tar.gz
-
-Source files with CRLF line endings (for Windows), without the
-"configure" script
-
- lpng1614.7z (LZMA-compressed, recommended)
- lpng1614.zip
-
-Other information:
-
- libpng-1.6.14-README.txt
- libpng-1.6.14-LICENSE.txt
- libpng-1.6.14-*.asc (armored detached GPG signatures)
-
-Changes since the last public release (1.6.13):
- Guard usage of png_ptr->options with #ifdef PNG_SET_OPTION_SUPPORTED.
- Do not build contrib/tools/pngfix.c when PNG_SETJMP_NOT_SUPPORTED,
- to allow "make" to complete without setjmp support (bug report by
- Claudio Fontana)
- Add "#include <setjmp.h>" to contrib/tools/pngfix.c (John Bowler)
- Use nanosleep() instead of usleep() in contrib/gregbook/rpng2-x.c
- because usleep() is deprecated.
- Define usleep() in contrib/gregbook/rpng2-x.c if not already defined
- in unistd.h and nanosleep() is not available; fixes error introduced
- in libpng-1.6.13.
- Define FE_DIVBYZERO, FE_INVALID, and FE_OVERFLOW in pngvalid.c if not
- already defined (bug report by "zootus at users.sourceforge.net").
- Fixed incorrect handling of the iTXt compression flag in pngrutil.c
- (bug report by Shunsaku Hirata). Bug was introduced in libpng-1.6.0.
- Added "option READ_iCCP enables READ_COMPRESSED_TEXT" to pnglibconf.dfa
- Removed unused "text_len" parameter from private function png_write_zTXt().
- Conditionally compile some code in png_deflate_claim(), when
- PNG_WARNINGS_SUPPORTED and PNG_ERROR_TEXT_SUPPORTED are disabled.
- Replaced repeated code in pngpread.c with PNG_PUSH_SAVE_BUFFER_IF_FULL.
- Added "chunk iTXt enables TEXT" and "chunk zTXt enables TEXT"
- to pnglibconf.dfa.
- Removed "option READ_COMPRESSED_TEXT enables READ_TEXT" from pnglibconf.dfa,
- to make it possible to configure a libpng that supports iCCP but not TEXT.
- Removed "option WRITE_COMPRESSED_TEXT enables WRITE_TEXT" from pnglibconf.dfa
- Only mark text chunks as written after successfully writing them.
- Fixed some typos in comments.
- Changed png_convert_to_rfc_1123() to png_convert_to_rfc_1123_buffer()
- in the manual, to reflect the change made in libpng-1.6.0.
- Updated README file to explain that direct access to the png_struct
- and info_struct members has not been permitted since libpng-1.5.0.
-
-Send comments/corrections/commendations to png-mng-implement at lists.sf.net
-(subscription required; visit
-https://lists.sourceforge.net/lists/listinfo/png-mng-implement
-to subscribe)
-or to glennrp at users.sourceforge.net
-
-Glenn R-P
diff --git a/source/libs/libpng/libpng-1.6.14-PATCHES/ChangeLog b/source/libs/libpng/libpng-1.6.15-PATCHES/ChangeLog
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14-PATCHES/ChangeLog
rename to source/libs/libpng/libpng-1.6.15-PATCHES/ChangeLog
diff --git a/source/libs/libpng/libpng-1.6.14-PATCHES/TL-Changes b/source/libs/libpng/libpng-1.6.15-PATCHES/TL-Changes
similarity index 64%
rename from source/libs/libpng/libpng-1.6.14-PATCHES/TL-Changes
rename to source/libs/libpng/libpng-1.6.15-PATCHES/TL-Changes
index 29f49fd8bb8134d221c655a3e613500874e3cdae..edecd7c31282457e5989ee82aaa12ea1eb74f34b 100644
--- a/source/libs/libpng/libpng-1.6.14-PATCHES/TL-Changes
+++ b/source/libs/libpng/libpng-1.6.15-PATCHES/TL-Changes
@@ -1,5 +1,5 @@
-Changes applied to the libpng-1.6.14/ tree as obtained from:
- http://www.libpng.org/ libpng-1.6.14.tar.xz
+Changes applied to the libpng-1.6.15/ tree as obtained from:
+ http://www.libpng.org/ libpng-1.6.15.tar.xz
Copied:
scripts/pnglibconf.h.prebuilt -> pnglibconf.h
diff --git a/source/libs/libpng/libpng-1.6.15/ANNOUNCE b/source/libs/libpng/libpng-1.6.15/ANNOUNCE
new file mode 100644
index 0000000000000000000000000000000000000000..bd5e1eb9439adaf4f54ba47f7485d1793f06e073
--- /dev/null
+++ b/source/libs/libpng/libpng-1.6.15/ANNOUNCE
@@ -0,0 +1,66 @@
+Libpng 1.6.15 - November 20, 2014
+
+This is a public release of libpng, intended for use in production codes.
+
+Files available for download:
+
+Source files with LF line endings (for Unix/Linux) and with a
+"configure" script
+
+ libpng-1.6.15.tar.xz (LZMA-compressed, recommended)
+ libpng-1.6.15.tar.gz
+
+Source files with CRLF line endings (for Windows), without the
+"configure" script
+
+ lpng1615.7z (LZMA-compressed, recommended)
+ lpng1615.zip
+
+Other information:
+
+ libpng-1.6.15-README.txt
+ libpng-1.6.15-LICENSE.txt
+ libpng-1.6.15-*.asc (armored detached GPG signatures)
+
+Changes since the last public release (1.6.14):
+ Changed "if (!x)" to "if (x == 0)" and "if (x)" to "if (x != 0)"
+ Simplified png_free_data().
+ Added missing "ptr = NULL" after some instances of png_free().
+ Made a one-line revision to configure.ac to support ARM on aarch64
+ (bug report by Marcin Juszkiewicz, fix by John Bowler).
+ Avoid out-of-bounds memory access in png_user_version_check().
+ Simplified and future-proofed png_user_version_check().
+ Fixed GCC unsigned int->float warnings. Various versions of GCC
+ seem to generate warnings when an unsigned value is implicitly
+ converted to double. This is probably a GCC bug but this change
+ avoids the issue by explicitly converting to (int) where safe.
+ Free all allocated memory in pngimage. The file buffer cache was left
+ allocated at the end of the program, harmless but it causes memory
+ leak reports from clang.
+ Fixed array size calculations to avoid warnings. At various points
+ in the code the number of elements in an array is calculated using
+ sizeof. This generates a compile time constant of type (size_t) which
+ is then typically assigned to an (unsigned int) or (int). Some versions
+ of GCC on 64-bit systems warn about the apparent narrowing, even though
+ the same compiler does apparently generate the correct, in-range,
+ numeric constant. This adds appropriate, safe, casts to make the
+ warnings go away.
+ Removed #ifdef PNG_16BIT_SUPPORTED/#endif around png_product2(); it is
+ needed by png_reciprocal2().
+ Added #ifdef PNG_16BIT_SUPPORTED/#endif around png_log16bit() and
+ png_do_swap().
+ Changed all "#endif /* PNG_FEATURE_SUPPORTED */" to "#endif /* FEATURE */"
+ The macros passed in the command line to Borland make were ignored if
+ similarly-named macros were already defined in makefiles. This behavior
+ is different from POSIX make and other make programs. Surround the
+ macro definitions with ifndef guards (Cosmin).
+ Added "-D_CRT_SECURE_NO_WARNINGS" to CFLAGS in scripts/makefile.vcwin32.
+ Removed the obsolete $ARCH variable from scripts/makefile.darwin.
+
+Send comments/corrections/commendations to png-mng-implement at lists.sf.net
+(subscription required; visit
+https://lists.sourceforge.net/lists/listinfo/png-mng-implement
+to subscribe)
+or to glennrp at users.sourceforge.net
+
+Glenn R-P
diff --git a/source/libs/libpng/libpng-1.6.14/CHANGES b/source/libs/libpng/libpng-1.6.15/CHANGES
similarity index 98%
rename from source/libs/libpng/libpng-1.6.14/CHANGES
rename to source/libs/libpng/libpng-1.6.15/CHANGES
index 04ae66361b3f0192f74d594300b31db1334cf1d2..02a3e471b4374dfcccb996a9a2728146a6f3fa52 100644
--- a/source/libs/libpng/libpng-1.6.14/CHANGES
+++ b/source/libs/libpng/libpng-1.6.15/CHANGES
@@ -5033,6 +5033,71 @@ Version 1.6.14rc02 [October 17, 2014]
Version 1.6.14 [October 23, 2014]
No changes.
+Version 1.6.15beta01 [October 29, 2014]
+ Changed "if (!x)" to "if (x == 0)" and "if (x)" to "if (x != 0)"
+ Simplified png_free_data().
+ Added missing "ptr = NULL" after some instances of png_free().
+
+Version 1.6.15beta02 [November 1, 2014]
+ Changed remaining "if (!x)" to "if (x == 0)" and "if (x)" to "if (x != 0)"
+
+Version 1.6.15beta03 [November 3, 2014]
+ Added PNG_USE_ARM_NEON configuration flag (Marcin Juszkiewicz).
+
+Version 1.6.15beta04 [November 4, 2014]
+ Removed new PNG_USE_ARM_NEON configuration flag and made a one-line
+ revision to configure.ac to support ARM on aarch64 instead (John Bowler).
+
+Version 1.6.15beta05 [November 5, 2014]
+ Use png_get_libpng_ver(NULL) instead of PNG_LIBPNG_VER_STRING in
+ example.c, pngtest.c, and applications in the contrib directory.
+ Avoid out-of-bounds memory access in png_user_version_check().
+ Simplified and future-proofed png_user_version_check().
+ Fixed GCC unsigned int->float warnings. Various versions of GCC
+ seem to generate warnings when an unsigned value is implicitly
+ converted to double. This is probably a GCC bug but this change
+ avoids the issue by explicitly converting to (int) where safe.
+ Free all allocated memory in pngimage. The file buffer cache was left
+ allocated at the end of the program, harmless but it causes memory
+ leak reports from clang.
+ Fixed array size calculations to avoid warnings. At various points
+ in the code the number of elements in an array is calculated using
+ sizeof. This generates a compile time constant of type (size_t) which
+ is then typically assigned to an (unsigned int) or (int). Some versions
+ of GCC on 64-bit systems warn about the apparent narrowing, even though
+ the same compiler does apparently generate the correct, in-range,
+ numeric constant. This adds appropriate, safe, casts to make the
+ warnings go away.
+
+Version 1.6.15beta06 [November 6, 2014]
+ Reverted use png_get_libpng_ver(NULL) instead of PNG_LIBPNG_VER_STRING
+ in the manual, example.c, pngtest.c, and applications in the contrib
+ directory. It was incorrect advice.
+
+Version 1.6.15beta07 [November 7, 2014]
+ Removed #ifdef PNG_16BIT_SUPPORTED/#endif around png_product2(); it is
+ needed by png_reciprocal2().
+ Added #ifdef PNG_16BIT_SUPPORTED/#endif around png_log16bit() and
+ png_do_swap().
+ Changed all "#endif /* PNG_FEATURE_SUPPORTED */" to "#endif /* FEATURE */"
+
+Version 1.6.15beta08 [November 8, 2014]
+ More housecleaning in *.h
+
+Version 1.6.15rc01 [November 13, 2014]
+
+Version 1.6.15rc02 [November 14, 2014]
+ The macros passed in the command line to Borland make were ignored if
+ similarly-named macros were already defined in makefiles. This behavior
+ is different from POSIX make and other make programs. Surround the
+ macro definitions with ifndef guards (Cosmin).
+
+Version 1.6.15rc03 [November 16, 2014]
+ Added "-D_CRT_SECURE_NO_WARNINGS" to CFLAGS in scripts/makefile.vcwin32.
+ Removed the obsolete $ARCH variable from scripts/makefile.darwin.
+
+Version 1.6.15 [November 20, 2014]
+
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/source/libs/libpng/libpng-1.6.14/CMakeLists.txt b/source/libs/libpng/libpng-1.6.15/CMakeLists.txt
similarity index 99%
rename from source/libs/libpng/libpng-1.6.14/CMakeLists.txt
rename to source/libs/libpng/libpng-1.6.15/CMakeLists.txt
index 576467be6dd7ca44d1c4fd9cfde7382b4bd7df77..691526c3ac597ac96f665e22ed29e9105e3bad01 100644
--- a/source/libs/libpng/libpng-1.6.14/CMakeLists.txt
+++ b/source/libs/libpng/libpng-1.6.15/CMakeLists.txt
@@ -16,7 +16,7 @@ enable_testing()
set(PNGLIB_MAJOR 1)
set(PNGLIB_MINOR 6)
-set(PNGLIB_RELEASE 14)
+set(PNGLIB_RELEASE 15)
set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
@@ -253,7 +253,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW)
# SET UP LINKS
if(PNG_SHARED)
set_target_properties(${PNG_LIB_NAME} PROPERTIES
-# VERSION 16.${PNGLIB_RELEASE}.1.6.14
+# VERSION 16.${PNGLIB_RELEASE}.1.6.15
VERSION 16.${PNGLIB_RELEASE}.0
SOVERSION 16
CLEAN_DIRECT_OUTPUT 1)
diff --git a/source/libs/libpng/libpng-1.6.14/INSTALL b/source/libs/libpng/libpng-1.6.15/INSTALL
similarity index 95%
rename from source/libs/libpng/libpng-1.6.14/INSTALL
rename to source/libs/libpng/libpng-1.6.15/INSTALL
index 1b66d89acf0c552679ff88f2b8d8f4a440facb62..61ea591479c009a23afe7e4b6e5c3a088ec74126 100644
--- a/source/libs/libpng/libpng-1.6.14/INSTALL
+++ b/source/libs/libpng/libpng-1.6.15/INSTALL
@@ -18,7 +18,7 @@ VIII. Configuring libpng for 16-bit platforms
XIII. Removing unwanted object code
XIV. Changes to the build and configuration of libpng in libpng-1.5.x
XV. Configuring libpng for multiprocessing
- XVI. Other sources of information about libpng:
+ XVI. Other sources of information about libpng
I. Simple installation
@@ -32,6 +32,15 @@ and ignore the rest of this document. "/path" is the path to the directory
where you want to install the libpng "lib", "include", and "bin"
subdirectories.
+If you downloaded a GIT clone, you will need to run ./autogen.sh before
+running ./configure, to create "configure" and "Makefile.in" which are
+not included in the GIT repository.
+
+Note that "configure" is only included in the "*.tar" distributions and not
+in the "*.zip" or "*.7z" distributions. If you downloaded one of those
+distributions, see "Building with project files" or "Building with makefiles",
+below.
+
II. Rebuilding the configure scripts
If configure does not work on your system, or if you have a need to
@@ -111,8 +120,7 @@ Your directory structure should look like this:
libpng (this directory)
INSTALL (this file)
README
- *.h
- *.c
+ *.h, *.c => libpng source files
CMakeLists.txt => "cmake" script
configuration files:
configure.ac, configure, Makefile.am, Makefile.in,
@@ -120,15 +128,10 @@ Your directory structure should look like this:
libpng-config.in, aclocal.m4, config.h.in, config.sub,
depcomp, install-sh, mkinstalldirs, test-pngtest.sh
contrib
- gregbook
- libtests
- pngminim
- pngminus
- pngsuite
- visupng
+ arm-neon, conftest, examples, gregbook, libtests, pngminim,
+ pngminus, pngsuite, tools, visupng
projects
- visualc71
- vstudio
+ cbuilder5, owatcom, visualc71, vstudio, xcode
scripts
makefile.*
*.def (module definition files)
@@ -136,11 +139,7 @@ Your directory structure should look like this:
pngtest.png
etc.
zlib
- README
- *.h
- *.c
- contrib
- etc.
+ README, *.h, *.c contrib, etc.
If the line endings in the files look funny, you may wish to get the other
distribution of libpng. It is available in both tar.gz (UNIX style line
@@ -149,7 +148,7 @@ endings) and zip (DOS style line endings) formats.
VI. Building with project files
If you are building libpng with MSVC, you can enter the
-libpng projects\visualc6 or visualc71 directory and follow the instructions
+libpng projects\visualc71 or vstudio directory and follow the instructions
in README.txt.
Otherwise enter the zlib directory and follow the instructions in zlib/README,
@@ -395,7 +394,7 @@ CFLAGS="-Wall -O -funroll-loops \
--with-pkgconfigdir=/usr/lib/pkgconfig --includedir=/usr/include
You can alternatively specify --includedir=/usr/include, /usr/local/include,
-/usr/include/libpng%NN%, or whatever.
+/usr/include/libpng16, or whatever.
If you find that the configure script is out-of-date or is not supporting
your platform properly, try running autogen.sh to regenerate "configure",
diff --git a/source/libs/libpng/libpng-1.6.14/LICENSE b/source/libs/libpng/libpng-1.6.15/LICENSE
similarity index 97%
rename from source/libs/libpng/libpng-1.6.14/LICENSE
rename to source/libs/libpng/libpng-1.6.15/LICENSE
index 63920b369a6368f4486d2828b830dab33240ea18..63ad5b2b900a2f1ce01f3b48accdf8a8aae82779 100644
--- a/source/libs/libpng/libpng-1.6.14/LICENSE
+++ b/source/libs/libpng/libpng-1.6.15/LICENSE
@@ -10,7 +10,7 @@ this sentence.
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.6.14, October 23, 2014, are
+libpng versions 1.2.6, August 15, 2004, through 1.6.15, November 20, 2014, are
Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors
@@ -108,4 +108,4 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-October 23, 2014
+November 20, 2014
diff --git a/source/libs/libpng/libpng-1.6.14/Makefile.am b/source/libs/libpng/libpng-1.6.15/Makefile.am
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/Makefile.am
rename to source/libs/libpng/libpng-1.6.15/Makefile.am
diff --git a/source/libs/libpng/libpng-1.6.14/README b/source/libs/libpng/libpng-1.6.15/README
similarity index 99%
rename from source/libs/libpng/libpng-1.6.14/README
rename to source/libs/libpng/libpng-1.6.15/README
index db6a023972961a634921893127d4d1b193836b5d..75506ce82e941de77b051039bc816b4a6077c38a 100644
--- a/source/libs/libpng/libpng-1.6.14/README
+++ b/source/libs/libpng/libpng-1.6.15/README
@@ -1,4 +1,4 @@
-README for libpng version 1.6.14 - October 23, 2014 (shared library 16.0)
+README for libpng version 1.6.15 - November 20, 2014 (shared library 16.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
diff --git a/source/libs/libpng/libpng-1.6.14/TODO b/source/libs/libpng/libpng-1.6.15/TODO
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/TODO
rename to source/libs/libpng/libpng-1.6.15/TODO
diff --git a/source/libs/libpng/libpng-1.6.14/arm/arm_init.c b/source/libs/libpng/libpng-1.6.15/arm/arm_init.c
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/arm/arm_init.c
rename to source/libs/libpng/libpng-1.6.15/arm/arm_init.c
diff --git a/source/libs/libpng/libpng-1.6.14/arm/filter_neon.S b/source/libs/libpng/libpng-1.6.15/arm/filter_neon.S
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/arm/filter_neon.S
rename to source/libs/libpng/libpng-1.6.15/arm/filter_neon.S
diff --git a/source/libs/libpng/libpng-1.6.14/arm/filter_neon_intrinsics.c b/source/libs/libpng/libpng-1.6.15/arm/filter_neon_intrinsics.c
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/arm/filter_neon_intrinsics.c
rename to source/libs/libpng/libpng-1.6.15/arm/filter_neon_intrinsics.c
diff --git a/source/libs/libpng/libpng-1.6.14/autogen.sh b/source/libs/libpng/libpng-1.6.15/autogen.sh
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/autogen.sh
rename to source/libs/libpng/libpng-1.6.15/autogen.sh
diff --git a/source/libs/libpng/libpng-1.6.14/config.h.in b/source/libs/libpng/libpng-1.6.15/config.h.in
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/config.h.in
rename to source/libs/libpng/libpng-1.6.15/config.h.in
diff --git a/source/libs/libpng/libpng-1.6.14/configure.ac b/source/libs/libpng/libpng-1.6.15/configure.ac
similarity index 98%
rename from source/libs/libpng/libpng-1.6.14/configure.ac
rename to source/libs/libpng/libpng-1.6.15/configure.ac
index d60a5ab65bbd118f9d184cf595b5e12b92191b01..952884a18f1f42b0eb3b3394307f42ec74c9f354 100644
--- a/source/libs/libpng/libpng-1.6.14/configure.ac
+++ b/source/libs/libpng/libpng-1.6.15/configure.ac
@@ -18,7 +18,7 @@ AC_PREREQ([2.68])
dnl Version number stuff here:
-AC_INIT([libpng],[1.6.14],[png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng],[1.6.15],[png-mng-implement@lists.sourceforge.net])
AC_CONFIG_MACRO_DIR([scripts])
# libpng does not follow GNU file name conventions (hence 'foreign')
@@ -39,10 +39,10 @@ dnl automake, so the following is not necessary (and is not defined anyway):
dnl AM_PREREQ([1.11.2])
dnl stop configure from automagically running automake
-PNGLIB_VERSION=1.6.14
+PNGLIB_VERSION=1.6.15
PNGLIB_MAJOR=1
PNGLIB_MINOR=6
-PNGLIB_RELEASE=14
+PNGLIB_RELEASE=15
dnl End of version number stuff
@@ -310,7 +310,7 @@ AC_ARG_ENABLE([arm-neon],
AM_CONDITIONAL([PNG_ARM_NEON],
[test "$enable_arm_neon" != 'no' &&
case "$host_cpu" in
- arm*) :;;
+ arm*|aarch64*) :;;
*) test "$enable_arm_neon" != '';;
esac])
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/README.txt b/source/libs/libpng/libpng-1.6.15/contrib/README.txt
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/README.txt
rename to source/libs/libpng/libpng-1.6.15/contrib/README.txt
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/arm-neon/README b/source/libs/libpng/libpng-1.6.15/contrib/arm-neon/README
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/arm-neon/README
rename to source/libs/libpng/libpng-1.6.15/contrib/arm-neon/README
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/arm-neon/android-ndk.c b/source/libs/libpng/libpng-1.6.15/contrib/arm-neon/android-ndk.c
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/arm-neon/android-ndk.c
rename to source/libs/libpng/libpng-1.6.15/contrib/arm-neon/android-ndk.c
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/arm-neon/linux-auxv.c b/source/libs/libpng/libpng-1.6.15/contrib/arm-neon/linux-auxv.c
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/arm-neon/linux-auxv.c
rename to source/libs/libpng/libpng-1.6.15/contrib/arm-neon/linux-auxv.c
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/arm-neon/linux.c b/source/libs/libpng/libpng-1.6.15/contrib/arm-neon/linux.c
similarity index 98%
rename from source/libs/libpng/libpng-1.6.14/contrib/arm-neon/linux.c
rename to source/libs/libpng/libpng-1.6.15/contrib/arm-neon/linux.c
index 182f3760576bc7d77ab61a0b73e45275787fde78..c2e47dd17a5a30d5b3ebb0c4f049db16539581b5 100644
--- a/source/libs/libpng/libpng-1.6.14/contrib/arm-neon/linux.c
+++ b/source/libs/libpng/libpng-1.6.15/contrib/arm-neon/linux.c
@@ -2,7 +2,7 @@
*
* Copyright (c) 2014 Glenn Randers-Pehrson
* Written by John Bowler, 2014.
- * Last changed in libpng 1.6.10 [March 6, 2014]
+ * Last changed in libpng 1.6.15 [November 20, 2014]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -152,8 +152,10 @@ png_have_neon(png_structp png_ptr)
}
}
+#ifdef PNG_WARNINGS_SUPPORTED
else
png_warning(png_ptr, "/proc/cpuinfo open failed");
+#endif
return 0;
}
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/conftest/README b/source/libs/libpng/libpng-1.6.15/contrib/conftest/README
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/conftest/README
rename to source/libs/libpng/libpng-1.6.15/contrib/conftest/README
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/conftest/read.dfa b/source/libs/libpng/libpng-1.6.15/contrib/conftest/read.dfa
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/conftest/read.dfa
rename to source/libs/libpng/libpng-1.6.15/contrib/conftest/read.dfa
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/conftest/s_read.dfa b/source/libs/libpng/libpng-1.6.15/contrib/conftest/s_read.dfa
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/conftest/s_read.dfa
rename to source/libs/libpng/libpng-1.6.15/contrib/conftest/s_read.dfa
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/conftest/s_write.dfa b/source/libs/libpng/libpng-1.6.15/contrib/conftest/s_write.dfa
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/conftest/s_write.dfa
rename to source/libs/libpng/libpng-1.6.15/contrib/conftest/s_write.dfa
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/conftest/simple.dfa b/source/libs/libpng/libpng-1.6.15/contrib/conftest/simple.dfa
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/conftest/simple.dfa
rename to source/libs/libpng/libpng-1.6.15/contrib/conftest/simple.dfa
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/conftest/write.dfa b/source/libs/libpng/libpng-1.6.15/contrib/conftest/write.dfa
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/conftest/write.dfa
rename to source/libs/libpng/libpng-1.6.15/contrib/conftest/write.dfa
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/examples/README.txt b/source/libs/libpng/libpng-1.6.15/contrib/examples/README.txt
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/examples/README.txt
rename to source/libs/libpng/libpng-1.6.15/contrib/examples/README.txt
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/examples/iccfrompng.c b/source/libs/libpng/libpng-1.6.15/contrib/examples/iccfrompng.c
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/examples/iccfrompng.c
rename to source/libs/libpng/libpng-1.6.15/contrib/examples/iccfrompng.c
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/examples/pngpixel.c b/source/libs/libpng/libpng-1.6.15/contrib/examples/pngpixel.c
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/examples/pngpixel.c
rename to source/libs/libpng/libpng-1.6.15/contrib/examples/pngpixel.c
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/examples/pngtopng.c b/source/libs/libpng/libpng-1.6.15/contrib/examples/pngtopng.c
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/examples/pngtopng.c
rename to source/libs/libpng/libpng-1.6.15/contrib/examples/pngtopng.c
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/gregbook/COPYING b/source/libs/libpng/libpng-1.6.15/contrib/gregbook/COPYING
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/gregbook/COPYING
rename to source/libs/libpng/libpng-1.6.15/contrib/gregbook/COPYING
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/gregbook/LICENSE b/source/libs/libpng/libpng-1.6.15/contrib/gregbook/LICENSE
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/gregbook/LICENSE
rename to source/libs/libpng/libpng-1.6.15/contrib/gregbook/LICENSE
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/gregbook/Makefile.mingw32 b/source/libs/libpng/libpng-1.6.15/contrib/gregbook/Makefile.mingw32
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/gregbook/Makefile.mingw32
rename to source/libs/libpng/libpng-1.6.15/contrib/gregbook/Makefile.mingw32
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/gregbook/Makefile.sgi b/source/libs/libpng/libpng-1.6.15/contrib/gregbook/Makefile.sgi
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/gregbook/Makefile.sgi
rename to source/libs/libpng/libpng-1.6.15/contrib/gregbook/Makefile.sgi
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/gregbook/Makefile.unx b/source/libs/libpng/libpng-1.6.15/contrib/gregbook/Makefile.unx
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/gregbook/Makefile.unx
rename to source/libs/libpng/libpng-1.6.15/contrib/gregbook/Makefile.unx
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/gregbook/Makefile.w32 b/source/libs/libpng/libpng-1.6.15/contrib/gregbook/Makefile.w32
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/gregbook/Makefile.w32
rename to source/libs/libpng/libpng-1.6.15/contrib/gregbook/Makefile.w32
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/gregbook/README b/source/libs/libpng/libpng-1.6.15/contrib/gregbook/README
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/gregbook/README
rename to source/libs/libpng/libpng-1.6.15/contrib/gregbook/README
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/gregbook/makevms.com b/source/libs/libpng/libpng-1.6.15/contrib/gregbook/makevms.com
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/gregbook/makevms.com
rename to source/libs/libpng/libpng-1.6.15/contrib/gregbook/makevms.com
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/gregbook/readpng.c b/source/libs/libpng/libpng-1.6.15/contrib/gregbook/readpng.c
similarity index 99%
rename from source/libs/libpng/libpng-1.6.14/contrib/gregbook/readpng.c
rename to source/libs/libpng/libpng-1.6.15/contrib/gregbook/readpng.c
index f5e1fb1a4e2668dfb912569a67fef6963b97a3b4..9167403e5977ec82a4066e8d58916e8ea6473929 100644
--- a/source/libs/libpng/libpng-1.6.14/contrib/gregbook/readpng.c
+++ b/source/libs/libpng/libpng-1.6.15/contrib/gregbook/readpng.c
@@ -100,7 +100,8 @@ int readpng_init(FILE *infile, ulg *pWidth, ulg *pHeight)
/* could pass pointers to user-defined error handlers instead of NULLs: */
- png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+ png_ptr = png_create_read_struct(png_get_libpng_ver(NULL), NULL, NULL,
+ NULL);
if (!png_ptr)
return 4; /* out of memory */
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/gregbook/readpng.h b/source/libs/libpng/libpng-1.6.15/contrib/gregbook/readpng.h
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/gregbook/readpng.h
rename to source/libs/libpng/libpng-1.6.15/contrib/gregbook/readpng.h
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/gregbook/readpng2.c b/source/libs/libpng/libpng-1.6.15/contrib/gregbook/readpng2.c
similarity index 99%
rename from source/libs/libpng/libpng-1.6.14/contrib/gregbook/readpng2.c
rename to source/libs/libpng/libpng-1.6.15/contrib/gregbook/readpng2.c
index 2e4c536279a6a24f42553cad873281003a33a9b6..4cf2600a41db2b511fe601fa7e0d9a37b240c3a9 100644
--- a/source/libs/libpng/libpng-1.6.14/contrib/gregbook/readpng2.c
+++ b/source/libs/libpng/libpng-1.6.15/contrib/gregbook/readpng2.c
@@ -104,7 +104,7 @@ int readpng2_init(mainprog_info *mainprog_ptr)
/* could also replace libpng warning-handler (final NULL), but no need: */
- png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, mainprog_ptr,
+ png_ptr = png_create_read_struct(png_get_libpng_ver(NULL), mainprog_ptr,
readpng2_error_handler, readpng2_warning_handler);
if (!png_ptr)
return 4; /* out of memory */
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/gregbook/readpng2.h b/source/libs/libpng/libpng-1.6.15/contrib/gregbook/readpng2.h
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/gregbook/readpng2.h
rename to source/libs/libpng/libpng-1.6.15/contrib/gregbook/readpng2.h
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/gregbook/readppm.c b/source/libs/libpng/libpng-1.6.15/contrib/gregbook/readppm.c
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/gregbook/readppm.c
rename to source/libs/libpng/libpng-1.6.15/contrib/gregbook/readppm.c
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/gregbook/rpng-win.c b/source/libs/libpng/libpng-1.6.15/contrib/gregbook/rpng-win.c
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/gregbook/rpng-win.c
rename to source/libs/libpng/libpng-1.6.15/contrib/gregbook/rpng-win.c
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/gregbook/rpng-x.c b/source/libs/libpng/libpng-1.6.15/contrib/gregbook/rpng-x.c
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/gregbook/rpng-x.c
rename to source/libs/libpng/libpng-1.6.15/contrib/gregbook/rpng-x.c
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/gregbook/rpng2-win.c b/source/libs/libpng/libpng-1.6.15/contrib/gregbook/rpng2-win.c
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/gregbook/rpng2-win.c
rename to source/libs/libpng/libpng-1.6.15/contrib/gregbook/rpng2-win.c
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/gregbook/rpng2-x.c b/source/libs/libpng/libpng-1.6.15/contrib/gregbook/rpng2-x.c
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/gregbook/rpng2-x.c
rename to source/libs/libpng/libpng-1.6.15/contrib/gregbook/rpng2-x.c
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/gregbook/toucan.png b/source/libs/libpng/libpng-1.6.15/contrib/gregbook/toucan.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/gregbook/toucan.png
rename to source/libs/libpng/libpng-1.6.15/contrib/gregbook/toucan.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/gregbook/wpng.c b/source/libs/libpng/libpng-1.6.15/contrib/gregbook/wpng.c
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/gregbook/wpng.c
rename to source/libs/libpng/libpng-1.6.15/contrib/gregbook/wpng.c
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/gregbook/writepng.c b/source/libs/libpng/libpng-1.6.15/contrib/gregbook/writepng.c
similarity index 99%
rename from source/libs/libpng/libpng-1.6.14/contrib/gregbook/writepng.c
rename to source/libs/libpng/libpng-1.6.15/contrib/gregbook/writepng.c
index 0dda62ea8c545c787d1a8f1cb7c33ab6d14abd3d..c5c9534797b8f173a2c222d768bfccda3759799b 100644
--- a/source/libs/libpng/libpng-1.6.14/contrib/gregbook/writepng.c
+++ b/source/libs/libpng/libpng-1.6.15/contrib/gregbook/writepng.c
@@ -90,7 +90,7 @@ int writepng_init(mainprog_info *mainprog_ptr)
/* could also replace libpng warning-handler (final NULL), but no need: */
- png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, mainprog_ptr,
+ png_ptr = png_create_write_struct(png_get_libpng_ver(NULL), mainprog_ptr,
writepng_error_handler, NULL);
if (!png_ptr)
return 4; /* out of memory */
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/gregbook/writepng.h b/source/libs/libpng/libpng-1.6.15/contrib/gregbook/writepng.h
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/gregbook/writepng.h
rename to source/libs/libpng/libpng-1.6.15/contrib/gregbook/writepng.h
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/libtests/fakepng.c b/source/libs/libpng/libpng-1.6.15/contrib/libtests/fakepng.c
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/libtests/fakepng.c
rename to source/libs/libpng/libpng-1.6.15/contrib/libtests/fakepng.c
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/libtests/gentests.sh b/source/libs/libpng/libpng-1.6.15/contrib/libtests/gentests.sh
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/libtests/gentests.sh
rename to source/libs/libpng/libpng-1.6.15/contrib/libtests/gentests.sh
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/libtests/makepng.c b/source/libs/libpng/libpng-1.6.15/contrib/libtests/makepng.c
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/libtests/makepng.c
rename to source/libs/libpng/libpng-1.6.15/contrib/libtests/makepng.c
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/libtests/pngimage.c b/source/libs/libpng/libpng-1.6.15/contrib/libtests/pngimage.c
similarity index 98%
rename from source/libs/libpng/libpng-1.6.14/contrib/libtests/pngimage.c
rename to source/libs/libpng/libpng-1.6.15/contrib/libtests/pngimage.c
index 372845ead634bee354a95a400dd962011fa64733..dccfbce127c50a72274ed8e10a2b9fa97f5f5d2a 100644
--- a/source/libs/libpng/libpng-1.6.14/contrib/libtests/pngimage.c
+++ b/source/libs/libpng/libpng-1.6.15/contrib/libtests/pngimage.c
@@ -337,6 +337,9 @@ validate_T(void)
* In both cases the file data is held in a linked list of buffers - not all
* of these are in use at any time.
*/
+#define NEW(type) ((type *)malloc(sizeof (type)))
+#define DELETE(ptr) (free(ptr))
+
struct buffer_list
{
struct buffer_list *next; /* next buffer in list */
@@ -361,6 +364,25 @@ buffer_init(struct buffer *buffer)
buffer->current = NULL;
}
+static void
+buffer_destroy_list(struct buffer_list *list)
+{
+ if (list != NULL)
+ {
+ struct buffer_list *next = list->next;
+ DELETE(list);
+ buffer_destroy_list(next);
+ }
+}
+
+static void
+buffer_destroy(struct buffer *buffer)
+{
+ struct buffer_list *list = buffer->first.next;
+ buffer_init(buffer);
+ buffer_destroy_list(list);
+}
+
#ifdef PNG_WRITE_SUPPORTED
static void
buffer_start_write(struct buffer *buffer)
@@ -390,8 +412,6 @@ get_buffer(png_structp pp)
return (struct buffer*)png_get_io_ptr(pp);
}
-#define NEW(type) ((type *)malloc(sizeof (type)))
-
static struct buffer_list *
buffer_extend(struct buffer_list *current)
{
@@ -598,6 +618,17 @@ display_clean(struct display *dp)
dp->results = 0; /* reset for next time */
}
+static void
+display_destroy(struct display *dp)
+{
+ /* Release any memory held in the display. */
+# ifdef PNG_WRITE_SUPPORTED
+ buffer_destroy(&dp->written_file);
+# endif
+
+ buffer_destroy(&dp->original_file);
+}
+
static struct display *
get_dp(png_structp pp)
/* The display pointer is always stored in the png_struct error pointer */
@@ -1605,6 +1636,9 @@ main(const int argc, const char * const * const argv)
display_clean(&d);
}
+ /* Release allocated memory */
+ display_destroy(&d);
+
return errors != 0;
}
}
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/libtests/pngstest.c b/source/libs/libpng/libpng-1.6.15/contrib/libtests/pngstest.c
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/libtests/pngstest.c
rename to source/libs/libpng/libpng-1.6.15/contrib/libtests/pngstest.c
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/libtests/pngunknown.c b/source/libs/libpng/libpng-1.6.15/contrib/libtests/pngunknown.c
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/libtests/pngunknown.c
rename to source/libs/libpng/libpng-1.6.15/contrib/libtests/pngunknown.c
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/libtests/pngvalid.c b/source/libs/libpng/libpng-1.6.15/contrib/libtests/pngvalid.c
similarity index 99%
rename from source/libs/libpng/libpng-1.6.14/contrib/libtests/pngvalid.c
rename to source/libs/libpng/libpng-1.6.15/contrib/libtests/pngvalid.c
index ca6f85188e3b2c7766210f8ee151dd7c2fd81649..a93fe65a60088fbe24afd171ef0387625a24b468 100644
--- a/source/libs/libpng/libpng-1.6.14/contrib/libtests/pngvalid.c
+++ b/source/libs/libpng/libpng-1.6.15/contrib/libtests/pngvalid.c
@@ -157,6 +157,13 @@ define_exception_type(struct png_store*);
&(ps)->exception_context
#define context(ps,fault) anon_context(ps); png_store *fault
+/* This macro returns the number of elements in an array as an (unsigned int),
+ * it is necessary to avoid the inability of certain versions of GCC to use
+ * the value of a compile-time constant when performing range checks. It must
+ * be passed an array name.
+ */
+#define ARRAY_SIZE(a) ((unsigned int)((sizeof (a))/(sizeof (a)[0])))
+
/******************************* UTILITIES ************************************/
/* Error handling is particularly problematic in production code - error
* handlers often themselves have bugs which lead to programs that detect
@@ -1558,7 +1565,7 @@ set_store_for_write(png_store *ps, png_infopp ppi,
else
# endif
- ps->pwrite = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+ ps->pwrite = png_create_write_struct(png_get_libpng_ver(NULL),
ps, store_error, store_warning);
png_set_write_fn(ps->pwrite, ps, store_write, store_flush);
@@ -4106,7 +4113,7 @@ make_errors(png_modifier* PNG_CONST pm, png_byte PNG_CONST colour_type,
standard_name(name, sizeof name, 0, colour_type, 1<<bdlo, 0,
interlace_type, 0, 0, 0);
- for (test=0; test<(sizeof error_test)/(sizeof error_test[0]); ++test)
+ for (test=0; test<ARRAY_SIZE(error_test); ++test)
{
make_error(&pm->this, colour_type, DEPTH(bdlo), interlace_type,
test, name);
@@ -10098,12 +10105,12 @@ int main(int argc, char **argv)
/* Store the test gammas */
pm.gammas = gammas;
- pm.ngammas = (sizeof gammas) / (sizeof gammas[0]);
+ pm.ngammas = ARRAY_SIZE(gammas);
pm.ngamma_tests = 0; /* default to off */
/* And the test encodings */
pm.encodings = test_encodings;
- pm.nencodings = (sizeof test_encodings) / (sizeof test_encodings[0]);
+ pm.nencodings = ARRAY_SIZE(test_encodings);
pm.sbitlow = 8U; /* because libpng doesn't do sBIT below 8! */
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/libtests/readpng.c b/source/libs/libpng/libpng-1.6.15/contrib/libtests/readpng.c
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/libtests/readpng.c
rename to source/libs/libpng/libpng-1.6.15/contrib/libtests/readpng.c
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/libtests/tarith.c b/source/libs/libpng/libpng-1.6.15/contrib/libtests/tarith.c
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/libtests/tarith.c
rename to source/libs/libpng/libpng-1.6.15/contrib/libtests/tarith.c
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/libtests/timepng.c b/source/libs/libpng/libpng-1.6.15/contrib/libtests/timepng.c
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/libtests/timepng.c
rename to source/libs/libpng/libpng-1.6.15/contrib/libtests/timepng.c
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngminim/README b/source/libs/libpng/libpng-1.6.15/contrib/pngminim/README
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngminim/README
rename to source/libs/libpng/libpng-1.6.15/contrib/pngminim/README
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngminim/decoder/README b/source/libs/libpng/libpng-1.6.15/contrib/pngminim/decoder/README
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngminim/decoder/README
rename to source/libs/libpng/libpng-1.6.15/contrib/pngminim/decoder/README
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngminim/decoder/makefile b/source/libs/libpng/libpng-1.6.15/contrib/pngminim/decoder/makefile
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngminim/decoder/makefile
rename to source/libs/libpng/libpng-1.6.15/contrib/pngminim/decoder/makefile
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngminim/decoder/pngusr.dfa b/source/libs/libpng/libpng-1.6.15/contrib/pngminim/decoder/pngusr.dfa
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngminim/decoder/pngusr.dfa
rename to source/libs/libpng/libpng-1.6.15/contrib/pngminim/decoder/pngusr.dfa
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngminim/decoder/pngusr.h b/source/libs/libpng/libpng-1.6.15/contrib/pngminim/decoder/pngusr.h
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngminim/decoder/pngusr.h
rename to source/libs/libpng/libpng-1.6.15/contrib/pngminim/decoder/pngusr.h
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngminim/encoder/README b/source/libs/libpng/libpng-1.6.15/contrib/pngminim/encoder/README
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngminim/encoder/README
rename to source/libs/libpng/libpng-1.6.15/contrib/pngminim/encoder/README
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngminim/encoder/makefile b/source/libs/libpng/libpng-1.6.15/contrib/pngminim/encoder/makefile
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngminim/encoder/makefile
rename to source/libs/libpng/libpng-1.6.15/contrib/pngminim/encoder/makefile
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngminim/encoder/pngusr.dfa b/source/libs/libpng/libpng-1.6.15/contrib/pngminim/encoder/pngusr.dfa
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngminim/encoder/pngusr.dfa
rename to source/libs/libpng/libpng-1.6.15/contrib/pngminim/encoder/pngusr.dfa
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngminim/encoder/pngusr.h b/source/libs/libpng/libpng-1.6.15/contrib/pngminim/encoder/pngusr.h
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngminim/encoder/pngusr.h
rename to source/libs/libpng/libpng-1.6.15/contrib/pngminim/encoder/pngusr.h
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngminim/preader/README b/source/libs/libpng/libpng-1.6.15/contrib/pngminim/preader/README
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngminim/preader/README
rename to source/libs/libpng/libpng-1.6.15/contrib/pngminim/preader/README
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngminim/preader/makefile b/source/libs/libpng/libpng-1.6.15/contrib/pngminim/preader/makefile
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngminim/preader/makefile
rename to source/libs/libpng/libpng-1.6.15/contrib/pngminim/preader/makefile
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngminim/preader/pngusr.dfa b/source/libs/libpng/libpng-1.6.15/contrib/pngminim/preader/pngusr.dfa
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngminim/preader/pngusr.dfa
rename to source/libs/libpng/libpng-1.6.15/contrib/pngminim/preader/pngusr.dfa
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngminim/preader/pngusr.h b/source/libs/libpng/libpng-1.6.15/contrib/pngminim/preader/pngusr.h
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngminim/preader/pngusr.h
rename to source/libs/libpng/libpng-1.6.15/contrib/pngminim/preader/pngusr.h
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngminus/README b/source/libs/libpng/libpng-1.6.15/contrib/pngminus/README
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngminus/README
rename to source/libs/libpng/libpng-1.6.15/contrib/pngminus/README
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngminus/makefile.std b/source/libs/libpng/libpng-1.6.15/contrib/pngminus/makefile.std
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngminus/makefile.std
rename to source/libs/libpng/libpng-1.6.15/contrib/pngminus/makefile.std
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngminus/makefile.tc3 b/source/libs/libpng/libpng-1.6.15/contrib/pngminus/makefile.tc3
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngminus/makefile.tc3
rename to source/libs/libpng/libpng-1.6.15/contrib/pngminus/makefile.tc3
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngminus/makevms.com b/source/libs/libpng/libpng-1.6.15/contrib/pngminus/makevms.com
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngminus/makevms.com
rename to source/libs/libpng/libpng-1.6.15/contrib/pngminus/makevms.com
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngminus/png2pnm.bat b/source/libs/libpng/libpng-1.6.15/contrib/pngminus/png2pnm.bat
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngminus/png2pnm.bat
rename to source/libs/libpng/libpng-1.6.15/contrib/pngminus/png2pnm.bat
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngminus/png2pnm.c b/source/libs/libpng/libpng-1.6.15/contrib/pngminus/png2pnm.c
similarity index 99%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngminus/png2pnm.c
rename to source/libs/libpng/libpng-1.6.15/contrib/pngminus/png2pnm.c
index 83d9565a313208fc25c6da48e14d2b707cb71738..dff4d0b3d0442c4bc7e95f6647f7602e48e4ad22 100644
--- a/source/libs/libpng/libpng-1.6.14/contrib/pngminus/png2pnm.c
+++ b/source/libs/libpng/libpng-1.6.15/contrib/pngminus/png2pnm.c
@@ -223,7 +223,7 @@ BOOL png2pnm (FILE *png_file, FILE *pnm_file, FILE *alpha_file,
/* create png and info structures */
- png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING,
+ png_ptr = png_create_read_struct (png_get_libpng_ver(NULL),
NULL, NULL, NULL);
if (!png_ptr)
return FALSE; /* out of memory */
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngminus/png2pnm.sh b/source/libs/libpng/libpng-1.6.15/contrib/pngminus/png2pnm.sh
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngminus/png2pnm.sh
rename to source/libs/libpng/libpng-1.6.15/contrib/pngminus/png2pnm.sh
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngminus/pngminus.bat b/source/libs/libpng/libpng-1.6.15/contrib/pngminus/pngminus.bat
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngminus/pngminus.bat
rename to source/libs/libpng/libpng-1.6.15/contrib/pngminus/pngminus.bat
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngminus/pngminus.sh b/source/libs/libpng/libpng-1.6.15/contrib/pngminus/pngminus.sh
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngminus/pngminus.sh
rename to source/libs/libpng/libpng-1.6.15/contrib/pngminus/pngminus.sh
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngminus/pnm2png.bat b/source/libs/libpng/libpng-1.6.15/contrib/pngminus/pnm2png.bat
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngminus/pnm2png.bat
rename to source/libs/libpng/libpng-1.6.15/contrib/pngminus/pnm2png.bat
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngminus/pnm2png.c b/source/libs/libpng/libpng-1.6.15/contrib/pngminus/pnm2png.c
similarity index 99%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngminus/pnm2png.c
rename to source/libs/libpng/libpng-1.6.15/contrib/pngminus/pnm2png.c
index b073414ff853709af280a30d8b3c597dfc686a8b..7bf720f6813f702b5ffd1053708c8a2334b19ee2 100644
--- a/source/libs/libpng/libpng-1.6.14/contrib/pngminus/pnm2png.c
+++ b/source/libs/libpng/libpng-1.6.15/contrib/pngminus/pnm2png.c
@@ -425,7 +425,8 @@ BOOL pnm2png (FILE *pnm_file, FILE *png_file, FILE *alpha_file, BOOL interlace,
} /* end for row */
/* prepare the standard PNG structures */
- png_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+ png_ptr = png_create_write_struct (png_get_libpng_ver(NULL), NULL, NULL,
+ NULL);
if (!png_ptr)
{
return FALSE;
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngminus/pnm2png.sh b/source/libs/libpng/libpng-1.6.15/contrib/pngminus/pnm2png.sh
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngminus/pnm2png.sh
rename to source/libs/libpng/libpng-1.6.15/contrib/pngminus/pnm2png.sh
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/README b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/README
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/README
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/README
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn0g01.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn0g01.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn0g01.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn0g01.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn0g02.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn0g02.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn0g02.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn0g02.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn0g04.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn0g04.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn0g04.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn0g04.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn0g08.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn0g08.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn0g08.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn0g08.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn0g16.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn0g16.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn0g16.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn0g16.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn2c08.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn2c08.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn2c08.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn2c08.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn2c16.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn2c16.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn2c16.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn2c16.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn3p01.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn3p01.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn3p01.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn3p01.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn3p02.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn3p02.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn3p02.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn3p02.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn3p04.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn3p04.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn3p04.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn3p04.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn3p08.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn3p08.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn3p08.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn3p08.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn4a08.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn4a08.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn4a08.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn4a08.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn4a16.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn4a16.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn4a16.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn4a16.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn6a08.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn6a08.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn6a08.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn6a08.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn6a16.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn6a16.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/basn6a16.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/basn6a16.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftbbn0g01.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftbbn0g01.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftbbn0g01.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftbbn0g01.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftbbn0g02.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftbbn0g02.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftbbn0g02.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftbbn0g02.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftbbn0g04.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftbbn0g04.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftbbn0g04.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftbbn0g04.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftbbn2c16.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftbbn2c16.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftbbn2c16.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftbbn2c16.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftbbn3p08.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftbbn3p08.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftbbn3p08.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftbbn3p08.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftbgn2c16.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftbgn2c16.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftbgn2c16.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftbgn2c16.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftbgn3p08.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftbgn3p08.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftbgn3p08.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftbgn3p08.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftbrn2c08.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftbrn2c08.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftbrn2c08.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftbrn2c08.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftbwn0g16.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftbwn0g16.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftbwn0g16.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftbwn0g16.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftbwn3p08.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftbwn3p08.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftbwn3p08.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftbwn3p08.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftbyn3p08.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftbyn3p08.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftbyn3p08.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftbyn3p08.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftp0n0g08.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftp0n0g08.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftp0n0g08.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftp0n0g08.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftp0n2c08.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftp0n2c08.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftp0n2c08.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftp0n2c08.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftp0n3p08.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftp0n3p08.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftp0n3p08.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftp0n3p08.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftp1n3p08.png b/source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftp1n3p08.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/pngsuite/ftp1n3p08.png
rename to source/libs/libpng/libpng-1.6.15/contrib/pngsuite/ftp1n3p08.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/tools/README.txt b/source/libs/libpng/libpng-1.6.15/contrib/tools/README.txt
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/tools/README.txt
rename to source/libs/libpng/libpng-1.6.15/contrib/tools/README.txt
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/tools/checksum-icc.c b/source/libs/libpng/libpng-1.6.15/contrib/tools/checksum-icc.c
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/tools/checksum-icc.c
rename to source/libs/libpng/libpng-1.6.15/contrib/tools/checksum-icc.c
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/tools/chkfmt b/source/libs/libpng/libpng-1.6.15/contrib/tools/chkfmt
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/tools/chkfmt
rename to source/libs/libpng/libpng-1.6.15/contrib/tools/chkfmt
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/tools/cvtcolor.c b/source/libs/libpng/libpng-1.6.15/contrib/tools/cvtcolor.c
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/tools/cvtcolor.c
rename to source/libs/libpng/libpng-1.6.15/contrib/tools/cvtcolor.c
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/tools/intgamma.sh b/source/libs/libpng/libpng-1.6.15/contrib/tools/intgamma.sh
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/tools/intgamma.sh
rename to source/libs/libpng/libpng-1.6.15/contrib/tools/intgamma.sh
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/tools/makesRGB.c b/source/libs/libpng/libpng-1.6.15/contrib/tools/makesRGB.c
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/tools/makesRGB.c
rename to source/libs/libpng/libpng-1.6.15/contrib/tools/makesRGB.c
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/tools/png-fix-itxt.c b/source/libs/libpng/libpng-1.6.15/contrib/tools/png-fix-itxt.c
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/tools/png-fix-itxt.c
rename to source/libs/libpng/libpng-1.6.15/contrib/tools/png-fix-itxt.c
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/tools/pngfix.c b/source/libs/libpng/libpng-1.6.15/contrib/tools/pngfix.c
similarity index 99%
rename from source/libs/libpng/libpng-1.6.14/contrib/tools/pngfix.c
rename to source/libs/libpng/libpng-1.6.15/contrib/tools/pngfix.c
index 28d47979e485a3d797385d453a806cd96cb30830..92600bb86f0ba4af0ea019fa88ec78e0ebd07b6c 100644
--- a/source/libs/libpng/libpng-1.6.14/contrib/tools/pngfix.c
+++ b/source/libs/libpng/libpng-1.6.15/contrib/tools/pngfix.c
@@ -3580,7 +3580,7 @@ read_png(struct control *control)
volatile png_bytep row = NULL, display = NULL;
volatile int rc;
- png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, control,
+ png_ptr = png_create_read_struct(png_get_libpng_ver(NULL), control,
error_handler, warning_handler);
if (png_ptr == NULL)
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/tools/sRGB.h b/source/libs/libpng/libpng-1.6.15/contrib/tools/sRGB.h
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/tools/sRGB.h
rename to source/libs/libpng/libpng-1.6.15/contrib/tools/sRGB.h
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/visupng/PngFile.c b/source/libs/libpng/libpng-1.6.15/contrib/visupng/PngFile.c
similarity index 98%
rename from source/libs/libpng/libpng-1.6.14/contrib/visupng/PngFile.c
rename to source/libs/libpng/libpng-1.6.15/contrib/visupng/PngFile.c
index dcde18a3af4c8acac8be58dd6a03b804a06f48a8..e563e92927410b2bdc8fbf502904bc939c73f547 100644
--- a/source/libs/libpng/libpng-1.6.14/contrib/visupng/PngFile.c
+++ b/source/libs/libpng/libpng-1.6.15/contrib/visupng/PngFile.c
@@ -136,7 +136,7 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData,
/* create the two png(-info) structures */
- png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL,
+ png_ptr = png_create_read_struct(png_get_libpng_ver(NULL), NULL,
(png_error_ptr)png_cexcept_error, (png_error_ptr)NULL);
if (!png_ptr)
{
@@ -313,7 +313,7 @@ BOOL PngSaveImage (PTSTR pstrFileName, png_byte *pDiData,
/* prepare the standard PNG structures */
- png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL,
+ png_ptr = png_create_write_struct(png_get_libpng_ver(NULL), NULL,
(png_error_ptr)png_cexcept_error, (png_error_ptr)NULL);
if (!png_ptr)
{
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/visupng/PngFile.h b/source/libs/libpng/libpng-1.6.15/contrib/visupng/PngFile.h
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/visupng/PngFile.h
rename to source/libs/libpng/libpng-1.6.15/contrib/visupng/PngFile.h
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/visupng/README.txt b/source/libs/libpng/libpng-1.6.15/contrib/visupng/README.txt
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/visupng/README.txt
rename to source/libs/libpng/libpng-1.6.15/contrib/visupng/README.txt
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/visupng/VisualPng.c b/source/libs/libpng/libpng-1.6.15/contrib/visupng/VisualPng.c
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/visupng/VisualPng.c
rename to source/libs/libpng/libpng-1.6.15/contrib/visupng/VisualPng.c
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/visupng/VisualPng.dsp b/source/libs/libpng/libpng-1.6.15/contrib/visupng/VisualPng.dsp
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/visupng/VisualPng.dsp
rename to source/libs/libpng/libpng-1.6.15/contrib/visupng/VisualPng.dsp
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/visupng/VisualPng.dsw b/source/libs/libpng/libpng-1.6.15/contrib/visupng/VisualPng.dsw
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/visupng/VisualPng.dsw
rename to source/libs/libpng/libpng-1.6.15/contrib/visupng/VisualPng.dsw
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/visupng/VisualPng.ico b/source/libs/libpng/libpng-1.6.15/contrib/visupng/VisualPng.ico
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/visupng/VisualPng.ico
rename to source/libs/libpng/libpng-1.6.15/contrib/visupng/VisualPng.ico
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/visupng/VisualPng.png b/source/libs/libpng/libpng-1.6.15/contrib/visupng/VisualPng.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/visupng/VisualPng.png
rename to source/libs/libpng/libpng-1.6.15/contrib/visupng/VisualPng.png
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/visupng/VisualPng.rc b/source/libs/libpng/libpng-1.6.15/contrib/visupng/VisualPng.rc
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/visupng/VisualPng.rc
rename to source/libs/libpng/libpng-1.6.15/contrib/visupng/VisualPng.rc
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/visupng/cexcept.h b/source/libs/libpng/libpng-1.6.15/contrib/visupng/cexcept.h
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/visupng/cexcept.h
rename to source/libs/libpng/libpng-1.6.15/contrib/visupng/cexcept.h
diff --git a/source/libs/libpng/libpng-1.6.14/contrib/visupng/resource.h b/source/libs/libpng/libpng-1.6.15/contrib/visupng/resource.h
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/contrib/visupng/resource.h
rename to source/libs/libpng/libpng-1.6.15/contrib/visupng/resource.h
diff --git a/source/libs/libpng/libpng-1.6.14/example.c b/source/libs/libpng/libpng-1.6.15/example.c
similarity index 98%
rename from source/libs/libpng/libpng-1.6.14/example.c
rename to source/libs/libpng/libpng-1.6.15/example.c
index 5422b6b22570c2b20bdbcb509781ec66233d6b2b..945546c259a87bb3122290de887bab827a112de0 100644
--- a/source/libs/libpng/libpng-1.6.14/example.c
+++ b/source/libs/libpng/libpng-1.6.15/example.c
@@ -2,7 +2,7 @@
#if 0 /* in case someone actually tries to compile this */
/* example.c - an example of using libpng
- * Last changed in libpng 1.6.11 [June 5, 2014]
+ * Last changed in libpng 1.6.15 [November 20, 2014]
* Maintained 1998-2014 Glenn Randers-Pehrson
* Maintained 1996, 1997 Andreas Dilger)
* Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -52,7 +52,7 @@ int main(int argc, const char **argv)
image.version = PNG_IMAGE_VERSION;
/* The first argument is the file to read: */
- if (png_image_begin_read_from_file(&image, argv[1]))
+ if (png_image_begin_read_from_file(&image, argv[1]) != 0)
{
png_bytep buffer;
@@ -97,7 +97,7 @@ int main(int argc, const char **argv)
*/
if (buffer != NULL &&
png_image_finish_read(&image, NULL/*background*/, buffer,
- 0/*row_stride*/, NULL/*colormap*/))
+ 0/*row_stride*/, NULL/*colormap*/) != 0)
{
/* Now write the image out to the second argument. In the write
* call 'convert_to_8bit' allows 16-bit data to be squashed down to
@@ -105,7 +105,7 @@ int main(int argc, const char **argv)
* to the 8-bit format.
*/
if (png_image_write_to_file(&image, argv[2], 0/*convert_to_8bit*/,
- buffer, 0/*row_stride*/, NULL/*colormap*/))
+ buffer, 0/*row_stride*/, NULL/*colormap*/) != 0)
{
/* The image has been written successfully. */
exit(0);
@@ -405,7 +405,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* File is already open */
/* Expand paletted or RGB images with transparency to full alpha channels
* so the data will be available as RGBA quartets.
*/
- if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) != 0)
png_set_tRNS_to_alpha(png_ptr);
/* Set the background color to draw transparent and alpha images over.
@@ -417,7 +417,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* File is already open */
png_color_16 my_background, *image_background;
- if (png_get_bKGD(png_ptr, info_ptr, &image_background))
+ if (png_get_bKGD(png_ptr, info_ptr, &image_background) != 0)
png_set_background(png_ptr, image_background,
PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
else
@@ -454,12 +454,12 @@ void read_png(FILE *fp, unsigned int sig_read) /* File is already open */
int intent;
- if (png_get_sRGB(png_ptr, info_ptr, &intent))
+ if (png_get_sRGB(png_ptr, info_ptr, &intent) != 0)
png_set_gamma(png_ptr, screen_gamma, PNG_DEFAULT_sRGB);
else
{
double image_gamma;
- if (png_get_gAMA(png_ptr, info_ptr, &image_gamma))
+ if (png_get_gAMA(png_ptr, info_ptr, &image_gamma) != 0)
png_set_gamma(png_ptr, screen_gamma, image_gamma);
else
png_set_gamma(png_ptr, screen_gamma, 0.45455);
@@ -469,7 +469,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* File is already open */
/* Quantize RGB files down to 8 bit palette or reduce palettes
* to the number of colors available on your screen.
*/
- if (color_type & PNG_COLOR_MASK_COLOR)
+ if ((color_type & PNG_COLOR_MASK_COLOR) != 0)
{
int num_palette;
png_colorp palette;
@@ -484,7 +484,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* File is already open */
MAX_SCREEN_COLORS, NULL, 0);
}
/* This reduces the image to the palette supplied in the file */
- else if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette))
+ else if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette) != 0)
{
png_uint_16p histogram = NULL;
@@ -494,7 +494,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* File is already open */
max_screen_colors, histogram, 0);
}
}
-#endif /* PNG_READ_QUANTIZE_SUPPORTED */
+#endif /* READ_QUANTIZE */
/* Invert monochrome files to have 0 as white and 1 as black */
png_set_invert_mono(png_ptr);
@@ -503,7 +503,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* File is already open */
* [0,65535] to the original [0,7] or [0,31], or whatever range the
* colors were originally in:
*/
- if (png_get_valid(png_ptr, info_ptr, PNG_INFO_sBIT))
+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_sBIT) != 0)
{
png_color_8p sig_bit_p;
@@ -512,7 +512,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* File is already open */
}
/* Flip the RGB pixels to BGR (or RGBA to BGRA) */
- if (color_type & PNG_COLOR_MASK_COLOR)
+ if ((color_type & PNG_COLOR_MASK_COLOR) != 0)
png_set_bgr(png_ptr);
/* Swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR) */
@@ -532,7 +532,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* File is already open */
number_passes = png_set_interlace_handling(png_ptr);
#else
number_passes = 1;
-#endif /* PNG_READ_INTERLACING_SUPPORTED */
+#endif /* READ_INTERLACING */
/* Optional call to gamma correct and add the background to the palette
@@ -744,7 +744,7 @@ row_callback(png_structp png_ptr, png_bytep new_row,
* to pass the current row as new_row, and the function will combine
* the old row and the new row.
*/
-#endif /* PNG_READ_INTERLACING_SUPPORTED */
+#endif /* READ_INTERLACING */
}
end_callback(png_structp png_ptr, png_infop info)
diff --git a/source/libs/libpng/libpng-1.6.14/libpng-config.in b/source/libs/libpng/libpng-1.6.15/libpng-config.in
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/libpng-config.in
rename to source/libs/libpng/libpng-1.6.15/libpng-config.in
diff --git a/source/libs/libpng/libpng-1.6.14/libpng-manual.txt b/source/libs/libpng/libpng-1.6.15/libpng-manual.txt
similarity index 99%
rename from source/libs/libpng/libpng-1.6.14/libpng-manual.txt
rename to source/libs/libpng/libpng-1.6.15/libpng-manual.txt
index 6b77c2ca24e15e7b58c03b38a9353b211d696bb3..30bf926d53efa5f49c8754adbf23959fd773707e 100644
--- a/source/libs/libpng/libpng-1.6.14/libpng-manual.txt
+++ b/source/libs/libpng/libpng-1.6.15/libpng-manual.txt
@@ -1,6 +1,6 @@
libpng-manual.txt - A description on how to use and modify libpng
- libpng version 1.6.14 - October 23, 2014
+ libpng version 1.6.15 - November 20, 2014
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on:
- libpng versions 0.97, January 1998, through 1.6.14 - October 23, 2014
+ libpng versions 0.97, January 1998, through 1.6.15 - November 20, 2014
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -5277,13 +5277,13 @@ Other rules can be inferred by inspecting the libpng source.
XVI. Y2K Compliance in libpng
-October 23, 2014
+November 20, 2014
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.6.14 are Y2K compliant. It is my belief that earlier
+upward through 1.6.15 are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant.
Libpng only has two year fields. One is a 2-byte unsigned integer
diff --git a/source/libs/libpng/libpng-1.6.14/libpng.3 b/source/libs/libpng/libpng-1.6.15/libpng.3
similarity index 99%
rename from source/libs/libpng/libpng-1.6.14/libpng.3
rename to source/libs/libpng/libpng-1.6.15/libpng.3
index a489d0130ab1da71ed74898095e2503d3a50ab70..600b733362208dbdfbcce2f9a254523dc9fbdbd6 100644
--- a/source/libs/libpng/libpng-1.6.14/libpng.3
+++ b/source/libs/libpng/libpng-1.6.15/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "October 23, 2014"
+.TH LIBPNG 3 "November 20, 2014"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.6.14
+libpng \- Portable Network Graphics (PNG) Reference Library 1.6.15
.SH SYNOPSIS
\fB
#include <png.h>\fP
@@ -504,7 +504,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng.
.SH LIBPNG.TXT
libpng-manual.txt - A description on how to use and modify libpng
- libpng version 1.6.14 - October 23, 2014
+ libpng version 1.6.15 - November 20, 2014
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng
Based on:
- libpng versions 0.97, January 1998, through 1.6.14 - October 23, 2014
+ libpng versions 0.97, January 1998, through 1.6.15 - November 20, 2014
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -5781,13 +5781,13 @@ Other rules can be inferred by inspecting the libpng source.
.SH XVI. Y2K Compliance in libpng
-October 23, 2014
+November 20, 2014
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.6.14 are Y2K compliant. It is my belief that earlier
+upward through 1.6.15 are Y2K compliant. It is my belief that earlier
versions were also Y2K compliant.
Libpng only has two year fields. One is a 2-byte unsigned integer
@@ -6033,6 +6033,9 @@ the first widely used release:
1.6.14beta01-07 16 10614 16.so.16.14[.0]
1.6.14rc01-02 16 10614 16.so.16.14[.0]
1.6.14 16 10614 16.so.16.14[.0]
+ 1.6.15beta01-08 16 10615 16.so.16.15[.0]
+ 1.6.15rc01-03 16 10615 16.so.16.15[.0]
+ 1.6.15 16 10615 16.so.16.15[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -6089,7 +6092,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.6.14 - October 23, 2014:
+Libpng version 1.6.15 - November 20, 2014:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -6112,7 +6115,7 @@ this sentence.
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.6.14, October 23, 2014, are
+libpng versions 1.2.6, August 15, 2004, through 1.6.15, November 20, 2014, are
Copyright (c) 2004,2006-2014 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors
@@ -6211,7 +6214,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-October 23, 2014
+November 20, 2014
.\" end of man page
diff --git a/source/libs/libpng/libpng-1.6.14/libpng.pc.in b/source/libs/libpng/libpng-1.6.15/libpng.pc.in
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/libpng.pc.in
rename to source/libs/libpng/libpng-1.6.15/libpng.pc.in
diff --git a/source/libs/libpng/libpng-1.6.14/libpngpf.3 b/source/libs/libpng/libpng-1.6.15/libpngpf.3
similarity index 95%
rename from source/libs/libpng/libpng-1.6.14/libpngpf.3
rename to source/libs/libpng/libpng-1.6.15/libpngpf.3
index 9155936b5dff0576a803e57f739e5c850a4ce4bf..1d744f81f07e0918cc7d67e32a427efac5ffcae2 100644
--- a/source/libs/libpng/libpng-1.6.14/libpngpf.3
+++ b/source/libs/libpng/libpng-1.6.15/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "October 23, 2014"
+.TH LIBPNGPF 3 "November 20, 2014"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.6.14
+libpng \- Portable Network Graphics (PNG) Reference Library 1.6.15
(private functions)
.SH SYNOPSIS
\fB#include \fI"pngpriv.h"
diff --git a/source/libs/libpng/libpng-1.6.14/png.5 b/source/libs/libpng/libpng-1.6.15/png.5
similarity index 98%
rename from source/libs/libpng/libpng-1.6.14/png.5
rename to source/libs/libpng/libpng-1.6.15/png.5
index 474df9109bf03fef8d287d9b2ff6207408061b57..bd99dc642db674061b47bda60cf78c52c383a2da 100644
--- a/source/libs/libpng/libpng-1.6.14/png.5
+++ b/source/libs/libpng/libpng-1.6.15/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "October 23, 2014"
+.TH PNG 5 "November 20, 2014"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/source/libs/libpng/libpng-1.6.14/png.c b/source/libs/libpng/libpng-1.6.15/png.c
similarity index 91%
rename from source/libs/libpng/libpng-1.6.14/png.c
rename to source/libs/libpng/libpng-1.6.15/png.c
index ea5a92e6de16aa3733e9a7b99d25efe5cd14e3c6..62cc4bc6a9829a25779826d7313786f11f0368b8 100644
--- a/source/libs/libpng/libpng-1.6.14/png.c
+++ b/source/libs/libpng/libpng-1.6.15/png.c
@@ -1,7 +1,7 @@
/* png.c - location for general purpose libpng functions
*
- * Last changed in libpng 1.6.14 [October 23, 2014]
+ * Last changed in libpng 1.6.15 [November 20, 2014]
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -14,7 +14,7 @@
#include "pngpriv.h"
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_6_14 Your_png_h_is_not_version_1_6_14;
+typedef png_libpng_version_1_6_15 Your_png_h_is_not_version_1_6_15;
/* Tells libpng that we have already handled the first "num_bytes" bytes
* of the PNG file signature. If the PNG data is embedded into another
@@ -65,7 +65,7 @@ png_sig_cmp(png_const_bytep sig, png_size_t start, png_size_t num_to_check)
return ((int)(memcmp(&sig[start], &png_signature[start], num_to_check)));
}
-#endif /* PNG_READ_SUPPORTED */
+#endif /* READ */
#if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED)
/* Function to allocate memory for zlib */
@@ -115,7 +115,7 @@ png_calculate_crc(png_structrp png_ptr, png_const_bytep ptr, png_size_t length)
{
int need_crc = 1;
- if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name))
+ if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0)
{
if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
(PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
@@ -124,7 +124,7 @@ png_calculate_crc(png_structrp png_ptr, png_const_bytep ptr, png_size_t length)
else /* critical */
{
- if (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE)
+ if ((png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE) != 0)
need_crc = 0;
}
@@ -133,7 +133,7 @@ png_calculate_crc(png_structrp png_ptr, png_const_bytep ptr, png_size_t length)
* following cast is safe. 'uInt' may be no more than 16 bits, so it is
* necessary to perform a loop here.
*/
- if (need_crc && length > 0)
+ if (need_crc != 0 && length > 0)
{
uLong crc = png_ptr->crc; /* Should never issue a warning */
@@ -165,53 +165,51 @@ png_calculate_crc(png_structrp png_ptr, png_const_bytep ptr, png_size_t length)
int
png_user_version_check(png_structrp png_ptr, png_const_charp user_png_ver)
{
+ /* Libpng versions 1.0.0 and later are binary compatible if the version
+ * string matches through the second '.'; we must recompile any
+ * applications that use any older library version.
+ */
+
if (user_png_ver != NULL)
{
- int i = 0;
+ int i = -1;
+ int found_dots = 0;
do
{
- if (user_png_ver[i] != png_libpng_ver[i])
+ i++;
+ if (user_png_ver[i] != PNG_LIBPNG_VER_STRING[i])
png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
- } while (png_libpng_ver[i++]);
+ if (user_png_ver[i] == '.')
+ found_dots++;
+ } while (found_dots < 2 && user_png_ver[i] != 0 &&
+ PNG_LIBPNG_VER_STRING[i] != 0);
}
else
png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
- if (png_ptr->flags & PNG_FLAG_LIBRARY_MISMATCH)
+ if ((png_ptr->flags & PNG_FLAG_LIBRARY_MISMATCH) != 0)
{
- /* Libpng 0.90 and later are binary incompatible with libpng 0.89, so
- * we must recompile any applications that use any older library version.
- * For versions after libpng 1.0, we will be compatible, so we need
- * only check the first and third digits (note that when we reach version
- * 1.10 we will need to check the fourth symbol, namely user_png_ver[3]).
- */
- if (user_png_ver == NULL || user_png_ver[0] != png_libpng_ver[0] ||
- (user_png_ver[0] == '1' && (user_png_ver[2] != png_libpng_ver[2] ||
- user_png_ver[3] != png_libpng_ver[3])) ||
- (user_png_ver[0] == '0' && user_png_ver[2] < '9'))
- {
#ifdef PNG_WARNINGS_SUPPORTED
- size_t pos = 0;
- char m[128];
+ size_t pos = 0;
+ char m[128];
- pos = png_safecat(m, (sizeof m), pos,
- "Application built with libpng-");
- pos = png_safecat(m, (sizeof m), pos, user_png_ver);
- pos = png_safecat(m, (sizeof m), pos, " but running with ");
- pos = png_safecat(m, (sizeof m), pos, png_libpng_ver);
- PNG_UNUSED(pos)
+ pos = png_safecat(m, (sizeof m), pos,
+ "Application built with libpng-");
+ pos = png_safecat(m, (sizeof m), pos, user_png_ver);
+ pos = png_safecat(m, (sizeof m), pos, " but running with ");
+ pos = png_safecat(m, (sizeof m), pos, PNG_LIBPNG_VER_STRING);
+ PNG_UNUSED(pos)
- png_warning(png_ptr, m);
+ png_warning(png_ptr, m);
#endif
#ifdef PNG_ERROR_NUMBERS_SUPPORTED
- png_ptr->flags = 0;
+ png_ptr->flags = 0;
#endif
- return 0;
- }
+ return 0;
}
/* Success return. */
@@ -289,7 +287,7 @@ png_create_png_struct,(png_const_charp user_png_ver, png_voidp error_ptr,
# endif
/* Call the general version checker (shared with read and write code):
*/
- if (png_user_version_check(&create_struct, user_png_ver))
+ if (png_user_version_check(&create_struct, user_png_ver) != 0)
{
png_structrp png_ptr = png_voidcast(png_structrp,
png_malloc_warn(&create_struct, (sizeof *png_ptr)));
@@ -451,32 +449,32 @@ png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask,
#ifdef PNG_TEXT_SUPPORTED
/* Free text item num or (if num == -1) all text items */
- if ((mask & PNG_FREE_TEXT) & info_ptr->free_me)
+ if (info_ptr->text != 0 &&
+ ((mask & PNG_FREE_TEXT) & info_ptr->free_me) != 0)
{
if (num != -1)
{
- if (info_ptr->text && info_ptr->text[num].key)
- {
- png_free(png_ptr, info_ptr->text[num].key);
- info_ptr->text[num].key = NULL;
- }
+ png_free(png_ptr, info_ptr->text[num].key);
+ info_ptr->text[num].key = NULL;
}
else
{
int i;
+
for (i = 0; i < info_ptr->num_text; i++)
- png_free_data(png_ptr, info_ptr, PNG_FREE_TEXT, i);
+ png_free(png_ptr, info_ptr->text[i].key);
+
png_free(png_ptr, info_ptr->text);
info_ptr->text = NULL;
- info_ptr->num_text=0;
+ info_ptr->num_text = 0;
}
}
#endif
#ifdef PNG_tRNS_SUPPORTED
/* Free any tRNS entry */
- if ((mask & PNG_FREE_TRNS) & info_ptr->free_me)
+ if (((mask & PNG_FREE_TRNS) & info_ptr->free_me) != 0)
{
png_free(png_ptr, info_ptr->trans_alpha);
info_ptr->trans_alpha = NULL;
@@ -486,7 +484,7 @@ png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask,
#ifdef PNG_sCAL_SUPPORTED
/* Free any sCAL entry */
- if ((mask & PNG_FREE_SCAL) & info_ptr->free_me)
+ if (((mask & PNG_FREE_SCAL) & info_ptr->free_me) != 0)
{
png_free(png_ptr, info_ptr->scal_s_width);
png_free(png_ptr, info_ptr->scal_s_height);
@@ -498,20 +496,20 @@ png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask,
#ifdef PNG_pCAL_SUPPORTED
/* Free any pCAL entry */
- if ((mask & PNG_FREE_PCAL) & info_ptr->free_me)
+ if (((mask & PNG_FREE_PCAL) & info_ptr->free_me) != 0)
{
png_free(png_ptr, info_ptr->pcal_purpose);
png_free(png_ptr, info_ptr->pcal_units);
info_ptr->pcal_purpose = NULL;
info_ptr->pcal_units = NULL;
+
if (info_ptr->pcal_params != NULL)
{
- unsigned int i;
+ int i;
+
for (i = 0; i < info_ptr->pcal_nparams; i++)
- {
png_free(png_ptr, info_ptr->pcal_params[i]);
- info_ptr->pcal_params[i] = NULL;
- }
+
png_free(png_ptr, info_ptr->pcal_params);
info_ptr->pcal_params = NULL;
}
@@ -521,7 +519,7 @@ png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask,
#ifdef PNG_iCCP_SUPPORTED
/* Free any profile entry */
- if ((mask & PNG_FREE_ICCP) & info_ptr->free_me)
+ if (((mask & PNG_FREE_ICCP) & info_ptr->free_me) != 0)
{
png_free(png_ptr, info_ptr->iccp_name);
png_free(png_ptr, info_ptr->iccp_profile);
@@ -533,26 +531,28 @@ png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask,
#ifdef PNG_sPLT_SUPPORTED
/* Free a given sPLT entry, or (if num == -1) all sPLT entries */
- if ((mask & PNG_FREE_SPLT) & info_ptr->free_me)
+ if (info_ptr->splt_palettes != 0 &&
+ ((mask & PNG_FREE_SPLT) & info_ptr->free_me) != 0)
{
if (num != -1)
{
- if (info_ptr->splt_palettes)
- {
- png_free(png_ptr, info_ptr->splt_palettes[num].name);
- png_free(png_ptr, info_ptr->splt_palettes[num].entries);
- info_ptr->splt_palettes[num].name = NULL;
- info_ptr->splt_palettes[num].entries = NULL;
- }
+ png_free(png_ptr, info_ptr->splt_palettes[num].name);
+ png_free(png_ptr, info_ptr->splt_palettes[num].entries);
+ info_ptr->splt_palettes[num].name = NULL;
+ info_ptr->splt_palettes[num].entries = NULL;
}
else
{
- if (info_ptr->splt_palettes_num)
+ if (info_ptr->splt_palettes_num != 0)
{
int i;
+
for (i = 0; i < info_ptr->splt_palettes_num; i++)
- png_free_data(png_ptr, info_ptr, PNG_FREE_SPLT, (int)i);
+ {
+ png_free(png_ptr, info_ptr->splt_palettes[i].name);
+ png_free(png_ptr, info_ptr->splt_palettes[i].entries);
+ }
png_free(png_ptr, info_ptr->splt_palettes);
info_ptr->splt_palettes = NULL;
@@ -564,25 +564,23 @@ png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask,
#endif
#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
- if ((mask & PNG_FREE_UNKN) & info_ptr->free_me)
+ if (info_ptr->unknown_chunks != 0 &&
+ ((mask & PNG_FREE_UNKN) & info_ptr->free_me) != 0)
{
if (num != -1)
{
- if (info_ptr->unknown_chunks)
- {
- png_free(png_ptr, info_ptr->unknown_chunks[num].data);
- info_ptr->unknown_chunks[num].data = NULL;
- }
+ png_free(png_ptr, info_ptr->unknown_chunks[num].data);
+ info_ptr->unknown_chunks[num].data = NULL;
}
else
{
int i;
- if (info_ptr->unknown_chunks_num)
+ if (info_ptr->unknown_chunks_num != 0)
{
for (i = 0; i < info_ptr->unknown_chunks_num; i++)
- png_free_data(png_ptr, info_ptr, PNG_FREE_UNKN, (int)i);
+ png_free(png_ptr, info_ptr->unknown_chunks[i].data);
png_free(png_ptr, info_ptr->unknown_chunks);
info_ptr->unknown_chunks = NULL;
@@ -594,7 +592,7 @@ png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask,
#ifdef PNG_hIST_SUPPORTED
/* Free any hIST entry */
- if ((mask & PNG_FREE_HIST) & info_ptr->free_me)
+ if (((mask & PNG_FREE_HIST) & info_ptr->free_me) != 0)
{
png_free(png_ptr, info_ptr->hist);
info_ptr->hist = NULL;
@@ -603,7 +601,7 @@ png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask,
#endif
/* Free any PLTE entry that was internally allocated */
- if ((mask & PNG_FREE_PLTE) & info_ptr->free_me)
+ if (((mask & PNG_FREE_PLTE) & info_ptr->free_me) != 0)
{
png_free(png_ptr, info_ptr->palette);
info_ptr->palette = NULL;
@@ -613,16 +611,14 @@ png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask,
#ifdef PNG_INFO_IMAGE_SUPPORTED
/* Free any image bits attached to the info structure */
- if ((mask & PNG_FREE_ROWS) & info_ptr->free_me)
+ if (((mask & PNG_FREE_ROWS) & info_ptr->free_me) != 0)
{
- if (info_ptr->row_pointers)
+ if (info_ptr->row_pointers != 0)
{
png_uint_32 row;
for (row = 0; row < info_ptr->height; row++)
- {
png_free(png_ptr, info_ptr->row_pointers[row]);
- info_ptr->row_pointers[row] = NULL;
- }
+
png_free(png_ptr, info_ptr->row_pointers);
info_ptr->row_pointers = NULL;
}
@@ -635,7 +631,7 @@ png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask,
info_ptr->free_me &= ~mask;
}
-#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
+#endif /* READ || WRITE */
/* This function returns a pointer to the io_ptr associated with the user
* functions. The application should free any memory associated with this
@@ -750,7 +746,7 @@ png_convert_to_rfc1123(png_structrp png_ptr, png_const_timep ptime)
if (png_ptr != NULL)
{
/* The only failure above if png_ptr != NULL is from an invalid ptime */
- if (!png_convert_to_rfc1123_buffer(png_ptr->time_buffer, ptime))
+ if (png_convert_to_rfc1123_buffer(png_ptr->time_buffer, ptime) == 0)
png_warning(png_ptr, "Ignoring invalid time value");
else
@@ -760,9 +756,9 @@ png_convert_to_rfc1123(png_structrp png_ptr, png_const_timep ptime)
return NULL;
}
# endif
-# endif /* PNG_TIME_RFC1123_SUPPORTED */
+# endif /* TIME_RFC1123 */
-#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
+#endif /* READ || WRITE */
png_const_charp PNGAPI
png_get_copyright(png_const_structrp png_ptr)
@@ -773,13 +769,13 @@ png_get_copyright(png_const_structrp png_ptr)
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
- "libpng version 1.6.14 - October 23, 2014" PNG_STRING_NEWLINE \
+ "libpng version 1.6.15 - November 20, 2014" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2014 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
PNG_STRING_NEWLINE;
# else
- return "libpng version 1.6.14 - October 23, 2014\
+ return "libpng version 1.6.15 - November 20, 2014\
Copyright (c) 1998-2014 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
@@ -904,7 +900,7 @@ png_handle_as_unknown(png_const_structrp png_ptr, png_const_bytep chunk_name)
{
p -= 5;
- if (!memcmp(chunk_name, p, 4))
+ if (memcmp(chunk_name, p, 4) == 0)
return p[4];
}
while (p > p_end);
@@ -941,7 +937,7 @@ png_reset_zstream(png_structrp png_ptr)
/* WARNING: this resets the window bits to the maximum! */
return (inflateReset(&png_ptr->zstream));
}
-#endif /* PNG_READ_SUPPORTED */
+#endif /* READ */
/* This function was added to libpng-1.0.7 */
png_uint_32 PNGAPI
@@ -1046,8 +1042,8 @@ png_colorspace_check_gamma(png_const_structrp png_ptr,
png_fixed_point gtest;
if ((colorspace->flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&
- (!png_muldiv(>est, colorspace->gamma, PNG_FP_1, gAMA) ||
- png_gamma_significant(gtest)))
+ (png_muldiv(>est, colorspace->gamma, PNG_FP_1, gAMA) == 0 ||
+ png_gamma_significant(gtest) != 0))
{
/* Either this is an sRGB image, in which case the calculated gamma
* approximation should match, or this is an image with a profile and the
@@ -1102,12 +1098,13 @@ png_colorspace_set_gamma(png_const_structrp png_ptr,
# endif
/* Do nothing if the colorspace is already invalid */
- else if (colorspace->flags & PNG_COLORSPACE_INVALID)
+ else if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
return;
else
{
- if (png_colorspace_check_gamma(png_ptr, colorspace, gAMA, 1/*from gAMA*/))
+ if (png_colorspace_check_gamma(png_ptr, colorspace, gAMA,
+ 1/*from gAMA*/) != 0)
{
/* Store this gamma value. */
colorspace->gamma = gAMA;
@@ -1131,7 +1128,7 @@ png_colorspace_set_gamma(png_const_structrp png_ptr,
void /* PRIVATE */
png_colorspace_sync_info(png_const_structrp png_ptr, png_inforp info_ptr)
{
- if (info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID)
+ if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)
{
/* Everything is invalid */
info_ptr->valid &= ~(PNG_INFO_gAMA|PNG_INFO_cHRM|PNG_INFO_sRGB|
@@ -1152,20 +1149,20 @@ png_colorspace_sync_info(png_const_structrp png_ptr, png_inforp info_ptr)
* it; this allows a PNG to contain a profile which matches sRGB and
* yet still have that profile retrievable by the application.
*/
- if (info_ptr->colorspace.flags & PNG_COLORSPACE_MATCHES_sRGB)
+ if ((info_ptr->colorspace.flags & PNG_COLORSPACE_MATCHES_sRGB) != 0)
info_ptr->valid |= PNG_INFO_sRGB;
else
info_ptr->valid &= ~PNG_INFO_sRGB;
- if (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS)
+ if ((info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
info_ptr->valid |= PNG_INFO_cHRM;
else
info_ptr->valid &= ~PNG_INFO_cHRM;
# endif
- if (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA)
+ if ((info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0)
info_ptr->valid |= PNG_INFO_gAMA;
else
@@ -1198,22 +1195,28 @@ png_xy_from_XYZ(png_xy *xy, const png_XYZ *XYZ)
png_int_32 d, dwhite, whiteX, whiteY;
d = XYZ->red_X + XYZ->red_Y + XYZ->red_Z;
- if (!png_muldiv(&xy->redx, XYZ->red_X, PNG_FP_1, d)) return 1;
- if (!png_muldiv(&xy->redy, XYZ->red_Y, PNG_FP_1, d)) return 1;
+ if (png_muldiv(&xy->redx, XYZ->red_X, PNG_FP_1, d) == 0)
+ return 1;
+ if (png_muldiv(&xy->redy, XYZ->red_Y, PNG_FP_1, d) == 0)
+ return 1;
dwhite = d;
whiteX = XYZ->red_X;
whiteY = XYZ->red_Y;
d = XYZ->green_X + XYZ->green_Y + XYZ->green_Z;
- if (!png_muldiv(&xy->greenx, XYZ->green_X, PNG_FP_1, d)) return 1;
- if (!png_muldiv(&xy->greeny, XYZ->green_Y, PNG_FP_1, d)) return 1;
+ if (png_muldiv(&xy->greenx, XYZ->green_X, PNG_FP_1, d) == 0)
+ return 1;
+ if (png_muldiv(&xy->greeny, XYZ->green_Y, PNG_FP_1, d) == 0)
+ return 1;
dwhite += d;
whiteX += XYZ->green_X;
whiteY += XYZ->green_Y;
d = XYZ->blue_X + XYZ->blue_Y + XYZ->blue_Z;
- if (!png_muldiv(&xy->bluex, XYZ->blue_X, PNG_FP_1, d)) return 1;
- if (!png_muldiv(&xy->bluey, XYZ->blue_Y, PNG_FP_1, d)) return 1;
+ if (png_muldiv(&xy->bluex, XYZ->blue_X, PNG_FP_1, d) == 0)
+ return 1;
+ if (png_muldiv(&xy->bluey, XYZ->blue_Y, PNG_FP_1, d) == 0)
+ return 1;
dwhite += d;
whiteX += XYZ->blue_X;
whiteY += XYZ->blue_Y;
@@ -1221,8 +1224,10 @@ png_xy_from_XYZ(png_xy *xy, const png_XYZ *XYZ)
/* The reference white is simply the sum of the end-point (X,Y,Z) vectors,
* thus:
*/
- if (!png_muldiv(&xy->whitex, whiteX, PNG_FP_1, dwhite)) return 1;
- if (!png_muldiv(&xy->whitey, whiteY, PNG_FP_1, dwhite)) return 1;
+ if (png_muldiv(&xy->whitex, whiteX, PNG_FP_1, dwhite) == 0)
+ return 1;
+ if (png_muldiv(&xy->whitey, whiteY, PNG_FP_1, dwhite) == 0)
+ return 1;
return 0;
}
@@ -1425,16 +1430,16 @@ png_XYZ_from_xy(png_XYZ *XYZ, const png_xy *xy)
/* By the argument, above overflow should be impossible here. The return
* value of 2 indicates an internal error to the caller.
*/
- if (!png_muldiv(&left, xy->greenx-xy->bluex, xy->redy - xy->bluey, 7))
+ if (png_muldiv(&left, xy->greenx-xy->bluex, xy->redy - xy->bluey, 7) == 0)
return 2;
- if (!png_muldiv(&right, xy->greeny-xy->bluey, xy->redx - xy->bluex, 7))
+ if (png_muldiv(&right, xy->greeny-xy->bluey, xy->redx - xy->bluex, 7) == 0)
return 2;
denominator = left - right;
/* Now find the red numerator. */
- if (!png_muldiv(&left, xy->greenx-xy->bluex, xy->whitey-xy->bluey, 7))
+ if (png_muldiv(&left, xy->greenx-xy->bluex, xy->whitey-xy->bluey, 7) == 0)
return 2;
- if (!png_muldiv(&right, xy->greeny-xy->bluey, xy->whitex-xy->bluex, 7))
+ if (png_muldiv(&right, xy->greeny-xy->bluey, xy->whitex-xy->bluex, 7) == 0)
return 2;
/* Overflow is possible here and it indicates an extreme set of PNG cHRM
@@ -1442,16 +1447,16 @@ png_XYZ_from_xy(png_XYZ *XYZ, const png_xy *xy)
* scale value because this allows us to delay the multiplication of white-y
* into the denominator, which tends to produce a small number.
*/
- if (!png_muldiv(&red_inverse, xy->whitey, denominator, left-right) ||
+ if (png_muldiv(&red_inverse, xy->whitey, denominator, left-right) == 0 ||
red_inverse <= xy->whitey /* r+g+b scales = white scale */)
return 1;
/* Similarly for green_inverse: */
- if (!png_muldiv(&left, xy->redy-xy->bluey, xy->whitex-xy->bluex, 7))
+ if (png_muldiv(&left, xy->redy-xy->bluey, xy->whitex-xy->bluex, 7) == 0)
return 2;
- if (!png_muldiv(&right, xy->redx-xy->bluex, xy->whitey-xy->bluey, 7))
+ if (png_muldiv(&right, xy->redx-xy->bluex, xy->whitey-xy->bluey, 7) == 0)
return 2;
- if (!png_muldiv(&green_inverse, xy->whitey, denominator, left-right) ||
+ if (png_muldiv(&green_inverse, xy->whitey, denominator, left-right) == 0 ||
green_inverse <= xy->whitey)
return 1;
@@ -1459,29 +1464,34 @@ png_XYZ_from_xy(png_XYZ *XYZ, const png_xy *xy)
* can still produce 0 for extreme cHRM values.
*/
blue_scale = png_reciprocal(xy->whitey) - png_reciprocal(red_inverse) -
- png_reciprocal(green_inverse);
- if (blue_scale <= 0) return 1;
+ png_reciprocal(green_inverse);
+ if (blue_scale <= 0)
+ return 1;
/* And fill in the png_XYZ: */
- if (!png_muldiv(&XYZ->red_X, xy->redx, PNG_FP_1, red_inverse)) return 1;
- if (!png_muldiv(&XYZ->red_Y, xy->redy, PNG_FP_1, red_inverse)) return 1;
- if (!png_muldiv(&XYZ->red_Z, PNG_FP_1 - xy->redx - xy->redy, PNG_FP_1,
- red_inverse))
+ if (png_muldiv(&XYZ->red_X, xy->redx, PNG_FP_1, red_inverse) == 0)
+ return 1;
+ if (png_muldiv(&XYZ->red_Y, xy->redy, PNG_FP_1, red_inverse) == 0)
+ return 1;
+ if (png_muldiv(&XYZ->red_Z, PNG_FP_1 - xy->redx - xy->redy, PNG_FP_1,
+ red_inverse) == 0)
return 1;
- if (!png_muldiv(&XYZ->green_X, xy->greenx, PNG_FP_1, green_inverse))
+ if (png_muldiv(&XYZ->green_X, xy->greenx, PNG_FP_1, green_inverse) == 0)
return 1;
- if (!png_muldiv(&XYZ->green_Y, xy->greeny, PNG_FP_1, green_inverse))
+ if (png_muldiv(&XYZ->green_Y, xy->greeny, PNG_FP_1, green_inverse) == 0)
return 1;
- if (!png_muldiv(&XYZ->green_Z, PNG_FP_1 - xy->greenx - xy->greeny, PNG_FP_1,
- green_inverse))
+ if (png_muldiv(&XYZ->green_Z, PNG_FP_1 - xy->greenx - xy->greeny, PNG_FP_1,
+ green_inverse) == 0)
return 1;
- if (!png_muldiv(&XYZ->blue_X, xy->bluex, blue_scale, PNG_FP_1)) return 1;
- if (!png_muldiv(&XYZ->blue_Y, xy->bluey, blue_scale, PNG_FP_1)) return 1;
- if (!png_muldiv(&XYZ->blue_Z, PNG_FP_1 - xy->bluex - xy->bluey, blue_scale,
- PNG_FP_1))
+ if (png_muldiv(&XYZ->blue_X, xy->bluex, blue_scale, PNG_FP_1) == 0)
+ return 1;
+ if (png_muldiv(&XYZ->blue_Y, xy->bluey, blue_scale, PNG_FP_1) == 0)
+ return 1;
+ if (png_muldiv(&XYZ->blue_Z, PNG_FP_1 - xy->bluex - xy->bluey, blue_scale,
+ PNG_FP_1) == 0)
return 1;
return 0; /*success*/
@@ -1503,24 +1513,35 @@ png_XYZ_normalize(png_XYZ *XYZ)
* safe.
*/
Y = XYZ->red_Y;
- if (0x7fffffff - Y < XYZ->green_X) return 1;
+ if (0x7fffffff - Y < XYZ->green_X)
+ return 1;
Y += XYZ->green_Y;
- if (0x7fffffff - Y < XYZ->blue_X) return 1;
+ if (0x7fffffff - Y < XYZ->blue_X)
+ return 1;
Y += XYZ->blue_Y;
if (Y != PNG_FP_1)
{
- if (!png_muldiv(&XYZ->red_X, XYZ->red_X, PNG_FP_1, Y)) return 1;
- if (!png_muldiv(&XYZ->red_Y, XYZ->red_Y, PNG_FP_1, Y)) return 1;
- if (!png_muldiv(&XYZ->red_Z, XYZ->red_Z, PNG_FP_1, Y)) return 1;
+ if (png_muldiv(&XYZ->red_X, XYZ->red_X, PNG_FP_1, Y) == 0)
+ return 1;
+ if (png_muldiv(&XYZ->red_Y, XYZ->red_Y, PNG_FP_1, Y) == 0)
+ return 1;
+ if (png_muldiv(&XYZ->red_Z, XYZ->red_Z, PNG_FP_1, Y) == 0)
+ return 1;
- if (!png_muldiv(&XYZ->green_X, XYZ->green_X, PNG_FP_1, Y)) return 1;
- if (!png_muldiv(&XYZ->green_Y, XYZ->green_Y, PNG_FP_1, Y)) return 1;
- if (!png_muldiv(&XYZ->green_Z, XYZ->green_Z, PNG_FP_1, Y)) return 1;
+ if (png_muldiv(&XYZ->green_X, XYZ->green_X, PNG_FP_1, Y) == 0)
+ return 1;
+ if (png_muldiv(&XYZ->green_Y, XYZ->green_Y, PNG_FP_1, Y) == 0)
+ return 1;
+ if (png_muldiv(&XYZ->green_Z, XYZ->green_Z, PNG_FP_1, Y) == 0)
+ return 1;
- if (!png_muldiv(&XYZ->blue_X, XYZ->blue_X, PNG_FP_1, Y)) return 1;
- if (!png_muldiv(&XYZ->blue_Y, XYZ->blue_Y, PNG_FP_1, Y)) return 1;
- if (!png_muldiv(&XYZ->blue_Z, XYZ->blue_Z, PNG_FP_1, Y)) return 1;
+ if (png_muldiv(&XYZ->blue_X, XYZ->blue_X, PNG_FP_1, Y) == 0)
+ return 1;
+ if (png_muldiv(&XYZ->blue_Y, XYZ->blue_Y, PNG_FP_1, Y) == 0)
+ return 1;
+ if (png_muldiv(&XYZ->blue_Z, XYZ->blue_Z, PNG_FP_1, Y) == 0)
+ return 1;
}
return 0;
@@ -1530,14 +1551,16 @@ static int
png_colorspace_endpoints_match(const png_xy *xy1, const png_xy *xy2, int delta)
{
/* Allow an error of +/-0.01 (absolute value) on each chromaticity */
- return !(PNG_OUT_OF_RANGE(xy1->whitex, xy2->whitex,delta) ||
- PNG_OUT_OF_RANGE(xy1->whitey, xy2->whitey,delta) ||
- PNG_OUT_OF_RANGE(xy1->redx, xy2->redx, delta) ||
- PNG_OUT_OF_RANGE(xy1->redy, xy2->redy, delta) ||
- PNG_OUT_OF_RANGE(xy1->greenx, xy2->greenx,delta) ||
- PNG_OUT_OF_RANGE(xy1->greeny, xy2->greeny,delta) ||
- PNG_OUT_OF_RANGE(xy1->bluex, xy2->bluex, delta) ||
- PNG_OUT_OF_RANGE(xy1->bluey, xy2->bluey, delta));
+ if (PNG_OUT_OF_RANGE(xy1->whitex, xy2->whitex,delta) ||
+ PNG_OUT_OF_RANGE(xy1->whitey, xy2->whitey,delta) ||
+ PNG_OUT_OF_RANGE(xy1->redx, xy2->redx, delta) ||
+ PNG_OUT_OF_RANGE(xy1->redy, xy2->redy, delta) ||
+ PNG_OUT_OF_RANGE(xy1->greenx, xy2->greenx,delta) ||
+ PNG_OUT_OF_RANGE(xy1->greeny, xy2->greeny,delta) ||
+ PNG_OUT_OF_RANGE(xy1->bluex, xy2->bluex, delta) ||
+ PNG_OUT_OF_RANGE(xy1->bluey, xy2->bluey, delta))
+ return 0;
+ return 1;
}
/* Added in libpng-1.6.0, a different check for the validity of a set of cHRM
@@ -1558,13 +1581,15 @@ png_colorspace_check_xy(png_XYZ *XYZ, const png_xy *xy)
/* As a side-effect this routine also returns the XYZ endpoints. */
result = png_XYZ_from_xy(XYZ, xy);
- if (result != 0) return result;
+ if (result != 0)
+ return result;
result = png_xy_from_XYZ(&xy_test, XYZ);
- if (result != 0) return result;
+ if (result != 0)
+ return result;
if (png_colorspace_endpoints_match(xy, &xy_test,
- 5/*actually, the math is pretty accurate*/))
+ 5/*actually, the math is pretty accurate*/) != 0)
return 0;
/* Too much slip */
@@ -1581,10 +1606,12 @@ png_colorspace_check_XYZ(png_xy *xy, png_XYZ *XYZ)
png_XYZ XYZtemp;
result = png_XYZ_normalize(XYZ);
- if (result != 0) return result;
+ if (result != 0)
+ return result;
result = png_xy_from_XYZ(xy, XYZ);
- if (result != 0) return result;
+ if (result != 0)
+ return result;
XYZtemp = *XYZ;
return png_colorspace_check_xy(&XYZtemp, xy);
@@ -1605,19 +1632,21 @@ png_colorspace_set_xy_and_XYZ(png_const_structrp png_ptr,
png_colorspacerp colorspace, const png_xy *xy, const png_XYZ *XYZ,
int preferred)
{
- if (colorspace->flags & PNG_COLORSPACE_INVALID)
+ if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
return 0;
/* The consistency check is performed on the chromaticities; this factors out
* variations because of the normalization (or not) of the end point Y
* values.
*/
- if (preferred < 2 && (colorspace->flags & PNG_COLORSPACE_HAVE_ENDPOINTS))
+ if (preferred < 2 &&
+ (colorspace->flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
{
/* The end points must be reasonably close to any we already have. The
* following allows an error of up to +/-.001
*/
- if (!png_colorspace_endpoints_match(xy, &colorspace->end_points_xy, 100))
+ if (png_colorspace_endpoints_match(xy, &colorspace->end_points_xy,
+ 100) == 0)
{
colorspace->flags |= PNG_COLORSPACE_INVALID;
png_benign_error(png_ptr, "inconsistent chromaticities");
@@ -1636,7 +1665,7 @@ png_colorspace_set_xy_and_XYZ(png_const_structrp png_ptr,
/* The end points are normally quoted to two decimal digits, so allow +/-0.01
* on this test.
*/
- if (png_colorspace_endpoints_match(xy, &sRGB_xy, 1000))
+ if (png_colorspace_endpoints_match(xy, &sRGB_xy, 1000) != 0)
colorspace->flags |= PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB;
else
@@ -1764,7 +1793,7 @@ png_icc_profile_error(png_const_structrp png_ptr, png_colorspacerp colorspace,
pos = png_safecat(message, (sizeof message), 0, "profile '"); /* 9 chars */
pos = png_safecat(message, pos+79, pos, name); /* Truncate to 79 chars */
pos = png_safecat(message, (sizeof message), pos, "': "); /* +2 = 90 */
- if (is_ICC_signature(value))
+ if (is_ICC_signature(value) != 0)
{
/* So 'value' is at most 4 bytes and the following cast is safe */
png_icc_tag_name(message+pos, (png_uint_32)value);
@@ -1825,7 +1854,7 @@ png_colorspace_set_sRGB(png_const_structrp png_ptr, png_colorspacerp colorspace,
};
/* Do nothing if the colorspace is already invalidated. */
- if (colorspace->flags & PNG_COLORSPACE_INVALID)
+ if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
return 0;
/* Check the intent, then check for existing settings. It is valid for the
@@ -2004,13 +2033,13 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace,
switch (temp)
{
case 0x52474220: /* 'RGB ' */
- if (!(color_type & PNG_COLOR_MASK_COLOR))
+ if ((color_type & PNG_COLOR_MASK_COLOR) == 0)
return png_icc_profile_error(png_ptr, colorspace, name, temp,
"RGB color space not permitted on grayscale PNG");
break;
case 0x47524159: /* 'GRAY' */
- if (color_type & PNG_COLOR_MASK_COLOR)
+ if ((color_type & PNG_COLOR_MASK_COLOR) != 0)
return png_icc_profile_error(png_ptr, colorspace, name, temp,
"Gray color space not permitted on RGB PNG");
break;
@@ -2238,7 +2267,7 @@ png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr,
* are not used by default if there is an MD5!)
*/
# if PNG_sRGB_PROFILE_CHECKS == 0
- if (png_sRGB_checks[i].have_md5)
+ if (png_sRGB_checks[i].have_md5 != 0)
return 1+png_sRGB_checks[i].is_broken;
# endif
@@ -2278,7 +2307,7 @@ png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr,
if (crc == png_sRGB_checks[i].crc)
# endif
{
- if (png_sRGB_checks[i].is_broken)
+ if (png_sRGB_checks[i].is_broken != 0)
{
/* These profiles are known to have bad data that may cause
* problems if they are used, therefore attempt to
@@ -2293,7 +2322,7 @@ png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr,
* the profile is perfectly valid, but it would be nice if
* people used the up-to-date ones.
*/
- else if (!png_sRGB_checks[i].have_md5)
+ else if (png_sRGB_checks[i].have_md5 == 0)
{
png_chunk_report(png_ptr, "out-of-date sRGB profile with"
" no signature",
@@ -2331,26 +2360,26 @@ png_icc_set_sRGB(png_const_structrp png_ptr,
* the sRGB information.
*/
#if PNG_sRGB_PROFILE_CHECKS >= 0
- if (png_compare_ICC_profile_with_sRGB(png_ptr, profile, adler))
+ if (png_compare_ICC_profile_with_sRGB(png_ptr, profile, adler) != 0)
#endif
(void)png_colorspace_set_sRGB(png_ptr, colorspace,
(int)/*already checked*/png_get_uint_32(profile+64));
}
-#endif /* PNG_READ_sRGB_SUPPORTED */
+#endif /* READ_sRGB */
int /* PRIVATE */
png_colorspace_set_ICC(png_const_structrp png_ptr, png_colorspacerp colorspace,
png_const_charp name, png_uint_32 profile_length, png_const_bytep profile,
int color_type)
{
- if (colorspace->flags & PNG_COLORSPACE_INVALID)
+ if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0)
return 0;
- if (png_icc_check_length(png_ptr, colorspace, name, profile_length) &&
- png_icc_check_header(png_ptr, colorspace, name, profile_length, profile,
- color_type) &&
- png_icc_check_tag_table(png_ptr, colorspace, name, profile_length,
- profile))
+ if (png_icc_check_length(png_ptr, colorspace, name, profile_length) != 0 &&
+ png_icc_check_header(png_ptr, colorspace, name, profile_length, profile,
+ color_type) != 0 &&
+ png_icc_check_tag_table(png_ptr, colorspace, name, profile_length,
+ profile) != 0)
{
# ifdef PNG_sRGB_SUPPORTED
/* If no sRGB support, don't try storing sRGB information */
@@ -2369,7 +2398,7 @@ void /* PRIVATE */
png_colorspace_set_rgb_coefficients(png_structrp png_ptr)
{
/* Set the rgb_to_gray coefficients from the colorspace. */
- if (!png_ptr->rgb_to_gray_coefficients_set &&
+ if (png_ptr->rgb_to_gray_coefficients_set == 0 &&
(png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
{
/* png_set_background has not been called, get the coefficients from the Y
@@ -2533,13 +2562,13 @@ png_check_IHDR(png_const_structrp png_ptr,
* 4. The filter_method is 64 and
* 5. The color_type is RGB or RGBA
*/
- if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) &&
- png_ptr->mng_features_permitted)
+ if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) != 0 &&
+ png_ptr->mng_features_permitted != 0)
png_warning(png_ptr, "MNG features are not allowed in a PNG datastream");
if (filter_type != PNG_FILTER_TYPE_BASE)
{
- if (!((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+ if (!((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 &&
(filter_type == PNG_INTRAPIXEL_DIFFERENCING) &&
((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) == 0) &&
(color_type == PNG_COLOR_TYPE_RGB ||
@@ -2549,7 +2578,7 @@ png_check_IHDR(png_const_structrp png_ptr,
error = 1;
}
- if (png_ptr->mode & PNG_HAVE_PNG_SIGNATURE)
+ if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) != 0)
{
png_warning(png_ptr, "Invalid filter method in IHDR");
error = 1;
@@ -2609,7 +2638,7 @@ png_check_fp_number(png_const_charp string, png_size_t size, int *statep,
switch ((state & PNG_FP_STATE) + (type & PNG_FP_SAW_ANY))
{
case PNG_FP_INTEGER + PNG_FP_SAW_SIGN:
- if (state & PNG_FP_SAW_ANY)
+ if ((state & PNG_FP_SAW_ANY) != 0)
goto PNG_FP_End; /* not a part of the number */
png_fp_add(state, type);
@@ -2617,10 +2646,10 @@ png_check_fp_number(png_const_charp string, png_size_t size, int *statep,
case PNG_FP_INTEGER + PNG_FP_SAW_DOT:
/* Ok as trailer, ok as lead of fraction. */
- if (state & PNG_FP_SAW_DOT) /* two dots */
+ if ((state & PNG_FP_SAW_DOT) != 0) /* two dots */
goto PNG_FP_End;
- else if (state & PNG_FP_SAW_DIGIT) /* trailing dot? */
+ else if ((state & PNG_FP_SAW_DIGIT) != 0) /* trailing dot? */
png_fp_add(state, type);
else
@@ -2629,7 +2658,7 @@ png_check_fp_number(png_const_charp string, png_size_t size, int *statep,
break;
case PNG_FP_INTEGER + PNG_FP_SAW_DIGIT:
- if (state & PNG_FP_SAW_DOT) /* delayed fraction */
+ if ((state & PNG_FP_SAW_DOT) != 0) /* delayed fraction */
png_fp_set(state, PNG_FP_FRACTION | PNG_FP_SAW_DOT);
png_fp_add(state, type | PNG_FP_WAS_VALID);
@@ -2667,7 +2696,7 @@ png_check_fp_number(png_const_charp string, png_size_t size, int *statep,
break;
case PNG_FP_EXPONENT + PNG_FP_SAW_SIGN:
- if (state & PNG_FP_SAW_ANY)
+ if ((state & PNG_FP_SAW_ANY) != 0)
goto PNG_FP_End; /* not a part of the number */
png_fp_add(state, PNG_FP_SAW_SIGN);
@@ -2710,13 +2739,13 @@ png_check_fp_string(png_const_charp string, png_size_t size)
int state=0;
png_size_t char_index=0;
- if (png_check_fp_number(string, size, &state, &char_index) &&
+ if (png_check_fp_number(string, size, &state, &char_index) != 0 &&
(char_index == size || string[char_index] == 0))
return state /* must be non-zero - see above */;
return 0; /* i.e. fail */
}
-#endif /* pCAL or sCAL */
+#endif /* pCAL || sCAL */
#ifdef PNG_sCAL_SUPPORTED
# ifdef PNG_FLOATING_POINT_SUPPORTED
@@ -2964,8 +2993,9 @@ png_ascii_from_fp(png_const_structrp png_ptr, png_charp ascii, png_size_t size,
if (exp_b10 != (-1))
{
- if (exp_b10 == 0) *ascii++ = 46, --size; /* counted
- above */
+ if (exp_b10 == 0)
+ *ascii++ = 46, --size; /* counted above */
+
--exp_b10;
}
*ascii++ = (char)(48 + (int)d), ++cdigits;
@@ -3277,7 +3307,8 @@ png_muldiv(png_fixed_point_p res, png_fixed_point a, png_int_32 times,
result = -result;
/* Check for overflow. */
- if ((negative && result <= 0) || (!negative && result >= 0))
+ if ((negative != 0 && result <= 0) ||
+ (negative == 0 && result >= 0))
{
*res = result;
return 1;
@@ -3301,7 +3332,7 @@ png_muldiv_warn(png_const_structrp png_ptr, png_fixed_point a, png_int_32 times,
{
png_fixed_point result;
- if (png_muldiv(&result, a, times, divisor))
+ if (png_muldiv(&result, a, times, divisor) != 0)
return result;
png_warning(png_ptr, "fixed point overflow ignored");
@@ -3322,7 +3353,7 @@ png_reciprocal(png_fixed_point a)
#else
png_fixed_point res;
- if (png_muldiv(&res, 100000, 100000, a))
+ if (png_muldiv(&res, 100000, 100000, a) != 0)
return res;
#endif
@@ -3341,7 +3372,7 @@ png_gamma_significant(png_fixed_point gamma_val)
#endif
#ifdef PNG_READ_GAMMA_SUPPORTED
-# ifdef PNG_16BIT_SUPPORTED
+#if defined(PNG_16BIT_SUPPORTED) || !defined(PNG_FLOATING_ARITHMETIC_SUPPORTED)
/* A local convenience routine. */
static png_fixed_point
png_product2(png_fixed_point a, png_fixed_point b)
@@ -3357,13 +3388,13 @@ png_product2(png_fixed_point a, png_fixed_point b)
# else
png_fixed_point res;
- if (png_muldiv(&res, a, b, 100000))
+ if (png_muldiv(&res, a, b, 100000) != 0)
return res;
# endif
return 0; /* overflow */
}
-# endif /* 16BIT */
+#endif /* 16BIT || !FLOATING_ARITHMETIC */
/* The inverse of the above. */
png_fixed_point
@@ -3515,6 +3546,7 @@ png_log8bit(unsigned int x)
* Zero (257): 0
* End (258): 23499
*/
+#ifdef PNG_16BIT_SUPPORTED
static png_int_32
png_log16bit(png_uint_32 x)
{
@@ -3565,6 +3597,7 @@ png_log16bit(png_uint_32 x)
/* Safe, because the result can't have more than 20 bits: */
return (png_int_32)((lg2 + 2048) >> 12);
}
+#endif /* 16BIT */
/* The 'exp()' case must invert the above, taking a 20-bit fixed point
* logarithmic value and returning a 16 or 8-bit number as appropriate. In
@@ -3688,13 +3721,37 @@ png_gamma_8bit_correct(unsigned int value, png_fixed_point gamma_val)
if (value > 0 && value < 255)
{
# ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
- double r = floor(255*pow(value/255.,gamma_val*.00001)+.5);
+ /* 'value' is unsigned, ANSI-C90 requires the compiler to correctly
+ * convert this to a floating point value. This includes values that
+ * would overflow if 'value' were to be converted to 'int'.
+ *
+ * Apparently GCC, however, does an intermediate conversion to (int)
+ * on some (ARM) but not all (x86) platforms, possibly because of
+ * hardware FP limitations. (E.g. if the hardware conversion always
+ * assumes the integer register contains a signed value.) This results
+ * in ANSI-C undefined behavior for large values.
+ *
+ * Other implementations on the same machine might actually be ANSI-C90
+ * conformant and therefore compile spurious extra code for the large
+ * values.
+ *
+ * We can be reasonably sure that an unsigned to float conversion
+ * won't be faster than an int to float one. Therefore this code
+ * assumes responsibility for the undefined behavior, which it knows
+ * can't happen because of the check above.
+ *
+ * Note the argument to this routine is an (unsigned int) because, on
+ * 16-bit platforms, it is assigned a value which might be out of
+ * range for an (int); that would result in undefined behavior in the
+ * caller if the *argument* ('value') were to be declared (int).
+ */
+ double r = floor(255*pow((int)/*SAFE*/value/255.,gamma_val*.00001)+.5);
return (png_byte)r;
# else
png_int_32 lg2 = png_log8bit(value);
png_fixed_point res;
- if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1))
+ if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1) != 0)
return png_exp8bit(res);
/* Overflow. */
@@ -3712,13 +3769,19 @@ png_gamma_16bit_correct(unsigned int value, png_fixed_point gamma_val)
if (value > 0 && value < 65535)
{
# ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
- double r = floor(65535*pow(value/65535.,gamma_val*.00001)+.5);
+ /* The same (unsigned int)->(double) constraints apply here as above,
+ * however in this case the (unsigned int) to (int) conversion can
+ * overflow on an ANSI-C90 compliant system so the cast needs to ensure
+ * that this is not possible.
+ */
+ double r = floor(65535*pow((png_int_32)value/65535.,
+ gamma_val*.00001)+.5);
return (png_uint_16)r;
# else
png_int_32 lg2 = png_log16bit(value);
png_fixed_point res;
- if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1))
+ if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1) != 0)
return png_exp16bit(res);
/* Overflow. */
@@ -3766,6 +3829,12 @@ png_build_16bit_table(png_structrp png_ptr, png_uint_16pp *ptable,
{
/* Various values derived from 'shift': */
PNG_CONST unsigned int num = 1U << (8U - shift);
+#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
+ /* CSE the division and work round wacky GCC warnings (see the comments
+ * in png_gamma_8bit_correct for where these come from.)
+ */
+ PNG_CONST double fmax = 1./(((png_int_32)1 << (16U - shift))-1);
+#endif
PNG_CONST unsigned int max = (1U << (16U - shift))-1U;
PNG_CONST unsigned int max_by_2 = 1U << (15U-shift);
unsigned int i;
@@ -3781,7 +3850,7 @@ png_build_16bit_table(png_structrp png_ptr, png_uint_16pp *ptable,
/* The 'threshold' test is repeated here because it can arise for one of
* the 16-bit tables even if the others don't hit it.
*/
- if (png_gamma_significant(gamma_val))
+ if (png_gamma_significant(gamma_val) != 0)
{
/* The old code would overflow at the end and this would cause the
* 'pow' function to return a result >1, resulting in an
@@ -3797,7 +3866,10 @@ png_build_16bit_table(png_structrp png_ptr, png_uint_16pp *ptable,
png_uint_32 ig = (j << (8-shift)) + i;
# ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED
/* Inline the 'max' scaling operation: */
- double d = floor(65535*pow(ig/(double)max, gamma_val*.00001)+.5);
+ /* See png_gamma_8bit_correct for why the cast to (int) is
+ * required here.
+ */
+ double d = floor(65535.*pow(ig*fmax, gamma_val*.00001)+.5);
sub_table[j] = (png_uint_16)d;
# else
if (shift != 0)
@@ -3903,11 +3975,13 @@ png_build_8bit_table(png_structrp png_ptr, png_bytepp ptable,
unsigned int i;
png_bytep table = *ptable = (png_bytep)png_malloc(png_ptr, 256);
- if (png_gamma_significant(gamma_val)) for (i=0; i<256; i++)
- table[i] = png_gamma_8bit_correct(i, gamma_val);
+ if (png_gamma_significant(gamma_val) != 0)
+ for (i=0; i<256; i++)
+ table[i] = png_gamma_8bit_correct(i, gamma_val);
- else for (i=0; i<256; ++i)
- table[i] = (png_byte)i;
+ else
+ for (i=0; i<256; ++i)
+ table[i] = (png_byte)i;
}
/* Used from png_read_destroy and below to release the memory used by the gamma
@@ -3999,7 +4073,7 @@ png_build_gamma_table(png_structrp png_ptr, int bit_depth)
#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
- if (png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY))
+ if ((png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY)) != 0)
{
png_build_8bit_table(png_ptr, &png_ptr->gamma_to_1,
png_reciprocal(png_ptr->colorspace.gamma));
@@ -4015,7 +4089,7 @@ png_build_gamma_table(png_structrp png_ptr, int bit_depth)
{
png_byte shift, sig_bit;
- if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
+ if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
{
sig_bit = png_ptr->sig_bit.red;
@@ -4052,7 +4126,7 @@ png_build_gamma_table(png_structrp png_ptr, int bit_depth)
else
shift = 0; /* keep all 16 bits */
- if (png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8))
+ if ((png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8)) != 0)
{
/* PNG_MAX_GAMMA_8 is the number of bits to keep - effectively
* the significant bits in the *input* when the output will
@@ -4072,7 +4146,7 @@ png_build_gamma_table(png_structrp png_ptr, int bit_depth)
* 16-bit output because the 8-bit table assumes the result will be reduced
* to 8 bits.
*/
- if (png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8))
+ if ((png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8)) != 0)
png_build_16to8_table(png_ptr, &png_ptr->gamma_16_table, shift,
png_ptr->screen_gamma > 0 ? png_product2(png_ptr->colorspace.gamma,
png_ptr->screen_gamma) : PNG_FP_1);
@@ -4085,7 +4159,7 @@ png_build_gamma_table(png_structrp png_ptr, int bit_depth)
#if defined(PNG_READ_BACKGROUND_SUPPORTED) || \
defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \
defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
- if (png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY))
+ if ((png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY)) != 0)
{
png_build_16bit_table(png_ptr, &png_ptr->gamma_16_to_1, shift,
png_reciprocal(png_ptr->colorspace.gamma));
@@ -4183,7 +4257,7 @@ const png_uint_16 png_sRGB_table[256] =
57105,57646,58190,58737,59287,59840,60396,60955,
61517,62082,62650,63221,63795,64372,64952,65535
};
-#endif /* PNG_SIMPLIFIED_READ_SUPPORTED */
+#endif /* SIMPLIFIED_READ */
/* The base/delta tables are required for both read and write (but currently
* only the simplified versions.)
@@ -4311,7 +4385,7 @@ png_image_free_function(png_voidp argument)
/* First free any data held in the control structure. */
# ifdef PNG_STDIO_SUPPORTED
- if (cp->owned_file)
+ if (cp->owned_file != 0)
{
FILE *fp = png_voidcast(FILE*, cp->png_ptr->io_ptr);
cp->owned_file = 0;
@@ -4335,7 +4409,7 @@ png_image_free_function(png_voidp argument)
png_free(c.png_ptr, cp);
/* Then the structures, calling the correct API. */
- if (c.for_write)
+ if (c.for_write != 0)
{
# ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
png_destroy_write_struct(&c.png_ptr, &c.info_ptr);
@@ -4383,4 +4457,4 @@ png_image_error(png_imagep image, png_const_charp error_message)
}
#endif /* SIMPLIFIED READ/WRITE */
-#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
+#endif /* READ || WRITE */
diff --git a/source/libs/libpng/libpng-1.6.14/png.h b/source/libs/libpng/libpng-1.6.15/png.h
similarity index 99%
rename from source/libs/libpng/libpng-1.6.14/png.h
rename to source/libs/libpng/libpng-1.6.15/png.h
index 73ff4c6a06ce647df5b175328d5f253ec0823eb9..e8602f653061724260db54db6be3460ed2845278 100644
--- a/source/libs/libpng/libpng-1.6.14/png.h
+++ b/source/libs/libpng/libpng-1.6.15/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.6.14 - October 23, 2014
+ * libpng version 1.6.15, November 20, 2014
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -11,7 +11,7 @@
* Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
* libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- * libpng versions 0.97, January 1998, through 1.6.14 - October 23, 2014: Glenn
+ * libpng versions 0.97, January 1998, through 1.6.15, November 20, 2014: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -206,6 +206,9 @@
* 1.6.14beta01-07 16 10614 16.so.16.14[.0]
* 1.6.14rc01-02 16 10614 16.so.16.14[.0]
* 1.6.14 16 10614 16.so.16.14[.0]
+ * 1.6.15beta01-08 16 10615 16.so.16.15[.0]
+ * 1.6.15rc01-03 16 10615 16.so.16.15[.0]
+ * 1.6.15 16 10615 16.so.16.15[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -237,7 +240,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.6.14, October 23, 2014, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.6.15, November 20, 2014, are
* Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are
* distributed according to the same disclaimer and license as libpng-1.2.5
* with the following individual added to the list of Contributing Authors:
@@ -349,13 +352,13 @@
* Y2K compliance in libpng:
* =========================
*
- * October 23, 2014
+ * November 20, 2014
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
*
* This is your unofficial assurance that libpng from version 0.71 and
- * upward through 1.6.14 are Y2K compliant. It is my belief that
+ * upward through 1.6.15 are Y2K compliant. It is my belief that
* earlier versions were also Y2K compliant.
*
* Libpng only has two year fields. One is a 2-byte unsigned integer
@@ -417,9 +420,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.6.14"
+#define PNG_LIBPNG_VER_STRING "1.6.15"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.6.14 - October 23, 2014\n"
+ " libpng version 1.6.15 - November 20, 2014\n"
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
@@ -427,7 +430,7 @@
/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
#define PNG_LIBPNG_VER_MAJOR 1
#define PNG_LIBPNG_VER_MINOR 6
-#define PNG_LIBPNG_VER_RELEASE 14
+#define PNG_LIBPNG_VER_RELEASE 15
/* This should match the numeric part of the final component of
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
@@ -458,7 +461,7 @@
* version 1.0.0 was mis-numbered 100 instead of 10000). From
* version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release
*/
-#define PNG_LIBPNG_VER 10614 /* 1.6.14 */
+#define PNG_LIBPNG_VER 10615 /* 1.6.15 */
/* Library configuration: these options cannot be changed after
* the library has been built.
@@ -563,7 +566,7 @@ extern "C" {
/* This triggers a compiler error in png.c, if png.c and png.h
* do not agree upon the version number.
*/
-typedef char* png_libpng_version_1_6_14;
+typedef char* png_libpng_version_1_6_15;
/* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
*
@@ -1176,7 +1179,7 @@ PNG_EXPORT(24, void, png_convert_from_struct_tm, (png_timep ptime,
/* Convert from time_t to png_time. Uses gmtime() */
PNG_EXPORT(25, void, png_convert_from_time_t, (png_timep ptime, time_t ttime));
-#endif /* PNG_CONVERT_tIME_SUPPORTED */
+#endif /* CONVERT_tIME */
#ifdef PNG_READ_EXPAND_SUPPORTED
/* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */
@@ -1382,7 +1385,7 @@ PNG_EXPORT(39, void, png_set_filler, (png_structrp png_ptr, png_uint_32 filler,
/* Add an alpha byte to 8-bit Gray or 24-bit RGB images. */
PNG_EXPORT(40, void, png_set_add_alpha, (png_structrp png_ptr,
png_uint_32 filler, int flags));
-#endif /* PNG_READ_FILLER_SUPPORTED || PNG_WRITE_FILLER_SUPPORTED */
+#endif /* READ_FILLER || WRITE_FILLER */
#if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
/* Swap bytes in 16-bit depth files. */
@@ -1646,7 +1649,7 @@ PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed,
(png_structrp png_ptr, int heuristic_method, int num_weights,
png_const_fixed_point_p filter_weights,
png_const_fixed_point_p filter_costs))
-#endif /* PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
+#endif /* WRITE_WEIGHTED_FILTER */
/* Heuristic used for row filter selection. These defines should NOT be
* changed.
@@ -1702,7 +1705,7 @@ PNG_EXPORT(225, void, png_set_text_compression_window_bits,
PNG_EXPORT(226, void, png_set_text_compression_method, (png_structrp png_ptr,
int method));
-#endif /* PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED */
+#endif /* WRITE_CUSTOMIZE_ZTXT_COMPRESSION */
/* These next functions are called for input/output, memory, and error
* handling. They are in the file pngrio.c, pngwio.c, and pngerror.c,
@@ -1869,7 +1872,7 @@ PNG_EXPORT(220, png_uint_32, png_process_data_skip, (png_structrp));
*/
PNG_EXPORT(93, void, png_progressive_combine_row, (png_const_structrp png_ptr,
png_bytep old_row, png_const_bytep new_row));
-#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+#endif /* PROGRESSIVE_READ */
PNG_EXPORTA(94, png_voidp, png_malloc, (png_const_structrp png_ptr,
png_alloc_size_t size), PNG_ALLOCATED);
@@ -2070,7 +2073,7 @@ PNG_EXPORT(128, png_int_32, png_get_x_offset_microns,
PNG_EXPORT(129, png_int_32, png_get_y_offset_microns,
(png_const_structrp png_ptr, png_const_inforp info_ptr));
-#endif /* PNG_EASY_ACCESS_SUPPORTED */
+#endif /* EASY_ACCESS */
#ifdef PNG_READ_SUPPORTED
/* Returns pointer to signature string read from PNG header */
@@ -2322,7 +2325,7 @@ PNG_FIXED_EXPORT(213, void, png_set_sCAL_fixed, (png_const_structrp png_ptr,
PNG_EXPORT(171, void, png_set_sCAL_s, (png_const_structrp png_ptr,
png_inforp info_ptr, int unit,
png_const_charp swidth, png_const_charp sheight));
-#endif /* PNG_sCAL_SUPPORTED */
+#endif /* sCAL */
#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
/* Provide the default handling for all unknown chunks or, optionally, for
@@ -2550,8 +2553,8 @@ PNG_FIXED_EXPORT(212, png_fixed_point, png_get_y_offset_inches_fixed,
PNG_EXPORT(198, png_uint_32, png_get_pHYs_dpi, (png_const_structrp png_ptr,
png_const_inforp info_ptr, png_uint_32 *res_x, png_uint_32 *res_y,
int *unit_type));
-# endif /* PNG_pHYs_SUPPORTED */
-#endif /* PNG_INCH_CONVERSIONS_SUPPORTED */
+# endif /* pHYs */
+#endif /* INCH_CONVERSIONS */
/* Added in libpng-1.4.0 */
#ifdef PNG_IO_STATE_SUPPORTED
@@ -2574,7 +2577,7 @@ PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
# define PNG_IO_CHUNK_CRC 0x0080 /* currently at the chunk crc */
# define PNG_IO_MASK_OP 0x000f /* current operation: reading/writing */
# define PNG_IO_MASK_LOC 0x00f0 /* current location: sig/hdr/data/crc */
-#endif /* ?PNG_IO_STATE_SUPPORTED */
+#endif /* IO_STATE */
/* Interlace support. The following macros are always defined so that if
* libpng interlace handling is turned off the macros may be used to handle
@@ -2678,7 +2681,7 @@ PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type,
(composite) = (png_uint_16)(((png_uint_32)(fg) * (png_uint_32)(alpha) + \
(png_uint_32)(bg)*(png_uint_32)(65535 - (png_uint_32)(alpha)) + \
32767) / 65535)
-#endif /* PNG_READ_COMPOSITE_NODIV_SUPPORTED */
+#endif /* READ_COMPOSITE_NODIV */
#ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED
PNG_EXPORT(201, png_uint_32, png_get_uint_32, (png_const_bytep buf));
@@ -3106,7 +3109,7 @@ PNG_EXPORT(234, int, png_image_begin_read_from_file, (png_imagep image,
PNG_EXPORT(235, int, png_image_begin_read_from_stdio, (png_imagep image,
FILE* file));
/* The PNG header is read from the stdio FILE object. */
-#endif /* PNG_STDIO_SUPPORTED */
+#endif /* STDIO */
PNG_EXPORT(236, int, png_image_begin_read_from_memory, (png_imagep image,
png_const_voidp memory, png_size_t size));
@@ -3151,7 +3154,7 @@ PNG_EXPORT(238, void, png_image_free, (png_imagep image));
/* Free any data allocated by libpng in image->opaque, setting the pointer to
* NULL. May be called at any time after the structure is initialized.
*/
-#endif /* PNG_SIMPLIFIED_READ_SUPPORTED */
+#endif /* SIMPLIFIED_READ */
#ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
#ifdef PNG_STDIO_SUPPORTED
@@ -3197,12 +3200,12 @@ PNG_EXPORT(240, int, png_image_write_to_stdio, (png_imagep image, FILE *file,
*
* Note that the write API does not support interlacing or sub-8-bit pixels.
*/
-#endif /* PNG_STDIO_SUPPORTED */
-#endif /* PNG_SIMPLIFIED_WRITE_SUPPORTED */
+#endif /* STDIO */
+#endif /* SIMPLIFIED_WRITE */
/*******************************************************************************
* END OF SIMPLIFIED API
******************************************************************************/
-#endif /* PNG_SIMPLIFIED_{READ|WRITE}_SUPPORTED */
+#endif /* SIMPLIFIED_{READ|WRITE} */
#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
PNG_EXPORT(242, void, png_set_check_for_invalid_index,
@@ -3250,7 +3253,7 @@ PNG_EXPORT(243, int, png_get_palette_max, (png_const_structp png_ptr,
PNG_EXPORT(244, int, png_set_option, (png_structrp png_ptr, int option,
int onoff));
-#endif /* PNG_SET_OPTION_SUPPORTED */
+#endif /* SET_OPTION */
/*******************************************************************************
* END OF HARDWARE AND SOFTWARE OPTIONS
diff --git a/source/libs/libpng/libpng-1.6.14/pngbar.jpg b/source/libs/libpng/libpng-1.6.15/pngbar.jpg
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/pngbar.jpg
rename to source/libs/libpng/libpng-1.6.15/pngbar.jpg
diff --git a/source/libs/libpng/libpng-1.6.14/pngbar.png b/source/libs/libpng/libpng-1.6.15/pngbar.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/pngbar.png
rename to source/libs/libpng/libpng-1.6.15/pngbar.png
diff --git a/source/libs/libpng/libpng-1.6.14/pngconf.h b/source/libs/libpng/libpng-1.6.15/pngconf.h
similarity index 99%
rename from source/libs/libpng/libpng-1.6.14/pngconf.h
rename to source/libs/libpng/libpng-1.6.15/pngconf.h
index 13f48f73b7588a094c482f14f566019827149f16..73accfa181eeb08c3e1acae7c8e3c83e51699a28 100644
--- a/source/libs/libpng/libpng-1.6.14/pngconf.h
+++ b/source/libs/libpng/libpng-1.6.15/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.6.14 - October 23, 2014
+ * libpng version 1.6.15,November 20, 2014
*
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/source/libs/libpng/libpng-1.6.14/pngdebug.h b/source/libs/libpng/libpng-1.6.15/pngdebug.h
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/pngdebug.h
rename to source/libs/libpng/libpng-1.6.15/pngdebug.h
diff --git a/source/libs/libpng/libpng-1.6.14/pngerror.c b/source/libs/libpng/libpng-1.6.15/pngerror.c
similarity index 95%
rename from source/libs/libpng/libpng-1.6.14/pngerror.c
rename to source/libs/libpng/libpng-1.6.15/pngerror.c
index a2f8a563d33dc9b89de4db3d8edd4e0075feadff..0781866a89346252718739bd0786ced424464453 100644
--- a/source/libs/libpng/libpng-1.6.14/pngerror.c
+++ b/source/libs/libpng/libpng-1.6.15/pngerror.c
@@ -1,7 +1,7 @@
/* pngerror.c - stub functions for i/o and memory allocation
*
- * Last changed in libpng 1.6.13 [August 21, 2014]
+ * Last changed in libpng 1.6.15 [November 20, 2014]
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -27,7 +27,7 @@ static PNG_FUNCTION(void, png_default_error,PNGARG((png_const_structrp png_ptr,
static void /* PRIVATE */
png_default_warning PNGARG((png_const_structrp png_ptr,
png_const_charp warning_message));
-#endif /* PNG_WARNINGS_SUPPORTED */
+#endif /* WARNINGS */
/* This function is called whenever there is a fatal error. This function
* should not be changed. If there is a need to handle errors differently,
@@ -43,8 +43,8 @@ png_error,(png_const_structrp png_ptr, png_const_charp error_message),
char msg[16];
if (png_ptr != NULL)
{
- if (png_ptr->flags&
- (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
+ if ((png_ptr->flags &
+ (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) != 0
{
if (*error_message == PNG_LITERAL_SHARP)
{
@@ -54,7 +54,7 @@ png_error,(png_const_structrp png_ptr, png_const_charp error_message),
if (error_message[offset] == ' ')
break;
- if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
+ if ((png_ptr->flags & PNG_FLAG_STRIP_ERROR_TEXT) != 0)
{
int i;
for (i = 0; i < offset - 1; i++)
@@ -69,7 +69,7 @@ png_error,(png_const_structrp png_ptr, png_const_charp error_message),
else
{
- if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT)
+ if ((png_ptr->flags & PNG_FLAG_STRIP_ERROR_TEXT) != 0)
{
msg[0] = '0';
msg[1] = '\0';
@@ -103,7 +103,7 @@ png_err,(png_const_structrp png_ptr),PNG_NORETURN)
use the default handler, which will not return. */
png_default_error(png_ptr, "");
}
-#endif /* PNG_ERROR_TEXT_SUPPORTED */
+#endif /* ERROR_TEXT */
/* Utility to safely appends strings to a buffer. This never errors out so
* error checking is not required in the caller.
@@ -152,7 +152,7 @@ png_format_number(png_const_charp start, png_charp end, int format,
case PNG_NUMBER_FORMAT_fixed:
/* Needs five digits (the fraction) */
mincount = 5;
- if (output || number % 10 != 0)
+ if (output != 0 || number % 10 != 0)
{
*--end = digits[number % 10];
output = 1;
@@ -189,7 +189,7 @@ png_format_number(png_const_charp start, png_charp end, int format,
++count;
/* Float a fixed number here: */
- if (format == PNG_NUMBER_FORMAT_fixed) if (count == 5) if (end > start)
+ if ((format == PNG_NUMBER_FORMAT_fixed) && (count == 5) && (end > start))
{
/* End of the fraction, but maybe nothing was output? In that case
* drop the decimal point. If the number is a true zero handle that
@@ -219,8 +219,8 @@ png_warning(png_const_structrp png_ptr, png_const_charp warning_message)
if (png_ptr != NULL)
{
#ifdef PNG_ERROR_NUMBERS_SUPPORTED
- if (png_ptr->flags&
- (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT))
+ if ((png_ptr->flags &
+ (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) != 0)
#endif
{
if (*warning_message == PNG_LITERAL_SHARP)
@@ -355,13 +355,13 @@ png_formatted_warning(png_const_structrp png_ptr, png_warning_parameters p,
*/
png_warning(png_ptr, msg);
}
-#endif /* PNG_WARNINGS_SUPPORTED */
+#endif /* WARNINGS */
#ifdef PNG_BENIGN_ERRORS_SUPPORTED
void PNGAPI
png_benign_error(png_const_structrp png_ptr, png_const_charp error_message)
{
- if (png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN)
+ if ((png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN) != 0)
{
# ifdef PNG_READ_SUPPORTED
if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0 &&
@@ -391,7 +391,7 @@ png_benign_error(png_const_structrp png_ptr, png_const_charp error_message)
void /* PRIVATE */
png_app_warning(png_const_structrp png_ptr, png_const_charp error_message)
{
- if (png_ptr->flags & PNG_FLAG_APP_WARNINGS_WARN)
+ if ((png_ptr->flags & PNG_FLAG_APP_WARNINGS_WARN) != 0)
png_warning(png_ptr, error_message);
else
png_error(png_ptr, error_message);
@@ -404,7 +404,7 @@ png_app_warning(png_const_structrp png_ptr, png_const_charp error_message)
void /* PRIVATE */
png_app_error(png_const_structrp png_ptr, png_const_charp error_message)
{
- if (png_ptr->flags & PNG_FLAG_APP_ERRORS_WARN)
+ if ((png_ptr->flags & PNG_FLAG_APP_ERRORS_WARN) != 0)
png_warning(png_ptr, error_message);
else
png_error(png_ptr, error_message);
@@ -442,7 +442,7 @@ png_format_buffer(png_const_structrp png_ptr, png_charp buffer, png_const_charp
int c = (int)(chunk_name >> ishift) & 0xff;
ishift -= 8;
- if (isnonalpha(c))
+ if (isnonalpha(c) != 0)
{
buffer[iout++] = PNG_LITERAL_LEFT_SQUARE_BRACKET;
buffer[iout++] = png_digit[(c & 0xf0) >> 4];
@@ -473,7 +473,7 @@ png_format_buffer(png_const_structrp png_ptr, png_charp buffer, png_const_charp
buffer[iout] = '\0';
}
}
-#endif /* PNG_WARNINGS_SUPPORTED || PNG_ERROR_TEXT_SUPPORTED */
+#endif /* WARNINGS || ERROR_TEXT */
#if defined(PNG_READ_SUPPORTED) && defined(PNG_ERROR_TEXT_SUPPORTED)
PNG_FUNCTION(void,PNGAPI
@@ -490,7 +490,7 @@ png_chunk_error,(png_const_structrp png_ptr, png_const_charp error_message),
png_error(png_ptr, msg);
}
}
-#endif /* PNG_READ_SUPPORTED && PNG_ERROR_TEXT_SUPPORTED */
+#endif /* READ && ERROR_TEXT */
#ifdef PNG_WARNINGS_SUPPORTED
void PNGAPI
@@ -506,7 +506,7 @@ png_chunk_warning(png_const_structrp png_ptr, png_const_charp warning_message)
png_warning(png_ptr, msg);
}
}
-#endif /* PNG_WARNINGS_SUPPORTED */
+#endif /* WARNINGS */
#ifdef PNG_READ_SUPPORTED
#ifdef PNG_BENIGN_ERRORS_SUPPORTED
@@ -514,7 +514,7 @@ void PNGAPI
png_chunk_benign_error(png_const_structrp png_ptr, png_const_charp
error_message)
{
- if (png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN)
+ if ((png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN) != 0)
png_chunk_warning(png_ptr, error_message);
else
@@ -525,7 +525,7 @@ png_chunk_benign_error(png_const_structrp png_ptr, png_const_charp
# endif
}
#endif
-#endif /* PNG_READ_SUPPORTED */
+#endif /* READ */
void /* PRIVATE */
png_chunk_report(png_const_structrp png_ptr, png_const_charp message, int error)
@@ -538,7 +538,7 @@ png_chunk_report(png_const_structrp png_ptr, png_const_charp message, int error)
* unconditionally does the right thing.
*/
# if defined(PNG_READ_SUPPORTED) && defined(PNG_WRITE_SUPPORTED)
- if (png_ptr->mode & PNG_IS_READ_STRUCT)
+ if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)
# endif
# ifdef PNG_READ_SUPPORTED
@@ -552,7 +552,7 @@ png_chunk_report(png_const_structrp png_ptr, png_const_charp message, int error)
# endif
# if defined(PNG_READ_SUPPORTED) && defined(PNG_WRITE_SUPPORTED)
- else if (!(png_ptr->mode & PNG_IS_READ_STRUCT))
+ else if ((png_ptr->mode & PNG_IS_READ_STRUCT) == 0)
# endif
# ifdef PNG_WRITE_SUPPORTED
@@ -577,11 +577,12 @@ png_fixed_error,(png_const_structrp png_ptr, png_const_charp name),PNG_NORETURN)
char msg[fixed_message_ln+PNG_MAX_ERROR_TEXT];
memcpy(msg, fixed_message, fixed_message_ln);
iin = 0;
- if (name != NULL) while (iin < (PNG_MAX_ERROR_TEXT-1) && name[iin] != 0)
- {
- msg[fixed_message_ln + iin] = name[iin];
- ++iin;
- }
+ if (name != NULL)
+ while (iin < (PNG_MAX_ERROR_TEXT-1) && name[iin] != 0)
+ {
+ msg[fixed_message_ln + iin] = name[iin];
+ ++iin;
+ }
msg[fixed_message_ln + iin] = 0;
png_error(png_ptr, msg);
}
@@ -757,7 +758,8 @@ PNG_FUNCTION(void,PNGAPI
png_longjmp,(png_const_structrp png_ptr, int val),PNG_NORETURN)
{
#ifdef PNG_SETJMP_SUPPORTED
- if (png_ptr && png_ptr->longjmp_fn && png_ptr->jmp_buf_ptr)
+ if (png_ptr != NULL && png_ptr->longjmp_fn != NULL &&
+ png_ptr->jmp_buf_ptr != NULL)
png_ptr->longjmp_fn(*png_ptr->jmp_buf_ptr, val);
#else
PNG_UNUSED(png_ptr)
@@ -822,7 +824,7 @@ png_default_warning(png_const_structrp png_ptr, png_const_charp warning_message)
#endif
PNG_UNUSED(png_ptr) /* Make compiler happy */
}
-#endif /* PNG_WARNINGS_SUPPORTED */
+#endif /* WARNINGS */
/* This function is called when the application wants to use another method
* of handling errors and warnings. Note that the error function MUST NOT
@@ -957,5 +959,5 @@ png_safe_execute(png_imagep image_in, int (*function)(png_voidp), png_voidp arg)
return result;
}
-#endif /* SIMPLIFIED READ/WRITE */
-#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
+#endif /* SIMPLIFIED READ || SIMPLIFIED_WRITE */
+#endif /* READ || WRITE */
diff --git a/source/libs/libpng/libpng-1.6.14/pngget.c b/source/libs/libpng/libpng-1.6.15/pngget.c
similarity index 90%
rename from source/libs/libpng/libpng-1.6.14/pngget.c
rename to source/libs/libpng/libpng-1.6.15/pngget.c
index 172f50a90015c829eda4087bc33624c0c800ead3..fce126cd0b96897bf8c18c855374e29f61b26f43 100644
--- a/source/libs/libpng/libpng-1.6.14/pngget.c
+++ b/source/libs/libpng/libpng-1.6.15/pngget.c
@@ -1,7 +1,7 @@
/* pngget.c - retrieval of values from info struct
*
- * Last changed in libpng 1.6.11 [June 5, 2014]
+ * Last changed in libpng 1.6.15 [November 20, 2014]
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -116,7 +116,8 @@ png_get_x_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp
info_ptr)
{
#ifdef PNG_pHYs_SUPPORTED
- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
+ if (png_ptr != NULL && info_ptr != NULL &&
+ (info_ptr->valid & PNG_INFO_pHYs) != 0)
{
png_debug1(1, "in %s retrieval function",
"png_get_x_pixels_per_meter");
@@ -137,7 +138,8 @@ png_get_y_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp
info_ptr)
{
#ifdef PNG_pHYs_SUPPORTED
- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
+ if (png_ptr != NULL && info_ptr != NULL &&
+ (info_ptr->valid & PNG_INFO_pHYs) != 0)
{
png_debug1(1, "in %s retrieval function",
"png_get_y_pixels_per_meter");
@@ -157,7 +159,8 @@ png_uint_32 PNGAPI
png_get_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp info_ptr)
{
#ifdef PNG_pHYs_SUPPORTED
- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
+ if (png_ptr != NULL && info_ptr != NULL &&
+ (info_ptr->valid & PNG_INFO_pHYs) != 0)
{
png_debug1(1, "in %s retrieval function", "png_get_pixels_per_meter");
@@ -179,7 +182,8 @@ png_get_pixel_aspect_ratio(png_const_structrp png_ptr, png_const_inforp
info_ptr)
{
#ifdef PNG_READ_pHYs_SUPPORTED
- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
+ if (png_ptr != NULL && info_ptr != NULL &&
+ (info_ptr->valid & PNG_INFO_pHYs) != 0)
{
png_debug1(1, "in %s retrieval function", "png_get_aspect_ratio");
@@ -202,10 +206,11 @@ png_get_pixel_aspect_ratio_fixed(png_const_structrp png_ptr,
png_const_inforp info_ptr)
{
#ifdef PNG_READ_pHYs_SUPPORTED
- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs)
- && info_ptr->x_pixels_per_unit > 0 && info_ptr->y_pixels_per_unit > 0
- && info_ptr->x_pixels_per_unit <= PNG_UINT_31_MAX
- && info_ptr->y_pixels_per_unit <= PNG_UINT_31_MAX)
+ if (png_ptr != NULL && info_ptr != NULL &&
+ (info_ptr->valid & PNG_INFO_pHYs) != 0 &&
+ info_ptr->x_pixels_per_unit > 0 && info_ptr->y_pixels_per_unit > 0 &&
+ info_ptr->x_pixels_per_unit <= PNG_UINT_31_MAX &&
+ info_ptr->y_pixels_per_unit <= PNG_UINT_31_MAX)
{
png_fixed_point res;
@@ -215,7 +220,7 @@ png_get_pixel_aspect_ratio_fixed(png_const_structrp png_ptr,
* range of 0..2^31-1; otherwise the cast might overflow.
*/
if (png_muldiv(&res, (png_int_32)info_ptr->y_pixels_per_unit, PNG_FP_1,
- (png_int_32)info_ptr->x_pixels_per_unit))
+ (png_int_32)info_ptr->x_pixels_per_unit) != 0)
return res;
}
#else
@@ -231,7 +236,8 @@ png_int_32 PNGAPI
png_get_x_offset_microns(png_const_structrp png_ptr, png_const_inforp info_ptr)
{
#ifdef PNG_oFFs_SUPPORTED
- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
+ if (png_ptr != NULL && info_ptr != NULL &&
+ (info_ptr->valid & PNG_INFO_oFFs) != 0)
{
png_debug1(1, "in %s retrieval function", "png_get_x_offset_microns");
@@ -250,7 +256,8 @@ png_int_32 PNGAPI
png_get_y_offset_microns(png_const_structrp png_ptr, png_const_inforp info_ptr)
{
#ifdef PNG_oFFs_SUPPORTED
- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
+ if (png_ptr != NULL && info_ptr != NULL &&
+ (info_ptr->valid & PNG_INFO_oFFs) != 0)
{
png_debug1(1, "in %s retrieval function", "png_get_y_offset_microns");
@@ -269,7 +276,8 @@ png_int_32 PNGAPI
png_get_x_offset_pixels(png_const_structrp png_ptr, png_const_inforp info_ptr)
{
#ifdef PNG_oFFs_SUPPORTED
- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
+ if (png_ptr != NULL && info_ptr != NULL &&
+ (info_ptr->valid & PNG_INFO_oFFs) != 0)
{
png_debug1(1, "in %s retrieval function", "png_get_x_offset_pixels");
@@ -288,7 +296,8 @@ png_int_32 PNGAPI
png_get_y_offset_pixels(png_const_structrp png_ptr, png_const_inforp info_ptr)
{
#ifdef PNG_oFFs_SUPPORTED
- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
+ if (png_ptr != NULL && info_ptr != NULL &&
+ (info_ptr->valid & PNG_INFO_oFFs) != 0)
{
png_debug1(1, "in %s retrieval function", "png_get_y_offset_pixels");
@@ -328,7 +337,7 @@ ppi_from_ppm(png_uint_32 ppm)
*/
png_fixed_point result;
if (ppm <= PNG_UINT_31_MAX && png_muldiv(&result, (png_int_32)ppm, 127,
- 5000))
+ 5000) != 0)
return result;
/* Overflow. */
@@ -414,7 +423,8 @@ png_get_pHYs_dpi(png_const_structrp png_ptr, png_const_inforp info_ptr,
{
png_uint_32 retval = 0;
- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
+ if (png_ptr != NULL && info_ptr != NULL &&
+ (info_ptr->valid & PNG_INFO_pHYs) != 0)
{
png_debug1(1, "in %s retrieval function", "pHYs");
@@ -445,12 +455,12 @@ png_get_pHYs_dpi(png_const_structrp png_ptr, png_const_inforp info_ptr,
return (retval);
}
-#endif /* PNG_pHYs_SUPPORTED */
-#endif /* PNG_INCH_CONVERSIONS_SUPPORTED */
+#endif /* pHYs */
+#endif /* INCH_CONVERSIONS */
/* png_get_channels really belongs in here, too, but it's been around longer */
-#endif /* PNG_EASY_ACCESS_SUPPORTED */
+#endif /* EASY_ACCESS */
png_byte PNGAPI
@@ -478,8 +488,9 @@ png_uint_32 PNGAPI
png_get_bKGD(png_const_structrp png_ptr, png_inforp info_ptr,
png_color_16p *background)
{
- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD)
- && background != NULL)
+ if (png_ptr != NULL && info_ptr != NULL &&
+ (info_ptr->valid & PNG_INFO_bKGD) != 0 &&
+ background != NULL)
{
png_debug1(1, "in %s retrieval function", "bKGD");
@@ -509,7 +520,7 @@ png_get_cHRM(png_const_structrp png_ptr, png_const_inforp info_ptr,
* consistent.
*/
if (png_ptr != NULL && info_ptr != NULL &&
- (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS))
+ (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
{
png_debug1(1, "in %s retrieval function", "cHRM");
@@ -550,7 +561,7 @@ png_get_cHRM_XYZ(png_const_structrp png_ptr, png_const_inforp info_ptr,
double *blue_Z)
{
if (png_ptr != NULL && info_ptr != NULL &&
- (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS))
+ (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
{
png_debug1(1, "in %s retrieval function", "cHRM_XYZ(float)");
@@ -598,7 +609,7 @@ png_get_cHRM_XYZ_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
png_fixed_point *int_blue_Z)
{
if (png_ptr != NULL && info_ptr != NULL &&
- (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS))
+ (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
{
png_debug1(1, "in %s retrieval function", "cHRM_XYZ");
@@ -635,7 +646,7 @@ png_get_cHRM_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
png_debug1(1, "in %s retrieval function", "cHRM");
if (png_ptr != NULL && info_ptr != NULL &&
- (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS))
+ (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0)
{
if (white_x != NULL)
*white_x = info_ptr->colorspace.end_points_xy.whitex;
@@ -670,7 +681,7 @@ png_get_gAMA_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
png_debug1(1, "in %s retrieval function", "gAMA");
if (png_ptr != NULL && info_ptr != NULL &&
- (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) &&
+ (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&
file_gamma != NULL)
{
*file_gamma = info_ptr->colorspace.gamma;
@@ -689,7 +700,7 @@ png_get_gAMA(png_const_structrp png_ptr, png_const_inforp info_ptr,
png_debug1(1, "in %s retrieval function", "gAMA(float)");
if (png_ptr != NULL && info_ptr != NULL &&
- (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) &&
+ (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 &&
file_gamma != NULL)
{
*file_gamma = png_float(png_ptr, info_ptr->colorspace.gamma,
@@ -709,8 +720,8 @@ png_get_sRGB(png_const_structrp png_ptr, png_const_inforp info_ptr,
{
png_debug1(1, "in %s retrieval function", "sRGB");
- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB)
- && file_srgb_intent != NULL)
+ if (png_ptr != NULL && info_ptr != NULL &&
+ (info_ptr->valid & PNG_INFO_sRGB) != 0 && file_srgb_intent != NULL)
{
*file_srgb_intent = info_ptr->colorspace.rendering_intent;
return (PNG_INFO_sRGB);
@@ -728,9 +739,10 @@ png_get_iCCP(png_const_structrp png_ptr, png_inforp info_ptr,
{
png_debug1(1, "in %s retrieval function", "iCCP");
- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP)
- && name != NULL && compression_type != NULL && profile != NULL &&
- proflen != NULL)
+ if (png_ptr != NULL && info_ptr != NULL &&
+ (info_ptr->valid & PNG_INFO_iCCP) != 0 &&
+ name != NULL && compression_type != NULL && profile != NULL &&
+ proflen != NULL)
{
*name = info_ptr->iccp_name;
*profile = info_ptr->iccp_profile;
@@ -768,8 +780,8 @@ png_get_hIST(png_const_structrp png_ptr, png_inforp info_ptr,
{
png_debug1(1, "in %s retrieval function", "hIST");
- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST)
- && hist != NULL)
+ if (png_ptr != NULL && info_ptr != NULL &&
+ (info_ptr->valid & PNG_INFO_hIST) != 0 && hist != NULL)
{
*hist = info_ptr->hist;
return (PNG_INFO_hIST);
@@ -824,8 +836,9 @@ png_get_oFFs(png_const_structrp png_ptr, png_const_inforp info_ptr,
{
png_debug1(1, "in %s retrieval function", "oFFs");
- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs)
- && offset_x != NULL && offset_y != NULL && unit_type != NULL)
+ if (png_ptr != NULL && info_ptr != NULL &&
+ (info_ptr->valid & PNG_INFO_oFFs) != 0 &&
+ offset_x != NULL && offset_y != NULL && unit_type != NULL)
{
*offset_x = info_ptr->x_offset;
*offset_y = info_ptr->y_offset;
@@ -845,8 +858,9 @@ png_get_pCAL(png_const_structrp png_ptr, png_inforp info_ptr,
{
png_debug1(1, "in %s retrieval function", "pCAL");
- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL)
- && purpose != NULL && X0 != NULL && X1 != NULL && type != NULL &&
+ if (png_ptr != NULL && info_ptr != NULL &&
+ (info_ptr->valid & PNG_INFO_pCAL) != 0 &&
+ purpose != NULL && X0 != NULL && X1 != NULL && type != NULL &&
nparams != NULL && units != NULL && params != NULL)
{
*purpose = info_ptr->pcal_purpose;
@@ -872,7 +886,7 @@ png_get_sCAL_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr,
int *unit, png_fixed_point *width, png_fixed_point *height)
{
if (png_ptr != NULL && info_ptr != NULL &&
- (info_ptr->valid & PNG_INFO_sCAL))
+ (info_ptr->valid & PNG_INFO_sCAL) != 0)
{
*unit = info_ptr->scal_unit;
/*TODO: make this work without FP support; the API is currently eliminated
@@ -895,7 +909,7 @@ png_get_sCAL(png_const_structrp png_ptr, png_const_inforp info_ptr,
int *unit, double *width, double *height)
{
if (png_ptr != NULL && info_ptr != NULL &&
- (info_ptr->valid & PNG_INFO_sCAL))
+ (info_ptr->valid & PNG_INFO_sCAL) != 0)
{
*unit = info_ptr->scal_unit;
*width = atof(info_ptr->scal_s_width);
@@ -911,7 +925,7 @@ png_get_sCAL_s(png_const_structrp png_ptr, png_const_inforp info_ptr,
int *unit, png_charpp width, png_charpp height)
{
if (png_ptr != NULL && info_ptr != NULL &&
- (info_ptr->valid & PNG_INFO_sCAL))
+ (info_ptr->valid & PNG_INFO_sCAL) != 0)
{
*unit = info_ptr->scal_unit;
*width = info_ptr->scal_s_width;
@@ -933,7 +947,7 @@ png_get_pHYs(png_const_structrp png_ptr, png_const_inforp info_ptr,
png_debug1(1, "in %s retrieval function", "pHYs");
if (png_ptr != NULL && info_ptr != NULL &&
- (info_ptr->valid & PNG_INFO_pHYs))
+ (info_ptr->valid & PNG_INFO_pHYs) != 0)
{
if (res_x != NULL)
{
@@ -964,8 +978,8 @@ png_get_PLTE(png_const_structrp png_ptr, png_inforp info_ptr,
{
png_debug1(1, "in %s retrieval function", "PLTE");
- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_PLTE)
- && palette != NULL)
+ if (png_ptr != NULL && info_ptr != NULL &&
+ (info_ptr->valid & PNG_INFO_PLTE) != 0 && palette != NULL)
{
*palette = info_ptr->palette;
*num_palette = info_ptr->num_palette;
@@ -983,8 +997,8 @@ png_get_sBIT(png_const_structrp png_ptr, png_inforp info_ptr,
{
png_debug1(1, "in %s retrieval function", "sBIT");
- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT)
- && sig_bit != NULL)
+ if (png_ptr != NULL && info_ptr != NULL &&
+ (info_ptr->valid & PNG_INFO_sBIT) != 0 && sig_bit != NULL)
{
*sig_bit = &(info_ptr->sig_bit);
return (PNG_INFO_sBIT);
@@ -1027,8 +1041,8 @@ png_get_tIME(png_const_structrp png_ptr, png_inforp info_ptr,
{
png_debug1(1, "in %s retrieval function", "tIME");
- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME)
- && mod_time != NULL)
+ if (png_ptr != NULL && info_ptr != NULL &&
+ (info_ptr->valid & PNG_INFO_tIME) != 0 && mod_time != NULL)
{
*mod_time = &(info_ptr->mod_time);
return (PNG_INFO_tIME);
@@ -1044,7 +1058,8 @@ png_get_tRNS(png_const_structrp png_ptr, png_inforp info_ptr,
png_bytep *trans_alpha, int *num_trans, png_color_16p *trans_color)
{
png_uint_32 retval = 0;
- if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
+ if (png_ptr != NULL && info_ptr != NULL &&
+ (info_ptr->valid & PNG_INFO_tRNS) != 0)
{
png_debug1(1, "in %s retrieval function", "tRNS");
@@ -1121,7 +1136,7 @@ png_get_compression_buffer_size(png_const_structrp png_ptr)
return 0;
# ifdef PNG_WRITE_SUPPORTED
- if (png_ptr->mode & PNG_IS_READ_STRUCT)
+ if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)
# endif
{
# ifdef PNG_SEQUENTIAL_READ_SUPPORTED
@@ -1165,7 +1180,7 @@ png_get_chunk_malloc_max (png_const_structrp png_ptr)
{
return (png_ptr ? png_ptr->user_chunk_malloc_max : 0);
}
-#endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */
+#endif /* SET_USER_LIMITS */
/* These functions were added to libpng 1.4.0 */
#ifdef PNG_IO_STATE_SUPPORTED
@@ -1180,7 +1195,7 @@ png_get_io_chunk_type (png_const_structrp png_ptr)
{
return png_ptr->chunk_name;
}
-#endif /* ?PNG_IO_STATE_SUPPORTED */
+#endif /* IO_STATE */
#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
# ifdef PNG_GET_PALETTE_MAX_SUPPORTED
@@ -1195,4 +1210,4 @@ png_get_palette_max(png_const_structp png_ptr, png_const_infop info_ptr)
# endif
#endif
-#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
+#endif /* READ || WRITE */
diff --git a/source/libs/libpng/libpng-1.6.14/pnginfo.h b/source/libs/libpng/libpng-1.6.15/pnginfo.h
similarity index 99%
rename from source/libs/libpng/libpng-1.6.14/pnginfo.h
rename to source/libs/libpng/libpng-1.6.15/pnginfo.h
index 26bf26502cf2d9fbfe7cdef0db3fbfdea1fdd376..122a90a4111a302ef7d890b183ef3bf17fad0998 100644
--- a/source/libs/libpng/libpng-1.6.14/pnginfo.h
+++ b/source/libs/libpng/libpng-1.6.15/pnginfo.h
@@ -121,7 +121,7 @@ struct png_info_def
int num_text; /* number of comments read or comments to write */
int max_text; /* current size of text array */
png_textp text; /* array of comments read or comments to write */
-#endif /* PNG_TEXT_SUPPORTED */
+#endif /* TEXT */
#ifdef PNG_tIME_SUPPORTED
/* The tIME chunk holds the last time the displayed image data was
diff --git a/source/libs/libpng/libpng-1.6.14/pnglibconf.h b/source/libs/libpng/libpng-1.6.15/pnglibconf.h
similarity index 98%
rename from source/libs/libpng/libpng-1.6.14/pnglibconf.h
rename to source/libs/libpng/libpng-1.6.15/pnglibconf.h
index 2c45d90ae176142005562b13292c05d85f44e739..325ef39bdec6f2b2f7f8a4ff10badf893c6dc854 100644
--- a/source/libs/libpng/libpng-1.6.14/pnglibconf.h
+++ b/source/libs/libpng/libpng-1.6.15/pnglibconf.h
@@ -1,8 +1,8 @@
-/* libpng 1.6.14 STANDARD API DEFINITION */
+/* libpng 1.6.15 STANDARD API DEFINITION */
/* pnglibconf.h - library build configuration */
-/* Libpng version 1.6.14 - October 23, 2014 */
+/* Libpng version 1.6.15 - November 20, 2014 */
/* Copyright (c) 1998-2014 Glenn Randers-Pehrson */
diff --git a/source/libs/libpng/libpng-1.6.14/pngmem.c b/source/libs/libpng/libpng-1.6.15/pngmem.c
similarity index 96%
rename from source/libs/libpng/libpng-1.6.14/pngmem.c
rename to source/libs/libpng/libpng-1.6.15/pngmem.c
index 8ee0866f67aa4ac9458f44e71bfff07bc392b521..d6caf273f1f958f8873680bb838622c53359bcdb 100644
--- a/source/libs/libpng/libpng-1.6.14/pngmem.c
+++ b/source/libs/libpng/libpng-1.6.15/pngmem.c
@@ -1,8 +1,8 @@
/* pngmem.c - stub functions for memory allocation
*
- * Last changed in libpng 1.6.8 [December 19, 2013]
- * Copyright (c) 1998-2013 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.15 [November 20, 2014]
+ * Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -199,7 +199,7 @@ png_malloc_default,(png_const_structrp png_ptr, png_alloc_size_t size),
return ret;
}
-#endif /* PNG_USER_MEM_SUPPORTED */
+#endif /* USER_MEM */
/* This function was added at libpng version 1.2.3. The png_malloc_warn()
* function will issue a png_warning and return NULL instead of issuing a
@@ -244,7 +244,7 @@ png_free_default,(png_const_structrp png_ptr, png_voidp ptr),PNG_DEPRECATED)
{
if (png_ptr == NULL || ptr == NULL)
return;
-#endif /* PNG_USER_MEM_SUPPORTED */
+#endif /* USER_MEM */
free(ptr);
}
@@ -277,5 +277,5 @@ png_get_mem_ptr(png_const_structrp png_ptr)
return png_ptr->mem_ptr;
}
-#endif /* PNG_USER_MEM_SUPPORTED */
-#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
+#endif /* USER_MEM */
+#endif /* READ || WRITE */
diff --git a/source/libs/libpng/libpng-1.6.14/pngnow.png b/source/libs/libpng/libpng-1.6.15/pngnow.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/pngnow.png
rename to source/libs/libpng/libpng-1.6.15/pngnow.png
diff --git a/source/libs/libpng/libpng-1.6.14/pngpread.c b/source/libs/libpng/libpng-1.6.15/pngpread.c
similarity index 96%
rename from source/libs/libpng/libpng-1.6.14/pngpread.c
rename to source/libs/libpng/libpng-1.6.15/pngpread.c
index bcd9261dfda88d37a53003285ae27ab0e5b3bbb2..fb40e7db3b5e0337fa2259c0fcfb1eeab582b491 100644
--- a/source/libs/libpng/libpng-1.6.14/pngpread.c
+++ b/source/libs/libpng/libpng-1.6.15/pngpread.c
@@ -1,7 +1,7 @@
/* pngpread.c - read a png file in push mode
*
- * Last changed in libpng 1.6.14 [October 23, 2014]
+ * Last changed in libpng 1.6.15 [November 20, 2014]
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -202,7 +202,7 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr)
* sure we have enough data in the buffer for the 4-byte CRC at the
* end of every chunk (except IDAT, which is handled separately).
*/
- if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
+ if ((png_ptr->mode & PNG_HAVE_CHUNK_HEADER) == 0)
{
png_byte chunk_length[4];
png_byte chunk_tag[4];
@@ -221,28 +221,28 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr)
if (chunk_name == png_IDAT)
{
- if (png_ptr->mode & PNG_AFTER_IDAT)
+ if ((png_ptr->mode & PNG_AFTER_IDAT) != 0)
png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
/* If we reach an IDAT chunk, this means we have read all of the
* header chunks, and we can start reading the image (or if this
* is called after the image has been read - we have an error).
*/
- if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
png_error(png_ptr, "Missing IHDR before IDAT");
else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
- !(png_ptr->mode & PNG_HAVE_PLTE))
+ (png_ptr->mode & PNG_HAVE_PLTE) == 0)
png_error(png_ptr, "Missing PLTE before IDAT");
png_ptr->mode |= PNG_HAVE_IDAT;
png_ptr->process_mode = PNG_READ_IDAT_MODE;
- if (!(png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
+ if ((png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) == 0)
if (png_ptr->push_length == 0)
return;
- if (png_ptr->mode & PNG_AFTER_IDAT)
+ if ((png_ptr->mode & PNG_AFTER_IDAT) != 0)
png_benign_error(png_ptr, "Too many IDATs found");
}
@@ -449,7 +449,7 @@ png_push_crc_skip(png_structrp png_ptr, png_uint_32 skip)
void /* PRIVATE */
png_push_crc_finish(png_structrp png_ptr)
{
- if (png_ptr->skip_length && png_ptr->save_buffer_size)
+ if (png_ptr->skip_length != 0 && png_ptr->save_buffer_size != 0)
{
png_size_t save_size = png_ptr->save_buffer_size;
png_uint_32 skip_length = png_ptr->skip_length;
@@ -473,7 +473,7 @@ png_push_crc_finish(png_structrp png_ptr)
png_ptr->save_buffer_size -= save_size;
png_ptr->save_buffer_ptr += save_size;
}
- if (png_ptr->skip_length && png_ptr->current_buffer_size)
+ if (png_ptr->skip_length != 0 && png_ptr->current_buffer_size != 0)
{
png_size_t save_size = png_ptr->current_buffer_size;
png_uint_32 skip_length = png_ptr->skip_length;
@@ -494,7 +494,7 @@ png_push_crc_finish(png_structrp png_ptr)
png_ptr->current_buffer_size -= save_size;
png_ptr->current_buffer_ptr += save_size;
}
- if (!png_ptr->skip_length)
+ if (png_ptr->skip_length == 0)
{
PNG_PUSH_SAVE_BUFFER_IF_LT(4)
png_crc_finish(png_ptr, 0);
@@ -511,7 +511,7 @@ png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)
return;
ptr = buffer;
- if (png_ptr->save_buffer_size)
+ if (png_ptr->save_buffer_size != 0)
{
png_size_t save_size;
@@ -528,7 +528,7 @@ png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)
png_ptr->save_buffer_size -= save_size;
png_ptr->save_buffer_ptr += save_size;
}
- if (length && png_ptr->current_buffer_size)
+ if (length != 0 && png_ptr->current_buffer_size != 0)
{
png_size_t save_size;
@@ -548,7 +548,7 @@ png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length)
void /* PRIVATE */
png_push_save_buffer(png_structrp png_ptr)
{
- if (png_ptr->save_buffer_size)
+ if (png_ptr->save_buffer_size != 0)
{
if (png_ptr->save_buffer_ptr != png_ptr->save_buffer)
{
@@ -584,11 +584,13 @@ png_push_save_buffer(png_structrp png_ptr)
if (png_ptr->save_buffer == NULL)
{
png_free(png_ptr, old_buffer);
+ old_buffer = NULL;
png_error(png_ptr, "Insufficient memory for save_buffer");
}
memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size);
png_free(png_ptr, old_buffer);
+ old_buffer = NULL;
png_ptr->save_buffer_max = new_max;
}
if (png_ptr->current_buffer_size)
@@ -615,7 +617,7 @@ png_push_restore_buffer(png_structrp png_ptr, png_bytep buffer,
void /* PRIVATE */
png_push_read_IDAT(png_structrp png_ptr)
{
- if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
+ if ((png_ptr->mode & PNG_HAVE_CHUNK_HEADER) == 0)
{
png_byte chunk_length[4];
png_byte chunk_tag[4];
@@ -633,7 +635,7 @@ png_push_read_IDAT(png_structrp png_ptr)
{
png_ptr->process_mode = PNG_READ_CHUNK_MODE;
- if (!(png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED))
+ if ((png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) == 0)
png_error(png_ptr, "Not enough compressed data");
return;
@@ -642,7 +644,7 @@ png_push_read_IDAT(png_structrp png_ptr)
png_ptr->idat_size = png_ptr->push_length;
}
- if (png_ptr->idat_size && png_ptr->save_buffer_size)
+ if (png_ptr->idat_size != 0 && png_ptr->save_buffer_size != 0)
{
png_size_t save_size = png_ptr->save_buffer_size;
png_uint_32 idat_size = png_ptr->idat_size;
@@ -669,7 +671,7 @@ png_push_read_IDAT(png_structrp png_ptr)
png_ptr->save_buffer_ptr += save_size;
}
- if (png_ptr->idat_size && png_ptr->current_buffer_size)
+ if (png_ptr->idat_size != 0 && png_ptr->current_buffer_size != 0)
{
png_size_t save_size = png_ptr->current_buffer_size;
png_uint_32 idat_size = png_ptr->idat_size;
@@ -694,7 +696,7 @@ png_push_read_IDAT(png_structrp png_ptr)
png_ptr->current_buffer_size -= save_size;
png_ptr->current_buffer_ptr += save_size;
}
- if (!png_ptr->idat_size)
+ if (png_ptr->idat_size == 0)
{
PNG_PUSH_SAVE_BUFFER_IF_LT(4)
png_crc_finish(png_ptr, 0);
@@ -841,7 +843,7 @@ png_push_process_row(png_structrp png_ptr)
memcpy(png_ptr->prev_row, png_ptr->row_buf, row_info.rowbytes + 1);
#ifdef PNG_READ_TRANSFORMS_SUPPORTED
- if (png_ptr->transformations)
+ if (png_ptr->transformations != 0)
png_do_read_transformations(png_ptr, &row_info);
#endif
@@ -859,7 +861,8 @@ png_push_process_row(png_structrp png_ptr)
#ifdef PNG_READ_INTERLACING_SUPPORTED
/* Expand interlaced rows to full size */
- if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
+ if (png_ptr->interlaced != 0 &&
+ (png_ptr->transformations & PNG_INTERLACE) != 0)
{
if (png_ptr->pass < 6)
png_do_read_interlace(&row_info, png_ptr->row_buf + 1, png_ptr->pass,
@@ -1066,7 +1069,7 @@ png_read_push_finish_row(png_structrp png_ptr)
if (png_ptr->row_number < png_ptr->num_rows)
return;
- if (png_ptr->interlaced)
+ if (png_ptr->interlaced != 0)
{
png_ptr->row_number = 0;
memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
@@ -1090,7 +1093,7 @@ png_read_push_finish_row(png_structrp png_ptr)
png_pass_start[png_ptr->pass]) /
png_pass_inc[png_ptr->pass];
- if (png_ptr->transformations & PNG_INTERLACE)
+ if ((png_ptr->transformations & PNG_INTERLACE) != 0)
break;
png_ptr->num_rows = (png_ptr->height +
@@ -1162,4 +1165,4 @@ png_get_progressive_ptr(png_const_structrp png_ptr)
return png_ptr->io_ptr;
}
-#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+#endif /* PROGRESSIVE_READ */
diff --git a/source/libs/libpng/libpng-1.6.14/pngpriv.h b/source/libs/libpng/libpng-1.6.15/pngpriv.h
similarity index 99%
rename from source/libs/libpng/libpng-1.6.14/pngpriv.h
rename to source/libs/libpng/libpng-1.6.15/pngpriv.h
index aa63cfa478099242f149caa486a7004620b3c9d7..cbd66deceaad991b0ff118b576411248b9edd7ee 100644
--- a/source/libs/libpng/libpng-1.6.14/pngpriv.h
+++ b/source/libs/libpng/libpng-1.6.15/pngpriv.h
@@ -172,7 +172,7 @@
*/
# define PNG_ARM_NEON_IMPLEMENTATION 2
# endif /* __ARM_NEON__ */
-# endif /* !defined PNG_ARM_NEON_IMPLEMENTATION */
+# endif /* !PNG_ARM_NEON_IMPLEMENTATION */
# ifndef PNG_ARM_NEON_IMPLEMENTATION
/* Use the intrinsics code by default. */
@@ -855,7 +855,7 @@ PNG_INTERNAL_DATA(const png_byte, png_sRGB_delta, [512]);
/* Given a value 'linear' in the range 0..255*65535 calculate the 8-bit sRGB
* encoded value with maximum error 0.646365. Note that the input is not a
* 16-bit value; it has been multiplied by 255! */
-#endif /* PNG_SIMPLIFIED_READ/WRITE */
+#endif /* SIMPLIFIED_READ/WRITE */
/* Inhibit C++ name-mangling for libpng functions but not for system calls. */
@@ -1229,7 +1229,7 @@ PNG_INTERNAL_FUNCTION(void,png_read_finish_IDAT,(png_structrp png_ptr),
PNG_INTERNAL_FUNCTION(void,png_read_finish_row,(png_structrp png_ptr),
PNG_EMPTY);
/* Finish a row while reading, dealing with interlacing passes, etc. */
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
+#endif /* SEQUENTIAL_READ */
/* Initialize the row buffers, etc. */
PNG_INTERNAL_FUNCTION(void,png_read_start_row,(png_structrp png_ptr),PNG_EMPTY);
@@ -1305,7 +1305,7 @@ PNG_INTERNAL_FUNCTION(void,png_handle_hIST,(png_structrp png_ptr,
#ifdef PNG_READ_iCCP_SUPPORTED
PNG_INTERNAL_FUNCTION(void,png_handle_iCCP,(png_structrp png_ptr,
png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif /* PNG_READ_iCCP_SUPPORTED */
+#endif /* READ_iCCP */
#ifdef PNG_READ_iTXt_SUPPORTED
PNG_INTERNAL_FUNCTION(void,png_handle_iTXt,(png_structrp png_ptr,
@@ -1340,7 +1340,7 @@ PNG_INTERNAL_FUNCTION(void,png_handle_sCAL,(png_structrp png_ptr,
#ifdef PNG_READ_sPLT_SUPPORTED
PNG_INTERNAL_FUNCTION(void,png_handle_sPLT,(png_structrp png_ptr,
png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
-#endif /* PNG_READ_sPLT_SUPPORTED */
+#endif /* READ_sPLT */
#ifdef PNG_READ_sRGB_SUPPORTED
PNG_INTERNAL_FUNCTION(void,png_handle_sRGB,(png_structrp png_ptr,
@@ -1454,7 +1454,7 @@ PNG_INTERNAL_FUNCTION(void,png_push_read_iTXt,(png_structrp png_ptr,
png_inforp info_ptr),PNG_EMPTY);
# endif
-#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+#endif /* PROGRESSIVE_READ */
/* Added at libpng version 1.6.0 */
#ifdef PNG_GAMMA_SUPPORTED
diff --git a/source/libs/libpng/libpng-1.6.14/pngread.c b/source/libs/libpng/libpng-1.6.15/pngread.c
similarity index 95%
rename from source/libs/libpng/libpng-1.6.14/pngread.c
rename to source/libs/libpng/libpng-1.6.15/pngread.c
index 53b9c3b9b37008ae4d0f166bd01bf3d52deba2d9..87a789157bb3cb6758bf0c1a27548750f01757dc 100644
--- a/source/libs/libpng/libpng-1.6.14/pngread.c
+++ b/source/libs/libpng/libpng-1.6.15/pngread.c
@@ -1,7 +1,7 @@
/* pngread.c - read a PNG file
*
- * Last changed in libpng 1.6.11 [June 5, 2014]
+ * Last changed in libpng 1.6.15 [November 20, 2014]
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -44,7 +44,7 @@ png_create_read_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr,
{
png_structp png_ptr = png_create_png_struct(user_png_ver, error_ptr,
error_fn, warn_fn, mem_ptr, malloc_fn, free_fn);
-#endif /* PNG_USER_MEM_SUPPORTED */
+#endif /* USER_MEM */
if (png_ptr != NULL)
{
@@ -113,20 +113,20 @@ png_read_info(png_structrp png_ptr, png_inforp info_ptr)
*/
if (chunk_name == png_IDAT)
{
- if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
png_chunk_error(png_ptr, "Missing IHDR before IDAT");
else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
- !(png_ptr->mode & PNG_HAVE_PLTE))
+ (png_ptr->mode & PNG_HAVE_PLTE) == 0)
png_chunk_error(png_ptr, "Missing PLTE before IDAT");
- else if (png_ptr->mode & PNG_AFTER_IDAT)
+ else if ((png_ptr->mode & PNG_AFTER_IDAT) != 0)
png_chunk_benign_error(png_ptr, "Too many IDATs found");
png_ptr->mode |= PNG_HAVE_IDAT;
}
- else if (png_ptr->mode & PNG_HAVE_IDAT)
+ else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
png_ptr->mode |= PNG_AFTER_IDAT;
/* This should be a binary subdivision search or a hash for
@@ -252,7 +252,7 @@ png_read_info(png_structrp png_ptr, png_inforp info_ptr)
PNG_HANDLE_CHUNK_AS_DEFAULT);
}
}
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
+#endif /* SEQUENTIAL_READ */
/* Optional call to update the users info_ptr structure */
void PNGAPI
@@ -302,7 +302,7 @@ png_start_read_image(png_structrp png_ptr)
"png_start_read_image/png_read_update_info: duplicate call");
}
}
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
+#endif /* SEQUENTIAL_READ */
#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
#ifdef PNG_MNG_FEATURES_SUPPORTED
@@ -315,7 +315,7 @@ png_do_read_intrapixel(png_row_infop row_info, png_bytep row)
png_debug(1, "in png_do_read_intrapixel");
if (
- (row_info->color_type & PNG_COLOR_MASK_COLOR))
+ (row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)
{
int bytes_per_pixel;
png_uint_32 row_width = row_info->width;
@@ -369,7 +369,7 @@ png_do_read_intrapixel(png_row_infop row_info, png_bytep row)
}
}
}
-#endif /* PNG_MNG_FEATURES_SUPPORTED */
+#endif /* MNG_FEATURES */
void PNGAPI
png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row)
@@ -385,7 +385,7 @@ png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row)
/* png_read_start_row sets the information (in particular iwidth) for this
* interlace pass.
*/
- if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
+ if ((png_ptr->flags & PNG_FLAG_ROW_INIT) == 0)
png_read_start_row(png_ptr);
/* 1.5.6: row_info moved out of png_struct to a local here. */
@@ -401,42 +401,42 @@ png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row)
{
/* Check for transforms that have been set but were defined out */
#if defined(PNG_WRITE_INVERT_SUPPORTED) && !defined(PNG_READ_INVERT_SUPPORTED)
- if (png_ptr->transformations & PNG_INVERT_MONO)
+ if ((png_ptr->transformations & PNG_INVERT_MONO) != 0)
png_warning(png_ptr, "PNG_READ_INVERT_SUPPORTED is not defined");
#endif
#if defined(PNG_WRITE_FILLER_SUPPORTED) && !defined(PNG_READ_FILLER_SUPPORTED)
- if (png_ptr->transformations & PNG_FILLER)
+ if ((png_ptr->transformations & PNG_FILLER) != 0)
png_warning(png_ptr, "PNG_READ_FILLER_SUPPORTED is not defined");
#endif
#if defined(PNG_WRITE_PACKSWAP_SUPPORTED) && \
!defined(PNG_READ_PACKSWAP_SUPPORTED)
- if (png_ptr->transformations & PNG_PACKSWAP)
+ if ((png_ptr->transformations & PNG_PACKSWAP) != 0)
png_warning(png_ptr, "PNG_READ_PACKSWAP_SUPPORTED is not defined");
#endif
#if defined(PNG_WRITE_PACK_SUPPORTED) && !defined(PNG_READ_PACK_SUPPORTED)
- if (png_ptr->transformations & PNG_PACK)
+ if ((png_ptr->transformations & PNG_PACK) != 0)
png_warning(png_ptr, "PNG_READ_PACK_SUPPORTED is not defined");
#endif
#if defined(PNG_WRITE_SHIFT_SUPPORTED) && !defined(PNG_READ_SHIFT_SUPPORTED)
- if (png_ptr->transformations & PNG_SHIFT)
+ if ((png_ptr->transformations & PNG_SHIFT) != 0)
png_warning(png_ptr, "PNG_READ_SHIFT_SUPPORTED is not defined");
#endif
#if defined(PNG_WRITE_BGR_SUPPORTED) && !defined(PNG_READ_BGR_SUPPORTED)
- if (png_ptr->transformations & PNG_BGR)
+ if ((png_ptr->transformations & PNG_BGR) != 0)
png_warning(png_ptr, "PNG_READ_BGR_SUPPORTED is not defined");
#endif
#if defined(PNG_WRITE_SWAP_SUPPORTED) && !defined(PNG_READ_SWAP_SUPPORTED)
- if (png_ptr->transformations & PNG_SWAP_BYTES)
+ if ((png_ptr->transformations & PNG_SWAP_BYTES) != 0)
png_warning(png_ptr, "PNG_READ_SWAP_SUPPORTED is not defined");
#endif
}
-#endif /* PNG_WARNINGS_SUPPORTED */
+#endif /* WARNINGS */
#ifdef PNG_READ_INTERLACING_SUPPORTED
/* If interlaced and we do not need a new row, combine row and return.
@@ -445,7 +445,8 @@ png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row)
* untransformed) and, because of the libpng API for interlaced images, this
* means we must transform before de-interlacing.
*/
- if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
+ if (png_ptr->interlaced != 0 &&
+ (png_ptr->transformations & PNG_INTERLACE) != 0)
{
switch (png_ptr->pass)
{
@@ -516,7 +517,7 @@ png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row)
default:
case 6:
- if (!(png_ptr->row_number & 1))
+ if ((png_ptr->row_number & 1) == 0)
{
png_read_finish_row(png_ptr);
return;
@@ -526,7 +527,7 @@ png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row)
}
#endif
- if (!(png_ptr->mode & PNG_HAVE_IDAT))
+ if ((png_ptr->mode & PNG_HAVE_IDAT) == 0)
png_error(png_ptr, "Invalid attempt to read row data");
/* Fill the row with IDAT data: */
@@ -549,7 +550,7 @@ png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row)
memcpy(png_ptr->prev_row, png_ptr->row_buf, row_info.rowbytes + 1);
#ifdef PNG_MNG_FEATURES_SUPPORTED
- if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+ if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 &&
(png_ptr->filter_type == PNG_INTRAPIXEL_DIFFERENCING))
{
/* Intrapixel differencing */
@@ -575,8 +576,8 @@ png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row)
#ifdef PNG_READ_INTERLACING_SUPPORTED
/* Expand interlaced rows to full size */
- if (png_ptr->interlaced &&
- (png_ptr->transformations & PNG_INTERLACE))
+ if (png_ptr->interlaced != 0 &&
+ (png_ptr->transformations & PNG_INTERLACE) != 0)
{
if (png_ptr->pass < 6)
png_do_read_interlace(&row_info, png_ptr->row_buf + 1, png_ptr->pass,
@@ -604,7 +605,7 @@ png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row)
(*(png_ptr->read_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass);
}
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
+#endif /* SEQUENTIAL_READ */
#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
/* Read one or more rows of image data. If the image is interlaced,
@@ -671,7 +672,7 @@ png_read_rows(png_structrp png_ptr, png_bytepp row,
dp++;
}
}
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
+#endif /* SEQUENTIAL_READ */
#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
/* Read the entire image. If the image has an alpha channel or a tRNS
@@ -699,7 +700,7 @@ png_read_image(png_structrp png_ptr, png_bytepp image)
return;
#ifdef PNG_READ_INTERLACING_SUPPORTED
- if (!(png_ptr->flags & PNG_FLAG_ROW_INIT))
+ if ((png_ptr->flags & PNG_FLAG_ROW_INIT) == 0)
{
pass = png_set_interlace_handling(png_ptr);
/* And make sure transforms are initialized. */
@@ -707,7 +708,8 @@ png_read_image(png_structrp png_ptr, png_bytepp image)
}
else
{
- if (png_ptr->interlaced && !(png_ptr->transformations & PNG_INTERLACE))
+ if (png_ptr->interlaced != 0 &&
+ (png_ptr->transformations & PNG_INTERLACE) == 0)
{
/* Caller called png_start_read_image or png_read_update_info without
* first turning on the PNG_INTERLACE transform. We can fix this here,
@@ -744,7 +746,7 @@ png_read_image(png_structrp png_ptr, png_bytepp image)
}
}
}
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
+#endif /* SEQUENTIAL_READ */
#ifdef PNG_SEQUENTIAL_READ_SUPPORTED
/* Read the end of the PNG file. Will not read past the end of the
@@ -767,7 +769,7 @@ png_read_end(png_structrp png_ptr, png_inforp info_ptr)
* still be pending IDAT data and an owned zstream. Deal with this here.
*/
#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
- if (!png_chunk_unknown_handling(png_ptr, png_IDAT))
+ if (png_chunk_unknown_handling(png_ptr, png_IDAT) == 0)
#endif
png_read_finish_IDAT(png_ptr);
@@ -797,7 +799,8 @@ png_read_end(png_structrp png_ptr, png_inforp info_ptr)
{
if (chunk_name == png_IDAT)
{
- if ((length > 0) || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
+ if ((length > 0) ||
+ (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) != 0)
png_benign_error(png_ptr, "Too many IDATs found");
}
png_handle_unknown(png_ptr, info_ptr, length, keep);
@@ -811,7 +814,8 @@ png_read_end(png_structrp png_ptr, png_inforp info_ptr)
/* Zero length IDATs are legal after the last IDAT has been
* read, but not after other chunks have been read.
*/
- if ((length > 0) || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT))
+ if ((length > 0) ||
+ (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) != 0)
png_benign_error(png_ptr, "Too many IDATs found");
png_crc_finish(png_ptr, length);
@@ -907,9 +911,9 @@ png_read_end(png_structrp png_ptr, png_inforp info_ptr)
else
png_handle_unknown(png_ptr, info_ptr, length,
PNG_HANDLE_CHUNK_AS_DEFAULT);
- } while (!(png_ptr->mode & PNG_HAVE_IEND));
+ } while ((png_ptr->mode & PNG_HAVE_IEND) == 0);
}
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
+#endif /* SEQUENTIAL_READ */
/* Free all memory used in the read struct */
static void
@@ -922,22 +926,33 @@ png_read_destroy(png_structrp png_ptr)
#endif
png_free(png_ptr, png_ptr->big_row_buf);
+ png_ptr->big_row_buf = NULL;
png_free(png_ptr, png_ptr->big_prev_row);
+ png_ptr->big_prev_row = NULL;
png_free(png_ptr, png_ptr->read_buffer);
+ png_ptr->read_buffer = NULL;
#ifdef PNG_READ_QUANTIZE_SUPPORTED
png_free(png_ptr, png_ptr->palette_lookup);
+ png_ptr->palette_lookup = NULL;
png_free(png_ptr, png_ptr->quantize_index);
+ png_ptr->quantize_index = NULL;
#endif
- if (png_ptr->free_me & PNG_FREE_PLTE)
+ if ((png_ptr->free_me & PNG_FREE_PLTE) != 0)
+ {
png_zfree(png_ptr, png_ptr->palette);
+ png_ptr->palette = NULL;
+ }
png_ptr->free_me &= ~PNG_FREE_PLTE;
#if defined(PNG_tRNS_SUPPORTED) || \
defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED)
- if (png_ptr->free_me & PNG_FREE_TRNS)
+ if ((png_ptr->free_me & PNG_FREE_TRNS) != 0)
+ {
png_free(png_ptr, png_ptr->trans_alpha);
+ png_ptr->trans_alpha = NULL;
+ }
png_ptr->free_me &= ~PNG_FREE_TRNS;
#endif
@@ -945,15 +960,18 @@ png_read_destroy(png_structrp png_ptr)
#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
png_free(png_ptr, png_ptr->save_buffer);
+ png_ptr->save_buffer = NULL;
#endif
#if defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED) && \
defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
png_free(png_ptr, png_ptr->unknown_chunk.data);
+ png_ptr->unknown_chunk.data = NULL;
#endif
#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
png_free(png_ptr, png_ptr->chunk_list);
+ png_ptr->chunk_list = NULL;
#endif
/* NOTE: the 'setjmp' buffer may still be allocated and the memory and error
@@ -1025,7 +1043,7 @@ png_read_png(png_structrp png_ptr, png_inforp info_ptr,
/* Tell libpng to strip 16-bit/color files down to 8 bits per color.
*/
- if (transforms & PNG_TRANSFORM_SCALE_16)
+ if ((transforms & PNG_TRANSFORM_SCALE_16) != 0)
/* Added at libpng-1.5.4. "strip_16" produces the same result that it
* did in earlier versions, while "scale_16" is now more accurate.
*/
@@ -1039,7 +1057,7 @@ png_read_png(png_structrp png_ptr, png_inforp info_ptr,
* latter by doing SCALE first. This is ok and allows apps not to check for
* which is supported to get the right answer.
*/
- if (transforms & PNG_TRANSFORM_STRIP_16)
+ if ((transforms & PNG_TRANSFORM_STRIP_16) != 0)
#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
png_set_strip_16(png_ptr);
#else
@@ -1049,7 +1067,7 @@ png_read_png(png_structrp png_ptr, png_inforp info_ptr,
/* Strip alpha bytes from the input data without combining with
* the background (not recommended).
*/
- if (transforms & PNG_TRANSFORM_STRIP_ALPHA)
+ if ((transforms & PNG_TRANSFORM_STRIP_ALPHA) != 0)
#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
png_set_strip_alpha(png_ptr);
#else
@@ -1059,7 +1077,7 @@ png_read_png(png_structrp png_ptr, png_inforp info_ptr,
/* Extract multiple pixels with bit depths of 1, 2, or 4 from a single
* byte into separate bytes (useful for paletted and grayscale images).
*/
- if (transforms & PNG_TRANSFORM_PACKING)
+ if ((transforms & PNG_TRANSFORM_PACKING) != 0)
#ifdef PNG_READ_PACK_SUPPORTED
png_set_packing(png_ptr);
#else
@@ -1069,7 +1087,7 @@ png_read_png(png_structrp png_ptr, png_inforp info_ptr,
/* Change the order of packed pixels to least significant bit first
* (not useful if you are using png_set_packing).
*/
- if (transforms & PNG_TRANSFORM_PACKSWAP)
+ if ((transforms & PNG_TRANSFORM_PACKSWAP) != 0)
#ifdef PNG_READ_PACKSWAP_SUPPORTED
png_set_packswap(png_ptr);
#else
@@ -1081,7 +1099,7 @@ png_read_png(png_structrp png_ptr, png_inforp info_ptr,
* Expand paletted or RGB images with transparency to full alpha
* channels so the data will be available as RGBA quartets.
*/
- if (transforms & PNG_TRANSFORM_EXPAND)
+ if ((transforms & PNG_TRANSFORM_EXPAND) != 0)
#ifdef PNG_READ_EXPAND_SUPPORTED
png_set_expand(png_ptr);
#else
@@ -1093,7 +1111,7 @@ png_read_png(png_structrp png_ptr, png_inforp info_ptr,
/* Invert monochrome files to have 0 as white and 1 as black
*/
- if (transforms & PNG_TRANSFORM_INVERT_MONO)
+ if ((transforms & PNG_TRANSFORM_INVERT_MONO) != 0)
#ifdef PNG_READ_INVERT_SUPPORTED
png_set_invert_mono(png_ptr);
#else
@@ -1104,16 +1122,16 @@ png_read_png(png_structrp png_ptr, png_inforp info_ptr,
* [0,65535] to the original [0,7] or [0,31], or whatever range the
* colors were originally in:
*/
- if (transforms & PNG_TRANSFORM_SHIFT)
+ if ((transforms & PNG_TRANSFORM_SHIFT) != 0)
#ifdef PNG_READ_SHIFT_SUPPORTED
- if (info_ptr->valid & PNG_INFO_sBIT)
+ if ((info_ptr->valid & PNG_INFO_sBIT) != 0)
png_set_shift(png_ptr, &info_ptr->sig_bit);
#else
png_app_error(png_ptr, "PNG_TRANSFORM_SHIFT not supported");
#endif
/* Flip the RGB pixels to BGR (or RGBA to BGRA) */
- if (transforms & PNG_TRANSFORM_BGR)
+ if ((transforms & PNG_TRANSFORM_BGR) != 0)
#ifdef PNG_READ_BGR_SUPPORTED
png_set_bgr(png_ptr);
#else
@@ -1121,7 +1139,7 @@ png_read_png(png_structrp png_ptr, png_inforp info_ptr,
#endif
/* Swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR) */
- if (transforms & PNG_TRANSFORM_SWAP_ALPHA)
+ if ((transforms & PNG_TRANSFORM_SWAP_ALPHA) != 0)
#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
png_set_swap_alpha(png_ptr);
#else
@@ -1129,7 +1147,7 @@ png_read_png(png_structrp png_ptr, png_inforp info_ptr,
#endif
/* Swap bytes of 16-bit files to least significant byte first */
- if (transforms & PNG_TRANSFORM_SWAP_ENDIAN)
+ if ((transforms & PNG_TRANSFORM_SWAP_ENDIAN) != 0)
#ifdef PNG_READ_SWAP_SUPPORTED
png_set_swap(png_ptr);
#else
@@ -1138,7 +1156,7 @@ png_read_png(png_structrp png_ptr, png_inforp info_ptr,
/* Added at libpng-1.2.41 */
/* Invert the alpha channel from opacity to transparency */
- if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
+ if ((transforms & PNG_TRANSFORM_INVERT_ALPHA) != 0)
#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
png_set_invert_alpha(png_ptr);
#else
@@ -1147,7 +1165,7 @@ png_read_png(png_structrp png_ptr, png_inforp info_ptr,
/* Added at libpng-1.2.41 */
/* Expand grayscale image to RGB */
- if (transforms & PNG_TRANSFORM_GRAY_TO_RGB)
+ if ((transforms & PNG_TRANSFORM_GRAY_TO_RGB) != 0)
#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
png_set_gray_to_rgb(png_ptr);
#else
@@ -1155,7 +1173,7 @@ png_read_png(png_structrp png_ptr, png_inforp info_ptr,
#endif
/* Added at libpng-1.5.4 */
- if (transforms & PNG_TRANSFORM_EXPAND_16)
+ if ((transforms & PNG_TRANSFORM_EXPAND_16) != 0)
#ifdef PNG_READ_EXPAND_16_SUPPORTED
png_set_expand_16(png_ptr);
#else
@@ -1203,8 +1221,8 @@ png_read_png(png_structrp png_ptr, png_inforp info_ptr,
PNG_UNUSED(params)
}
-#endif /* PNG_INFO_IMAGE_SUPPORTED */
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
+#endif /* INFO_IMAGE */
+#endif /* SEQUENTIAL_READ */
#ifdef PNG_SIMPLIFIED_READ_SUPPORTED
/* SIMPLIFIED READ
@@ -1313,10 +1331,10 @@ png_image_format(png_structrp png_ptr)
{
png_uint_32 format = 0;
- if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
+ if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
format |= PNG_FORMAT_FLAG_COLOR;
- if (png_ptr->color_type & PNG_COLOR_MASK_ALPHA)
+ if ((png_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0)
format |= PNG_FORMAT_FLAG_ALPHA;
/* Use png_ptr here, not info_ptr, because by examination png_handle_tRNS
@@ -1330,7 +1348,7 @@ png_image_format(png_structrp png_ptr)
if (png_ptr->bit_depth == 16)
format |= PNG_FORMAT_FLAG_LINEAR;
- if (png_ptr->color_type & PNG_COLOR_MASK_PALETTE)
+ if ((png_ptr->color_type & PNG_COLOR_MASK_PALETTE) != 0)
format |= PNG_FORMAT_FLAG_COLORMAP;
return format;
@@ -1430,7 +1448,7 @@ png_image_begin_read_from_stdio(png_imagep image, FILE* file)
{
if (file != NULL)
{
- if (png_image_read_init(image))
+ if (png_image_read_init(image) != 0)
{
/* This is slightly evil, but png_init_io doesn't do anything other
* than this and we haven't changed the standard IO functions so
@@ -1464,7 +1482,7 @@ png_image_begin_read_from_file(png_imagep image, const char *file_name)
if (fp != NULL)
{
- if (png_image_read_init(image))
+ if (png_image_read_init(image) != 0)
{
image->opaque->png_ptr->io_ptr = fp;
image->opaque->owned_file = 1;
@@ -1490,7 +1508,7 @@ png_image_begin_read_from_file(png_imagep image, const char *file_name)
return 0;
}
-#endif /* PNG_STDIO_SUPPORTED */
+#endif /* STDIO */
static void PNGCBAPI
png_image_memory_read(png_structp png_ptr, png_bytep out, png_size_t need)
@@ -1529,7 +1547,7 @@ int PNGAPI png_image_begin_read_from_memory(png_imagep image,
{
if (memory != NULL && size > 0)
{
- if (png_image_read_init(image))
+ if (png_image_read_init(image) != 0)
{
/* Now set the IO functions to read from the memory buffer and
* store it into io_ptr. Again do this in-place to avoid calling a
@@ -1601,14 +1619,14 @@ png_image_skip_unused_chunks(png_structrp png_ptr)
/* But do not ignore image data handling chunks */
png_set_keep_unknown_chunks(png_ptr, PNG_HANDLE_CHUNK_AS_DEFAULT,
- chunks_to_process, (sizeof chunks_to_process)/5);
+ chunks_to_process, (int)/*SAFE*/(sizeof chunks_to_process)/5);
}
}
# define PNG_SKIP_CHUNKS(p) png_image_skip_unused_chunks(p)
#else
# define PNG_SKIP_CHUNKS(p) ((void)0)
-#endif /* PNG_HANDLE_AS_UNKNOWN_SUPPORTED */
+#endif /* HANDLE_AS_UNKNOWN */
/* The following macro gives the exact rounded answer for all values in the
* range 0..255 (it actually divides by 51.2, but the rounding still generates
@@ -1621,9 +1639,9 @@ static void
set_file_encoding(png_image_read_control *display)
{
png_fixed_point g = display->image->opaque->png_ptr->colorspace.gamma;
- if (png_gamma_significant(g))
+ if (png_gamma_significant(g) != 0)
{
- if (png_gamma_not_sRGB(g))
+ if (png_gamma_not_sRGB(g) != 0)
{
display->file_encoding = P_FILE;
display->gamma_to_linear = png_reciprocal(g);
@@ -1718,7 +1736,7 @@ png_create_colormap_entry(png_image_read_control *display,
png_uint_32 alpha, int encoding)
{
png_imagep image = display->image;
- const int output_encoding = (image->format & PNG_FORMAT_FLAG_LINEAR) ?
+ const int output_encoding = (image->format & PNG_FORMAT_FLAG_LINEAR) != 0 ?
P_LINEAR : P_sRGB;
const int convert_to_Y = (image->format & PNG_FORMAT_FLAG_COLOR) == 0 &&
(red != green || green != blue);
@@ -1748,7 +1766,7 @@ png_create_colormap_entry(png_image_read_control *display,
green = png_gamma_16bit_correct(green*257, g);
blue = png_gamma_16bit_correct(blue*257, g);
- if (convert_to_Y || output_encoding == P_LINEAR)
+ if (convert_to_Y != 0 || output_encoding == P_LINEAR)
{
alpha *= 257;
encoding = P_LINEAR;
@@ -1775,7 +1793,8 @@ png_create_colormap_entry(png_image_read_control *display,
encoding = P_LINEAR;
}
- else if (encoding == P_sRGB && (convert_to_Y || output_encoding == P_LINEAR))
+ else if (encoding == P_sRGB &&
+ (convert_to_Y != 0 || output_encoding == P_LINEAR))
{
/* The values are 8-bit sRGB values, but must be converted to 16-bit
* linear.
@@ -1833,7 +1852,7 @@ png_create_colormap_entry(png_image_read_control *display,
# define afirst 0
# endif
# ifdef PNG_FORMAT_BGR_SUPPORTED
- const int bgr = (image->format & PNG_FORMAT_FLAG_BGR) ? 2 : 0;
+ const int bgr = (image->format & PNG_FORMAT_FLAG_BGR) != 0 ? 2 : 0;
# else
# define bgr 0
# endif
@@ -2045,7 +2064,7 @@ png_image_read_colormap(png_voidp argument)
const png_structrp png_ptr = image->opaque->png_ptr;
const png_uint_32 output_format = image->format;
- const int output_encoding = (output_format & PNG_FORMAT_FLAG_LINEAR) ?
+ const int output_encoding = (output_format & PNG_FORMAT_FLAG_LINEAR) != 0 ?
P_LINEAR : P_sRGB;
unsigned int cmap_entries;
@@ -2084,7 +2103,7 @@ png_image_read_colormap(png_voidp argument)
else
{
back_g = display->background->green;
- if (output_format & PNG_FORMAT_FLAG_COLOR)
+ if ((output_format & PNG_FORMAT_FLAG_COLOR) != 0)
{
back_r = display->background->red;
back_b = display->background->blue;
@@ -2226,7 +2245,7 @@ png_image_read_colormap(png_voidp argument)
{
unsigned int back_alpha;
- if (output_format & PNG_FORMAT_FLAG_ALPHA)
+ if ((output_format & PNG_FORMAT_FLAG_ALPHA) != 0)
back_alpha = 0;
else
@@ -2307,7 +2326,7 @@ png_image_read_colormap(png_voidp argument)
*/
data_encoding = P_sRGB;
- if (output_format & PNG_FORMAT_FLAG_ALPHA)
+ if ((output_format & PNG_FORMAT_FLAG_ALPHA) != 0)
{
if (PNG_GA_COLORMAP_ENTRIES > image->colormap_entries)
png_error(png_ptr, "gray+alpha color-map: too few entries");
@@ -2502,7 +2521,7 @@ png_image_read_colormap(png_voidp argument)
*/
if ((png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
png_ptr->num_trans > 0) &&
- png_gamma_not_sRGB(png_ptr->colorspace.gamma))
+ png_gamma_not_sRGB(png_ptr->colorspace.gamma) != 0)
{
cmap_entries = make_gray_file_colormap(display);
data_encoding = P_FILE;
@@ -2590,7 +2609,7 @@ png_image_read_colormap(png_voidp argument)
/* Is there alpha in the output too? If so all four channels are
* processed into a special RGB cube with alpha support.
*/
- if (output_format & PNG_FORMAT_FLAG_ALPHA)
+ if ((output_format & PNG_FORMAT_FLAG_ALPHA) != 0)
{
png_uint_32 r;
@@ -2764,7 +2783,7 @@ png_image_read_colormap(png_voidp argument)
for (i=0; i < cmap_entries; ++i)
{
- if (do_background && i < num_trans && trans[i] < 255)
+ if (do_background != 0 && i < num_trans && trans[i] < 255)
{
if (trans[i] == 0)
png_create_colormap_entry(display, i, back_r, back_g,
@@ -2809,8 +2828,8 @@ png_image_read_colormap(png_voidp argument)
}
/* Now deal with the output processing */
- if (expand_tRNS && png_ptr->num_trans > 0 &&
- (png_ptr->color_type & PNG_COLOR_MASK_ALPHA) == 0)
+ if (expand_tRNS != 0 && png_ptr->num_trans > 0 &&
+ (png_ptr->color_type & PNG_COLOR_MASK_ALPHA) == 0)
png_set_tRNS_to_alpha(png_ptr);
switch (data_encoding)
@@ -3226,7 +3245,8 @@ png_image_read_composite(png_voidp argument)
png_uint_32 height = image->height;
png_uint_32 width = image->width;
ptrdiff_t step_row = display->row_bytes;
- unsigned int channels = (image->format & PNG_FORMAT_FLAG_COLOR) ? 3 : 1;
+ unsigned int channels =
+ (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ? 3 : 1;
int pass;
for (pass = 0; pass < passes; ++pass)
@@ -3524,7 +3544,8 @@ png_image_read_background(png_voidp argument)
int swap_alpha = 0;
# ifdef PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED
- if (preserve_alpha && (image->format & PNG_FORMAT_FLAG_AFIRST))
+ if (preserve_alpha != 0 &&
+ (image->format & PNG_FORMAT_FLAG_AFIRST) != 0)
swap_alpha = 1;
# endif
@@ -3633,10 +3654,10 @@ png_image_read_direct(png_voidp argument)
int mode; /* alpha mode */
/* Do this first so that we have a record if rgb to gray is happening. */
- if (change & PNG_FORMAT_FLAG_COLOR)
+ if ((change & PNG_FORMAT_FLAG_COLOR) != 0)
{
/* gray<->color transformation required. */
- if (format & PNG_FORMAT_FLAG_COLOR)
+ if ((format & PNG_FORMAT_FLAG_COLOR) != 0)
png_set_gray_to_rgb(png_ptr);
else
@@ -3654,7 +3675,7 @@ png_image_read_direct(png_voidp argument)
* enormous change) 'do_local_background' is used to indicate that
* the problem exists.
*/
- if (base_format & PNG_FORMAT_FLAG_ALPHA)
+ if ((base_format & PNG_FORMAT_FLAG_ALPHA) != 0)
do_local_background = 1/*maybe*/;
png_set_rgb_to_gray_fixed(png_ptr, PNG_ERROR_ACTION_NONE,
@@ -3669,8 +3690,8 @@ png_image_read_direct(png_voidp argument)
{
png_fixed_point input_gamma_default;
- if ((base_format & PNG_FORMAT_FLAG_LINEAR) &&
- (image->flags & PNG_IMAGE_FLAG_16BIT_sRGB) == 0)
+ if ((base_format & PNG_FORMAT_FLAG_LINEAR) != 0 &&
+ (image->flags & PNG_IMAGE_FLAG_16BIT_sRGB) == 0)
input_gamma_default = PNG_GAMMA_LINEAR;
else
input_gamma_default = PNG_DEFAULT_sRGB;
@@ -3686,7 +3707,7 @@ png_image_read_direct(png_voidp argument)
/* If there *is* an alpha channel in the input it must be multiplied
* out; use PNG_ALPHA_STANDARD, otherwise just use PNG_ALPHA_PNG.
*/
- if (base_format & PNG_FORMAT_FLAG_ALPHA)
+ if ((base_format & PNG_FORMAT_FLAG_ALPHA) != 0)
mode = PNG_ALPHA_STANDARD; /* associated alpha */
else
@@ -3717,7 +3738,7 @@ png_image_read_direct(png_voidp argument)
* final value.
*/
if (png_muldiv(>est, output_gamma, png_ptr->colorspace.gamma,
- PNG_FP_1) && !png_gamma_significant(gtest))
+ PNG_FP_1) != 0 && png_gamma_significant(gtest) == 0)
do_local_background = 0;
else if (mode == PNG_ALPHA_STANDARD)
@@ -3730,9 +3751,9 @@ png_image_read_direct(png_voidp argument)
}
/* If the bit-depth changes then handle that here. */
- if (change & PNG_FORMAT_FLAG_LINEAR)
+ if ((change & PNG_FORMAT_FLAG_LINEAR) != 0)
{
- if (linear /*16-bit output*/)
+ if (linear != 0 /*16-bit output*/)
png_set_expand_16(png_ptr);
else /* 8-bit output */
@@ -3742,13 +3763,13 @@ png_image_read_direct(png_voidp argument)
}
/* Now the background/alpha channel changes. */
- if (change & PNG_FORMAT_FLAG_ALPHA)
+ if ((change & PNG_FORMAT_FLAG_ALPHA) != 0)
{
/* Removing an alpha channel requires composition for the 8-bit
* formats; for the 16-bit it is already done, above, by the
* pre-multiplication and the channel just needs to be stripped.
*/
- if (base_format & PNG_FORMAT_FLAG_ALPHA)
+ if ((base_format & PNG_FORMAT_FLAG_ALPHA) != 0)
{
/* If RGB->gray is happening the alpha channel must be left and the
* operation completed locally.
@@ -3813,7 +3834,7 @@ png_image_read_direct(png_voidp argument)
filler = 255;
# ifdef PNG_FORMAT_AFIRST_SUPPORTED
- if (format & PNG_FORMAT_FLAG_AFIRST)
+ if ((format & PNG_FORMAT_FLAG_AFIRST) != 0)
{
where = PNG_FILLER_BEFORE;
change &= ~PNG_FORMAT_FLAG_AFIRST;
@@ -3837,12 +3858,12 @@ png_image_read_direct(png_voidp argument)
png_set_alpha_mode_fixed(png_ptr, mode, output_gamma);
# ifdef PNG_FORMAT_BGR_SUPPORTED
- if (change & PNG_FORMAT_FLAG_BGR)
+ if ((change & PNG_FORMAT_FLAG_BGR) != 0)
{
/* Check only the output format; PNG is never BGR; don't do this if
* the output is gray, but fix up the 'format' value in that case.
*/
- if (format & PNG_FORMAT_FLAG_COLOR)
+ if ((format & PNG_FORMAT_FLAG_COLOR) != 0)
png_set_bgr(png_ptr);
else
@@ -3853,14 +3874,14 @@ png_image_read_direct(png_voidp argument)
# endif
# ifdef PNG_FORMAT_AFIRST_SUPPORTED
- if (change & PNG_FORMAT_FLAG_AFIRST)
+ if ((change & PNG_FORMAT_FLAG_AFIRST) != 0)
{
/* Only relevant if there is an alpha channel - it's particularly
* important to handle this correctly because do_local_compose may
* be set above and then libpng will keep the alpha channel for this
* code to remove.
*/
- if (format & PNG_FORMAT_FLAG_ALPHA)
+ if ((format & PNG_FORMAT_FLAG_ALPHA) != 0)
{
/* Disable this if doing a local background,
* TODO: remove this when local background is no longer required.
@@ -3883,7 +3904,7 @@ png_image_read_direct(png_voidp argument)
{
PNG_CONST png_uint_16 le = 0x0001;
- if (*(png_const_bytep)&le)
+ if ((*(png_const_bytep) & le) != 0)
png_set_swap(png_ptr);
}
@@ -3908,10 +3929,10 @@ png_image_read_direct(png_voidp argument)
{
png_uint_32 info_format = 0;
- if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
+ if ((info_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
info_format |= PNG_FORMAT_FLAG_COLOR;
- if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
+ if ((info_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0)
{
/* do_local_compose removes this channel below. */
if (do_local_compose == 0)
@@ -3930,14 +3951,14 @@ png_image_read_direct(png_voidp argument)
info_format |= PNG_FORMAT_FLAG_LINEAR;
# ifdef PNG_FORMAT_BGR_SUPPORTED
- if (png_ptr->transformations & PNG_BGR)
+ if ((png_ptr->transformations & PNG_BGR) != 0)
info_format |= PNG_FORMAT_FLAG_BGR;
# endif
# ifdef PNG_FORMAT_AFIRST_SUPPORTED
if (do_local_background == 2)
{
- if (format & PNG_FORMAT_FLAG_AFIRST)
+ if ((format & PNG_FORMAT_FLAG_AFIRST) != 0)
info_format |= PNG_FORMAT_FLAG_AFIRST;
}
@@ -4066,7 +4087,7 @@ png_image_finish_read(png_imagep image, png_const_colorp background,
/* Choose the correct 'end' routine; for the color-map case all the
* setup has already been done.
*/
- if (image->format & PNG_FORMAT_FLAG_COLORMAP)
+ if ((image->format & PNG_FORMAT_FLAG_COLORMAP) != 0)
result =
png_safe_execute(image, png_image_read_colormap, &display) &&
png_safe_execute(image, png_image_read_colormapped, &display);
@@ -4096,5 +4117,5 @@ png_image_finish_read(png_imagep image, png_const_colorp background,
return 0;
}
-#endif /* PNG_SIMPLIFIED_READ_SUPPORTED */
-#endif /* PNG_READ_SUPPORTED */
+#endif /* SIMPLIFIED_READ */
+#endif /* READ */
diff --git a/source/libs/libpng/libpng-1.6.14/pngrio.c b/source/libs/libpng/libpng-1.6.15/pngrio.c
similarity index 97%
rename from source/libs/libpng/libpng-1.6.14/pngrio.c
rename to source/libs/libpng/libpng-1.6.15/pngrio.c
index d75ac5b4dd577f781e1d9219e6cfd036fb41dc8f..1e98395fd7e04a6c750ed4f0b9d29402ca01e352 100644
--- a/source/libs/libpng/libpng-1.6.14/pngrio.c
+++ b/source/libs/libpng/libpng-1.6.15/pngrio.c
@@ -1,7 +1,7 @@
/* pngrio.c - functions for data input
*
- * Last changed in libpng 1.6.9 [February 6, 2014]
+ * Last changed in libpng 1.6.15 [November 20, 2014]
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -117,4 +117,4 @@ png_set_read_fn(png_structrp png_ptr, png_voidp io_ptr,
png_ptr->output_flush_fn = NULL;
#endif
}
-#endif /* PNG_READ_SUPPORTED */
+#endif /* READ */
diff --git a/source/libs/libpng/libpng-1.6.14/pngrtran.c b/source/libs/libpng/libpng-1.6.15/pngrtran.c
similarity index 94%
rename from source/libs/libpng/libpng-1.6.14/pngrtran.c
rename to source/libs/libpng/libpng-1.6.15/pngrtran.c
index 91e6471616749d9928ddeee47968b81dad7d7f46..e6fe9fdbfb6c0fe29711b550a0f3fe771ab33d2e 100644
--- a/source/libs/libpng/libpng-1.6.14/pngrtran.c
+++ b/source/libs/libpng/libpng-1.6.15/pngrtran.c
@@ -1,7 +1,7 @@
/* pngrtran.c - transforms the data in a row for PNG readers
*
- * Last changed in libpng 1.6.11 [June 5, 2014]
+ * Last changed in libpng 1.6.15 [November 20, 2014]
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -91,14 +91,15 @@ png_set_crc_action(png_structrp png_ptr, int crit_action, int ancil_action)
#ifdef PNG_READ_TRANSFORMS_SUPPORTED
/* Is it OK to set a transformation now? Only if png_start_read_image or
* png_read_update_info have not been called. It is not necessary for the IHDR
- * to have been read in all cases, the parameter allows for this check too.
+ * to have been read in all cases; the need_IHDR parameter allows for this
+ * check too.
*/
static int
png_rtran_ok(png_structrp png_ptr, int need_IHDR)
{
if (png_ptr != NULL)
{
- if (png_ptr->flags & PNG_FLAG_ROW_INIT)
+ if ((png_ptr->flags & PNG_FLAG_ROW_INIT) != 0)
png_app_error(png_ptr,
"invalid after png_start_read_image or png_read_update_info");
@@ -127,7 +128,7 @@ png_set_background_fixed(png_structrp png_ptr,
{
png_debug(1, "in png_set_background_fixed");
- if (!png_rtran_ok(png_ptr, 0) || background_color == NULL)
+ if (png_rtran_ok(png_ptr, 0) == 0 || background_color == NULL)
return;
if (background_gamma_code == PNG_BACKGROUND_GAMMA_UNKNOWN)
@@ -171,7 +172,7 @@ png_set_scale_16(png_structrp png_ptr)
{
png_debug(1, "in png_set_scale_16");
- if (!png_rtran_ok(png_ptr, 0))
+ if (png_rtran_ok(png_ptr, 0) == 0)
return;
png_ptr->transformations |= PNG_SCALE_16_TO_8;
@@ -185,7 +186,7 @@ png_set_strip_16(png_structrp png_ptr)
{
png_debug(1, "in png_set_strip_16");
- if (!png_rtran_ok(png_ptr, 0))
+ if (png_rtran_ok(png_ptr, 0) == 0)
return;
png_ptr->transformations |= PNG_16_TO_8;
@@ -198,7 +199,7 @@ png_set_strip_alpha(png_structrp png_ptr)
{
png_debug(1, "in png_set_strip_alpha");
- if (!png_rtran_ok(png_ptr, 0))
+ if (png_rtran_ok(png_ptr, 0) == 0)
return;
png_ptr->transformations |= PNG_STRIP_ALPHA;
@@ -279,7 +280,7 @@ png_set_alpha_mode_fixed(png_structrp png_ptr, int mode,
png_debug(1, "in png_set_alpha_mode");
- if (!png_rtran_ok(png_ptr, 0))
+ if (png_rtran_ok(png_ptr, 0) == 0)
return;
output_gamma = translate_gamma_flags(png_ptr, output_gamma, 1/*screen*/);
@@ -371,7 +372,7 @@ png_set_alpha_mode_fixed(png_structrp png_ptr, int mode,
png_ptr->background_gamma_type = PNG_BACKGROUND_GAMMA_FILE;
png_ptr->transformations &= ~PNG_BACKGROUND_EXPAND;
- if (png_ptr->transformations & PNG_COMPOSE)
+ if ((png_ptr->transformations & PNG_COMPOSE) != 0)
png_error(png_ptr,
"conflicting calls to set alpha mode and background");
@@ -415,7 +416,7 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
{
png_debug(1, "in png_set_quantize");
- if (!png_rtran_ok(png_ptr, 0))
+ if (png_rtran_ok(png_ptr, 0) == 0)
return;
png_ptr->transformations |= PNG_QUANTIZE;
@@ -793,7 +794,7 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette,
png_free(png_ptr, distance);
}
}
-#endif /* PNG_READ_QUANTIZE_SUPPORTED */
+#endif /* READ_QUANTIZE */
#ifdef PNG_READ_GAMMA_SUPPORTED
void PNGFAPI
@@ -802,7 +803,7 @@ png_set_gamma_fixed(png_structrp png_ptr, png_fixed_point scrn_gamma,
{
png_debug(1, "in png_set_gamma_fixed");
- if (!png_rtran_ok(png_ptr, 0))
+ if (png_rtran_ok(png_ptr, 0) == 0)
return;
/* New in libpng-1.5.4 - reserve particular negative values as flags. */
@@ -842,7 +843,7 @@ png_set_gamma(png_structrp png_ptr, double scrn_gamma, double file_gamma)
png_set_gamma_fixed(png_ptr, convert_gamma_value(png_ptr, scrn_gamma),
convert_gamma_value(png_ptr, file_gamma));
}
-# endif /* FLOATING_POINT_SUPPORTED */
+# endif /* FLOATING_POINT */
#endif /* READ_GAMMA */
#ifdef PNG_READ_EXPAND_SUPPORTED
@@ -855,7 +856,7 @@ png_set_expand(png_structrp png_ptr)
{
png_debug(1, "in png_set_expand");
- if (!png_rtran_ok(png_ptr, 0))
+ if (png_rtran_ok(png_ptr, 0) == 0)
return;
png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
@@ -885,7 +886,7 @@ png_set_palette_to_rgb(png_structrp png_ptr)
{
png_debug(1, "in png_set_palette_to_rgb");
- if (!png_rtran_ok(png_ptr, 0))
+ if (png_rtran_ok(png_ptr, 0) == 0)
return;
png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
@@ -897,7 +898,7 @@ png_set_expand_gray_1_2_4_to_8(png_structrp png_ptr)
{
png_debug(1, "in png_set_expand_gray_1_2_4_to_8");
- if (!png_rtran_ok(png_ptr, 0))
+ if (png_rtran_ok(png_ptr, 0) == 0)
return;
png_ptr->transformations |= PNG_EXPAND;
@@ -909,12 +910,12 @@ png_set_tRNS_to_alpha(png_structrp png_ptr)
{
png_debug(1, "in png_set_tRNS_to_alpha");
- if (!png_rtran_ok(png_ptr, 0))
+ if (png_rtran_ok(png_ptr, 0) == 0)
return;
png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS);
}
-#endif /* defined(PNG_READ_EXPAND_SUPPORTED) */
+#endif /* READ_EXPAND */
#ifdef PNG_READ_EXPAND_16_SUPPORTED
/* Expand to 16-bit channels, expand the tRNS chunk too (because otherwise
@@ -925,7 +926,7 @@ png_set_expand_16(png_structrp png_ptr)
{
png_debug(1, "in png_set_expand_16");
- if (!png_rtran_ok(png_ptr, 0))
+ if (png_rtran_ok(png_ptr, 0) == 0)
return;
png_ptr->transformations |= (PNG_EXPAND_16 | PNG_EXPAND | PNG_EXPAND_tRNS);
@@ -938,7 +939,7 @@ png_set_gray_to_rgb(png_structrp png_ptr)
{
png_debug(1, "in png_set_gray_to_rgb");
- if (!png_rtran_ok(png_ptr, 0))
+ if (png_rtran_ok(png_ptr, 0) == 0)
return;
/* Because rgb must be 8 bits or more: */
@@ -956,7 +957,7 @@ png_set_rgb_to_gray_fixed(png_structrp png_ptr, int error_action,
/* Need the IHDR here because of the check on color_type below. */
/* TODO: fix this */
- if (!png_rtran_ok(png_ptr, 1))
+ if (png_rtran_ok(png_ptr, 1) == 0)
return;
switch (error_action)
@@ -998,7 +999,7 @@ png_set_rgb_to_gray_fixed(png_structrp png_ptr, int error_action,
png_uint_16 red_int, green_int;
/* NOTE: this calculation does not round, but this behavior is retained
- * for consistency, the inaccuracy is very small. The code here always
+ * for consistency; the inaccuracy is very small. The code here always
* overwrites the coefficients, regardless of whether they have been
* defaulted or set already.
*/
@@ -1091,7 +1092,7 @@ png_gamma_threshold(png_fixed_point screen_gamma, png_fixed_point file_gamma)
* the palette.
*/
-/*For the moment 'png_init_palette_transformations' and
+/* For the moment 'png_init_palette_transformations' and
* 'png_init_rgb_transformations' only do some flag canceling optimizations.
* The intent is that these two routines should have palette or rgb operations
* extracted from 'png_init_read_transformations'.
@@ -1153,8 +1154,8 @@ png_init_palette_transformations(png_structrp png_ptr)
/* The following code cannot be entered in the alpha pre-multiplication case
* because PNG_BACKGROUND_EXPAND is cancelled below.
*/
- if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
- (png_ptr->transformations & PNG_EXPAND))
+ if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) != 0 &&
+ (png_ptr->transformations & PNG_EXPAND) != 0)
{
{
png_ptr->background.red =
@@ -1165,9 +1166,9 @@ png_init_palette_transformations(png_structrp png_ptr)
png_ptr->palette[png_ptr->background.index].blue;
#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
- if (png_ptr->transformations & PNG_INVERT_ALPHA)
+ if ((png_ptr->transformations & PNG_INVERT_ALPHA) != 0)
{
- if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
+ if ((png_ptr->transformations & PNG_EXPAND_tRNS) == 0)
{
/* Invert the alpha channel (in tRNS) unless the pixels are
* going to be expanded, in which case leave it for later
@@ -1179,10 +1180,10 @@ png_init_palette_transformations(png_structrp png_ptr)
png_ptr->trans_alpha[i]);
}
}
-#endif /* PNG_READ_INVERT_ALPHA_SUPPORTED */
+#endif /* READ_INVERT_ALPHA */
}
} /* background expand and (therefore) no alpha association. */
-#endif /* PNG_READ_EXPAND_SUPPORTED && PNG_READ_BACKGROUND_SUPPORTED */
+#endif /* READ_EXPAND && READ_BACKGROUND */
}
static void /* PRIVATE */
@@ -1220,9 +1221,9 @@ png_init_rgb_transformations(png_structrp png_ptr)
/* The following code cannot be entered in the alpha pre-multiplication case
* because PNG_BACKGROUND_EXPAND is cancelled below.
*/
- if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
- (png_ptr->transformations & PNG_EXPAND) &&
- !(png_ptr->color_type & PNG_COLOR_MASK_COLOR))
+ if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) != 0 &&
+ (png_ptr->transformations & PNG_EXPAND) != 0 &&
+ (png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0)
/* i.e., GRAY or GRAY_ALPHA */
{
{
@@ -1260,14 +1261,14 @@ png_init_rgb_transformations(png_structrp png_ptr)
png_ptr->background.red = png_ptr->background.green =
png_ptr->background.blue = (png_uint_16)gray;
- if (!(png_ptr->transformations & PNG_EXPAND_tRNS))
+ if ((png_ptr->transformations & PNG_EXPAND_tRNS) == 0)
{
png_ptr->trans_color.red = png_ptr->trans_color.green =
png_ptr->trans_color.blue = (png_uint_16)trans_gray;
}
}
} /* background expand and (therefore) no alpha association. */
-#endif /* PNG_READ_EXPAND_SUPPORTED && PNG_READ_BACKGROUND_SUPPORTED */
+#endif /* READ_EXPAND && READ_BACKGROUND */
}
void /* PRIVATE */
@@ -1345,7 +1346,7 @@ png_init_read_transformations(png_structrp png_ptr)
#endif
/* Certain transformations have the effect of preventing other
- * transformations that happen afterward in png_do_read_transformations,
+ * transformations that happen afterward in png_do_read_transformations;
* resolve the interdependencies here. From the code of
* png_do_read_transformations the order is:
*
@@ -1374,8 +1375,8 @@ png_init_read_transformations(png_structrp png_ptr)
* 23) PNG_USER_TRANSFORM [must be last]
*/
#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
- if ((png_ptr->transformations & PNG_STRIP_ALPHA) &&
- !(png_ptr->transformations & PNG_COMPOSE))
+ if ((png_ptr->transformations & PNG_STRIP_ALPHA) != 0 &&
+ (png_ptr->transformations & PNG_COMPOSE) == 0)
{
/* Stripping the alpha channel happens immediately after the 'expand'
* transformations, before all other transformation, so it cancels out
@@ -1401,7 +1402,7 @@ png_init_read_transformations(png_structrp png_ptr)
/* If the screen gamma is about 1.0 then the OPTIMIZE_ALPHA and ENCODE_ALPHA
* settings will have no effect.
*/
- if (!png_gamma_significant(png_ptr->screen_gamma))
+ if (png_gamma_significant(png_ptr->screen_gamma) == 0)
{
png_ptr->transformations &= ~PNG_ENCODE_ALPHA;
png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA;
@@ -1412,7 +1413,7 @@ png_init_read_transformations(png_structrp png_ptr)
/* Make sure the coefficients for the rgb to gray conversion are set
* appropriately.
*/
- if (png_ptr->transformations & PNG_RGB_TO_GRAY)
+ if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0)
png_colorspace_set_rgb_coefficients(png_ptr);
#endif
@@ -1433,23 +1434,23 @@ png_init_read_transformations(png_structrp png_ptr)
* png_set_background, along with the bit depth, then the code has a record
* of exactly what color space the background is currently in.
*/
- if (png_ptr->transformations & PNG_BACKGROUND_EXPAND)
+ if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) != 0)
{
/* PNG_BACKGROUND_EXPAND: the background is in the file color space, so if
* the file was grayscale the background value is gray.
*/
- if (!(png_ptr->color_type & PNG_COLOR_MASK_COLOR))
+ if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0)
png_ptr->mode |= PNG_BACKGROUND_IS_GRAY;
}
- else if (png_ptr->transformations & PNG_COMPOSE)
+ else if ((png_ptr->transformations & PNG_COMPOSE) != 0)
{
/* PNG_COMPOSE: png_set_background was called with need_expand false,
* so the color is in the color space of the output or png_set_alpha_mode
* was called and the color is black. Ignore RGB_TO_GRAY because that
* happens before GRAY_TO_RGB.
*/
- if (png_ptr->transformations & PNG_GRAY_TO_RGB)
+ if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0)
{
if (png_ptr->background.red == png_ptr->background.green &&
png_ptr->background.red == png_ptr->background.blue)
@@ -1459,8 +1460,8 @@ png_init_read_transformations(png_structrp png_ptr)
}
}
}
-#endif /* PNG_READ_EXPAND_SUPPORTED && PNG_READ_BACKGROUND_SUPPORTED */
-#endif /* PNG_READ_GRAY_TO_RGB_SUPPORTED */
+#endif /* READ_EXPAND && READ_BACKGROUND */
+#endif /* READ_GRAY_TO_RGB */
/* For indexed PNG data (PNG_COLOR_TYPE_PALETTE) many of the transformations
* can be performed directly on the palette, and some (such as rgb to gray)
@@ -1481,10 +1482,10 @@ png_init_read_transformations(png_structrp png_ptr)
#if defined(PNG_READ_BACKGROUND_SUPPORTED) && \
defined(PNG_READ_EXPAND_16_SUPPORTED)
- if ((png_ptr->transformations & PNG_EXPAND_16) &&
- (png_ptr->transformations & PNG_COMPOSE) &&
- !(png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
- png_ptr->bit_depth != 16)
+ if ((png_ptr->transformations & PNG_EXPAND_16) != 0 &&
+ (png_ptr->transformations & PNG_COMPOSE) != 0 &&
+ (png_ptr->transformations & PNG_BACKGROUND_EXPAND) == 0 &&
+ png_ptr->bit_depth != 16)
{
/* TODO: fix this. Because the expand_16 operation is after the compose
* handling the background color must be 8, not 16, bits deep, but the
@@ -1503,15 +1504,15 @@ png_init_read_transformations(png_structrp png_ptr)
CHOP(png_ptr->background.gray);
# undef CHOP
}
-#endif /* PNG_READ_BACKGROUND_SUPPORTED && PNG_READ_EXPAND_16_SUPPORTED */
+#endif /* READ_BACKGROUND && READ_EXPAND_16 */
#if defined(PNG_READ_BACKGROUND_SUPPORTED) && \
(defined(PNG_READ_SCALE_16_TO_8_SUPPORTED) || \
defined(PNG_READ_STRIP_16_TO_8_SUPPORTED))
- if ((png_ptr->transformations & (PNG_16_TO_8|PNG_SCALE_16_TO_8)) &&
- (png_ptr->transformations & PNG_COMPOSE) &&
- !(png_ptr->transformations & PNG_BACKGROUND_EXPAND) &&
- png_ptr->bit_depth == 16)
+ if ((png_ptr->transformations & (PNG_16_TO_8|PNG_SCALE_16_TO_8)) != 0 &&
+ (png_ptr->transformations & PNG_COMPOSE) != 0 &&
+ (png_ptr->transformations & PNG_BACKGROUND_EXPAND) == 0 &&
+ png_ptr->bit_depth == 16)
{
/* On the other hand, if a 16-bit file is to be reduced to 8-bits per
* component this will also happen after PNG_COMPOSE and so the background
@@ -1554,25 +1555,24 @@ png_init_read_transformations(png_structrp png_ptr)
* file gamma - if it is not 1.0 both RGB_TO_GRAY and COMPOSE need the
* tables.
*/
- if ((png_ptr->transformations & PNG_GAMMA)
- || ((png_ptr->transformations & PNG_RGB_TO_GRAY)
- && (png_gamma_significant(png_ptr->colorspace.gamma) ||
- png_gamma_significant(png_ptr->screen_gamma)))
- || ((png_ptr->transformations & PNG_COMPOSE)
- && (png_gamma_significant(png_ptr->colorspace.gamma)
- || png_gamma_significant(png_ptr->screen_gamma)
+ if ((png_ptr->transformations & PNG_GAMMA) != 0 ||
+ ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0 &&
+ (png_gamma_significant(png_ptr->colorspace.gamma) != 0 ||
+ png_gamma_significant(png_ptr->screen_gamma) != 0)) ||
+ ((png_ptr->transformations & PNG_COMPOSE) != 0 &&
+ (png_gamma_significant(png_ptr->colorspace.gamma) != 0 ||
+ png_gamma_significant(png_ptr->screen_gamma) != 0
# ifdef PNG_READ_BACKGROUND_SUPPORTED
- || (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_UNIQUE
- && png_gamma_significant(png_ptr->background_gamma))
+ || (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_UNIQUE &&
+ png_gamma_significant(png_ptr->background_gamma) != 0)
# endif
- )) || ((png_ptr->transformations & PNG_ENCODE_ALPHA)
- && png_gamma_significant(png_ptr->screen_gamma))
- )
+ )) || ((png_ptr->transformations & PNG_ENCODE_ALPHA) != 0 &&
+ png_gamma_significant(png_ptr->screen_gamma) != 0))
{
png_build_gamma_table(png_ptr, png_ptr->bit_depth);
#ifdef PNG_READ_BACKGROUND_SUPPORTED
- if (png_ptr->transformations & PNG_COMPOSE)
+ if ((png_ptr->transformations & PNG_COMPOSE) != 0)
{
/* Issue a warning about this combination: because RGB_TO_GRAY is
* optimized to do the gamma transform if present yet do_background has
@@ -1580,11 +1580,11 @@ png_init_read_transformations(png_structrp png_ptr)
* double-gamma-correction happens. This is true in all versions of
* libpng to date.
*/
- if (png_ptr->transformations & PNG_RGB_TO_GRAY)
+ if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0)
png_warning(png_ptr,
"libpng does not support gamma+background+rgb_to_gray");
- if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+ if ((png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) != 0)
{
/* We don't get to here unless there is a tRNS chunk with non-opaque
* entries - see the checking code at the start of this function.
@@ -1632,7 +1632,7 @@ png_init_read_transformations(png_structrp png_ptr)
break;
}
- if (png_gamma_significant(gs))
+ if (png_gamma_significant(gs) != 0)
{
back.red = png_gamma_8bit_correct(png_ptr->background.red,
gs);
@@ -1649,7 +1649,7 @@ png_init_read_transformations(png_structrp png_ptr)
back.blue = (png_byte)png_ptr->background.blue;
}
- if (png_gamma_significant(g))
+ if (png_gamma_significant(g) != 0)
{
back_1.red = png_gamma_8bit_correct(png_ptr->background.red,
g);
@@ -1798,7 +1798,7 @@ png_init_read_transformations(png_structrp png_ptr)
else
/* Transformation does not include PNG_BACKGROUND */
-#endif /* PNG_READ_BACKGROUND_SUPPORTED */
+#endif /* READ_BACKGROUND */
if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE
#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
/* RGB_TO_GRAY needs to have non-gamma-corrected values! */
@@ -1828,11 +1828,11 @@ png_init_read_transformations(png_structrp png_ptr)
#ifdef PNG_READ_BACKGROUND_SUPPORTED
else
#endif
-#endif /* PNG_READ_GAMMA_SUPPORTED */
+#endif /* READ_GAMMA */
#ifdef PNG_READ_BACKGROUND_SUPPORTED
/* No GAMMA transformation (see the hanging else 4 lines above) */
- if ((png_ptr->transformations & PNG_COMPOSE) &&
+ if ((png_ptr->transformations & PNG_COMPOSE) != 0 &&
(png_ptr->color_type == PNG_COLOR_TYPE_PALETTE))
{
int i;
@@ -1867,11 +1867,11 @@ png_init_read_transformations(png_structrp png_ptr)
png_ptr->transformations &= ~PNG_COMPOSE;
}
-#endif /* PNG_READ_BACKGROUND_SUPPORTED */
+#endif /* READ_BACKGROUND */
#ifdef PNG_READ_SHIFT_SUPPORTED
- if ((png_ptr->transformations & PNG_SHIFT) &&
- !(png_ptr->transformations & PNG_EXPAND) &&
+ if ((png_ptr->transformations & PNG_SHIFT) != 0 &&
+ (png_ptr->transformations & PNG_EXPAND) == 0 &&
(png_ptr->color_type == PNG_COLOR_TYPE_PALETTE))
{
int i;
@@ -1913,7 +1913,7 @@ png_init_read_transformations(png_structrp png_ptr)
png_ptr->palette[i].blue = (png_byte)component;
}
}
-#endif /* PNG_READ_SHIFT_SUPPORTED */
+#endif /* READ_SHIFT */
}
/* Modify the info structure to reflect the transformations. The
@@ -1926,7 +1926,7 @@ png_read_transform_info(png_structrp png_ptr, png_inforp info_ptr)
png_debug(1, "in png_read_transform_info");
#ifdef PNG_READ_EXPAND_SUPPORTED
- if (png_ptr->transformations & PNG_EXPAND)
+ if ((png_ptr->transformations & PNG_EXPAND) != 0)
{
if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
{
@@ -1948,9 +1948,9 @@ png_read_transform_info(png_structrp png_ptr, png_inforp info_ptr)
}
else
{
- if (png_ptr->num_trans)
+ if (png_ptr->num_trans != 0)
{
- if (png_ptr->transformations & PNG_EXPAND_tRNS)
+ if ((png_ptr->transformations & PNG_EXPAND_tRNS) != 0)
info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
}
if (info_ptr->bit_depth < 8)
@@ -1966,7 +1966,7 @@ png_read_transform_info(png_structrp png_ptr, png_inforp info_ptr)
/* The following is almost certainly wrong unless the background value is in
* the screen space!
*/
- if (png_ptr->transformations & PNG_COMPOSE)
+ if ((png_ptr->transformations & PNG_COMPOSE) != 0)
info_ptr->background = png_ptr->background;
#endif
@@ -1987,12 +1987,12 @@ png_read_transform_info(png_structrp png_ptr, png_inforp info_ptr)
{
# ifdef PNG_READ_16BIT_SUPPORTED
# ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
- if (png_ptr->transformations & PNG_SCALE_16_TO_8)
+ if ((png_ptr->transformations & PNG_SCALE_16_TO_8) != 0)
info_ptr->bit_depth = 8;
# endif
# ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED
- if (png_ptr->transformations & PNG_16_TO_8)
+ if ((png_ptr->transformations & PNG_16_TO_8) != 0)
info_ptr->bit_depth = 8;
# endif
@@ -2018,27 +2018,27 @@ png_read_transform_info(png_structrp png_ptr, png_inforp info_ptr)
CONFIGURATION ERROR: you must enable at least one 16 to 8 method
# endif
# endif
-#endif /* !READ_16BIT_SUPPORTED */
+#endif /* !READ_16BIT */
}
#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
- if (png_ptr->transformations & PNG_GRAY_TO_RGB)
+ if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0)
info_ptr->color_type = (png_byte)(info_ptr->color_type |
PNG_COLOR_MASK_COLOR);
#endif
#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
- if (png_ptr->transformations & PNG_RGB_TO_GRAY)
+ if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0)
info_ptr->color_type = (png_byte)(info_ptr->color_type &
~PNG_COLOR_MASK_COLOR);
#endif
#ifdef PNG_READ_QUANTIZE_SUPPORTED
- if (png_ptr->transformations & PNG_QUANTIZE)
+ if ((png_ptr->transformations & PNG_QUANTIZE) != 0)
{
if (((info_ptr->color_type == PNG_COLOR_TYPE_RGB) ||
(info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)) &&
- png_ptr->palette_lookup && info_ptr->bit_depth == 8)
+ png_ptr->palette_lookup != 0 && info_ptr->bit_depth == 8)
{
info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
}
@@ -2046,29 +2046,31 @@ png_read_transform_info(png_structrp png_ptr, png_inforp info_ptr)
#endif
#ifdef PNG_READ_EXPAND_16_SUPPORTED
- if (png_ptr->transformations & PNG_EXPAND_16 && info_ptr->bit_depth == 8 &&
- info_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
+ if ((png_ptr->transformations & PNG_EXPAND_16) != 0 &&
+ info_ptr->bit_depth == 8 &&
+ info_ptr->color_type != PNG_COLOR_TYPE_PALETTE)
{
info_ptr->bit_depth = 16;
}
#endif
#ifdef PNG_READ_PACK_SUPPORTED
- if ((png_ptr->transformations & PNG_PACK) && (info_ptr->bit_depth < 8))
+ if ((png_ptr->transformations & PNG_PACK) != 0 &&
+ (info_ptr->bit_depth < 8))
info_ptr->bit_depth = 8;
#endif
if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
info_ptr->channels = 1;
- else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
+ else if ((info_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
info_ptr->channels = 3;
else
info_ptr->channels = 1;
#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
- if (png_ptr->transformations & PNG_STRIP_ALPHA)
+ if ((png_ptr->transformations & PNG_STRIP_ALPHA) != 0)
{
info_ptr->color_type = (png_byte)(info_ptr->color_type &
~PNG_COLOR_MASK_ALPHA);
@@ -2076,25 +2078,25 @@ png_read_transform_info(png_structrp png_ptr, png_inforp info_ptr)
}
#endif
- if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
+ if ((info_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0)
info_ptr->channels++;
#ifdef PNG_READ_FILLER_SUPPORTED
/* STRIP_ALPHA and FILLER allowed: MASK_ALPHA bit stripped above */
- if ((png_ptr->transformations & PNG_FILLER) &&
- ((info_ptr->color_type == PNG_COLOR_TYPE_RGB) ||
- (info_ptr->color_type == PNG_COLOR_TYPE_GRAY)))
+ if ((png_ptr->transformations & PNG_FILLER) != 0 &&
+ (info_ptr->color_type == PNG_COLOR_TYPE_RGB ||
+ info_ptr->color_type == PNG_COLOR_TYPE_GRAY))
{
info_ptr->channels++;
/* If adding a true alpha channel not just filler */
- if (png_ptr->transformations & PNG_ADD_ALPHA)
+ if ((png_ptr->transformations & PNG_ADD_ALPHA) != 0)
info_ptr->color_type |= PNG_COLOR_MASK_ALPHA;
}
#endif
#if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) && \
defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
- if (png_ptr->transformations & PNG_USER_TRANSFORM)
+ if ((png_ptr->transformations & PNG_USER_TRANSFORM) != 0)
{
if (info_ptr->bit_depth < png_ptr->user_transform_depth)
info_ptr->bit_depth = png_ptr->user_transform_depth;
@@ -2245,7 +2247,7 @@ png_do_unshift(png_row_infop row_info, png_bytep row,
int channels = 0;
int bit_depth = row_info->bit_depth;
- if (color_type & PNG_COLOR_MASK_COLOR)
+ if ((color_type & PNG_COLOR_MASK_COLOR) != 0)
{
shift[channels++] = bit_depth - sig_bits->red;
shift[channels++] = bit_depth - sig_bits->green;
@@ -2257,7 +2259,7 @@ png_do_unshift(png_row_infop row_info, png_bytep row,
shift[channels++] = bit_depth - sig_bits->gray;
}
- if (color_type & PNG_COLOR_MASK_ALPHA)
+ if ((color_type & PNG_COLOR_MASK_ALPHA) != 0)
{
shift[channels++] = bit_depth - sig_bits->alpha;
}
@@ -2671,7 +2673,7 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,
{
if (row_info->bit_depth == 8)
{
- if (flags & PNG_FLAG_FILLER_AFTER)
+ if ((flags & PNG_FLAG_FILLER_AFTER) != 0)
{
/* This changes the data from G to GX */
png_bytep sp = row + (png_size_t)row_width;
@@ -2706,7 +2708,7 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,
#ifdef PNG_READ_16BIT_SUPPORTED
else if (row_info->bit_depth == 16)
{
- if (flags & PNG_FLAG_FILLER_AFTER)
+ if ((flags & PNG_FLAG_FILLER_AFTER) != 0)
{
/* This changes the data from GG to GGXX */
png_bytep sp = row + (png_size_t)row_width * 2;
@@ -2748,7 +2750,7 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,
{
if (row_info->bit_depth == 8)
{
- if (flags & PNG_FLAG_FILLER_AFTER)
+ if ((flags & PNG_FLAG_FILLER_AFTER) != 0)
{
/* This changes the data from RGB to RGBX */
png_bytep sp = row + (png_size_t)row_width * 3;
@@ -2787,7 +2789,7 @@ png_do_read_filler(png_row_infop row_info, png_bytep row,
#ifdef PNG_READ_16BIT_SUPPORTED
else if (row_info->bit_depth == 16)
{
- if (flags & PNG_FLAG_FILLER_AFTER)
+ if ((flags & PNG_FLAG_FILLER_AFTER) != 0)
{
/* This changes the data from RRGGBB to RRGGBBXX */
png_bytep sp = row + (png_size_t)row_width * 6;
@@ -2848,7 +2850,7 @@ png_do_gray_to_rgb(png_row_infop row_info, png_bytep row)
png_debug(1, "in png_do_gray_to_rgb");
if (row_info->bit_depth >= 8 &&
- !(row_info->color_type & PNG_COLOR_MASK_COLOR))
+ (row_info->color_type & PNG_COLOR_MASK_COLOR) == 0)
{
if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
{
@@ -2986,8 +2988,8 @@ png_do_rgb_to_gray(png_structrp png_ptr, png_row_infop row_info, png_bytep row)
png_debug(1, "in png_do_rgb_to_gray");
- if (!(row_info->color_type & PNG_COLOR_MASK_PALETTE) &&
- (row_info->color_type & PNG_COLOR_MASK_COLOR))
+ if ((row_info->color_type & PNG_COLOR_MASK_PALETTE) == 0 &&
+ (row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)
{
PNG_CONST png_uint_32 rc = png_ptr->rgb_to_gray_red_coeff;
PNG_CONST png_uint_32 gc = png_ptr->rgb_to_gray_green_coeff;
@@ -3086,15 +3088,15 @@ png_do_rgb_to_gray(png_structrp png_ptr, png_row_infop row_info, png_bytep row)
{
png_uint_16 red, green, blue, w;
- red = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
- green = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
- blue = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
+ red = (png_uint_16)(((*(sp)) << 8) | *(sp + 1)); sp += 2;
+ green = (png_uint_16)(((*(sp)) << 8) | *(sp + 1)); sp += 2;
+ blue = (png_uint_16)(((*(sp)) << 8) | *(sp + 1)); sp += 2;
if (red == green && red == blue)
{
if (png_ptr->gamma_16_table != NULL)
- w = png_ptr->gamma_16_table[(red&0xff)
- >> png_ptr->gamma_shift][red>>8];
+ w = png_ptr->gamma_16_table[(red & 0xff)
+ >> png_ptr->gamma_shift][red >> 8];
else
w = red;
@@ -3137,9 +3139,9 @@ png_do_rgb_to_gray(png_structrp png_ptr, png_row_infop row_info, png_bytep row)
{
png_uint_16 red, green, blue, gray16;
- red = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
- green = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
- blue = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2;
+ red = (png_uint_16)(((*(sp)) << 8) | *(sp + 1)); sp += 2;
+ green = (png_uint_16)(((*(sp)) << 8) | *(sp + 1)); sp += 2;
+ blue = (png_uint_16)(((*(sp)) << 8) | *(sp + 1)); sp += 2;
if (red != green || red != blue)
rgb_error |= 1;
@@ -3150,7 +3152,7 @@ png_do_rgb_to_gray(png_structrp png_ptr, png_row_infop row_info, png_bytep row)
*/
gray16 = (png_uint_16)((rc*red + gc*green + bc*blue + 16384) >>
15);
- *(dp++) = (png_byte)((gray16>>8) & 0xff);
+ *(dp++) = (png_byte)((gray16 >> 8) & 0xff);
*(dp++) = (png_byte)(gray16 & 0xff);
if (have_alpha != 0)
@@ -3910,7 +3912,7 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr)
}
}
}
-#endif /* PNG_READ_BACKGROUND_SUPPORTED || PNG_READ_ALPHA_MODE_SUPPORTED */
+#endif /* READ_BACKGROUND || READ_ALPHA_MODE */
#ifdef PNG_READ_GAMMA_SUPPORTED
/* Gamma correct the image, avoiding the alpha channel. Make sure
@@ -4127,7 +4129,7 @@ png_do_encode_alpha(png_row_infop row_info, png_bytep row, png_structrp png_ptr)
png_debug(1, "in png_do_encode_alpha");
- if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
+ if ((row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0)
{
if (row_info->bit_depth == 8)
{
@@ -4353,7 +4355,7 @@ png_do_expand(png_row_infop row_info, png_bytep row,
{
if (row_info->color_type == PNG_COLOR_TYPE_GRAY)
{
- unsigned int gray = trans_color ? trans_color->gray : 0;
+ unsigned int gray = trans_color != NULL ? trans_color->gray : 0;
if (row_info->bit_depth < 8)
{
@@ -4497,7 +4499,8 @@ png_do_expand(png_row_infop row_info, png_bytep row,
row_width);
}
}
- else if (row_info->color_type == PNG_COLOR_TYPE_RGB && trans_color)
+ else if (row_info->color_type == PNG_COLOR_TYPE_RGB &&
+ trans_color != NULL)
{
if (row_info->bit_depth == 8)
{
@@ -4688,7 +4691,7 @@ png_do_quantize(png_row_infop row_info, png_bytep row,
}
}
}
-#endif /* PNG_READ_QUANTIZE_SUPPORTED */
+#endif /* READ_QUANTIZE */
/* Transform the row. The order of transformations is significant,
* and is very touchy. If you add a transformation, take care to
@@ -4715,7 +4718,7 @@ png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info)
* demand, if necessary.
*/
if ((png_ptr->flags & PNG_FLAG_DETECT_UNINITIALIZED) != 0 &&
- !(png_ptr->flags & PNG_FLAG_ROW_INIT))
+ (png_ptr->flags & PNG_FLAG_ROW_INIT) == 0)
{
/* Application has failed to call either png_read_start_image() or
* png_read_update_info() after setting transforms that expand pixels.
@@ -4725,7 +4728,7 @@ png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info)
}
#ifdef PNG_READ_EXPAND_SUPPORTED
- if (png_ptr->transformations & PNG_EXPAND)
+ if ((png_ptr->transformations & PNG_EXPAND) != 0)
{
if (row_info->color_type == PNG_COLOR_TYPE_PALETTE)
{
@@ -4735,8 +4738,8 @@ png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info)
else
{
- if (png_ptr->num_trans &&
- (png_ptr->transformations & PNG_EXPAND_tRNS))
+ if (png_ptr->num_trans != 0 &&
+ (png_ptr->transformations & PNG_EXPAND_tRNS) != 0)
png_do_expand(row_info, png_ptr->row_buf + 1,
&(png_ptr->trans_color));
@@ -4748,16 +4751,16 @@ png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info)
#endif
#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
- if ((png_ptr->transformations & PNG_STRIP_ALPHA) &&
- !(png_ptr->transformations & PNG_COMPOSE) &&
- (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
- row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA))
+ if ((png_ptr->transformations & PNG_STRIP_ALPHA) != 0 &&
+ (png_ptr->transformations & PNG_COMPOSE) == 0 &&
+ (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
+ row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA))
png_do_strip_channel(row_info, png_ptr->row_buf + 1,
0 /* at_start == false, because SWAP_ALPHA happens later */);
#endif
#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
- if (png_ptr->transformations & PNG_RGB_TO_GRAY)
+ if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0)
{
int rgb_error =
png_do_rgb_to_gray(png_ptr, row_info,
@@ -4812,22 +4815,22 @@ png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info)
/* If gray -> RGB, do so now only if background is non-gray; else do later
* for performance reasons
*/
- if ((png_ptr->transformations & PNG_GRAY_TO_RGB) &&
- !(png_ptr->mode & PNG_BACKGROUND_IS_GRAY))
+ if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0 &&
+ (png_ptr->mode & PNG_BACKGROUND_IS_GRAY) == 0)
png_do_gray_to_rgb(row_info, png_ptr->row_buf + 1);
#endif
#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\
defined(PNG_READ_ALPHA_MODE_SUPPORTED)
- if (png_ptr->transformations & PNG_COMPOSE)
+ if ((png_ptr->transformations & PNG_COMPOSE) != 0)
png_do_compose(row_info, png_ptr->row_buf + 1, png_ptr);
#endif
#ifdef PNG_READ_GAMMA_SUPPORTED
- if ((png_ptr->transformations & PNG_GAMMA) &&
+ if ((png_ptr->transformations & PNG_GAMMA) != 0 &&
#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
/* Because RGB_TO_GRAY does the gamma transform. */
- !(png_ptr->transformations & PNG_RGB_TO_GRAY) &&
+ (png_ptr->transformations & PNG_RGB_TO_GRAY) == 0 &&
#endif
#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\
defined(PNG_READ_ALPHA_MODE_SUPPORTED)
@@ -4836,7 +4839,7 @@ png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info)
*/
!((png_ptr->transformations & PNG_COMPOSE) &&
((png_ptr->num_trans != 0) ||
- (png_ptr->color_type & PNG_COLOR_MASK_ALPHA))) &&
+ (png_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0)) &&
#endif
/* Because png_init_read_transformations transforms the palette, unless
* RGB_TO_GRAY will do the transform.
@@ -4846,22 +4849,22 @@ png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info)
#endif
#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED
- if ((png_ptr->transformations & PNG_STRIP_ALPHA) &&
- (png_ptr->transformations & PNG_COMPOSE) &&
- (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
- row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA))
+ if ((png_ptr->transformations & PNG_STRIP_ALPHA) != 0 &&
+ (png_ptr->transformations & PNG_COMPOSE) != 0 &&
+ (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA ||
+ row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA))
png_do_strip_channel(row_info, png_ptr->row_buf + 1,
- 0 /* at_start == false, because SWAP_ALPHA happens later */);
+ 0 /* at_start == false, because SWAP_ALPHA happens later */);
#endif
#ifdef PNG_READ_ALPHA_MODE_SUPPORTED
- if ((png_ptr->transformations & PNG_ENCODE_ALPHA) &&
- (row_info->color_type & PNG_COLOR_MASK_ALPHA))
+ if ((png_ptr->transformations & PNG_ENCODE_ALPHA) != 0 &&
+ (row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0)
png_do_encode_alpha(row_info, png_ptr->row_buf + 1, png_ptr);
#endif
#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED
- if (png_ptr->transformations & PNG_SCALE_16_TO_8)
+ if ((png_ptr->transformations & PNG_SCALE_16_TO_8) != 0)
png_do_scale_16_to_8(row_info, png_ptr->row_buf + 1);
#endif
@@ -4870,12 +4873,12 @@ png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info)
* by putting the 'scale' option first if the app asks for scale (either by
* calling the API or in a TRANSFORM flag) this is what happens.
*/
- if (png_ptr->transformations & PNG_16_TO_8)
+ if ((png_ptr->transformations & PNG_16_TO_8) != 0)
png_do_chop(row_info, png_ptr->row_buf + 1);
#endif
#ifdef PNG_READ_QUANTIZE_SUPPORTED
- if (png_ptr->transformations & PNG_QUANTIZE)
+ if ((png_ptr->transformations & PNG_QUANTIZE) != 0)
{
png_do_quantize(row_info, png_ptr->row_buf + 1,
png_ptr->palette_lookup, png_ptr->quantize_index);
@@ -4883,7 +4886,7 @@ png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info)
if (row_info->rowbytes == 0)
png_error(png_ptr, "png_do_quantize returned rowbytes=0");
}
-#endif /* PNG_READ_QUANTIZE_SUPPORTED */
+#endif /* READ_QUANTIZE */
#ifdef PNG_READ_EXPAND_16_SUPPORTED
/* Do the expansion now, after all the arithmetic has been done. Notice
@@ -4891,35 +4894,35 @@ png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info)
* is efficient (particularly true in the case of gamma correction, where
* better accuracy results faster!)
*/
- if (png_ptr->transformations & PNG_EXPAND_16)
+ if ((png_ptr->transformations & PNG_EXPAND_16) != 0)
png_do_expand_16(row_info, png_ptr->row_buf + 1);
#endif
#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
/* NOTE: moved here in 1.5.4 (from much later in this list.) */
- if ((png_ptr->transformations & PNG_GRAY_TO_RGB) &&
- (png_ptr->mode & PNG_BACKGROUND_IS_GRAY))
+ if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0 &&
+ (png_ptr->mode & PNG_BACKGROUND_IS_GRAY) != 0)
png_do_gray_to_rgb(row_info, png_ptr->row_buf + 1);
#endif
#ifdef PNG_READ_INVERT_SUPPORTED
- if (png_ptr->transformations & PNG_INVERT_MONO)
+ if ((png_ptr->transformations & PNG_INVERT_MONO) != 0)
png_do_invert(row_info, png_ptr->row_buf + 1);
#endif
#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED
- if (png_ptr->transformations & PNG_INVERT_ALPHA)
+ if ((png_ptr->transformations & PNG_INVERT_ALPHA) != 0)
png_do_read_invert_alpha(row_info, png_ptr->row_buf + 1);
#endif
#ifdef PNG_READ_SHIFT_SUPPORTED
- if (png_ptr->transformations & PNG_SHIFT)
+ if ((png_ptr->transformations & PNG_SHIFT) != 0)
png_do_unshift(row_info, png_ptr->row_buf + 1,
&(png_ptr->shift));
#endif
#ifdef PNG_READ_PACK_SUPPORTED
- if (png_ptr->transformations & PNG_PACK)
+ if ((png_ptr->transformations & PNG_PACK) != 0)
png_do_unpack(row_info, png_ptr->row_buf + 1);
#endif
@@ -4931,36 +4934,36 @@ png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info)
#endif
#ifdef PNG_READ_BGR_SUPPORTED
- if (png_ptr->transformations & PNG_BGR)
+ if ((png_ptr->transformations & PNG_BGR) != 0)
png_do_bgr(row_info, png_ptr->row_buf + 1);
#endif
#ifdef PNG_READ_PACKSWAP_SUPPORTED
- if (png_ptr->transformations & PNG_PACKSWAP)
+ if ((png_ptr->transformations & PNG_PACKSWAP) != 0)
png_do_packswap(row_info, png_ptr->row_buf + 1);
#endif
#ifdef PNG_READ_FILLER_SUPPORTED
- if (png_ptr->transformations & PNG_FILLER)
+ if ((png_ptr->transformations & PNG_FILLER) != 0)
png_do_read_filler(row_info, png_ptr->row_buf + 1,
(png_uint_32)png_ptr->filler, png_ptr->flags);
#endif
#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED
- if (png_ptr->transformations & PNG_SWAP_ALPHA)
+ if ((png_ptr->transformations & PNG_SWAP_ALPHA) != 0)
png_do_read_swap_alpha(row_info, png_ptr->row_buf + 1);
#endif
#ifdef PNG_READ_16BIT_SUPPORTED
#ifdef PNG_READ_SWAP_SUPPORTED
- if (png_ptr->transformations & PNG_SWAP_BYTES)
+ if ((png_ptr->transformations & PNG_SWAP_BYTES) != 0)
png_do_swap(row_info, png_ptr->row_buf + 1);
#endif
#endif
#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
- if (png_ptr->transformations & PNG_USER_TRANSFORM)
- {
+ if ((png_ptr->transformations & PNG_USER_TRANSFORM) != 0)
+ {
if (png_ptr->read_user_transform_fn != NULL)
(*(png_ptr->read_user_transform_fn)) /* User read transform function */
(png_ptr, /* png_ptr */
@@ -4973,10 +4976,10 @@ png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info)
/* png_byte pixel_depth; bits per pixel (depth*channels) */
png_ptr->row_buf + 1); /* start of pixel data for row */
#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED
- if (png_ptr->user_transform_depth)
+ if (png_ptr->user_transform_depth != 0)
row_info->bit_depth = png_ptr->user_transform_depth;
- if (png_ptr->user_transform_channels)
+ if (png_ptr->user_transform_channels != 0)
row_info->channels = png_ptr->user_transform_channels;
#endif
row_info->pixel_depth = (png_byte)(row_info->bit_depth *
@@ -4987,5 +4990,5 @@ png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info)
#endif
}
-#endif /* PNG_READ_TRANSFORMS_SUPPORTED */
-#endif /* PNG_READ_SUPPORTED */
+#endif /* READ_TRANSFORMS */
+#endif /* READ */
diff --git a/source/libs/libpng/libpng-1.6.14/pngrutil.c b/source/libs/libpng/libpng-1.6.15/pngrutil.c
similarity index 94%
rename from source/libs/libpng/libpng-1.6.14/pngrutil.c
rename to source/libs/libpng/libpng-1.6.15/pngrutil.c
index a48907aeba867b6961d525588d369f246a5e9f57..b0385fc78c8e4e49b1f6dd6e0c422762c09e8889 100644
--- a/source/libs/libpng/libpng-1.6.14/pngrutil.c
+++ b/source/libs/libpng/libpng-1.6.15/pngrutil.c
@@ -1,7 +1,7 @@
/* pngrutil.c - utilities to read a PNG file
*
- * Last changed in libpng 1.6.14 [October 23, 2014]
+ * Last changed in libpng 1.6.15 [November 20, 2014]
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -108,7 +108,7 @@ png_get_uint_16)(png_const_bytep buf)
return (png_uint_16)val;
}
-#endif /* PNG_READ_INT_FUNCTIONS_SUPPORTED */
+#endif /* READ_INT_FUNCTIONS */
/* Read and check the PNG file signature */
void /* PRIVATE */
@@ -131,7 +131,7 @@ png_read_sig(png_structrp png_ptr, png_inforp info_ptr)
png_read_data(png_ptr, &(info_ptr->signature[num_checked]), num_to_check);
png_ptr->sig_bytes = 8;
- if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check))
+ if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check) != 0)
{
if (num_checked < 4 &&
png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4))
@@ -217,11 +217,11 @@ png_crc_finish(png_structrp png_ptr, png_uint_32 skip)
png_crc_read(png_ptr, tmpbuf, len);
}
- if (png_crc_error(png_ptr))
+ if (png_crc_error(png_ptr) != 0)
{
- if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) ?
- !(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) :
- (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_USE))
+ if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0 ?
+ (png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) == 0 :
+ (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_USE) != 0)
{
png_chunk_warning(png_ptr, "CRC error");
}
@@ -245,7 +245,7 @@ png_crc_error(png_structrp png_ptr)
png_uint_32 crc;
int need_crc = 1;
- if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name))
+ if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0)
{
if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) ==
(PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN))
@@ -254,7 +254,7 @@ png_crc_error(png_structrp png_ptr)
else /* critical */
{
- if (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE)
+ if ((png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE) != 0)
need_crc = 0;
}
@@ -321,7 +321,7 @@ png_read_buffer(png_structrp png_ptr, png_alloc_size_t new_size, int warn)
return buffer;
}
-#endif /* PNG_READ_iCCP|iTXt|pCAL|sCAL|sPLT|tEXt|zTXt|SEQUENTIAL_READ */
+#endif /* READ_iCCP|iTXt|pCAL|sCAL|sPLT|tEXt|zTXt|SEQUENTIAL_READ */
/* png_inflate_claim: claim the zstream for some nefarious purpose that involves
* decompression. Returns Z_OK on success, else a zlib error code. It checks
@@ -388,7 +388,7 @@ png_inflate_claim(png_structrp png_ptr, png_uint_32 owner)
png_ptr->zstream.next_out = NULL;
png_ptr->zstream.avail_out = 0;
- if (png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED)
+ if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0)
{
#if PNG_ZLIB_VERNUM < 0x1240
ret = inflateReset(&png_ptr->zstream);
@@ -670,6 +670,7 @@ png_decompress_chunk(png_structrp png_ptr,
* success)
*/
png_free(png_ptr, text);
+ text = NULL;
/* This really is very benign, but it's still an error because
* the extra space may otherwise be used as a Trojan Horse.
@@ -717,7 +718,7 @@ png_decompress_chunk(png_structrp png_ptr,
return Z_MEM_ERROR;
}
}
-#endif /* PNG_READ_COMPRESSED_TEXT_SUPPORTED */
+#endif /* READ_COMPRESSED_TEXT */
#ifdef PNG_READ_iCCP_SUPPORTED
/* Perform a partial read and decompress, producing 'avail_out' bytes and
@@ -797,7 +798,7 @@ png_handle_IHDR(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_debug(1, "in png_handle_IHDR");
- if (png_ptr->mode & PNG_HAVE_IHDR)
+ if ((png_ptr->mode & PNG_HAVE_IHDR) != 0)
png_chunk_error(png_ptr, "out of place");
/* Check the length */
@@ -873,7 +874,7 @@ png_handle_PLTE(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_debug(1, "in png_handle_PLTE");
- if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
png_chunk_error(png_ptr, "missing IHDR");
/* Moved to before the 'after IDAT' check below because otherwise duplicate
@@ -881,10 +882,10 @@ png_handle_PLTE(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
* than one PLTE, the error is not treated as benign, so this check trumps
* the requirement that PLTE appears before IDAT.)
*/
- else if (png_ptr->mode & PNG_HAVE_PLTE)
+ else if ((png_ptr->mode & PNG_HAVE_PLTE) != 0)
png_chunk_error(png_ptr, "duplicate");
- else if (png_ptr->mode & PNG_HAVE_IDAT)
+ else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
{
/* This is benign because the non-benign error happened before, when an
* IDAT was encountered in a color-mapped image with no PLTE.
@@ -896,7 +897,7 @@ png_handle_PLTE(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_ptr->mode |= PNG_HAVE_PLTE;
- if (!(png_ptr->color_type & PNG_COLOR_MASK_COLOR))
+ if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0)
{
png_crc_finish(png_ptr, length);
png_chunk_benign_error(png_ptr, "ignored in grayscale PNG");
@@ -963,7 +964,7 @@ png_handle_PLTE(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
}
#ifndef PNG_READ_OPT_PLTE_SUPPORTED
- else if (png_crc_error(png_ptr)) /* Only if we have a CRC error */
+ else if (png_crc_error(png_ptr) != 0) /* Only if we have a CRC error */
{
/* If we don't want to use the data from an ancillary chunk,
* we have two options: an error abort, or a warning and we
@@ -974,9 +975,9 @@ png_handle_PLTE(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
* chunk type to determine whether to check the ancillary or the critical
* flags.
*/
- if (!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_USE))
+ if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_USE) == 0)
{
- if (png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN)
+ if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) != 0)
return;
else
@@ -984,7 +985,7 @@ png_handle_PLTE(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
}
/* Otherwise, we (optionally) emit a warning and use the chunk. */
- else if (!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN))
+ else if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) == 0)
png_chunk_warning(png_ptr, "CRC error");
}
#endif
@@ -1041,7 +1042,8 @@ png_handle_IEND(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
{
png_debug(1, "in png_handle_IEND");
- if (!(png_ptr->mode & PNG_HAVE_IHDR) || !(png_ptr->mode & PNG_HAVE_IDAT))
+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0 ||
+ (png_ptr->mode & PNG_HAVE_IDAT) == 0)
png_chunk_error(png_ptr, "out of place");
png_ptr->mode |= (PNG_AFTER_IDAT | PNG_HAVE_IEND);
@@ -1063,10 +1065,10 @@ png_handle_gAMA(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_debug(1, "in png_handle_gAMA");
- if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
png_chunk_error(png_ptr, "missing IHDR");
- else if (png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE))
+ else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
{
png_crc_finish(png_ptr, length);
png_chunk_benign_error(png_ptr, "out of place");
@@ -1082,7 +1084,7 @@ png_handle_gAMA(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_crc_read(png_ptr, buf, 4);
- if (png_crc_finish(png_ptr, 0))
+ if (png_crc_finish(png_ptr, 0) != 0)
return;
igamma = png_get_fixed_point(NULL, buf);
@@ -1102,17 +1104,17 @@ png_handle_sBIT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_debug(1, "in png_handle_sBIT");
- if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
png_chunk_error(png_ptr, "missing IHDR");
- else if (png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE))
+ else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
{
png_crc_finish(png_ptr, length);
png_chunk_benign_error(png_ptr, "out of place");
return;
}
- if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT))
+ if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT) != 0)
{
png_crc_finish(png_ptr, length);
png_chunk_benign_error(png_ptr, "duplicate");
@@ -1141,7 +1143,7 @@ png_handle_sBIT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
buf[0] = buf[1] = buf[2] = buf[3] = sample_depth;
png_crc_read(png_ptr, buf, truelen);
- if (png_crc_finish(png_ptr, 0))
+ if (png_crc_finish(png_ptr, 0) != 0)
return;
for (i=0; i<truelen; ++i)
@@ -1151,7 +1153,7 @@ png_handle_sBIT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
return;
}
- if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
+ if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
{
png_ptr->sig_bit.red = buf[0];
png_ptr->sig_bit.green = buf[1];
@@ -1181,10 +1183,10 @@ png_handle_cHRM(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_debug(1, "in png_handle_cHRM");
- if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
png_chunk_error(png_ptr, "missing IHDR");
- else if (png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE))
+ else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
{
png_crc_finish(png_ptr, length);
png_chunk_benign_error(png_ptr, "out of place");
@@ -1200,7 +1202,7 @@ png_handle_cHRM(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_crc_read(png_ptr, buf, 32);
- if (png_crc_finish(png_ptr, 0))
+ if (png_crc_finish(png_ptr, 0) != 0)
return;
xy.whitex = png_get_fixed_point(NULL, buf);
@@ -1226,10 +1228,10 @@ png_handle_cHRM(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
}
/* If a colorspace error has already been output skip this chunk */
- if (png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID)
+ if ((png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)
return;
- if (png_ptr->colorspace.flags & PNG_COLORSPACE_FROM_cHRM)
+ if ((png_ptr->colorspace.flags & PNG_COLORSPACE_FROM_cHRM) != 0)
{
png_ptr->colorspace.flags |= PNG_COLORSPACE_INVALID;
png_colorspace_sync(png_ptr, info_ptr);
@@ -1252,10 +1254,10 @@ png_handle_sRGB(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_debug(1, "in png_handle_sRGB");
- if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
png_chunk_error(png_ptr, "missing IHDR");
- else if (png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE))
+ else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
{
png_crc_finish(png_ptr, length);
png_chunk_benign_error(png_ptr, "out of place");
@@ -1271,17 +1273,17 @@ png_handle_sRGB(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_crc_read(png_ptr, &intent, 1);
- if (png_crc_finish(png_ptr, 0))
+ if (png_crc_finish(png_ptr, 0) != 0)
return;
/* If a colorspace error has already been output skip this chunk */
- if (png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID)
+ if ((png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)
return;
/* Only one sRGB or iCCP chunk is allowed, use the HAVE_INTENT flag to detect
* this.
*/
- if (png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_INTENT)
+ if ((png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_INTENT) != 0)
{
png_ptr->colorspace.flags |= PNG_COLORSPACE_INVALID;
png_colorspace_sync(png_ptr, info_ptr);
@@ -1292,7 +1294,7 @@ png_handle_sRGB(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
(void)png_colorspace_set_sRGB(png_ptr, &png_ptr->colorspace, intent);
png_colorspace_sync(png_ptr, info_ptr);
}
-#endif /* PNG_READ_sRGB_SUPPORTED */
+#endif /* READ_sRGB */
#ifdef PNG_READ_iCCP_SUPPORTED
void /* PRIVATE */
@@ -1304,10 +1306,10 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_debug(1, "in png_handle_iCCP");
- if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
png_chunk_error(png_ptr, "missing IHDR");
- else if (png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE))
+ else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0)
{
png_crc_finish(png_ptr, length);
png_chunk_benign_error(png_ptr, "out of place");
@@ -1330,7 +1332,7 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
}
/* If a colorspace error has already been output skip this chunk */
- if (png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID)
+ if ((png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0)
{
png_crc_finish(png_ptr, length);
return;
@@ -1390,14 +1392,14 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_get_uint_32(profile_header);
if (png_icc_check_length(png_ptr, &png_ptr->colorspace,
- keyword, profile_length))
+ keyword, profile_length) != 0)
{
/* The length is apparently ok, so we can check the 132
* byte header.
*/
if (png_icc_check_header(png_ptr, &png_ptr->colorspace,
keyword, profile_length, profile_header,
- png_ptr->color_type))
+ png_ptr->color_type) != 0)
{
/* Now read the tag table; a variable size buffer is
* needed at this point, allocate one for the whole
@@ -1427,7 +1429,7 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
{
if (png_icc_check_tag_table(png_ptr,
&png_ptr->colorspace, keyword, profile_length,
- profile))
+ profile) != 0)
{
/* The profile has been validated for basic
* security issues, so read the whole thing in.
@@ -1565,7 +1567,7 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
if (errmsg != NULL) /* else already output */
png_chunk_benign_error(png_ptr, errmsg);
}
-#endif /* PNG_READ_iCCP_SUPPORTED */
+#endif /* READ_iCCP */
#ifdef PNG_READ_sPLT_SUPPORTED
void /* PRIVATE */
@@ -1601,10 +1603,10 @@ png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
}
#endif
- if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
png_chunk_error(png_ptr, "missing IHDR");
- else if (png_ptr->mode & PNG_HAVE_IDAT)
+ else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
{
png_crc_finish(png_ptr, length);
png_chunk_benign_error(png_ptr, "out of place");
@@ -1635,7 +1637,7 @@ png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
*/
png_crc_read(png_ptr, buffer, length);
- if (png_crc_finish(png_ptr, skip))
+ if (png_crc_finish(png_ptr, skip) != 0)
return;
buffer[length] = 0;
@@ -1660,7 +1662,7 @@ png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
data_length = length - (png_uint_32)(entry_start - buffer);
/* Integrity-check the data length */
- if (data_length % entry_size)
+ if ((data_length % entry_size) != 0)
{
png_warning(png_ptr, "sPLT chunk has bad length");
return;
@@ -1742,7 +1744,7 @@ png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_free(png_ptr, new_palette.entries);
}
-#endif /* PNG_READ_sPLT_SUPPORTED */
+#endif /* READ_sPLT */
#ifdef PNG_READ_tRNS_SUPPORTED
void /* PRIVATE */
@@ -1752,17 +1754,17 @@ png_handle_tRNS(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_debug(1, "in png_handle_tRNS");
- if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
png_chunk_error(png_ptr, "missing IHDR");
- else if (png_ptr->mode & PNG_HAVE_IDAT)
+ else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
{
png_crc_finish(png_ptr, length);
png_chunk_benign_error(png_ptr, "out of place");
return;
}
- else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS))
+ else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS) != 0)
{
png_crc_finish(png_ptr, length);
png_chunk_benign_error(png_ptr, "duplicate");
@@ -1805,7 +1807,7 @@ png_handle_tRNS(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
{
- if (!(png_ptr->mode & PNG_HAVE_PLTE))
+ if ((png_ptr->mode & PNG_HAVE_PLTE) == 0)
{
/* TODO: is this actually an error in the ISO spec? */
png_crc_finish(png_ptr, length);
@@ -1832,7 +1834,7 @@ png_handle_tRNS(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
return;
}
- if (png_crc_finish(png_ptr, 0))
+ if (png_crc_finish(png_ptr, 0) != 0)
{
png_ptr->num_trans = 0;
return;
@@ -1857,19 +1859,19 @@ png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_debug(1, "in png_handle_bKGD");
- if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
png_chunk_error(png_ptr, "missing IHDR");
- else if ((png_ptr->mode & PNG_HAVE_IDAT) ||
- (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
- !(png_ptr->mode & PNG_HAVE_PLTE)))
+ else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0 ||
+ (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+ (png_ptr->mode & PNG_HAVE_PLTE) == 0))
{
png_crc_finish(png_ptr, length);
png_chunk_benign_error(png_ptr, "out of place");
return;
}
- else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD))
+ else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD) != 0)
{
png_crc_finish(png_ptr, length);
png_chunk_benign_error(png_ptr, "duplicate");
@@ -1879,7 +1881,7 @@ png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
truelen = 1;
- else if (png_ptr->color_type & PNG_COLOR_MASK_COLOR)
+ else if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
truelen = 6;
else
@@ -1894,7 +1896,7 @@ png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_crc_read(png_ptr, buf, truelen);
- if (png_crc_finish(png_ptr, 0))
+ if (png_crc_finish(png_ptr, 0) != 0)
return;
/* We convert the index value into RGB components so that we can allow
@@ -1906,7 +1908,7 @@ png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
{
background.index = buf[0];
- if (info_ptr && info_ptr->num_palette)
+ if (info_ptr != NULL && info_ptr->num_palette != 0)
{
if (buf[0] >= info_ptr->num_palette)
{
@@ -1925,7 +1927,7 @@ png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
background.gray = 0;
}
- else if (!(png_ptr->color_type & PNG_COLOR_MASK_COLOR)) /* GRAY */
+ else if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0) /* GRAY */
{
background.index = 0;
background.red =
@@ -1956,17 +1958,18 @@ png_handle_hIST(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_debug(1, "in png_handle_hIST");
- if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
png_chunk_error(png_ptr, "missing IHDR");
- else if ((png_ptr->mode & PNG_HAVE_IDAT) || !(png_ptr->mode & PNG_HAVE_PLTE))
+ else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0 ||
+ (png_ptr->mode & PNG_HAVE_PLTE) == 0)
{
png_crc_finish(png_ptr, length);
png_chunk_benign_error(png_ptr, "out of place");
return;
}
- else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST))
+ else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST) != 0)
{
png_crc_finish(png_ptr, length);
png_chunk_benign_error(png_ptr, "duplicate");
@@ -1990,7 +1993,7 @@ png_handle_hIST(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
readbuf[i] = png_get_uint_16(buf);
}
- if (png_crc_finish(png_ptr, 0))
+ if (png_crc_finish(png_ptr, 0) != 0)
return;
png_set_hIST(png_ptr, info_ptr, readbuf);
@@ -2007,17 +2010,17 @@ png_handle_pHYs(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_debug(1, "in png_handle_pHYs");
- if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
png_chunk_error(png_ptr, "missing IHDR");
- else if (png_ptr->mode & PNG_HAVE_IDAT)
+ else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
{
png_crc_finish(png_ptr, length);
png_chunk_benign_error(png_ptr, "out of place");
return;
}
- else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs))
+ else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs) != 0)
{
png_crc_finish(png_ptr, length);
png_chunk_benign_error(png_ptr, "duplicate");
@@ -2033,7 +2036,7 @@ png_handle_pHYs(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_crc_read(png_ptr, buf, 9);
- if (png_crc_finish(png_ptr, 0))
+ if (png_crc_finish(png_ptr, 0) != 0)
return;
res_x = png_get_uint_32(buf);
@@ -2053,17 +2056,17 @@ png_handle_oFFs(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_debug(1, "in png_handle_oFFs");
- if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
png_chunk_error(png_ptr, "missing IHDR");
- else if (png_ptr->mode & PNG_HAVE_IDAT)
+ else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
{
png_crc_finish(png_ptr, length);
png_chunk_benign_error(png_ptr, "out of place");
return;
}
- else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs))
+ else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs) != 0)
{
png_crc_finish(png_ptr, length);
png_chunk_benign_error(png_ptr, "duplicate");
@@ -2079,7 +2082,7 @@ png_handle_oFFs(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_crc_read(png_ptr, buf, 9);
- if (png_crc_finish(png_ptr, 0))
+ if (png_crc_finish(png_ptr, 0) != 0)
return;
offset_x = png_get_int_32(buf);
@@ -2102,17 +2105,17 @@ png_handle_pCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_debug(1, "in png_handle_pCAL");
- if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
png_chunk_error(png_ptr, "missing IHDR");
- else if (png_ptr->mode & PNG_HAVE_IDAT)
+ else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
{
png_crc_finish(png_ptr, length);
png_chunk_benign_error(png_ptr, "out of place");
return;
}
- else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL))
+ else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL) != 0)
{
png_crc_finish(png_ptr, length);
png_chunk_benign_error(png_ptr, "duplicate");
@@ -2133,7 +2136,7 @@ png_handle_pCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_crc_read(png_ptr, buffer, length);
- if (png_crc_finish(png_ptr, 0))
+ if (png_crc_finish(png_ptr, 0) != 0)
return;
buffer[length] = 0; /* Null terminate the last string */
@@ -2229,17 +2232,17 @@ png_handle_sCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_debug(1, "in png_handle_sCAL");
- if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
png_chunk_error(png_ptr, "missing IHDR");
- else if (png_ptr->mode & PNG_HAVE_IDAT)
+ else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
{
png_crc_finish(png_ptr, length);
png_chunk_benign_error(png_ptr, "out of place");
return;
}
- else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sCAL))
+ else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sCAL) != 0)
{
png_crc_finish(png_ptr, length);
png_chunk_benign_error(png_ptr, "duplicate");
@@ -2269,7 +2272,7 @@ png_handle_sCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_crc_read(png_ptr, buffer, length);
buffer[length] = 0; /* Null terminate the last string */
- if (png_crc_finish(png_ptr, 0))
+ if (png_crc_finish(png_ptr, 0) != 0)
return;
/* Validate the unit. */
@@ -2285,11 +2288,11 @@ png_handle_sCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
i = 1;
state = 0;
- if (!png_check_fp_number((png_const_charp)buffer, length, &state, &i) ||
+ if (png_check_fp_number((png_const_charp)buffer, length, &state, &i) == 0 ||
i >= length || buffer[i++] != 0)
png_chunk_benign_error(png_ptr, "bad width format");
- else if (!PNG_FP_IS_POSITIVE(state))
+ else if (PNG_FP_IS_POSITIVE(state) == 0)
png_chunk_benign_error(png_ptr, "non-positive width");
else
@@ -2297,11 +2300,11 @@ png_handle_sCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_size_t heighti = i;
state = 0;
- if (!png_check_fp_number((png_const_charp)buffer, length, &state, &i) ||
- i != length)
+ if (png_check_fp_number((png_const_charp)buffer, length,
+ &state, &i) == 0 || i != length)
png_chunk_benign_error(png_ptr, "bad height format");
- else if (!PNG_FP_IS_POSITIVE(state))
+ else if (PNG_FP_IS_POSITIVE(state) == 0)
png_chunk_benign_error(png_ptr, "non-positive height");
else
@@ -2321,17 +2324,17 @@ png_handle_tIME(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_debug(1, "in png_handle_tIME");
- if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
png_chunk_error(png_ptr, "missing IHDR");
- else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME))
+ else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME) != 0)
{
png_crc_finish(png_ptr, length);
png_chunk_benign_error(png_ptr, "duplicate");
return;
}
- if (png_ptr->mode & PNG_HAVE_IDAT)
+ if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
png_ptr->mode |= PNG_AFTER_IDAT;
if (length != 7)
@@ -2343,7 +2346,7 @@ png_handle_tIME(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_crc_read(png_ptr, buf, 7);
- if (png_crc_finish(png_ptr, 0))
+ if (png_crc_finish(png_ptr, 0) != 0)
return;
mod_time.second = buf[6];
@@ -2388,10 +2391,10 @@ png_handle_tEXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
}
#endif
- if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
png_chunk_error(png_ptr, "missing IHDR");
- if (png_ptr->mode & PNG_HAVE_IDAT)
+ if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
png_ptr->mode |= PNG_AFTER_IDAT;
#ifdef PNG_MAX_MALLOC_64K
@@ -2413,7 +2416,7 @@ png_handle_tEXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_crc_read(png_ptr, buffer, length);
- if (png_crc_finish(png_ptr, skip))
+ if (png_crc_finish(png_ptr, skip) != 0)
return;
key = (png_charp)buffer;
@@ -2433,7 +2436,7 @@ png_handle_tEXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
text_info.text = text;
text_info.text_length = strlen(text);
- if (png_set_text_2(png_ptr, info_ptr, &text_info, 1))
+ if (png_set_text_2(png_ptr, info_ptr, &text_info, 1) != 0)
png_warning(png_ptr, "Insufficient memory to process text chunk");
}
#endif
@@ -2467,10 +2470,10 @@ png_handle_zTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
}
#endif
- if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
png_chunk_error(png_ptr, "missing IHDR");
- if (png_ptr->mode & PNG_HAVE_IDAT)
+ if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
png_ptr->mode |= PNG_AFTER_IDAT;
buffer = png_read_buffer(png_ptr, length, 2/*silent*/);
@@ -2484,7 +2487,7 @@ png_handle_zTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_crc_read(png_ptr, buffer, length);
- if (png_crc_finish(png_ptr, 0))
+ if (png_crc_finish(png_ptr, 0) != 0)
return;
/* TODO: also check that the keyword contents match the spec! */
@@ -2534,7 +2537,7 @@ png_handle_zTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
text.lang = NULL;
text.lang_key = NULL;
- if (png_set_text_2(png_ptr, info_ptr, &text, 1))
+ if (png_set_text_2(png_ptr, info_ptr, &text, 1) != 0)
errmsg = "insufficient memory";
}
@@ -2576,10 +2579,10 @@ png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
}
#endif
- if (!(png_ptr->mode & PNG_HAVE_IHDR))
+ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
png_chunk_error(png_ptr, "missing IHDR");
- if (png_ptr->mode & PNG_HAVE_IDAT)
+ if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
png_ptr->mode |= PNG_AFTER_IDAT;
buffer = png_read_buffer(png_ptr, length+1, 1/*warn*/);
@@ -2593,7 +2596,7 @@ png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
png_crc_read(png_ptr, buffer, length);
- if (png_crc_finish(png_ptr, 0))
+ if (png_crc_finish(png_ptr, 0) != 0)
return;
/* First the keyword. */
@@ -2643,10 +2646,10 @@ png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
*/
++prefix_length;
- if (!compressed && prefix_length <= length)
+ if (compressed == 0 && prefix_length <= length)
uncompressed_length = length - prefix_length;
- else if (compressed && prefix_length < length)
+ else if (compressed != 0 && prefix_length < length)
{
uncompressed_length = PNG_SIZE_MAX;
@@ -2684,7 +2687,7 @@ png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
text.text_length = 0;
text.itxt_length = uncompressed_length;
- if (png_set_text_2(png_ptr, info_ptr, &text, 1))
+ if (png_set_text_2(png_ptr, info_ptr, &text, 1) != 0)
errmsg = "insufficient memory";
}
}
@@ -2712,7 +2715,7 @@ png_cache_unknown_chunk(png_structrp png_ptr, png_uint_32 length)
# ifdef PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
if (png_ptr->user_chunk_malloc_max > 0 &&
- png_ptr->user_chunk_malloc_max < limit)
+ png_ptr->user_chunk_malloc_max < limit)
limit = png_ptr->user_chunk_malloc_max;
# elif PNG_USER_CHUNK_MALLOC_MAX > 0
@@ -2755,7 +2758,7 @@ png_cache_unknown_chunk(png_structrp png_ptr, png_uint_32 length)
return 1;
}
}
-#endif /* PNG_READ_UNKNOWN_CHUNKS_SUPPORTED */
+#endif /* READ_UNKNOWN_CHUNKS */
/* Handle an unknown, or known but disabled, chunk */
void /* PRIVATE */
@@ -2794,7 +2797,7 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr,
*/
if (png_ptr->read_user_chunk_fn != NULL)
{
- if (png_cache_unknown_chunk(png_ptr, length))
+ if (png_cache_unknown_chunk(png_ptr, length) != 0)
{
/* Callback to user unknown chunk handler */
int ret = (*(png_ptr->read_user_chunk_fn))(png_ptr,
@@ -2855,7 +2858,7 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr,
else
/* Use the SAVE_UNKNOWN_CHUNKS code or skip the chunk */
-# endif /* PNG_READ_USER_CHUNKS_SUPPORTED */
+# endif /* READ_USER_CHUNKS */
# ifdef PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED
{
@@ -2871,7 +2874,7 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr,
(keep == PNG_HANDLE_CHUNK_IF_SAFE &&
PNG_CHUNK_ANCILLARY(png_ptr->chunk_name)))
{
- if (!png_cache_unknown_chunk(png_ptr, length))
+ if (png_cache_unknown_chunk(png_ptr, length) == 0)
keep = PNG_HANDLE_CHUNK_NEVER;
}
@@ -2922,7 +2925,7 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr,
--(png_ptr->user_chunk_cache_max);
/* FALL THROUGH */
case 0: /* no limit */
-# endif /* PNG_USER_LIMITS_SUPPORTED */
+# endif /* USER_LIMITS */
/* Here when the limit isn't reached or when limits are compiled
* out; store the chunk.
*/
@@ -2951,10 +2954,10 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr,
png_crc_finish(png_ptr, length);
PNG_UNUSED(info_ptr)
PNG_UNUSED(keep)
-#endif /* !PNG_READ_UNKNOWN_CHUNKS_SUPPORTED */
+#endif /* !READ_UNKNOWN_CHUNKS */
/* Check for unhandled critical chunks */
- if (!handled && PNG_CHUNK_CRITICAL(png_ptr->chunk_name))
+ if (handled == 0 && PNG_CHUNK_CRITICAL(png_ptr->chunk_name))
png_chunk_error(png_ptr, "unhandled critical chunk");
}
@@ -3037,7 +3040,8 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display)
end_ptr = dp + PNG_ROWBYTES(pixel_depth, row_width) - 1;
end_byte = *end_ptr;
# ifdef PNG_READ_PACKSWAP_SUPPORTED
- if (png_ptr->transformations & PNG_PACKSWAP) /* little-endian byte */
+ if ((png_ptr->transformations & PNG_PACKSWAP) != 0)
+ /* little-endian byte */
end_mask = 0xff << end_mask;
else /* big-endian byte */
@@ -3053,10 +3057,11 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display)
* pass.
*/
#ifdef PNG_READ_INTERLACING_SUPPORTED
- if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE) &&
- pass < 6 && (display == 0 ||
- /* The following copies everything for 'display' on passes 0, 2 and 4. */
- (display == 1 && (pass & 1) != 0)))
+ if (png_ptr->interlaced != 0 &&
+ (png_ptr->transformations & PNG_INTERLACE) != 0 &&
+ pass < 6 && (display == 0 ||
+ /* The following copies everything for 'display' on passes 0, 2 and 4. */
+ (display == 1 && (pass & 1) != 0)))
{
/* Narrow images may have no bits in a pass; the caller should handle
* this, but this test is cheap:
@@ -3188,7 +3193,7 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display)
*/
# define MASK(pass,depth,display,png)\
((display)?B_MASK(pass,depth,png):S_MASK(pass,depth,png))
-#endif /* !PNG_USE_COMPILE_TIME_MASKS */
+#endif /* !USE_COMPILE_TIME_MASKS */
/* Use the appropriate mask to copy the required bits. In some cases
* the byte mask will be 0 or 0xff; optimize these cases. row_width is
@@ -3199,7 +3204,7 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display)
png_uint_32 mask;
# ifdef PNG_READ_PACKSWAP_SUPPORTED
- if (png_ptr->transformations & PNG_PACKSWAP)
+ if ((png_ptr->transformations & PNG_PACKSWAP) != 0)
mask = MASK(pass, pixel_depth, display, 0);
else
@@ -3350,24 +3355,24 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display)
* wide bytes_to_copy either - use the memcpy there.
*/
if (bytes_to_copy < 16 /*else use memcpy*/ &&
- png_isaligned(dp, png_uint_16) &&
- png_isaligned(sp, png_uint_16) &&
- bytes_to_copy % (sizeof (png_uint_16)) == 0 &&
- bytes_to_jump % (sizeof (png_uint_16)) == 0)
+ png_isaligned(dp, png_uint_16) &&
+ png_isaligned(sp, png_uint_16) &&
+ bytes_to_copy % (sizeof (png_uint_16)) == 0 &&
+ bytes_to_jump % (sizeof (png_uint_16)) == 0)
{
/* Everything is aligned for png_uint_16 copies, but try for
* png_uint_32 first.
*/
- if (png_isaligned(dp, png_uint_32) &&
- png_isaligned(sp, png_uint_32) &&
- bytes_to_copy % (sizeof (png_uint_32)) == 0 &&
- bytes_to_jump % (sizeof (png_uint_32)) == 0)
+ if (png_isaligned(dp, png_uint_32) != 0 &&
+ png_isaligned(sp, png_uint_32) != 0 &&
+ bytes_to_copy % (sizeof (png_uint_32)) == 0 &&
+ bytes_to_jump % (sizeof (png_uint_32)) == 0)
{
png_uint_32p dp32 = png_aligncast(png_uint_32p,dp);
png_const_uint_32p sp32 = png_aligncastconst(
- png_const_uint_32p, sp);
+ png_const_uint_32p, sp);
size_t skip = (bytes_to_jump-bytes_to_copy) /
- (sizeof (png_uint_32));
+ (sizeof (png_uint_32));
do
{
@@ -3439,7 +3444,7 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display)
return;
}
}
-#endif /* PNG_ALIGN_ code */
+#endif /* ALIGN_TYPE code */
/* The true default - use a memcpy: */
for (;;)
@@ -3463,7 +3468,7 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display)
/* Here if pixel_depth < 8 to check 'end_ptr' below. */
}
else
-#endif /* PNG_READ_INTERLACING_SUPPORTED */
+#endif /* READ_INTERLACING */
/* If here then the switch above wasn't used so just memcpy the whole row
* from the temporary row buffer (notice that this overwrites the end of the
@@ -3506,7 +3511,7 @@ png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
int j;
#ifdef PNG_READ_PACKSWAP_SUPPORTED
- if (transformations & PNG_PACKSWAP)
+ if ((transformations & PNG_PACKSWAP) != 0)
{
sshift = (int)((row_info->width + 7) & 0x07);
dshift = (int)((final_width + 7) & 0x07);
@@ -3566,7 +3571,7 @@ png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
png_uint_32 i;
#ifdef PNG_READ_PACKSWAP_SUPPORTED
- if (transformations & PNG_PACKSWAP)
+ if ((transformations & PNG_PACKSWAP) != 0)
{
sshift = (int)(((row_info->width + 3) & 0x03) << 1);
dshift = (int)(((final_width + 3) & 0x03) << 1);
@@ -3629,7 +3634,7 @@ png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
int jstop = png_pass_inc[pass];
#ifdef PNG_READ_PACKSWAP_SUPPORTED
- if (transformations & PNG_PACKSWAP)
+ if ((transformations & PNG_PACKSWAP) != 0)
{
sshift = (int)(((row_info->width + 1) & 0x01) << 2);
dshift = (int)(((final_width + 1) & 0x01) << 2);
@@ -3719,7 +3724,7 @@ png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
PNG_UNUSED(transformations) /* Silence compiler warning */
#endif
}
-#endif /* PNG_READ_INTERLACING_SUPPORTED */
+#endif /* READ_INTERLACING */
static void
png_read_filter_row_sub(png_row_infop row_info, png_bytep row,
@@ -4070,7 +4075,7 @@ png_read_finish_IDAT(png_structrp png_ptr)
* read it otherwise stray unread IDAT data or, more likely, an IDAT chunk
* may still remain to be consumed.
*/
- if (!(png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED))
+ if ((png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) == 0)
{
/* The NULL causes png_read_IDAT_data to swallow any remaining bytes in
* the compressed stream, but the stream may be damaged too, so even after
@@ -4082,7 +4087,7 @@ png_read_finish_IDAT(png_structrp png_ptr)
/* Now clear everything out for safety; the following may not have been
* done.
*/
- if (!(png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED))
+ if ((png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) == 0)
{
png_ptr->mode |= PNG_AFTER_IDAT;
png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
@@ -4132,7 +4137,7 @@ png_read_finish_row(png_structrp png_ptr)
if (png_ptr->row_number < png_ptr->num_rows)
return;
- if (png_ptr->interlaced)
+ if (png_ptr->interlaced != 0)
{
png_ptr->row_number = 0;
@@ -4153,7 +4158,7 @@ png_read_finish_row(png_structrp png_ptr)
png_pass_start[png_ptr->pass]) /
png_pass_inc[png_ptr->pass];
- if (!(png_ptr->transformations & PNG_INTERLACE))
+ if ((png_ptr->transformations & PNG_INTERLACE) == 0)
{
png_ptr->num_rows = (png_ptr->height +
png_pass_yinc[png_ptr->pass] - 1 -
@@ -4173,7 +4178,7 @@ png_read_finish_row(png_structrp png_ptr)
/* Here after at the end of the last row of the last pass. */
png_read_finish_IDAT(png_ptr);
}
-#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
+#endif /* SEQUENTIAL_READ */
void /* PRIVATE */
png_read_start_row(png_structrp png_ptr)
@@ -4200,9 +4205,9 @@ png_read_start_row(png_structrp png_ptr)
#ifdef PNG_READ_TRANSFORMS_SUPPORTED
png_init_read_transformations(png_ptr);
#endif
- if (png_ptr->interlaced)
+ if (png_ptr->interlaced != 0)
{
- if (!(png_ptr->transformations & PNG_INTERLACE))
+ if ((png_ptr->transformations & PNG_INTERLACE) == 0)
png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
png_pass_ystart[0]) / png_pass_yinc[0];
@@ -4234,16 +4239,16 @@ png_read_start_row(png_structrp png_ptr)
* TODO: fix this.
*/
#ifdef PNG_READ_PACK_SUPPORTED
- if ((png_ptr->transformations & PNG_PACK) && png_ptr->bit_depth < 8)
+ if ((png_ptr->transformations & PNG_PACK) != 0 && png_ptr->bit_depth < 8)
max_pixel_depth = 8;
#endif
#ifdef PNG_READ_EXPAND_SUPPORTED
- if (png_ptr->transformations & PNG_EXPAND)
+ if ((png_ptr->transformations & PNG_EXPAND) != 0)
{
if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
{
- if (png_ptr->num_trans)
+ if (png_ptr->num_trans != 0)
max_pixel_depth = 32;
else
@@ -4255,13 +4260,13 @@ png_read_start_row(png_structrp png_ptr)
if (max_pixel_depth < 8)
max_pixel_depth = 8;
- if (png_ptr->num_trans)
+ if (png_ptr->num_trans != 0)
max_pixel_depth *= 2;
}
else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB)
{
- if (png_ptr->num_trans)
+ if (png_ptr->num_trans != 0)
{
max_pixel_depth *= 4;
max_pixel_depth /= 3;
@@ -4271,13 +4276,13 @@ png_read_start_row(png_structrp png_ptr)
#endif
#ifdef PNG_READ_EXPAND_16_SUPPORTED
- if (png_ptr->transformations & PNG_EXPAND_16)
+ if ((png_ptr->transformations & PNG_EXPAND_16) != 0)
{
# ifdef PNG_READ_EXPAND_SUPPORTED
/* In fact it is an error if it isn't supported, but checking is
* the safe way.
*/
- if (png_ptr->transformations & PNG_EXPAND)
+ if ((png_ptr->transformations & PNG_EXPAND) != 0)
{
if (png_ptr->bit_depth < 16)
max_pixel_depth *= 2;
@@ -4289,7 +4294,7 @@ png_read_start_row(png_structrp png_ptr)
#endif
#ifdef PNG_READ_FILLER_SUPPORTED
- if (png_ptr->transformations & (PNG_FILLER))
+ if ((png_ptr->transformations & (PNG_FILLER)) != 0)
{
if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY)
{
@@ -4313,14 +4318,15 @@ png_read_start_row(png_structrp png_ptr)
#endif
#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED
- if (png_ptr->transformations & PNG_GRAY_TO_RGB)
+ if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0)
{
if (
#ifdef PNG_READ_EXPAND_SUPPORTED
- (png_ptr->num_trans && (png_ptr->transformations & PNG_EXPAND)) ||
+ (png_ptr->num_trans != 0 &&
+ (png_ptr->transformations & PNG_EXPAND) != 0) ||
#endif
#ifdef PNG_READ_FILLER_SUPPORTED
- (png_ptr->transformations & (PNG_FILLER)) ||
+ (png_ptr->transformations & (PNG_FILLER)) != 0 ||
#endif
png_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
{
@@ -4353,7 +4359,7 @@ png_read_start_row(png_structrp png_ptr)
#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) && \
defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
- if (png_ptr->transformations & PNG_USER_TRANSFORM)
+ if ((png_ptr->transformations & PNG_USER_TRANSFORM) != 0)
{
int user_pixel_depth = png_ptr->user_transform_depth *
png_ptr->user_transform_channels;
@@ -4389,7 +4395,7 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
png_free(png_ptr, png_ptr->big_row_buf);
png_free(png_ptr, png_ptr->big_prev_row);
- if (png_ptr->interlaced)
+ if (png_ptr->interlaced != 0)
png_ptr->big_row_buf = (png_bytep)png_calloc(png_ptr,
row_bytes + 48);
@@ -4446,7 +4452,7 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
* does not, so free the read buffer now regardless; the sequential reader
* reallocates it on demand.
*/
- if (png_ptr->read_buffer)
+ if (png_ptr->read_buffer != 0)
{
png_bytep buffer = png_ptr->read_buffer;
@@ -4465,4 +4471,4 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
png_ptr->flags |= PNG_FLAG_ROW_INIT;
}
-#endif /* PNG_READ_SUPPORTED */
+#endif /* READ */
diff --git a/source/libs/libpng/libpng-1.6.14/pngset.c b/source/libs/libpng/libpng-1.6.15/pngset.c
similarity index 96%
rename from source/libs/libpng/libpng-1.6.14/pngset.c
rename to source/libs/libpng/libpng-1.6.15/pngset.c
index 8eb5f6e30747c7c27800c0d6a82326e302f2947a..2f1f550dafe8a28cb34190951f2d785b7380505d 100644
--- a/source/libs/libpng/libpng-1.6.14/pngset.c
+++ b/source/libs/libpng/libpng-1.6.15/pngset.c
@@ -1,7 +1,7 @@
/* pngset.c - storage of image information into info struct
*
- * Last changed in libpng 1.6.11 [June 5, 2014]
+ * Last changed in libpng 1.6.15 [November 20, 2014]
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -59,7 +59,7 @@ png_set_cHRM_fixed(png_const_structrp png_ptr, png_inforp info_ptr,
xy.whitey = white_y;
if (png_colorspace_set_chromaticities(png_ptr, &info_ptr->colorspace, &xy,
- 2/* override with app values*/))
+ 2/* override with app values*/) != 0)
info_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM;
png_colorspace_sync_info(png_ptr, info_ptr);
@@ -90,7 +90,8 @@ png_set_cHRM_XYZ_fixed(png_const_structrp png_ptr, png_inforp info_ptr,
XYZ.blue_Y = int_blue_Y;
XYZ.blue_Z = int_blue_Z;
- if (png_colorspace_set_endpoints(png_ptr, &info_ptr->colorspace, &XYZ, 2))
+ if (png_colorspace_set_endpoints(png_ptr, &info_ptr->colorspace,
+ &XYZ, 2) != 0)
info_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM;
png_colorspace_sync_info(png_ptr, info_ptr);
@@ -129,9 +130,9 @@ png_set_cHRM_XYZ(png_const_structrp png_ptr, png_inforp info_ptr, double red_X,
png_fixed(png_ptr, blue_Y, "cHRM Red Y"),
png_fixed(png_ptr, blue_Z, "cHRM Red Z"));
}
-# endif /* PNG_FLOATING_POINT_SUPPORTED */
+# endif /* FLOATING_POINT */
-#endif /* PNG_cHRM_SUPPORTED */
+#endif /* cHRM */
#ifdef PNG_gAMA_SUPPORTED
void PNGFAPI
@@ -227,13 +228,13 @@ png_set_IHDR(png_const_structrp png_ptr, png_inforp info_ptr,
if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
info_ptr->channels = 1;
- else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
+ else if ((info_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0)
info_ptr->channels = 3;
else
info_ptr->channels = 1;
- if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
+ if ((info_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0)
info_ptr->channels++;
info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);
@@ -288,12 +289,14 @@ png_set_pCAL(png_const_structrp png_ptr, png_inforp info_ptr,
/* Validate params[nparams] */
for (i=0; i<nparams; ++i)
+ {
if (params[i] == NULL ||
- !png_check_fp_string(params[i], strlen(params[i])))
+ !png_check_fp_string(params[i], strlen(params[i])))
png_error(png_ptr, "Invalid format for pCAL parameter");
+ }
info_ptr->pcal_purpose = png_voidcast(png_charp,
- png_malloc_warn(png_ptr, length));
+ png_malloc_warn(png_ptr, length));
if (info_ptr->pcal_purpose == NULL)
{
@@ -594,7 +597,8 @@ png_set_sRGB_gAMA_and_cHRM(png_const_structrp png_ptr, png_inforp info_ptr,
if (png_ptr == NULL || info_ptr == NULL)
return;
- if (png_colorspace_set_sRGB(png_ptr, &info_ptr->colorspace, srgb_intent))
+ if (png_colorspace_set_sRGB(png_ptr, &info_ptr->colorspace,
+ srgb_intent) != 0)
{
/* This causes the gAMA and cHRM to be written too */
info_ptr->colorspace.flags |=
@@ -661,6 +665,7 @@ png_set_iCCP(png_const_structrp png_ptr, png_inforp info_ptr,
if (new_iccp_profile == NULL)
{
png_free(png_ptr, new_iccp_name);
+ new_iccp_name = NULL;
png_benign_error(png_ptr,
"Insufficient memory to process iCCP profile");
return;
@@ -890,7 +895,7 @@ png_set_tIME(png_const_structrp png_ptr, png_inforp info_ptr,
png_debug1(1, "in %s storage function", "tIME");
if (png_ptr == NULL || info_ptr == NULL || mod_time == NULL ||
- (png_ptr->mode & PNG_WROTE_tIME))
+ (png_ptr->mode & PNG_WROTE_tIME) != 0)
return;
if (mod_time->month == 0 || mod_time->month > 12 ||
@@ -1041,6 +1046,7 @@ png_set_sPLT(png_const_structrp png_ptr,
if (np->entries == NULL)
{
png_free(png_ptr, np->name);
+ np->name = NULL;
break;
}
@@ -1063,7 +1069,7 @@ png_set_sPLT(png_const_structrp png_ptr,
if (nentries > 0)
png_chunk_report(png_ptr, "sPLT out of memory", PNG_CHUNK_WRITE_ERROR);
}
-#endif /* PNG_sPLT_SUPPORTED */
+#endif /* sPLT */
#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
static png_byte
@@ -1075,7 +1081,7 @@ check_location(png_const_structrp png_ptr, int location)
* change; previously the app had to use the
* png_set_unknown_chunk_location API below for each chunk.
*/
- if (location == 0 && !(png_ptr->mode & PNG_IS_READ_STRUCT))
+ if (location == 0 && (png_ptr->mode & PNG_IS_READ_STRUCT) == 0)
{
/* Write struct, so unknown chunks come from the app */
png_app_warning(png_ptr,
@@ -1121,7 +1127,7 @@ png_set_unknown_chunks(png_const_structrp png_ptr,
*/
# if !defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) && \
defined(PNG_READ_SUPPORTED)
- if (png_ptr->mode & PNG_IS_READ_STRUCT)
+ if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)
{
png_app_error(png_ptr, "no unknown chunk support on read");
return;
@@ -1129,7 +1135,7 @@ png_set_unknown_chunks(png_const_structrp png_ptr,
# endif
# if !defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED) && \
defined(PNG_WRITE_SUPPORTED)
- if (!(png_ptr->mode & PNG_IS_READ_STRUCT))
+ if ((png_ptr->mode & PNG_IS_READ_STRUCT) == 0)
{
png_app_error(png_ptr, "no unknown chunk support on write");
return;
@@ -1215,7 +1221,7 @@ png_set_unknown_chunk_location(png_const_structrp png_ptr, png_inforp info_ptr,
{
png_app_error(png_ptr, "invalid unknown chunk location");
/* Fake out the pre 1.6.0 behavior: */
- if ((location & PNG_HAVE_IDAT)) /* undocumented! */
+ if ((location & PNG_HAVE_IDAT) != 0) /* undocumented! */
location = PNG_AFTER_IDAT;
else
@@ -1253,10 +1259,13 @@ add_one_chunk(png_bytep list, unsigned int count, png_const_bytep add, int keep)
/* Utility function: update the 'keep' state of a chunk if it is already in
* the list, otherwise add it to the list.
*/
- for (i=0; i<count; ++i, list += 5) if (memcmp(list, add, 4) == 0)
+ for (i=0; i<count; ++i, list += 5)
{
- list[4] = (png_byte)keep;
- return count;
+ if (memcmp(list, add, 4) == 0)
+ {
+ list[4] = (png_byte)keep;
+ return count;
+ }
}
if (keep != PNG_HANDLE_CHUNK_AS_DEFAULT)
@@ -1320,7 +1329,7 @@ png_set_keep_unknown_chunks(png_structrp png_ptr, int keep,
};
chunk_list = chunks_to_ignore;
- num_chunks = (sizeof chunks_to_ignore)/5;
+ num_chunks = (unsigned int)/*SAFE*/(sizeof chunks_to_ignore)/5U;
}
else /* num_chunks_in > 0 */
@@ -1380,12 +1389,15 @@ png_set_keep_unknown_chunks(png_structrp png_ptr, int keep,
unsigned int i;
for (i=0; i<num_chunks; ++i)
+ {
old_num_chunks = add_one_chunk(new_list, old_num_chunks,
chunk_list+5*i, keep);
+ }
/* Now remove any spurious 'default' entries. */
num_chunks = 0;
for (i=0, inlist=outlist=new_list; i<old_num_chunks; ++i, inlist += 5)
+ {
if (inlist[4])
{
if (outlist != inlist)
@@ -1393,6 +1405,7 @@ png_set_keep_unknown_chunks(png_structrp png_ptr, int keep,
outlist += 5;
++num_chunks;
}
+ }
/* This means the application has removed all the specialized handling. */
if (num_chunks == 0)
@@ -1444,7 +1457,8 @@ png_set_rows(png_const_structrp png_ptr, png_inforp info_ptr,
if (png_ptr == NULL || info_ptr == NULL)
return;
- if (info_ptr->row_pointers && (info_ptr->row_pointers != row_pointers))
+ if (info_ptr->row_pointers != NULL &&
+ (info_ptr->row_pointers != row_pointers))
png_free_data(png_ptr, info_ptr, PNG_FREE_ROWS, 0);
info_ptr->row_pointers = row_pointers;
@@ -1464,7 +1478,7 @@ png_set_compression_buffer_size(png_structrp png_ptr, png_size_t size)
png_error(png_ptr, "invalid compression buffer size");
# ifdef PNG_SEQUENTIAL_READ_SUPPORTED
- if (png_ptr->mode & PNG_IS_READ_STRUCT)
+ if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)
{
png_ptr->IDAT_read_size = (png_uint_32)size; /* checked above */
return;
@@ -1472,7 +1486,7 @@ png_set_compression_buffer_size(png_structrp png_ptr, png_size_t size)
# endif
# ifdef PNG_WRITE_SUPPORTED
- if (!(png_ptr->mode & PNG_IS_READ_STRUCT))
+ if ((png_ptr->mode & PNG_IS_READ_STRUCT) == 0)
{
if (png_ptr->zowner != 0)
{
@@ -1510,7 +1524,7 @@ png_set_compression_buffer_size(png_structrp png_ptr, png_size_t size)
void PNGAPI
png_set_invalid(png_const_structrp png_ptr, png_inforp info_ptr, int mask)
{
- if (png_ptr && info_ptr)
+ if (png_ptr != NULL && info_ptr != NULL)
info_ptr->valid &= ~mask;
}
@@ -1548,7 +1562,7 @@ png_set_chunk_malloc_max (png_structrp png_ptr,
if (png_ptr != NULL)
png_ptr->user_chunk_malloc_max = user_chunk_malloc_max;
}
-#endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */
+#endif /* ?SET_USER_LIMITS */
#ifdef PNG_BENIGN_ERRORS_SUPPORTED
@@ -1571,7 +1585,7 @@ png_set_benign_errors(png_structrp png_ptr, int allowed)
png_ptr->flags &= ~(PNG_FLAG_BENIGN_ERRORS_WARN |
PNG_FLAG_APP_WARNINGS_WARN | PNG_FLAG_APP_ERRORS_WARN);
}
-#endif /* PNG_BENIGN_ERRORS_SUPPORTED */
+#endif /* BENIGN_ERRORS */
#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
/* Whether to report invalid palette index; added at libng-1.5.10.
@@ -1594,4 +1608,4 @@ png_set_check_for_invalid_index(png_structrp png_ptr, int allowed)
png_ptr->num_palette_max = -1;
}
#endif
-#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
+#endif /* READ || WRITE */
diff --git a/source/libs/libpng/libpng-1.6.14/pngstruct.h b/source/libs/libpng/libpng-1.6.15/pngstruct.h
similarity index 99%
rename from source/libs/libpng/libpng-1.6.14/pngstruct.h
rename to source/libs/libpng/libpng-1.6.15/pngstruct.h
index d58c0288449fcd85931b18f919ba4a26e912cc2e..c1dd026a9003a164b39ebe18bf3ffcc8b83e6e18 100644
--- a/source/libs/libpng/libpng-1.6.14/pngstruct.h
+++ b/source/libs/libpng/libpng-1.6.15/pngstruct.h
@@ -274,7 +274,7 @@ struct png_struct_def
#ifdef PNG_READ_GAMMA_SUPPORTED
png_color_16 background_1; /* background normalized to gamma 1.0 */
#endif
-#endif /* PNG_bKGD_SUPPORTED */
+#endif /* bKGD */
#ifdef PNG_WRITE_FLUSH_SUPPORTED
png_flush_ptr output_flush_fn; /* Function for flushing output */
@@ -331,7 +331,7 @@ struct png_struct_def
int process_mode; /* what push library is currently doing */
int cur_palette; /* current push library palette index */
-#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+#endif /* PROGRESSIVE_READ */
#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
/* For the Borland special 64K segment handler */
diff --git a/source/libs/libpng/libpng-1.6.14/pngtest.c b/source/libs/libpng/libpng-1.6.15/pngtest.c
similarity index 95%
rename from source/libs/libpng/libpng-1.6.14/pngtest.c
rename to source/libs/libpng/libpng-1.6.15/pngtest.c
index e9218ba9f73845b83abbcc387f4796c9c184da10..0cb1a716a2348eb2d82a1962dd4ba0a40ea9f652 100644
--- a/source/libs/libpng/libpng-1.6.14/pngtest.c
+++ b/source/libs/libpng/libpng-1.6.15/pngtest.c
@@ -1,7 +1,7 @@
/* pngtest.c - a simple test program to test libpng
*
- * Last changed in libpng 1.6.11 [June 5, 2014]
+ * Last changed in libpng 1.6.15 [November 20, 2014]
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -283,7 +283,8 @@ count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data)
png_uint_32 n, nstop;
int channel;
int color_channels = row_info->channels;
- if (row_info->color_type > 3)color_channels--;
+ if (row_info->color_type > 3)
+ color_channels--;
for (n = 0, nstop=row_info->width; n<nstop; n++)
{
@@ -310,7 +311,7 @@ count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data)
}
}
}
-#endif /* PNG_WRITE_USER_TRANSFORM_SUPPORTED */
+#endif /* WRITE_USER_TRANSFORM */
#ifndef PNG_STDIO_SUPPORTED
/* START of code to validate stdio-free compilation */
@@ -419,7 +420,7 @@ pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
pngtest_check_io_state(png_ptr, length, PNG_IO_WRITING);
#endif
}
-#endif /* !PNG_STDIO_SUPPORTED */
+#endif /* !STDIO */
/* This function is called when there is a warning, but the library thinks
* it can continue anyway. Replacement functions don't have to do anything
@@ -588,7 +589,7 @@ png_debug_free(png_structp png_ptr, png_voidp ptr)
if (pinfo->next == NULL)
{
- fprintf(STDERR, "Pointer %x not found\n", (unsigned int)ptr);
+ fprintf(STDERR, "Pointer %p not found\n", ptr);
break;
}
@@ -604,7 +605,7 @@ png_debug_free(png_structp png_ptr, png_voidp ptr)
free(ptr);
ptr = NULL;
}
-#endif /* PNG_USER_MEM_SUPPORTED && PNG_DEBUG */
+#endif /* USER_MEM && DEBUG */
/* END of code to test memory allocation/deallocation */
@@ -643,7 +644,7 @@ set_location(png_structp png_ptr, struct user_chunk_data *data, int what)
{
int location;
- if ((data->location[0] & what) || (data->location[1] & what))
+ if ((data->location[0] & what) != 0 || (data->location[1] & what) != 0)
return 0; /* already have one of these */
/* Find where we are (the code below zeroes info_ptr to indicate that the
@@ -652,7 +653,7 @@ set_location(png_structp png_ptr, struct user_chunk_data *data, int what)
if (data->info_ptr == NULL) /* after IDAT */
location = what | after_IDAT;
- else if (png_get_valid(png_ptr, data->info_ptr, PNG_INFO_PLTE))
+ else if (png_get_valid(png_ptr, data->info_ptr, PNG_INFO_PLTE) != 0)
location = what | before_IDAT;
else
@@ -699,7 +700,7 @@ read_user_chunk_callback(png_struct *png_ptr, png_unknown_chunkp chunk)
if (chunk->data[0] != 0 && chunk->data[0] != 1)
return (-1); /* Invalid mode */
- if (set_location(png_ptr, my_user_chunk_data, have_sTER))
+ if (set_location(png_ptr, my_user_chunk_data, have_sTER) != 0)
{
my_user_chunk_data->sTER_mode=chunk->data[0];
return (1);
@@ -718,7 +719,7 @@ read_user_chunk_callback(png_struct *png_ptr, png_unknown_chunkp chunk)
if (chunk->size != 9)
return (-1); /* Error return */
- if (!set_location(png_ptr, my_user_chunk_data, have_vpAg))
+ if (set_location(png_ptr, my_user_chunk_data, have_vpAg) == 0)
return (0); /* duplicate vpAg */
my_user_chunk_data->vpAg_width = png_get_uint_31(png_ptr, chunk->data);
@@ -779,8 +780,8 @@ write_chunks(png_structp write_ptr, int location)
write_vpAg_chunk(write_ptr);
}
}
-#endif /* PNG_WRITE_SUPPORTED */
-#else /* !PNG_READ_USER_CHUNKS_SUPPORTED */
+#endif /* WRITE */
+#else /* !READ_USER_CHUNKS */
# define write_chunks(pp,loc) ((void)0)
#endif
/* END of code to demonstrate user chunk support */
@@ -1049,7 +1050,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
int interlace_type, compression_type, filter_type;
if (png_get_IHDR(read_ptr, read_info_ptr, &width, &height, &bit_depth,
- &color_type, &interlace_type, &compression_type, &filter_type))
+ &color_type, &interlace_type, &compression_type, &filter_type) != 0)
{
png_set_IHDR(write_ptr, write_info_ptr, width, height, bit_depth,
color_type, interlace_type, compression_type, filter_type);
@@ -1082,7 +1083,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
blue_y;
if (png_get_cHRM_fixed(read_ptr, read_info_ptr, &white_x, &white_y,
- &red_x, &red_y, &green_x, &green_y, &blue_x, &blue_y))
+ &red_x, &red_y, &green_x, &green_y, &blue_x, &blue_y) != 0)
{
png_set_cHRM_fixed(write_ptr, write_info_ptr, white_x, white_y, red_x,
red_y, green_x, green_y, blue_x, blue_y);
@@ -1093,7 +1094,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
{
png_fixed_point gamma;
- if (png_get_gAMA_fixed(read_ptr, read_info_ptr, &gamma))
+ if (png_get_gAMA_fixed(read_ptr, read_info_ptr, &gamma) != 0)
png_set_gAMA_fixed(write_ptr, write_info_ptr, gamma);
}
#endif
@@ -1105,7 +1106,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
blue_y;
if (png_get_cHRM(read_ptr, read_info_ptr, &white_x, &white_y, &red_x,
- &red_y, &green_x, &green_y, &blue_x, &blue_y))
+ &red_y, &green_x, &green_y, &blue_x, &blue_y) != 0)
{
png_set_cHRM(write_ptr, write_info_ptr, white_x, white_y, red_x,
red_y, green_x, green_y, blue_x, blue_y);
@@ -1116,7 +1117,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
{
double gamma;
- if (png_get_gAMA(read_ptr, read_info_ptr, &gamma))
+ if (png_get_gAMA(read_ptr, read_info_ptr, &gamma) != 0)
png_set_gAMA(write_ptr, write_info_ptr, gamma);
}
#endif
@@ -1130,7 +1131,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
int compression_type;
if (png_get_iCCP(read_ptr, read_info_ptr, &name, &compression_type,
- &profile, &proflen))
+ &profile, &proflen) != 0)
{
png_set_iCCP(write_ptr, write_info_ptr, name, compression_type,
profile, proflen);
@@ -1141,7 +1142,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
{
int intent;
- if (png_get_sRGB(read_ptr, read_info_ptr, &intent))
+ if (png_get_sRGB(read_ptr, read_info_ptr, &intent) != 0)
png_set_sRGB(write_ptr, write_info_ptr, intent);
}
#endif
@@ -1149,14 +1150,14 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
png_colorp palette;
int num_palette;
- if (png_get_PLTE(read_ptr, read_info_ptr, &palette, &num_palette))
+ if (png_get_PLTE(read_ptr, read_info_ptr, &palette, &num_palette) != 0)
png_set_PLTE(write_ptr, write_info_ptr, palette, num_palette);
}
#ifdef PNG_bKGD_SUPPORTED
{
png_color_16p background;
- if (png_get_bKGD(read_ptr, read_info_ptr, &background))
+ if (png_get_bKGD(read_ptr, read_info_ptr, &background) != 0)
{
png_set_bKGD(write_ptr, write_info_ptr, background);
}
@@ -1166,7 +1167,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
{
png_uint_16p hist;
- if (png_get_hIST(read_ptr, read_info_ptr, &hist))
+ if (png_get_hIST(read_ptr, read_info_ptr, &hist) != 0)
png_set_hIST(write_ptr, write_info_ptr, hist);
}
#endif
@@ -1176,7 +1177,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
int unit_type;
if (png_get_oFFs(read_ptr, read_info_ptr, &offset_x, &offset_y,
- &unit_type))
+ &unit_type) != 0)
{
png_set_oFFs(write_ptr, write_info_ptr, offset_x, offset_y, unit_type);
}
@@ -1190,7 +1191,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
int type, nparams;
if (png_get_pCAL(read_ptr, read_info_ptr, &purpose, &X0, &X1, &type,
- &nparams, &units, ¶ms))
+ &nparams, &units, ¶ms) != 0)
{
png_set_pCAL(write_ptr, write_info_ptr, purpose, X0, X1, type,
nparams, units, params);
@@ -1202,7 +1203,8 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
png_uint_32 res_x, res_y;
int unit_type;
- if (png_get_pHYs(read_ptr, read_info_ptr, &res_x, &res_y, &unit_type))
+ if (png_get_pHYs(read_ptr, read_info_ptr, &res_x, &res_y,
+ &unit_type) != 0)
png_set_pHYs(write_ptr, write_info_ptr, res_x, res_y, unit_type);
}
#endif
@@ -1210,7 +1212,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
{
png_color_8p sig_bit;
- if (png_get_sBIT(read_ptr, read_info_ptr, &sig_bit))
+ if (png_get_sBIT(read_ptr, read_info_ptr, &sig_bit) != 0)
png_set_sBIT(write_ptr, write_info_ptr, sig_bit);
}
#endif
@@ -1222,7 +1224,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
double scal_width, scal_height;
if (png_get_sCAL(read_ptr, read_info_ptr, &unit, &scal_width,
- &scal_height))
+ &scal_height) != 0)
{
png_set_sCAL(write_ptr, write_info_ptr, unit, scal_width, scal_height);
}
@@ -1234,7 +1236,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
png_charp scal_width, scal_height;
if (png_get_sCAL_s(read_ptr, read_info_ptr, &unit, &scal_width,
- &scal_height))
+ &scal_height) != 0)
{
png_set_sCAL_s(write_ptr, write_info_ptr, unit, scal_width,
scal_height);
@@ -1274,11 +1276,11 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
{
png_timep mod_time;
- if (png_get_tIME(read_ptr, read_info_ptr, &mod_time))
+ if (png_get_tIME(read_ptr, read_info_ptr, &mod_time) != 0)
{
png_set_tIME(write_ptr, write_info_ptr, mod_time);
#ifdef PNG_TIME_RFC1123_SUPPORTED
- if (png_convert_to_rfc1123_buffer(tIME_string, mod_time))
+ if (png_convert_to_rfc1123_buffer(tIME_string, mod_time) != 0)
tIME_string[(sizeof tIME_string) - 1] = '\0';
else
@@ -1288,7 +1290,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
}
tIME_chunk_present++;
-#endif /* PNG_TIME_RFC1123_SUPPORTED */
+#endif /* TIME_RFC1123 */
}
}
#endif
@@ -1299,7 +1301,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
png_color_16p trans_color;
if (png_get_tRNS(read_ptr, read_info_ptr, &trans_alpha, &num_trans,
- &trans_color))
+ &trans_color) != 0)
{
int sample_max = (1 << bit_depth);
/* libpng doesn't reject a tRNS chunk with out-of-range samples */
@@ -1382,11 +1384,12 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
{
#ifndef SINGLE_ROWBUF_ALLOC
pngtest_debug2("Allocating row buffer (pass %d, y = %u)...", pass, y);
+
row_buf = (png_bytep)png_malloc(read_ptr,
png_get_rowbytes(read_ptr, read_info_ptr));
- pngtest_debug2("\t0x%08lx (%u bytes)", (unsigned long)row_buf,
- png_get_rowbytes(read_ptr, read_info_ptr));
+ pngtest_debug2("\t0x%08lx (%lu bytes)", (unsigned long)row_buf,
+ (unsigned long)png_get_rowbytes(read_ptr, read_info_ptr));
#endif /* !SINGLE_ROWBUF_ALLOC */
png_read_rows(read_ptr, (png_bytepp)&row_buf, NULL, 1);
@@ -1403,7 +1406,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
t_encode += (t_stop - t_start);
t_start = t_stop;
#endif
-#endif /* PNG_WRITE_SUPPORTED */
+#endif /* WRITE */
#ifndef SINGLE_ROWBUF_ALLOC
pngtest_debug2("Freeing row buffer (pass %d, y = %u)", pass, y);
@@ -1456,11 +1459,11 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
{
png_timep mod_time;
- if (png_get_tIME(read_ptr, end_info_ptr, &mod_time))
+ if (png_get_tIME(read_ptr, end_info_ptr, &mod_time) != 0)
{
png_set_tIME(write_ptr, write_end_info_ptr, mod_time);
#ifdef PNG_TIME_RFC1123_SUPPORTED
- if (png_convert_to_rfc1123_buffer(tIME_string, mod_time))
+ if (png_convert_to_rfc1123_buffer(tIME_string, mod_time) != 0)
tIME_string[(sizeof tIME_string) - 1] = '\0';
else
@@ -1470,7 +1473,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
}
tIME_chunk_present++;
-#endif /* PNG_TIME_RFC1123_SUPPORTED */
+#endif /* TIME_RFC1123 */
}
}
#endif
@@ -1675,7 +1678,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
}
}
}
-#endif /* PNG_WRITE_SUPPORTED */
+#endif /* WRITE */
FCLOSE(fpin);
FCLOSE(fpout);
@@ -1780,10 +1783,11 @@ main(int argc, char *argv[])
}
}
- if (!multiple && argc == 3 + verbose)
+ if (multiple == 0 && argc == 3 + verbose)
outname = argv[2 + verbose];
- if ((!multiple && argc > 3 + verbose) || (multiple && argc < 2))
+ if ((multiple == 0 && argc > 3 + verbose) ||
+ (multiple != 0 && argc < 2))
{
fprintf(STDERR,
"usage: %s [infile.png] [outfile.png]\n\t%s -m {infile.png}\n",
@@ -1805,6 +1809,9 @@ main(int argc, char *argv[])
{
int kerror;
fprintf(STDERR, "\n Testing %s:", argv[i]);
+#if PNG_DEBUG > 0
+ fprintf(STDERR, "\n");
+#endif
kerror = test_one_file(argv[i], outname);
if (kerror == 0)
{
@@ -1819,7 +1826,7 @@ main(int argc, char *argv[])
#endif
#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
for (k = 0; k<256; k++)
- if (filters_used[k])
+ if (filters_used[k] != 0)
fprintf(STDERR, " Filter %d was used %lu times\n",
k, (unsigned long)filters_used[k]);
#endif
@@ -1828,7 +1835,7 @@ main(int argc, char *argv[])
fprintf(STDERR, " tIME = %s\n", tIME_string);
tIME_chunk_present = 0;
-#endif /* PNG_TIME_RFC1123_SUPPORTED */
+#endif /* TIME_RFC1123 */
}
else
@@ -1850,9 +1857,9 @@ main(int argc, char *argv[])
while (pinfo != NULL)
{
- fprintf(STDERR, " %lu bytes at %x\n",
+ fprintf(STDERR, " %lu bytes at %p\n",
(unsigned long)pinfo->size,
- (unsigned int)pinfo->pointer);
+ pinfo->pointer);
pinfo = pinfo->next;
}
}
@@ -1886,7 +1893,12 @@ main(int argc, char *argv[])
status_dots_requested = 0;
if (i == 0 || verbose == 1 || ierror != 0)
+ {
fprintf(STDERR, "\n Testing %s:", inname);
+#if PNG_DEBUG > 0
+ fprintf(STDERR, "\n");
+#endif
+ }
kerror = test_one_file(inname, outname);
@@ -1905,21 +1917,26 @@ main(int argc, char *argv[])
#endif
#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
for (k = 0; k<256; k++)
- if (filters_used[k])
+ if (filters_used[k] != 0)
fprintf(STDERR, " Filter %d was used %lu times\n",
k, (unsigned long)filters_used[k]);
#endif
#ifdef PNG_TIME_RFC1123_SUPPORTED
if (tIME_chunk_present != 0)
fprintf(STDERR, " tIME = %s\n", tIME_string);
-#endif /* PNG_TIME_RFC1123_SUPPORTED */
+#endif /* TIME_RFC1123 */
}
}
else
{
if (verbose == 0 && i != 2)
+ {
fprintf(STDERR, "\n Testing %s:", inname);
+#if PNG_DEBUG > 0
+ fprintf(STDERR, "\n");
+#endif
+ }
fprintf(STDERR, " FAIL\n");
ierror += kerror;
@@ -1938,8 +1955,8 @@ main(int argc, char *argv[])
while (pinfo != NULL)
{
- fprintf(STDERR, " %lu bytes at %x\n",
- (unsigned long)pinfo->size, (unsigned int)pinfo->pointer);
+ fprintf(STDERR, " %lu bytes at %p\n",
+ (unsigned long)pinfo->size, pinfo->pointer);
pinfo = pinfo->next;
}
}
@@ -1991,4 +2008,4 @@ main(void)
#endif
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_6_14 Your_png_h_is_not_version_1_6_14;
+typedef png_libpng_version_1_6_15 Your_png_h_is_not_version_1_6_15;
diff --git a/source/libs/libpng/libpng-1.6.14/pngtest.png b/source/libs/libpng/libpng-1.6.15/pngtest.png
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/pngtest.png
rename to source/libs/libpng/libpng-1.6.15/pngtest.png
diff --git a/source/libs/libpng/libpng-1.6.14/pngtrans.c b/source/libs/libpng/libpng-1.6.15/pngtrans.c
similarity index 97%
rename from source/libs/libpng/libpng-1.6.14/pngtrans.c
rename to source/libs/libpng/libpng-1.6.15/pngtrans.c
index 631e3c15e6d456009a8d8b9a7e86743cede6975a..56856b48023f7e51b3797026cbf48ee3eae9a7c2 100644
--- a/source/libs/libpng/libpng-1.6.14/pngtrans.c
+++ b/source/libs/libpng/libpng-1.6.15/pngtrans.c
@@ -1,7 +1,7 @@
/* pngtrans.c - transforms the data in a row (used by both readers and writers)
*
- * Last changed in libpng 1.6.11 [June 5, 2014]
+ * Last changed in libpng 1.6.15 [November 20, 2014]
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -100,7 +100,7 @@ png_set_interlace_handling(png_structrp png_ptr)
{
png_debug(1, "in png_set_interlace handling");
- if (png_ptr && png_ptr->interlaced)
+ if (png_ptr != 0 && png_ptr->interlaced != 0)
{
png_ptr->transformations |= PNG_INTERLACE;
return (7);
@@ -127,7 +127,7 @@ png_set_filler(png_structrp png_ptr, png_uint_32 filler, int filler_loc)
/* In libpng 1.6 it is possible to determine whether this is a read or write
* operation and therefore to do more checking here for a valid call.
*/
- if (png_ptr->mode & PNG_IS_READ_STRUCT)
+ if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0)
{
# ifdef PNG_READ_FILLER_SUPPORTED
/* On read png_set_filler is always valid, regardless of the base PNG
@@ -210,7 +210,7 @@ png_set_add_alpha(png_structrp png_ptr, png_uint_32 filler, int filler_loc)
png_set_filler(png_ptr, filler, filler_loc);
/* The above may fail to do anything. */
- if (png_ptr->transformations & PNG_FILLER)
+ if ((png_ptr->transformations & PNG_FILLER) != 0)
png_ptr->transformations |= PNG_ADD_ALPHA;
}
@@ -478,7 +478,7 @@ png_do_packswap(png_row_infop row_info, png_bytep row)
*rp = table[*rp];
}
}
-#endif /* PNG_READ_PACKSWAP_SUPPORTED or PNG_WRITE_PACKSWAP_SUPPORTED */
+#endif /* PACKSWAP || WRITE_PACKSWAP */
#if defined(PNG_WRITE_FILLER_SUPPORTED) || \
defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
@@ -605,7 +605,7 @@ png_do_bgr(png_row_infop row_info, png_bytep row)
{
png_debug(1, "in png_do_bgr");
- if ((row_info->color_type & PNG_COLOR_MASK_COLOR))
+ if ((row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)
{
png_uint_32 row_width = row_info->width;
if (row_info->bit_depth == 8)
@@ -675,7 +675,7 @@ png_do_bgr(png_row_infop row_info, png_bytep row)
#endif
}
}
-#endif /* PNG_READ_BGR_SUPPORTED or PNG_WRITE_BGR_SUPPORTED */
+#endif /* READ_BGR || WRITE_BGR */
#if defined(PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED) || \
defined(PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED)
@@ -778,7 +778,7 @@ png_do_check_palette_indexes(png_structrp png_ptr, png_row_infop row_info)
}
}
}
-#endif /* PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED */
+#endif /* CHECK_FOR_INVALID_INDEX */
#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
@@ -844,7 +844,6 @@ png_get_current_pass_number(png_const_structrp png_ptr)
return png_ptr->pass;
return 8; /* invalid */
}
-#endif /* PNG_USER_TRANSFORM_INFO_SUPPORTED */
-#endif /* PNG_READ_USER_TRANSFORM_SUPPORTED ||
- PNG_WRITE_USER_TRANSFORM_SUPPORTED */
-#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
+#endif /* USER_TRANSFORM_INFO */
+#endif /* READ_USER_TRANSFORM || WRITE_USER_TRANSFORM */
+#endif /* READ || WRITE */
diff --git a/source/libs/libpng/libpng-1.6.14/pngusr.dfa b/source/libs/libpng/libpng-1.6.15/pngusr.dfa
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/pngusr.dfa
rename to source/libs/libpng/libpng-1.6.15/pngusr.dfa
diff --git a/source/libs/libpng/libpng-1.6.14/pngwio.c b/source/libs/libpng/libpng-1.6.15/pngwio.c
similarity index 97%
rename from source/libs/libpng/libpng-1.6.14/pngwio.c
rename to source/libs/libpng/libpng-1.6.15/pngwio.c
index 1b525f94848a60d72a1d97cc4cdffca0df2261d4..0a40948aab50ef928bfa5de6ae0522eceb58decf 100644
--- a/source/libs/libpng/libpng-1.6.14/pngwio.c
+++ b/source/libs/libpng/libpng-1.6.15/pngwio.c
@@ -1,7 +1,7 @@
/* pngwio.c - functions for data output
*
- * Last changed in libpng 1.6.9 [February 6, 2014]
+ * Last changed in libpng 1.6.15 [November 20, 2014]
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -151,7 +151,7 @@ png_set_write_fn(png_structrp png_ptr, png_voidp io_ptr,
# endif
#else
PNG_UNUSED(output_flush_fn)
-#endif /* PNG_WRITE_FLUSH_SUPPORTED */
+#endif /* WRITE_FLUSH */
#ifdef PNG_READ_SUPPORTED
/* It is an error to read while writing a png file */
@@ -165,4 +165,4 @@ png_set_write_fn(png_structrp png_ptr, png_voidp io_ptr,
}
#endif
}
-#endif /* PNG_WRITE_SUPPORTED */
+#endif /* WRITE */
diff --git a/source/libs/libpng/libpng-1.6.14/pngwrite.c b/source/libs/libpng/libpng-1.6.15/pngwrite.c
similarity index 92%
rename from source/libs/libpng/libpng-1.6.14/pngwrite.c
rename to source/libs/libpng/libpng-1.6.15/pngwrite.c
index 6a831f62ced112387b326c2c4802320c3ac74b18..94548877bd0ee6fae6f63a083a5a944565435de1 100644
--- a/source/libs/libpng/libpng-1.6.14/pngwrite.c
+++ b/source/libs/libpng/libpng-1.6.15/pngwrite.c
@@ -1,7 +1,7 @@
/* pngwrite.c - general routines to write a PNG file
*
- * Last changed in libpng 1.6.14 [October 23, 2014]
+ * Last changed in libpng 1.6.15 [November 20, 2014]
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -24,7 +24,7 @@ static void
write_unknown_chunks(png_structrp png_ptr, png_const_inforp info_ptr,
unsigned int where)
{
- if (info_ptr->unknown_chunks_num)
+ if (info_ptr->unknown_chunks_num != 0)
{
png_const_unknown_chunkp up;
@@ -33,7 +33,7 @@ write_unknown_chunks(png_structrp png_ptr, png_const_inforp info_ptr,
for (up = info_ptr->unknown_chunks;
up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num;
++up)
- if (up->location & where)
+ if ((up->location & where) != 0)
{
/* If per-chunk unknown chunk handling is enabled use it, otherwise
* just write the chunks the application has set.
@@ -69,7 +69,7 @@ write_unknown_chunks(png_structrp png_ptr, png_const_inforp info_ptr,
}
}
}
-#endif /* PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED */
+#endif /* WRITE_UNKNOWN_CHUNKS */
/* Writes all the PNG information. This is the suggested way to use the
* library. If you have a new chunk to add, make a function to write it,
@@ -88,14 +88,14 @@ png_write_info_before_PLTE(png_structrp png_ptr, png_const_inforp info_ptr)
if (png_ptr == NULL || info_ptr == NULL)
return;
- if (!(png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE))
+ if ((png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE) == 0)
{
/* Write PNG signature */
png_write_sig(png_ptr);
#ifdef PNG_MNG_FEATURES_SUPPORTED
- if ((png_ptr->mode&PNG_HAVE_PNG_SIGNATURE) && \
- (png_ptr->mng_features_permitted))
+ if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) != 0 && \
+ png_ptr->mng_features_permitted != 0)
{
png_warning(png_ptr, "MNG features are not allowed in a PNG datastream");
png_ptr->mng_features_permitted = 0;
@@ -129,9 +129,9 @@ png_write_info_before_PLTE(png_structrp png_ptr, png_const_inforp info_ptr)
*/
#ifdef PNG_GAMMA_SUPPORTED
# ifdef PNG_WRITE_gAMA_SUPPORTED
- if (!(info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) &&
- (info_ptr->colorspace.flags & PNG_COLORSPACE_FROM_gAMA) &&
- (info_ptr->valid & PNG_INFO_gAMA))
+ if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
+ (info_ptr->colorspace.flags & PNG_COLORSPACE_FROM_gAMA) != 0 &&
+ (info_ptr->valid & PNG_INFO_gAMA) != 0)
png_write_gAMA_fixed(png_ptr, info_ptr->colorspace.gamma);
# endif
#endif
@@ -141,11 +141,11 @@ png_write_info_before_PLTE(png_structrp png_ptr, png_const_inforp info_ptr)
* and it matches one of the known sRGB ones issue a warning.
*/
# ifdef PNG_WRITE_iCCP_SUPPORTED
- if (!(info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) &&
- (info_ptr->valid & PNG_INFO_iCCP))
+ if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
+ (info_ptr->valid & PNG_INFO_iCCP) != 0)
{
# ifdef PNG_WRITE_sRGB_SUPPORTED
- if (info_ptr->valid & PNG_INFO_sRGB)
+ if ((info_ptr->valid & PNG_INFO_sRGB) != 0)
png_app_warning(png_ptr,
"profile matches sRGB but writing iCCP instead");
# endif
@@ -159,22 +159,22 @@ png_write_info_before_PLTE(png_structrp png_ptr, png_const_inforp info_ptr)
# endif
# ifdef PNG_WRITE_sRGB_SUPPORTED
- if (!(info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) &&
- (info_ptr->valid & PNG_INFO_sRGB))
+ if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
+ (info_ptr->valid & PNG_INFO_sRGB) != 0)
png_write_sRGB(png_ptr, info_ptr->colorspace.rendering_intent);
# endif /* WRITE_sRGB */
#endif /* COLORSPACE */
#ifdef PNG_WRITE_sBIT_SUPPORTED
- if (info_ptr->valid & PNG_INFO_sBIT)
+ if ((info_ptr->valid & PNG_INFO_sBIT) != 0)
png_write_sBIT(png_ptr, &(info_ptr->sig_bit), info_ptr->color_type);
#endif
#ifdef PNG_COLORSPACE_SUPPORTED
# ifdef PNG_WRITE_cHRM_SUPPORTED
- if (!(info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) &&
- (info_ptr->colorspace.flags & PNG_COLORSPACE_FROM_cHRM) &&
- (info_ptr->valid & PNG_INFO_cHRM))
+ if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
+ (info_ptr->colorspace.flags & PNG_COLORSPACE_FROM_cHRM) != 0 &&
+ (info_ptr->valid & PNG_INFO_cHRM) != 0)
png_write_cHRM_fixed(png_ptr, &info_ptr->colorspace.end_points_xy);
# endif
#endif
@@ -201,19 +201,19 @@ png_write_info(png_structrp png_ptr, png_const_inforp info_ptr)
png_write_info_before_PLTE(png_ptr, info_ptr);
- if (info_ptr->valid & PNG_INFO_PLTE)
+ if ((info_ptr->valid & PNG_INFO_PLTE) != 0)
png_write_PLTE(png_ptr, info_ptr->palette,
(png_uint_32)info_ptr->num_palette);
- else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+ else if ((info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) !=0)
png_error(png_ptr, "Valid palette required for paletted images");
#ifdef PNG_WRITE_tRNS_SUPPORTED
- if (info_ptr->valid & PNG_INFO_tRNS)
+ if ((info_ptr->valid & PNG_INFO_tRNS) !=0)
{
#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
/* Invert the alpha channel (in tRNS) */
- if ((png_ptr->transformations & PNG_INVERT_ALPHA) &&
+ if ((png_ptr->transformations & PNG_INVERT_ALPHA) != 0 &&
info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
{
int j;
@@ -227,42 +227,42 @@ png_write_info(png_structrp png_ptr, png_const_inforp info_ptr)
}
#endif
#ifdef PNG_WRITE_bKGD_SUPPORTED
- if (info_ptr->valid & PNG_INFO_bKGD)
+ if ((info_ptr->valid & PNG_INFO_bKGD) != 0)
png_write_bKGD(png_ptr, &(info_ptr->background), info_ptr->color_type);
#endif
#ifdef PNG_WRITE_hIST_SUPPORTED
- if (info_ptr->valid & PNG_INFO_hIST)
+ if ((info_ptr->valid & PNG_INFO_hIST) != 0)
png_write_hIST(png_ptr, info_ptr->hist, info_ptr->num_palette);
#endif
#ifdef PNG_WRITE_oFFs_SUPPORTED
- if (info_ptr->valid & PNG_INFO_oFFs)
+ if ((info_ptr->valid & PNG_INFO_oFFs) != 0)
png_write_oFFs(png_ptr, info_ptr->x_offset, info_ptr->y_offset,
info_ptr->offset_unit_type);
#endif
#ifdef PNG_WRITE_pCAL_SUPPORTED
- if (info_ptr->valid & PNG_INFO_pCAL)
+ if ((info_ptr->valid & PNG_INFO_pCAL) != 0)
png_write_pCAL(png_ptr, info_ptr->pcal_purpose, info_ptr->pcal_X0,
info_ptr->pcal_X1, info_ptr->pcal_type, info_ptr->pcal_nparams,
info_ptr->pcal_units, info_ptr->pcal_params);
#endif
#ifdef PNG_WRITE_sCAL_SUPPORTED
- if (info_ptr->valid & PNG_INFO_sCAL)
+ if ((info_ptr->valid & PNG_INFO_sCAL) != 0)
png_write_sCAL_s(png_ptr, (int)info_ptr->scal_unit,
info_ptr->scal_s_width, info_ptr->scal_s_height);
#endif /* sCAL */
#ifdef PNG_WRITE_pHYs_SUPPORTED
- if (info_ptr->valid & PNG_INFO_pHYs)
+ if ((info_ptr->valid & PNG_INFO_pHYs) != 0)
png_write_pHYs(png_ptr, info_ptr->x_pixels_per_unit,
info_ptr->y_pixels_per_unit, info_ptr->phys_unit_type);
#endif /* pHYs */
#ifdef PNG_WRITE_tIME_SUPPORTED
- if (info_ptr->valid & PNG_INFO_tIME)
+ if ((info_ptr->valid & PNG_INFO_tIME) != 0)
{
png_write_tIME(png_ptr, &(info_ptr->mod_time));
png_ptr->mode |= PNG_WROTE_tIME;
@@ -270,7 +270,7 @@ png_write_info(png_structrp png_ptr, png_const_inforp info_ptr)
#endif /* tIME */
#ifdef PNG_WRITE_sPLT_SUPPORTED
- if (info_ptr->valid & PNG_INFO_sPLT)
+ if ((info_ptr->valid & PNG_INFO_sPLT) != 0)
for (i = 0; i < (int)info_ptr->splt_palettes_num; i++)
png_write_sPLT(png_ptr, info_ptr->splt_palettes + i);
#endif /* sPLT */
@@ -351,7 +351,7 @@ png_write_end(png_structrp png_ptr, png_inforp info_ptr)
if (png_ptr == NULL)
return;
- if (!(png_ptr->mode & PNG_HAVE_IDAT))
+ if ((png_ptr->mode & PNG_HAVE_IDAT) == 0)
png_error(png_ptr, "No IDATs written into file");
#ifdef PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
@@ -367,8 +367,8 @@ png_write_end(png_structrp png_ptr, png_inforp info_ptr)
#endif
#ifdef PNG_WRITE_tIME_SUPPORTED
/* Check to see if user has supplied a time chunk */
- if ((info_ptr->valid & PNG_INFO_tIME) &&
- !(png_ptr->mode & PNG_WROTE_tIME))
+ if ((info_ptr->valid & PNG_INFO_tIME) != 0 &&
+ (png_ptr->mode & PNG_WROTE_tIME) == 0)
png_write_tIME(png_ptr, &(info_ptr->mod_time));
#endif
@@ -497,7 +497,7 @@ png_create_write_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr,
{
png_structrp png_ptr = png_create_png_struct(user_png_ver, error_ptr,
error_fn, warn_fn, mem_ptr, malloc_fn, free_fn);
-#endif /* PNG_USER_MEM_SUPPORTED */
+#endif /* USER_MEM */
if (png_ptr != NULL)
{
/* Set the zlib control values to defaults; they can be overridden by the
@@ -521,7 +521,7 @@ png_create_write_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr,
png_ptr->zlib_text_mem_level = 8;
png_ptr->zlib_text_window_bits = 15;
png_ptr->zlib_text_method = 8;
-#endif /* PNG_WRITE_COMPRESSED_TEXT_SUPPORTED */
+#endif /* WRITE_COMPRESSED_TEXT */
/* This is a highly dubious configuration option; by default it is off,
* but it may be appropriate for private builds that are testing
@@ -618,7 +618,7 @@ png_do_write_intrapixel(png_row_infop row_info, png_bytep row)
{
png_debug(1, "in png_do_write_intrapixel");
- if ((row_info->color_type & PNG_COLOR_MASK_COLOR))
+ if ((row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)
{
int bytes_per_pixel;
png_uint_32 row_width = row_info->width;
@@ -671,10 +671,10 @@ png_do_write_intrapixel(png_row_infop row_info, png_bytep row)
*(rp + 5) = (png_byte)(blue & 0xff);
}
}
-#endif /* PNG_WRITE_16BIT_SUPPORTED */
+#endif /* WRITE_16BIT */
}
}
-#endif /* PNG_MNG_FEATURES_SUPPORTED */
+#endif /* MNG_FEATURES */
/* Called by user to write a row of image data */
void PNGAPI
@@ -693,44 +693,44 @@ png_write_row(png_structrp png_ptr, png_const_bytep row)
if (png_ptr->row_number == 0 && png_ptr->pass == 0)
{
/* Make sure we wrote the header info */
- if (!(png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE))
+ if ((png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE) == 0)
png_error(png_ptr,
"png_write_info was never called before png_write_row");
/* Check for transforms that have been set but were defined out */
#if !defined(PNG_WRITE_INVERT_SUPPORTED) && defined(PNG_READ_INVERT_SUPPORTED)
- if (png_ptr->transformations & PNG_INVERT_MONO)
+ if ((png_ptr->transformations & PNG_INVERT_MONO) != 0)
png_warning(png_ptr, "PNG_WRITE_INVERT_SUPPORTED is not defined");
#endif
#if !defined(PNG_WRITE_FILLER_SUPPORTED) && defined(PNG_READ_FILLER_SUPPORTED)
- if (png_ptr->transformations & PNG_FILLER)
+ if ((png_ptr->transformations & PNG_FILLER) != 0)
png_warning(png_ptr, "PNG_WRITE_FILLER_SUPPORTED is not defined");
#endif
#if !defined(PNG_WRITE_PACKSWAP_SUPPORTED) && \
defined(PNG_READ_PACKSWAP_SUPPORTED)
- if (png_ptr->transformations & PNG_PACKSWAP)
+ if ((png_ptr->transformations & PNG_PACKSWAP) != 0)
png_warning(png_ptr,
"PNG_WRITE_PACKSWAP_SUPPORTED is not defined");
#endif
#if !defined(PNG_WRITE_PACK_SUPPORTED) && defined(PNG_READ_PACK_SUPPORTED)
- if (png_ptr->transformations & PNG_PACK)
+ if ((png_ptr->transformations & PNG_PACK) != 0)
png_warning(png_ptr, "PNG_WRITE_PACK_SUPPORTED is not defined");
#endif
#if !defined(PNG_WRITE_SHIFT_SUPPORTED) && defined(PNG_READ_SHIFT_SUPPORTED)
- if (png_ptr->transformations & PNG_SHIFT)
+ if ((png_ptr->transformations & PNG_SHIFT) != 0)
png_warning(png_ptr, "PNG_WRITE_SHIFT_SUPPORTED is not defined");
#endif
#if !defined(PNG_WRITE_BGR_SUPPORTED) && defined(PNG_READ_BGR_SUPPORTED)
- if (png_ptr->transformations & PNG_BGR)
+ if ((png_ptr->transformations & PNG_BGR) != 0)
png_warning(png_ptr, "PNG_WRITE_BGR_SUPPORTED is not defined");
#endif
#if !defined(PNG_WRITE_SWAP_SUPPORTED) && defined(PNG_READ_SWAP_SUPPORTED)
- if (png_ptr->transformations & PNG_SWAP_BYTES)
+ if ((png_ptr->transformations & PNG_SWAP_BYTES) != 0)
png_warning(png_ptr, "PNG_WRITE_SWAP_SUPPORTED is not defined");
#endif
@@ -739,12 +739,13 @@ png_write_row(png_structrp png_ptr, png_const_bytep row)
#ifdef PNG_WRITE_INTERLACING_SUPPORTED
/* If interlaced and not interested in row, return */
- if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE))
+ if (png_ptr->interlaced != 0 &&
+ (png_ptr->transformations & PNG_INTERLACE) != 0)
{
switch (png_ptr->pass)
{
case 0:
- if (png_ptr->row_number & 0x07)
+ if ((png_ptr->row_number & 0x07) != 0)
{
png_write_finish_row(png_ptr);
return;
@@ -752,7 +753,7 @@ png_write_row(png_structrp png_ptr, png_const_bytep row)
break;
case 1:
- if ((png_ptr->row_number & 0x07) || png_ptr->width < 5)
+ if ((png_ptr->row_number & 0x07) != 0 || png_ptr->width < 5)
{
png_write_finish_row(png_ptr);
return;
@@ -768,7 +769,7 @@ png_write_row(png_structrp png_ptr, png_const_bytep row)
break;
case 3:
- if ((png_ptr->row_number & 0x03) || png_ptr->width < 3)
+ if ((png_ptr->row_number & 0x03) != 0 || png_ptr->width < 3)
{
png_write_finish_row(png_ptr);
return;
@@ -784,7 +785,7 @@ png_write_row(png_structrp png_ptr, png_const_bytep row)
break;
case 5:
- if ((png_ptr->row_number & 0x01) || png_ptr->width < 2)
+ if ((png_ptr->row_number & 0x01) != 0 || png_ptr->width < 2)
{
png_write_finish_row(png_ptr);
return;
@@ -792,7 +793,7 @@ png_write_row(png_structrp png_ptr, png_const_bytep row)
break;
case 6:
- if (!(png_ptr->row_number & 0x01))
+ if ((png_ptr->row_number & 0x01) == 0)
{
png_write_finish_row(png_ptr);
return;
@@ -826,7 +827,7 @@ png_write_row(png_structrp png_ptr, png_const_bytep row)
#ifdef PNG_WRITE_INTERLACING_SUPPORTED
/* Handle interlacing */
if (png_ptr->interlaced && png_ptr->pass < 6 &&
- (png_ptr->transformations & PNG_INTERLACE))
+ (png_ptr->transformations & PNG_INTERLACE) != 0)
{
png_do_write_interlace(&row_info, png_ptr->row_buf + 1, png_ptr->pass);
/* This should always get caught above, but still ... */
@@ -840,7 +841,7 @@ png_write_row(png_structrp png_ptr, png_const_bytep row)
#ifdef PNG_WRITE_TRANSFORMS_SUPPORTED
/* Handle other transformations */
- if (png_ptr->transformations)
+ if (png_ptr->transformations != 0)
png_do_write_transformations(png_ptr, &row_info);
#endif
@@ -861,7 +862,7 @@ png_write_row(png_structrp png_ptr, png_const_bytep row)
* 4. The filter_method is 64 and
* 5. The color_type is RGB or RGBA
*/
- if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+ if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 &&
(png_ptr->filter_type == PNG_INTRAPIXEL_DIFFERENCING))
{
/* Intrapixel differencing */
@@ -914,7 +915,7 @@ png_write_flush(png_structrp png_ptr)
png_ptr->flush_rows = 0;
png_flush(png_ptr);
}
-#endif /* PNG_WRITE_FLUSH_SUPPORTED */
+#endif /* WRITE_FLUSH */
#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
static void png_reset_filter_heuristics(png_structrp png_ptr);/* forward decl */
@@ -927,18 +928,24 @@ png_write_destroy(png_structrp png_ptr)
png_debug(1, "in png_write_destroy");
/* Free any memory zlib uses */
- if (png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED)
+ if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0)
deflateEnd(&png_ptr->zstream);
/* Free our memory. png_free checks NULL for us. */
png_free_buffer_list(png_ptr, &png_ptr->zbuffer_list);
png_free(png_ptr, png_ptr->row_buf);
+ png_ptr->row_buf = NULL;
#ifdef PNG_WRITE_FILTER_SUPPORTED
png_free(png_ptr, png_ptr->prev_row);
png_free(png_ptr, png_ptr->sub_row);
png_free(png_ptr, png_ptr->up_row);
png_free(png_ptr, png_ptr->avg_row);
png_free(png_ptr, png_ptr->paeth_row);
+ png_ptr->prev_row = NULL;
+ png_ptr->sub_row = NULL;
+ png_ptr->up_row = NULL;
+ png_ptr->avg_row = NULL;
+ png_ptr->paeth_row = NULL;
#endif
#ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
@@ -946,10 +953,13 @@ png_write_destroy(png_structrp png_ptr)
png_reset_filter_heuristics(png_ptr);
png_free(png_ptr, png_ptr->filter_costs);
png_free(png_ptr, png_ptr->inv_filter_costs);
+ png_ptr->filter_costs = NULL;
+ png_ptr->inv_filter_costs = NULL;
#endif
#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
png_free(png_ptr, png_ptr->chunk_list);
+ png_ptr->chunk_list = NULL;
#endif
/* The error handling and memory handling information is left intact at this
@@ -995,7 +1005,7 @@ png_set_filter(png_structrp png_ptr, int method, int filters)
return;
#ifdef PNG_MNG_FEATURES_SUPPORTED
- if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
+ if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 &&
(method == PNG_INTRAPIXEL_DIFFERENCING))
method = PNG_FILTER_TYPE_BASE;
@@ -1009,7 +1019,7 @@ png_set_filter(png_structrp png_ptr, int method, int filters)
case 6:
case 7: png_app_error(png_ptr, "Unknown row filter for method 0");
/* FALL THROUGH */
-#endif /* PNG_WRITE_FILTER_SUPPORTED */
+#endif /* WRITE_FILTER */
case PNG_FILTER_VALUE_NONE:
png_ptr->do_filter = PNG_FILTER_NONE; break;
@@ -1031,7 +1041,7 @@ png_set_filter(png_structrp png_ptr, int method, int filters)
#else
default:
png_app_error(png_ptr, "Unknown row filter for method 0");
-#endif /* PNG_WRITE_FILTER_SUPPORTED */
+#endif /* WRITE_FILTER */
}
/* If we have allocated the row_buf, this means we have already started
@@ -1046,14 +1056,16 @@ png_set_filter(png_structrp png_ptr, int method, int filters)
if (png_ptr->row_buf != NULL)
{
#ifdef PNG_WRITE_FILTER_SUPPORTED
- if ((png_ptr->do_filter & PNG_FILTER_SUB) && png_ptr->sub_row == NULL)
+ if ((png_ptr->do_filter & PNG_FILTER_SUB) != 0 &&
+ png_ptr->sub_row == NULL)
{
png_ptr->sub_row = (png_bytep)png_malloc(png_ptr,
(png_ptr->rowbytes + 1));
png_ptr->sub_row[0] = PNG_FILTER_VALUE_SUB;
}
- if ((png_ptr->do_filter & PNG_FILTER_UP) && png_ptr->up_row == NULL)
+ if ((png_ptr->do_filter & PNG_FILTER_UP) != 0 &&
+ png_ptr->up_row == NULL)
{
if (png_ptr->prev_row == NULL)
{
@@ -1070,7 +1082,8 @@ png_set_filter(png_structrp png_ptr, int method, int filters)
}
}
- if ((png_ptr->do_filter & PNG_FILTER_AVG) && png_ptr->avg_row == NULL)
+ if ((png_ptr->do_filter & PNG_FILTER_AVG) != 0 &&
+ png_ptr->avg_row == NULL)
{
if (png_ptr->prev_row == NULL)
{
@@ -1087,7 +1100,7 @@ png_set_filter(png_structrp png_ptr, int method, int filters)
}
}
- if ((png_ptr->do_filter & PNG_FILTER_PAETH) &&
+ if ((png_ptr->do_filter & PNG_FILTER_PAETH) != 0 &&
png_ptr->paeth_row == NULL)
{
if (png_ptr->prev_row == NULL)
@@ -1105,7 +1118,7 @@ png_set_filter(png_structrp png_ptr, int method, int filters)
}
if (png_ptr->do_filter == PNG_NO_FILTERS)
-#endif /* PNG_WRITE_FILTER_SUPPORTED */
+#endif /* WRITE_FILTER */
png_ptr->do_filter = PNG_FILTER_NONE;
}
}
@@ -1248,7 +1261,7 @@ png_set_filter_heuristics(png_structrp png_ptr, int heuristic_method,
/* The internal API allocates all the arrays and ensures that the elements of
* those arrays are set to the default value.
*/
- if (!png_init_filter_heuristics(png_ptr, heuristic_method, num_weights))
+ if (png_init_filter_heuristics(png_ptr, heuristic_method, num_weights) == 0)
return;
/* If using the weighted method copy in the weights. */
@@ -1303,7 +1316,7 @@ png_set_filter_heuristics_fixed(png_structrp png_ptr, int heuristic_method,
/* The internal API allocates all the arrays and ensures that the elements of
* those arrays are set to the default value.
*/
- if (!png_init_filter_heuristics(png_ptr, heuristic_method, num_weights))
+ if (png_init_filter_heuristics(png_ptr, heuristic_method, num_weights) == 0)
return;
/* If using the weighted method copy in the weights. */
@@ -1357,7 +1370,7 @@ png_set_filter_heuristics_fixed(png_structrp png_ptr, int heuristic_method,
}
}
#endif /* FIXED_POINT */
-#endif /* PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */
+#endif /* WRITE_WEIGHTED_FILTER */
void PNGAPI
png_set_compression_level(png_structrp png_ptr, int level)
@@ -1514,7 +1527,7 @@ png_set_text_compression_method(png_structrp png_ptr, int method)
png_ptr->zlib_text_method = method;
}
-#endif /* PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED */
+#endif /* WRITE_CUSTOMIZE_ZTXT_COMPRESSION */
/* end of API added to libpng-1.5.4 */
void PNGAPI
@@ -1562,7 +1575,7 @@ png_write_png(png_structrp png_ptr, png_inforp info_ptr,
/* ------ these transformations don't touch the info structure ------- */
/* Invert monochrome pixels */
- if (transforms & PNG_TRANSFORM_INVERT_MONO)
+ if ((transforms & PNG_TRANSFORM_INVERT_MONO) != 0)
#ifdef PNG_WRITE_INVERT_SUPPORTED
png_set_invert_mono(png_ptr);
#else
@@ -1572,16 +1585,16 @@ png_write_png(png_structrp png_ptr, png_inforp info_ptr,
/* Shift the pixels up to a legal bit depth and fill in
* as appropriate to correctly scale the image.
*/
- if (transforms & PNG_TRANSFORM_SHIFT)
+ if ((transforms & PNG_TRANSFORM_SHIFT) != 0)
#ifdef PNG_WRITE_SHIFT_SUPPORTED
- if (info_ptr->valid & PNG_INFO_sBIT)
+ if ((info_ptr->valid & PNG_INFO_sBIT) != 0)
png_set_shift(png_ptr, &info_ptr->sig_bit);
#else
png_app_error(png_ptr, "PNG_TRANSFORM_SHIFT not supported");
#endif
/* Pack pixels into bytes */
- if (transforms & PNG_TRANSFORM_PACKING)
+ if ((transforms & PNG_TRANSFORM_PACKING) != 0)
#ifdef PNG_WRITE_PACK_SUPPORTED
png_set_packing(png_ptr);
#else
@@ -1589,7 +1602,7 @@ png_write_png(png_structrp png_ptr, png_inforp info_ptr,
#endif
/* Swap location of alpha bytes from ARGB to RGBA */
- if (transforms & PNG_TRANSFORM_SWAP_ALPHA)
+ if ((transforms & PNG_TRANSFORM_SWAP_ALPHA) != 0)
#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
png_set_swap_alpha(png_ptr);
#else
@@ -1600,13 +1613,13 @@ png_write_png(png_structrp png_ptr, png_inforp info_ptr,
* RGB, note that the code expects the input color type to be G or RGB; no
* alpha channel.
*/
- if (transforms &
- (PNG_TRANSFORM_STRIP_FILLER_AFTER|PNG_TRANSFORM_STRIP_FILLER_BEFORE))
+ if ((transforms & (PNG_TRANSFORM_STRIP_FILLER_AFTER|
+ PNG_TRANSFORM_STRIP_FILLER_BEFORE)) != 0)
{
#ifdef PNG_WRITE_FILLER_SUPPORTED
- if (transforms & PNG_TRANSFORM_STRIP_FILLER_AFTER)
+ if ((transforms & PNG_TRANSFORM_STRIP_FILLER_AFTER) != 0)
{
- if (transforms & PNG_TRANSFORM_STRIP_FILLER_BEFORE)
+ if ((transforms & PNG_TRANSFORM_STRIP_FILLER_BEFORE) != 0)
png_app_error(png_ptr,
"PNG_TRANSFORM_STRIP_FILLER: BEFORE+AFTER not supported");
@@ -1614,7 +1627,7 @@ png_write_png(png_structrp png_ptr, png_inforp info_ptr,
png_set_filler(png_ptr, 0, PNG_FILLER_AFTER);
}
- else if (transforms & PNG_TRANSFORM_STRIP_FILLER_BEFORE)
+ else if ((transforms & PNG_TRANSFORM_STRIP_FILLER_BEFORE) != 0)
png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
#else
png_app_error(png_ptr, "PNG_TRANSFORM_STRIP_FILLER not supported");
@@ -1622,7 +1635,7 @@ png_write_png(png_structrp png_ptr, png_inforp info_ptr,
}
/* Flip BGR pixels to RGB */
- if (transforms & PNG_TRANSFORM_BGR)
+ if ((transforms & PNG_TRANSFORM_BGR) != 0)
#ifdef PNG_WRITE_BGR_SUPPORTED
png_set_bgr(png_ptr);
#else
@@ -1630,7 +1643,7 @@ png_write_png(png_structrp png_ptr, png_inforp info_ptr,
#endif
/* Swap bytes of 16-bit files to most significant byte first */
- if (transforms & PNG_TRANSFORM_SWAP_ENDIAN)
+ if ((transforms & PNG_TRANSFORM_SWAP_ENDIAN) != 0)
#ifdef PNG_WRITE_SWAP_SUPPORTED
png_set_swap(png_ptr);
#else
@@ -1638,7 +1651,7 @@ png_write_png(png_structrp png_ptr, png_inforp info_ptr,
#endif
/* Swap bits of 1, 2, 4 bit packed pixel formats */
- if (transforms & PNG_TRANSFORM_PACKSWAP)
+ if ((transforms & PNG_TRANSFORM_PACKSWAP) != 0)
#ifdef PNG_WRITE_PACKSWAP_SUPPORTED
png_set_packswap(png_ptr);
#else
@@ -1646,7 +1659,7 @@ png_write_png(png_structrp png_ptr, png_inforp info_ptr,
#endif
/* Invert the alpha channel from opacity to transparency */
- if (transforms & PNG_TRANSFORM_INVERT_ALPHA)
+ if ((transforms & PNG_TRANSFORM_INVERT_ALPHA) != 0)
#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
png_set_invert_alpha(png_ptr);
#else
@@ -1737,14 +1750,14 @@ png_write_image_16bit(png_voidp argument)
display->first_row);
png_uint_16p output_row = png_voidcast(png_uint_16p, display->local_row);
png_uint_16p row_end;
- const int channels = (image->format & PNG_FORMAT_FLAG_COLOR) ? 3 : 1;
+ const int channels = (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ? 3 : 1;
int aindex = 0;
png_uint_32 y = image->height;
- if (image->format & PNG_FORMAT_FLAG_ALPHA)
+ if ((image->format & PNG_FORMAT_FLAG_ALPHA) != 0)
{
# ifdef PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
- if (image->format & PNG_FORMAT_FLAG_AFIRST)
+ if ((image->format & PNG_FORMAT_FLAG_AFIRST) != 0)
{
aindex = -1;
++input_row; /* To point to the first component */
@@ -1894,15 +1907,15 @@ png_write_image_8bit(png_voidp argument)
display->first_row);
png_bytep output_row = png_voidcast(png_bytep, display->local_row);
png_uint_32 y = image->height;
- const int channels = (image->format & PNG_FORMAT_FLAG_COLOR) ? 3 : 1;
+ const int channels = (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ? 3 : 1;
- if (image->format & PNG_FORMAT_FLAG_ALPHA)
+ if ((image->format & PNG_FORMAT_FLAG_ALPHA) != 0)
{
png_bytep row_end;
int aindex;
# ifdef PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
- if (image->format & PNG_FORMAT_FLAG_AFIRST)
+ if ((image->format & PNG_FORMAT_FLAG_AFIRST) != 0)
{
aindex = -1;
++input_row; /* To point to the first component */
@@ -1999,7 +2012,7 @@ png_image_set_PLTE(png_image_write_control *display)
# endif
# ifdef PNG_FORMAT_BGR_SUPPORTED
- const int bgr = (format & PNG_FORMAT_FLAG_BGR) ? 2 : 0;
+ const int bgr = (format & PNG_FORMAT_FLAG_BGR) != 0 ? 2 : 0;
# else
# define bgr 0
# endif
@@ -2016,13 +2029,13 @@ png_image_set_PLTE(png_image_write_control *display)
/* This gets automatically converted to sRGB with reversal of the
* pre-multiplication if the color-map has an alpha channel.
*/
- if (format & PNG_FORMAT_FLAG_LINEAR)
+ if ((format & PNG_FORMAT_FLAG_LINEAR) != 0)
{
png_const_uint_16p entry = png_voidcast(png_const_uint_16p, cmap);
entry += i * channels;
- if (channels & 1) /* no alpha */
+ if ((channels & 1) != 0) /* no alpha */
{
if (channels >= 3) /* RGB */
{
@@ -2134,10 +2147,11 @@ png_image_write_main(png_voidp argument)
png_inforp info_ptr = image->opaque->info_ptr;
png_uint_32 format = image->format;
- int colormap = (format & PNG_FORMAT_FLAG_COLORMAP) != 0;
- int linear = !colormap && (format & PNG_FORMAT_FLAG_LINEAR) != 0; /* input */
- int alpha = !colormap && (format & PNG_FORMAT_FLAG_ALPHA) != 0;
- int write_16bit = linear && !colormap && !display->convert_to_8bit;
+ /* The following four ints are actually booleans */
+ int colormap = (format & PNG_FORMAT_FLAG_COLORMAP);
+ int linear = !colormap && (format & PNG_FORMAT_FLAG_LINEAR); /* input */
+ int alpha = !colormap && (format & PNG_FORMAT_FLAG_ALPHA);
+ int write_16bit = linear && !colormap && (display->convert_to_8bit == 0);
# ifdef PNG_BENIGN_ERRORS_SUPPORTED
/* Make sure we error out on any bad situation */
@@ -2149,7 +2163,7 @@ png_image_write_main(png_voidp argument)
display->row_stride = PNG_IMAGE_ROW_STRIDE(*image);
/* Set the required transforms then write the rows in the correct order. */
- if (format & PNG_FORMAT_FLAG_COLORMAP)
+ if ((format & PNG_FORMAT_FLAG_COLORMAP) != 0)
{
if (display->colormap != NULL && image->colormap_entries > 0)
{
@@ -2186,7 +2200,7 @@ png_image_write_main(png_voidp argument)
/* The gamma here is 1.0 (linear) and the cHRM chunk matches sRGB. */
png_set_gAMA_fixed(png_ptr, info_ptr, PNG_GAMMA_LINEAR);
- if (!(image->flags & PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB))
+ if ((image->flags & PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB) == 0)
png_set_cHRM_fixed(png_ptr, info_ptr,
/* color x y */
/* white */ 31270, 32900,
@@ -2196,7 +2210,7 @@ png_image_write_main(png_voidp argument)
);
}
- else if (!(image->flags & PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB))
+ else if ((image->flags & PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB) == 0)
png_set_sRGB(png_ptr, info_ptr, PNG_sRGB_INTENT_PERCEPTUAL);
/* Else writing an 8-bit file and the *colors* aren't sRGB, but the 8-bit
@@ -2217,23 +2231,23 @@ png_image_write_main(png_voidp argument)
{
PNG_CONST png_uint_16 le = 0x0001;
- if (*(png_const_bytep)&le)
+ if ((*(png_const_bytep) & le) != 0)
png_set_swap(png_ptr);
}
# ifdef PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED
- if (format & PNG_FORMAT_FLAG_BGR)
+ if ((format & PNG_FORMAT_FLAG_BGR) != 0)
{
- if (!colormap && (format & PNG_FORMAT_FLAG_COLOR) != 0)
+ if (colormap == 0 && (format & PNG_FORMAT_FLAG_COLOR) != 0)
png_set_bgr(png_ptr);
format &= ~PNG_FORMAT_FLAG_BGR;
}
# endif
# ifdef PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
- if (format & PNG_FORMAT_FLAG_AFIRST)
+ if ((format & PNG_FORMAT_FLAG_AFIRST) != 0)
{
- if (!colormap && (format & PNG_FORMAT_FLAG_ALPHA) != 0)
+ if (colormap == 0 && (format & PNG_FORMAT_FLAG_ALPHA) != 0)
png_set_swap_alpha(png_ptr);
format &= ~PNG_FORMAT_FLAG_AFIRST;
}
@@ -2242,7 +2256,7 @@ png_image_write_main(png_voidp argument)
/* If there are 16 or fewer color-map entries we wrote a lower bit depth
* above, but the application data is still byte packed.
*/
- if (colormap && image->colormap_entries <= 16)
+ if (colormap != 0 && image->colormap_entries <= 16)
png_set_packing(png_ptr);
/* That should have handled all (both) the transforms. */
@@ -2280,7 +2294,8 @@ png_image_write_main(png_voidp argument)
* before it is written. This only applies when the input is 16-bit and
* either there is an alpha channel or it is converted to 8-bit.
*/
- if ((linear && alpha) || (!colormap && display->convert_to_8bit))
+ if ((linear != 0 && alpha != 0 ) ||
+ (colormap == 0 && display->convert_to_8bit != 0))
{
png_bytep row = png_voidcast(png_bytep, png_malloc(png_ptr,
png_get_rowbytes(png_ptr, info_ptr)));
@@ -2329,7 +2344,7 @@ png_image_write_to_stdio(png_imagep image, FILE *file, int convert_to_8bit,
{
if (file != NULL)
{
- if (png_image_write_init(image))
+ if (png_image_write_init(image) != 0)
{
png_image_write_control display;
int result;
@@ -2384,7 +2399,7 @@ png_image_write_to_file(png_imagep image, const char *file_name,
if (fp != NULL)
{
if (png_image_write_to_stdio(image, fp, convert_to_8bit, buffer,
- row_stride, colormap))
+ row_stride, colormap) != 0)
{
int error; /* from fflush/fclose */
@@ -2435,6 +2450,6 @@ png_image_write_to_file(png_imagep image, const char *file_name,
else
return 0;
}
-#endif /* PNG_STDIO_SUPPORTED */
+#endif /* STDIO */
#endif /* SIMPLIFIED_WRITE */
-#endif /* PNG_WRITE_SUPPORTED */
+#endif /* WRITE */
diff --git a/source/libs/libpng/libpng-1.6.14/pngwtran.c b/source/libs/libpng/libpng-1.6.15/pngwtran.c
similarity index 94%
rename from source/libs/libpng/libpng-1.6.14/pngwtran.c
rename to source/libs/libpng/libpng-1.6.15/pngwtran.c
index 215bd68a9d872d0c3ed9451149e3a94027e56176..09562a787d0c957ba1fbcf4303d5c2fc78593221 100644
--- a/source/libs/libpng/libpng-1.6.14/pngwtran.c
+++ b/source/libs/libpng/libpng-1.6.15/pngwtran.c
@@ -1,7 +1,7 @@
/* pngwtran.c - transforms the data in a row for PNG writers
*
- * Last changed in libpng 1.6.9 [February 6, 2014]
+ * Last changed in libpng 1.6.15 [November 20, 2014]
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -177,7 +177,7 @@ png_do_shift(png_row_infop row_info, png_bytep row,
int shift_start[4], shift_dec[4];
int channels = 0;
- if (row_info->color_type & PNG_COLOR_MASK_COLOR)
+ if ((row_info->color_type & PNG_COLOR_MASK_COLOR) != 0)
{
shift_start[channels] = row_info->bit_depth - bit_depth->red;
shift_dec[channels] = bit_depth->red;
@@ -199,7 +199,7 @@ png_do_shift(png_row_infop row_info, png_bytep row,
channels++;
}
- if (row_info->color_type & PNG_COLOR_MASK_ALPHA)
+ if ((row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0)
{
shift_start[channels] = row_info->bit_depth - bit_depth->alpha;
shift_dec[channels] = bit_depth->alpha;
@@ -353,7 +353,7 @@ png_do_write_swap_alpha(png_row_infop row_info, png_bytep row)
*(dp++) = save[1];
}
}
-#endif /* PNG_WRITE_16BIT_SUPPORTED */
+#endif /* WRITE_16BIT */
}
else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
@@ -392,7 +392,7 @@ png_do_write_swap_alpha(png_row_infop row_info, png_bytep row)
*(dp++) = save[1];
}
}
-#endif /* PNG_WRITE_16BIT_SUPPORTED */
+#endif /* WRITE_16BIT */
}
}
}
@@ -449,7 +449,7 @@ png_do_write_invert_alpha(png_row_infop row_info, png_bytep row)
*(dp++) = (png_byte)(255 - *(sp++));
}
}
-#endif /* PNG_WRITE_16BIT_SUPPORTED */
+#endif /* WRITE_16BIT */
}
else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
@@ -487,7 +487,7 @@ png_do_write_invert_alpha(png_row_infop row_info, png_bytep row)
*(dp++) = (png_byte)(255 - *(sp++));
}
}
-#endif /* PNG_WRITE_16BIT_SUPPORTED */
+#endif /* WRITE_16BIT */
}
}
}
@@ -505,7 +505,7 @@ png_do_write_transformations(png_structrp png_ptr, png_row_infop row_info)
return;
#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
- if (png_ptr->transformations & PNG_USER_TRANSFORM)
+ if ((png_ptr->transformations & PNG_USER_TRANSFORM) != 0)
if (png_ptr->write_user_transform_fn != NULL)
(*(png_ptr->write_user_transform_fn)) /* User write transform
function */
@@ -521,52 +521,54 @@ png_do_write_transformations(png_structrp png_ptr, png_row_infop row_info)
#endif
#ifdef PNG_WRITE_FILLER_SUPPORTED
- if (png_ptr->transformations & PNG_FILLER)
+ if ((png_ptr->transformations & PNG_FILLER) != 0)
png_do_strip_channel(row_info, png_ptr->row_buf + 1,
!(png_ptr->flags & PNG_FLAG_FILLER_AFTER));
#endif
#ifdef PNG_WRITE_PACKSWAP_SUPPORTED
- if (png_ptr->transformations & PNG_PACKSWAP)
+ if ((png_ptr->transformations & PNG_PACKSWAP) != 0)
png_do_packswap(row_info, png_ptr->row_buf + 1);
#endif
#ifdef PNG_WRITE_PACK_SUPPORTED
- if (png_ptr->transformations & PNG_PACK)
+ if ((png_ptr->transformations & PNG_PACK) != 0)
png_do_pack(row_info, png_ptr->row_buf + 1,
(png_uint_32)png_ptr->bit_depth);
#endif
#ifdef PNG_WRITE_SWAP_SUPPORTED
- if (png_ptr->transformations & PNG_SWAP_BYTES)
+# ifdef PNG_16BIT_SUPPORTED
+ if ((png_ptr->transformations & PNG_SWAP_BYTES) != 0)
png_do_swap(row_info, png_ptr->row_buf + 1);
+# endif
#endif
#ifdef PNG_WRITE_SHIFT_SUPPORTED
- if (png_ptr->transformations & PNG_SHIFT)
+ if ((png_ptr->transformations & PNG_SHIFT) != 0)
png_do_shift(row_info, png_ptr->row_buf + 1,
&(png_ptr->shift));
#endif
#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED
- if (png_ptr->transformations & PNG_SWAP_ALPHA)
+ if ((png_ptr->transformations & PNG_SWAP_ALPHA) != 0)
png_do_write_swap_alpha(row_info, png_ptr->row_buf + 1);
#endif
#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED
- if (png_ptr->transformations & PNG_INVERT_ALPHA)
+ if ((png_ptr->transformations & PNG_INVERT_ALPHA) != 0)
png_do_write_invert_alpha(row_info, png_ptr->row_buf + 1);
#endif
#ifdef PNG_WRITE_BGR_SUPPORTED
- if (png_ptr->transformations & PNG_BGR)
+ if ((png_ptr->transformations & PNG_BGR) != 0)
png_do_bgr(row_info, png_ptr->row_buf + 1);
#endif
#ifdef PNG_WRITE_INVERT_SUPPORTED
- if (png_ptr->transformations & PNG_INVERT_MONO)
+ if ((png_ptr->transformations & PNG_INVERT_MONO) != 0)
png_do_invert(row_info, png_ptr->row_buf + 1);
#endif
}
-#endif /* PNG_WRITE_TRANSFORMS_SUPPORTED */
-#endif /* PNG_WRITE_SUPPORTED */
+#endif /* WRITE_TRANSFORMS */
+#endif /* WRITE */
diff --git a/source/libs/libpng/libpng-1.6.14/pngwutil.c b/source/libs/libpng/libpng-1.6.15/pngwutil.c
similarity index 96%
rename from source/libs/libpng/libpng-1.6.14/pngwutil.c
rename to source/libs/libpng/libpng-1.6.15/pngwutil.c
index 45b6b1e358a6d0960ab6d77a7120a7c210d0a40e..10c1edffaf78b3c8bdc17bc34a821037582ccb3e 100644
--- a/source/libs/libpng/libpng-1.6.14/pngwutil.c
+++ b/source/libs/libpng/libpng-1.6.15/pngwutil.c
@@ -1,7 +1,7 @@
/* pngwutil.c - utilities to write a PNG file
*
- * Last changed in libpng 1.6.14 [October 23, 2014]
+ * Last changed in libpng 1.6.15 [November 20, 2014]
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -211,7 +211,7 @@ png_image_size(png_structrp png_ptr)
if (png_ptr->rowbytes < 32768 && h < 32768)
{
- if (png_ptr->interlaced)
+ if (png_ptr->interlaced != 0)
{
/* Interlacing makes the image larger because of the replication of
* both the filter byte and the padding to a byte boundary.
@@ -286,9 +286,7 @@ optimize_cmf(png_bytep data, png_alloc_size_t data_size)
}
}
}
-#else
-# define optimize_cmf(dp,dl) ((void)0)
-#endif /* PNG_WRITE_OPTIMIZE_CMF_SUPPORTED */
+#endif /* WRITE_OPTIMIZE_CMF */
/* Initialize the compressor for the appropriate type of compression. */
static int
@@ -297,7 +295,7 @@ png_deflate_claim(png_structrp png_ptr, png_uint_32 owner,
{
if (png_ptr->zowner != 0)
{
-# if defined(PNG_WARNINGS_SUPPORTED) || defined(PNG_ERROR_TEXT_SUPPORTED)
+#if defined(PNG_WARNINGS_SUPPORTED) || defined(PNG_ERROR_TEXT_SUPPORTED)
char msg[64];
PNG_STRING_FROM_CHUNK(msg, owner);
@@ -309,8 +307,8 @@ png_deflate_claim(png_structrp png_ptr, png_uint_32 owner,
* are minimal.
*/
(void)png_safecat(msg, (sizeof msg), 10, " using zstream");
-# endif
-# if PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC
+#endif
+#if PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC
png_warning(png_ptr, msg);
/* Attempt sane error recovery */
@@ -321,9 +319,9 @@ png_deflate_claim(png_structrp png_ptr, png_uint_32 owner,
}
png_ptr->zowner = 0;
-# else
+#else
png_error(png_ptr, msg);
-# endif
+#endif
}
{
@@ -336,7 +334,7 @@ png_deflate_claim(png_structrp png_ptr, png_uint_32 owner,
if (owner == png_IDAT)
{
- if (png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_STRATEGY)
+ if ((png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_STRATEGY) != 0)
strategy = png_ptr->zlib_strategy;
else if (png_ptr->do_filter != PNG_FILTER_NONE)
@@ -348,20 +346,20 @@ png_deflate_claim(png_structrp png_ptr, png_uint_32 owner,
else
{
-# ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
+#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
level = png_ptr->zlib_text_level;
method = png_ptr->zlib_text_method;
windowBits = png_ptr->zlib_text_window_bits;
memLevel = png_ptr->zlib_text_mem_level;
strategy = png_ptr->zlib_text_strategy;
-# else
+#else
/* If customization is not supported the values all come from the
* IDAT values except for the strategy, which is fixed to the
* default. (This is the pre-1.6.0 behavior too, although it was
* implemented in a very different way.)
*/
strategy = Z_DEFAULT_STRATEGY;
-# endif
+#endif
}
/* Adjust 'windowBits' down if larger than 'data_size'; to stop this
@@ -388,7 +386,7 @@ png_deflate_claim(png_structrp png_ptr, png_uint_32 owner,
}
/* Check against the previous initialized values, if any. */
- if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) &&
+ if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0 &&
(png_ptr->zlib_set_level != level ||
png_ptr->zlib_set_method != method ||
png_ptr->zlib_set_window_bits != windowBits ||
@@ -412,7 +410,7 @@ png_deflate_claim(png_structrp png_ptr, png_uint_32 owner,
/* Now initialize if required, setting the new parameters, otherwise just
* to a simple reset to the previous parameters.
*/
- if (png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED)
+ if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0)
ret = deflateReset(&png_ptr->zstream);
else
@@ -619,9 +617,10 @@ png_text_compress(png_structrp png_ptr, png_uint_32 chunk_name,
*/
if (ret == Z_STREAM_END && input_len == 0)
{
+#ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
/* Fix up the deflate header, if required */
optimize_cmf(comp->output, comp->input_len);
-
+#endif
/* But Z_OK is returned, not Z_STREAM_END; this allows the claim
* function above to return Z_STREAM_END on an error (though it never
* does in the current versions of zlib.)
@@ -664,7 +663,7 @@ png_write_compressed_data_out(png_structrp png_ptr, compression_state *comp)
if (output_len > 0)
png_error(png_ptr, "error writing ancillary chunked compressed data");
}
-#endif /* PNG_WRITE_COMPRESSED_TEXT_SUPPORTED */
+#endif /* WRITE_COMPRESSED_TEXT */
#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_pCAL_SUPPORTED) || \
defined(PNG_WRITE_iCCP_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED)
@@ -717,7 +716,7 @@ png_check_keyword(png_structrp png_ptr, png_const_charp key, png_bytep new_key)
bad_character = ch; /* just skip it, record the first error */
}
- if (key_len > 0 && space) /* trailing space */
+ if (key_len > 0 && space != 0) /* trailing space */
{
--key_len, --new_key;
if (bad_character == 0)
@@ -732,7 +731,7 @@ png_check_keyword(png_structrp png_ptr, png_const_charp key, png_bytep new_key)
#ifdef PNG_WARNINGS_SUPPORTED
/* Try to only output one warning per keyword: */
- if (*key) /* keyword too long */
+ if (*key != 0) /* keyword too long */
png_warning(png_ptr, "keyword truncated");
else if (bad_character != 0)
@@ -744,11 +743,11 @@ png_check_keyword(png_structrp png_ptr, png_const_charp key, png_bytep new_key)
png_formatted_warning(png_ptr, p, "keyword \"@1\": bad character '0x@2'");
}
-#endif /* PNG_WARNINGS_SUPPORTED */
+#endif /* WARNINGS */
return key_len;
}
-#endif
+#endif /* WRITE_TEXT || WRITE_pCAL || WRITE_iCCP || WRITE_sPLT */
/* Write the IHDR chunk, and update the png_struct with the necessary
* information. Note that the rest of this code depends upon this
@@ -849,8 +848,8 @@ png_write_IHDR(png_structrp png_ptr, png_uint_32 width, png_uint_32 height,
*/
if (
#ifdef PNG_MNG_FEATURES_SUPPORTED
- !((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) &&
- ((png_ptr->mode&PNG_HAVE_PNG_SIGNATURE) == 0) &&
+ !((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 &&
+ ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) == 0) &&
(color_type == PNG_COLOR_TYPE_RGB ||
color_type == PNG_COLOR_TYPE_RGB_ALPHA) &&
(filter_type == PNG_INTRAPIXEL_DIFFERENCING)) &&
@@ -931,7 +930,7 @@ png_write_PLTE(png_structrp png_ptr, png_const_colorp palette,
if ((
#ifdef PNG_MNG_FEATURES_SUPPORTED
- !(png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) &&
+ (png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) == 0 &&
#endif
num_pal == 0) || num_pal > 256)
{
@@ -947,7 +946,7 @@ png_write_PLTE(png_structrp png_ptr, png_const_colorp palette,
}
}
- if (!(png_ptr->color_type&PNG_COLOR_MASK_COLOR))
+ if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0)
{
png_warning(png_ptr,
"Ignoring request to write a PLTE chunk in grayscale PNG");
@@ -1074,11 +1073,11 @@ png_compress_IDAT(png_structrp png_ptr, png_const_bytep input,
/* Write an IDAT containing the data then reset the buffer. The
* first IDAT may need deflate header optimization.
*/
-# ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
- if (!(png_ptr->mode & PNG_HAVE_IDAT) &&
- png_ptr->compression_type == PNG_COMPRESSION_TYPE_BASE)
+#ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
+ if ((png_ptr->mode & PNG_HAVE_IDAT) == 0 &&
+ png_ptr->compression_type == PNG_COMPRESSION_TYPE_BASE)
optimize_cmf(data, png_image_size(png_ptr));
-# endif
+#endif
png_write_complete_chunk(png_ptr, png_IDAT, data, size);
png_ptr->mode |= PNG_HAVE_IDAT;
@@ -1120,11 +1119,11 @@ png_compress_IDAT(png_structrp png_ptr, png_const_bytep input,
png_bytep data = png_ptr->zbuffer_list->output;
uInt size = png_ptr->zbuffer_size - png_ptr->zstream.avail_out;
-# ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
- if (!(png_ptr->mode & PNG_HAVE_IDAT) &&
- png_ptr->compression_type == PNG_COMPRESSION_TYPE_BASE)
- optimize_cmf(data, png_image_size(png_ptr));
-# endif
+#ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
+ if ((png_ptr->mode & PNG_HAVE_IDAT) == 0 &&
+ png_ptr->compression_type == PNG_COMPRESSION_TYPE_BASE)
+ optimize_cmf(data, png_image_size(png_ptr));
+#endif
png_write_complete_chunk(png_ptr, png_IDAT, data, size);
png_ptr->zstream.avail_out = 0;
@@ -1345,7 +1344,7 @@ png_write_sBIT(png_structrp png_ptr, png_const_color_8p sbit, int color_type)
png_debug(1, "in png_write_sBIT");
/* Make sure we don't depend upon the order of PNG_COLOR_8 */
- if (color_type & PNG_COLOR_MASK_COLOR)
+ if ((color_type & PNG_COLOR_MASK_COLOR) != 0)
{
png_byte maxbits;
@@ -1378,7 +1377,7 @@ png_write_sBIT(png_structrp png_ptr, png_const_color_8p sbit, int color_type)
size = 1;
}
- if (color_type & PNG_COLOR_MASK_ALPHA)
+ if ((color_type & PNG_COLOR_MASK_ALPHA) != 0)
{
if (sbit->alpha == 0 || sbit->alpha > png_ptr->usr_bit_depth)
{
@@ -1465,9 +1464,9 @@ png_write_tRNS(png_structrp png_ptr, png_const_bytep trans_alpha,
png_save_uint_16(buf + 2, tran->green);
png_save_uint_16(buf + 4, tran->blue);
#ifdef PNG_WRITE_16BIT_SUPPORTED
- if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]))
+ if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]) != 0)
#else
- if (buf[0] | buf[2] | buf[4])
+ if ((buf[0] | buf[2] | buf[4]) != 0)
#endif
{
png_app_warning(png_ptr,
@@ -1498,8 +1497,8 @@ png_write_bKGD(png_structrp png_ptr, png_const_color_16p back, int color_type)
{
if (
#ifdef PNG_MNG_FEATURES_SUPPORTED
- (png_ptr->num_palette ||
- (!(png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE))) &&
+ (png_ptr->num_palette != 0 ||
+ (png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) == 0) &&
#endif
back->index >= png_ptr->num_palette)
{
@@ -1511,15 +1510,15 @@ png_write_bKGD(png_structrp png_ptr, png_const_color_16p back, int color_type)
png_write_complete_chunk(png_ptr, png_bKGD, buf, (png_size_t)1);
}
- else if (color_type & PNG_COLOR_MASK_COLOR)
+ else if ((color_type & PNG_COLOR_MASK_COLOR) != 0)
{
png_save_uint_16(buf, back->red);
png_save_uint_16(buf + 2, back->green);
png_save_uint_16(buf + 4, back->blue);
#ifdef PNG_WRITE_16BIT_SUPPORTED
- if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]))
+ if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]) != 0)
#else
- if (buf[0] | buf[2] | buf[4])
+ if ((buf[0] | buf[2] | buf[4]) != 0)
#endif
{
png_warning(png_ptr,
@@ -1986,12 +1985,13 @@ png_write_start_row(png_structrp png_ptr)
}
/* We only need to keep the previous row if we are using one of these. */
- if (png_ptr->do_filter & (PNG_FILTER_AVG | PNG_FILTER_UP | PNG_FILTER_PAETH))
+ if ((png_ptr->do_filter &
+ (PNG_FILTER_AVG | PNG_FILTER_UP | PNG_FILTER_PAETH)) != 0)
{
/* Set up previous row buffer */
png_ptr->prev_row = (png_bytep)png_calloc(png_ptr, buf_size);
- if (png_ptr->do_filter & PNG_FILTER_UP)
+ if ((png_ptr->do_filter & PNG_FILTER_UP) != 0)
{
png_ptr->up_row = (png_bytep)png_malloc(png_ptr,
png_ptr->rowbytes + 1);
@@ -1999,7 +1999,7 @@ png_write_start_row(png_structrp png_ptr)
png_ptr->up_row[0] = PNG_FILTER_VALUE_UP;
}
- if (png_ptr->do_filter & PNG_FILTER_AVG)
+ if ((png_ptr->do_filter & PNG_FILTER_AVG) != 0)
{
png_ptr->avg_row = (png_bytep)png_malloc(png_ptr,
png_ptr->rowbytes + 1);
@@ -2007,7 +2007,7 @@ png_write_start_row(png_structrp png_ptr)
png_ptr->avg_row[0] = PNG_FILTER_VALUE_AVG;
}
- if (png_ptr->do_filter & PNG_FILTER_PAETH)
+ if ((png_ptr->do_filter & PNG_FILTER_PAETH) != 0)
{
png_ptr->paeth_row = (png_bytep)png_malloc(png_ptr,
png_ptr->rowbytes + 1);
@@ -2015,13 +2015,13 @@ png_write_start_row(png_structrp png_ptr)
png_ptr->paeth_row[0] = PNG_FILTER_VALUE_PAETH;
}
}
-#endif /* PNG_WRITE_FILTER_SUPPORTED */
+#endif /* WRITE_FILTER */
#ifdef PNG_WRITE_INTERLACING_SUPPORTED
/* If interlaced, we need to set up width and height of pass */
- if (png_ptr->interlaced)
+ if (png_ptr->interlaced != 0)
{
- if (!(png_ptr->transformations & PNG_INTERLACE))
+ if ((png_ptr->transformations & PNG_INTERLACE) == 0)
{
png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
png_pass_ystart[0]) / png_pass_yinc[0];
@@ -2076,10 +2076,10 @@ png_write_finish_row(png_structrp png_ptr)
#ifdef PNG_WRITE_INTERLACING_SUPPORTED
/* If interlaced, go to next pass */
- if (png_ptr->interlaced)
+ if (png_ptr->interlaced != 0)
{
png_ptr->row_number = 0;
- if (png_ptr->transformations & PNG_INTERLACE)
+ if ((png_ptr->transformations & PNG_INTERLACE) != 0)
{
png_ptr->pass++;
}
@@ -2104,7 +2104,7 @@ png_write_finish_row(png_structrp png_ptr)
png_pass_ystart[png_ptr->pass]) /
png_pass_yinc[png_ptr->pass];
- if (png_ptr->transformations & PNG_INTERLACE)
+ if ((png_ptr->transformations & PNG_INTERLACE) != 0)
break;
} while (png_ptr->usr_width == 0 || png_ptr->num_rows == 0);
@@ -2383,7 +2383,7 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info)
/* We don't need to test the 'no filter' case if this is the only filter
* that has been chosen, as it doesn't actually do anything to the data.
*/
- if ((filter_to_do & PNG_FILTER_NONE) && filter_to_do != PNG_FILTER_NONE)
+ if ((filter_to_do & PNG_FILTER_NONE) != 0 && filter_to_do != PNG_FILTER_NONE)
{
png_bytep rp;
png_uint_32 sum = 0;
@@ -2459,7 +2459,7 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info)
best_row = png_ptr->sub_row;
}
- else if (filter_to_do & PNG_FILTER_SUB)
+ else if ((filter_to_do & PNG_FILTER_SUB) != 0)
{
png_bytep rp, dp, lp;
png_uint_32 sum = 0, lmins = mins;
@@ -2580,7 +2580,7 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info)
best_row = png_ptr->up_row;
}
- else if (filter_to_do & PNG_FILTER_UP)
+ else if ((filter_to_do & PNG_FILTER_UP) != 0)
{
png_bytep rp, dp, pp;
png_uint_32 sum = 0, lmins = mins;
@@ -2694,7 +2694,7 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info)
best_row = png_ptr->avg_row;
}
- else if (filter_to_do & PNG_FILTER_AVG)
+ else if ((filter_to_do & PNG_FILTER_AVG) != 0)
{
png_bytep rp, dp, pp, lp;
png_uint_32 sum = 0, lmins = mins;
@@ -2796,7 +2796,7 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info)
}
/* Paeth filter */
- if (filter_to_do == PNG_FILTER_PAETH)
+ if ((filter_to_do == PNG_FILTER_PAETH) != 0)
{
png_bytep rp, dp, pp, cp, lp;
png_size_t i;
@@ -2835,7 +2835,7 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info)
best_row = png_ptr->paeth_row;
}
- else if (filter_to_do & PNG_FILTER_PAETH)
+ else if ((filter_to_do & PNG_FILTER_PAETH) != 0)
{
png_bytep rp, dp, pp, cp, lp;
png_uint_32 sum = 0, lmins = mins;
@@ -2905,7 +2905,7 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info)
pc = (p + pc) < 0 ? -(p + pc) : p + pc;
#endif
p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c;
-#else /* PNG_SLOW_PAETH */
+#else /* SLOW_PAETH */
p = a + b - c;
pa = abs(p - a);
pb = abs(p - b);
@@ -2919,7 +2919,7 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info)
else
p = c;
-#endif /* PNG_SLOW_PAETH */
+#endif /* SLOW_PAETH */
v = *dp++ = (png_byte)(((int)*rp++ - p) & 0xff);
@@ -2968,7 +2968,7 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info)
best_row = png_ptr->paeth_row;
}
}
-#endif /* PNG_WRITE_FILTER_SUPPORTED */
+#endif /* WRITE_FILTER */
/* Do the actual writing of the filtered row data from the chosen filter. */
png_write_filtered_row(png_ptr, best_row, row_info->rowbytes+1);
@@ -2988,7 +2988,7 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info)
png_ptr->prev_filters[j] = best_row[0];
}
#endif
-#endif /* PNG_WRITE_FILTER_SUPPORTED */
+#endif /* WRITE_FILTER */
}
@@ -3024,6 +3024,6 @@ png_write_filtered_row(png_structrp png_ptr, png_bytep filtered_row,
{
png_write_flush(png_ptr);
}
-#endif
+#endif /* WRITE_FLUSH */
}
-#endif /* PNG_WRITE_SUPPORTED */
+#endif /* WRITE */
diff --git a/source/libs/libpng/libpng-1.6.14/projects/owatcom/libpng.tgt b/source/libs/libpng/libpng-1.6.15/projects/owatcom/libpng.tgt
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/projects/owatcom/libpng.tgt
rename to source/libs/libpng/libpng-1.6.15/projects/owatcom/libpng.tgt
diff --git a/source/libs/libpng/libpng-1.6.14/projects/owatcom/libpng.wpj b/source/libs/libpng/libpng-1.6.15/projects/owatcom/libpng.wpj
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/projects/owatcom/libpng.wpj
rename to source/libs/libpng/libpng-1.6.15/projects/owatcom/libpng.wpj
diff --git a/source/libs/libpng/libpng-1.6.14/projects/owatcom/pngconfig.mak b/source/libs/libpng/libpng-1.6.15/projects/owatcom/pngconfig.mak
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/projects/owatcom/pngconfig.mak
rename to source/libs/libpng/libpng-1.6.15/projects/owatcom/pngconfig.mak
diff --git a/source/libs/libpng/libpng-1.6.14/projects/owatcom/pngstest.tgt b/source/libs/libpng/libpng-1.6.15/projects/owatcom/pngstest.tgt
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/projects/owatcom/pngstest.tgt
rename to source/libs/libpng/libpng-1.6.15/projects/owatcom/pngstest.tgt
diff --git a/source/libs/libpng/libpng-1.6.14/projects/owatcom/pngtest.tgt b/source/libs/libpng/libpng-1.6.15/projects/owatcom/pngtest.tgt
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/projects/owatcom/pngtest.tgt
rename to source/libs/libpng/libpng-1.6.15/projects/owatcom/pngtest.tgt
diff --git a/source/libs/libpng/libpng-1.6.14/projects/owatcom/pngvalid.tgt b/source/libs/libpng/libpng-1.6.15/projects/owatcom/pngvalid.tgt
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/projects/owatcom/pngvalid.tgt
rename to source/libs/libpng/libpng-1.6.15/projects/owatcom/pngvalid.tgt
diff --git a/source/libs/libpng/libpng-1.6.14/projects/visualc71/PRJ0041.mak b/source/libs/libpng/libpng-1.6.15/projects/visualc71/PRJ0041.mak
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/projects/visualc71/PRJ0041.mak
rename to source/libs/libpng/libpng-1.6.15/projects/visualc71/PRJ0041.mak
diff --git a/source/libs/libpng/libpng-1.6.14/projects/visualc71/README.txt b/source/libs/libpng/libpng-1.6.15/projects/visualc71/README.txt
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/projects/visualc71/README.txt
rename to source/libs/libpng/libpng-1.6.15/projects/visualc71/README.txt
diff --git a/source/libs/libpng/libpng-1.6.14/projects/visualc71/README_zlib.txt b/source/libs/libpng/libpng-1.6.15/projects/visualc71/README_zlib.txt
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/projects/visualc71/README_zlib.txt
rename to source/libs/libpng/libpng-1.6.15/projects/visualc71/README_zlib.txt
diff --git a/source/libs/libpng/libpng-1.6.14/projects/visualc71/libpng.sln b/source/libs/libpng/libpng-1.6.15/projects/visualc71/libpng.sln
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/projects/visualc71/libpng.sln
rename to source/libs/libpng/libpng-1.6.15/projects/visualc71/libpng.sln
diff --git a/source/libs/libpng/libpng-1.6.14/projects/visualc71/libpng.vcproj b/source/libs/libpng/libpng-1.6.15/projects/visualc71/libpng.vcproj
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/projects/visualc71/libpng.vcproj
rename to source/libs/libpng/libpng-1.6.15/projects/visualc71/libpng.vcproj
diff --git a/source/libs/libpng/libpng-1.6.14/projects/visualc71/pngtest.vcproj b/source/libs/libpng/libpng-1.6.15/projects/visualc71/pngtest.vcproj
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/projects/visualc71/pngtest.vcproj
rename to source/libs/libpng/libpng-1.6.15/projects/visualc71/pngtest.vcproj
diff --git a/source/libs/libpng/libpng-1.6.14/projects/visualc71/zlib.vcproj b/source/libs/libpng/libpng-1.6.15/projects/visualc71/zlib.vcproj
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/projects/visualc71/zlib.vcproj
rename to source/libs/libpng/libpng-1.6.15/projects/visualc71/zlib.vcproj
diff --git a/source/libs/libpng/libpng-1.6.14/projects/vstudio/WARNING b/source/libs/libpng/libpng-1.6.15/projects/vstudio/WARNING
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/projects/vstudio/WARNING
rename to source/libs/libpng/libpng-1.6.15/projects/vstudio/WARNING
diff --git a/source/libs/libpng/libpng-1.6.14/projects/vstudio/libpng/libpng.vcxproj b/source/libs/libpng/libpng-1.6.15/projects/vstudio/libpng/libpng.vcxproj
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/projects/vstudio/libpng/libpng.vcxproj
rename to source/libs/libpng/libpng-1.6.15/projects/vstudio/libpng/libpng.vcxproj
diff --git a/source/libs/libpng/libpng-1.6.14/projects/vstudio/pnglibconf/pnglibconf.vcxproj b/source/libs/libpng/libpng-1.6.15/projects/vstudio/pnglibconf/pnglibconf.vcxproj
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/projects/vstudio/pnglibconf/pnglibconf.vcxproj
rename to source/libs/libpng/libpng-1.6.15/projects/vstudio/pnglibconf/pnglibconf.vcxproj
diff --git a/source/libs/libpng/libpng-1.6.14/projects/vstudio/pngstest/pngstest.vcxproj b/source/libs/libpng/libpng-1.6.15/projects/vstudio/pngstest/pngstest.vcxproj
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/projects/vstudio/pngstest/pngstest.vcxproj
rename to source/libs/libpng/libpng-1.6.15/projects/vstudio/pngstest/pngstest.vcxproj
diff --git a/source/libs/libpng/libpng-1.6.14/projects/vstudio/pngtest/pngtest.vcxproj b/source/libs/libpng/libpng-1.6.15/projects/vstudio/pngtest/pngtest.vcxproj
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/projects/vstudio/pngtest/pngtest.vcxproj
rename to source/libs/libpng/libpng-1.6.15/projects/vstudio/pngtest/pngtest.vcxproj
diff --git a/source/libs/libpng/libpng-1.6.14/projects/vstudio/pngunknown/pngunknown.vcxproj b/source/libs/libpng/libpng-1.6.15/projects/vstudio/pngunknown/pngunknown.vcxproj
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/projects/vstudio/pngunknown/pngunknown.vcxproj
rename to source/libs/libpng/libpng-1.6.15/projects/vstudio/pngunknown/pngunknown.vcxproj
diff --git a/source/libs/libpng/libpng-1.6.14/projects/vstudio/pngvalid/pngvalid.vcxproj b/source/libs/libpng/libpng-1.6.15/projects/vstudio/pngvalid/pngvalid.vcxproj
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/projects/vstudio/pngvalid/pngvalid.vcxproj
rename to source/libs/libpng/libpng-1.6.15/projects/vstudio/pngvalid/pngvalid.vcxproj
diff --git a/source/libs/libpng/libpng-1.6.14/projects/vstudio/readme.txt b/source/libs/libpng/libpng-1.6.15/projects/vstudio/readme.txt
similarity index 98%
rename from source/libs/libpng/libpng-1.6.14/projects/vstudio/readme.txt
rename to source/libs/libpng/libpng-1.6.15/projects/vstudio/readme.txt
index bbb8c7263a2e0d7babb53bd53474d3e33e26799e..98dc379bf394c2e02873f9eb08453b450e0df059 100644
--- a/source/libs/libpng/libpng-1.6.14/projects/vstudio/readme.txt
+++ b/source/libs/libpng/libpng-1.6.15/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.6.14 - October 23, 2014
+libpng version 1.6.15 - November 20, 2014
Copyright (c) 1998-2010 Glenn Randers-Pehrson
diff --git a/source/libs/libpng/libpng-1.6.14/projects/vstudio/vstudio.sln b/source/libs/libpng/libpng-1.6.15/projects/vstudio/vstudio.sln
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/projects/vstudio/vstudio.sln
rename to source/libs/libpng/libpng-1.6.15/projects/vstudio/vstudio.sln
diff --git a/source/libs/libpng/libpng-1.6.14/projects/vstudio/zlib.props b/source/libs/libpng/libpng-1.6.15/projects/vstudio/zlib.props
similarity index 97%
rename from source/libs/libpng/libpng-1.6.14/projects/vstudio/zlib.props
rename to source/libs/libpng/libpng-1.6.15/projects/vstudio/zlib.props
index e4ff794b07600a63e3f4bc06ae22216a3f2f0d30..4e846d7f0770111164bd1bac5cd79750f12ffa16 100644
--- a/source/libs/libpng/libpng-1.6.14/projects/vstudio/zlib.props
+++ b/source/libs/libpng/libpng-1.6.15/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source
*
- * libpng version 1.6.14 - October 23, 2014
+ * libpng version 1.6.15 - November 20, 2014
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
diff --git a/source/libs/libpng/libpng-1.6.14/projects/vstudio/zlib/zlib.vcxproj b/source/libs/libpng/libpng-1.6.15/projects/vstudio/zlib/zlib.vcxproj
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/projects/vstudio/zlib/zlib.vcxproj
rename to source/libs/libpng/libpng-1.6.15/projects/vstudio/zlib/zlib.vcxproj
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/README.txt b/source/libs/libpng/libpng-1.6.15/scripts/README.txt
similarity index 93%
rename from source/libs/libpng/libpng-1.6.14/scripts/README.txt
rename to source/libs/libpng/libpng-1.6.15/scripts/README.txt
index 16886c492080419f7799f4a5e86afff0ee6bc88f..739eac67ad52e4c731bb195542488144f3206c5b 100644
--- a/source/libs/libpng/libpng-1.6.14/scripts/README.txt
+++ b/source/libs/libpng/libpng-1.6.15/scripts/README.txt
@@ -1,9 +1,9 @@
-Makefiles for libpng version 1.6.14 - October 23, 2014
+Makefiles for libpng version 1.6.15 - November 20, 2014
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng16.so.16.1.6.14)
+ (gcc, creates libpng16.so.16.1.6.15)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
ansi2knr (Requires ansi2knr.c from
@@ -33,12 +33,12 @@ pnglibconf.h.prebuilt => Stores configuration settings
makefile.os2 => OS/2 Makefile (gcc and emx, requires libpng.def)
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
makefile.sggcc => Silicon Graphics (gcc,
- creates libpng16.so.16.1.6.14)
+ creates libpng16.so.16.1.6.15)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng16.so.16.1.6.14)
+ creates libpng16.so.16.1.6.15)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng16.so.16.1.6.14)
+ creates libpng16.so.16.1.6.15)
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.sunos => Sun makefile
makefile.32sunu => Sun Ultra 32-bit makefile
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/SCOPTIONS.ppc b/source/libs/libpng/libpng-1.6.15/scripts/SCOPTIONS.ppc
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/SCOPTIONS.ppc
rename to source/libs/libpng/libpng-1.6.15/scripts/SCOPTIONS.ppc
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/checksym.awk b/source/libs/libpng/libpng-1.6.15/scripts/checksym.awk
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/checksym.awk
rename to source/libs/libpng/libpng-1.6.15/scripts/checksym.awk
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/def.dfn b/source/libs/libpng/libpng-1.6.15/scripts/def.dfn
similarity index 97%
rename from source/libs/libpng/libpng-1.6.14/scripts/def.dfn
rename to source/libs/libpng/libpng-1.6.15/scripts/def.dfn
index b0716405791aae0c901ceb4adfd50873acd35939..6aece794c372832b9d7c7a25be9cda0a3685c4db 100644
--- a/source/libs/libpng/libpng-1.6.14/scripts/def.dfn
+++ b/source/libs/libpng/libpng-1.6.15/scripts/def.dfn
@@ -21,7 +21,7 @@ PNG_DFN "OS2 DESCRIPTION "PNG image compression library""
PNG_DFN "OS2 CODE PRELOAD MOVEABLE DISCARDABLE"
PNG_DFN ""
PNG_DFN "EXPORTS"
-PNG_DFN ";Version 1.6.14"
+PNG_DFN ";Version 1.6.15"
#define PNG_EXPORTA(ordinal, type, name, args, attributes)\
PNG_DFN "@" SYMBOL_PREFIX "@@" name "@"
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/descrip.mms b/source/libs/libpng/libpng-1.6.15/scripts/descrip.mms
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/descrip.mms
rename to source/libs/libpng/libpng-1.6.15/scripts/descrip.mms
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/dfn.awk b/source/libs/libpng/libpng-1.6.15/scripts/dfn.awk
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/dfn.awk
rename to source/libs/libpng/libpng-1.6.15/scripts/dfn.awk
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/intprefix.dfn b/source/libs/libpng/libpng-1.6.15/scripts/intprefix.dfn
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/intprefix.dfn
rename to source/libs/libpng/libpng-1.6.15/scripts/intprefix.dfn
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/libpng-config-body.in b/source/libs/libpng/libpng-1.6.15/scripts/libpng-config-body.in
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/libpng-config-body.in
rename to source/libs/libpng/libpng-1.6.15/scripts/libpng-config-body.in
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/libpng-config-head.in b/source/libs/libpng/libpng-1.6.15/scripts/libpng-config-head.in
similarity index 96%
rename from source/libs/libpng/libpng-1.6.14/scripts/libpng-config-head.in
rename to source/libs/libpng/libpng-1.6.15/scripts/libpng-config-head.in
index d1128142bd39e28b8f863b93230b57ff3bd1f46e..cea087523b02a5384fc9847241948ada7b52884b 100644
--- a/source/libs/libpng/libpng-1.6.14/scripts/libpng-config-head.in
+++ b/source/libs/libpng/libpng-1.6.15/scripts/libpng-config-head.in
@@ -11,7 +11,7 @@
# Modeled after libxml-config.
-version=1.6.14
+version=1.6.15
prefix=""
libdir=""
libs=""
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/libpng.pc.in b/source/libs/libpng/libpng-1.6.15/scripts/libpng.pc.in
similarity index 92%
rename from source/libs/libpng/libpng-1.6.14/scripts/libpng.pc.in
rename to source/libs/libpng/libpng-1.6.15/scripts/libpng.pc.in
index 035a698615ba6bf0e673b3f145458a202ad5e6da..e6399c5215ed2cc4ef32f00d8a3d0538dcde80dd 100644
--- a/source/libs/libpng/libpng-1.6.14/scripts/libpng.pc.in
+++ b/source/libs/libpng/libpng-1.6.15/scripts/libpng.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@/libpng16
Name: libpng
Description: Loads and saves PNG files
-Version: 1.6.14
+Version: 1.6.15
Libs: -L${libdir} -lpng16
Cflags: -I${includedir}
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/libtool.m4 b/source/libs/libpng/libpng-1.6.15/scripts/libtool.m4
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/libtool.m4
rename to source/libs/libpng/libpng-1.6.15/scripts/libtool.m4
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/ltoptions.m4 b/source/libs/libpng/libpng-1.6.15/scripts/ltoptions.m4
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/ltoptions.m4
rename to source/libs/libpng/libpng-1.6.15/scripts/ltoptions.m4
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/ltsugar.m4 b/source/libs/libpng/libpng-1.6.15/scripts/ltsugar.m4
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/ltsugar.m4
rename to source/libs/libpng/libpng-1.6.15/scripts/ltsugar.m4
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/ltversion.m4 b/source/libs/libpng/libpng-1.6.15/scripts/ltversion.m4
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/ltversion.m4
rename to source/libs/libpng/libpng-1.6.15/scripts/ltversion.m4
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/lt~obsolete.m4 b/source/libs/libpng/libpng-1.6.15/scripts/lt~obsolete.m4
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/lt~obsolete.m4
rename to source/libs/libpng/libpng-1.6.15/scripts/lt~obsolete.m4
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/macro.lst b/source/libs/libpng/libpng-1.6.15/scripts/macro.lst
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/macro.lst
rename to source/libs/libpng/libpng-1.6.15/scripts/macro.lst
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.32sunu b/source/libs/libpng/libpng-1.6.15/scripts/makefile.32sunu
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.32sunu
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.32sunu
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.64sunu b/source/libs/libpng/libpng-1.6.15/scripts/makefile.64sunu
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.64sunu
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.64sunu
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.acorn b/source/libs/libpng/libpng-1.6.15/scripts/makefile.acorn
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.acorn
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.acorn
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.aix b/source/libs/libpng/libpng-1.6.15/scripts/makefile.aix
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.aix
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.aix
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.amiga b/source/libs/libpng/libpng-1.6.15/scripts/makefile.amiga
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.amiga
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.amiga
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.atari b/source/libs/libpng/libpng-1.6.15/scripts/makefile.atari
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.atari
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.atari
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.bc32 b/source/libs/libpng/libpng-1.6.15/scripts/makefile.bc32
similarity index 99%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.bc32
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.bc32
index d488a54a0cb8b2a8cc8bdf476145d3dd48132621..bdbc4cb2f91ffd2f656510812f0d92096b87356c 100644
--- a/source/libs/libpng/libpng-1.6.14/scripts/makefile.bc32
+++ b/source/libs/libpng/libpng-1.6.15/scripts/makefile.bc32
@@ -52,7 +52,9 @@ LDFLAGS=-L$(ZLIB_DIR) -M $(LDEBUG)
# Pre-built configuration
# See scripts\pnglibconf.mak for more options
+!ifndef PNGLIBCONF_H_PREBUILT
PNGLIBCONF_H_PREBUILT = scripts\pnglibconf.h.prebuilt
+!endif
## Variables
OBJS = \
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.beos b/source/libs/libpng/libpng-1.6.15/scripts/makefile.beos
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.beos
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.beos
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.bor b/source/libs/libpng/libpng-1.6.15/scripts/makefile.bor
similarity index 99%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.bor
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.bor
index a01f73899830159bc06131419052079a9e11b631..6693772dbe6738703ee75fafc0fdd830a5ae63e6 100644
--- a/source/libs/libpng/libpng-1.6.14/scripts/makefile.bor
+++ b/source/libs/libpng/libpng-1.6.15/scripts/makefile.bor
@@ -60,7 +60,9 @@ LDFLAGS=-M -L$(ZLIB_DIR) $(MODEL_ARG) $(LDEBUG)
# Pre-built configuration
# See scripts\pnglibconf.mak for more options
+!ifndef PNGLIBCONF_H_PREBUILT
PNGLIBCONF_H_PREBUILT = scripts\pnglibconf.h.prebuilt
+!endif
## Variables
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.cegcc b/source/libs/libpng/libpng-1.6.15/scripts/makefile.cegcc
similarity index 99%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.cegcc
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.cegcc
index 324c6ad6fc0d349c322e1536469cd318d8a50654..5422915f80695e1499fe7c9a6f3006cf686ddd5f 100644
--- a/source/libs/libpng/libpng-1.6.14/scripts/makefile.cegcc
+++ b/source/libs/libpng/libpng-1.6.15/scripts/makefile.cegcc
@@ -23,7 +23,7 @@
VERMAJ = 1
VERMIN = 6
-VERMIC = 14
+VERMIC = 15
VER = $(VERMAJ).$(VERMIN).$(VERMIC)
NAME = libpng
PACKAGE = $(NAME)-$(VER)
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.darwin b/source/libs/libpng/libpng-1.6.15/scripts/makefile.darwin
similarity index 97%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.darwin
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.darwin
index fdc744d929c99a37731484979f1c0187ac4f2529..be3f92c54b4406cab6f707231ae92c0f56eca374 100644
--- a/source/libs/libpng/libpng-1.6.14/scripts/makefile.darwin
+++ b/source/libs/libpng/libpng-1.6.15/scripts/makefile.darwin
@@ -36,12 +36,11 @@ LN_SF=ln -sf
RANLIB=ranlib
CP=cp
RM_F=/bin/rm -f
-ARCH=-arch ppc -arch i386 -arch x86_64
CPPFLAGS=-I$(ZLIBINC)
# CFLAGS=-W -Wall -O3 -funroll-loops
-CFLAGS=-W -Wall -O -funroll-loops $(ARCH)
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng16 -lz $(ARCH)
+CFLAGS=-W -Wall -O -funroll-loops
+LDFLAGS=-L. -L$(ZLIBLIB) -lpng16 -lz
INCPATH=$(prefix)/include
LIBPATH=$(exec_prefix)/lib
@@ -113,7 +112,7 @@ $(LIBSOMAJ): $(OBJSDLL)
$(CC) -dynamiclib \
-install_name $(LIBPATH)/$(LIBSOMAJ) \
-current_version 16 -compatibility_version 16 \
- $(ARCH) -o $(LIBSOMAJ) \
+ -o $(LIBSOMAJ) \
$(OBJSDLL) -L$(ZLIBLIB) -lz
pngtest: pngtest.o $(LIBSO)
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.dec b/source/libs/libpng/libpng-1.6.15/scripts/makefile.dec
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.dec
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.dec
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.dj2 b/source/libs/libpng/libpng-1.6.15/scripts/makefile.dj2
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.dj2
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.dj2
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.freebsd b/source/libs/libpng/libpng-1.6.15/scripts/makefile.freebsd
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.freebsd
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.freebsd
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.gcc b/source/libs/libpng/libpng-1.6.15/scripts/makefile.gcc
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.gcc
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.gcc
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.hp64 b/source/libs/libpng/libpng-1.6.15/scripts/makefile.hp64
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.hp64
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.hp64
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.hpgcc b/source/libs/libpng/libpng-1.6.15/scripts/makefile.hpgcc
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.hpgcc
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.hpgcc
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.hpux b/source/libs/libpng/libpng-1.6.15/scripts/makefile.hpux
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.hpux
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.hpux
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.ibmc b/source/libs/libpng/libpng-1.6.15/scripts/makefile.ibmc
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.ibmc
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.ibmc
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.intel b/source/libs/libpng/libpng-1.6.15/scripts/makefile.intel
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.intel
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.intel
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.knr b/source/libs/libpng/libpng-1.6.15/scripts/makefile.knr
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.knr
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.knr
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.linux b/source/libs/libpng/libpng-1.6.15/scripts/makefile.linux
similarity index 99%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.linux
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.linux
index 58396d12c227e6e772b485b719b621d3b85c413a..1ecfd1af424844991cc7e298c271ab6feea5c44b 100644
--- a/source/libs/libpng/libpng-1.6.14/scripts/makefile.linux
+++ b/source/libs/libpng/libpng-1.6.15/scripts/makefile.linux
@@ -10,7 +10,7 @@
# Library name:
LIBNAME = libpng16
PNGMAJ = 16
-RELEASE = 14
+RELEASE = 15
# Shared library names:
LIBSO=$(LIBNAME).so
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.mips b/source/libs/libpng/libpng-1.6.15/scripts/makefile.mips
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.mips
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.mips
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.msc b/source/libs/libpng/libpng-1.6.15/scripts/makefile.msc
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.msc
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.msc
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.msys b/source/libs/libpng/libpng-1.6.15/scripts/makefile.msys
similarity index 99%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.msys
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.msys
index 1d815c052b1b28d7d141612a473c0a78775f1abf..fa59c86a967c059ae41aed3d0334a5e938c4aee4 100644
--- a/source/libs/libpng/libpng-1.6.14/scripts/makefile.msys
+++ b/source/libs/libpng/libpng-1.6.15/scripts/makefile.msys
@@ -18,7 +18,7 @@ exec_prefix=$(prefix)
# Library name:
LIBNAME = libpng16
PNGMAJ = 16
-RELEASE = 14
+RELEASE = 15
# Shared library names:
LIBSO=$(LIBNAME).dll
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.ne12bsd b/source/libs/libpng/libpng-1.6.15/scripts/makefile.ne12bsd
similarity index 98%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.ne12bsd
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.ne12bsd
index b203eb946870261058ff50555136424af54a4dfa..32432ebc9b191b78c5a41788d57c2d543e3b6a2d 100644
--- a/source/libs/libpng/libpng-1.6.14/scripts/makefile.ne12bsd
+++ b/source/libs/libpng/libpng-1.6.15/scripts/makefile.ne12bsd
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng16
LIB= png16
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.6.14
+SHLIB_MINOR= 1.6.15
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.netbsd b/source/libs/libpng/libpng-1.6.15/scripts/makefile.netbsd
similarity index 98%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.netbsd
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.netbsd
index 9987361e0f8eb1aa57a2d89fee6c403cb35e0bac..41f2e92fbc335f6c291f6d5cc3033de17e4212d0 100644
--- a/source/libs/libpng/libpng-1.6.14/scripts/makefile.netbsd
+++ b/source/libs/libpng/libpng-1.6.15/scripts/makefile.netbsd
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include
LIB= png
SHLIB_MAJOR= 16
-SHLIB_MINOR= 1.6.14
+SHLIB_MINOR= 1.6.15
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.openbsd b/source/libs/libpng/libpng-1.6.15/scripts/makefile.openbsd
similarity index 99%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.openbsd
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.openbsd
index 5aed6f57df3ffabf87eddc228d7dc273520ffde8..5a193e95004163b94fc69c29627a8b5f45198a3a 100644
--- a/source/libs/libpng/libpng-1.6.14/scripts/makefile.openbsd
+++ b/source/libs/libpng/libpng-1.6.15/scripts/makefile.openbsd
@@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 16
-SHLIB_MINOR= 1.6.14
+SHLIB_MINOR= 1.6.15
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.sco b/source/libs/libpng/libpng-1.6.15/scripts/makefile.sco
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.sco
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.sco
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.sggcc b/source/libs/libpng/libpng-1.6.15/scripts/makefile.sggcc
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.sggcc
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.sggcc
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.sgi b/source/libs/libpng/libpng-1.6.15/scripts/makefile.sgi
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.sgi
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.sgi
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.so9 b/source/libs/libpng/libpng-1.6.15/scripts/makefile.so9
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.so9
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.so9
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.solaris b/source/libs/libpng/libpng-1.6.15/scripts/makefile.solaris
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.solaris
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.solaris
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.solaris-x86 b/source/libs/libpng/libpng-1.6.15/scripts/makefile.solaris-x86
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.solaris-x86
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.solaris-x86
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.std b/source/libs/libpng/libpng-1.6.15/scripts/makefile.std
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.std
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.std
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.sunos b/source/libs/libpng/libpng-1.6.15/scripts/makefile.sunos
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.sunos
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.sunos
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.tc3 b/source/libs/libpng/libpng-1.6.15/scripts/makefile.tc3
similarity index 98%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.tc3
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.tc3
index c917a08f15e01f947f4fc8d2f47c0bf5ba65b644..1d015026cbc96bfc3331e36e6fa59a2c87c5bcc0 100644
--- a/source/libs/libpng/libpng-1.6.14/scripts/makefile.tc3
+++ b/source/libs/libpng/libpng-1.6.15/scripts/makefile.tc3
@@ -16,7 +16,9 @@ CP=copy
# Pre-built configuration
# See scripts\pnglibconf.mak for more options
+!ifndef PNGLIBCONF_H_PREBUILT
PNGLIBCONF_H_PREBUILT = scripts\pnglibconf.h.prebuilt
+!endif
O=.obj
E=.exe
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makefile.vcwin32 b/source/libs/libpng/libpng-1.6.15/scripts/makefile.vcwin32
similarity index 97%
rename from source/libs/libpng/libpng-1.6.14/scripts/makefile.vcwin32
rename to source/libs/libpng/libpng-1.6.15/scripts/makefile.vcwin32
index 62196923927e582d1b3ffea16f5f23ceec0def31..2bd143cc0aeb91e9b1bc78a09547fb657a3338fd 100644
--- a/source/libs/libpng/libpng-1.6.14/scripts/makefile.vcwin32
+++ b/source/libs/libpng/libpng-1.6.15/scripts/makefile.vcwin32
@@ -16,7 +16,7 @@ CC = cl
LD = link
AR = lib
CPPFLAGS = -I..\zlib
-CFLAGS = -nologo -D_CRT_SECURE_NO_DEPRECATE -MD -O2 -W3
+CFLAGS = -nologo -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -MD -O2 -W3
LDFLAGS = -nologo
ARFLAGS = -nologo
CP = copy
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/makevms.com b/source/libs/libpng/libpng-1.6.15/scripts/makevms.com
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/makevms.com
rename to source/libs/libpng/libpng-1.6.15/scripts/makevms.com
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/options.awk b/source/libs/libpng/libpng-1.6.15/scripts/options.awk
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/options.awk
rename to source/libs/libpng/libpng-1.6.15/scripts/options.awk
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/pnglibconf.dfa b/source/libs/libpng/libpng-1.6.15/scripts/pnglibconf.dfa
similarity index 99%
rename from source/libs/libpng/libpng-1.6.14/scripts/pnglibconf.dfa
rename to source/libs/libpng/libpng-1.6.15/scripts/pnglibconf.dfa
index 62b922c020750cc3cf627af8b95a2dc8fcd9c8bb..2744b6ba5b95323add5a6b83913064996e2fd7f0 100644
--- a/source/libs/libpng/libpng-1.6.14/scripts/pnglibconf.dfa
+++ b/source/libs/libpng/libpng-1.6.15/scripts/pnglibconf.dfa
@@ -221,7 +221,7 @@ option SET_OPTION disabled
# ARM_NEON_API: (PNG_ARM_NEON == 1) allow the optimization to be switched on
# with png_set_option
# ARM_NEON_CHECK: (PNG_ARM_NEON == 1) compile a run-time check to see if Neon
-# extensions are supported, this is poorly supported and
+# extensions are supported. This is poorly supported and
# deprectated - use the png_set_option API.
setting ARM_NEON_OPT
option ARM_NEON_API disabled requires ALIGNED_MEMORY enables SET_OPTION,
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/pnglibconf.h.prebuilt b/source/libs/libpng/libpng-1.6.15/scripts/pnglibconf.h.prebuilt
similarity index 98%
rename from source/libs/libpng/libpng-1.6.14/scripts/pnglibconf.h.prebuilt
rename to source/libs/libpng/libpng-1.6.15/scripts/pnglibconf.h.prebuilt
index 2c45d90ae176142005562b13292c05d85f44e739..325ef39bdec6f2b2f7f8a4ff10badf893c6dc854 100644
--- a/source/libs/libpng/libpng-1.6.14/scripts/pnglibconf.h.prebuilt
+++ b/source/libs/libpng/libpng-1.6.15/scripts/pnglibconf.h.prebuilt
@@ -1,8 +1,8 @@
-/* libpng 1.6.14 STANDARD API DEFINITION */
+/* libpng 1.6.15 STANDARD API DEFINITION */
/* pnglibconf.h - library build configuration */
-/* Libpng version 1.6.14 - October 23, 2014 */
+/* Libpng version 1.6.15 - November 20, 2014 */
/* Copyright (c) 1998-2014 Glenn Randers-Pehrson */
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/pnglibconf.mak b/source/libs/libpng/libpng-1.6.15/scripts/pnglibconf.mak
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/pnglibconf.mak
rename to source/libs/libpng/libpng-1.6.15/scripts/pnglibconf.mak
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/pngwin.rc b/source/libs/libpng/libpng-1.6.15/scripts/pngwin.rc
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/pngwin.rc
rename to source/libs/libpng/libpng-1.6.15/scripts/pngwin.rc
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/prefix.dfn b/source/libs/libpng/libpng-1.6.15/scripts/prefix.dfn
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/prefix.dfn
rename to source/libs/libpng/libpng-1.6.15/scripts/prefix.dfn
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/smakefile.ppc b/source/libs/libpng/libpng-1.6.15/scripts/smakefile.ppc
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/smakefile.ppc
rename to source/libs/libpng/libpng-1.6.15/scripts/smakefile.ppc
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/sym.dfn b/source/libs/libpng/libpng-1.6.15/scripts/sym.dfn
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/sym.dfn
rename to source/libs/libpng/libpng-1.6.15/scripts/sym.dfn
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/symbols.def b/source/libs/libpng/libpng-1.6.15/scripts/symbols.def
similarity index 99%
rename from source/libs/libpng/libpng-1.6.14/scripts/symbols.def
rename to source/libs/libpng/libpng-1.6.15/scripts/symbols.def
index a10a4ae714e685f365b94534e9cf0ae1c625dad2..908d3aa4bf8bd79587453a9c523a598fb60bfac8 100644
--- a/source/libs/libpng/libpng-1.6.14/scripts/symbols.def
+++ b/source/libs/libpng/libpng-1.6.15/scripts/symbols.def
@@ -1,4 +1,4 @@
-;Version 1.6.14
+;Version 1.6.15
;--------------------------------------------------------------
; LIBPNG symbol list as a Win32 DEF file
; Contains all the symbols that can be exported from libpng
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/symbols.dfn b/source/libs/libpng/libpng-1.6.15/scripts/symbols.dfn
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/symbols.dfn
rename to source/libs/libpng/libpng-1.6.15/scripts/symbols.dfn
diff --git a/source/libs/libpng/libpng-1.6.14/scripts/vers.dfn b/source/libs/libpng/libpng-1.6.15/scripts/vers.dfn
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/scripts/vers.dfn
rename to source/libs/libpng/libpng-1.6.15/scripts/vers.dfn
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngimage-full b/source/libs/libpng/libpng-1.6.15/tests/pngimage-full
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngimage-full
rename to source/libs/libpng/libpng-1.6.15/tests/pngimage-full
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngimage-quick b/source/libs/libpng/libpng-1.6.15/tests/pngimage-quick
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngimage-quick
rename to source/libs/libpng/libpng-1.6.15/tests/pngimage-quick
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngstest b/source/libs/libpng/libpng-1.6.15/tests/pngstest
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngstest
rename to source/libs/libpng/libpng-1.6.15/tests/pngstest
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngstest-0g01 b/source/libs/libpng/libpng-1.6.15/tests/pngstest-0g01
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngstest-0g01
rename to source/libs/libpng/libpng-1.6.15/tests/pngstest-0g01
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngstest-0g02 b/source/libs/libpng/libpng-1.6.15/tests/pngstest-0g02
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngstest-0g02
rename to source/libs/libpng/libpng-1.6.15/tests/pngstest-0g02
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngstest-0g04 b/source/libs/libpng/libpng-1.6.15/tests/pngstest-0g04
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngstest-0g04
rename to source/libs/libpng/libpng-1.6.15/tests/pngstest-0g04
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngstest-0g08 b/source/libs/libpng/libpng-1.6.15/tests/pngstest-0g08
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngstest-0g08
rename to source/libs/libpng/libpng-1.6.15/tests/pngstest-0g08
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngstest-0g16 b/source/libs/libpng/libpng-1.6.15/tests/pngstest-0g16
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngstest-0g16
rename to source/libs/libpng/libpng-1.6.15/tests/pngstest-0g16
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngstest-2c08 b/source/libs/libpng/libpng-1.6.15/tests/pngstest-2c08
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngstest-2c08
rename to source/libs/libpng/libpng-1.6.15/tests/pngstest-2c08
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngstest-2c16 b/source/libs/libpng/libpng-1.6.15/tests/pngstest-2c16
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngstest-2c16
rename to source/libs/libpng/libpng-1.6.15/tests/pngstest-2c16
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngstest-3p01 b/source/libs/libpng/libpng-1.6.15/tests/pngstest-3p01
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngstest-3p01
rename to source/libs/libpng/libpng-1.6.15/tests/pngstest-3p01
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngstest-3p02 b/source/libs/libpng/libpng-1.6.15/tests/pngstest-3p02
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngstest-3p02
rename to source/libs/libpng/libpng-1.6.15/tests/pngstest-3p02
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngstest-3p04 b/source/libs/libpng/libpng-1.6.15/tests/pngstest-3p04
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngstest-3p04
rename to source/libs/libpng/libpng-1.6.15/tests/pngstest-3p04
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngstest-3p08 b/source/libs/libpng/libpng-1.6.15/tests/pngstest-3p08
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngstest-3p08
rename to source/libs/libpng/libpng-1.6.15/tests/pngstest-3p08
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngstest-4a08 b/source/libs/libpng/libpng-1.6.15/tests/pngstest-4a08
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngstest-4a08
rename to source/libs/libpng/libpng-1.6.15/tests/pngstest-4a08
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngstest-4a16 b/source/libs/libpng/libpng-1.6.15/tests/pngstest-4a16
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngstest-4a16
rename to source/libs/libpng/libpng-1.6.15/tests/pngstest-4a16
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngstest-6a08 b/source/libs/libpng/libpng-1.6.15/tests/pngstest-6a08
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngstest-6a08
rename to source/libs/libpng/libpng-1.6.15/tests/pngstest-6a08
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngstest-6a16 b/source/libs/libpng/libpng-1.6.15/tests/pngstest-6a16
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngstest-6a16
rename to source/libs/libpng/libpng-1.6.15/tests/pngstest-6a16
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngstest-error b/source/libs/libpng/libpng-1.6.15/tests/pngstest-error
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngstest-error
rename to source/libs/libpng/libpng-1.6.15/tests/pngstest-error
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngtest b/source/libs/libpng/libpng-1.6.15/tests/pngtest
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngtest
rename to source/libs/libpng/libpng-1.6.15/tests/pngtest
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngunknown-IDAT b/source/libs/libpng/libpng-1.6.15/tests/pngunknown-IDAT
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngunknown-IDAT
rename to source/libs/libpng/libpng-1.6.15/tests/pngunknown-IDAT
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngunknown-discard b/source/libs/libpng/libpng-1.6.15/tests/pngunknown-discard
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngunknown-discard
rename to source/libs/libpng/libpng-1.6.15/tests/pngunknown-discard
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngunknown-if-safe b/source/libs/libpng/libpng-1.6.15/tests/pngunknown-if-safe
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngunknown-if-safe
rename to source/libs/libpng/libpng-1.6.15/tests/pngunknown-if-safe
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngunknown-sAPI b/source/libs/libpng/libpng-1.6.15/tests/pngunknown-sAPI
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngunknown-sAPI
rename to source/libs/libpng/libpng-1.6.15/tests/pngunknown-sAPI
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngunknown-sTER b/source/libs/libpng/libpng-1.6.15/tests/pngunknown-sTER
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngunknown-sTER
rename to source/libs/libpng/libpng-1.6.15/tests/pngunknown-sTER
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngunknown-save b/source/libs/libpng/libpng-1.6.15/tests/pngunknown-save
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngunknown-save
rename to source/libs/libpng/libpng-1.6.15/tests/pngunknown-save
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngunknown-vpAg b/source/libs/libpng/libpng-1.6.15/tests/pngunknown-vpAg
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngunknown-vpAg
rename to source/libs/libpng/libpng-1.6.15/tests/pngunknown-vpAg
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngvalid-gamma-16-to-8 b/source/libs/libpng/libpng-1.6.15/tests/pngvalid-gamma-16-to-8
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngvalid-gamma-16-to-8
rename to source/libs/libpng/libpng-1.6.15/tests/pngvalid-gamma-16-to-8
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngvalid-gamma-alpha-mode b/source/libs/libpng/libpng-1.6.15/tests/pngvalid-gamma-alpha-mode
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngvalid-gamma-alpha-mode
rename to source/libs/libpng/libpng-1.6.15/tests/pngvalid-gamma-alpha-mode
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngvalid-gamma-background b/source/libs/libpng/libpng-1.6.15/tests/pngvalid-gamma-background
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngvalid-gamma-background
rename to source/libs/libpng/libpng-1.6.15/tests/pngvalid-gamma-background
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngvalid-gamma-expand16-alpha-mode b/source/libs/libpng/libpng-1.6.15/tests/pngvalid-gamma-expand16-alpha-mode
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngvalid-gamma-expand16-alpha-mode
rename to source/libs/libpng/libpng-1.6.15/tests/pngvalid-gamma-expand16-alpha-mode
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngvalid-gamma-expand16-background b/source/libs/libpng/libpng-1.6.15/tests/pngvalid-gamma-expand16-background
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngvalid-gamma-expand16-background
rename to source/libs/libpng/libpng-1.6.15/tests/pngvalid-gamma-expand16-background
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngvalid-gamma-expand16-transform b/source/libs/libpng/libpng-1.6.15/tests/pngvalid-gamma-expand16-transform
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngvalid-gamma-expand16-transform
rename to source/libs/libpng/libpng-1.6.15/tests/pngvalid-gamma-expand16-transform
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngvalid-gamma-sbit b/source/libs/libpng/libpng-1.6.15/tests/pngvalid-gamma-sbit
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngvalid-gamma-sbit
rename to source/libs/libpng/libpng-1.6.15/tests/pngvalid-gamma-sbit
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngvalid-gamma-threshold b/source/libs/libpng/libpng-1.6.15/tests/pngvalid-gamma-threshold
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngvalid-gamma-threshold
rename to source/libs/libpng/libpng-1.6.15/tests/pngvalid-gamma-threshold
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngvalid-gamma-transform b/source/libs/libpng/libpng-1.6.15/tests/pngvalid-gamma-transform
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngvalid-gamma-transform
rename to source/libs/libpng/libpng-1.6.15/tests/pngvalid-gamma-transform
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngvalid-progressive-interlace-size b/source/libs/libpng/libpng-1.6.15/tests/pngvalid-progressive-interlace-size
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngvalid-progressive-interlace-size
rename to source/libs/libpng/libpng-1.6.15/tests/pngvalid-progressive-interlace-size
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngvalid-progressive-interlace-standard b/source/libs/libpng/libpng-1.6.15/tests/pngvalid-progressive-interlace-standard
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngvalid-progressive-interlace-standard
rename to source/libs/libpng/libpng-1.6.15/tests/pngvalid-progressive-interlace-standard
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngvalid-progressive-interlace-transform b/source/libs/libpng/libpng-1.6.15/tests/pngvalid-progressive-interlace-transform
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngvalid-progressive-interlace-transform
rename to source/libs/libpng/libpng-1.6.15/tests/pngvalid-progressive-interlace-transform
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngvalid-progressive-standard b/source/libs/libpng/libpng-1.6.15/tests/pngvalid-progressive-standard
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngvalid-progressive-standard
rename to source/libs/libpng/libpng-1.6.15/tests/pngvalid-progressive-standard
diff --git a/source/libs/libpng/libpng-1.6.14/tests/pngvalid-standard b/source/libs/libpng/libpng-1.6.15/tests/pngvalid-standard
similarity index 100%
rename from source/libs/libpng/libpng-1.6.14/tests/pngvalid-standard
rename to source/libs/libpng/libpng-1.6.15/tests/pngvalid-standard
diff --git a/source/libs/libpng/version.ac b/source/libs/libpng/version.ac
index e9714e4c06a967bd2a481456974066e046447276..470555ad8f91461adcabb3c196d902b9a283ac53 100644
--- a/source/libs/libpng/version.ac
+++ b/source/libs/libpng/version.ac
@@ -8,4 +8,4 @@ dnl
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current libpng version
-m4_define([libpng_version], [1.6.14])
+m4_define([libpng_version], [1.6.15])
diff --git a/source/libs/lua52/Makefile.am b/source/libs/lua52/Makefile.am
index 220fdb6f482fd20979ee134880a5115fd7e8175c..3858a41f1a3bdf17c53ef4da16a48171df41bfeb 100644
--- a/source/libs/lua52/Makefile.am
+++ b/source/libs/lua52/Makefile.am
@@ -62,7 +62,6 @@ nodist_libtexlua52_la_SOURCES = \
@LUA52_TREE@/src/lvm.c \
@LUA52_TREE@/src/lzio.c
-
lua52includedir = ${includedir}/texlua52
lua52include_HEADERS = \
diff --git a/source/libs/lua52/configure b/source/libs/lua52/configure
index 1c936d897861980143c88dbfee9c13044e3bed28..86d13fb3a30d24b3942ceb9822c1be9cd30d8d53 100755
--- a/source/libs/lua52/configure
+++ b/source/libs/lua52/configure
@@ -770,6 +770,7 @@ enable_shared
enable_static
with_pic
enable_fast_install
+with_aix_soname
with_gnu_ld
with_sysroot
enable_libtool_lock
@@ -1427,6 +1428,9 @@ Optional Packages:
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
both]
+ --with-aix-soname=aix|svr4|both
+ shared library versioning (aka "SONAME") variant to
+ provide on AIX, [default=aix].
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-sysroot[=DIR] Search for dependent libraries within DIR (or the
compiler's sysroot if not specified).
@@ -4935,8 +4939,8 @@ esac
-macro_version='2.4.2.458.26-92994'
-macro_revision='2.4.3'
+macro_version='2.4.4'
+macro_revision='2.4.4'
@@ -6294,6 +6298,9 @@ sysv4 | sysv4.3*)
tpf*)
lt_cv_deplibs_check_method=pass_all
;;
+os2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
fi
@@ -9059,6 +9066,58 @@ fi
+ shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[5-9]*,yes)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+
+# Check whether --with-aix-soname was given.
+if test "${with_aix_soname+set}" = set; then :
+ withval=$with_aix_soname; case $withval in
+ aix|svr4|both)
+ ;;
+ *)
+ as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+ ;;
+ esac
+ lt_cv_with_aix_soname=$with_aix_soname
+else
+ if ${lt_cv_with_aix_soname+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_with_aix_soname=aix
+fi
+
+ with_aix_soname=$lt_cv_with_aix_soname
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
+ if test aix != "$with_aix_soname"; then
+ # For the AIX way of multilib, we name the shared archive member
+ # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+ # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+ # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+ # the AIX toolchain works better with OBJECT_MODE set (default 32).
+ if test 64 = "${OBJECT_MODE-32}"; then
+ shared_archive_member_spec=shr_64
+ else
+ shared_archive_member_spec=shr
+ fi
+ fi
+ ;;
+*)
+ with_aix_soname=aix
+ ;;
+esac
+
+
+
+
+
+
+
@@ -9497,6 +9556,11 @@ lt_prog_compiler_static=
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
lt_prog_compiler_pic='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
@@ -9593,6 +9657,11 @@ lt_prog_compiler_static=
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static='$wl-static'
+ ;;
+ esac
;;
hpux9* | hpux10* | hpux11*)
@@ -10233,6 +10302,34 @@ _LT_EOF
link_all_deplibs=yes
;;
+ os2*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ allow_undefined_flag=unsupported
+ shrext_cmds=.dll
+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes=yes
+ ;;
+
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
@@ -10306,6 +10403,9 @@ _LT_EOF
fi
case $cc_basename in
+ tcc*)
+ export_dynamic_flag_spec='-rdynamic'
+ ;;
xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
@@ -10435,19 +10535,35 @@ _LT_EOF
no_entry_flag=
else
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global
- # defined symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
@@ -10455,6 +10571,13 @@ _LT_EOF
break
fi
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -10474,6 +10597,14 @@ _LT_EOF
hardcode_libdir_separator=':'
link_all_deplibs=yes
file_list_spec='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # traditional, no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ hardcode_direct=no
+ hardcode_direct_absolute=no
+ ;;
+ esac
if test yes = "$GCC"; then
case $host_os in aix4.[012]|aix4.[012].*)
@@ -10501,6 +10632,11 @@ _LT_EOF
if test yes = "$aix_use_runtimelinking"; then
shared_flag="$shared_flag "'$wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
if test ia64 = "$host_cpu"; then
@@ -10513,6 +10649,8 @@ _LT_EOF
else
shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
@@ -10520,7 +10658,7 @@ _LT_EOF
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to export.
always_export_symbols=yes
- if test yes = "$aix_use_runtimelinking"; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
allow_undefined_flag='-berok'
@@ -10635,8 +10773,20 @@ fi
whole_archive_flag_spec='$convenience'
fi
archive_cmds_need_lc=yes
- # This is similar to how AIX traditionally builds its shared libraries.
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $wl-bnoentry $compiler_flags $wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+ else
+ # used by -dlpreopen to get the symbols
+ archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -10955,6 +11105,16 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
link_all_deplibs=yes
;;
+ linux*)
+ case $cc_basename in
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ ld_shlibs=yes
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+
netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
@@ -11000,8 +11160,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ shrext_cmds=.dll
+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes=yes
;;
osf3*)
@@ -11560,20 +11740,70 @@ aix[4-9]*)
fi
;;
esac
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
# AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
# soname into executable. Probably we can add versioning support to
# collect2, so additional links can be useful in future.
- if test yes = "$aix_use_runtimelinking"; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
# instead of lib<name>.a to let people know that these are not
# typical AIX shared libraries.
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
- else
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a(lib.so.V)'
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
library_names_spec='$libname$release.a $libname.a'
soname_spec='$libname$release$shared_ext$major'
- fi
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
shlibpath_var=LIBPATH
fi
;;
@@ -11761,7 +11991,7 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
need_version=no
need_lib_prefix=no
;;
@@ -12045,11 +12275,32 @@ openbsd* | bitrig*)
os2*)
libname_spec='$name'
+ version_type=windows
shrext_cmds=.dll
+ need_version=no
need_lib_prefix=no
- library_names_spec='$libname$shared_ext $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
;;
osf3* | osf4* | osf5*)
@@ -12125,7 +12376,7 @@ sysv4*MP*)
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
need_lib_prefix=no
need_version=no
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
@@ -12654,7 +12905,7 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
@@ -12760,7 +13011,7 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
@@ -12909,8 +13160,12 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
;;
aix[4-9]*)
- if test ia64 != "$host_cpu" && test no = "$aix_use_runtimelinking"; then
- test yes = "$enable_shared" && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -14241,6 +14496,7 @@ enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
@@ -15283,6 +15539,9 @@ pic_mode=$pic_mode
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
# Shell to use when invoking shell scripts.
SHELL=$lt_SHELL
diff --git a/source/libs/luajit/ChangeLog b/source/libs/luajit/ChangeLog
index e1ca65e06ae9406bf0a2465e49660f46f5b83ffd..ef6d06a0bf24e3f40b08941498685fa5364dfb6a 100644
--- a/source/libs/luajit/ChangeLog
+++ b/source/libs/luajit/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-04 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am, configure.ac: Build luajit as (possibly shared)
+ Libtool library, install headers, library, and .pc file.
+ * luajiterror.test: Adapted.
+
2014-09-20 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac, native/configure.ac: Improved cross-build.
diff --git a/source/libs/luajit/Makefile.am b/source/libs/luajit/Makefile.am
index e32186a5f79367cc5dfcfce556d72c01838c4af1..393989fdbb4f9de0489dde0d9105763a53faa696 100644
--- a/source/libs/luajit/Makefile.am
+++ b/source/libs/luajit/Makefile.am
@@ -14,16 +14,18 @@ EXTRA_DIST += $(LUAJIT_TREE)-PATCHES
# in case of an SVN repository
dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
+ rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name .libs -o -name '*.o' -o -name '*.lo'`
AM_CPPFLAGS = -I$(srcdir)/$(LUAJIT_TREE)/src $(LUAJIT_DEFINES)
AM_CFLAGS = -Wall
SUBDIRS = . native include
-noinst_LIBRARIES = libluajit.a
+lib_LTLIBRARIES = libtexluajit.la
-nodist_libluajit_a_SOURCES = \
+libtexluajit_la_LDFLAGS = -bindir @bindir@ -no-undefined -version-info $(LUAJIT_LT_VERSINFO)
+
+nodist_libtexluajit_la_SOURCES = \
$(ljlib_sources) \
@LUAJIT_TREE@/src/lbitlib.c \
@LUAJIT_TREE@/src/lib_aux.c \
@@ -77,11 +79,10 @@ nodist_libluajit_a_SOURCES = \
@LUAJIT_TREE@/src/lj_vmevent.c \
@LUAJIT_TREE@/src/lj_vmmath.c
-
if PEOBJ
-libluajit_a_LIBADD = lj_vm_obj.o
+libtexluajit_la_LIBADD = lj_vm_obj.lo
else !PEOBJ
-nodist_libluajit_a_SOURCES += lj_vm_asm.s
+nodist_libtexluajit_la_SOURCES += lj_vm_asm.s
endif !PEOBJ
ljlib_sources = \
@@ -97,7 +98,7 @@ ljlib_sources = \
lib_jit.c \
lib_ffi.c
-$(libluajit_a_OBJECTS): $(HDRGEN)
+$(libtexluajit_la_OBJECTS): $(HDRGEN)
# When cross-compiling, EXEEXT for the build and host systems may differ.
# Thus we depend on the auxiliary file native/buildvm-stamp.
@@ -124,6 +125,11 @@ lj_folddef.h: native/buildvm-stamp $(LUAJIT_TREE)/src/lj_opt_fold.c
lj_vm_obj.o lj_vm_asm.s: native/buildvm-stamp
$(AM_V_GEN)native/buildvm -m $(LJVM_MODE) -o $@
+lj_vm_obj.lo: lj_vm_obj.o lib_base.lo
+ $(AM_V_GEN)sed 's/lib_base/lj_vm_obj/' lib_base.lo >$@ \
+ && . ./$@ && test x"$$pic_object" == xnone \
+ || cp lj_vm_obj.o .libs/lj_vm_obj.o
+
$(ljlib_sources): config.force
@test -f $@ || { rm -f $@; \
if $(AM_V_P); then echo "$(LN_S) $(srcdir)/$(LUAJIT_TREE)/src/$@ $@"; \
@@ -134,6 +140,20 @@ CLEANFILES = $(HDRGEN) $(ljlib_sources) lj_vm_asm.s
CONFIG_CLEAN_FILES = dynasm_flags native_flags
+luajitincludedir = ${includedir}/texluajit
+
+luajitinclude_HEADERS = \
+ $(LUAJIT_TREE)/src/lauxlib.h \
+ $(LUAJIT_TREE)/src/luaconf.h \
+ $(LUAJIT_TREE)/src/luajit.h \
+ $(LUAJIT_TREE)/src/lua.h \
+ $(LUAJIT_TREE)/src/lua.hpp \
+ $(LUAJIT_TREE)/src/lualib.h
+
+pkgconfigdir = ${libdir}/pkgconfig
+
+pkgconfig_DATA = texluajit.pc
+
if build
check_PROGRAMS = jittest luajittry
dist_check_SCRIPTS = luajit.test luajiterr.test
@@ -149,7 +169,7 @@ nodist_luajittry_SOURCES = @LUAJIT_TREE@/src/luajit.c
luajittry_CPPFLAGS = -Iinclude
luajittry_LDFLAGS = $(LUAJIT_LDEXTRA)
-LDADD = libluajit.a
+LDADD = libtexluajit.la
EXTRA_DIST += jiterr.exp
CLEANFILES += jiterr.out jiterr.tmp
diff --git a/source/libs/luajit/Makefile.in b/source/libs/luajit/Makefile.in
index eec16acadc1e396aa1f426b791c93da8fcd6a490..71999b66dcf75022c278c510f0c40e905f0961f4 100644
--- a/source/libs/luajit/Makefile.in
+++ b/source/libs/luajit/Makefile.in
@@ -14,6 +14,8 @@
@SET_MAKE@
+
+
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__make_running_with_option = \
@@ -84,8 +86,8 @@ 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 \
+ $(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 \
@@ -96,15 +98,23 @@ DIST_COMMON = $(srcdir)/../../am/reconfig.am \
$(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 \
$(top_srcdir)/../../m4/kpse-common.m4 \
+ $(top_srcdir)/../../m4/kpse-dll-name.m4 \
$(top_srcdir)/../../m4/kpse-largefile.m4 \
+ $(top_srcdir)/../../m4/kpse-lib-version.m4 \
$(top_srcdir)/../../m4/kpse-luajit-flags.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
- $(top_srcdir)/version.ac $(top_srcdir)/configure.ac
+ $(top_srcdir)/../../m4/libtool.m4 \
+ $(top_srcdir)/../../m4/ltoptions.m4 \
+ $(top_srcdir)/../../m4/ltsugar.m4 \
+ $(top_srcdir)/../../m4/ltversion.m4 \
+ $(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -112,85 +122,94 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_VPATH_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-AR = ar
-ARFLAGS = cru
-AM_V_AR = $(am__v_AR_@AM_V@)
-am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
-am__v_AR_0 = @echo " AR " $@;
-am__v_AR_1 =
-libluajit_a_AR = $(AR) $(ARFLAGS)
-@PEOBJ_TRUE@libluajit_a_DEPENDENCIES = lj_vm_obj.o
-am__objects_1 = lib_base.$(OBJEXT) lib_math.$(OBJEXT) \
- lib_bit.$(OBJEXT) lib_string.$(OBJEXT) lib_table.$(OBJEXT) \
- lib_io.$(OBJEXT) lib_os.$(OBJEXT) lib_package.$(OBJEXT) \
- lib_debug.$(OBJEXT) lib_jit.$(OBJEXT) lib_ffi.$(OBJEXT)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
+ "$(DESTDIR)$(luajitincludedir)"
+LTLIBRARIES = $(lib_LTLIBRARIES)
+@PEOBJ_TRUE@libtexluajit_la_DEPENDENCIES = lj_vm_obj.lo
+am__objects_1 = lib_base.lo lib_math.lo lib_bit.lo lib_string.lo \
+ lib_table.lo lib_io.lo lib_os.lo lib_package.lo lib_debug.lo \
+ lib_jit.lo lib_ffi.lo
am__dirstamp = $(am__leading_dot)dirstamp
-@PEOBJ_FALSE@am__objects_2 = lj_vm_asm.$(OBJEXT)
-nodist_libluajit_a_OBJECTS = $(am__objects_1) \
- @LUAJIT_TREE@/src/lbitlib.$(OBJEXT) \
- @LUAJIT_TREE@/src/lib_aux.$(OBJEXT) \
- @LUAJIT_TREE@/src/lib_init.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_alloc.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_api.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_asm.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_bc.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_bcread.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_bcwrite.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_carith.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_ccall.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_ccallback.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_cconv.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_cdata.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_char.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_clib.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_cparse.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_crecord.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_ctype.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_debug.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_dispatch.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_err.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_ffrecord.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_func.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_gc.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_gdbjit.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_ir.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_lex.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_lib.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_load.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_mcode.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_meta.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_obj.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_opt_dce.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_opt_fold.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_opt_loop.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_opt_mem.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_opt_narrow.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_opt_sink.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_opt_split.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_parse.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_record.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_snap.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_state.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_str.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_strscan.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_tab.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_trace.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_udata.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_vmevent.$(OBJEXT) \
- @LUAJIT_TREE@/src/lj_vmmath.$(OBJEXT) $(am__objects_2)
-libluajit_a_OBJECTS = $(nodist_libluajit_a_OBJECTS)
+@PEOBJ_FALSE@am__objects_2 = lj_vm_asm.lo
+nodist_libtexluajit_la_OBJECTS = $(am__objects_1) \
+ @LUAJIT_TREE@/src/lbitlib.lo @LUAJIT_TREE@/src/lib_aux.lo \
+ @LUAJIT_TREE@/src/lib_init.lo @LUAJIT_TREE@/src/lj_alloc.lo \
+ @LUAJIT_TREE@/src/lj_api.lo @LUAJIT_TREE@/src/lj_asm.lo \
+ @LUAJIT_TREE@/src/lj_bc.lo @LUAJIT_TREE@/src/lj_bcread.lo \
+ @LUAJIT_TREE@/src/lj_bcwrite.lo @LUAJIT_TREE@/src/lj_carith.lo \
+ @LUAJIT_TREE@/src/lj_ccall.lo \
+ @LUAJIT_TREE@/src/lj_ccallback.lo \
+ @LUAJIT_TREE@/src/lj_cconv.lo @LUAJIT_TREE@/src/lj_cdata.lo \
+ @LUAJIT_TREE@/src/lj_char.lo @LUAJIT_TREE@/src/lj_clib.lo \
+ @LUAJIT_TREE@/src/lj_cparse.lo @LUAJIT_TREE@/src/lj_crecord.lo \
+ @LUAJIT_TREE@/src/lj_ctype.lo @LUAJIT_TREE@/src/lj_debug.lo \
+ @LUAJIT_TREE@/src/lj_dispatch.lo @LUAJIT_TREE@/src/lj_err.lo \
+ @LUAJIT_TREE@/src/lj_ffrecord.lo @LUAJIT_TREE@/src/lj_func.lo \
+ @LUAJIT_TREE@/src/lj_gc.lo @LUAJIT_TREE@/src/lj_gdbjit.lo \
+ @LUAJIT_TREE@/src/lj_ir.lo @LUAJIT_TREE@/src/lj_lex.lo \
+ @LUAJIT_TREE@/src/lj_lib.lo @LUAJIT_TREE@/src/lj_load.lo \
+ @LUAJIT_TREE@/src/lj_mcode.lo @LUAJIT_TREE@/src/lj_meta.lo \
+ @LUAJIT_TREE@/src/lj_obj.lo @LUAJIT_TREE@/src/lj_opt_dce.lo \
+ @LUAJIT_TREE@/src/lj_opt_fold.lo \
+ @LUAJIT_TREE@/src/lj_opt_loop.lo \
+ @LUAJIT_TREE@/src/lj_opt_mem.lo \
+ @LUAJIT_TREE@/src/lj_opt_narrow.lo \
+ @LUAJIT_TREE@/src/lj_opt_sink.lo \
+ @LUAJIT_TREE@/src/lj_opt_split.lo \
+ @LUAJIT_TREE@/src/lj_parse.lo @LUAJIT_TREE@/src/lj_record.lo \
+ @LUAJIT_TREE@/src/lj_snap.lo @LUAJIT_TREE@/src/lj_state.lo \
+ @LUAJIT_TREE@/src/lj_str.lo @LUAJIT_TREE@/src/lj_strscan.lo \
+ @LUAJIT_TREE@/src/lj_tab.lo @LUAJIT_TREE@/src/lj_trace.lo \
+ @LUAJIT_TREE@/src/lj_udata.lo @LUAJIT_TREE@/src/lj_vmevent.lo \
+ @LUAJIT_TREE@/src/lj_vmmath.lo $(am__objects_2)
+libtexluajit_la_OBJECTS = $(nodist_libtexluajit_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 =
+libtexluajit_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(AM_CFLAGS) $(CFLAGS) $(libtexluajit_la_LDFLAGS) $(LDFLAGS) \
+ -o $@
am_jittest_OBJECTS = jittest-jittest.$(OBJEXT)
jittest_OBJECTS = $(am_jittest_OBJECTS)
jittest_LDADD = $(LDADD)
-jittest_DEPENDENCIES = libluajit.a
+jittest_DEPENDENCIES = libtexluajit.la
nodist_luajittry_OBJECTS = \
@LUAJIT_TREE@/src/luajittry-luajit.$(OBJEXT)
luajittry_OBJECTS = $(nodist_luajittry_OBJECTS)
luajittry_LDADD = $(LDADD)
-luajittry_DEPENDENCIES = libluajit.a
-luajittry_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(luajittry_LDFLAGS) \
- $(LDFLAGS) -o $@
+luajittry_DEPENDENCIES = libtexluajit.la
+luajittry_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(luajittry_LDFLAGS) $(LDFLAGS) -o $@
am__dist_check_SCRIPTS_DIST = luajit.test luajiterr.test
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -208,28 +227,33 @@ DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
am__v_CC_1 =
CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
+LTCCASCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(AM_CCASFLAGS) \
+ $(CCASFLAGS)
AM_V_CCAS = $(am__v_CCAS_@AM_V@)
am__v_CCAS_ = $(am__v_CCAS_@AM_DEFAULT_V@)
am__v_CCAS_0 = @echo " CCAS " $@;
am__v_CCAS_1 =
-SOURCES = $(nodist_libluajit_a_SOURCES) $(jittest_SOURCES) \
+SOURCES = $(nodist_libtexluajit_la_SOURCES) $(jittest_SOURCES) \
$(nodist_luajittry_SOURCES)
DIST_SOURCES = $(jittest_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
@@ -245,6 +269,8 @@ am__can_run_installinfo = \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
+DATA = $(pkgconfig_DATA)
+HEADERS = $(luajitinclude_HEADERS)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
am__recursive_targets = \
@@ -296,33 +322,6 @@ am__tty_colors = { \
std='[m'; \
fi; \
}
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
am__recheck_rx = ^[ ]*:recheck:[ ]*
am__global_test_result_rx = ^[ ]*:global-test-result:[ ]*
am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]*
@@ -521,6 +520,8 @@ distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -537,32 +538,47 @@ CYGPATH_W = @CYGPATH_W@
DASM_ARCH = @DASM_ARCH@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+FGREP = @FGREP@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LJARCH = @LJARCH@
LJHOST = @LJHOST@
LJVM_MODE = @LJVM_MODE@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LUAJITVERSION = @LUAJITVERSION@
LUAJIT_DEFINES = @LUAJIT_DEFINES@
LUAJIT_LDEXTRA = @LUAJIT_LDEXTRA@
+LUAJIT_LT_VERSINFO = @LUAJIT_LT_VERSINFO@
LUAJIT_TREE = @LUAJIT_TREE@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -572,6 +588,7 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -581,7 +598,9 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -632,8 +651,9 @@ EXTRA_DIST = $(LUAJIT_TREE) $(LUAJIT_TREE)-PATCHES jiterr.exp
AM_CPPFLAGS = -I$(srcdir)/$(LUAJIT_TREE)/src $(LUAJIT_DEFINES)
AM_CFLAGS = -Wall
SUBDIRS = . native include
-noinst_LIBRARIES = libluajit.a
-nodist_libluajit_a_SOURCES = $(ljlib_sources) \
+lib_LTLIBRARIES = libtexluajit.la
+libtexluajit_la_LDFLAGS = -bindir @bindir@ -no-undefined -version-info $(LUAJIT_LT_VERSINFO)
+nodist_libtexluajit_la_SOURCES = $(ljlib_sources) \
@LUAJIT_TREE@/src/lbitlib.c @LUAJIT_TREE@/src/lib_aux.c \
@LUAJIT_TREE@/src/lib_init.c @LUAJIT_TREE@/src/lj_alloc.c \
@LUAJIT_TREE@/src/lj_api.c @LUAJIT_TREE@/src/lj_asm.c \
@@ -662,7 +682,7 @@ nodist_libluajit_a_SOURCES = $(ljlib_sources) \
@LUAJIT_TREE@/src/lj_trace.c @LUAJIT_TREE@/src/lj_udata.c \
@LUAJIT_TREE@/src/lj_vmevent.c @LUAJIT_TREE@/src/lj_vmmath.c \
$(am__append_1)
-@PEOBJ_TRUE@libluajit_a_LIBADD = lj_vm_obj.o
+@PEOBJ_TRUE@libtexluajit_la_LIBADD = lj_vm_obj.lo
ljlib_sources = \
lib_base.c \
lib_math.c \
@@ -680,6 +700,17 @@ HDRGEN = lj_bcdef.h lj_ffdef.h lj_libdef.h lj_recdef.h lj_folddef.h
CLEANFILES = $(HDRGEN) $(ljlib_sources) lj_vm_asm.s jiterr.out \
jiterr.tmp rebuild.stamp
CONFIG_CLEAN_FILES = dynasm_flags native_flags
+luajitincludedir = ${includedir}/texluajit
+luajitinclude_HEADERS = \
+ $(LUAJIT_TREE)/src/lauxlib.h \
+ $(LUAJIT_TREE)/src/luaconf.h \
+ $(LUAJIT_TREE)/src/luajit.h \
+ $(LUAJIT_TREE)/src/lua.h \
+ $(LUAJIT_TREE)/src/lua.hpp \
+ $(LUAJIT_TREE)/src/lualib.h
+
+pkgconfigdir = ${libdir}/pkgconfig
+pkgconfig_DATA = texluajit.pc
@build_TRUE@dist_check_SCRIPTS = luajit.test luajiterr.test
@build_TRUE@TESTS = luajit.test luajiterr.test
jittest_SOURCES = jittest.c
@@ -687,7 +718,7 @@ jittest_CPPFLAGS = -Iinclude
nodist_luajittry_SOURCES = @LUAJIT_TREE@/src/luajit.c
luajittry_CPPFLAGS = -Iinclude
luajittry_LDFLAGS = $(LUAJIT_LDEXTRA)
-LDADD = libluajit.a
+LDADD = libtexluajit.la
# Reconfig
reconfig_prereq =
@@ -700,7 +731,7 @@ all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
-.SUFFIXES: .c .log .o .obj .s .test .test$(EXEEXT) .trs
+.SUFFIXES: .c .lo .log .o .obj .s .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/reconfig.am $(srcdir)/../../am/rebuild.am $(am__configure_deps)
@@ -751,165 +782,163 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
distclean-hdr:
-rm -f config.h stamp-h1
+texluajit.pc: $(top_builddir)/config.status $(srcdir)/texluajit.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ list2=; for p in $$list; do \
+ if test -f $$p; then \
+ list2="$$list2 $$p"; \
+ else :; fi; \
+ done; \
+ test -z "$$list2" || { \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+ }
+
+uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+ done
-clean-noinstLIBRARIES:
- -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
@LUAJIT_TREE@/src/$(am__dirstamp):
@$(MKDIR_P) @LUAJIT_TREE@/src
@: > @LUAJIT_TREE@/src/$(am__dirstamp)
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) @LUAJIT_TREE@/src/$(DEPDIR)
@: > @LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lbitlib.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lbitlib.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lib_aux.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lib_aux.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lib_init.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lib_init.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_alloc.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_alloc.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_api.$(OBJEXT): @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_api.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_asm.$(OBJEXT): @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_asm.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_bc.$(OBJEXT): @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_bc.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_bcread.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_bcread.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_bcwrite.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_bcwrite.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_carith.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_carith.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_ccall.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_ccall.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_ccallback.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_ccallback.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_cconv.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_cconv.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_cdata.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_cdata.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_char.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_char.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_clib.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_clib.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_cparse.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_cparse.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_crecord.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_crecord.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_ctype.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_ctype.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_debug.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_debug.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_dispatch.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_dispatch.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_err.$(OBJEXT): @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_err.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_ffrecord.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_ffrecord.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_func.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_func.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_gc.$(OBJEXT): @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_gc.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_gdbjit.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_gdbjit.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_ir.$(OBJEXT): @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_ir.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_lex.$(OBJEXT): @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_lex.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_lib.$(OBJEXT): @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_lib.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_load.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_load.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_mcode.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_mcode.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_meta.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_meta.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_obj.$(OBJEXT): @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_obj.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_opt_dce.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_opt_dce.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_opt_fold.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_opt_fold.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_opt_loop.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_opt_loop.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_opt_mem.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_opt_mem.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_opt_narrow.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_opt_narrow.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_opt_sink.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_opt_sink.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_opt_split.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_opt_split.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_parse.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_parse.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_record.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_record.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_snap.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_snap.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_state.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_state.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_str.$(OBJEXT): @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_str.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_strscan.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_strscan.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_tab.$(OBJEXT): @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_tab.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_trace.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_trace.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_udata.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_udata.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_vmevent.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_vmevent.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-@LUAJIT_TREE@/src/lj_vmmath.$(OBJEXT): \
- @LUAJIT_TREE@/src/$(am__dirstamp) \
+@LUAJIT_TREE@/src/lj_vmmath.lo: @LUAJIT_TREE@/src/$(am__dirstamp) \
@LUAJIT_TREE@/src/$(DEPDIR)/$(am__dirstamp)
-libluajit.a: $(libluajit_a_OBJECTS) $(libluajit_a_DEPENDENCIES) $(EXTRA_libluajit_a_DEPENDENCIES)
- $(AM_V_at)-rm -f libluajit.a
- $(AM_V_AR)$(libluajit_a_AR) libluajit.a $(libluajit_a_OBJECTS) $(libluajit_a_LIBADD)
- $(AM_V_at)$(RANLIB) libluajit.a
+libtexluajit.la: $(libtexluajit_la_OBJECTS) $(libtexluajit_la_DEPENDENCIES) $(EXTRA_libtexluajit_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(libtexluajit_la_LINK) -rpath $(libdir) $(libtexluajit_la_OBJECTS) $(libtexluajit_la_LIBADD) $(LIBS)
clean-checkPROGRAMS:
- -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
+ @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
jittest$(EXEEXT): $(jittest_OBJECTS) $(jittest_DEPENDENCIES) $(EXTRA_jittest_DEPENDENCIES)
@rm -f jittest$(EXEEXT)
@@ -925,73 +954,74 @@ luajittry$(EXEEXT): $(luajittry_OBJECTS) $(luajittry_DEPENDENCIES) $(EXTRA_luaji
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-rm -f @LUAJIT_TREE@/src/*.$(OBJEXT)
+ -rm -f @LUAJIT_TREE@/src/*.lo
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jittest-jittest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_base.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_bit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_debug.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_ffi.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_io.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_jit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_math.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_os.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_package.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_string.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_table.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lbitlib.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lib_aux.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lib_init.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_alloc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_api.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_asm.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_bc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_bcread.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_bcwrite.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_carith.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_ccall.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_ccallback.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_cconv.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_cdata.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_char.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_clib.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_cparse.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_crecord.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_ctype.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_debug.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_dispatch.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_err.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_ffrecord.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_func.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_gc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_gdbjit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_ir.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_lex.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_lib.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_load.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_mcode.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_meta.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_obj.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_opt_dce.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_opt_fold.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_opt_loop.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_opt_mem.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_opt_narrow.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_opt_sink.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_opt_split.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_parse.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_record.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_snap.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_state.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_str.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_strscan.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_tab.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_trace.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_udata.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_vmevent.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_vmmath.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_base.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_bit.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_debug.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_ffi.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_io.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_jit.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_math.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_os.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_package.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_string.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_table.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lbitlib.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lib_aux.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lib_init.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_alloc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_api.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_asm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_bc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_bcread.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_bcwrite.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_carith.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_ccall.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_ccallback.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_cconv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_cdata.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_char.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_clib.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_cparse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_crecord.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_ctype.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_debug.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_dispatch.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_err.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_ffrecord.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_func.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_gc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_gdbjit.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_ir.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_lex.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_lib.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_load.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_mcode.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_meta.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_obj.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_opt_dce.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_opt_fold.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_opt_loop.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_opt_mem.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_opt_narrow.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_opt_sink.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_opt_split.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_parse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_record.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_snap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_state.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_str.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_strscan.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_tab.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_trace.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_udata.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_vmevent.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/lj_vmmath.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@LUAJIT_TREE@/src/$(DEPDIR)/luajittry-luajit.Po@am__quote@
.c.o:
@@ -1010,6 +1040,14 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+.c.lo:
+@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
jittest-jittest.o: jittest.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(jittest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT jittest-jittest.o -MD -MP -MF $(DEPDIR)/jittest-jittest.Tpo -c -o jittest-jittest.o `test -f 'jittest.c' || echo '$(srcdir)/'`jittest.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/jittest-jittest.Tpo $(DEPDIR)/jittest-jittest.Po
@@ -1044,6 +1082,61 @@ jittest-jittest.obj: jittest.c
.s.obj:
$(AM_V_CCAS)$(CCASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+.s.lo:
+ $(AM_V_CCAS)$(LTCCASCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+ -rm -rf @LUAJIT_TREE@/src/.libs @LUAJIT_TREE@/src/_libs
+
+distclean-libtool:
+ -rm -f libtool config.lt
+install-pkgconfigDATA: $(pkgconfig_DATA)
+ @$(NORMAL_INSTALL)
+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
+ done
+
+uninstall-pkgconfigDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
+install-luajitincludeHEADERS: $(luajitinclude_HEADERS)
+ @$(NORMAL_INSTALL)
+ @list='$(luajitinclude_HEADERS)'; test -n "$(luajitincludedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(luajitincludedir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(luajitincludedir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(luajitincludedir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(luajitincludedir)" || exit $$?; \
+ done
+
+uninstall-luajitincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(luajitinclude_HEADERS)'; test -n "$(luajitincludedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(luajitincludedir)'; $(am__uninstall_files_from_dir)
+
# This directory's subdirectories are mostly independent; you can cd
# into them and run 'make' without going through this Makefile.
# To change the values of 'make' variables: instead of editing Makefiles,
@@ -1502,9 +1595,12 @@ check-am: all-am
$(dist_check_SCRIPTS)
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-recursive
-all-am: Makefile $(LIBRARIES) config.h
+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config.h
installdirs: installdirs-recursive
installdirs-am:
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(luajitincludedir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -1544,15 +1640,15 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-recursive
-clean-am: clean-checkPROGRAMS clean-generic clean-noinstLIBRARIES \
- mostlyclean-am
+clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
+ clean-libtool mostlyclean-am
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf ./$(DEPDIR) @LUAJIT_TREE@/src/$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
- distclean-hdr distclean-tags
+ distclean-hdr distclean-libtool distclean-tags
dvi: dvi-recursive
@@ -1566,13 +1662,13 @@ info: info-recursive
info-am:
-install-data-am:
+install-data-am: install-luajitincludeHEADERS install-pkgconfigDATA
install-dvi: install-dvi-recursive
install-dvi-am:
-install-exec-am:
+install-exec-am: install-libLTLIBRARIES
install-html: install-html-recursive
@@ -1603,7 +1699,8 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
pdf: pdf-recursive
@@ -1613,34 +1710,39 @@ ps: ps-recursive
ps-am:
-uninstall-am:
+uninstall-am: uninstall-libLTLIBRARIES uninstall-luajitincludeHEADERS \
+ uninstall-pkgconfigDATA
.MAKE: $(am__recursive_targets) all check-am install-am install-strip
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
am--refresh check check-TESTS check-am clean \
clean-checkPROGRAMS clean-cscope clean-generic \
- clean-noinstLIBRARIES cscope cscopelist-am ctags ctags-am dist \
- dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
- dist-tarZ dist-xz dist-zip distcheck distclean \
- distclean-compile distclean-generic distclean-hdr \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs installdirs-am \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
- recheck tags tags-am uninstall uninstall-am
+ clean-libLTLIBRARIES clean-libtool cscope cscopelist-am ctags \
+ ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \
+ dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \
+ distclean distclean-compile distclean-generic distclean-hdr \
+ distclean-libtool distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am \
+ install-libLTLIBRARIES install-luajitincludeHEADERS \
+ install-man install-pdf install-pdf-am install-pkgconfigDATA \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ recheck tags tags-am uninstall uninstall-am \
+ uninstall-libLTLIBRARIES uninstall-luajitincludeHEADERS \
+ uninstall-pkgconfigDATA
# in case of an SVN repository
dist-hook:
- rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'`
+ rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name .libs -o -name '*.o' -o -name '*.lo'`
-$(libluajit_a_OBJECTS): $(HDRGEN)
+$(libtexluajit_la_OBJECTS): $(HDRGEN)
# When cross-compiling, EXEEXT for the build and host systems may differ.
# Thus we depend on the auxiliary file native/buildvm-stamp.
@@ -1665,6 +1767,11 @@ lj_folddef.h: native/buildvm-stamp $(LUAJIT_TREE)/src/lj_opt_fold.c
lj_vm_obj.o lj_vm_asm.s: native/buildvm-stamp
$(AM_V_GEN)native/buildvm -m $(LJVM_MODE) -o $@
+lj_vm_obj.lo: lj_vm_obj.o lib_base.lo
+ $(AM_V_GEN)sed 's/lib_base/lj_vm_obj/' lib_base.lo >$@ \
+ && . ./$@ && test x"$$pic_object" == xnone \
+ || cp lj_vm_obj.o .libs/lj_vm_obj.o
+
$(ljlib_sources): config.force
@test -f $@ || { rm -f $@; \
if $(AM_V_P); then echo "$(LN_S) $(srcdir)/$(LUAJIT_TREE)/src/$@ $@"; \
diff --git a/source/libs/luajit/aclocal.m4 b/source/libs/luajit/aclocal.m4
index a49d8ace71eeb26bc9da4cf293c9e9b10dc519d7..925c4d326b7c02daf269d0c6278c01a0a3fbf4cf 100644
--- a/source/libs/luajit/aclocal.m4
+++ b/source/libs/luajit/aclocal.m4
@@ -1205,6 +1205,13 @@ AC_SUBST([am__untar])
m4_include([m4/lj-system.m4])
m4_include([../../m4/kpse-common.m4])
+m4_include([../../m4/kpse-dll-name.m4])
m4_include([../../m4/kpse-largefile.m4])
+m4_include([../../m4/kpse-lib-version.m4])
m4_include([../../m4/kpse-luajit-flags.m4])
m4_include([../../m4/kpse-warnings.m4])
+m4_include([../../m4/libtool.m4])
+m4_include([../../m4/ltoptions.m4])
+m4_include([../../m4/ltsugar.m4])
+m4_include([../../m4/ltversion.m4])
+m4_include([../../m4/lt~obsolete.m4])
diff --git a/source/libs/luajit/config.h.in b/source/libs/luajit/config.h.in
index f80965981d5200f1ae62c814c5290ec3c8a9cf3f..0aa075a8ffffcecf0dd30ffb6c15d591d2fe71b2 100644
--- a/source/libs/luajit/config.h.in
+++ b/source/libs/luajit/config.h.in
@@ -1,5 +1,8 @@
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
#undef HAVE_FSEEKO
@@ -30,6 +33,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
diff --git a/source/libs/luajit/configure b/source/libs/luajit/configure
index e3abf0b48a3265401996e97f5346a1dd5cfb8192..66a55f6f5ba38ae822d1170bcb93fe7a3c25b3c8 100755
--- a/source/libs/luajit/configure
+++ b/source/libs/luajit/configure
@@ -198,6 +198,14 @@ test -x / || exit 1"
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+
+ test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+ PATH=/empty FPATH=/empty; export PATH FPATH
+ test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+ || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
test \$(( 1 + 1 )) = 2 || exit 1"
if (eval "$as_required") 2>/dev/null; then :
as_have_required=yes
@@ -556,6 +564,8 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
# Sed expression to map a string onto a valid variable name.
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+SHELL=${CONFIG_SHELL-/bin/sh}
+
test -n "$DJDIR" || exec 7<&0 </dev/null
exec 6>&1
@@ -639,9 +649,29 @@ DASM_ARCH
LJARCH
LUAJIT_LDEXTRA
LUAJIT_DEFINES
+CPP
+OTOOL64
+OTOOL
+LIPO
+NMEDIT
+DSYMUTIL
+MANIFEST_TOOL
+ac_ct_AR
+AR
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+LD
+FGREP
EGREP
GREP
-CPP
+SED
+LIBTOOL
+OBJDUMP
+DLLTOOL
+AS
+LUAJIT_LT_VERSINFO
+LUAJITVERSION
LN_S
RANLIB
am__fastdepCCAS_FALSE
@@ -750,6 +780,14 @@ enable_silent_rules
enable_maintainer_mode
enable_dependency_tracking
enable_compiler_warnings
+enable_shared
+enable_static
+with_pic
+enable_fast_install
+with_aix_soname
+with_gnu_ld
+with_sysroot
+enable_libtool_lock
enable_largefile
'
ac_precious_vars='build_alias
@@ -1394,8 +1432,25 @@ Optional Features:
--enable-compiler-warnings=[no|min|yes|max|all]
Turn on compiler warnings [default: yes if
maintainer-mode, min otherwise]
+ --enable-shared[=PKGS] build shared libraries [default=yes]
+ --enable-static[=PKGS] build static libraries [default=yes]
+ --enable-fast-install[=PKGS]
+ optimize for fast installation [default=yes]
+ --disable-libtool-lock avoid locking (might break parallel builds)
--disable-largefile omit support for large files
+Optional Packages:
+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
+ both]
+ --with-aix-soname=aix|svr4|both
+ shared library versioning (aka "SONAME") variant to
+ provide on AIX, [default=aix].
+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]
+ --with-sysroot[=DIR] Search for dependent libraries within DIR (or the
+ compiler's sysroot if not specified).
+
Some influential environment variables:
CC C compiler command
CFLAGS C compiler flags
@@ -1572,6 +1627,74 @@ fi
} # ac_fn_c_try_link
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } > conftest.i && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
# ac_fn_c_try_run LINENO
# ----------------------
# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
@@ -1614,6 +1737,73 @@ fi
} # ac_fn_c_try_run
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $2 (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
+
# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES
# --------------------------------------------
# Tries to find the compile-time value of EXPR in a program that includes
@@ -1796,74 +1986,6 @@ rm -f conftest.val
as_fn_set_status $ac_retval
} # ac_fn_c_compute_int
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } > conftest.i && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=1
-fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- eval "$3=yes"
-else
- eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_compile
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
@@ -5031,142 +5153,186 @@ $as_echo "no, using $LN_S" >&6; }
fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-fi
-if test -z "$CPP"; then
- if ${ac_cv_prog_CPP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- # Double quotes because CPP needs to be expanded
- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
- do
- ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
- Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+LUAJITVERSION=2.0.3
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- # Broken: success on invalid input.
-continue
-else
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
- break
-fi
+LUAJIT_LT_VERSINFO=2:3:0
- done
- ac_cv_prog_CPP=$CPP
-fi
- CPP=$ac_cv_prog_CPP
+case `pwd` in
+ *\ * | *\ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+esac
+
+
+
+macro_version='2.4.4'
+macro_revision='2.4.4'
+
+
+
+
+
+
+
+
+
+
+
+
+
+ltmain=$ac_aux_dir/ltmain.sh
+
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+ ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+ ECHO='printf %s\n'
else
- ac_cv_prog_CPP=$CPP
+ # Use this function as a fallback that always works.
+ func_fallback_echo ()
+ {
+ eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+ }
+ ECHO='func_fallback_echo'
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+ $ECHO ""
+}
+
+case $ECHO in
+ printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+ print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+ *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+ for ac_i in 1 2 3 4 5 6 7; do
+ ac_script="$ac_script$as_nl$ac_script"
+ done
+ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+ { ac_script=; unset ac_script;}
+ if test -z "$SED"; then
+ ac_path_SED_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
- Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+ # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+ ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo '' >> "conftest.nl"
+ "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_SED_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_SED="$ac_path_SED"
+ ac_path_SED_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+ $ac_path_SED_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_SED"; then
+ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+ fi
else
- # Broken: fails on valid input.
-continue
+ ac_cv_path_SED=$SED
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- # Broken: success on invalid input.
-continue
-else
- # Passes both tests.
-ac_preproc_ok=:
-break
fi
-rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+ rm -f conftest.sed
+
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+
+
+
+
+
+
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
@@ -5299,133 +5465,7960 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
EGREP="$ac_cv_path_EGREP"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+$as_echo_n "checking for fgrep... " >&6; }
+if ${ac_cv_path_FGREP+:} false; then :
$as_echo_n "(cached) " >&6
else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
+ if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+ then ac_cv_path_FGREP="$GREP -F"
+ else
+ if test -z "$FGREP"; then
+ ac_path_FGREP_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in fgrep; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_FGREP" || continue
+# Check for GNU ac_path_FGREP and select it if it is found.
+ # Check for GNU $ac_path_FGREP
+case `"$ac_path_FGREP" --version 2>&1` in
+*GNU*)
+ ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo 'FGREP' >> "conftest.nl"
+ "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_FGREP="$ac_path_FGREP"
+ ac_path_FGREP_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_header_stdc=yes
+ $ac_path_FGREP_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_FGREP"; then
+ as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
else
- ac_cv_header_stdc=no
+ ac_cv_path_FGREP=$FGREP
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <string.h>
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+$as_echo "$ac_cv_path_FGREP" >&6; }
+ FGREP="$ac_cv_path_FGREP"
+
+
+test -z "$GREP" && GREP=grep
+
+
+
+
+
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then :
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+ withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
else
- ac_cv_header_stdc=no
+ with_gnu_ld=no
+fi
+
+ac_prog=ld
+if test yes = "$GCC"; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return, which upsets mingw
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+ esac
+ case $ac_prog in
+ # Accept absolute paths.
+ [\\/]* | ?:[\\/]*)
+ re_direlt='/[^/][^/]*/\.\./'
+ # Canonicalize the pathname of ld
+ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD=$ac_prog
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
+ ;;
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
+ ;;
+ esac
+elif test yes = "$with_gnu_ld"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if ${lt_cv_path_LD+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -z "$LD"; then
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
+ IFS=$lt_save_ifs
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ lt_cv_path_LD=$ac_dir/$ac_prog
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some variants of GNU ld only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+ test no != "$with_gnu_ld" && break
+ ;;
+ *)
+ test yes != "$with_gnu_ld" && break
+ ;;
+ esac
+ fi
+ done
+ IFS=$lt_save_ifs
+else
+ lt_cv_path_LD=$LD # Let the user override the test with a path.
+fi
fi
-rm -f conftest*
+LD=$lt_cv_path_LD
+if test -n "$LD"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ # I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+ lt_cv_prog_gnu_ld=yes
+ ;;
+*)
+ lt_cv_prog_gnu_ld=no
+ ;;
+esac
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$lt_cv_prog_gnu_ld
-if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+if ${lt_cv_path_NM+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$NM"; then
+ # Let the user override the test.
+ lt_cv_path_NM=$NM
+else
+ lt_nm_to_check=${ac_tool_prefix}nm
+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+ lt_nm_to_check="$lt_nm_to_check nm"
+ fi
+ for lt_tmp_nm in $lt_nm_to_check; do
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+ IFS=$lt_save_ifs
+ test -z "$ac_dir" && ac_dir=.
+ tmp_nm=$ac_dir/$lt_tmp_nm
+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
+ # Check to see if the nm accepts a BSD-compat flag.
+ # Adding the 'sed 1q' prevents false positives on HP-UX, which says:
+ # nm: unknown option "B" ignored
+ # Tru64's nm complains that /dev/null is an invalid object file
+ # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+ case $build_os in
+ mingw*) lt_bad_file=conftest.nm/nofile ;;
+ *) lt_bad_file=/dev/null ;;
+ esac
+ case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+ *$lt_bad_file* | *'Invalid file or object type'*)
+ lt_cv_path_NM="$tmp_nm -B"
+ break 2
+ ;;
+ *)
+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+ */dev/null*)
+ lt_cv_path_NM="$tmp_nm -p"
+ break 2
+ ;;
+ *)
+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+ continue # so that we can try to find one that supports BSD flags
+ ;;
+ esac
+ ;;
+ esac
+ fi
+ done
+ IFS=$lt_save_ifs
+ done
+ : ${lt_cv_path_NM=no}
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+$as_echo "$lt_cv_path_NM" >&6; }
+if test no != "$lt_cv_path_NM"; then
+ NM=$lt_cv_path_NM
+else
+ # Didn't find any BSD compatible name lister, look for dumpbin.
+ if test -n "$DUMPBIN"; then :
+ # Let the user override the test.
+ else
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in dumpbin "link -dump"
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DUMPBIN+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$DUMPBIN"; then
+ ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+DUMPBIN=$ac_cv_prog_DUMPBIN
+if test -n "$DUMPBIN"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+$as_echo "$DUMPBIN" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$DUMPBIN" && break
+ done
+fi
+if test -z "$DUMPBIN"; then
+ ac_ct_DUMPBIN=$DUMPBIN
+ for ac_prog in dumpbin "link -dump"
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_DUMPBIN"; then
+ ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+if test -n "$ac_ct_DUMPBIN"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+$as_echo "$ac_ct_DUMPBIN" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$ac_ct_DUMPBIN" && break
+done
+
+ if test "x$ac_ct_DUMPBIN" = x; then
+ DUMPBIN=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ DUMPBIN=$ac_ct_DUMPBIN
+ fi
+fi
+
+ case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+ *COFF*)
+ DUMPBIN="$DUMPBIN -symbols -headers"
+ ;;
+ *)
+ DUMPBIN=:
+ ;;
+ esac
+ fi
+
+ if test : != "$DUMPBIN"; then
+ NM=$DUMPBIN
+ fi
+fi
+test -z "$NM" && NM=nm
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+if ${lt_cv_nm_interface+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_nm_interface="BSD nm"
+ echo "int some_variable = 0;" > conftest.$ac_ext
+ (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
+ (eval "$ac_compile" 2>conftest.err)
+ cat conftest.err >&5
+ (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+ cat conftest.err >&5
+ (eval echo "\"\$as_me:$LINENO: output\"" >&5)
+ cat conftest.out >&5
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+ lt_cv_nm_interface="MS dumpbin"
+ fi
+ rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+$as_echo "$lt_cv_nm_interface" >&6; }
+
+# find the maximum length of command line arguments
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if ${lt_cv_sys_max_cmd_len+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ i=0
+ teststring=ABCD
+
+ case $build_os in
+ msdosdjgpp*)
+ # On DJGPP, this test can blow up pretty badly due to problems in libc
+ # (any single argument exceeding 2000 bytes causes a buffer overrun
+ # during glob expansion). Even if it were fixed, the result of this
+ # check would be larger than it should be.
+ lt_cv_sys_max_cmd_len=12288; # 12K is about right
+ ;;
+
+ gnu*)
+ # Under GNU Hurd, this test is not required because there is
+ # no limit to the length of command line arguments.
+ # Libtool will interpret -1 as no limit whatsoever
+ lt_cv_sys_max_cmd_len=-1;
+ ;;
+
+ cygwin* | mingw* | cegcc*)
+ # On Win9x/ME, this test blows up -- it succeeds, but takes
+ # about 5 minutes as the teststring grows exponentially.
+ # Worse, since 9x/ME are not pre-emptively multitasking,
+ # you end up with a "frozen" computer, even though with patience
+ # the test eventually succeeds (with a max line length of 256k).
+ # Instead, let's just punt: use the minimum linelength reported by
+ # all of the supported platforms: 8192 (on NT/2K/XP).
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
+ mint*)
+ # On MiNT this can take a long time and run out of memory.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
+ amigaos*)
+ # On AmigaOS with pdksh, this test takes hours, literally.
+ # So we just punt and use a minimum line length of 8192.
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
+ bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
+ # This has been around since 386BSD, at least. Likely further.
+ if test -x /sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+ elif test -x /usr/sbin/sysctl; then
+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+ else
+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
+ fi
+ # And add a safety zone
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ ;;
+
+ interix*)
+ # We know the value 262144 and hardcode it with a safety zone (like BSD)
+ lt_cv_sys_max_cmd_len=196608
+ ;;
+
+ os2*)
+ # The test takes a long time on OS/2.
+ lt_cv_sys_max_cmd_len=8192
+ ;;
+
+ osf*)
+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+ # nice to cause kernel panics so lets avoid the loop below.
+ # First set a reasonable default.
+ lt_cv_sys_max_cmd_len=16384
+ #
+ if test -x /sbin/sysconfig; then
+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+ *1*) lt_cv_sys_max_cmd_len=-1 ;;
+ esac
+ fi
+ ;;
+ sco3.2v5*)
+ lt_cv_sys_max_cmd_len=102400
+ ;;
+ sysv5* | sco5v6* | sysv4.2uw2*)
+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+ if test -n "$kargmax"; then
+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'`
+ else
+ lt_cv_sys_max_cmd_len=32768
+ fi
+ ;;
+ *)
+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+ if test -n "$lt_cv_sys_max_cmd_len" && \
+ test undefined != "$lt_cv_sys_max_cmd_len"; then
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+ else
+ # Make teststring a little bigger before we do anything with it.
+ # a 1K string should be a reasonable start.
+ for i in 1 2 3 4 5 6 7 8; do
+ teststring=$teststring$teststring
+ done
+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+ # If test is not a shell built-in, we'll probably end up computing a
+ # maximum length that is only half of the actual maximum length, but
+ # we can't tell.
+ while { test X`env echo "$teststring$teststring" 2>/dev/null` \
+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+ test 17 != "$i" # 1/2 MB should be enough
+ do
+ i=`expr $i + 1`
+ teststring=$teststring$teststring
+ done
+ # Only check the string length outside the loop.
+ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+ teststring=
+ # Add a significant safety factor because C++ compilers can tack on
+ # massive amounts of additional arguments before passing them to the
+ # linker. It appears as though 1/2 is a usable value.
+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+ fi
+ ;;
+ esac
+
+fi
+
+if test -n "$lt_cv_sys_max_cmd_len"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+
+
+
+
+
+
+: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ lt_unset=unset
+else
+ lt_unset=false
+fi
+
+
+
+
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+ lt_SP2NL='tr \040 \012'
+ lt_NL2SP='tr \015\012 \040\040'
+ ;;
+ *) # EBCDIC based system
+ lt_SP2NL='tr \100 \n'
+ lt_NL2SP='tr \r\n \100\100'
+ ;;
+esac
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+if ${lt_cv_to_host_file_cmd+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $host in
+ *-*-mingw* )
+ case $build in
+ *-*-mingw* ) # actually msys
+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+ ;;
+ *-*-cygwin* )
+ lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+ ;;
+ * ) # otherwise, assume *nix
+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+ ;;
+ esac
+ ;;
+ *-*-cygwin* )
+ case $build in
+ *-*-mingw* ) # actually msys
+ lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+ ;;
+ *-*-cygwin* )
+ lt_cv_to_host_file_cmd=func_convert_file_noop
+ ;;
+ * ) # otherwise, assume *nix
+ lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+ ;;
+ esac
+ ;;
+ * ) # unhandled hosts (and "normal" native builds)
+ lt_cv_to_host_file_cmd=func_convert_file_noop
+ ;;
+esac
+
+fi
+
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+if ${lt_cv_to_tool_file_cmd+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ #assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+ *-*-mingw* )
+ case $build in
+ *-*-mingw* ) # actually msys
+ lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+ ;;
+ esac
+ ;;
+esac
+
+fi
+
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if ${lt_cv_ld_reload_flag+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_ld_reload_flag='-r'
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+ cygwin* | mingw* | pw32* | cegcc*)
+ if test yes != "$GCC"; then
+ reload_cmds=false
+ fi
+ ;;
+ darwin*)
+ if test yes = "$GCC"; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+ else
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ fi
+ ;;
+esac
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJDUMP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$OBJDUMP"; then
+ ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+ ac_ct_OBJDUMP=$OBJDUMP
+ # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_OBJDUMP"; then
+ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_OBJDUMP="objdump"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_OBJDUMP" = x; then
+ OBJDUMP="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ OBJDUMP=$ac_ct_OBJDUMP
+ fi
+else
+ OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if ${lt_cv_deplibs_check_method+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# 'unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[4-9]*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+beos*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+bsdi[45]*)
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+ lt_cv_file_magic_cmd='/usr/bin/file -L'
+ lt_cv_file_magic_test_file=/shlib/libc.so
+ ;;
+
+cygwin*)
+ # func_win32_libid is a shell function defined in ltmain.sh
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ ;;
+
+mingw* | pw32*)
+ # Base MSYS/MinGW do not provide the 'file' command needed by
+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
+ # unless we find 'file', for example because we are cross-compiling.
+ if ( file / ) >/dev/null 2>&1; then
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ else
+ # Keep this pattern in sync with the one in func_win32_libid.
+ lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
+ fi
+ ;;
+
+cegcc*)
+ # use the weaker test based on 'objdump'. See mingw*.
+ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
+ ;;
+
+darwin* | rhapsody*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+freebsd* | dragonfly*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+ case $host_cpu in
+ i*86 )
+ # Not sure whether the presence of OpenBSD here was a mistake.
+ # Let's accept both of them until this is cleared up.
+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ ;;
+ esac
+ else
+ lt_cv_deplibs_check_method=pass_all
+ fi
+ ;;
+
+haiku*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+hpux10.20* | hpux11*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+ case $host_cpu in
+ ia64*)
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+ ;;
+ hppa*64*)
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+ ;;
+ *)
+ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
+ lt_cv_file_magic_test_file=/usr/lib/libc.sl
+ ;;
+ esac
+ ;;
+
+interix[3-9]*)
+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
+ ;;
+
+irix5* | irix6* | nonstopux*)
+ case $LD in
+ *-32|*"-32 ") libmagic=32-bit;;
+ *-n32|*"-n32 ") libmagic=N32;;
+ *-64|*"-64 ") libmagic=64-bit;;
+ *) libmagic=never-match;;
+ esac
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+ else
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+ fi
+ ;;
+
+newos6*)
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=/usr/lib/libnls.so
+ ;;
+
+*nto* | *qnx*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+openbsd* | bitrig*)
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+ else
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+ fi
+ ;;
+
+osf3* | osf4* | osf5*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+rdos*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+solaris*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+sysv4 | sysv4.3*)
+ case $host_vendor in
+ motorola)
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+ ;;
+ ncr)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+ sequent)
+ lt_cv_file_magic_cmd='/bin/file'
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
+ ;;
+ sni)
+ lt_cv_file_magic_cmd='/bin/file'
+ lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+ lt_cv_file_magic_test_file=/lib/libc.so
+ ;;
+ siemens)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+ pc)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+ esac
+ ;;
+
+tpf*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+os2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+ case $host_os in
+ mingw* | pw32*)
+ if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+ want_nocaseglob=yes
+ else
+ file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
+ fi
+ ;;
+ esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$DLLTOOL"; then
+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+ ac_ct_DLLTOOL=$DLLTOOL
+ # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_DLLTOOL"; then
+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_DLLTOOL" = x; then
+ DLLTOOL="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ DLLTOOL=$ac_ct_DLLTOOL
+ fi
+else
+ DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+ # two different shell functions defined in ltmain.sh;
+ # decide which one to use based on capabilities of $DLLTOOL
+ case `$DLLTOOL --help 2>&1` in
+ *--identify-strict*)
+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+ ;;
+ *)
+ lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+ ;;
+ esac
+ ;;
+*)
+ # fallback: assume linklib IS sharedlib
+ lt_cv_sharedlib_from_linklib_cmd=$ECHO
+ ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+ for ac_prog in ar
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$AR"; then
+ ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$AR" && break
+ done
+fi
+if test -z "$AR"; then
+ ac_ct_AR=$AR
+ for ac_prog in ar
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_AR"; then
+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_AR="$ac_prog"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$ac_ct_AR" && break
+done
+
+ if test "x$ac_ct_AR" = x; then
+ AR="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ AR=$ac_ct_AR
+ fi
+fi
+
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+$as_echo_n "checking for archiver @FILE support... " >&6; }
+if ${lt_cv_ar_at_file+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_ar_at_file=no
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ echo conftest.$ac_objext > conftest.lst
+ lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+ (eval $lt_ar_try) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if test 0 -eq "$ac_status"; then
+ # Ensure the archiver fails upon bogus file names.
+ rm -f conftest.$ac_objext libconftest.a
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+ (eval $lt_ar_try) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if test 0 -ne "$ac_status"; then
+ lt_cv_ar_at_file=@
+ fi
+ fi
+ rm -f conftest.* libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+$as_echo "$lt_cv_ar_at_file" >&6; }
+
+if test no = "$lt_cv_ar_at_file"; then
+ archiver_list_spec=
+else
+ archiver_list_spec=$lt_cv_ar_at_file
+fi
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$STRIP"; then
+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_STRIP"; then
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_STRIP="strip"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_STRIP" = x; then
+ STRIP=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ STRIP=$ac_ct_STRIP
+ fi
+else
+ STRIP="$ac_cv_prog_STRIP"
+fi
+
+test -z "$STRIP" && STRIP=:
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$RANLIB"; then
+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_RANLIB"; then
+ ac_ct_RANLIB=$RANLIB
+ # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_RANLIB"; then
+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_RANLIB="ranlib"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_RANLIB" = x; then
+ RANLIB=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ RANLIB=$ac_ct_RANLIB
+ fi
+else
+ RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+test -z "$RANLIB" && RANLIB=:
+
+
+
+
+
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+ case $host_os in
+ bitrig* | openbsd*)
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+ ;;
+ *)
+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+ ;;
+ esac
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+ darwin*)
+ lock_old_archive_extraction=yes ;;
+ *)
+ lock_old_archive_extraction=no ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix. What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[BCDEGRST]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+ symcode='[BCDT]'
+ ;;
+cygwin* | mingw* | pw32* | cegcc*)
+ symcode='[ABCDGISTW]'
+ ;;
+hpux*)
+ if test ia64 = "$host_cpu"; then
+ symcode='[ABCDEGRST]'
+ fi
+ ;;
+irix* | nonstopux*)
+ symcode='[BCDEGRST]'
+ ;;
+osf*)
+ symcode='[BCDEGQRST]'
+ ;;
+solaris*)
+ symcode='[BDRT]'
+ ;;
+sco3.2v5*)
+ symcode='[DT]'
+ ;;
+sysv4.2uw2*)
+ symcode='[DT]'
+ ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+ symcode='[ABDT]'
+ ;;
+sysv4)
+ symcode='[DFNSTU]'
+ ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+ symcode='[ABCDGIRSTW]' ;;
+esac
+
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ # Gets list of data symbols to import.
+ lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+ # Adjust the below global symbol transforms to fixup imported variables.
+ lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+ lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'"
+ lt_c_name_lib_hook="\
+ -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\
+ -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'"
+else
+ # Disable hooks by default.
+ lt_cv_sys_global_symbol_to_import=
+ lt_cdecl_hook=
+ lt_c_name_hook=
+ lt_c_name_lib_hook=
+fi
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+ ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+ symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+ # Write the raw and C identifiers.
+ if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ # Fake it for dumpbin and say T for any non-static function,
+ # D for any global variable and I for any imported variable.
+ # Also find C++ and __fastcall symbols from MSVC++,
+ # which start with @ or ?.
+ lt_cv_sys_global_symbol_pipe="$AWK '"\
+" {last_section=section; section=\$ 3};"\
+" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
+" \$ 0!~/External *\|/{next};"\
+" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+" {if(hide[section]) next};"\
+" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
+" ' prfx=^$ac_symprfx"
+ else
+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+ fi
+ lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+ # Check to see that the pipe works correctly.
+ pipe_works=no
+
+ rm -f conftest*
+ cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ # Now try to grab the symbols.
+ nlist=conftest.nm
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+ (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s "$nlist"; then
+ # Try sorting and uniquifying the output.
+ if sort "$nlist" | uniq > "$nlist"T; then
+ mv -f "$nlist"T "$nlist"
+ else
+ rm -f "$nlist"T
+ fi
+
+ # Make sure that we snagged all the symbols we need.
+ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+ cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+ relocations are performed -- see ld's documentation on pseudo-relocs. */
+# define LT_DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data. */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+ # Now generate the symbol file.
+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+ cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols. */
+LT_DLSYM_CONST struct {
+ const char *name;
+ void *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[] =
+{
+ { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+ $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+ cat <<\_LT_EOF >> conftest.$ac_ext
+ {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+ return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+ # Now try linking the two files.
+ mv conftest.$ac_objext conftstm.$ac_objext
+ lt_globsym_save_LIBS=$LIBS
+ lt_globsym_save_CFLAGS=$CFLAGS
+ LIBS=conftstm.$ac_objext
+ CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s conftest$ac_exeext; then
+ pipe_works=yes
+ fi
+ LIBS=$lt_globsym_save_LIBS
+ CFLAGS=$lt_globsym_save_CFLAGS
+ else
+ echo "cannot find nm_test_func in $nlist" >&5
+ fi
+ else
+ echo "cannot find nm_test_var in $nlist" >&5
+ fi
+ else
+ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+ fi
+ else
+ echo "$progname: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ fi
+ rm -rf conftest* conftst*
+
+ # Do not use the global_symbol_pipe unless it works.
+ if test yes = "$pipe_works"; then
+ break
+ else
+ lt_cv_sys_global_symbol_pipe=
+ fi
+done
+
+fi
+
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+ lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
+ nm_file_list_spec='@'
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
+
+# Check whether --with-sysroot was given.
+if test "${with_sysroot+set}" = set; then :
+ withval=$with_sysroot;
+else
+ with_sysroot=no
+fi
+
+
+lt_sysroot=
+case $with_sysroot in #(
+ yes)
+ if test yes = "$GCC"; then
+ lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+ fi
+ ;; #(
+ /*)
+ lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+ ;; #(
+ no|'')
+ ;; #(
+ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
+$as_echo "$with_sysroot" >&6; }
+ as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+ ;;
+esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+$as_echo "${lt_sysroot:-no}" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
+$as_echo_n "checking for a working dd... " >&6; }
+if ${ac_cv_path_lt_DD+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+if test -z "$lt_DD"; then
+ ac_path_lt_DD_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in dd; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_lt_DD" || continue
+if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi
+ $ac_path_lt_DD_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_lt_DD"; then
+ :
+ fi
+else
+ ac_cv_path_lt_DD=$lt_DD
+fi
+
+rm -f conftest.i conftest2.i conftest.out
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
+$as_echo "$ac_cv_path_lt_DD" >&6; }
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
+$as_echo_n "checking how to truncate binary pipes... " >&6; }
+if ${lt_cv_truncate_bin+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
+$as_echo "$lt_cv_truncate_bin" >&6; }
+
+
+
+
+
+
+# Check whether --enable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then :
+ enableval=$enable_libtool_lock;
+fi
+
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+ # Find out what ABI is being produced by ac_compile, and set mode
+ # options accordingly.
+ echo 'int i;' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *ELF-32*)
+ HPUX_IA64_MODE=32
+ ;;
+ *ELF-64*)
+ HPUX_IA64_MODE=64
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+*-*-irix6*)
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ LD="${LD-ld} -melf32bsmip"
+ ;;
+ *N32*)
+ LD="${LD-ld} -melf32bmipn32"
+ ;;
+ *64-bit*)
+ LD="${LD-ld} -melf64bmip"
+ ;;
+ esac
+ else
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ LD="${LD-ld} -32"
+ ;;
+ *N32*)
+ LD="${LD-ld} -n32"
+ ;;
+ *64-bit*)
+ LD="${LD-ld} -64"
+ ;;
+ esac
+ fi
+ fi
+ rm -rf conftest*
+ ;;
+
+mips64*-*linux*)
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
+ echo '#line '$LINENO' "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ emul=elf
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ emul="${emul}32"
+ ;;
+ *64-bit*)
+ emul="${emul}64"
+ ;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *MSB*)
+ emul="${emul}btsmip"
+ ;;
+ *LSB*)
+ emul="${emul}ltsmip"
+ ;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *N32*)
+ emul="${emul}n32"
+ ;;
+ esac
+ LD="${LD-ld} -m $emul"
+ fi
+ rm -rf conftest*
+ ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly. Note that the listed cases only cover the
+ # situations where additional linker options are needed (such as when
+ # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+ # vice versa); the common cases where no linker options are needed do
+ # not appear in the list.
+ echo 'int i;' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ case `/usr/bin/file conftest.o` in
+ *32-bit*)
+ case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_i386_fbsd"
+ ;;
+ x86_64-*linux*)
+ case `/usr/bin/file conftest.o` in
+ *x86-64*)
+ LD="${LD-ld} -m elf32_x86_64"
+ ;;
+ *)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+ esac
+ ;;
+ powerpc64le-*linux*)
+ LD="${LD-ld} -m elf32lppclinux"
+ ;;
+ powerpc64-*linux*)
+ LD="${LD-ld} -m elf32ppclinux"
+ ;;
+ s390x-*linux*)
+ LD="${LD-ld} -m elf_s390"
+ ;;
+ sparc64-*linux*)
+ LD="${LD-ld} -m elf32_sparc"
+ ;;
+ esac
+ ;;
+ *64-bit*)
+ case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_x86_64_fbsd"
+ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf64lppc"
+ ;;
+ powerpc-*linux*)
+ LD="${LD-ld} -m elf64ppc"
+ ;;
+ s390*-*linux*|s390*-*tpf*)
+ LD="${LD-ld} -m elf64_s390"
+ ;;
+ sparc*-*linux*)
+ LD="${LD-ld} -m elf64_sparc"
+ ;;
+ esac
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+
+*-*-sco3.2v5*)
+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+ SAVE_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS -belf"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if ${lt_cv_cc_needs_belf+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ lt_cv_cc_needs_belf=yes
+else
+ lt_cv_cc_needs_belf=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
+ if test yes != "$lt_cv_cc_needs_belf"; then
+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+ CFLAGS=$SAVE_CFLAGS
+ fi
+ ;;
+*-*solaris*)
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
+ echo 'int i;' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ case `/usr/bin/file conftest.o` in
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+ yes*)
+ case $host in
+ i?86-*-solaris*|x86_64-*-solaris*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+ sparc*-*-solaris*)
+ LD="${LD-ld} -m elf64_sparc"
+ ;;
+ esac
+ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
+ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+ LD=${LD-ld}_sol2
+ fi
+ ;;
+ *)
+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+ LD="${LD-ld} -64"
+ fi
+ ;;
+ esac
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+esac
+
+need_locks=$enable_libtool_lock
+
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
+set dummy ${ac_tool_prefix}mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$MANIFEST_TOOL"; then
+ ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+if test -n "$MANIFEST_TOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+$as_echo "$MANIFEST_TOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+ ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+ # Extract the first word of "mt", so it can be a program name with args.
+set dummy mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_MANIFEST_TOOL"; then
+ ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+if test -n "$ac_ct_MANIFEST_TOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_MANIFEST_TOOL" = x; then
+ MANIFEST_TOOL=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+ fi
+else
+ MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+fi
+
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if ${lt_cv_path_mainfest_tool+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_path_mainfest_tool=no
+ echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+ $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+ cat conftest.err >&5
+ if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+ lt_cv_path_mainfest_tool=yes
+ fi
+ rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
+if test yes != "$lt_cv_path_mainfest_tool"; then
+ MANIFEST_TOOL=:
+fi
+
+
+
+
+
+
+ case $host_os in
+ rhapsody* | darwin*)
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$DSYMUTIL"; then
+ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+DSYMUTIL=$ac_cv_prog_DSYMUTIL
+if test -n "$DSYMUTIL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DSYMUTIL"; then
+ ac_ct_DSYMUTIL=$DSYMUTIL
+ # Extract the first word of "dsymutil", so it can be a program name with args.
+set dummy dsymutil; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_DSYMUTIL"; then
+ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+if test -n "$ac_ct_DSYMUTIL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_DSYMUTIL" = x; then
+ DSYMUTIL=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ DSYMUTIL=$ac_ct_DSYMUTIL
+ fi
+else
+ DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_NMEDIT+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$NMEDIT"; then
+ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+NMEDIT=$ac_cv_prog_NMEDIT
+if test -n "$NMEDIT"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_NMEDIT"; then
+ ac_ct_NMEDIT=$NMEDIT
+ # Extract the first word of "nmedit", so it can be a program name with args.
+set dummy nmedit; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_NMEDIT"; then
+ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_NMEDIT="nmedit"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+if test -n "$ac_ct_NMEDIT"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_NMEDIT" = x; then
+ NMEDIT=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ NMEDIT=$ac_ct_NMEDIT
+ fi
+else
+ NMEDIT="$ac_cv_prog_NMEDIT"
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_LIPO+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$LIPO"; then
+ ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+LIPO=$ac_cv_prog_LIPO
+if test -n "$LIPO"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+$as_echo "$LIPO" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_LIPO"; then
+ ac_ct_LIPO=$LIPO
+ # Extract the first word of "lipo", so it can be a program name with args.
+set dummy lipo; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_LIPO"; then
+ ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_LIPO="lipo"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+if test -n "$ac_ct_LIPO"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+$as_echo "$ac_ct_LIPO" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_LIPO" = x; then
+ LIPO=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ LIPO=$ac_ct_LIPO
+ fi
+else
+ LIPO="$ac_cv_prog_LIPO"
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$OTOOL"; then
+ ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL=$ac_cv_prog_OTOOL
+if test -n "$OTOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+$as_echo "$OTOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL"; then
+ ac_ct_OTOOL=$OTOOL
+ # Extract the first word of "otool", so it can be a program name with args.
+set dummy otool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_OTOOL"; then
+ ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_OTOOL="otool"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+if test -n "$ac_ct_OTOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+$as_echo "$ac_ct_OTOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_OTOOL" = x; then
+ OTOOL=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ OTOOL=$ac_ct_OTOOL
+ fi
+else
+ OTOOL="$ac_cv_prog_OTOOL"
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OTOOL64+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$OTOOL64"; then
+ ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+OTOOL64=$ac_cv_prog_OTOOL64
+if test -n "$OTOOL64"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+$as_echo "$OTOOL64" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OTOOL64"; then
+ ac_ct_OTOOL64=$OTOOL64
+ # Extract the first word of "otool64", so it can be a program name with args.
+set dummy otool64; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_OTOOL64"; then
+ ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_OTOOL64="otool64"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+if test -n "$ac_ct_OTOOL64"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+$as_echo "$ac_ct_OTOOL64" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_OTOOL64" = x; then
+ OTOOL64=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ OTOOL64=$ac_ct_OTOOL64
+ fi
+else
+ OTOOL64="$ac_cv_prog_OTOOL64"
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if ${lt_cv_apple_cc_single_mod+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_apple_cc_single_mod=no
+ if test -z "$LT_MULTI_MODULE"; then
+ # By default we will add the -single_module flag. You can override
+ # by either setting the environment variable LT_MULTI_MODULE
+ # non-empty at configure time, or by adding -multi_module to the
+ # link flags.
+ rm -rf libconftest.dylib*
+ echo "int foo(void){return 1;}" > conftest.c
+ echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&5
+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+ _lt_result=$?
+ # If there is a non-empty error log, and "single_module"
+ # appears in it, assume the flag caused a linker warning
+ if test -s conftest.err && $GREP single_module conftest.err; then
+ cat conftest.err >&5
+ # Otherwise, if the output was created with a 0 exit code from
+ # the compiler, it worked.
+ elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
+ lt_cv_apple_cc_single_mod=yes
+ else
+ cat conftest.err >&5
+ fi
+ rm -rf libconftest.dylib*
+ rm -f conftest.*
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_ld_exported_symbols_list=no
+ save_LDFLAGS=$LDFLAGS
+ echo "_main" > conftest.sym
+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ lt_cv_ld_exported_symbols_list=yes
+else
+ lt_cv_ld_exported_symbols_list=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS=$save_LDFLAGS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if ${lt_cv_ld_force_load+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_ld_force_load=no
+ cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+ echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+ $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+ echo "$AR cru libconftest.a conftest.o" >&5
+ $AR cru libconftest.a conftest.o 2>&5
+ echo "$RANLIB libconftest.a" >&5
+ $RANLIB libconftest.a 2>&5
+ cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+ _lt_result=$?
+ if test -s conftest.err && $GREP force_load conftest.err; then
+ cat conftest.err >&5
+ elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
+ lt_cv_ld_force_load=yes
+ else
+ cat conftest.err >&5
+ fi
+ rm -f conftest.err libconftest.a conftest conftest.c
+ rm -rf conftest.dSYM
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
+ case $host_os in
+ rhapsody* | darwin1.[012])
+ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
+ darwin1.*)
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+ darwin*) # darwin 5.x on
+ # if running on 10.5 or later, the deployment target defaults
+ # to the OS version, if on x86, and 10.4, the deployment
+ # target defaults to 10.4. Don't you love it?
+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+ 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+ 10.[012][,.]*)
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+ 10.*)
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+ esac
+ ;;
+ esac
+ if test yes = "$lt_cv_apple_cc_single_mod"; then
+ _lt_dar_single_mod='$single_module'
+ fi
+ if test yes = "$lt_cv_ld_exported_symbols_list"; then
+ _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
+ else
+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
+ fi
+ if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
+ _lt_dsymutil='~$DSYMUTIL $lib || :'
+ else
+ _lt_dsymutil=
+ fi
+ ;;
+ esac
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+fi
+if test -z "$CPP"; then
+ if ${ac_cv_prog_CPP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ # Double quotes because CPP needs to be expanded
+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ # Broken: success on invalid input.
+continue
+else
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+ break
+fi
+
+ done
+ ac_cv_prog_CPP=$CPP
+
+fi
+ CPP=$ac_cv_prog_CPP
+else
+ ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+ # Broken: success on invalid input.
+continue
+else
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ ac_cv_header_stdc=yes
+else
+ ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "free" >/dev/null 2>&1; then :
+
+else
+ ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ if test "$cross_compiling" = yes; then :
+ :
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+ (('a' <= (c) && (c) <= 'i') \
+ || ('j' <= (c) && (c) <= 'r') \
+ || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+ int i;
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+ return 2;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+ ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ inttypes.h stdint.h unistd.h
+do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_header in dlfcn.h
+do :
+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
+
+fi
+
+done
+
+
+
+
+
+# Set options
+enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+set dummy ${ac_tool_prefix}as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AS+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$AS"; then
+ ac_cv_prog_AS="$AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_AS="${ac_tool_prefix}as"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+AS=$ac_cv_prog_AS
+if test -n "$AS"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+$as_echo "$AS" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_AS"; then
+ ac_ct_AS=$AS
+ # Extract the first word of "as", so it can be a program name with args.
+set dummy as; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AS+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_AS"; then
+ ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_AS="as"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_AS=$ac_cv_prog_ac_ct_AS
+if test -n "$ac_ct_AS"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+$as_echo "$ac_ct_AS" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_AS" = x; then
+ AS="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ AS=$ac_ct_AS
+ fi
+else
+ AS="$ac_cv_prog_AS"
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DLLTOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$DLLTOOL"; then
+ ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_DLLTOOL"; then
+ ac_ct_DLLTOOL=$DLLTOOL
+ # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_DLLTOOL"; then
+ ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_DLLTOOL" = x; then
+ DLLTOOL="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ DLLTOOL=$ac_ct_DLLTOOL
+ fi
+else
+ DLLTOOL="$ac_cv_prog_DLLTOOL"
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_OBJDUMP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$OBJDUMP"; then
+ ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+OBJDUMP=$ac_cv_prog_OBJDUMP
+if test -n "$OBJDUMP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+$as_echo "$OBJDUMP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_OBJDUMP"; then
+ ac_ct_OBJDUMP=$OBJDUMP
+ # Extract the first word of "objdump", so it can be a program name with args.
+set dummy objdump; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ac_ct_OBJDUMP"; then
+ ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_OBJDUMP="objdump"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+if test -n "$ac_ct_OBJDUMP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+$as_echo "$ac_ct_OBJDUMP" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_ct_OBJDUMP" = x; then
+ OBJDUMP="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ OBJDUMP=$ac_ct_OBJDUMP
+ fi
+else
+ OBJDUMP="$ac_cv_prog_OBJDUMP"
+fi
+
+ ;;
+esac
+
+test -z "$AS" && AS=as
+
+
+
+
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
+
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+
+
+
+
+
+
+
+ enable_dlopen=no
+
+
+
+ # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+ enableval=$enable_shared; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_shared=yes ;;
+ no) enable_shared=no ;;
+ *)
+ enable_shared=no
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+ for pkg in $enableval; do
+ IFS=$lt_save_ifs
+ if test "X$pkg" = "X$p"; then
+ enable_shared=yes
+ fi
+ done
+ IFS=$lt_save_ifs
+ ;;
+ esac
+else
+ enable_shared=yes
+fi
+
+
+
+
+
+
+
+
+
+ # Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+ enableval=$enable_static; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_static=yes ;;
+ no) enable_static=no ;;
+ *)
+ enable_static=no
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+ for pkg in $enableval; do
+ IFS=$lt_save_ifs
+ if test "X$pkg" = "X$p"; then
+ enable_static=yes
+ fi
+ done
+ IFS=$lt_save_ifs
+ ;;
+ esac
+else
+ enable_static=yes
+fi
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-pic was given.
+if test "${with_pic+set}" = set; then :
+ withval=$with_pic; lt_p=${PACKAGE-default}
+ case $withval in
+ yes|no) pic_mode=$withval ;;
+ *)
+ pic_mode=default
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+ for lt_pkg in $withval; do
+ IFS=$lt_save_ifs
+ if test "X$lt_pkg" = "X$lt_p"; then
+ pic_mode=yes
+ fi
+ done
+ IFS=$lt_save_ifs
+ ;;
+ esac
+else
+ pic_mode=default
+fi
+
+
+
+
+
+
+
+
+ # Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then :
+ enableval=$enable_fast_install; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_fast_install=yes ;;
+ no) enable_fast_install=no ;;
+ *)
+ enable_fast_install=no
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+ for pkg in $enableval; do
+ IFS=$lt_save_ifs
+ if test "X$pkg" = "X$p"; then
+ enable_fast_install=yes
+ fi
+ done
+ IFS=$lt_save_ifs
+ ;;
+ esac
+else
+ enable_fast_install=yes
+fi
+
+
+
+
+
+
+
+
+ shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[5-9]*,yes)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+
+# Check whether --with-aix-soname was given.
+if test "${with_aix_soname+set}" = set; then :
+ withval=$with_aix_soname; case $withval in
+ aix|svr4|both)
+ ;;
+ *)
+ as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+ ;;
+ esac
+ lt_cv_with_aix_soname=$with_aix_soname
+else
+ if ${lt_cv_with_aix_soname+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_with_aix_soname=aix
+fi
+
+ with_aix_soname=$lt_cv_with_aix_soname
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
+ if test aix != "$with_aix_soname"; then
+ # For the AIX way of multilib, we name the shared archive member
+ # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+ # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+ # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+ # the AIX toolchain works better with OBJECT_MODE set (default 32).
+ if test 64 = "${OBJECT_MODE-32}"; then
+ shared_archive_member_spec=shr_64
+ else
+ shared_archive_member_spec=shr
+ fi
+ fi
+ ;;
+*)
+ with_aix_soname=aix
+ ;;
+esac
+
+
+
+
+
+
+
+
+
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS=$ltmain
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+test -z "$LN_S" && LN_S="ln -s"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+if test -n "${ZSH_VERSION+set}"; then
+ setopt NO_GLOB_SUBST
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if ${lt_cv_objdir+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+ lt_cv_objdir=.libs
+else
+ # MS-DOS does not allow filenames that begin with a dot.
+ lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
+objdir=$lt_cv_objdir
+
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define LT_OBJDIR "$lt_cv_objdir/"
+_ACEOF
+
+
+
+
+case $host_os in
+aix3*)
+ # AIX sometimes has problems with the GCC collect2 program. For some
+ # reason, if we set the COLLECT_NAMES environment variable, the problems
+ # vanish in a puff of smoke.
+ if test set != "${COLLECT_NAMES+set}"; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
+ fi
+ ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a '.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+old_CC=$CC
+old_CFLAGS=$CFLAGS
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+for cc_temp in $compiler""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+done
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $MAGIC_CMD in
+[\\/*] | ?:[\\/]*)
+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+ ;;
+*)
+ lt_save_MAGIC_CMD=$MAGIC_CMD
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+ for ac_dir in $ac_dummy; do
+ IFS=$lt_save_ifs
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/${ac_tool_prefix}file"; then
+ lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
+ if test -n "$file_magic_test_file"; then
+ case $deplibs_check_method in
+ "file_magic "*)
+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ $EGREP "$file_magic_regex" > /dev/null; then
+ :
+ else
+ cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such. This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem. Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+ fi ;;
+ esac
+ fi
+ break
+ fi
+ done
+ IFS=$lt_save_ifs
+ MAGIC_CMD=$lt_save_MAGIC_CMD
+ ;;
+esac
+fi
+
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+ if test -n "$ac_tool_prefix"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $MAGIC_CMD in
+[\\/*] | ?:[\\/]*)
+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+ ;;
+*)
+ lt_save_MAGIC_CMD=$MAGIC_CMD
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+ ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
+ for ac_dir in $ac_dummy; do
+ IFS=$lt_save_ifs
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/file"; then
+ lt_cv_path_MAGIC_CMD=$ac_dir/"file"
+ if test -n "$file_magic_test_file"; then
+ case $deplibs_check_method in
+ "file_magic "*)
+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ $EGREP "$file_magic_regex" > /dev/null; then
+ :
+ else
+ cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such. This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem. Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool@gnu.org
+
+_LT_EOF
+ fi ;;
+ esac
+ fi
+ break
+ fi
+ done
+ IFS=$lt_save_ifs
+ MAGIC_CMD=$lt_save_MAGIC_CMD
+ ;;
+esac
+fi
+
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ else
+ MAGIC_CMD=:
+ fi
+fi
+
+ fi
+ ;;
+esac
+
+# Use C for the default configuration in the libtool script
+
+lt_save_CC=$CC
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+objext=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+
+
+
+
+
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+
+lt_prog_compiler_no_builtin_flag=
+
+if test yes = "$GCC"; then
+ case $cc_basename in
+ nvcc*)
+ lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+ *)
+ lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+ esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler_rtti_exceptions=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_rtti_exceptions=yes
+ fi
+ fi
+ $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
+ lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
+else
+ :
+fi
+
+fi
+
+
+
+
+
+
+ lt_prog_compiler_wl=
+lt_prog_compiler_pic=
+lt_prog_compiler_static=
+
+
+ if test yes = "$GCC"; then
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_static='-static'
+
+ case $host_os in
+ aix*)
+ # All AIX code is PIC.
+ if test ia64 = "$host_cpu"; then
+ # AIX 5 now supports IA64 processor
+ lt_prog_compiler_static='-Bstatic'
+ fi
+ lt_prog_compiler_pic='-fPIC'
+ ;;
+
+ amigaos*)
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ lt_prog_compiler_pic='-fPIC'
+ ;;
+ m68k)
+ # FIXME: we need at least 68020 code to build shared libraries, but
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
+ lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
+ ;;
+ esac
+ ;;
+
+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+
+ mingw* | cygwin* | pw32* | os2* | cegcc*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+ lt_prog_compiler_pic='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static='$wl-static'
+ ;;
+ esac
+ ;;
+
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ lt_prog_compiler_pic='-fno-common'
+ ;;
+
+ haiku*)
+ # PIC is the default for Haiku.
+ # The "-static" flag exists, but is broken.
+ lt_prog_compiler_static=
+ ;;
+
+ hpux*)
+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
+ # sets the default TLS model and affects inlining.
+ case $host_cpu in
+ hppa*64*)
+ # +Z the default
+ ;;
+ *)
+ lt_prog_compiler_pic='-fPIC'
+ ;;
+ esac
+ ;;
+
+ interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+ ;;
+
+ msdosdjgpp*)
+ # Just because we use GCC doesn't mean we suddenly get shared libraries
+ # on systems that don't support them.
+ lt_prog_compiler_can_build_shared=no
+ enable_shared=no
+ ;;
+
+ *nto* | *qnx*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+ # it will coredump.
+ lt_prog_compiler_pic='-fPIC -shared'
+ ;;
+
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ lt_prog_compiler_pic=-Kconform_pic
+ fi
+ ;;
+
+ *)
+ lt_prog_compiler_pic='-fPIC'
+ ;;
+ esac
+
+ case $cc_basename in
+ nvcc*) # Cuda Compiler Driver 2.2
+ lt_prog_compiler_wl='-Xlinker '
+ if test -n "$lt_prog_compiler_pic"; then
+ lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+ fi
+ ;;
+ esac
+ else
+ # PORTME Check for flag to pass linker flags through the system compiler.
+ case $host_os in
+ aix*)
+ lt_prog_compiler_wl='-Wl,'
+ if test ia64 = "$host_cpu"; then
+ # AIX 5 now supports IA64 processor
+ lt_prog_compiler_static='-Bstatic'
+ else
+ lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
+ fi
+ ;;
+
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ lt_prog_compiler_pic='-fno-common'
+ case $cc_basename in
+ nagfor*)
+ # NAG Fortran compiler
+ lt_prog_compiler_wl='-Wl,-Wl,,'
+ lt_prog_compiler_pic='-PIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+ esac
+ ;;
+
+ mingw* | cygwin* | pw32* | os2* | cegcc*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ lt_prog_compiler_pic='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static='$wl-static'
+ ;;
+ esac
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+ lt_prog_compiler_wl='-Wl,'
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+ *)
+ lt_prog_compiler_pic='+Z'
+ ;;
+ esac
+ # Is there a better lt_prog_compiler_static that works with the bundled CC?
+ lt_prog_compiler_static='$wl-a ${wl}archive'
+ ;;
+
+ irix5* | irix6* | nonstopux*)
+ lt_prog_compiler_wl='-Wl,'
+ # PIC (with -KPIC) is the default.
+ lt_prog_compiler_static='-non_shared'
+ ;;
+
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ case $cc_basename in
+ # old Intel for x86_64, which still supported -KPIC.
+ ecc*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-static'
+ ;;
+ # icc used to be incompatible with GCC.
+ # ICC 10 doesn't accept -KPIC any more.
+ icc* | ifort*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fPIC'
+ lt_prog_compiler_static='-static'
+ ;;
+ # Lahey Fortran 8.1.
+ lf95*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='--shared'
+ lt_prog_compiler_static='--static'
+ ;;
+ nagfor*)
+ # NAG Fortran compiler
+ lt_prog_compiler_wl='-Wl,-Wl,,'
+ lt_prog_compiler_pic='-PIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fPIC'
+ lt_prog_compiler_static='-static'
+ ;;
+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+ # Portland Group compilers (*not* the Pentium gcc compiler,
+ # which looks to be a dead project)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fpic'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+ ccc*)
+ lt_prog_compiler_wl='-Wl,'
+ # All Alpha code is PIC.
+ lt_prog_compiler_static='-non_shared'
+ ;;
+ xl* | bgxl* | bgf* | mpixl*)
+ # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-qpic'
+ lt_prog_compiler_static='-qstaticlink'
+ ;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ lt_prog_compiler_wl=''
+ ;;
+ *Sun\ F* | *Sun*Fortran*)
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ lt_prog_compiler_wl='-Qoption ld '
+ ;;
+ *Sun\ C*)
+ # Sun C 5.9
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ lt_prog_compiler_wl='-Wl,'
+ ;;
+ *Intel*\ [CF]*Compiler*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fPIC'
+ lt_prog_compiler_static='-static'
+ ;;
+ *Portland\ Group*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-fpic'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+ esac
+ ;;
+ esac
+ ;;
+
+ newsos6)
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+
+ *nto* | *qnx*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+ # it will coredump.
+ lt_prog_compiler_pic='-fPIC -shared'
+ ;;
+
+ osf3* | osf4* | osf5*)
+ lt_prog_compiler_wl='-Wl,'
+ # All OSF/1 code is PIC.
+ lt_prog_compiler_static='-non_shared'
+ ;;
+
+ rdos*)
+ lt_prog_compiler_static='-non_shared'
+ ;;
+
+ solaris*)
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ case $cc_basename in
+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+ lt_prog_compiler_wl='-Qoption ld ';;
+ *)
+ lt_prog_compiler_wl='-Wl,';;
+ esac
+ ;;
+
+ sunos4*)
+ lt_prog_compiler_wl='-Qoption ld '
+ lt_prog_compiler_pic='-PIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+
+ sysv4 | sysv4.2uw2* | sysv4.3*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ lt_prog_compiler_pic='-Kconform_pic'
+ lt_prog_compiler_static='-Bstatic'
+ fi
+ ;;
+
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+
+ unicos*)
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_can_build_shared=no
+ ;;
+
+ uts4*)
+ lt_prog_compiler_pic='-pic'
+ lt_prog_compiler_static='-Bstatic'
+ ;;
+
+ *)
+ lt_prog_compiler_can_build_shared=no
+ ;;
+ esac
+ fi
+
+case $host_os in
+ # For platforms that do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ lt_prog_compiler_pic=
+ ;;
+ *)
+ lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+ ;;
+esac
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$lt_prog_compiler_pic"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler_pic_works=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_pic_works=yes
+ fi
+ fi
+ $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_pic_works"; then
+ case $lt_prog_compiler_pic in
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+ esac
+else
+ lt_prog_compiler_pic=
+ lt_prog_compiler_can_build_shared=no
+fi
+
+fi
+
+
+
+
+
+
+
+
+
+
+
+#
+# Check to make sure the static flag actually works.
+#
+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler_static_works=no
+ save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_static_works=yes
+ fi
+ else
+ lt_cv_prog_compiler_static_works=yes
+ fi
+ fi
+ $RM -r conftest*
+ LDFLAGS=$save_LDFLAGS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
+
+if test yes = "$lt_cv_prog_compiler_static_works"; then
+ :
+else
+ lt_prog_compiler_static=
+fi
+
+
+
+
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler_c_o=no
+ $RM -r conftest 2>/dev/null
+ mkdir conftest
+ cd conftest
+ mkdir out
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o=yes
+ fi
+ fi
+ chmod u+w . 2>&5
+ $RM conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
+ # template instantiation
+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+ $RM out/* && rmdir out
+ cd ..
+ $RM -r conftest
+ $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler_c_o=no
+ $RM -r conftest 2>/dev/null
+ mkdir conftest
+ cd conftest
+ mkdir out
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+ (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o=yes
+ fi
+ fi
+ chmod u+w . 2>&5
+ $RM conftest*
+ # SGI C++ compiler will create directory out/ii_files/ for
+ # template instantiation
+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+ $RM out/* && rmdir out
+ cd ..
+ $RM -r conftest
+ $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+
+
+
+
+hard_links=nottested
+if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
+ # do not overwrite the value of need_locks provided by the user
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
+ hard_links=yes
+ $RM conftest*
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ touch conftest.a
+ ln conftest.a conftest.b 2>&5 || hard_links=no
+ ln conftest.a conftest.b 2>/dev/null && hard_links=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
+ if test no = "$hard_links"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+ need_locks=warn
+ fi
+else
+ need_locks=no
+fi
+
+
+
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+
+ runpath_var=
+ allow_undefined_flag=
+ always_export_symbols=no
+ archive_cmds=
+ archive_expsym_cmds=
+ compiler_needs_object=no
+ enable_shared_with_static_runtimes=no
+ export_dynamic_flag_spec=
+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ hardcode_automatic=no
+ hardcode_direct=no
+ hardcode_direct_absolute=no
+ hardcode_libdir_flag_spec=
+ hardcode_libdir_separator=
+ hardcode_minus_L=no
+ hardcode_shlibpath_var=unsupported
+ inherit_rpath=no
+ link_all_deplibs=unknown
+ module_cmds=
+ module_expsym_cmds=
+ old_archive_from_new_cmds=
+ old_archive_from_expsyms_cmds=
+ thread_safe_flag_spec=
+ whole_archive_flag_spec=
+ # include_expsyms should be a list of space-separated symbols to be *always*
+ # included in the symbol list
+ include_expsyms=
+ # exclude_expsyms can be an extended regexp of symbols to exclude
+ # it will be wrapped by ' (' and ')$', so one must not match beginning or
+ # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+ # as well as any symbol that contains 'd'.
+ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+ # the symbol is explicitly referenced. Since portable code cannot
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
+ # Exclude shared library initialization/finalization symbols.
+ extract_expsyms_cmds=
+
+ case $host_os in
+ cygwin* | mingw* | pw32* | cegcc*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ if test yes != "$GCC"; then
+ with_gnu_ld=no
+ fi
+ ;;
+ interix*)
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
+ with_gnu_ld=yes
+ ;;
+ openbsd* | bitrig*)
+ with_gnu_ld=no
+ ;;
+ esac
+
+ ld_shlibs=yes
+
+ # On some targets, GNU ld is compatible enough with the native linker
+ # that we're better off using the native interface for both.
+ lt_use_gnu_ld_interface=no
+ if test yes = "$with_gnu_ld"; then
+ case $host_os in
+ aix*)
+ # The AIX port of GNU ld has always aspired to compatibility
+ # with the native linker. However, as the warning in the GNU ld
+ # block says, versions before 2.19.5* couldn't really create working
+ # shared libraries, regardless of the interface used.
+ case `$LD -v 2>&1` in
+ *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+ *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+ *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+ *)
+ lt_use_gnu_ld_interface=yes
+ ;;
+ esac
+ ;;
+ *)
+ lt_use_gnu_ld_interface=yes
+ ;;
+ esac
+ fi
+
+ if test yes = "$lt_use_gnu_ld_interface"; then
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='$wl'
+
+ # Set some defaults for GNU ld with shared library support. These
+ # are reset later if shared libraries are not supported. Putting them
+ # here allows them to be overridden if necessary.
+ runpath_var=LD_RUN_PATH
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+ export_dynamic_flag_spec='$wl--export-dynamic'
+ # ancient GNU ld didn't support --whole-archive et. al.
+ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+ whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+ else
+ whole_archive_flag_spec=
+ fi
+ supports_anon_versioning=no
+ case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
+ *GNU\ gold*) supports_anon_versioning=yes ;;
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+ *\ 2.11.*) ;; # other 2.11 versions
+ *) supports_anon_versioning=yes ;;
+ esac
+
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test ia64 != "$host_cpu"; then
+ ld_shlibs=no
+ cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support. If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+ fi
+ ;;
+
+ amigaos*)
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds=''
+ ;;
+ m68k)
+ archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ ;;
+ esac
+ ;;
+
+ beos*)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ allow_undefined_flag=unsupported
+ # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+ archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
+ cygwin* | mingw* | pw32* | cegcc*)
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+ # as there is no search path for DLLs.
+ hardcode_libdir_flag_spec='-L$libdir'
+ export_dynamic_flag_spec='$wl--export-all-symbols'
+ allow_undefined_flag=unsupported
+ always_export_symbols=no
+ enable_shared_with_static_runtimes=yes
+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+
+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file, use it as
+ # is; otherwise, prepend EXPORTS...
+ archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
+ haiku*)
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ link_all_deplibs=yes
+ ;;
+
+ os2*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ allow_undefined_flag=unsupported
+ shrext_cmds=.dll
+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes=yes
+ ;;
+
+ interix[3-9]*)
+ hardcode_direct=no
+ hardcode_shlibpath_var=no
+ hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+ export_dynamic_flag_spec='$wl-E'
+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+ # Instead, shared libraries are loaded at an image base (0x10000000 by
+ # default) and relocated if they conflict, which is a slow very memory
+ # consuming and fragmenting process. To avoid this, we pick a random,
+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+ if test linux-dietlibc = "$host_os"; then
+ case $cc_basename in
+ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
+ esac
+ fi
+ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+ && test no = "$tmp_diet"
+ then
+ tmp_addflag=' $pic_flag'
+ tmp_sharedflag='-shared'
+ case $cc_basename,$host_cpu in
+ pgcc*) # Portland Group C compiler
+ whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+ tmp_addflag=' $pic_flag'
+ ;;
+ pgf77* | pgf90* | pgf95* | pgfortran*)
+ # Portland Group f77 and f90 compilers
+ whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
+ tmp_addflag=' -i_dynamic' ;;
+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
+ tmp_addflag=' -i_dynamic -nofor_main' ;;
+ ifc* | ifort*) # Intel Fortran compiler
+ tmp_addflag=' -nofor_main' ;;
+ lf95*) # Lahey Fortran 8.1
+ whole_archive_flag_spec=
+ tmp_sharedflag='--shared' ;;
+ nagfor*) # NAGFOR 5.3
+ tmp_sharedflag='-Wl,-shared' ;;
+ xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ tmp_sharedflag='-qmkshrobj'
+ tmp_addflag= ;;
+ nvcc*) # Cuda Compiler Driver 2.2
+ whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+ compiler_needs_object=yes
+ ;;
+ esac
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C 5.9
+ whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+ compiler_needs_object=yes
+ tmp_sharedflag='-G' ;;
+ *Sun\ F*) # Sun Fortran 8.3
+ tmp_sharedflag='-G' ;;
+ esac
+ archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+
+ if test yes = "$supports_anon_versioning"; then
+ archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+ fi
+
+ case $cc_basename in
+ tcc*)
+ export_dynamic_flag_spec='-rdynamic'
+ ;;
+ xlf* | bgf* | bgxlf* | mpixlf*)
+ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+ whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+ if test yes = "$supports_anon_versioning"; then
+ archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ fi
+ ;;
+ esac
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
+ netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+ else
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+ fi
+ ;;
+
+ solaris*)
+ if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+ ld_shlibs=no
+ cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems. Therefore, libtool
+*** is disabling shared libraries support. We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer. Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+ case `$LD -v 2>&1` in
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+ ld_shlibs=no
+ cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
+*** reliably create shared libraries on SCO systems. Therefore, libtool
+*** is disabling shared libraries support. We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+ ;;
+ *)
+ # For security reasons, it is highly recommended that you always
+ # use absolute paths for naming shared libraries, and exclude the
+ # DT_RUNPATH tag from executables and libraries. But doing so
+ # requires that you compile everything twice, which is a pain.
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ esac
+ ;;
+
+ sunos4*)
+ archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ wlarc=
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ ;;
+
+ *)
+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ esac
+
+ if test no = "$ld_shlibs"; then
+ runpath_var=
+ hardcode_libdir_flag_spec=
+ export_dynamic_flag_spec=
+ whole_archive_flag_spec=
+ fi
+ else
+ # PORTME fill in a description of your system's linker (not GNU ld)
+ case $host_os in
+ aix3*)
+ allow_undefined_flag=unsupported
+ always_export_symbols=yes
+ archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+ # Note: this linker hardcodes the directories in LIBPATH if there
+ # are no directories specified by -L.
+ hardcode_minus_L=yes
+ if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ hardcode_direct=unsupported
+ fi
+ ;;
+
+ aix[4-9]*)
+ if test ia64 = "$host_cpu"; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+ aix_use_runtimelinking=no
+ exp_sym_flag='-Bexport'
+ no_entry_flag=
+ else
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+ else
+ export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+ fi
+ aix_use_runtimelinking=no
+
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
+ aix_use_runtimelinking=yes
+ break
+ fi
+ done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
+ ;;
+ esac
+
+ exp_sym_flag='-bexport'
+ no_entry_flag='-bnoentry'
+ fi
+
+ # When large executables or shared objects are built, AIX ld can
+ # have problems creating the table of contents. If linking a library
+ # or program results in "error TOC overflow" add -mminimal-toc to
+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+ archive_cmds=''
+ hardcode_direct=yes
+ hardcode_direct_absolute=yes
+ hardcode_libdir_separator=':'
+ link_all_deplibs=yes
+ file_list_spec='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # traditional, no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ hardcode_direct=no
+ hardcode_direct_absolute=no
+ ;;
+ esac
+
+ if test yes = "$GCC"; then
+ case $host_os in aix4.[012]|aix4.[012].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`$CC -print-prog-name=collect2`
+ if test -f "$collect2name" &&
+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+ :
+ else
+ # We have old collect2
+ hardcode_direct=unsupported
+ # It fails to find uninstalled libraries when the uninstalled
+ # path is not listed in the libpath. Setting hardcode_minus_L
+ # to unsupported forces relinking
+ hardcode_minus_L=yes
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_libdir_separator=
+ fi
+ ;;
+ esac
+ shared_flag='-shared'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag="$shared_flag "'$wl-G'
+ fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
+ else
+ # not using gcc
+ if test ia64 = "$host_cpu"; then
+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+ # chokes on -Wl,-G. The following line is correct:
+ shared_flag='-G'
+ else
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag='$wl-G'
+ else
+ shared_flag='$wl-bM:SRE'
+ fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
+ fi
+ fi
+
+ export_dynamic_flag_spec='$wl-bexpall'
+ # It seems that -bexpall does not export symbols beginning with
+ # underscore (_), so it is better to generate a list of symbols to export.
+ always_export_symbols=yes
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # Warning - without using the other runtime loading flags (-brtl),
+ # -berok will link without error, but may produce a broken library.
+ allow_undefined_flag='-berok'
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+ if test set = "${lt_cv_aix_libpath+set}"; then
+ aix_libpath=$lt_cv_aix_libpath
+else
+ if ${lt_cv_aix_libpath_+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\([^ ]*\) *$/\1/
+ p
+ }
+ }'
+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+ if test -z "$lt_cv_aix_libpath_"; then
+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$lt_cv_aix_libpath_"; then
+ lt_cv_aix_libpath_=/usr/lib:/lib
+ fi
+
+fi
+
+ aix_libpath=$lt_cv_aix_libpath_
+fi
+
+ hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+ else
+ if test ia64 = "$host_cpu"; then
+ hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
+ allow_undefined_flag="-z nodefs"
+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+ else
+ # Determine the default libpath from the value encoded in an
+ # empty executable.
+ if test set = "${lt_cv_aix_libpath+set}"; then
+ aix_libpath=$lt_cv_aix_libpath
+else
+ if ${lt_cv_aix_libpath_+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+ lt_aix_libpath_sed='
+ /Import File Strings/,/^$/ {
+ /^0/ {
+ s/^0 *\([^ ]*\) *$/\1/
+ p
+ }
+ }'
+ lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+ if test -z "$lt_cv_aix_libpath_"; then
+ lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test -z "$lt_cv_aix_libpath_"; then
+ lt_cv_aix_libpath_=/usr/lib:/lib
+ fi
+
+fi
+
+ aix_libpath=$lt_cv_aix_libpath_
+fi
+
+ hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
+ # Warning - without using the other run time loading flags,
+ # -berok will link without error, but may produce a broken library.
+ no_undefined_flag=' $wl-bernotok'
+ allow_undefined_flag=' $wl-berok'
+ if test yes = "$with_gnu_ld"; then
+ # We only use this code for GNU lds that support --whole-archive.
+ whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
+ else
+ # Exported symbols can be pulled into shared objects from archives
+ whole_archive_flag_spec='$convenience'
+ fi
+ archive_cmds_need_lc=yes
+ archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+ else
+ # used by -dlpreopen to get the symbols
+ archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
+ fi
+ fi
+ ;;
+
+ amigaos*)
+ case $host_cpu in
+ powerpc)
+ # see comment about AmigaOS4 .so support
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ archive_expsym_cmds=''
+ ;;
+ m68k)
+ archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ ;;
+ esac
+ ;;
+
+ bsdi[45]*)
+ export_dynamic_flag_spec=-rdynamic
+ ;;
+
+ cygwin* | mingw* | pw32* | cegcc*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ case $cc_basename in
+ cl*)
+ # Native MSVC
+ hardcode_libdir_flag_spec=' '
+ allow_undefined_flag=unsupported
+ always_export_symbols=yes
+ file_list_spec='@'
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ shrext_cmds=.dll
+ # FIXME: Setting linknames here is a bad hack.
+ archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+ archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then
+ cp "$export_symbols" "$output_objdir/$soname.def";
+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+ else
+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
+ # The linker will not automatically build a static lib if we build a DLL.
+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+ enable_shared_with_static_runtimes=yes
+ exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ # Don't use ranlib
+ old_postinstall_cmds='chmod 644 $oldlib'
+ postlink_cmds='lt_outputfile="@OUTPUT@"~
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile=$lt_outputfile.exe
+ lt_tool_outputfile=$lt_tool_outputfile.exe
+ ;;
+ esac~
+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
+ ;;
+ *)
+ # Assume MSVC wrapper
+ hardcode_libdir_flag_spec=' '
+ allow_undefined_flag=unsupported
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+ shrext_cmds=.dll
+ # FIXME: Setting linknames here is a bad hack.
+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+ # The linker will automatically build a .lib file if we build a DLL.
+ old_archive_from_new_cmds='true'
+ # FIXME: Should let the user specify the lib program.
+ old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+ enable_shared_with_static_runtimes=yes
+ ;;
+ esac
+ ;;
+
+ darwin* | rhapsody*)
+
+
+ archive_cmds_need_lc=no
+ hardcode_direct=no
+ hardcode_automatic=yes
+ hardcode_shlibpath_var=unsupported
+ if test yes = "$lt_cv_ld_force_load"; then
+ whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+ else
+ whole_archive_flag_spec=''
+ fi
+ link_all_deplibs=yes
+ allow_undefined_flag=$_lt_dar_allow_undefined
+ case $cc_basename in
+ ifort*|nagfor*) _lt_dar_can_shared=yes ;;
+ *) _lt_dar_can_shared=$GCC ;;
+ esac
+ if test yes = "$_lt_dar_can_shared"; then
+ output_verbose_link_cmd=func_echo_all
+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+ archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+ module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+
+ else
+ ld_shlibs=no
+ fi
+
+ ;;
+
+ dgux*)
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_shlibpath_var=no
+ ;;
+
+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+ # support. Future versions do this automatically, but an explicit c++rt0.o
+ # does not break anything, and helps significantly (at the cost of a little
+ # extra space).
+ freebsd2.2*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+ freebsd2.*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+ hardcode_shlibpath_var=no
+ ;;
+
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+ freebsd* | dragonfly*)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ ;;
+
+ hpux9*)
+ if test yes = "$GCC"; then
+ archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+ else
+ archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+ fi
+ hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+ hardcode_libdir_separator=:
+ hardcode_direct=yes
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L=yes
+ export_dynamic_flag_spec='$wl-E'
+ ;;
+
+ hpux10*)
+ if test yes,no = "$GCC,$with_gnu_ld"; then
+ archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+ fi
+ if test no = "$with_gnu_ld"; then
+ hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+ hardcode_libdir_separator=:
+ hardcode_direct=yes
+ hardcode_direct_absolute=yes
+ export_dynamic_flag_spec='$wl-E'
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L=yes
+ fi
+ ;;
+
+ hpux11*)
+ if test yes,no = "$GCC,$with_gnu_ld"; then
+ case $host_cpu in
+ hppa*64*)
+ archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+ archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ else
+ case $host_cpu in
+ hppa*64*)
+ archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ ia64*)
+ archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+
+ # Older versions of the 11.00 compiler do not understand -b yet
+ # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if ${lt_cv_prog_compiler__b+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_prog_compiler__b=no
+ save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -b"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+ $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler__b=yes
+ fi
+ else
+ lt_cv_prog_compiler__b=yes
+ fi
+ fi
+ $RM -r conftest*
+ LDFLAGS=$save_LDFLAGS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+if test yes = "$lt_cv_prog_compiler__b"; then
+ archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
+ ;;
+ esac
+ fi
+ if test no = "$with_gnu_ld"; then
+ hardcode_libdir_flag_spec='$wl+b $wl$libdir'
+ hardcode_libdir_separator=:
+
+ case $host_cpu in
+ hppa*64*|ia64*)
+ hardcode_direct=no
+ hardcode_shlibpath_var=no
+ ;;
+ *)
+ hardcode_direct=yes
+ hardcode_direct_absolute=yes
+ export_dynamic_flag_spec='$wl-E'
+
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L=yes
+ ;;
+ esac
+ fi
+ ;;
+
+ irix5* | irix6* | nonstopux*)
+ if test yes = "$GCC"; then
+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+ # Try to use the -exported_symbol ld option, if it does not
+ # work, assume that -exports_file does not work either and
+ # implicitly export all symbols.
+ # This should be the same for all languages, so no per-tag cache variable.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if ${lt_cv_irix_exported_symbol+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int foo (void) { return 0; }
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ lt_cv_irix_exported_symbol=yes
+else
+ lt_cv_irix_exported_symbol=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS=$save_LDFLAGS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+ if test yes = "$lt_cv_irix_exported_symbol"; then
+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
+ fi
+ else
+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
+ fi
+ archive_cmds_need_lc='no'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+ hardcode_libdir_separator=:
+ inherit_rpath=yes
+ link_all_deplibs=yes
+ ;;
+
+ linux*)
+ case $cc_basename in
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ ld_shlibs=yes
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+
+ netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+ archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
+ fi
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ ;;
+
+ newsos6)
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=yes
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+ hardcode_libdir_separator=:
+ hardcode_shlibpath_var=no
+ ;;
+
+ *nto* | *qnx*)
+ ;;
+
+ openbsd* | bitrig*)
+ if test -f /usr/libexec/ld.so; then
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ hardcode_direct_absolute=yes
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+ hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+ export_dynamic_flag_spec='$wl-E'
+ else
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='$wl-rpath,$libdir'
+ fi
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
+ os2*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ allow_undefined_flag=unsupported
+ shrext_cmds=.dll
+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes=yes
+ ;;
+
+ osf3*)
+ if test yes = "$GCC"; then
+ allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+ else
+ allow_undefined_flag=' -expect_unresolved \*'
+ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+ fi
+ archive_cmds_need_lc='no'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+ hardcode_libdir_separator=:
+ ;;
+
+ osf4* | osf5*) # as osf3* with the addition of -msym flag
+ if test yes = "$GCC"; then
+ allow_undefined_flag=' $wl-expect_unresolved $wl\*'
+ archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+ hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
+ else
+ allow_undefined_flag=' -expect_unresolved \*'
+ archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+ archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+ $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ hardcode_libdir_flag_spec='-rpath $libdir'
+ fi
+ archive_cmds_need_lc='no'
+ hardcode_libdir_separator=:
+ ;;
+
+ solaris*)
+ no_undefined_flag=' -z defs'
+ if test yes = "$GCC"; then
+ wlarc='$wl'
+ archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ else
+ case `$CC -V 2>&1` in
+ *"Compilers 5.0"*)
+ wlarc=''
+ archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+ ;;
+ *)
+ wlarc='$wl'
+ archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+ $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ ;;
+ esac
+ fi
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_shlibpath_var=no
+ case $host_os in
+ solaris2.[0-5] | solaris2.[0-5].*) ;;
+ *)
+ # The compiler driver will combine and reorder linker options,
+ # but understands '-z linker_flag'. GCC discards it without '$wl',
+ # but is careful enough not to reorder.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+ if test yes = "$GCC"; then
+ whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+ else
+ whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+ fi
+ ;;
+ esac
+ link_all_deplibs=yes
+ ;;
+
+ sunos4*)
+ if test sequent = "$host_vendor"; then
+ # Use $CC to link under sequent, because it throws in some extra .o
+ # files that make .init and .fini sections work.
+ archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+ fi
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+ hardcode_shlibpath_var=no
+ ;;
+
+ sysv4)
+ case $host_vendor in
+ sni)
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=yes # is this really true???
+ ;;
+ siemens)
+ ## LD is ld it makes a PLAMLIB
+ ## CC just makes a GrossModule.
+ archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+ reload_cmds='$CC -r -o $output$reload_objs'
+ hardcode_direct=no
+ ;;
+ motorola)
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+ ;;
+ esac
+ runpath_var='LD_RUN_PATH'
+ hardcode_shlibpath_var=no
+ ;;
+
+ sysv4.3*)
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_shlibpath_var=no
+ export_dynamic_flag_spec='-Bexport'
+ ;;
+
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_shlibpath_var=no
+ runpath_var=LD_RUN_PATH
+ hardcode_runpath_var=yes
+ ld_shlibs=yes
+ fi
+ ;;
+
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+ no_undefined_flag='$wl-z,text'
+ archive_cmds_need_lc=no
+ hardcode_shlibpath_var=no
+ runpath_var='LD_RUN_PATH'
+
+ if test yes = "$GCC"; then
+ archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+ ;;
+
+ sysv5* | sco3.2v5* | sco5v6*)
+ # Note: We CANNOT use -z defs as we might desire, because we do not
+ # link with -lc, and that would cause any symbols used from libc to
+ # always be unresolved, which means just about no library would
+ # ever link correctly. If we're not using GNU ld we use -z text
+ # though, which does catch some bad symbols but isn't as heavy-handed
+ # as -z defs.
+ no_undefined_flag='$wl-z,text'
+ allow_undefined_flag='$wl-z,nodefs'
+ archive_cmds_need_lc=no
+ hardcode_shlibpath_var=no
+ hardcode_libdir_flag_spec='$wl-R,$libdir'
+ hardcode_libdir_separator=':'
+ link_all_deplibs=yes
+ export_dynamic_flag_spec='$wl-Bexport'
+ runpath_var='LD_RUN_PATH'
+
+ if test yes = "$GCC"; then
+ archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+ ;;
+
+ uts4*)
+ archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_shlibpath_var=no
+ ;;
+
+ *)
+ ld_shlibs=no
+ ;;
+ esac
+
+ if test sni = "$host_vendor"; then
+ case $host in
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+ export_dynamic_flag_spec='$wl-Blargedynsym'
+ ;;
+ esac
+ fi
+ fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
+test no = "$ld_shlibs" && can_build_shared=no
+
+with_gnu_ld=$with_gnu_ld
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$archive_cmds_need_lc" in
+x|xyes)
+ # Assume -lc should be added
+ archive_cmds_need_lc=yes
+
+ if test yes,yes = "$GCC,$enable_shared"; then
+ case $archive_cmds in
+ *'~'*)
+ # FIXME: we may have to deal with multi-command sequences.
+ ;;
+ '$CC '*)
+ # Test whether the compiler implicitly links with -lc since on some
+ # systems, -lgcc has to come before -lc. If gcc already passes -lc
+ # to ld, don't add -lc before -lgcc.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+if ${lt_cv_archive_cmds_need_lc+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ $RM conftest*
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } 2>conftest.err; then
+ soname=conftest
+ lib=conftest
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$lt_prog_compiler_wl
+ pic_flag=$lt_prog_compiler_pic
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+ output_objdir=.
+ libname=conftest
+ lt_save_allow_undefined_flag=$allow_undefined_flag
+ allow_undefined_flag=
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+ (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ then
+ lt_cv_archive_cmds_need_lc=no
+ else
+ lt_cv_archive_cmds_need_lc=yes
+ fi
+ allow_undefined_flag=$lt_save_allow_undefined_flag
+ else
+ cat conftest.err 1>&5
+ fi
+ $RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+ archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
+ ;;
+ esac
+ fi
+ ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+if test yes = "$GCC"; then
+ case $host_os in
+ darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+ *) lt_awk_arg='/^libraries:/' ;;
+ esac
+ case $host_os in
+ mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
+ *) lt_sed_strip_eq='s|=/|/|g' ;;
+ esac
+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+ case $lt_search_path_spec in
+ *\;*)
+ # if the path contains ";" then we assume it to be the separator
+ # otherwise default to the standard path separator (i.e. ":") - it is
+ # assumed that no part of a normal pathname contains ";" but that should
+ # okay in the real world where ";" in dirpaths is itself problematic.
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+ ;;
+ *)
+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+ ;;
+ esac
+ # Ok, now we have the path, separated by spaces, we can step through it
+ # and add multilib dir if necessary...
+ lt_tmp_lt_search_path_spec=
+ lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ # ...but if some path component already ends with the multilib dir we assume
+ # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+ case "$lt_multi_os_dir; $lt_search_path_spec " in
+ "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+ lt_multi_os_dir=
+ ;;
+ esac
+ for lt_sys_path in $lt_search_path_spec; do
+ if test -d "$lt_sys_path$lt_multi_os_dir"; then
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+ elif test -n "$lt_multi_os_dir"; then
+ test -d "$lt_sys_path" && \
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+ fi
+ done
+ lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS = " "; FS = "/|\n";} {
+ lt_foo = "";
+ lt_count = 0;
+ for (lt_i = NF; lt_i > 0; lt_i--) {
+ if ($lt_i != "" && $lt_i != ".") {
+ if ($lt_i == "..") {
+ lt_count++;
+ } else {
+ if (lt_count == 0) {
+ lt_foo = "/" $lt_i lt_foo;
+ } else {
+ lt_count--;
+ }
+ }
+ }
+ }
+ if (lt_foo != "") { lt_freq[lt_foo]++; }
+ if (lt_freq[lt_foo] == 1) { print lt_foo; }
+}'`
+ # AWK program above erroneously prepends '/' to C:/dos/paths
+ # for these hosts.
+ case $host_os in
+ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+ $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
+ esac
+ sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=.so
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+case $host_os in
+aix3*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
+ shlibpath_var=LIBPATH
+
+ # AIX 3 has no versioning support, so we append a major version to the name.
+ soname_spec='$libname$release$shared_ext$major'
+ ;;
+
+aix[4-9]*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ hardcode_into_libs=yes
+ if test ia64 = "$host_cpu"; then
+ # AIX 5 supports IA64
+ library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
+ shlibpath_var=LD_LIBRARY_PATH
+ else
+ # With GCC up to 2.95.x, collect2 would create an import file
+ # for dependence libraries. The import file would start with
+ # the line '#! .'. This would cause the generated library to
+ # depend on '.', always an invalid library. This was fixed in
+ # development snapshots of GCC prior to 3.0.
+ case $host_os in
+ aix4 | aix4.[01] | aix4.[01].*)
+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+ echo ' yes '
+ echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
+ :
+ else
+ can_build_shared=no
+ fi
+ ;;
+ esac
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
+ # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
+ # soname into executable. Probably we can add versioning support to
+ # collect2, so additional links can be useful in future.
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
+ # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+ # instead of lib<name>.a to let people know that these are not
+ # typical AIX shared libraries.
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a(lib.so.V)'
+ # We preserve .a as extension for shared libraries through AIX4.2
+ # and later when we are not doing run time linking.
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
+ shlibpath_var=LIBPATH
+ fi
+ ;;
+
+amigaos*)
+ case $host_cpu in
+ powerpc)
+ # Since July 2007 AmigaOS4 officially supports .so libraries.
+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ ;;
+ m68k)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+ esac
+ ;;
+
+beos*)
+ library_names_spec='$libname$shared_ext'
+ dynamic_linker="$host_os ld.so"
+ shlibpath_var=LIBRARY_PATH
+ ;;
+
+bsdi[45]*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_version=no
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+ # the default ld.so.conf also contains /usr/contrib/lib and
+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+ # libtool to hard-code these into programs
+ ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+ version_type=windows
+ shrext_cmds=.dll
+ need_version=no
+ need_lib_prefix=no
+
+ case $GCC,$cc_basename in
+ yes,*)
+ # gcc
+ library_names_spec='$libname.dll.a'
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
+ shlibpath_overrides_runpath=yes
+
+ case $host_os in
+ cygwin*)
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
+ ;;
+ mingw* | cegcc*)
+ # MinGW DLLs use traditional 'lib' prefix
+ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+ library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+ ;;
+ esac
+ dynamic_linker='Win32 ld.exe'
+ ;;
+
+ *,cl*)
+ # Native MSVC
+ libname_spec='$name'
+ soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
+ library_names_spec='$libname.dll.lib'
+
+ case $build_os in
+ mingw*)
+ sys_lib_search_path_spec=
+ lt_save_ifs=$IFS
+ IFS=';'
+ for lt_path in $LIB
+ do
+ IFS=$lt_save_ifs
+ # Let DOS variable expansion print the short 8.3 style file name.
+ lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+ sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+ done
+ IFS=$lt_save_ifs
+ # Convert to MSYS style.
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+ ;;
+ cygwin*)
+ # Convert to unix form, then to dos form, then back to unix form
+ # but this time dos style (no spaces!) so that the unix form looks
+ # like /cygdrive/c/PROGRA~1:/cygdr...
+ sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+ sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ ;;
+ *)
+ sys_lib_search_path_spec=$LIB
+ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+ # It is most probably a Windows format PATH.
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+ else
+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+ fi
+ # FIXME: find the short name or the path components, as spaces are
+ # common. (e.g. "Program Files" -> "PROGRA~1")
+ ;;
+ esac
+
+ # DLL is installed to $(libdir)/../bin by postinstall_cmds
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
+ shlibpath_overrides_runpath=yes
+ dynamic_linker='Win32 link.exe'
+ ;;
+
+ *)
+ # Assume MSVC wrapper
+ library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
+ dynamic_linker='Win32 ld.exe'
+ ;;
+ esac
+ # FIXME: first we should search . and the directory the executable is in
+ shlibpath_var=PATH
+ ;;
+
+darwin* | rhapsody*)
+ dynamic_linker="$host_os dyld"
+ version_type=darwin
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$major$shared_ext'
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+ ;;
+
+dgux*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+ if test -x /usr/bin/objformat; then
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+ freebsd[23].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ need_version=no
+ need_lib_prefix=no
+ ;;
+ freebsd-*)
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+ need_version=yes
+ ;;
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+ freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+ freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+ *) # from 4.6 on, and DragonFly
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+ esac
+ ;;
+
+haiku*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ dynamic_linker="$host_os runtime_loader"
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ shlibpath_var=LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+ hardcode_into_libs=yes
+ ;;
+
+hpux9* | hpux10* | hpux11*)
+ # Give a soname corresponding to the major version so that dld.sl refuses to
+ # link against other versions.
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+ case $host_cpu in
+ ia64*)
+ shrext_cmds='.so'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.so"
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ if test 32 = "$HPUX_IA64_MODE"; then
+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ else
+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ fi
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ hppa*64*)
+ shrext_cmds='.sl'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ *)
+ shrext_cmds='.sl'
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=SHLIB_PATH
+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ ;;
+ esac
+ # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+ postinstall_cmds='chmod 555 $lib'
+ # or fails outright, so override atomically:
+ install_override_mode=555
+ ;;
+
+interix[3-9]*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
+irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+ *)
+ if test yes = "$lt_cv_prog_gnu_ld"; then
+ version_type=linux # correct to gnu/linux during the next big refactor
+ else
+ version_type=irix
+ fi ;;
+ esac
+ need_lib_prefix=no
+ need_version=no
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
+ case $host_os in
+ irix5* | nonstopux*)
+ libsuff= shlibsuff=
+ ;;
+ *)
+ case $LD in # libtool.m4 will add one of these switches to LD
+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+ libsuff= shlibsuff= libmagic=32-bit;;
+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+ libsuff=32 shlibsuff=N32 libmagic=N32;;
+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+ libsuff=64 shlibsuff=64 libmagic=64-bit;;
+ *) libsuff= shlibsuff= libmagic=never-match;;
+ esac
+ ;;
+ esac
+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+ shlibpath_overrides_runpath=no
+ sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+ sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
+ hardcode_into_libs=yes
+ ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+ dynamic_linker=no
+ ;;
+
+linux*android*)
+ version_type=none # Android doesn't support versioned libraries.
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext'
+ soname_spec='$libname$release$shared_ext'
+ finish_cmds=
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+ dynamic_linker='Android linker'
+ # Don't embed -rpath directories since the linker doesn't support them.
+ hardcode_libdir_flag_spec='-L$libdir'
+ ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+
+ # Some binutils ld are patched to set DT_RUNPATH
+ if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_shlibpath_overrides_runpath=no
+ save_LDFLAGS=$LDFLAGS
+ save_libdir=$libdir
+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+ lt_cv_shlibpath_overrides_runpath=yes
+fi
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS=$save_LDFLAGS
+ libdir=$save_libdir
+
+fi
+
+ shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+ # powerpc, because MkLinux only supported shared libraries with the
+ # GNU dynamic linker. Since this was broken with cross compilers,
+ # most powerpc-linux boxes support dynamic linking these days and
+ # people can always --disable-shared, the test was removed, and we
+ # assume the GNU/Linux dynamic linker is in use.
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
+netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
+ else
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ dynamic_linker='NetBSD ld.elf_so'
+ fi
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+
+newsos6)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ ;;
+
+*nto* | *qnx*)
+ version_type=qnx
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='ldqnx.so'
+ ;;
+
+openbsd* | bitrig*)
+ version_type=sunos
+ sys_lib_dlsearch_path_spec=/usr/lib
+ need_lib_prefix=no
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ need_version=no
+ else
+ need_version=yes
+ fi
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ ;;
+
+os2*)
+ libname_spec='$name'
+ version_type=windows
+ shrext_cmds=.dll
+ need_version=no
+ need_lib_prefix=no
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
+ dynamic_linker='OS/2 ld.exe'
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
+ ;;
+
+osf3* | osf4* | osf5*)
+ version_type=osf
+ need_lib_prefix=no
+ need_version=no
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ shlibpath_var=LD_LIBRARY_PATH
+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+
+rdos*)
+ dynamic_linker=no
+ ;;
+
+solaris*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ # ldd complains unless libraries are executable
+ postinstall_cmds='chmod +x $lib'
+ ;;
+
+sunos4*)
+ version_type=sunos
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ if test yes = "$with_gnu_ld"; then
+ need_lib_prefix=no
+ fi
+ need_version=yes
+ ;;
+
+sysv4 | sysv4.3*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_vendor in
+ sni)
+ shlibpath_overrides_runpath=no
+ need_lib_prefix=no
+ runpath_var=LD_RUN_PATH
+ ;;
+ siemens)
+ need_lib_prefix=no
+ ;;
+ motorola)
+ need_lib_prefix=no
+ need_version=no
+ shlibpath_overrides_runpath=no
+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+ ;;
+ esac
+ ;;
+
+sysv4*MP*)
+ if test -d /usr/nec; then
+ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+ soname_spec='$libname$shared_ext.$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ fi
+ ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ version_type=sco
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ if test yes = "$with_gnu_ld"; then
+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+ else
+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+ case $host_os in
+ sco3.2v5*)
+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+ ;;
+ esac
+ fi
+ sys_lib_dlsearch_path_spec='/usr/lib'
+ ;;
+
+tpf*)
+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
+ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
+
+uts4*)
+ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+*)
+ dynamic_linker=no
+ ;;
+esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
+test no = "$dynamic_linker" && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test yes = "$GCC"; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
+fi
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" ||
+ test -n "$runpath_var" ||
+ test yes = "$hardcode_automatic"; then
+
+ # We can hardcode non-existent directories.
+ if test no != "$hardcode_direct" &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
+ # have to relink, otherwise we might link with an installed library
+ # when we should be linking with a yet-to-be-installed one
+ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
+ test no != "$hardcode_minus_L"; then
+ # Linking always hardcodes the temporary library directory.
+ hardcode_action=relink
+ else
+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
+ hardcode_action=immediate
+ fi
+else
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ hardcode_action=unsupported
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
+
+if test relink = "$hardcode_action" ||
+ test yes = "$inherit_rpath"; then
+ # Fast installation is not supported
+ enable_fast_install=no
+elif test yes = "$shlibpath_overrides_runpath" ||
+ test no = "$enable_shared"; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
+fi
+
+
+
+
+
+
+ if test yes != "$enable_dlopen"; then
+ enable_dlopen=unknown
+ enable_dlopen_self=unknown
+ enable_dlopen_self_static=unknown
+else
+ lt_cv_dlopen=no
+ lt_cv_dlopen_libs=
+
+ case $host_os in
+ beos*)
+ lt_cv_dlopen=load_add_on
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=yes
+ ;;
+
+ mingw* | pw32* | cegcc*)
+ lt_cv_dlopen=LoadLibrary
+ lt_cv_dlopen_libs=
+ ;;
+
+ cygwin*)
+ lt_cv_dlopen=dlopen
+ lt_cv_dlopen_libs=
+ ;;
+
+ darwin*)
+ # if libdl is installed we need to link against it
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dl_dlopen=yes
+else
+ ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
+else
+
+ lt_cv_dlopen=dyld
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=yes
+
+fi
+
+ ;;
+
+ tpf*)
+ # Don't try to run any link tests for TPF. We know it's impossible
+ # because TPF is a cross-compiler, and we know how we open DSOs.
+ lt_cv_dlopen=dlopen
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=no
+ ;;
+
+ *)
+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = xyes; then :
+ lt_cv_dlopen=shl_load
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if ${ac_cv_lib_dld_shl_load+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char shl_load ();
+int
+main ()
+{
+return shl_load ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dld_shl_load=yes
+else
+ ac_cv_lib_dld_shl_load=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
+ lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
+else
+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = xyes; then :
+ lt_cv_dlopen=dlopen
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+ ;
+ return 0;
+}
_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then :
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dl_dlopen=yes
+else
+ ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+if ${ac_cv_lib_svld_dlopen+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsvld $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_svld_dlopen=yes
+else
+ ac_cv_lib_svld_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
+ lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
+if ${ac_cv_lib_dld_dld_link+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldld $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dld_link ();
+int
+main ()
+{
+return dld_link ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dld_dld_link=yes
+else
+ ac_cv_lib_dld_dld_link=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
+ lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+
+fi
+
+ ;;
+ esac
+
+ if test no = "$lt_cv_dlopen"; then
+ enable_dlopen=no
+ else
+ enable_dlopen=yes
+ fi
+
+ case $lt_cv_dlopen in
+ dlopen)
+ save_CPPFLAGS=$CPPFLAGS
+ test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+ save_LDFLAGS=$LDFLAGS
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+ save_LIBS=$LIBS
+ LIBS="$lt_cv_dlopen_libs $LIBS"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test yes = "$cross_compiling"; then :
+ lt_cv_dlopen_self=cross
+else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+# define LT_DLGLOBAL RTLD_GLOBAL
+#else
+# ifdef DL_GLOBAL
+# define LT_DLGLOBAL DL_GLOBAL
+# else
+# define LT_DLGLOBAL 0
+# endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+ find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+# ifdef RTLD_LAZY
+# define LT_DLLAZY_OR_NOW RTLD_LAZY
+# else
+# ifdef DL_LAZY
+# define LT_DLLAZY_OR_NOW DL_LAZY
+# else
+# ifdef RTLD_NOW
+# define LT_DLLAZY_OR_NOW RTLD_NOW
+# else
+# ifdef DL_NOW
+# define LT_DLLAZY_OR_NOW DL_NOW
+# else
+# define LT_DLLAZY_OR_NOW 0
+# endif
+# endif
+# endif
+# endif
+#endif
+
+/* When -fvisibility=hidden is used, assume the code has been annotated
+ correspondingly for the symbols needed. */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+ int status = $lt_dlunknown;
+
+ if (self)
+ {
+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+ else
+ {
+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else puts (dlerror ());
+ }
+ /* dlclose (self); */
+ }
+ else
+ puts (dlerror ());
+
+ return status;
+}
+_LT_EOF
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
+ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+ x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+ x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
+ esac
+ else :
+ # compilation failed
+ lt_cv_dlopen_self=no
+ fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
+
+ if test yes = "$lt_cv_dlopen_self"; then
+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self_static+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test yes = "$cross_compiling"; then :
+ lt_cv_dlopen_self_static=cross
+else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+# define LT_DLGLOBAL RTLD_GLOBAL
+#else
+# ifdef DL_GLOBAL
+# define LT_DLGLOBAL DL_GLOBAL
+# else
+# define LT_DLGLOBAL 0
+# endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+ find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+# ifdef RTLD_LAZY
+# define LT_DLLAZY_OR_NOW RTLD_LAZY
+# else
+# ifdef DL_LAZY
+# define LT_DLLAZY_OR_NOW DL_LAZY
+# else
+# ifdef RTLD_NOW
+# define LT_DLLAZY_OR_NOW RTLD_NOW
+# else
+# ifdef DL_NOW
+# define LT_DLLAZY_OR_NOW DL_NOW
+# else
+# define LT_DLLAZY_OR_NOW 0
+# endif
+# endif
+# endif
+# endif
+#endif
+
+/* When -fvisibility=hidden is used, assume the code has been annotated
+ correspondingly for the symbols needed. */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+ int status = $lt_dlunknown;
+
+ if (self)
+ {
+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+ else
+ {
+ if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ else puts (dlerror ());
+ }
+ /* dlclose (self); */
+ }
+ else
+ puts (dlerror ());
+
+ return status;
+}
+_LT_EOF
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
+ (./conftest; exit; ) >&5 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+ x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+ x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
+ esac
+ else :
+ # compilation failed
+ lt_cv_dlopen_self_static=no
+ fi
+fi
+rm -fr conftest*
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
+ fi
+
+ CPPFLAGS=$save_CPPFLAGS
+ LDFLAGS=$save_LDFLAGS
+ LIBS=$save_LIBS
+ ;;
+ esac
+
+ case $lt_cv_dlopen_self in
+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+ *) enable_dlopen_self=unknown ;;
+ esac
+
+ case $lt_cv_dlopen_self_static in
+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+ *) enable_dlopen_self_static=unknown ;;
+ esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+striplib=
+old_striplib=
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+ darwin*)
+ if test -n "$STRIP"; then
+ striplib="$STRIP -x"
+ old_striplib="$STRIP -S"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+ ;;
+ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ ;;
+ esac
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+ # Report what library types will actually be built
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
+ test no = "$can_build_shared" && enable_shared=no
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case $host_os in
+ aix3*)
+ test yes = "$enable_shared" && enable_static=no
+ if test -n "$RANLIB"; then
+ archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+
+ aix[4-9]*)
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
+ fi
+ ;;
+ esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
+ # Make sure either enable_shared or enable_static is yes.
+ test yes = "$enable_shared" || enable_static=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
+
+
+
+
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+CC=$lt_save_CC
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ac_config_commands="$ac_config_commands libtool"
+
+
+
+
+# Only expand once:
+
+
+
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
+$as_echo_n "checking size of void *... " >&6; }
+if ${ac_cv_sizeof_void_p+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then :
else
- ac_cv_header_stdc=no
+ if test "$ac_cv_type_void_p" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (void *)
+See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_void_p=0
+ fi
fi
-rm -f conftest*
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
+$as_echo "$ac_cv_sizeof_void_p" >&6; }
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then :
- :
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
- (('a' <= (c) && (c) <= 'i') \
- || ('j' <= (c) && (c) <= 'r') \
- || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
- return 2;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-else
- ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
+_ACEOF
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-fi
+case $host:$ac_cv_sizeof_void_p in #(
+ *-*-mingw*:4) :
+ kpse_dll_name=texluajit ;; #(
+ *-*-mingw*:8) :
+ kpse_dll_name=texluajit ;; #(
+ *-*-cygwin:4) :
+ kpse_dll_name= ;; #(
+ *-*-cygwin:8) :
+ kpse_dll_name= ;; #(
+ *) :
+ kpse_dll_name= ;;
+esac
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
-do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-fi
-done
# The cast to long int works around a bug in the HP C Compiler
@@ -6054,7 +14047,7 @@ LUAJIT_TREE=LuaJIT-2.0.3
ac_config_headers="$ac_config_headers config.h"
-ac_config_files="$ac_config_files Makefile include/Makefile"
+ac_config_files="$ac_config_files Makefile include/Makefile texluajit.pc"
@@ -6802,6 +14795,290 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
#
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in AS \
+DLLTOOL \
+OBJDUMP \
+SHELL \
+ECHO \
+PATH_SEPARATOR \
+SED \
+GREP \
+EGREP \
+FGREP \
+LD \
+NM \
+LN_S \
+lt_SP2NL \
+lt_NL2SP \
+reload_flag \
+deplibs_check_method \
+file_magic_cmd \
+file_magic_glob \
+want_nocaseglob \
+sharedlib_from_linklib_cmd \
+AR \
+AR_FLAGS \
+archiver_list_spec \
+STRIP \
+RANLIB \
+CC \
+CFLAGS \
+compiler \
+lt_cv_sys_global_symbol_pipe \
+lt_cv_sys_global_symbol_to_cdecl \
+lt_cv_sys_global_symbol_to_import \
+lt_cv_sys_global_symbol_to_c_name_address \
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
+lt_cv_nm_interface \
+nm_file_list_spec \
+lt_cv_truncate_bin \
+lt_prog_compiler_no_builtin_flag \
+lt_prog_compiler_pic \
+lt_prog_compiler_wl \
+lt_prog_compiler_static \
+lt_cv_prog_compiler_c_o \
+need_locks \
+MANIFEST_TOOL \
+DSYMUTIL \
+NMEDIT \
+LIPO \
+OTOOL \
+OTOOL64 \
+shrext_cmds \
+export_dynamic_flag_spec \
+whole_archive_flag_spec \
+compiler_needs_object \
+with_gnu_ld \
+allow_undefined_flag \
+no_undefined_flag \
+hardcode_libdir_flag_spec \
+hardcode_libdir_separator \
+exclude_expsyms \
+include_expsyms \
+file_list_spec \
+variables_saved_for_relink \
+libname_spec \
+library_names_spec \
+soname_spec \
+install_override_mode \
+finish_eval \
+old_striplib \
+striplib; do
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+ *[\\\\\\\`\\"\\\$]*)
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+ ;;
+ esac
+done
+
+# Double-quote double-evaled strings.
+for var in reload_cmds \
+old_postinstall_cmds \
+old_postuninstall_cmds \
+old_archive_cmds \
+extract_expsyms_cmds \
+old_archive_from_new_cmds \
+old_archive_from_expsyms_cmds \
+archive_cmds \
+archive_expsym_cmds \
+module_cmds \
+module_expsym_cmds \
+export_symbols_cmds \
+prelink_cmds \
+postlink_cmds \
+postinstall_cmds \
+postuninstall_cmds \
+finish_cmds \
+sys_lib_search_path_spec \
+sys_lib_dlsearch_path_spec; do
+ case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+ *[\\\\\\\`\\"\\\$]*)
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+ ;;
+ esac
+done
+
+ac_aux_dir='$ac_aux_dir'
+
+# See if we are running on zsh, and set the options that allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}"; then
+ setopt NO_GLOB_SUBST
+fi
+
+
+ PACKAGE='$PACKAGE'
+ VERSION='$VERSION'
+ RM='$RM'
+ ofile='$ofile'
+
+kpse_dll_name='$kpse_dll_name'
+
+
+
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -6811,9 +15088,11 @@ for ac_config_target in $ac_config_targets
do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+ "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
+ "texluajit.pc") CONFIG_FILES="$CONFIG_FILES texluajit.pc" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
@@ -7501,6 +15780,497 @@ $as_echo X"$file" |
done
done
}
+ ;;
+ "libtool":C)
+
+ # See if we are running on zsh, and set the options that allow our
+ # commands through without removal of \ escapes.
+ if test -n "${ZSH_VERSION+set}"; then
+ setopt NO_GLOB_SUBST
+ fi
+
+ cfgfile=${ofile}T
+ trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+ $RM "$cfgfile"
+
+ cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+# Generated automatically by $as_me ($PACKAGE) $VERSION
+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+# Copyright (C) 2014 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.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the same
+# distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+# The names of the tagged configurations supported by this script.
+available_tags=''
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Which release of libtool.m4 was used?
+macro_version=$macro_version
+macro_revision=$macro_revision
+
+# Assembler program.
+AS=$lt_AS
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Object dumper program.
+OBJDUMP=$lt_OBJDUMP
+
+# Whether or not to build shared libraries.
+build_libtool_libs=$enable_shared
+
+# Whether or not to build static libraries.
+build_old_libs=$enable_static
+
+# What type of objects to build.
+pic_mode=$pic_mode
+
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
+# The host system.
+host_alias=$host_alias
+host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
+
+# A sed program that does not truncate output.
+SED=$lt_SED
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="\$SED -e 1s/^X//"
+
+# A grep program that handles long lines.
+GREP=$lt_GREP
+
+# An ERE matcher.
+EGREP=$lt_EGREP
+
+# A literal string matcher.
+FGREP=$lt_FGREP
+
+# A BSD- or MS-compatible name lister.
+NM=$lt_NM
+
+# Whether we need soft or hard links.
+LN_S=$lt_LN_S
+
+# What is the maximum length of a command?
+max_cmd_len=$max_cmd_len
+
+# Object file suffix (normally "o").
+objext=$ac_objext
+
+# Executable file suffix (normally "").
+exeext=$exeext
+
+# whether the shell understands "unset".
+lt_unset=$lt_unset
+
+# turn spaces into newlines.
+SP2NL=$lt_lt_SP2NL
+
+# turn newlines into spaces.
+NL2SP=$lt_lt_NL2SP
+
+# convert \$build file names to \$host format.
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+
+# convert \$build files to toolchain format.
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method=$lt_deplibs_check_method
+
+# Command to use when deplibs_check_method = "file_magic".
+file_magic_cmd=$lt_file_magic_cmd
+
+# How to find potential files when deplibs_check_method = "file_magic".
+file_magic_glob=$lt_file_magic_glob
+
+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
+want_nocaseglob=$lt_want_nocaseglob
+
+# Command to associate shared and link libraries.
+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
+
+# The archiver.
+AR=$lt_AR
+
+# Flags to create an archive.
+AR_FLAGS=$lt_AR_FLAGS
+
+# How to feed a file listing to the archiver.
+archiver_list_spec=$lt_archiver_list_spec
+
+# A symbol stripping program.
+STRIP=$lt_STRIP
+
+# Commands used to install an old-style archive.
+RANLIB=$lt_RANLIB
+old_postinstall_cmds=$lt_old_postinstall_cmds
+old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
+# A C compiler.
+LTCC=$lt_CC
+
+# LTCC compiler flags.
+LTCFLAGS=$lt_CFLAGS
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+
+# Transform the output of nm in a proper C declaration.
+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+
+# Transform the output of nm into a list of symbols to manually relocate.
+global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
+
+# Transform the output of nm in a C name address pair.
+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+
+# Transform the output of nm in a C name address pair when lib prefix is needed.
+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+
+# The name lister interface.
+nm_interface=$lt_lt_cv_nm_interface
+
+# Specify filename containing input files for \$NM.
+nm_file_list_spec=$lt_nm_file_list_spec
+
+# The root where to search for dependent libraries,and where our libraries should be installed.
+lt_sysroot=$lt_sysroot
+
+# Command to truncate a binary pipe.
+lt_truncate_bin=$lt_lt_cv_truncate_bin
+
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
+
+# Used to examine libraries when file_magic_cmd begins with "file".
+MAGIC_CMD=$MAGIC_CMD
+
+# Must we lock files when doing compilation?
+need_locks=$lt_need_locks
+
+# Manifest tool.
+MANIFEST_TOOL=$lt_MANIFEST_TOOL
+
+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
+DSYMUTIL=$lt_DSYMUTIL
+
+# Tool to change global to local symbols on Mac OS X.
+NMEDIT=$lt_NMEDIT
+
+# Tool to manipulate fat objects and archives on Mac OS X.
+LIPO=$lt_LIPO
+
+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
+OTOOL=$lt_OTOOL
+
+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
+OTOOL64=$lt_OTOOL64
+
+# Old archive suffix (normally "a").
+libext=$libext
+
+# Shared library suffix (normally ".so").
+shrext_cmds=$lt_shrext_cmds
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=$lt_extract_expsyms_cmds
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at link time.
+variables_saved_for_relink=$lt_variables_saved_for_relink
+
+# Do we need the "lib" prefix for modules?
+need_lib_prefix=$need_lib_prefix
+
+# Do we need a version for libraries?
+need_version=$need_version
+
+# Library versioning type.
+version_type=$version_type
+
+# Shared library runtime path variable.
+runpath_var=$runpath_var
+
+# Shared library path variable.
+shlibpath_var=$shlibpath_var
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+
+# Format of library name prefix.
+libname_spec=$lt_libname_spec
+
+# List of archive names. First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME
+library_names_spec=$lt_library_names_spec
+
+# The coded name of the library, if different from the real name.
+soname_spec=$lt_soname_spec
+
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
+# Command to use after installation of a shared archive.
+postinstall_cmds=$lt_postinstall_cmds
+
+# Command to use after uninstallation of a shared archive.
+postuninstall_cmds=$lt_postuninstall_cmds
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds=$lt_finish_cmds
+
+# As "finish_cmds", except a single script fragment to be evaled but
+# not shown.
+finish_eval=$lt_finish_eval
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=$hardcode_into_libs
+
+# Compile-time system search path for libraries.
+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+
+# Run-time system search path for libraries.
+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+# Whether dlopen is supported.
+dlopen_support=$enable_dlopen
+
+# Whether dlopen of programs is supported.
+dlopen_self=$enable_dlopen_self
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=$enable_dlopen_self_static
+
+# Commands to strip libraries.
+old_striplib=$lt_old_striplib
+striplib=$lt_striplib
+
+
+# The linker used to build libraries.
+LD=$lt_LD
+
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
+# Commands used to build an old-style archive.
+old_archive_cmds=$lt_old_archive_cmds
+
+# A language specific compiler.
+CC=$lt_compiler
+
+# Is the compiler the GNU compiler?
+with_gcc=$GCC
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+
+# Additional compiler flags for building library objects.
+pic_flag=$lt_lt_prog_compiler_pic
+
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag=$lt_lt_prog_compiler_static
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=$archive_cmds_need_lc
+
+# Whether or not to disallow shared libs when runtime libs are static.
+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+
+# Whether the compiler copes with passing no objects directly.
+compiler_needs_object=$lt_compiler_needs_object
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
+
+# Commands used to build a shared archive.
+archive_cmds=$lt_archive_cmds
+archive_expsym_cmds=$lt_archive_expsym_cmds
+
+# Commands used to build a loadable module if different from building
+# a shared archive.
+module_cmds=$lt_module_cmds
+module_expsym_cmds=$lt_module_expsym_cmds
+
+# Whether we are building with GNU ld or not.
+with_gnu_ld=$lt_with_gnu_ld
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=$lt_allow_undefined_flag
+
+# Flag that enforces no undefined symbols.
+no_undefined_flag=$lt_no_undefined_flag
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist
+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+# Whether we need a single "-rpath" flag with a separated argument.
+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary.
+hardcode_direct=$hardcode_direct
+
+# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
+# DIR into the resulting binary and the resulting library dependency is
+# "absolute",i.e impossible to change by setting \$shlibpath_var if the
+# library is relocated.
+hardcode_direct_absolute=$hardcode_direct_absolute
+
+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+# into the resulting binary.
+hardcode_minus_L=$hardcode_minus_L
+
+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+# into the resulting binary.
+hardcode_shlibpath_var=$hardcode_shlibpath_var
+
+# Set to "yes" if building a shared library automatically hardcodes DIR
+# into the library and all subsequent libraries and executables linked
+# against it.
+hardcode_automatic=$hardcode_automatic
+
+# Set to yes if linker adds runtime paths of dependent libraries
+# to runtime path list.
+inherit_rpath=$inherit_rpath
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=$link_all_deplibs
+
+# Set to "yes" if exported symbols are required.
+always_export_symbols=$always_export_symbols
+
+# The commands to list exported symbols.
+export_symbols_cmds=$lt_export_symbols_cmds
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=$lt_exclude_expsyms
+
+# Symbols that must always be exported.
+include_expsyms=$lt_include_expsyms
+
+# Commands necessary for linking programs (against libraries) with templates.
+prelink_cmds=$lt_prelink_cmds
+
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds
+
+# Specify filename containing input files.
+file_list_spec=$lt_file_list_spec
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=$hardcode_action
+
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+ case $host_os in
+ aix3*)
+ cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program. For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test set != "${COLLECT_NAMES+set}"; then
+ COLLECT_NAMES=
+ export COLLECT_NAMES
+fi
+_LT_EOF
+ ;;
+ esac
+
+
+ltmain=$ac_aux_dir/ltmain.sh
+
+
+ # We use sed instead of cat because bash on DJGPP gets confused if
+ # if finds mixed CR/LF and LF-only lines. Since sed operates in
+ # text mode, it properly converts lines to CR/LF. This bash problem
+ # is reportedly fixed, but why not run on old versions too?
+ sed '$q' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
+
+ mv -f "$cfgfile" "$ofile" ||
+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+ chmod +x "$ofile"
+
+## KPSE_DLL_NAME: Specify the DLL name
+if test "x$kpse_dll_name" != x; then
+ $SED '/^soname_spec=/a\
+## KPSE_DLL_NAME: Specify the DLL name\
+soname_spec='$kpse_dll_name'.dll\
+' "$ofile" >"$cfgfile"
+ mv "$cfgfile" "$ofile" ||
+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+ chmod +x "$ofile"
+fi
;;
esac
diff --git a/source/libs/luajit/configure.ac b/source/libs/luajit/configure.ac
index 8a16e71038fa19f4a0ab134cfe8063cdf7fee85c..230570809650f84e5917169e7ec5c121a0e29a33 100644
--- a/source/libs/luajit/configure.ac
+++ b/source/libs/luajit/configure.ac
@@ -22,6 +22,13 @@ AM_PROG_AS
AC_PROG_RANLIB
AC_PROG_LN_S
+AC_SUBST([LUAJITVERSION], [luajit_version])
+KPSE_LT_VERSION([luajit])
+
+LT_INIT([win32-dll])
+
+KPSE_DLL_NAME([texluajit], [texluajit])
+
AC_CHECK_SIZEOF([void *])
ac_configure_args="$ac_configure_args HOST_PTR_SIZE='$ac_cv_sizeof_void_p'"
@@ -63,7 +70,7 @@ AC_SUBST([LUAJIT_TREE], [LuaJIT-]luajit_version)
dnl Not used but avoids putting a zillion useless -D's on the command line.
AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([Makefile include/Makefile])
+AC_CONFIG_FILES([Makefile include/Makefile texluajit.pc])
dnl Pass DASM_ARCH to the subdirectory native,
dnl which must be configured for the build system.
diff --git a/source/libs/luajit/include/Makefile.in b/source/libs/luajit/include/Makefile.in
index 64be6080fdd9bd44b29f5b3dd4b12bedaecd4f73..fffe6cdb910a3214f1c623f979c1d26dbb7bc44b 100644
--- a/source/libs/luajit/include/Makefile.in
+++ b/source/libs/luajit/include/Makefile.in
@@ -83,10 +83,17 @@ subdir = include
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/lj-system.m4 \
$(top_srcdir)/../../m4/kpse-common.m4 \
+ $(top_srcdir)/../../m4/kpse-dll-name.m4 \
$(top_srcdir)/../../m4/kpse-largefile.m4 \
+ $(top_srcdir)/../../m4/kpse-lib-version.m4 \
$(top_srcdir)/../../m4/kpse-luajit-flags.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
- $(top_srcdir)/version.ac $(top_srcdir)/configure.ac
+ $(top_srcdir)/../../m4/libtool.m4 \
+ $(top_srcdir)/../../m4/ltoptions.m4 \
+ $(top_srcdir)/../../m4/ltsugar.m4 \
+ $(top_srcdir)/../../m4/ltversion.m4 \
+ $(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -117,6 +124,8 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -133,32 +142,47 @@ CYGPATH_W = @CYGPATH_W@
DASM_ARCH = @DASM_ARCH@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+FGREP = @FGREP@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LJARCH = @LJARCH@
LJHOST = @LJHOST@
LJVM_MODE = @LJVM_MODE@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
+LUAJITVERSION = @LUAJITVERSION@
LUAJIT_DEFINES = @LUAJIT_DEFINES@
LUAJIT_LDEXTRA = @LUAJIT_LDEXTRA@
+LUAJIT_LT_VERSINFO = @LUAJIT_LT_VERSINFO@
LUAJIT_TREE = @LUAJIT_TREE@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -168,6 +192,7 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@@ -177,7 +202,9 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -270,6 +297,12 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
tags TAGS:
ctags CTAGS:
@@ -343,7 +376,7 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
-rm -f Makefile
@@ -395,7 +428,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
-mostlyclean-am: mostlyclean-generic
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
pdf: pdf-am
@@ -410,15 +443,16 @@ uninstall-am:
.MAKE: install-am install-strip
.PHONY: all all-am all-local check check-am clean clean-generic \
- cscopelist-am ctags-am distclean distclean-generic \
- distclean-local distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
+ clean-libtool cscopelist-am ctags-am distclean \
+ distclean-generic distclean-libtool distclean-local distdir \
+ dvi dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
uninstall-am
all-local:
diff --git a/source/libs/luajit/luajiterr.test b/source/libs/luajit/luajiterr.test
index 25783449aeaab6d48e42dd39b4112151f4fe2015..957c7493088e0decba71ac23e2f198c62e116427 100644
--- a/source/libs/luajit/luajiterr.test
+++ b/source/libs/luajit/luajiterr.test
@@ -5,7 +5,8 @@
./luajittry -e "error('test')" 2>jiterr.tmp && exit 1
-sed -e '/\[C]: at 0x/d' jiterr.tmp >jiterr.out
+sed -e 's/lt-luajittry/luajittry/;s,^.*/luajittry,./luajittry,' \
+ -e '/\[C]: at 0x/d' jiterr.tmp >jiterr.out
diff $srcdir/jiterr.exp jiterr.out || exit 1
diff --git a/source/libs/luajit/texluajit.pc.in b/source/libs/luajit/texluajit.pc.in
new file mode 100644
index 0000000000000000000000000000000000000000..dd3fe4bbd0a3484fa1d12d3a1bd7e611fddbb98f
--- /dev/null
+++ b/source/libs/luajit/texluajit.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: LuaJIT for LuaJITTeX
+Description: LuaJIT, modified for use with LuaJITTeX
+Version: @LUAJITVERSION@
+Libs: -L${libdir} -ltexluajit
+Libs.private: @LIBS@
+Cflags: -I${includedir}/texluajit
+
diff --git a/source/libs/mpfr/ChangeLog b/source/libs/mpfr/ChangeLog
index c3896dc3f07e7a2ad921b61025071be8e2983b54..374b495ca1cd8969074cdd195341dc945bcd74cc 100644
--- a/source/libs/mpfr/ChangeLog
+++ b/source/libs/mpfr/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-03 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Added KPSE_COMPILER_VISIBILITY.
+ * Makefile.am [AM_CFLAGS]: Added $(VISIBILITY_CFLAGS).
+
2014-09-19 Taco Hoekwater <taco@elvenkind.com>
* Makefile.am [Darwin]: Need to compile src/abort_prec_max.c.
diff --git a/source/libs/mpfr/Makefile.am b/source/libs/mpfr/Makefile.am
index 0889e5e47c5b774ded17da2d49b3d6d4a419e041..61ebba8c38679ad4b19d5f26e895f0ff6c077ce9 100644
--- a/source/libs/mpfr/Makefile.am
+++ b/source/libs/mpfr/Makefile.am
@@ -22,7 +22,7 @@ dist-hook:
SUBDIRS = . include
AM_CPPFLAGS = -I$(srcdir)/$(MPFR_TREE)/src $(GMP_INCLUDES)
-AM_CFLAGS = # $(WARNING_CFLAGS)
+AM_CFLAGS = $(VISIBILITY_CFLAGS) # $(WARNING_CFLAGS)
noinst_LIBRARIES = libmpfr.a
$(libmpfr_a_OBJECTS): $(GMP_DEPEND)
diff --git a/source/libs/mpfr/Makefile.in b/source/libs/mpfr/Makefile.in
index 9b796bd2738cc57736c6235d4e3f040b939806d5..283171838613b3956d4719eb7538d50dd45bc25e 100644
--- a/source/libs/mpfr/Makefile.in
+++ b/source/libs/mpfr/Makefile.in
@@ -106,6 +106,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/mpfr-check-printf-spec.m4 \
$(top_srcdir)/../../m4/kpse-gmp-flags.m4 \
$(top_srcdir)/../../m4/kpse-search-libs.m4 \
$(top_srcdir)/../../m4/kpse-size-max.m4 \
+ $(top_srcdir)/../../m4/kpse-visibility.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -588,6 +589,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -642,7 +644,7 @@ top_srcdir = @top_srcdir@
EXTRA_DIST = $(MPFR_TREE) $(MPFR_TREE)-PATCHES
SUBDIRS = . include
AM_CPPFLAGS = -I$(srcdir)/$(MPFR_TREE)/src $(GMP_INCLUDES)
-AM_CFLAGS = # $(WARNING_CFLAGS)
+AM_CFLAGS = $(VISIBILITY_CFLAGS) # $(WARNING_CFLAGS)
noinst_LIBRARIES = libmpfr.a
nodist_libmpfr_a_SOURCES = \
@MPFR_TREE@/src/abort_prec_max.c \
diff --git a/source/libs/mpfr/aclocal.m4 b/source/libs/mpfr/aclocal.m4
index 7684b85b907d6f9099fd564c78c13bae5ad2e463..be6474dfaa9884e4461f7c0fe160abe58de2d7c9 100644
--- a/source/libs/mpfr/aclocal.m4
+++ b/source/libs/mpfr/aclocal.m4
@@ -1190,4 +1190,5 @@ m4_include([../../m4/kpse-common.m4])
m4_include([../../m4/kpse-gmp-flags.m4])
m4_include([../../m4/kpse-search-libs.m4])
m4_include([../../m4/kpse-size-max.m4])
+m4_include([../../m4/kpse-visibility.m4])
m4_include([../../m4/kpse-warnings.m4])
diff --git a/source/libs/mpfr/configure b/source/libs/mpfr/configure
index 5b59952ec214faf05189aa55f9b936021dc8ce14..0733c3c2e36fffea559cfd36e6791ffe51111974 100755
--- a/source/libs/mpfr/configure
+++ b/source/libs/mpfr/configure
@@ -646,6 +646,7 @@ build_os
build_vendor
build_cpu
build
+VISIBILITY_CFLAGS
LN_S
RANLIB
WARNING_CFLAGS
@@ -4890,6 +4891,56 @@ $as_echo "no, using $LN_S" >&6; }
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for C to hide external symbols" >&5
+$as_echo_n "checking CFLAGS for C to hide external symbols... " >&6; }
+if ${kpse_cv_visibility_cflags+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+kpse_cv_visibility_cflags=unknown
+kpse_save_flags=$CFLAGS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
+ extern void foo(void);
+ void foo(void){printf("foo\n");}
+_ACEOF
+# FIXME: Add tests for non-GNU compilers
+for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do
+ CFLAGS="$kpse_save_flags -Werror $kpse_flag"
+ if ac_fn_c_try_compile "$LINENO"; then :
+ kpse_cv_visibility_cflags=$kpse_flag; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+done
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_visibility_cflags" >&5
+$as_echo "$kpse_cv_visibility_cflags" >&6; }
+CFLAGS=$kpse_save_flags
+case $kpse_cv_visibility_cflags in #(
+ unknown) :
+ ;; #(
+ *) :
+ VISIBILITY_CFLAGS=$kpse_cv_visibility_cflags
+ ;;
+esac
+
+
+
+
+
ac_config_headers="$ac_config_headers config.h"
diff --git a/source/libs/mpfr/configure.ac b/source/libs/mpfr/configure.ac
index 00e3bf4663dfde3007c765c8b557b9210c694ea0..00354de953d41c2d1b715a3770e161fc41a25aaf 100644
--- a/source/libs/mpfr/configure.ac
+++ b/source/libs/mpfr/configure.ac
@@ -20,6 +20,8 @@ AC_PROG_CC
AC_PROG_RANLIB
AC_PROG_LN_S
+KPSE_COMPILER_VISIBILITY
+
AC_CONFIG_HEADERS([config.h])
KPSE_CANONICAL_HOST
diff --git a/source/libs/mpfr/include/Makefile.in b/source/libs/mpfr/include/Makefile.in
index dbd5a068db28acde56c8b00b9eeb3694c92c266c..596e7fd3fb7958890da6b114e172a3fcfdd3b3b4 100644
--- a/source/libs/mpfr/include/Makefile.in
+++ b/source/libs/mpfr/include/Makefile.in
@@ -88,6 +88,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/mpfr-check-printf-spec.m4 \
$(top_srcdir)/../../m4/kpse-gmp-flags.m4 \
$(top_srcdir)/../../m4/kpse-search-libs.m4 \
$(top_srcdir)/../../m4/kpse-size-max.m4 \
+ $(top_srcdir)/../../m4/kpse-visibility.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -171,6 +172,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
diff --git a/source/libs/pixman/ChangeLog b/source/libs/pixman/ChangeLog
index 0125498b2caa05eeb6f318e6de1d341deb3d591a..eb2e493282c162092cebd889ea5ecf658f5429f0 100644
--- a/source/libs/pixman/ChangeLog
+++ b/source/libs/pixman/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-03 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Added KPSE_COMPILER_VISIBILITY.
+ * Makefile.am [AM_CFLAGS]: Added $(VISIBILITY_CFLAGS).
+
2014-07-07 Peter Breitenlohner <peb@mppmu.mpg.de>
Import pixman-0.32.6.
diff --git a/source/libs/pixman/Makefile.am b/source/libs/pixman/Makefile.am
index 84a1809852e0c94320def89bf50209e330109721..31b89f475501c889a5040e8e1abc6b1eb79963af 100644
--- a/source/libs/pixman/Makefile.am
+++ b/source/libs/pixman/Makefile.am
@@ -25,6 +25,7 @@ dist-hook:
SUBDIRS = . include
AM_CPPFLAGS = -I$(top_srcdir)/$(PIXMAN_SRC)
+AM_CFLAGS = $(VISIBILITY_CFLAGS) # $(WARNING_CFLAGS)
noinst_LIBRARIES = libpixman.a
diff --git a/source/libs/pixman/Makefile.in b/source/libs/pixman/Makefile.in
index 74672c015b4a237478034406a5a92967899dbd15..d93c4474a221281c6fac2c4856b4a76169a38ce8 100644
--- a/source/libs/pixman/Makefile.in
+++ b/source/libs/pixman/Makefile.in
@@ -98,6 +98,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-lib-version.m4 \
$(top_srcdir)/../../m4/kpse-size-max.m4 \
+ $(top_srcdir)/../../m4/kpse-visibility.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -528,6 +529,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@@ -575,6 +577,7 @@ EXTRA_DIST = $(PIXMAN_TREE) $(PIXMAN_TREE)-PATCHES
PIXMAN_SRC = $(PIXMAN_TREE)/pixman
SUBDIRS = . include
AM_CPPFLAGS = -I$(top_srcdir)/$(PIXMAN_SRC)
+AM_CFLAGS = $(VISIBILITY_CFLAGS) # $(WARNING_CFLAGS)
noinst_LIBRARIES = libpixman.a
libpixman_sources = \
@PIXMAN_TREE@/pixman/pixman.c \
diff --git a/source/libs/pixman/aclocal.m4 b/source/libs/pixman/aclocal.m4
index 68edc2b237b65693aa33f94f02e636a6b5c9ba33..0ebf296045d079c5633908263a0307f1b31cc0ef 100644
--- a/source/libs/pixman/aclocal.m4
+++ b/source/libs/pixman/aclocal.m4
@@ -1186,4 +1186,5 @@ AC_SUBST([am__untar])
m4_include([../../m4/kpse-common.m4])
m4_include([../../m4/kpse-lib-version.m4])
m4_include([../../m4/kpse-size-max.m4])
+m4_include([../../m4/kpse-visibility.m4])
m4_include([../../m4/kpse-warnings.m4])
diff --git a/source/libs/pixman/configure b/source/libs/pixman/configure
index 8679ff232ec23e30f3a781dcba84381839547d03..1f1784f974c5c7c9ddda74e8fc0e27f4dc0577f0 100755
--- a/source/libs/pixman/configure
+++ b/source/libs/pixman/configure
@@ -629,6 +629,7 @@ LIBOBJS
PIXMAN_TREE
build_FALSE
build_TRUE
+VISIBILITY_CFLAGS
EGREP
GREP
CPP
@@ -5584,6 +5585,56 @@ _ACEOF
esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for C to hide external symbols" >&5
+$as_echo_n "checking CFLAGS for C to hide external symbols... " >&6; }
+if ${kpse_cv_visibility_cflags+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+kpse_cv_visibility_cflags=unknown
+kpse_save_flags=$CFLAGS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
+ extern void foo(void);
+ void foo(void){printf("foo\n");}
+_ACEOF
+# FIXME: Add tests for non-GNU compilers
+for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do
+ CFLAGS="$kpse_save_flags -Werror $kpse_flag"
+ if ac_fn_c_try_compile "$LINENO"; then :
+ kpse_cv_visibility_cflags=$kpse_flag; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+done
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_visibility_cflags" >&5
+$as_echo "$kpse_cv_visibility_cflags" >&6; }
+CFLAGS=$kpse_save_flags
+case $kpse_cv_visibility_cflags in #(
+ unknown) :
+ ;; #(
+ *) :
+ VISIBILITY_CFLAGS=$kpse_cv_visibility_cflags
+ ;;
+esac
+
+
+
+
+
ac_config_headers="$ac_config_headers config.h"
diff --git a/source/libs/pixman/configure.ac b/source/libs/pixman/configure.ac
index 4f54aa8c4cc150e3604784c0074e974eb845fe6e..7291f5045304cafe6ee670a5ec763671f9e85d68 100644
--- a/source/libs/pixman/configure.ac
+++ b/source/libs/pixman/configure.ac
@@ -29,6 +29,8 @@ AC_CHECK_FUNCS([getisax])
AC_C_BIGENDIAN
AC_C_INLINE
+KPSE_COMPILER_VISIBILITY
+
AC_CONFIG_HEADERS([config.h])
AM_CONDITIONAL([build], [test "x$enable_build" != xno])
diff --git a/source/libs/pixman/include/Makefile.in b/source/libs/pixman/include/Makefile.in
index f96666920573513ab11b041c7d45ffadef448e11..034802af22821496ddb363c95f076bb55f7bf967 100644
--- a/source/libs/pixman/include/Makefile.in
+++ b/source/libs/pixman/include/Makefile.in
@@ -82,6 +82,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-lib-version.m4 \
$(top_srcdir)/../../m4/kpse-size-max.m4 \
+ $(top_srcdir)/../../m4/kpse-visibility.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -163,6 +164,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
diff --git a/source/libs/pixman/pixman-0.32.6-PATCHES/ChangeLog b/source/libs/pixman/pixman-0.32.6-PATCHES/ChangeLog
index b49f74809d25bba91a64eca586793ca1c0b28dd1..fa46f56477743f3c8fe185378278f032ca719bc1 100644
--- a/source/libs/pixman/pixman-0.32.6-PATCHES/ChangeLog
+++ b/source/libs/pixman/pixman-0.32.6-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-04 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-01-hide-symbols (new): Allow to hide all symbols.
+
2014-07-07 Peter Breitenlohner <peb@mppmu.mpg.de>
Import pixman-0.32.6.
diff --git a/source/libs/pixman/pixman-0.32.6-PATCHES/patch-01-hide-symbols b/source/libs/pixman/pixman-0.32.6-PATCHES/patch-01-hide-symbols
new file mode 100644
index 0000000000000000000000000000000000000000..dfcd5bf86ce24ccdf7d338ef23809e2c4349b428
--- /dev/null
+++ b/source/libs/pixman/pixman-0.32.6-PATCHES/patch-01-hide-symbols
@@ -0,0 +1,12 @@
+diff -ur pixman-0.32.6.orig/pixman/pixman-compiler.h pixman-0.32.6/pixman/pixman-compiler.h
+--- pixman-0.32.6.orig/pixman/pixman-compiler.h 2014-04-24 06:34:14.000000000 +0200
++++ pixman-0.32.6/pixman/pixman-compiler.h 2014-12-04 08:34:52.000000000 +0100
+@@ -91,7 +91,7 @@
+
+ /* GCC visibility */
+ #if defined(__GNUC__) && __GNUC__ >= 4 && !defined(_WIN32)
+-# define PIXMAN_EXPORT __attribute__ ((visibility("default")))
++# define PIXMAN_EXPORT
+ /* Sun Studio 8 visibility */
+ #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
+ # define PIXMAN_EXPORT __global
diff --git a/source/libs/pixman/pixman-0.32.6/pixman/pixman-compiler.h b/source/libs/pixman/pixman-0.32.6/pixman/pixman-compiler.h
index 2489adc38e0206a432d22df8ff2943e5c262247c..eb97acdbd0c3e2d9b913534ca54015972bce0db6 100644
--- a/source/libs/pixman/pixman-0.32.6/pixman/pixman-compiler.h
+++ b/source/libs/pixman/pixman-0.32.6/pixman/pixman-compiler.h
@@ -91,7 +91,7 @@
/* GCC visibility */
#if defined(__GNUC__) && __GNUC__ >= 4 && !defined(_WIN32)
-# define PIXMAN_EXPORT __attribute__ ((visibility("default")))
+# define PIXMAN_EXPORT
/* Sun Studio 8 visibility */
#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
# define PIXMAN_EXPORT __global
diff --git a/source/libs/poppler/ChangeLog b/source/libs/poppler/ChangeLog
index ebca79c302e0c22b6fbf11645ecb61f7a163fa81..3db0f80f441f60871e9e7824f6b1356cc077b0d7 100644
--- a/source/libs/poppler/ChangeLog
+++ b/source/libs/poppler/ChangeLog
@@ -1,3 +1,13 @@
+2014-12-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Import poppler-0.29.0.
+ * version.ac: Adjust.
+
+2014-12-03 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Added KPSE_COMPILER_VISIBILITY.
+ * Makefile.am [AM_C*FLAGS]: Added $(VISIBILITY_C*FLAGS).
+
2014-11-04 Peter Breitenlohner <peb@mppmu.mpg.de>
Import poppler-0.28.0.
diff --git a/source/libs/poppler/Makefile.am b/source/libs/poppler/Makefile.am
index 3ac0098709a9eb8331b99a298ccbb12220f5ed10..3951d2a00a715ae8b6cdbb18bfe53bf700ea8bb8 100644
--- a/source/libs/poppler/Makefile.am
+++ b/source/libs/poppler/Makefile.am
@@ -26,8 +26,8 @@ POPPLER_SRC = $(top_srcdir)/$(POPPLER_TREE)/poppler
AM_CPPFLAGS = -I$(top_srcdir)/$(POPPLER_TREE) -I$(GOO_SRC) $(ZLIB_INCLUDES)
AM_CPPFLAGS += -DPOPPLER_DATADIR='"."'
-AM_CFLAGS = $(WARNING_CFLAGS)
-AM_CXXFLAGS = $(NO_WARN_CXXFLAGS)
+AM_CFLAGS = $(VISIBILITY_CFLAGS) $(WARNING_CFLAGS)
+AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) $(NO_WARN_CXXFLAGS)
noinst_LIBRARIES = libpoppler.a
diff --git a/source/libs/poppler/Makefile.in b/source/libs/poppler/Makefile.in
index 5081680bcc8859d2ca259bb7deab753f192db68e..9f37ff095c593df16ee0b7a1d1385477d39c4793 100644
--- a/source/libs/poppler/Makefile.in
+++ b/source/libs/poppler/Makefile.in
@@ -80,7 +80,7 @@ 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.28.0/poppler/poppler-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 \
@@ -93,6 +93,7 @@ DIST_COMMON = $(srcdir)/../../am/reconfig.am \
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
+ $(top_srcdir)/../../m4/kpse-visibility.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/../../m4/kpse-win32.m4 \
$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
@@ -365,6 +366,8 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
ZLIB_DEPEND = @ZLIB_DEPEND@
@@ -420,8 +423,8 @@ FOFI_SRC = $(top_srcdir)/$(POPPLER_TREE)/fofi
POPPLER_SRC = $(top_srcdir)/$(POPPLER_TREE)/poppler
AM_CPPFLAGS = -I$(top_srcdir)/$(POPPLER_TREE) -I$(GOO_SRC) \
$(ZLIB_INCLUDES) -DPOPPLER_DATADIR='"."'
-AM_CFLAGS = $(WARNING_CFLAGS)
-AM_CXXFLAGS = $(NO_WARN_CXXFLAGS)
+AM_CFLAGS = $(VISIBILITY_CFLAGS) $(WARNING_CFLAGS)
+AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) $(NO_WARN_CXXFLAGS)
noinst_LIBRARIES = libpoppler.a
nodist_libpoppler_a_SOURCES = \
$(goo_libGoo_a_sources) \
@@ -578,7 +581,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.28.0/poppler/poppler-config.h.in $(top_builddir)/config.status
+stamp-h2: $(top_srcdir)/poppler-0.29.0/poppler/poppler-config.h.in $(top_builddir)/config.status
@rm -f stamp-h2
cd $(top_builddir) && $(SHELL) ./config.status poppler-config.h
diff --git a/source/libs/poppler/aclocal.m4 b/source/libs/poppler/aclocal.m4
index 5db0dd6531eb97356d731ddd367039bb95ad2f0c..4d694ecb52dd928218ab503a0eea6bf9d401c33d 100644
--- a/source/libs/poppler/aclocal.m4
+++ b/source/libs/poppler/aclocal.m4
@@ -1184,6 +1184,7 @@ AC_SUBST([am__untar])
]) # _AM_PROG_TAR
m4_include([../../m4/kpse-common.m4])
+m4_include([../../m4/kpse-visibility.m4])
m4_include([../../m4/kpse-warnings.m4])
m4_include([../../m4/kpse-win32.m4])
m4_include([../../m4/kpse-zlib-flags.m4])
diff --git a/source/libs/poppler/configure b/source/libs/poppler/configure
index 30debd4462864ef237b0b0f2e24b6b6693e39884..7c323259a6bb2046cc96098af4203c4032078b15 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.28.0.
+# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.29.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.28.0'
-PACKAGE_STRING='poppler (TeX Live) 0.28.0'
+PACKAGE_VERSION='0.29.0'
+PACKAGE_STRING='poppler (TeX Live) 0.29.0'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
-ac_unique_file="poppler-0.28.0/poppler/Array.cc"
+ac_unique_file="poppler-0.29.0/poppler/Array.cc"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -641,6 +641,8 @@ NO_WARN_CXXFLAGS
EGREP
GREP
CPP
+VISIBILITY_CXXFLAGS
+VISIBILITY_CFLAGS
LN_S
RANLIB
WARNING_CXXFLAGS
@@ -1304,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.28.0 to adapt to many kinds of systems.
+\`configure' configures poppler (TeX Live) 0.29.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1371,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.28.0:";;
+ short | recursive ) echo "Configuration of poppler (TeX Live) 0.29.0:";;
esac
cat <<\_ACEOF
@@ -1484,7 +1486,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-poppler (TeX Live) configure 0.28.0
+poppler (TeX Live) configure 0.29.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2074,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.28.0, which was
+It was created by poppler (TeX Live) $as_me 0.29.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3997,7 +3999,7 @@ fi
# Define the identity of the package.
PACKAGE='poppler--tex-live-'
- VERSION='0.28.0'
+ VERSION='0.29.0'
# Some tools Automake needs.
@@ -5449,6 +5451,103 @@ $as_echo "no, using $LN_S" >&6; }
fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for C to hide external symbols" >&5
+$as_echo_n "checking CFLAGS for C to hide external symbols... " >&6; }
+if ${kpse_cv_visibility_cflags+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+kpse_cv_visibility_cflags=unknown
+kpse_save_flags=$CFLAGS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
+ extern void foo(void);
+ void foo(void){printf("foo\n");}
+_ACEOF
+# FIXME: Add tests for non-GNU compilers
+for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do
+ CFLAGS="$kpse_save_flags -Werror $kpse_flag"
+ if ac_fn_c_try_compile "$LINENO"; then :
+ kpse_cv_visibility_cflags=$kpse_flag; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+done
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_visibility_cflags" >&5
+$as_echo "$kpse_cv_visibility_cflags" >&6; }
+CFLAGS=$kpse_save_flags
+case $kpse_cv_visibility_cflags in #(
+ unknown) :
+ ;; #(
+ *) :
+ VISIBILITY_CFLAGS=$kpse_cv_visibility_cflags
+ ;;
+esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CXXFLAGS for C++ to hide external symbols" >&5
+$as_echo_n "checking CXXFLAGS for C++ to hide external symbols... " >&6; }
+if ${kpse_cv_visibility_cxxflags+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+kpse_cv_visibility_cxxflags=unknown
+kpse_save_flags=$CXXFLAGS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
+ extern void foo(void);
+ void foo(void){printf("foo\n");}
+_ACEOF
+# FIXME: Add tests for non-GNU compilers
+for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do
+ CXXFLAGS="$kpse_save_flags -Werror $kpse_flag"
+ if ac_fn_cxx_try_compile "$LINENO"; then :
+ kpse_cv_visibility_cxxflags=$kpse_flag; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+done
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_visibility_cxxflags" >&5
+$as_echo "$kpse_cv_visibility_cxxflags" >&6; }
+CXXFLAGS=$kpse_save_flags
+case $kpse_cv_visibility_cxxflags in #(
+ unknown) :
+ ;; #(
+ *) :
+ VISIBILITY_CXXFLAGS=$kpse_cv_visibility_cxxflags
+ ;;
+esac
+
+
+
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -6473,12 +6572,12 @@ fi
ac_config_headers="$ac_config_headers config.h"
-ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.28.0/poppler/poppler-config.h.in"
+ac_config_headers="$ac_config_headers poppler-config.h:poppler-0.29.0/poppler/poppler-config.h.in"
cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.28.0"
+#define POPPLER_VERSION "0.29.0"
_ACEOF
@@ -6612,7 +6711,7 @@ fi
$as_echo "#define ENABLE_ZLIB 1" >>confdefs.h
-POPPLER_TREE=poppler-0.28.0
+POPPLER_TREE=poppler-0.29.0
ac_config_files="$ac_config_files Makefile include/Makefile include/goo/Makefile include/fofi/Makefile"
@@ -7172,7 +7271,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.28.0, which was
+This file was extended by poppler (TeX Live) $as_me 0.29.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7238,7 +7337,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.28.0
+poppler (TeX Live) config.status 0.29.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -7369,7 +7468,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.28.0/poppler/poppler-config.h.in" ;;
+ "poppler-config.h") CONFIG_HEADERS="$CONFIG_HEADERS poppler-config.h:poppler-0.29.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/configure.ac b/source/libs/poppler/configure.ac
index 84a4a249b93562292b813c73c80fec5979cf1e6e..cd5430f19c89ee2b19721571133d296335832952 100644
--- a/source/libs/poppler/configure.ac
+++ b/source/libs/poppler/configure.ac
@@ -20,6 +20,8 @@ AC_PROG_CXX
AC_PROG_RANLIB
AC_PROG_LN_S
+KPSE_COMPILER_VISIBILITY
+
AC_CHECK_SIZEOF([long long])
if test $ac_cv_sizeof_long_long -lt 8; then
AC_MSG_ERROR([Sorry, your compiler has no `long long' with at least 8 bytes.])
diff --git a/source/libs/poppler/include/Makefile.in b/source/libs/poppler/include/Makefile.in
index 7386ebdb2f26fdb715d5a8b828f4ed006c1126aa..8b7e4637d1231d23bf3b33c5b250539d82ad42ad 100644
--- a/source/libs/poppler/include/Makefile.in
+++ b/source/libs/poppler/include/Makefile.in
@@ -80,6 +80,7 @@ DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \
subdir = include
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
+ $(top_srcdir)/../../m4/kpse-visibility.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/../../m4/kpse-win32.m4 \
$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
@@ -225,6 +226,8 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
ZLIB_DEPEND = @ZLIB_DEPEND@
diff --git a/source/libs/poppler/include/fofi/Makefile.in b/source/libs/poppler/include/fofi/Makefile.in
index 3e8f032d739867ea4cb5738527587aee31003992..896aa75f00a075e9e2d528b0e5e0f662c4a129cd 100644
--- a/source/libs/poppler/include/fofi/Makefile.in
+++ b/source/libs/poppler/include/fofi/Makefile.in
@@ -80,6 +80,7 @@ DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \
subdir = include/fofi
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
+ $(top_srcdir)/../../m4/kpse-visibility.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/../../m4/kpse-win32.m4 \
$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
@@ -165,6 +166,8 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
ZLIB_DEPEND = @ZLIB_DEPEND@
diff --git a/source/libs/poppler/include/goo/Makefile.in b/source/libs/poppler/include/goo/Makefile.in
index f8115f8e39b847b27364863bf523b125421eada3..25370991459f2b8608a4c998a5066746d0c7d90e 100644
--- a/source/libs/poppler/include/goo/Makefile.in
+++ b/source/libs/poppler/include/goo/Makefile.in
@@ -80,6 +80,7 @@ DIST_COMMON = $(top_srcdir)/../../am/hdr_links.am \
subdir = include/goo
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
+ $(top_srcdir)/../../m4/kpse-visibility.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/../../m4/kpse-win32.m4 \
$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
@@ -165,6 +166,8 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
+VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
ZLIB_DEPEND = @ZLIB_DEPEND@
diff --git a/source/libs/poppler/poppler-0.28.0-PATCHES/ChangeLog b/source/libs/poppler/poppler-0.29.0-PATCHES/ChangeLog
similarity index 97%
rename from source/libs/poppler/poppler-0.28.0-PATCHES/ChangeLog
rename to source/libs/poppler/poppler-0.29.0-PATCHES/ChangeLog
index eb46aee57e9caae05c7aec4efc8343f1a35aa2ba..16ffd02b874042e64a7da77ebd5f17c8bf2be7dd 100644
--- a/source/libs/poppler/poppler-0.28.0-PATCHES/ChangeLog
+++ b/source/libs/poppler/poppler-0.29.0-PATCHES/ChangeLog
@@ -1,3 +1,10 @@
+2014-12-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Imported poppler-0.29.0 source tree from:
+ http://poppler.freedesktop.org/
+
+ * patch-02-LLONG_MAX: Adapted.
+
2014-11-04 Peter Breitenlohner <peb@mppmu.mpg.de>
Imported poppler-0.28.0 source tree from:
diff --git a/source/libs/poppler/poppler-0.28.0-PATCHES/TL-Changes b/source/libs/poppler/poppler-0.29.0-PATCHES/TL-Changes
similarity index 83%
rename from source/libs/poppler/poppler-0.28.0-PATCHES/TL-Changes
rename to source/libs/poppler/poppler-0.29.0-PATCHES/TL-Changes
index 61bbc4a65d2457df3333b888c303b54474b64561..92980bc4b1cabb17f6b27b056149e7b4ceb0254e 100644
--- a/source/libs/poppler/poppler-0.28.0-PATCHES/TL-Changes
+++ b/source/libs/poppler/poppler-0.29.0-PATCHES/TL-Changes
@@ -1,4 +1,4 @@
-Changes applied to the poppler-0.28.0 tree as obtained from:
+Changes applied to the poppler-0.29.0 tree as obtained from:
http://poppler.freedesktop.org/
Removed:
diff --git a/source/libs/poppler/poppler-0.28.0-PATCHES/patch-02-LLONG_MAX b/source/libs/poppler/poppler-0.29.0-PATCHES/patch-02-LLONG_MAX
similarity index 76%
rename from source/libs/poppler/poppler-0.28.0-PATCHES/patch-02-LLONG_MAX
rename to source/libs/poppler/poppler-0.29.0-PATCHES/patch-02-LLONG_MAX
index 21569fa4439c7126c3672529059dd85d3bc296db..57e7fe17d210d76cef688c98b5a15a68740d0e14 100644
--- a/source/libs/poppler/poppler-0.28.0-PATCHES/patch-02-LLONG_MAX
+++ b/source/libs/poppler/poppler-0.29.0-PATCHES/patch-02-LLONG_MAX
@@ -1,6 +1,6 @@
-diff -ur poppler-0.28.0.orig/goo/GooString.h poppler-0.28.0/goo/GooString.h
---- poppler-0.28.0.orig/goo/GooString.h 2014-10-07 22:41:15.000000000 +0200
-+++ poppler-0.28.0/goo/GooString.h 2014-11-04 10:20:40.567904859 +0100
+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
@@ -34,6 +34,21 @@
#endif
diff --git a/source/libs/poppler/poppler-0.28.0/AUTHORS b/source/libs/poppler/poppler-0.29.0/AUTHORS
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/AUTHORS
rename to source/libs/poppler/poppler-0.29.0/AUTHORS
diff --git a/source/libs/poppler/poppler-0.28.0/CMakeLists.txt b/source/libs/poppler/poppler-0.29.0/CMakeLists.txt
similarity index 99%
rename from source/libs/poppler/poppler-0.28.0/CMakeLists.txt
rename to source/libs/poppler/poppler-0.29.0/CMakeLists.txt
index 7178d25a8514e17a88789652747875e27785d19c..7fdb49a178d3aceea535a3ee849aac83569002bc 100644
--- a/source/libs/poppler/poppler-0.28.0/CMakeLists.txt
+++ b/source/libs/poppler/poppler-0.29.0/CMakeLists.txt
@@ -17,7 +17,7 @@ include(CheckFileOffsetBits)
CHECK_FILE_OFFSET_BITS()
set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "28")
+set(POPPLER_MINOR_VERSION "29")
set(POPPLER_MICRO_VERSION "0")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
@@ -443,7 +443,7 @@ add_library(poppler STATIC ${poppler_SRCS})
else(MSVC)
add_library(poppler SHARED ${poppler_SRCS})
endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 47.0.0 SOVERSION 47)
+set_target_properties(poppler PROPERTIES VERSION 48.0.0 SOVERSION 48)
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})
diff --git a/source/libs/poppler/poppler-0.28.0/COPYING b/source/libs/poppler/poppler-0.29.0/COPYING
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/COPYING
rename to source/libs/poppler/poppler-0.29.0/COPYING
diff --git a/source/libs/poppler/poppler-0.28.0/ChangeLog b/source/libs/poppler/poppler-0.29.0/ChangeLog
similarity index 99%
rename from source/libs/poppler/poppler-0.28.0/ChangeLog
rename to source/libs/poppler/poppler-0.29.0/ChangeLog
index e395b330610ca04192195542270b77abeef746b0..01c35a0078356c182772963545d8c8e11ef30934 100644
--- a/source/libs/poppler/poppler-0.28.0/ChangeLog
+++ b/source/libs/poppler/poppler-0.29.0/ChangeLog
@@ -1,3 +1,171 @@
+commit fee700cfecb9d7d5fa938704a5f457f15aaa4676
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Mon Dec 1 20:52:42 2014 +0100
+
+ Run dos2unix as suggested by Volker Grabsch
+
+ splash/SplashState.h | 278 ++++++++++----------
+ test/perf-test-preview-dummy.cc | 44 ++--
+ test/perf-test-preview-win.cc | 544
+ ++++++++++++++++++++--------------------
+ 3 files changed, 433 insertions(+), 433 deletions(-)
+
+commit d3fe0661c6dc6050e14cd5cb4afa089b7d7d66b0
+Author: Richard PALO <richard@netbsd.org>
+Date: Sun Nov 30 22:46:22 2014 +0100
+
+ warning: "_FILE_OFFSET_BITS" redefined
+
+ Bug #86870
+
+ test/perf-test.cc | 2559
+ +++++++++++++++++++++++++++--------------------------
+ 1 file changed, 1280 insertions(+), 1279 deletions(-)
+
+commit 18884065e11fee82506915095619107a43172ecb
+Author: Richard PALO <richard@netbsd.org>
+Date: Sun Nov 30 22:36:29 2014 +0100
+
+ The isfinite macro is defined on SunOS under c99
+
+ Bug #86869
+
+ poppler/SplashOutputDev.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit bcb470064dd9f75ab0b0a0d9b7319fe8f1e558ae
+Author: Adrian Johnson <ajohnson@redneon.com>
+Date: Tue Nov 25 05:53:38 2014 +1030
+
+ cofigure: print "no" instead of "auto" if lcms not found
+
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 832046c57ab2909d329340f1c941b29e8246ff73
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Fri Nov 28 11:08:34 2014 +0100
+
+ Use correct LAB byte array for lcms input
+
+ Bug #86388
+
+ poppler/GfxState.cc | 51
+ ++++++++++++++++++++++++++++++++++++++-------------
+ poppler/GfxState.h | 4 +++-
+ 2 files changed, 41 insertions(+), 14 deletions(-)
+
+commit a604bc3a2ed9f9181aa3b12d795608fcf5e08220
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Fri Nov 14 11:56:50 2014 +0100
+
+ Solve blend mode problem in CYMK and DeviceN for separable blend modes
+
+ Fixes part of #68986
+
+ poppler/SplashOutputDev.cc | 277
+ +++++++++++++++++++++++++--------------------
+ 1 file changed, 155 insertions(+), 122 deletions(-)
+
+commit b7802ff39db270dda2aa20f005fb87c22ed34137
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Fri Nov 14 11:47:38 2014 +0100
+
+ Use Default colorspaces if present instead of Device colorspaces
+
+ Fixes part of #68986
+
+ poppler/CairoOutputDev.cc | 4 +-
+ poppler/Gfx.cc | 40 +++++-----
+ poppler/GfxState.cc | 197
+ ++++++++++++++++++++++++++++++++++------------
+ poppler/GfxState.h | 31 ++++----
+ poppler/Page.cc | 4 +-
+ 5 files changed, 188 insertions(+), 88 deletions(-)
+
+commit 07aa6f4030418883d8d45a8dfa3d80d2dadca4e7
+Author: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Thu Nov 13 12:26:25 2014 +0100
+
+ write correct size in trailer dict
+
+ Bug #86063
+
+ poppler/PDFDoc.cc | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+commit 51e7c29cabedc72e097023e6d8d6d68ed43fa20c
+Author: Carlos Garcia Campos <cgarcia@igalia.com>
+Date: Fri Nov 7 18:30:36 2014 +0100
+
+ regtest: Update references also for tests that no longer crash
+
+ We are currently updating the refs only when we have checksums to
+ compare, but if a test used to crash there's no md5 file in refs.
+
+ regtest/TestRun.py | 2 ++
+ regtest/backends/__init__.py | 24 ++++++++++++++++++++++++
+ 2 files changed, 26 insertions(+)
+
+commit d205908930d5dc4ec3a1a1a2c2b93fbb92c2c867
+Author: William Bader <williambader@hotmail.com>
+Date: Wed Nov 5 20:23:49 2014 +0100
+
+ Make it proper C
+
+ glib/demo/annots.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit fa1d636b00210b9c52787ab3c833fe9aa2e293fa
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Nov 4 20:00:08 2014 +0100
+
+ 0.28.1
+
+ configure.ac | 2 +-
+ cpp/Doxyfile | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+commit 7debbb05df18afc86df8a4fd37980728ec2e5788
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Nov 4 19:29:58 2014 +0100
+
+ Fix typo
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit d5489ef37742227176e800390a990f2b882d9710
+Author: Albert Astals Cid <aacid@kde.org>
+Date: Tue Nov 4 01:27:05 2014 +0100
+
+ 0.28.0
+
+ CMakeLists.txt | 6 +++---
+ NEWS | 43 +++++++++++++++++++++++++++++++++++++++++++
+ configure.ac | 4 ++--
+ cpp/Doxyfile | 2 +-
+ poppler/Makefile.am | 2 +-
+ qt4/src/CMakeLists.txt | 2 +-
+ qt4/src/Doxyfile | 2 +-
+ qt4/src/Makefile.am | 2 +-
+ qt5/src/CMakeLists.txt | 2 +-
+ qt5/src/Doxyfile | 2 +-
+ qt5/src/Makefile.am | 2 +-
+ 11 files changed, 56 insertions(+), 13 deletions(-)
+
+commit f87115a1129e4e03802769181a3392c8dce3192a
+Author: Hib Eris <hib@hiberis.nl>
+Date: Tue Nov 4 01:25:18 2014 +0100
+
+ Don't ship the moc files
+
+ qt4/demos/Makefile.am | 1 -
+ qt5/demos/Makefile.am | 1 -
+ 2 files changed, 2 deletions(-)
+
commit 0a9c38076f1555196029372b7e08714b43c7a58d
Author: Albert Astals Cid <aacid@kde.org>
Date: Mon Nov 3 21:43:28 2014 +0100
diff --git a/source/libs/poppler/poppler-0.28.0/ConfigureChecks.cmake b/source/libs/poppler/poppler-0.29.0/ConfigureChecks.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/ConfigureChecks.cmake
rename to source/libs/poppler/poppler-0.29.0/ConfigureChecks.cmake
diff --git a/source/libs/poppler/poppler-0.28.0/INSTALL b/source/libs/poppler/poppler-0.29.0/INSTALL
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/INSTALL
rename to source/libs/poppler/poppler-0.29.0/INSTALL
diff --git a/source/libs/poppler/poppler-0.28.0/Makefile.am b/source/libs/poppler/poppler-0.29.0/Makefile.am
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/Makefile.am
rename to source/libs/poppler/poppler-0.29.0/Makefile.am
diff --git a/source/libs/poppler/poppler-0.28.0/NEWS b/source/libs/poppler/poppler-0.29.0/NEWS
similarity index 99%
rename from source/libs/poppler/poppler-0.28.0/NEWS
rename to source/libs/poppler/poppler-0.29.0/NEWS
index 97b94c8a8b8f30d5ae5552ccb883a0c2e6bc022e..4bfd589d6e32bf882bd8ffa46dfe5a36ee8858cf 100644
--- a/source/libs/poppler/poppler-0.28.0/NEWS
+++ b/source/libs/poppler/poppler-0.29.0/NEWS
@@ -1,3 +1,18 @@
+Release 0.29.0
+ core:
+ * Use correct LAB byte array for lcms input. Bug #86388
+ * Write correct size in trailer dict. Bug #86063
+ * Use Default colorspaces if present instead of Device colorspaces
+ * Solve blend mode problem in CYMK and DeviceN for separable blend modes
+ * Compilation/warning fixes on SunOS
+ * Regression test improvements
+
+ glib:
+ * demo: Compilation fixlets
+
+ build system:
+ * cofigure: print "no" instead of "auto" if lcms not found
+
Release 0.28.0
core:
* Fix rendering of file with a wrong embedded font. Bug #84270
diff --git a/source/libs/poppler/poppler-0.28.0/README b/source/libs/poppler/poppler-0.29.0/README
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/README
rename to source/libs/poppler/poppler-0.29.0/README
diff --git a/source/libs/poppler/poppler-0.28.0/README-XPDF b/source/libs/poppler/poppler-0.29.0/README-XPDF
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/README-XPDF
rename to source/libs/poppler/poppler-0.29.0/README-XPDF
diff --git a/source/libs/poppler/poppler-0.28.0/TODO b/source/libs/poppler/poppler-0.29.0/TODO
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/TODO
rename to source/libs/poppler/poppler-0.29.0/TODO
diff --git a/source/libs/poppler/poppler-0.28.0/config.h.cmake b/source/libs/poppler/poppler-0.29.0/config.h.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/config.h.cmake
rename to source/libs/poppler/poppler-0.29.0/config.h.cmake
diff --git a/source/libs/poppler/poppler-0.28.0/config.h.in b/source/libs/poppler/poppler-0.29.0/config.h.in
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/config.h.in
rename to source/libs/poppler/poppler-0.29.0/config.h.in
diff --git a/source/libs/poppler/poppler-0.28.0/configure.ac b/source/libs/poppler/poppler-0.29.0/configure.ac
similarity index 99%
rename from source/libs/poppler/poppler-0.28.0/configure.ac
rename to source/libs/poppler/poppler-0.29.0/configure.ac
index df8b5d562f500c7396f05fa28264b875e973dbb7..3bf36e0336b0149a1f86e6fd606c0ddec22a6ef5 100644
--- a/source/libs/poppler/poppler-0.28.0/configure.ac
+++ b/source/libs/poppler/poppler-0.29.0/configure.ac
@@ -1,5 +1,5 @@
m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[28])
+m4_define([poppler_version_minor],[29])
m4_define([poppler_version_micro],[0])
m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
@@ -470,7 +470,7 @@ fi
CAIRO_VERSION="1.10.0"
AC_SUBST(CAIRO_VERSION)
-CAIRO_DEPS="cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION)"
+CAIRO_DEPS="cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION"
AC_ARG_ENABLE(cairo-output,
AC_HELP_STRING([--disable-cairo-output],
[Don't build the cairo graphics backend.]),
@@ -762,6 +762,8 @@ if test x$lcms1 = xyes || test x$lcms2 = xyes; then
lcms1=yes;
AC_DEFINE(USE_LCMS1, 1, [Defines if use lcms1])
fi
+else
+ enable_cms=no
fi
AM_CONDITIONAL(USE_CMS, test x$enable_cms = xyes)
diff --git a/source/libs/poppler/poppler-0.28.0/fofi/FoFiBase.cc b/source/libs/poppler/poppler-0.29.0/fofi/FoFiBase.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/fofi/FoFiBase.cc
rename to source/libs/poppler/poppler-0.29.0/fofi/FoFiBase.cc
diff --git a/source/libs/poppler/poppler-0.28.0/fofi/FoFiBase.h b/source/libs/poppler/poppler-0.29.0/fofi/FoFiBase.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/fofi/FoFiBase.h
rename to source/libs/poppler/poppler-0.29.0/fofi/FoFiBase.h
diff --git a/source/libs/poppler/poppler-0.28.0/fofi/FoFiEncodings.cc b/source/libs/poppler/poppler-0.29.0/fofi/FoFiEncodings.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/fofi/FoFiEncodings.cc
rename to source/libs/poppler/poppler-0.29.0/fofi/FoFiEncodings.cc
diff --git a/source/libs/poppler/poppler-0.28.0/fofi/FoFiEncodings.h b/source/libs/poppler/poppler-0.29.0/fofi/FoFiEncodings.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/fofi/FoFiEncodings.h
rename to source/libs/poppler/poppler-0.29.0/fofi/FoFiEncodings.h
diff --git a/source/libs/poppler/poppler-0.28.0/fofi/FoFiIdentifier.cc b/source/libs/poppler/poppler-0.29.0/fofi/FoFiIdentifier.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/fofi/FoFiIdentifier.cc
rename to source/libs/poppler/poppler-0.29.0/fofi/FoFiIdentifier.cc
diff --git a/source/libs/poppler/poppler-0.28.0/fofi/FoFiIdentifier.h b/source/libs/poppler/poppler-0.29.0/fofi/FoFiIdentifier.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/fofi/FoFiIdentifier.h
rename to source/libs/poppler/poppler-0.29.0/fofi/FoFiIdentifier.h
diff --git a/source/libs/poppler/poppler-0.28.0/fofi/FoFiTrueType.cc b/source/libs/poppler/poppler-0.29.0/fofi/FoFiTrueType.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/fofi/FoFiTrueType.cc
rename to source/libs/poppler/poppler-0.29.0/fofi/FoFiTrueType.cc
diff --git a/source/libs/poppler/poppler-0.28.0/fofi/FoFiTrueType.h b/source/libs/poppler/poppler-0.29.0/fofi/FoFiTrueType.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/fofi/FoFiTrueType.h
rename to source/libs/poppler/poppler-0.29.0/fofi/FoFiTrueType.h
diff --git a/source/libs/poppler/poppler-0.28.0/fofi/FoFiType1.cc b/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/fofi/FoFiType1.cc
rename to source/libs/poppler/poppler-0.29.0/fofi/FoFiType1.cc
diff --git a/source/libs/poppler/poppler-0.28.0/fofi/FoFiType1.h b/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/fofi/FoFiType1.h
rename to source/libs/poppler/poppler-0.29.0/fofi/FoFiType1.h
diff --git a/source/libs/poppler/poppler-0.28.0/fofi/FoFiType1C.cc b/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1C.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/fofi/FoFiType1C.cc
rename to source/libs/poppler/poppler-0.29.0/fofi/FoFiType1C.cc
diff --git a/source/libs/poppler/poppler-0.28.0/fofi/FoFiType1C.h b/source/libs/poppler/poppler-0.29.0/fofi/FoFiType1C.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/fofi/FoFiType1C.h
rename to source/libs/poppler/poppler-0.29.0/fofi/FoFiType1C.h
diff --git a/source/libs/poppler/poppler-0.28.0/fofi/Makefile.am b/source/libs/poppler/poppler-0.29.0/fofi/Makefile.am
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/fofi/Makefile.am
rename to source/libs/poppler/poppler-0.29.0/fofi/Makefile.am
diff --git a/source/libs/poppler/poppler-0.28.0/goo/FixedPoint.cc b/source/libs/poppler/poppler-0.29.0/goo/FixedPoint.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/FixedPoint.cc
rename to source/libs/poppler/poppler-0.29.0/goo/FixedPoint.cc
diff --git a/source/libs/poppler/poppler-0.28.0/goo/FixedPoint.h b/source/libs/poppler/poppler-0.29.0/goo/FixedPoint.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/FixedPoint.h
rename to source/libs/poppler/poppler-0.29.0/goo/FixedPoint.h
diff --git a/source/libs/poppler/poppler-0.28.0/goo/GooHash.cc b/source/libs/poppler/poppler-0.29.0/goo/GooHash.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/GooHash.cc
rename to source/libs/poppler/poppler-0.29.0/goo/GooHash.cc
diff --git a/source/libs/poppler/poppler-0.28.0/goo/GooHash.h b/source/libs/poppler/poppler-0.29.0/goo/GooHash.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/GooHash.h
rename to source/libs/poppler/poppler-0.29.0/goo/GooHash.h
diff --git a/source/libs/poppler/poppler-0.28.0/goo/GooLikely.h b/source/libs/poppler/poppler-0.29.0/goo/GooLikely.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/GooLikely.h
rename to source/libs/poppler/poppler-0.29.0/goo/GooLikely.h
diff --git a/source/libs/poppler/poppler-0.28.0/goo/GooList.cc b/source/libs/poppler/poppler-0.29.0/goo/GooList.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/GooList.cc
rename to source/libs/poppler/poppler-0.29.0/goo/GooList.cc
diff --git a/source/libs/poppler/poppler-0.28.0/goo/GooList.h b/source/libs/poppler/poppler-0.29.0/goo/GooList.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/GooList.h
rename to source/libs/poppler/poppler-0.29.0/goo/GooList.h
diff --git a/source/libs/poppler/poppler-0.28.0/goo/GooMutex.h b/source/libs/poppler/poppler-0.29.0/goo/GooMutex.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/GooMutex.h
rename to source/libs/poppler/poppler-0.29.0/goo/GooMutex.h
diff --git a/source/libs/poppler/poppler-0.28.0/goo/GooString.cc b/source/libs/poppler/poppler-0.29.0/goo/GooString.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/GooString.cc
rename to source/libs/poppler/poppler-0.29.0/goo/GooString.cc
diff --git a/source/libs/poppler/poppler-0.28.0/goo/GooString.h b/source/libs/poppler/poppler-0.29.0/goo/GooString.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/GooString.h
rename to source/libs/poppler/poppler-0.29.0/goo/GooString.h
diff --git a/source/libs/poppler/poppler-0.28.0/goo/GooTimer.cc b/source/libs/poppler/poppler-0.29.0/goo/GooTimer.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/GooTimer.cc
rename to source/libs/poppler/poppler-0.29.0/goo/GooTimer.cc
diff --git a/source/libs/poppler/poppler-0.28.0/goo/GooTimer.h b/source/libs/poppler/poppler-0.29.0/goo/GooTimer.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/GooTimer.h
rename to source/libs/poppler/poppler-0.29.0/goo/GooTimer.h
diff --git a/source/libs/poppler/poppler-0.28.0/goo/ImgWriter.cc b/source/libs/poppler/poppler-0.29.0/goo/ImgWriter.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/ImgWriter.cc
rename to source/libs/poppler/poppler-0.29.0/goo/ImgWriter.cc
diff --git a/source/libs/poppler/poppler-0.28.0/goo/ImgWriter.h b/source/libs/poppler/poppler-0.29.0/goo/ImgWriter.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/ImgWriter.h
rename to source/libs/poppler/poppler-0.29.0/goo/ImgWriter.h
diff --git a/source/libs/poppler/poppler-0.28.0/goo/JpegWriter.cc b/source/libs/poppler/poppler-0.29.0/goo/JpegWriter.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/JpegWriter.cc
rename to source/libs/poppler/poppler-0.29.0/goo/JpegWriter.cc
diff --git a/source/libs/poppler/poppler-0.28.0/goo/JpegWriter.h b/source/libs/poppler/poppler-0.29.0/goo/JpegWriter.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/JpegWriter.h
rename to source/libs/poppler/poppler-0.29.0/goo/JpegWriter.h
diff --git a/source/libs/poppler/poppler-0.28.0/goo/Makefile.am b/source/libs/poppler/poppler-0.29.0/goo/Makefile.am
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/Makefile.am
rename to source/libs/poppler/poppler-0.29.0/goo/Makefile.am
diff --git a/source/libs/poppler/poppler-0.28.0/goo/NetPBMWriter.cc b/source/libs/poppler/poppler-0.29.0/goo/NetPBMWriter.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/NetPBMWriter.cc
rename to source/libs/poppler/poppler-0.29.0/goo/NetPBMWriter.cc
diff --git a/source/libs/poppler/poppler-0.28.0/goo/NetPBMWriter.h b/source/libs/poppler/poppler-0.29.0/goo/NetPBMWriter.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/NetPBMWriter.h
rename to source/libs/poppler/poppler-0.29.0/goo/NetPBMWriter.h
diff --git a/source/libs/poppler/poppler-0.28.0/goo/PNGWriter.cc b/source/libs/poppler/poppler-0.29.0/goo/PNGWriter.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/PNGWriter.cc
rename to source/libs/poppler/poppler-0.29.0/goo/PNGWriter.cc
diff --git a/source/libs/poppler/poppler-0.28.0/goo/PNGWriter.h b/source/libs/poppler/poppler-0.29.0/goo/PNGWriter.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/PNGWriter.h
rename to source/libs/poppler/poppler-0.29.0/goo/PNGWriter.h
diff --git a/source/libs/poppler/poppler-0.28.0/goo/TiffWriter.cc b/source/libs/poppler/poppler-0.29.0/goo/TiffWriter.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/TiffWriter.cc
rename to source/libs/poppler/poppler-0.29.0/goo/TiffWriter.cc
diff --git a/source/libs/poppler/poppler-0.28.0/goo/TiffWriter.h b/source/libs/poppler/poppler-0.29.0/goo/TiffWriter.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/TiffWriter.h
rename to source/libs/poppler/poppler-0.29.0/goo/TiffWriter.h
diff --git a/source/libs/poppler/poppler-0.28.0/goo/gfile.cc b/source/libs/poppler/poppler-0.29.0/goo/gfile.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/gfile.cc
rename to source/libs/poppler/poppler-0.29.0/goo/gfile.cc
diff --git a/source/libs/poppler/poppler-0.28.0/goo/gfile.h b/source/libs/poppler/poppler-0.29.0/goo/gfile.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/gfile.h
rename to source/libs/poppler/poppler-0.29.0/goo/gfile.h
diff --git a/source/libs/poppler/poppler-0.28.0/goo/gmem.cc b/source/libs/poppler/poppler-0.29.0/goo/gmem.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/gmem.cc
rename to source/libs/poppler/poppler-0.29.0/goo/gmem.cc
diff --git a/source/libs/poppler/poppler-0.28.0/goo/gmem.h b/source/libs/poppler/poppler-0.29.0/goo/gmem.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/gmem.h
rename to source/libs/poppler/poppler-0.29.0/goo/gmem.h
diff --git a/source/libs/poppler/poppler-0.28.0/goo/gmempp.cc b/source/libs/poppler/poppler-0.29.0/goo/gmempp.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/gmempp.cc
rename to source/libs/poppler/poppler-0.29.0/goo/gmempp.cc
diff --git a/source/libs/poppler/poppler-0.28.0/goo/grandom.cc b/source/libs/poppler/poppler-0.29.0/goo/grandom.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/grandom.cc
rename to source/libs/poppler/poppler-0.29.0/goo/grandom.cc
diff --git a/source/libs/poppler/poppler-0.28.0/goo/grandom.h b/source/libs/poppler/poppler-0.29.0/goo/grandom.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/grandom.h
rename to source/libs/poppler/poppler-0.29.0/goo/grandom.h
diff --git a/source/libs/poppler/poppler-0.28.0/goo/gstrtod.cc b/source/libs/poppler/poppler-0.29.0/goo/gstrtod.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/gstrtod.cc
rename to source/libs/poppler/poppler-0.29.0/goo/gstrtod.cc
diff --git a/source/libs/poppler/poppler-0.28.0/goo/gstrtod.h b/source/libs/poppler/poppler-0.29.0/goo/gstrtod.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/gstrtod.h
rename to source/libs/poppler/poppler-0.29.0/goo/gstrtod.h
diff --git a/source/libs/poppler/poppler-0.28.0/goo/gtypes.h b/source/libs/poppler/poppler-0.29.0/goo/gtypes.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/gtypes.h
rename to source/libs/poppler/poppler-0.29.0/goo/gtypes.h
diff --git a/source/libs/poppler/poppler-0.28.0/goo/gtypes_p.h b/source/libs/poppler/poppler-0.29.0/goo/gtypes_p.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/goo/gtypes_p.h
rename to source/libs/poppler/poppler-0.29.0/goo/gtypes_p.h
diff --git a/source/libs/poppler/poppler-0.28.0/gtk-doc.make b/source/libs/poppler/poppler-0.29.0/gtk-doc.make
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/gtk-doc.make
rename to source/libs/poppler/poppler-0.29.0/gtk-doc.make
diff --git a/source/libs/poppler/poppler-0.28.0/poppler-cairo-uninstalled.pc.in b/source/libs/poppler/poppler-0.29.0/poppler-cairo-uninstalled.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler-cairo-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.29.0/poppler-cairo-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.28.0/poppler-cairo.pc.cmake b/source/libs/poppler/poppler-0.29.0/poppler-cairo.pc.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler-cairo.pc.cmake
rename to source/libs/poppler/poppler-0.29.0/poppler-cairo.pc.cmake
diff --git a/source/libs/poppler/poppler-0.28.0/poppler-cairo.pc.in b/source/libs/poppler/poppler-0.29.0/poppler-cairo.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler-cairo.pc.in
rename to source/libs/poppler/poppler-0.29.0/poppler-cairo.pc.in
diff --git a/source/libs/poppler/poppler-0.28.0/poppler-cpp-uninstalled.pc.in b/source/libs/poppler/poppler-0.29.0/poppler-cpp-uninstalled.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler-cpp-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.29.0/poppler-cpp-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.28.0/poppler-cpp.pc.cmake b/source/libs/poppler/poppler-0.29.0/poppler-cpp.pc.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler-cpp.pc.cmake
rename to source/libs/poppler/poppler-0.29.0/poppler-cpp.pc.cmake
diff --git a/source/libs/poppler/poppler-0.28.0/poppler-cpp.pc.in b/source/libs/poppler/poppler-0.29.0/poppler-cpp.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler-cpp.pc.in
rename to source/libs/poppler/poppler-0.29.0/poppler-cpp.pc.in
diff --git a/source/libs/poppler/poppler-0.28.0/poppler-glib-uninstalled.pc.in b/source/libs/poppler/poppler-0.29.0/poppler-glib-uninstalled.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler-glib-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.29.0/poppler-glib-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.28.0/poppler-glib.pc.cmake b/source/libs/poppler/poppler-0.29.0/poppler-glib.pc.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler-glib.pc.cmake
rename to source/libs/poppler/poppler-0.29.0/poppler-glib.pc.cmake
diff --git a/source/libs/poppler/poppler-0.28.0/poppler-glib.pc.in b/source/libs/poppler/poppler-0.29.0/poppler-glib.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler-glib.pc.in
rename to source/libs/poppler/poppler-0.29.0/poppler-glib.pc.in
diff --git a/source/libs/poppler/poppler-0.28.0/poppler-qt4-uninstalled.pc.in b/source/libs/poppler/poppler-0.29.0/poppler-qt4-uninstalled.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler-qt4-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.29.0/poppler-qt4-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.28.0/poppler-qt4.pc.cmake b/source/libs/poppler/poppler-0.29.0/poppler-qt4.pc.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler-qt4.pc.cmake
rename to source/libs/poppler/poppler-0.29.0/poppler-qt4.pc.cmake
diff --git a/source/libs/poppler/poppler-0.28.0/poppler-qt4.pc.in b/source/libs/poppler/poppler-0.29.0/poppler-qt4.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler-qt4.pc.in
rename to source/libs/poppler/poppler-0.29.0/poppler-qt4.pc.in
diff --git a/source/libs/poppler/poppler-0.28.0/poppler-qt5-uninstalled.pc.in b/source/libs/poppler/poppler-0.29.0/poppler-qt5-uninstalled.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler-qt5-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.29.0/poppler-qt5-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.28.0/poppler-qt5.pc.cmake b/source/libs/poppler/poppler-0.29.0/poppler-qt5.pc.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler-qt5.pc.cmake
rename to source/libs/poppler/poppler-0.29.0/poppler-qt5.pc.cmake
diff --git a/source/libs/poppler/poppler-0.28.0/poppler-qt5.pc.in b/source/libs/poppler/poppler-0.29.0/poppler-qt5.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler-qt5.pc.in
rename to source/libs/poppler/poppler-0.29.0/poppler-qt5.pc.in
diff --git a/source/libs/poppler/poppler-0.28.0/poppler-splash-uninstalled.pc.in b/source/libs/poppler/poppler-0.29.0/poppler-splash-uninstalled.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler-splash-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.29.0/poppler-splash-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.28.0/poppler-splash.pc.cmake b/source/libs/poppler/poppler-0.29.0/poppler-splash.pc.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler-splash.pc.cmake
rename to source/libs/poppler/poppler-0.29.0/poppler-splash.pc.cmake
diff --git a/source/libs/poppler/poppler-0.28.0/poppler-splash.pc.in b/source/libs/poppler/poppler-0.29.0/poppler-splash.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler-splash.pc.in
rename to source/libs/poppler/poppler-0.29.0/poppler-splash.pc.in
diff --git a/source/libs/poppler/poppler-0.28.0/poppler-uninstalled.pc.in b/source/libs/poppler/poppler-0.29.0/poppler-uninstalled.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler-uninstalled.pc.in
rename to source/libs/poppler/poppler-0.29.0/poppler-uninstalled.pc.in
diff --git a/source/libs/poppler/poppler-0.28.0/poppler.pc.cmake b/source/libs/poppler/poppler-0.29.0/poppler.pc.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler.pc.cmake
rename to source/libs/poppler/poppler-0.29.0/poppler.pc.cmake
diff --git a/source/libs/poppler/poppler-0.28.0/poppler.pc.in b/source/libs/poppler/poppler-0.29.0/poppler.pc.in
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler.pc.in
rename to source/libs/poppler/poppler-0.29.0/poppler.pc.in
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Annot.cc b/source/libs/poppler/poppler-0.29.0/poppler/Annot.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Annot.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/Annot.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Annot.h b/source/libs/poppler/poppler-0.29.0/poppler/Annot.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Annot.h
rename to source/libs/poppler/poppler-0.29.0/poppler/Annot.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Array.cc b/source/libs/poppler/poppler-0.29.0/poppler/Array.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Array.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/Array.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Array.h b/source/libs/poppler/poppler-0.29.0/poppler/Array.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Array.h
rename to source/libs/poppler/poppler-0.29.0/poppler/Array.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/BuiltinFont.cc b/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFont.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/BuiltinFont.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/BuiltinFont.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/BuiltinFont.h b/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFont.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/BuiltinFont.h
rename to source/libs/poppler/poppler-0.29.0/poppler/BuiltinFont.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/BuiltinFontTables.cc b/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFontTables.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/BuiltinFontTables.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/BuiltinFontTables.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/BuiltinFontTables.h b/source/libs/poppler/poppler-0.29.0/poppler/BuiltinFontTables.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/BuiltinFontTables.h
rename to source/libs/poppler/poppler-0.29.0/poppler/BuiltinFontTables.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/CMap.cc b/source/libs/poppler/poppler-0.29.0/poppler/CMap.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/CMap.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/CMap.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/CMap.h b/source/libs/poppler/poppler-0.29.0/poppler/CMap.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/CMap.h
rename to source/libs/poppler/poppler-0.29.0/poppler/CMap.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/CachedFile.cc b/source/libs/poppler/poppler-0.29.0/poppler/CachedFile.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/CachedFile.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/CachedFile.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/CachedFile.h b/source/libs/poppler/poppler-0.29.0/poppler/CachedFile.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/CachedFile.h
rename to source/libs/poppler/poppler-0.29.0/poppler/CachedFile.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/CairoFontEngine.cc b/source/libs/poppler/poppler-0.29.0/poppler/CairoFontEngine.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/CairoFontEngine.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/CairoFontEngine.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/CairoFontEngine.h b/source/libs/poppler/poppler-0.29.0/poppler/CairoFontEngine.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/CairoFontEngine.h
rename to source/libs/poppler/poppler-0.29.0/poppler/CairoFontEngine.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/CairoOutputDev.cc b/source/libs/poppler/poppler-0.29.0/poppler/CairoOutputDev.cc
similarity index 99%
rename from source/libs/poppler/poppler-0.28.0/poppler/CairoOutputDev.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/CairoOutputDev.cc
index e08fe5cdca852f7310d4e653b0d104d70e15e5f2..4e8abcfd94d94ff0aef937a564dee983fa71e8b2 100644
--- a/source/libs/poppler/poppler-0.28.0/poppler/CairoOutputDev.cc
+++ b/source/libs/poppler/poppler-0.29.0/poppler/CairoOutputDev.cc
@@ -25,7 +25,7 @@
// Copyright (C) 2008, 2009 Chris Wilson <chris@chris-wilson.co.uk>
// Copyright (C) 2008, 2012 Hib Eris <hib@hiberis.nl>
// Copyright (C) 2009, 2010 David Benjamin <davidben@mit.edu>
-// Copyright (C) 2011-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2011-2014 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2012 Patrick Pfeifer <p2000@mailinator.com>
// Copyright (C) 2012 Jason Crain <jason@aquaticape.us>
//
@@ -2713,7 +2713,7 @@ void CairoOutputDev::setMimeData(GfxState *state, Stream *str, Object *ref,
return;
str->getDict()->lookup("ColorSpace", &obj);
- colorSpace = GfxColorSpace::parse(&obj, this, state);
+ colorSpace = GfxColorSpace::parse(NULL, &obj, this, state);
obj.free();
// colorspace in stream dict may be different from colorspace in jpx
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/CairoOutputDev.h b/source/libs/poppler/poppler-0.29.0/poppler/CairoOutputDev.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/CairoOutputDev.h
rename to source/libs/poppler/poppler-0.29.0/poppler/CairoOutputDev.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/CairoRescaleBox.cc b/source/libs/poppler/poppler-0.29.0/poppler/CairoRescaleBox.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/CairoRescaleBox.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/CairoRescaleBox.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/CairoRescaleBox.h b/source/libs/poppler/poppler-0.29.0/poppler/CairoRescaleBox.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/CairoRescaleBox.h
rename to source/libs/poppler/poppler-0.29.0/poppler/CairoRescaleBox.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Catalog.cc b/source/libs/poppler/poppler-0.29.0/poppler/Catalog.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Catalog.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/Catalog.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Catalog.h b/source/libs/poppler/poppler-0.29.0/poppler/Catalog.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Catalog.h
rename to source/libs/poppler/poppler-0.29.0/poppler/Catalog.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/CharCodeToUnicode.cc b/source/libs/poppler/poppler-0.29.0/poppler/CharCodeToUnicode.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/CharCodeToUnicode.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/CharCodeToUnicode.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/CharCodeToUnicode.h b/source/libs/poppler/poppler-0.29.0/poppler/CharCodeToUnicode.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/CharCodeToUnicode.h
rename to source/libs/poppler/poppler-0.29.0/poppler/CharCodeToUnicode.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/CharTypes.h b/source/libs/poppler/poppler-0.29.0/poppler/CharTypes.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/CharTypes.h
rename to source/libs/poppler/poppler-0.29.0/poppler/CharTypes.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/CompactFontTables.h b/source/libs/poppler/poppler-0.29.0/poppler/CompactFontTables.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/CompactFontTables.h
rename to source/libs/poppler/poppler-0.29.0/poppler/CompactFontTables.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/CurlCachedFile.cc b/source/libs/poppler/poppler-0.29.0/poppler/CurlCachedFile.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/CurlCachedFile.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/CurlCachedFile.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/CurlCachedFile.h b/source/libs/poppler/poppler-0.29.0/poppler/CurlCachedFile.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/CurlCachedFile.h
rename to source/libs/poppler/poppler-0.29.0/poppler/CurlCachedFile.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/CurlPDFDocBuilder.cc b/source/libs/poppler/poppler-0.29.0/poppler/CurlPDFDocBuilder.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/CurlPDFDocBuilder.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/CurlPDFDocBuilder.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/CurlPDFDocBuilder.h b/source/libs/poppler/poppler-0.29.0/poppler/CurlPDFDocBuilder.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/CurlPDFDocBuilder.h
rename to source/libs/poppler/poppler-0.29.0/poppler/CurlPDFDocBuilder.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/DCTStream.cc b/source/libs/poppler/poppler-0.29.0/poppler/DCTStream.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/DCTStream.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/DCTStream.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/DCTStream.h b/source/libs/poppler/poppler-0.29.0/poppler/DCTStream.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/DCTStream.h
rename to source/libs/poppler/poppler-0.29.0/poppler/DCTStream.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/DateInfo.cc b/source/libs/poppler/poppler-0.29.0/poppler/DateInfo.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/DateInfo.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/DateInfo.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/DateInfo.h b/source/libs/poppler/poppler-0.29.0/poppler/DateInfo.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/DateInfo.h
rename to source/libs/poppler/poppler-0.29.0/poppler/DateInfo.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Decrypt.cc b/source/libs/poppler/poppler-0.29.0/poppler/Decrypt.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Decrypt.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/Decrypt.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Decrypt.h b/source/libs/poppler/poppler-0.29.0/poppler/Decrypt.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Decrypt.h
rename to source/libs/poppler/poppler-0.29.0/poppler/Decrypt.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Dict.cc b/source/libs/poppler/poppler-0.29.0/poppler/Dict.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Dict.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/Dict.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Dict.h b/source/libs/poppler/poppler-0.29.0/poppler/Dict.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Dict.h
rename to source/libs/poppler/poppler-0.29.0/poppler/Dict.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Error.cc b/source/libs/poppler/poppler-0.29.0/poppler/Error.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Error.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/Error.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Error.h b/source/libs/poppler/poppler-0.29.0/poppler/Error.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Error.h
rename to source/libs/poppler/poppler-0.29.0/poppler/Error.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/ErrorCodes.h b/source/libs/poppler/poppler-0.29.0/poppler/ErrorCodes.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/ErrorCodes.h
rename to source/libs/poppler/poppler-0.29.0/poppler/ErrorCodes.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/FileSpec.cc b/source/libs/poppler/poppler-0.29.0/poppler/FileSpec.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/FileSpec.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/FileSpec.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/FileSpec.h b/source/libs/poppler/poppler-0.29.0/poppler/FileSpec.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/FileSpec.h
rename to source/libs/poppler/poppler-0.29.0/poppler/FileSpec.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/FlateStream.cc b/source/libs/poppler/poppler-0.29.0/poppler/FlateStream.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/FlateStream.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/FlateStream.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/FlateStream.h b/source/libs/poppler/poppler-0.29.0/poppler/FlateStream.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/FlateStream.h
rename to source/libs/poppler/poppler-0.29.0/poppler/FlateStream.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/FontEncodingTables.cc b/source/libs/poppler/poppler-0.29.0/poppler/FontEncodingTables.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/FontEncodingTables.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/FontEncodingTables.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/FontEncodingTables.h b/source/libs/poppler/poppler-0.29.0/poppler/FontEncodingTables.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/FontEncodingTables.h
rename to source/libs/poppler/poppler-0.29.0/poppler/FontEncodingTables.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/FontInfo.cc b/source/libs/poppler/poppler-0.29.0/poppler/FontInfo.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/FontInfo.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/FontInfo.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/FontInfo.h b/source/libs/poppler/poppler-0.29.0/poppler/FontInfo.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/FontInfo.h
rename to source/libs/poppler/poppler-0.29.0/poppler/FontInfo.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Form.cc b/source/libs/poppler/poppler-0.29.0/poppler/Form.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Form.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/Form.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Form.h b/source/libs/poppler/poppler-0.29.0/poppler/Form.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Form.h
rename to source/libs/poppler/poppler-0.29.0/poppler/Form.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Function.cc b/source/libs/poppler/poppler-0.29.0/poppler/Function.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Function.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/Function.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Function.h b/source/libs/poppler/poppler-0.29.0/poppler/Function.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Function.h
rename to source/libs/poppler/poppler-0.29.0/poppler/Function.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Gfx.cc b/source/libs/poppler/poppler-0.29.0/poppler/Gfx.cc
similarity index 99%
rename from source/libs/poppler/poppler-0.28.0/poppler/Gfx.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/Gfx.cc
index 6bf7ec54421ce78204a19ef3b601048908668b6e..64a9d7ba3b47e35634ada369f541264aa5f5e489 100644
--- a/source/libs/poppler/poppler-0.28.0/poppler/Gfx.cc
+++ b/source/libs/poppler/poppler-0.29.0/poppler/Gfx.cc
@@ -28,7 +28,7 @@
// Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
// Copyright (C) 2008 Hib Eris <hib@hiberis.nl>
// Copyright (C) 2009 M Joonas Pihlaja <jpihlaja@cc.helsinki.fi>
-// Copyright (C) 2009-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2009-2014 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2009 William Bader <williambader@hotmail.com>
// Copyright (C) 2009, 2010 David Benjamin <davidben@mit.edu>
// Copyright (C) 2010 Nils Höglund <nils.hoglund@gmail.com>
@@ -468,7 +468,7 @@ GfxPattern *GfxResources::lookupPattern(char *name, OutputDev *out, GfxState *st
for (resPtr = this; resPtr; resPtr = resPtr->next) {
if (resPtr->patternDict.isDict()) {
if (!resPtr->patternDict.dictLookup(name, &obj)->isNull()) {
- pattern = GfxPattern::parse(&obj, out, state);
+ pattern = GfxPattern::parse(resPtr, &obj, out, state);
obj.free();
return pattern;
}
@@ -487,7 +487,7 @@ GfxShading *GfxResources::lookupShading(char *name, OutputDev *out, GfxState *st
for (resPtr = this; resPtr; resPtr = resPtr->next) {
if (resPtr->shadingDict.isDict()) {
if (!resPtr->shadingDict.dictLookup(name, &obj)->isNull()) {
- shading = GfxShading::parse(&obj, out, state);
+ shading = GfxShading::parse(resPtr, &obj, out, state);
obj.free();
return shading;
}
@@ -1236,7 +1236,7 @@ void Gfx::opSetExtGState(Object args[], int numArgs) {
blendingColorSpace = NULL;
isolated = knockout = gFalse;
if (!obj4.dictLookup("CS", &obj5)->isNull()) {
- blendingColorSpace = GfxColorSpace::parse(&obj5, out, state);
+ blendingColorSpace = GfxColorSpace::parse(res, &obj5, out, state);
}
obj5.free();
if (obj4.dictLookup("I", &obj5)->isBool()) {
@@ -1439,7 +1439,7 @@ void Gfx::opSetFillGray(Object args[], int numArgs) {
state->setFillPattern(NULL);
res->lookupColorSpace("DefaultGray", &obj);
if (!obj.isNull()) {
- colorSpace = GfxColorSpace::parse(&obj, out, state);
+ colorSpace = GfxColorSpace::parse(res, &obj, out, state);
}
if (colorSpace == NULL) {
colorSpace = new GfxDeviceGrayColorSpace();
@@ -1460,7 +1460,7 @@ void Gfx::opSetStrokeGray(Object args[], int numArgs) {
state->setStrokePattern(NULL);
res->lookupColorSpace("DefaultGray", &obj);
if (!obj.isNull()) {
- colorSpace = GfxColorSpace::parse(&obj, out, state);
+ colorSpace = GfxColorSpace::parse(res, &obj, out, state);
}
if (colorSpace == NULL) {
colorSpace = new GfxDeviceGrayColorSpace();
@@ -1481,7 +1481,7 @@ void Gfx::opSetFillCMYKColor(Object args[], int numArgs) {
res->lookupColorSpace("DefaultCMYK", &obj);
if (!obj.isNull()) {
- colorSpace = GfxColorSpace::parse(&obj, out, state);
+ colorSpace = GfxColorSpace::parse(res, &obj, out, state);
}
if (colorSpace == NULL) {
colorSpace = new GfxDeviceCMYKColorSpace();
@@ -1506,7 +1506,7 @@ void Gfx::opSetStrokeCMYKColor(Object args[], int numArgs) {
state->setStrokePattern(NULL);
res->lookupColorSpace("DefaultCMYK", &obj);
if (!obj.isNull()) {
- colorSpace = GfxColorSpace::parse(&obj, out, state);
+ colorSpace = GfxColorSpace::parse(res, &obj, out, state);
}
if (colorSpace == NULL) {
colorSpace = new GfxDeviceCMYKColorSpace();
@@ -1530,7 +1530,7 @@ void Gfx::opSetFillRGBColor(Object args[], int numArgs) {
state->setFillPattern(NULL);
res->lookupColorSpace("DefaultRGB", &obj);
if (!obj.isNull()) {
- colorSpace = GfxColorSpace::parse(&obj, out, state);
+ colorSpace = GfxColorSpace::parse(res, &obj, out, state);
}
if (colorSpace == NULL) {
colorSpace = new GfxDeviceRGBColorSpace();
@@ -1554,7 +1554,7 @@ void Gfx::opSetStrokeRGBColor(Object args[], int numArgs) {
state->setStrokePattern(NULL);
res->lookupColorSpace("DefaultRGB", &obj);
if (!obj.isNull()) {
- colorSpace = GfxColorSpace::parse(&obj, out, state);
+ colorSpace = GfxColorSpace::parse(res, &obj, out, state);
}
if (colorSpace == NULL) {
colorSpace = new GfxDeviceRGBColorSpace();
@@ -1576,9 +1576,9 @@ void Gfx::opSetFillColorSpace(Object args[], int numArgs) {
res->lookupColorSpace(args[0].getName(), &obj);
if (obj.isNull()) {
- colorSpace = GfxColorSpace::parse(&args[0], out, state);
+ colorSpace = GfxColorSpace::parse(res, &args[0], out, state);
} else {
- colorSpace = GfxColorSpace::parse(&obj, out, state);
+ colorSpace = GfxColorSpace::parse(res, &obj, out, state);
}
obj.free();
if (colorSpace) {
@@ -1601,9 +1601,9 @@ void Gfx::opSetStrokeColorSpace(Object args[], int numArgs) {
state->setStrokePattern(NULL);
res->lookupColorSpace(args[0].getName(), &obj);
if (obj.isNull()) {
- colorSpace = GfxColorSpace::parse(&args[0], out, state);
+ colorSpace = GfxColorSpace::parse(res, &args[0], out, state);
} else {
- colorSpace = GfxColorSpace::parse(&obj, out, state);
+ colorSpace = GfxColorSpace::parse(res, &obj, out, state);
}
obj.free();
if (colorSpace) {
@@ -4403,7 +4403,7 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
}
state->setRenderingIntent(objIntent.getName());
}
- colorSpace = GfxColorSpace::parse(&obj1, out, state);
+ colorSpace = GfxColorSpace::parse(res, &obj1, out, state);
if (objIntent.isName()) {
state->setRenderingIntent(tempIntent);
free(tempIntent);
@@ -4415,7 +4415,7 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
if (objCS.isNull()) {
colorSpace = new GfxDeviceGrayColorSpace();
} else {
- colorSpace = GfxColorSpace::parse(&objCS, out, state);
+ colorSpace = GfxColorSpace::parse(res, &objCS, out, state);
}
objCS.free();
} else if (csMode == streamCSDeviceRGB) {
@@ -4424,7 +4424,7 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
if (objCS.isNull()) {
colorSpace = new GfxDeviceRGBColorSpace();
} else {
- colorSpace = GfxColorSpace::parse(&objCS, out, state);
+ colorSpace = GfxColorSpace::parse(res, &objCS, out, state);
}
objCS.free();
} else if (csMode == streamCSDeviceCMYK) {
@@ -4433,7 +4433,7 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
if (objCS.isNull()) {
colorSpace = new GfxDeviceCMYKColorSpace();
} else {
- colorSpace = GfxColorSpace::parse(&objCS, out, state);
+ colorSpace = GfxColorSpace::parse(res, &objCS, out, state);
}
objCS.free();
} else {
@@ -4528,7 +4528,7 @@ void Gfx::doImage(Object *ref, Stream *str, GBool inlineImg) {
obj2.free();
}
}
- maskColorSpace = GfxColorSpace::parse(&obj1, out, state);
+ maskColorSpace = GfxColorSpace::parse(NULL, &obj1, out, state);
obj1.free();
if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
goto err1;
@@ -4824,7 +4824,7 @@ void Gfx::doForm(Object *str) {
if (dict->lookup("Group", &obj1)->isDict()) {
if (obj1.dictLookup("S", &obj2)->isName("Transparency")) {
if (!obj1.dictLookup("CS", &obj3)->isNull()) {
- blendingColorSpace = GfxColorSpace::parse(&obj3, out, state);
+ blendingColorSpace = GfxColorSpace::parse(res, &obj3, out, state);
}
obj3.free();
if (obj1.dictLookup("I", &obj3)->isBool()) {
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Gfx.h b/source/libs/poppler/poppler-0.29.0/poppler/Gfx.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Gfx.h
rename to source/libs/poppler/poppler-0.29.0/poppler/Gfx.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/GfxFont.cc b/source/libs/poppler/poppler-0.29.0/poppler/GfxFont.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/GfxFont.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/GfxFont.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/GfxFont.h b/source/libs/poppler/poppler-0.29.0/poppler/GfxFont.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/GfxFont.h
rename to source/libs/poppler/poppler-0.29.0/poppler/GfxFont.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/GfxState.cc b/source/libs/poppler/poppler-0.29.0/poppler/GfxState.cc
similarity index 95%
rename from source/libs/poppler/poppler-0.28.0/poppler/GfxState.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/GfxState.cc
index eae85dc38562f1ce62eca76713fe98e5154e2edc..359c0d693ae3439940cca24b3bf3d17b78d2672a 100644
--- a/source/libs/poppler/poppler-0.28.0/poppler/GfxState.cc
+++ b/source/libs/poppler/poppler-0.29.0/poppler/GfxState.cc
@@ -192,7 +192,7 @@ static const std::map<unsigned int, unsigned int>::size_type CMSCACHE_LIMIT = 20
#define LCMS_FLAGS 0
#else
#include <lcms2.h>
-#define LCMS_FLAGS cmsFLAGS_NOOPTIMIZE
+#define LCMS_FLAGS cmsFLAGS_NOOPTIMIZE | cmsFLAGS_BLACKPOINTCOMPENSATION
#endif
#define COLOR_PROFILE_DIR "/ColorProfiles/"
@@ -203,10 +203,11 @@ void GfxColorTransform::doTransform(void *in, void *out, unsigned int size) {
}
// transformA should be a cmsHTRANSFORM
-GfxColorTransform::GfxColorTransform(void *transformA, int cmsIntentA, unsigned int transformPixelTypeA) {
+GfxColorTransform::GfxColorTransform(void *transformA, int cmsIntentA, unsigned int inputPixelTypeA, unsigned int transformPixelTypeA) {
transform = transformA;
refCount = 1;
cmsIntent = cmsIntentA;
+ inputPixelType = inputPixelTypeA;
transformPixelType = transformPixelTypeA;
}
@@ -250,7 +251,7 @@ void GfxColorSpace::setDisplayProfile(void *displayProfileA) {
INTENT_RELATIVE_COLORIMETRIC,LCMS_FLAGS)) == 0) {
error(errSyntaxWarning, -1, "Can't create Lab transform");
} else {
- XYZ2DisplayTransform = new GfxColorTransform(transform, INTENT_RELATIVE_COLORIMETRIC, displayPixelType);
+ XYZ2DisplayTransform = new GfxColorTransform(transform, INTENT_RELATIVE_COLORIMETRIC, PT_XYZ, displayPixelType);
}
cmsCloseProfile(XYZProfile);
}
@@ -282,7 +283,7 @@ GfxColorSpace::GfxColorSpace() {
GfxColorSpace::~GfxColorSpace() {
}
-GfxColorSpace *GfxColorSpace::parse(Object *csObj, OutputDev *out, GfxState *state, int recursion) {
+GfxColorSpace *GfxColorSpace::parse(GfxResources *res, Object *csObj, OutputDev *out, GfxState *state, int recursion) {
GfxColorSpace *cs;
Object obj1;
@@ -294,11 +295,44 @@ GfxColorSpace *GfxColorSpace::parse(Object *csObj, OutputDev *out, GfxState *sta
cs = NULL;
if (csObj->isName()) {
if (csObj->isName("DeviceGray") || csObj->isName("G")) {
- cs = new GfxDeviceGrayColorSpace();
+ if (res != NULL) {
+ Object objCS;
+ res->lookupColorSpace("DefaultGray", &objCS);
+ if (objCS.isNull()) {
+ cs = new GfxDeviceGrayColorSpace();
+ } else {
+ cs = GfxColorSpace::parse(NULL, &objCS, out, state);
+ }
+ objCS.free();
+ } else {
+ cs = new GfxDeviceGrayColorSpace();
+ }
} else if (csObj->isName("DeviceRGB") || csObj->isName("RGB")) {
- cs = new GfxDeviceRGBColorSpace();
+ if (res != NULL) {
+ Object objCS;
+ res->lookupColorSpace("DefaultRGB", &objCS);
+ if (objCS.isNull()) {
+ cs = new GfxDeviceRGBColorSpace();
+ } else {
+ cs = GfxColorSpace::parse(NULL, &objCS, out, state);
+ }
+ objCS.free();
+ } else {
+ cs = new GfxDeviceRGBColorSpace();
+ }
} else if (csObj->isName("DeviceCMYK") || csObj->isName("CMYK")) {
- cs = new GfxDeviceCMYKColorSpace();
+ if (res != NULL) {
+ Object objCS;
+ res->lookupColorSpace("DefaultCMYK", &objCS);
+ if (objCS.isNull()) {
+ cs = new GfxDeviceCMYKColorSpace();
+ } else {
+ cs = GfxColorSpace::parse(NULL, &objCS, out, state);
+ }
+ objCS.free();
+ } else {
+ cs = new GfxDeviceCMYKColorSpace();
+ }
} else if (csObj->isName("Pattern")) {
cs = new GfxPatternColorSpace(NULL);
} else {
@@ -307,11 +341,44 @@ GfxColorSpace *GfxColorSpace::parse(Object *csObj, OutputDev *out, GfxState *sta
} else if (csObj->isArray() && csObj->arrayGetLength() > 0) {
csObj->arrayGet(0, &obj1);
if (obj1.isName("DeviceGray") || obj1.isName("G")) {
- cs = new GfxDeviceGrayColorSpace();
+ if (res != NULL) {
+ Object objCS;
+ res->lookupColorSpace("DefaultGray", &objCS);
+ if (objCS.isNull()) {
+ cs = new GfxDeviceGrayColorSpace();
+ } else {
+ cs = GfxColorSpace::parse(NULL, &objCS, out, state);
+ }
+ objCS.free();
+ } else {
+ cs = new GfxDeviceGrayColorSpace();
+ }
} else if (obj1.isName("DeviceRGB") || obj1.isName("RGB")) {
- cs = new GfxDeviceRGBColorSpace();
+ if (res != NULL) {
+ Object objCS;
+ res->lookupColorSpace("DefaultRGB", &objCS);
+ if (objCS.isNull()) {
+ cs = new GfxDeviceRGBColorSpace();
+ } else {
+ cs = GfxColorSpace::parse(NULL, &objCS, out, state);
+ }
+ objCS.free();
+ } else {
+ cs = new GfxDeviceRGBColorSpace();
+ }
} else if (obj1.isName("DeviceCMYK") || obj1.isName("CMYK")) {
- cs = new GfxDeviceCMYKColorSpace();
+ if (res != NULL) {
+ Object objCS;
+ res->lookupColorSpace("DefaultCMYK", &objCS);
+ if (objCS.isNull()) {
+ cs = new GfxDeviceCMYKColorSpace();
+ } else {
+ cs = GfxColorSpace::parse(NULL, &objCS, out, state);
+ }
+ objCS.free();
+ } else {
+ cs = new GfxDeviceCMYKColorSpace();
+ }
} else if (obj1.isName("CalGray")) {
cs = GfxCalGrayColorSpace::parse(csObj->getArray(), state);
} else if (obj1.isName("CalRGB")) {
@@ -321,13 +388,13 @@ GfxColorSpace *GfxColorSpace::parse(Object *csObj, OutputDev *out, GfxState *sta
} else if (obj1.isName("ICCBased")) {
cs = GfxICCBasedColorSpace::parse(csObj->getArray(), out, state, recursion);
} else if (obj1.isName("Indexed") || obj1.isName("I")) {
- cs = GfxIndexedColorSpace::parse(csObj->getArray(), out, state, recursion);
+ cs = GfxIndexedColorSpace::parse(res, csObj->getArray(), out, state, recursion);
} else if (obj1.isName("Separation")) {
- cs = GfxSeparationColorSpace::parse(csObj->getArray(), out, state, recursion);
+ cs = GfxSeparationColorSpace::parse(res, csObj->getArray(), out, state, recursion);
} else if (obj1.isName("DeviceN")) {
- cs = GfxDeviceNColorSpace::parse(csObj->getArray(), out, state, recursion);
+ cs = GfxDeviceNColorSpace::parse(res, csObj->getArray(), out, state, recursion);
} else if (obj1.isName("Pattern")) {
- cs = GfxPatternColorSpace::parse(csObj->getArray(), out, state, recursion);
+ cs = GfxPatternColorSpace::parse(res, csObj->getArray(), out, state, recursion);
} else {
error(errSyntaxWarning, -1, "Bad color space");
}
@@ -335,11 +402,44 @@ GfxColorSpace *GfxColorSpace::parse(Object *csObj, OutputDev *out, GfxState *sta
} else if (csObj->isDict()) {
csObj->dictLookup("ColorSpace", &obj1);
if (obj1.isName("DeviceGray")) {
- cs = new GfxDeviceGrayColorSpace();
+ if (res != NULL) {
+ Object objCS;
+ res->lookupColorSpace("DefaultGray", &objCS);
+ if (objCS.isNull()) {
+ cs = new GfxDeviceGrayColorSpace();
+ } else {
+ cs = GfxColorSpace::parse(NULL, &objCS, out, state);
+ }
+ objCS.free();
+ } else {
+ cs = new GfxDeviceGrayColorSpace();
+ }
} else if (obj1.isName("DeviceRGB")) {
- cs = new GfxDeviceRGBColorSpace();
+ if (res != NULL) {
+ Object objCS;
+ res->lookupColorSpace("DefaultRGB", &objCS);
+ if (objCS.isNull()) {
+ cs = new GfxDeviceRGBColorSpace();
+ } else {
+ cs = GfxColorSpace::parse(NULL, &objCS, out, state);
+ }
+ objCS.free();
+ } else {
+ cs = new GfxDeviceRGBColorSpace();
+ }
} else if (obj1.isName("DeviceCMYK")) {
- cs = new GfxDeviceCMYKColorSpace();
+ if (res != NULL) {
+ Object objCS;
+ res->lookupColorSpace("DefaultCMYK", &objCS);
+ if (objCS.isNull()) {
+ cs = new GfxDeviceCMYKColorSpace();
+ } else {
+ cs = GfxColorSpace::parse(NULL, &objCS, out, state);
+ }
+ objCS.free();
+ } else {
+ cs = new GfxDeviceCMYKColorSpace();
+ }
} else {
error(errSyntaxWarning, -1, "Bad color space dict'");
}
@@ -452,7 +552,7 @@ int GfxColorSpace::setupColorProfiles()
INTENT_RELATIVE_COLORIMETRIC,LCMS_FLAGS)) == 0) {
error(errSyntaxWarning, -1, "Can't create Lab transform");
} else {
- XYZ2DisplayTransform = new GfxColorTransform(transform, INTENT_RELATIVE_COLORIMETRIC, displayPixelType);
+ XYZ2DisplayTransform = new GfxColorTransform(transform, INTENT_RELATIVE_COLORIMETRIC, PT_XYZ, displayPixelType);
}
cmsCloseProfile(XYZProfile);
}
@@ -1871,7 +1971,7 @@ GfxColorSpace *GfxICCBasedColorSpace::parse(Array *arr, OutputDev *out, GfxState
nCompsA = 4;
}
if (dict->lookup("Alternate", &obj2)->isNull() ||
- !(altA = GfxColorSpace::parse(&obj2, out, state, recursion + 1))) {
+ !(altA = GfxColorSpace::parse(NULL, &obj2, out, state, recursion + 1))) {
switch (nCompsA) {
case 1:
altA = new GfxDeviceGrayColorSpace();
@@ -1950,7 +2050,7 @@ GfxColorSpace *GfxICCBasedColorSpace::parse(Array *arr, OutputDev *out, GfxState
error(errSyntaxWarning, -1, "Can't create transform");
cs->transform = NULL;
} else {
- cs->transform = new GfxColorTransform(transform, cmsIntent, dcst);
+ cs->transform = new GfxColorTransform(transform, cmsIntent, cst, dcst);
}
if (dcst == PT_RGB || dcst == PT_CMYK) {
// create line transform only when the display is RGB type color space
@@ -1960,7 +2060,7 @@ GfxColorSpace *GfxICCBasedColorSpace::parse(Array *arr, OutputDev *out, GfxState
error(errSyntaxWarning, -1, "Can't create transform");
cs->lineTransform = NULL;
} else {
- cs->lineTransform = new GfxColorTransform(transform, cmsIntent, dcst);
+ cs->lineTransform = new GfxColorTransform(transform, cmsIntent, cst, dcst);
}
}
cmsCloseProfile(hp);
@@ -1982,8 +2082,14 @@ void GfxICCBasedColorSpace::getGray(GfxColor *color, GfxGray *gray) {
Guchar in[gfxColorMaxComps];
Guchar out[gfxColorMaxComps];
- for (int i = 0;i < nComps;i++) {
+ if (nComps == 3 && transform->getInputPixelType() == PT_Lab) {
+ in[0] = colToByte(dblToCol(colToDbl(color->c[0]) / 100.0));
+ in[1] = colToByte(dblToCol((colToDbl(color->c[1]) + 128.0) / 255.0));
+ in[2] = colToByte(dblToCol((colToDbl(color->c[2]) + 128.0) / 255.0));
+ } else {
+ for (int i = 0;i < nComps;i++) {
in[i] = colToByte(color->c[i]);
+ }
}
if (nComps <= 4) {
unsigned int key = 0;
@@ -2025,8 +2131,14 @@ void GfxICCBasedColorSpace::getRGB(GfxColor *color, GfxRGB *rgb) {
Guchar in[gfxColorMaxComps];
Guchar out[gfxColorMaxComps];
- for (int i = 0;i < nComps;i++) {
+ if (nComps == 3 && transform->getInputPixelType() == PT_Lab) {
+ in[0] = colToByte(dblToCol(colToDbl(color->c[0]) / 100.0));
+ in[1] = colToByte(dblToCol((colToDbl(color->c[1]) + 128.0) / 255.0));
+ in[2] = colToByte(dblToCol((colToDbl(color->c[2]) + 128.0) / 255.0));
+ } else {
+ for (int i = 0;i < nComps;i++) {
in[i] = colToByte(color->c[i]);
+ }
}
if (nComps <= 4) {
unsigned int key = 0;
@@ -2059,8 +2171,14 @@ void GfxICCBasedColorSpace::getRGB(GfxColor *color, GfxRGB *rgb) {
Guchar out[gfxColorMaxComps];
double c, m, y, k, c1, m1, y1, k1, r, g, b;
- for (int i = 0;i < nComps;i++) {
+ if (nComps == 3 && transform->getInputPixelType() == PT_Lab) {
+ in[0] = colToByte(dblToCol(colToDbl(color->c[0]) / 100.0));
+ in[1] = colToByte(dblToCol((colToDbl(color->c[1]) + 128.0) / 255.0));
+ in[2] = colToByte(dblToCol((colToDbl(color->c[2]) + 128.0) / 255.0));
+ } else {
+ for (int i = 0;i < nComps;i++) {
in[i] = colToByte(color->c[i]);
+ }
}
if (nComps <= 4) {
unsigned int key = 0;
@@ -2271,8 +2389,14 @@ void GfxICCBasedColorSpace::getCMYK(GfxColor *color, GfxCMYK *cmyk) {
Guchar in[gfxColorMaxComps];
Guchar out[gfxColorMaxComps];
- for (int i = 0;i < nComps;i++) {
+ if (nComps == 3 && transform->getInputPixelType() == PT_Lab) {
+ in[0] = colToByte(dblToCol(colToDbl(color->c[0]) / 100.0));
+ in[1] = colToByte(dblToCol((colToDbl(color->c[1]) + 128.0) / 255.0));
+ in[2] = colToByte(dblToCol((colToDbl(color->c[2]) + 128.0) / 255.0));
+ } else {
+ for (int i = 0;i < nComps;i++) {
in[i] = colToByte(color->c[i]);
+ }
}
if (nComps <= 4) {
unsigned int key = 0;
@@ -2422,7 +2546,7 @@ GfxColorSpace *GfxIndexedColorSpace::copy() {
return cs;
}
-GfxColorSpace *GfxIndexedColorSpace::parse(Array *arr, OutputDev *out, GfxState *state, int recursion) {
+GfxColorSpace *GfxIndexedColorSpace::parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion) {
GfxIndexedColorSpace *cs;
GfxColorSpace *baseA;
int indexHighA;
@@ -2435,7 +2559,7 @@ GfxColorSpace *GfxIndexedColorSpace::parse(Array *arr, OutputDev *out, GfxState
goto err1;
}
arr->get(1, &obj1);
- if (!(baseA = GfxColorSpace::parse(&obj1, out, state, recursion + 1))) {
+ if (!(baseA = GfxColorSpace::parse(res, &obj1, out, state, recursion + 1))) {
error(errSyntaxWarning, -1, "Bad Indexed color space (base color space)");
goto err2;
}
@@ -2687,7 +2811,7 @@ GfxColorSpace *GfxSeparationColorSpace::copy() {
}
//~ handle the 'All' and 'None' colorants
-GfxColorSpace *GfxSeparationColorSpace::parse(Array *arr, OutputDev *out, GfxState *state, int recursion) {
+GfxColorSpace *GfxSeparationColorSpace::parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion) {
GfxSeparationColorSpace *cs;
GooString *nameA;
GfxColorSpace *altA;
@@ -2705,7 +2829,7 @@ GfxColorSpace *GfxSeparationColorSpace::parse(Array *arr, OutputDev *out, GfxSta
nameA = new GooString(obj1.getName());
obj1.free();
arr->get(2, &obj1);
- if (!(altA = GfxColorSpace::parse(&obj1, out, state, recursion + 1))) {
+ if (!(altA = GfxColorSpace::parse(res, &obj1, out, state, recursion + 1))) {
error(errSyntaxWarning, -1, "Bad Separation color space (alternate color space)");
goto err3;
}
@@ -2936,7 +3060,7 @@ GfxColorSpace *GfxDeviceNColorSpace::copy() {
}
//~ handle the 'None' colorant
-GfxColorSpace *GfxDeviceNColorSpace::parse(Array *arr, OutputDev *out, GfxState *state, int recursion) {
+GfxColorSpace *GfxDeviceNColorSpace::parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion) {
GfxDeviceNColorSpace *cs;
int nCompsA;
GooString *namesA[gfxColorMaxComps];
@@ -2971,7 +3095,7 @@ GfxColorSpace *GfxDeviceNColorSpace::parse(Array *arr, OutputDev *out, GfxState
}
obj1.free();
arr->get(2, &obj1);
- if (!(altA = GfxColorSpace::parse(&obj1, out, state, recursion + 1))) {
+ if (!(altA = GfxColorSpace::parse(res, &obj1, out, state, recursion + 1))) {
error(errSyntaxWarning, -1, "Bad DeviceN color space (alternate color space)");
goto err3;
}
@@ -2994,7 +3118,7 @@ GfxColorSpace *GfxDeviceNColorSpace::parse(Array *arr, OutputDev *out, GfxState
Object obj3;
colorants->getVal(i, &obj3);
if (obj3.isArray()) {
- separationList->append(GfxSeparationColorSpace::parse(obj3.getArray(), out, state, recursion));
+ separationList->append(GfxSeparationColorSpace::parse(res, obj3.getArray(), out, state, recursion));
} else {
obj3.free();
obj2.free();
@@ -3202,7 +3326,7 @@ GfxColorSpace *GfxPatternColorSpace::copy() {
(GfxColorSpace *)NULL);
}
-GfxColorSpace *GfxPatternColorSpace::parse(Array *arr, OutputDev *out, GfxState *state, int recursion) {
+GfxColorSpace *GfxPatternColorSpace::parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion) {
GfxPatternColorSpace *cs;
GfxColorSpace *underA;
Object obj1;
@@ -3214,7 +3338,7 @@ GfxColorSpace *GfxPatternColorSpace::parse(Array *arr, OutputDev *out, GfxState
underA = NULL;
if (arr->getLength() == 2) {
arr->get(1, &obj1);
- if (!(underA = GfxColorSpace::parse(&obj1, out, state, recursion + 1))) {
+ if (!(underA = GfxColorSpace::parse(res, &obj1, out, state, recursion + 1))) {
error(errSyntaxWarning, -1, "Bad Pattern color space (underlying color space)");
obj1.free();
return NULL;
@@ -3259,7 +3383,7 @@ GfxPattern::GfxPattern(int typeA) {
GfxPattern::~GfxPattern() {
}
-GfxPattern *GfxPattern::parse(Object *obj, OutputDev *out, GfxState *state) {
+GfxPattern *GfxPattern::parse(GfxResources *res, Object *obj, OutputDev *out, GfxState *state) {
GfxPattern *pattern;
Object obj1;
@@ -3274,7 +3398,7 @@ GfxPattern *GfxPattern::parse(Object *obj, OutputDev *out, GfxState *state) {
if (obj1.isInt() && obj1.getInt() == 1) {
pattern = GfxTilingPattern::parse(obj);
} else if (obj1.isInt() && obj1.getInt() == 2) {
- pattern = GfxShadingPattern::parse(obj, out, state);
+ pattern = GfxShadingPattern::parse(res, obj, out, state);
}
obj1.free();
return pattern;
@@ -3402,7 +3526,7 @@ GfxPattern *GfxTilingPattern::copy() {
// GfxShadingPattern
//------------------------------------------------------------------------
-GfxShadingPattern *GfxShadingPattern::parse(Object *patObj, OutputDev *out, GfxState *state) {
+GfxShadingPattern *GfxShadingPattern::parse(GfxResources *res, Object *patObj, OutputDev *out, GfxState *state) {
Dict *dict;
GfxShading *shadingA;
double matrixA[6];
@@ -3415,7 +3539,7 @@ GfxShadingPattern *GfxShadingPattern::parse(Object *patObj, OutputDev *out, GfxS
dict = patObj->getDict();
dict->lookup("Shading", &obj1);
- shadingA = GfxShading::parse(&obj1, out, state);
+ shadingA = GfxShading::parse(res, &obj1, out, state);
obj1.free();
if (!shadingA) {
return NULL;
@@ -3488,7 +3612,7 @@ GfxShading::~GfxShading() {
}
}
-GfxShading *GfxShading::parse(Object *obj, OutputDev *out, GfxState *state) {
+GfxShading *GfxShading::parse(GfxResources *res, Object *obj, OutputDev *out, GfxState *state) {
GfxShading *shading;
Dict *dict;
int typeA;
@@ -3512,17 +3636,17 @@ GfxShading *GfxShading::parse(Object *obj, OutputDev *out, GfxState *state) {
switch (typeA) {
case 1:
- shading = GfxFunctionShading::parse(dict, out, state);
+ shading = GfxFunctionShading::parse(res, dict, out, state);
break;
case 2:
- shading = GfxAxialShading::parse(dict, out, state);
+ shading = GfxAxialShading::parse(res, dict, out, state);
break;
case 3:
- shading = GfxRadialShading::parse(dict, out, state);
+ shading = GfxRadialShading::parse(res, dict, out, state);
break;
case 4:
if (obj->isStream()) {
- shading = GfxGouraudTriangleShading::parse(4, dict, obj->getStream(), out, state);
+ shading = GfxGouraudTriangleShading::parse(res, 4, dict, obj->getStream(), out, state);
} else {
error(errSyntaxWarning, -1, "Invalid Type 4 shading object");
goto err1;
@@ -3530,7 +3654,7 @@ GfxShading *GfxShading::parse(Object *obj, OutputDev *out, GfxState *state) {
break;
case 5:
if (obj->isStream()) {
- shading = GfxGouraudTriangleShading::parse(5, dict, obj->getStream(), out, state);
+ shading = GfxGouraudTriangleShading::parse(res, 5, dict, obj->getStream(), out, state);
} else {
error(errSyntaxWarning, -1, "Invalid Type 5 shading object");
goto err1;
@@ -3538,7 +3662,7 @@ GfxShading *GfxShading::parse(Object *obj, OutputDev *out, GfxState *state) {
break;
case 6:
if (obj->isStream()) {
- shading = GfxPatchMeshShading::parse(6, dict, obj->getStream(), out, state);
+ shading = GfxPatchMeshShading::parse(res, 6, dict, obj->getStream(), out, state);
} else {
error(errSyntaxWarning, -1, "Invalid Type 6 shading object");
goto err1;
@@ -3546,7 +3670,7 @@ GfxShading *GfxShading::parse(Object *obj, OutputDev *out, GfxState *state) {
break;
case 7:
if (obj->isStream()) {
- shading = GfxPatchMeshShading::parse(7, dict, obj->getStream(), out, state);
+ shading = GfxPatchMeshShading::parse(res, 7, dict, obj->getStream(), out, state);
} else {
error(errSyntaxWarning, -1, "Invalid Type 7 shading object");
goto err1;
@@ -3563,12 +3687,12 @@ GfxShading *GfxShading::parse(Object *obj, OutputDev *out, GfxState *state) {
return NULL;
}
-GBool GfxShading::init(Dict *dict, OutputDev *out, GfxState *state) {
+GBool GfxShading::init(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state) {
Object obj1, obj2;
int i;
dict->lookup("ColorSpace", &obj1);
- if (!(colorSpace = GfxColorSpace::parse(&obj1, out, state))) {
+ if (!(colorSpace = GfxColorSpace::parse(res, &obj1, out, state))) {
error(errSyntaxWarning, -1, "Bad color space in shading dictionary");
obj1.free();
return gFalse;
@@ -3675,7 +3799,7 @@ GfxFunctionShading::~GfxFunctionShading() {
}
}
-GfxFunctionShading *GfxFunctionShading::parse(Dict *dict, OutputDev *out, GfxState *state) {
+GfxFunctionShading *GfxFunctionShading::parse(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state) {
GfxFunctionShading *shading;
double x0A, y0A, x1A, y1A;
double matrixA[6];
@@ -3743,7 +3867,7 @@ GfxFunctionShading *GfxFunctionShading::parse(Dict *dict, OutputDev *out, GfxSta
shading = new GfxFunctionShading(x0A, y0A, x1A, y1A, matrixA,
funcsA, nFuncsA);
- if (!shading->init(dict, out, state)) {
+ if (!shading->init(res, dict, out, state)) {
delete shading;
return NULL;
}
@@ -3994,7 +4118,7 @@ GfxAxialShading::GfxAxialShading(GfxAxialShading *shading):
GfxAxialShading::~GfxAxialShading() {
}
-GfxAxialShading *GfxAxialShading::parse(Dict *dict, OutputDev *out, GfxState *state) {
+GfxAxialShading *GfxAxialShading::parse(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state) {
GfxAxialShading *shading;
double x0A, y0A, x1A, y1A;
double t0A, t1A;
@@ -4091,7 +4215,7 @@ GfxAxialShading *GfxAxialShading::parse(Dict *dict, OutputDev *out, GfxState *st
shading = new GfxAxialShading(x0A, y0A, x1A, y1A, t0A, t1A,
funcsA, nFuncsA, extend0A, extend1A);
- if (!shading->init(dict, out, state)) {
+ if (!shading->init(res, dict, out, state)) {
delete shading;
return NULL;
}
@@ -4202,7 +4326,7 @@ GfxRadialShading::GfxRadialShading(GfxRadialShading *shading):
GfxRadialShading::~GfxRadialShading() {
}
-GfxRadialShading *GfxRadialShading::parse(Dict *dict, OutputDev *out, GfxState *state) {
+GfxRadialShading *GfxRadialShading::parse(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state) {
GfxRadialShading *shading;
double x0A, y0A, r0A, x1A, y1A, r1A;
double t0A, t1A;
@@ -4281,7 +4405,7 @@ GfxRadialShading *GfxRadialShading::parse(Dict *dict, OutputDev *out, GfxState *
shading = new GfxRadialShading(x0A, y0A, r0A, x1A, y1A, r1A, t0A, t1A,
funcsA, nFuncsA, extend0A, extend1A);
- if (!shading->init(dict, out, state)) {
+ if (!shading->init(res, dict, out, state)) {
delete shading;
return NULL;
}
@@ -4722,7 +4846,7 @@ GfxGouraudTriangleShading::~GfxGouraudTriangleShading() {
}
}
-GfxGouraudTriangleShading *GfxGouraudTriangleShading::parse(int typeA,
+GfxGouraudTriangleShading *GfxGouraudTriangleShading::parse(GfxResources *res, int typeA,
Dict *dict,
Stream *str,
OutputDev *out, GfxState *gfxState) {
@@ -4921,7 +5045,7 @@ GfxGouraudTriangleShading *GfxGouraudTriangleShading::parse(int typeA,
shading = new GfxGouraudTriangleShading(typeA, verticesA, nVerticesA,
trianglesA, nTrianglesA,
funcsA, nFuncsA);
- if (!shading->init(dict, out, gfxState)) {
+ if (!shading->init(res, dict, out, gfxState)) {
delete shading;
return NULL;
}
@@ -5067,7 +5191,7 @@ GfxPatchMeshShading::~GfxPatchMeshShading() {
}
}
-GfxPatchMeshShading *GfxPatchMeshShading::parse(int typeA, Dict *dict,
+GfxPatchMeshShading *GfxPatchMeshShading::parse(GfxResources *res, int typeA, Dict *dict,
Stream *str, OutputDev *out, GfxState *state) {
GfxPatchMeshShading *shading;
Function *funcsA[gfxColorMaxComps];
@@ -5592,7 +5716,7 @@ GfxPatchMeshShading *GfxPatchMeshShading::parse(int typeA, Dict *dict,
shading = new GfxPatchMeshShading(typeA, patchesA, nPatchesA,
funcsA, nFuncsA);
- if (!shading->init(dict, out, state)) {
+ if (!shading->init(res, dict, out, state)) {
delete shading;
return NULL;
}
@@ -6668,7 +6792,7 @@ void GfxState::setDisplayProfile(cmsHPROFILE localDisplayProfileA) {
INTENT_RELATIVE_COLORIMETRIC,LCMS_FLAGS)) == 0) {
error(errSyntaxWarning, -1, "Can't create Lab transform");
} else {
- XYZ2DisplayTransformRelCol = new GfxColorTransform(transform, INTENT_RELATIVE_COLORIMETRIC, localDisplayPixelType);
+ XYZ2DisplayTransformRelCol = new GfxColorTransform(transform, INTENT_RELATIVE_COLORIMETRIC, PT_XYZ, localDisplayPixelType);
}
if ((transform = cmsCreateTransform(XYZProfile, TYPE_XYZ_DBL,
localDisplayProfile,
@@ -6677,7 +6801,7 @@ void GfxState::setDisplayProfile(cmsHPROFILE localDisplayProfileA) {
INTENT_ABSOLUTE_COLORIMETRIC,LCMS_FLAGS)) == 0) {
error(errSyntaxWarning, -1, "Can't create Lab transform");
} else {
- XYZ2DisplayTransformAbsCol = new GfxColorTransform(transform, INTENT_ABSOLUTE_COLORIMETRIC, localDisplayPixelType);
+ XYZ2DisplayTransformAbsCol = new GfxColorTransform(transform, INTENT_ABSOLUTE_COLORIMETRIC, PT_XYZ, localDisplayPixelType);
}
if ((transform = cmsCreateTransform(XYZProfile, TYPE_XYZ_DBL,
localDisplayProfile,
@@ -6686,7 +6810,7 @@ void GfxState::setDisplayProfile(cmsHPROFILE localDisplayProfileA) {
INTENT_SATURATION,LCMS_FLAGS)) == 0) {
error(errSyntaxWarning, -1, "Can't create Lab transform");
} else {
- XYZ2DisplayTransformSat = new GfxColorTransform(transform, INTENT_SATURATION, localDisplayPixelType);
+ XYZ2DisplayTransformSat = new GfxColorTransform(transform, INTENT_SATURATION, PT_XYZ, localDisplayPixelType);
}
if ((transform = cmsCreateTransform(XYZProfile, TYPE_XYZ_DBL,
localDisplayProfile,
@@ -6695,7 +6819,7 @@ void GfxState::setDisplayProfile(cmsHPROFILE localDisplayProfileA) {
INTENT_PERCEPTUAL,LCMS_FLAGS)) == 0) {
error(errSyntaxWarning, -1, "Can't create Lab transform");
} else {
- XYZ2DisplayTransformPerc = new GfxColorTransform(transform, INTENT_PERCEPTUAL, localDisplayPixelType);
+ XYZ2DisplayTransformPerc = new GfxColorTransform(transform, INTENT_PERCEPTUAL, PT_XYZ, localDisplayPixelType);
}
cmsCloseProfile(XYZProfile);
}
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/GfxState.h b/source/libs/poppler/poppler-0.29.0/poppler/GfxState.h
similarity index 96%
rename from source/libs/poppler/poppler-0.28.0/poppler/GfxState.h
rename to source/libs/poppler/poppler-0.29.0/poppler/GfxState.h
index 106b2c0bf0064c54675de211d23f03349fd01fbf..f018e93dd341ba79d5794414f7c3b6597d7b4a7f 100644
--- a/source/libs/poppler/poppler-0.28.0/poppler/GfxState.h
+++ b/source/libs/poppler/poppler-0.29.0/poppler/GfxState.h
@@ -20,7 +20,7 @@
// Copyright (C) 2009-2011, 2013 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
// Copyright (C) 2011 Andrea Canciani <ranma42@gmail.com>
-// Copyright (C) 2011-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2011-2014 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2013 Lu Wang <coolwanglu@gmail.com>
//
// To see a description of the changes please see the Changelog file that
@@ -53,6 +53,7 @@ class PopplerCache;
class GooList;
class OutputDev;
class GfxState;
+class GfxResources;
class Matrix {
public:
@@ -182,9 +183,10 @@ class GfxColorTransform {
public:
void doTransform(void *in, void *out, unsigned int size);
// transformA should be a cmsHTRANSFORM
- GfxColorTransform(void *transformA, int cmsIntent, unsigned int transformPixelType);
+ GfxColorTransform(void *transformA, int cmsIntent, unsigned int inputPixelType, unsigned int transformPixelType);
~GfxColorTransform();
int getIntent() { return cmsIntent; }
+ int getInputPixelType() { return inputPixelType; }
int getTransformPixelType() { return transformPixelType; }
void ref();
unsigned int unref();
@@ -193,6 +195,7 @@ private:
void *transform;
unsigned int refCount;
int cmsIntent;
+ unsigned int inputPixelType;
unsigned int transformPixelType;
};
@@ -205,7 +208,7 @@ public:
virtual GfxColorSpaceMode getMode() = 0;
// Construct a color space. Returns NULL if unsuccessful.
- static GfxColorSpace *parse(Object *csObj, OutputDev *out, GfxState *state, int recursion = 0);
+ static GfxColorSpace *parse(GfxResources *res, Object *csObj, OutputDev *out, GfxState *state, int recursion = 0);
// Convert to gray, RGB, or CMYK.
virtual void getGray(GfxColor *color, GfxGray *gray) = 0;
@@ -578,7 +581,7 @@ public:
virtual GfxColorSpaceMode getMode() { return csIndexed; }
// Construct an Indexed color space. Returns NULL if unsuccessful.
- static GfxColorSpace *parse(Array *arr, OutputDev *out, GfxState *state, int recursion);
+ static GfxColorSpace *parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion);
virtual void getGray(GfxColor *color, GfxGray *gray);
virtual void getRGB(GfxColor *color, GfxRGB *rgb);
@@ -631,7 +634,7 @@ public:
virtual GfxColorSpaceMode getMode() { return csSeparation; }
// Construct a Separation color space. Returns NULL if unsuccessful.
- static GfxColorSpace *parse(Array *arr, OutputDev *out, GfxState *state, int recursion);
+ static GfxColorSpace *parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion);
virtual void getGray(GfxColor *color, GfxGray *gray);
virtual void getRGB(GfxColor *color, GfxRGB *rgb);
@@ -676,7 +679,7 @@ public:
virtual GfxColorSpaceMode getMode() { return csDeviceN; }
// Construct a DeviceN color space. Returns NULL if unsuccessful.
- static GfxColorSpace *parse(Array *arr, OutputDev *out, GfxState *state, int recursion);
+ static GfxColorSpace *parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion);
virtual void getGray(GfxColor *color, GfxGray *gray);
virtual void getRGB(GfxColor *color, GfxRGB *rgb);
@@ -723,7 +726,7 @@ public:
virtual GfxColorSpaceMode getMode() { return csPattern; }
// Construct a Pattern color space. Returns NULL if unsuccessful.
- static GfxColorSpace *parse(Array *arr, OutputDev *out, GfxState *state, int recursion);
+ static GfxColorSpace *parse(GfxResources *res, Array *arr, OutputDev *out, GfxState *state, int recursion);
virtual void getGray(GfxColor *color, GfxGray *gray);
virtual void getRGB(GfxColor *color, GfxRGB *rgb);
@@ -752,7 +755,7 @@ public:
GfxPattern(int typeA);
virtual ~GfxPattern();
- static GfxPattern *parse(Object *obj, OutputDev *out, GfxState *state);
+ static GfxPattern *parse(GfxResources *res, Object *obj, OutputDev *out, GfxState *state);
virtual GfxPattern *copy() = 0;
@@ -808,7 +811,7 @@ private:
class GfxShadingPattern: public GfxPattern {
public:
- static GfxShadingPattern *parse(Object *patObj, OutputDev *out, GfxState *state);
+ static GfxShadingPattern *parse(GfxResources *res, Object *patObj, OutputDev *out, GfxState *state);
virtual ~GfxShadingPattern();
virtual GfxPattern *copy();
@@ -835,7 +838,7 @@ public:
GfxShading(GfxShading *shading);
virtual ~GfxShading();
- static GfxShading *parse(Object *obj, OutputDev *out, GfxState *state);
+ static GfxShading *parse(GfxResources *res, Object *obj, OutputDev *out, GfxState *state);
virtual GfxShading *copy() = 0;
@@ -849,7 +852,7 @@ public:
protected:
- GBool init(Dict *dict, OutputDev *out, GfxState *state);
+ GBool init(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state);
int type;
GfxColorSpace *colorSpace;
@@ -918,7 +921,7 @@ public:
GfxFunctionShading(GfxFunctionShading *shading);
virtual ~GfxFunctionShading();
- static GfxFunctionShading *parse(Dict *dict, OutputDev *out, GfxState *state);
+ static GfxFunctionShading *parse(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state);
virtual GfxShading *copy();
@@ -952,7 +955,7 @@ public:
GfxAxialShading(GfxAxialShading *shading);
virtual ~GfxAxialShading();
- static GfxAxialShading *parse(Dict *dict, OutputDev *out, GfxState *state);
+ static GfxAxialShading *parse(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state);
virtual GfxShading *copy();
@@ -985,7 +988,7 @@ public:
GfxRadialShading(GfxRadialShading *shading);
virtual ~GfxRadialShading();
- static GfxRadialShading *parse(Dict *dict, OutputDev *out, GfxState *state);
+ static GfxRadialShading *parse(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state);
virtual GfxShading *copy();
@@ -1023,7 +1026,7 @@ public:
GfxGouraudTriangleShading(GfxGouraudTriangleShading *shading);
virtual ~GfxGouraudTriangleShading();
- static GfxGouraudTriangleShading *parse(int typeA, Dict *dict, Stream *str, OutputDev *out, GfxState *state);
+ static GfxGouraudTriangleShading *parse(GfxResources *res, int typeA, Dict *dict, Stream *str, OutputDev *out, GfxState *state);
virtual GfxShading *copy();
@@ -1109,7 +1112,7 @@ public:
GfxPatchMeshShading(GfxPatchMeshShading *shading);
virtual ~GfxPatchMeshShading();
- static GfxPatchMeshShading *parse(int typeA, Dict *dict, Stream *str, OutputDev *out, GfxState *state);
+ static GfxPatchMeshShading *parse(GfxResources *res, int typeA, Dict *dict, Stream *str, OutputDev *out, GfxState *state);
virtual GfxShading *copy();
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/GfxState_helpers.h b/source/libs/poppler/poppler-0.29.0/poppler/GfxState_helpers.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/GfxState_helpers.h
rename to source/libs/poppler/poppler-0.29.0/poppler/GfxState_helpers.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/GlobalParams.cc b/source/libs/poppler/poppler-0.29.0/poppler/GlobalParams.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/GlobalParams.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/GlobalParams.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/GlobalParams.h b/source/libs/poppler/poppler-0.29.0/poppler/GlobalParams.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/GlobalParams.h
rename to source/libs/poppler/poppler-0.29.0/poppler/GlobalParams.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/GlobalParamsWin.cc b/source/libs/poppler/poppler-0.29.0/poppler/GlobalParamsWin.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/GlobalParamsWin.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/GlobalParamsWin.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Hints.cc b/source/libs/poppler/poppler-0.29.0/poppler/Hints.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Hints.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/Hints.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Hints.h b/source/libs/poppler/poppler-0.29.0/poppler/Hints.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Hints.h
rename to source/libs/poppler/poppler-0.29.0/poppler/Hints.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/JArithmeticDecoder.cc b/source/libs/poppler/poppler-0.29.0/poppler/JArithmeticDecoder.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/JArithmeticDecoder.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/JArithmeticDecoder.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/JArithmeticDecoder.h b/source/libs/poppler/poppler-0.29.0/poppler/JArithmeticDecoder.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/JArithmeticDecoder.h
rename to source/libs/poppler/poppler-0.29.0/poppler/JArithmeticDecoder.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/JBIG2Stream.cc b/source/libs/poppler/poppler-0.29.0/poppler/JBIG2Stream.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/JBIG2Stream.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/JBIG2Stream.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/JBIG2Stream.h b/source/libs/poppler/poppler-0.29.0/poppler/JBIG2Stream.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/JBIG2Stream.h
rename to source/libs/poppler/poppler-0.29.0/poppler/JBIG2Stream.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/JPEG2000Stream.cc b/source/libs/poppler/poppler-0.29.0/poppler/JPEG2000Stream.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/JPEG2000Stream.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/JPEG2000Stream.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/JPEG2000Stream.h b/source/libs/poppler/poppler-0.29.0/poppler/JPEG2000Stream.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/JPEG2000Stream.h
rename to source/libs/poppler/poppler-0.29.0/poppler/JPEG2000Stream.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/JPXStream.cc b/source/libs/poppler/poppler-0.29.0/poppler/JPXStream.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/JPXStream.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/JPXStream.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/JPXStream.h b/source/libs/poppler/poppler-0.29.0/poppler/JPXStream.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/JPXStream.h
rename to source/libs/poppler/poppler-0.29.0/poppler/JPXStream.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Lexer.cc b/source/libs/poppler/poppler-0.29.0/poppler/Lexer.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Lexer.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/Lexer.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Lexer.h b/source/libs/poppler/poppler-0.29.0/poppler/Lexer.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Lexer.h
rename to source/libs/poppler/poppler-0.29.0/poppler/Lexer.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Linearization.cc b/source/libs/poppler/poppler-0.29.0/poppler/Linearization.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Linearization.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/Linearization.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Linearization.h b/source/libs/poppler/poppler-0.29.0/poppler/Linearization.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Linearization.h
rename to source/libs/poppler/poppler-0.29.0/poppler/Linearization.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Link.cc b/source/libs/poppler/poppler-0.29.0/poppler/Link.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Link.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/Link.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Link.h b/source/libs/poppler/poppler-0.29.0/poppler/Link.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Link.h
rename to source/libs/poppler/poppler-0.29.0/poppler/Link.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/LocalPDFDocBuilder.cc b/source/libs/poppler/poppler-0.29.0/poppler/LocalPDFDocBuilder.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/LocalPDFDocBuilder.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/LocalPDFDocBuilder.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/LocalPDFDocBuilder.h b/source/libs/poppler/poppler-0.29.0/poppler/LocalPDFDocBuilder.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/LocalPDFDocBuilder.h
rename to source/libs/poppler/poppler-0.29.0/poppler/LocalPDFDocBuilder.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Makefile.am b/source/libs/poppler/poppler-0.29.0/poppler/Makefile.am
similarity index 99%
rename from source/libs/poppler/poppler-0.28.0/poppler/Makefile.am
rename to source/libs/poppler/poppler-0.29.0/poppler/Makefile.am
index 54f2197d7396e281e824c23ba77e23a7243c4524..01fe01e585d316a55f74609aa9a0c7ee3a254d4e 100644
--- a/source/libs/poppler/poppler-0.28.0/poppler/Makefile.am
+++ b/source/libs/poppler/poppler-0.29.0/poppler/Makefile.am
@@ -296,7 +296,7 @@ libpoppler_la_LIBADD = \
$(win32_libs)
libpoppler_la_LDFLAGS = \
- -version-info 47:0:0 \
+ -version-info 48:0:0 \
@create_shared_lib@ \
@auto_import_flags@
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/MarkedContentOutputDev.cc b/source/libs/poppler/poppler-0.29.0/poppler/MarkedContentOutputDev.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/MarkedContentOutputDev.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/MarkedContentOutputDev.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/MarkedContentOutputDev.h b/source/libs/poppler/poppler-0.29.0/poppler/MarkedContentOutputDev.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/MarkedContentOutputDev.h
rename to source/libs/poppler/poppler-0.29.0/poppler/MarkedContentOutputDev.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Movie.cc b/source/libs/poppler/poppler-0.29.0/poppler/Movie.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Movie.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/Movie.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Movie.h b/source/libs/poppler/poppler-0.29.0/poppler/Movie.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Movie.h
rename to source/libs/poppler/poppler-0.29.0/poppler/Movie.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/NameToCharCode.cc b/source/libs/poppler/poppler-0.29.0/poppler/NameToCharCode.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/NameToCharCode.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/NameToCharCode.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/NameToCharCode.h b/source/libs/poppler/poppler-0.29.0/poppler/NameToCharCode.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/NameToCharCode.h
rename to source/libs/poppler/poppler-0.29.0/poppler/NameToCharCode.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/NameToUnicodeTable.h b/source/libs/poppler/poppler-0.29.0/poppler/NameToUnicodeTable.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/NameToUnicodeTable.h
rename to source/libs/poppler/poppler-0.29.0/poppler/NameToUnicodeTable.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Object.cc b/source/libs/poppler/poppler-0.29.0/poppler/Object.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Object.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/Object.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Object.h b/source/libs/poppler/poppler-0.29.0/poppler/Object.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Object.h
rename to source/libs/poppler/poppler-0.29.0/poppler/Object.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/OptionalContent.cc b/source/libs/poppler/poppler-0.29.0/poppler/OptionalContent.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/OptionalContent.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/OptionalContent.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/OptionalContent.h b/source/libs/poppler/poppler-0.29.0/poppler/OptionalContent.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/OptionalContent.h
rename to source/libs/poppler/poppler-0.29.0/poppler/OptionalContent.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Outline.cc b/source/libs/poppler/poppler-0.29.0/poppler/Outline.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Outline.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/Outline.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Outline.h b/source/libs/poppler/poppler-0.29.0/poppler/Outline.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Outline.h
rename to source/libs/poppler/poppler-0.29.0/poppler/Outline.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/OutputDev.cc b/source/libs/poppler/poppler-0.29.0/poppler/OutputDev.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/OutputDev.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/OutputDev.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/OutputDev.h b/source/libs/poppler/poppler-0.29.0/poppler/OutputDev.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/OutputDev.h
rename to source/libs/poppler/poppler-0.29.0/poppler/OutputDev.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/PDFDoc.cc b/source/libs/poppler/poppler-0.29.0/poppler/PDFDoc.cc
similarity index 99%
rename from source/libs/poppler/poppler-0.28.0/poppler/PDFDoc.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/PDFDoc.cc
index 04237fc3d3940e5ae7c662dfb1ea494421d05222..ec8d3df18d8548963c20865899bf099033a33f47 100644
--- a/source/libs/poppler/poppler-0.28.0/poppler/PDFDoc.cc
+++ b/source/libs/poppler/poppler-0.29.0/poppler/PDFDoc.cc
@@ -707,7 +707,7 @@ int PDFDoc::savePageAs(GooString *name, int pageNo)
annotsObj.free();
}
yRef->markUnencrypted();
- Guint objectsCount = writePageObjects(outStr, yRef, 0);
+ writePageObjects(outStr, yRef, 0);
yRef->add(rootNum,0,outStr->getPos(),gTrue);
outStr->printf("%d 0 obj\n", rootNum);
@@ -728,7 +728,6 @@ int PDFDoc::savePageAs(GooString *name, int pageNo)
catObj.free();
pagesObj.free();
outStr->printf(">>\nendobj\n");
- objectsCount++;
yRef->add(rootNum + 1,0,outStr->getPos(),gTrue);
outStr->printf("%d 0 obj\n", rootNum + 1);
@@ -740,7 +739,6 @@ int PDFDoc::savePageAs(GooString *name, int pageNo)
}
outStr->printf(">>\n");
outStr->printf("endobj\n");
- objectsCount++;
yRef->add(rootNum + 2,0,outStr->getPos(),gTrue);
outStr->printf("%d 0 obj\n", rootNum + 2);
@@ -758,14 +756,13 @@ int PDFDoc::savePageAs(GooString *name, int pageNo)
value.free();
}
outStr->printf(" >>\nendobj\n");
- objectsCount++;
page.free();
Goffset uxrefOffset = outStr->getPos();
Ref ref;
ref.num = rootNum;
ref.gen = 0;
- Dict *trailerDict = createTrailerDict(objectsCount, gFalse, 0, &ref, getXRef(),
+ Dict *trailerDict = createTrailerDict(rootNum + 3, gFalse, 0, &ref, getXRef(),
name->getCString(), uxrefOffset);
writeXRefTableTrailer(trailerDict, yRef, gFalse /* do not write unnecessary entries */,
uxrefOffset, outStr, getXRef());
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/PDFDoc.h b/source/libs/poppler/poppler-0.29.0/poppler/PDFDoc.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/PDFDoc.h
rename to source/libs/poppler/poppler-0.29.0/poppler/PDFDoc.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/PDFDocBuilder.h b/source/libs/poppler/poppler-0.29.0/poppler/PDFDocBuilder.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/PDFDocBuilder.h
rename to source/libs/poppler/poppler-0.29.0/poppler/PDFDocBuilder.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/PDFDocEncoding.cc b/source/libs/poppler/poppler-0.29.0/poppler/PDFDocEncoding.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/PDFDocEncoding.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/PDFDocEncoding.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/PDFDocEncoding.h b/source/libs/poppler/poppler-0.29.0/poppler/PDFDocEncoding.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/PDFDocEncoding.h
rename to source/libs/poppler/poppler-0.29.0/poppler/PDFDocEncoding.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/PDFDocFactory.cc b/source/libs/poppler/poppler-0.29.0/poppler/PDFDocFactory.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/PDFDocFactory.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/PDFDocFactory.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/PDFDocFactory.h b/source/libs/poppler/poppler-0.29.0/poppler/PDFDocFactory.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/PDFDocFactory.h
rename to source/libs/poppler/poppler-0.29.0/poppler/PDFDocFactory.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/PSOutputDev.cc b/source/libs/poppler/poppler-0.29.0/poppler/PSOutputDev.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/PSOutputDev.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/PSOutputDev.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/PSOutputDev.h b/source/libs/poppler/poppler-0.29.0/poppler/PSOutputDev.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/PSOutputDev.h
rename to source/libs/poppler/poppler-0.29.0/poppler/PSOutputDev.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/PSTokenizer.cc b/source/libs/poppler/poppler-0.29.0/poppler/PSTokenizer.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/PSTokenizer.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/PSTokenizer.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/PSTokenizer.h b/source/libs/poppler/poppler-0.29.0/poppler/PSTokenizer.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/PSTokenizer.h
rename to source/libs/poppler/poppler-0.29.0/poppler/PSTokenizer.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Page.cc b/source/libs/poppler/poppler-0.29.0/poppler/Page.cc
similarity index 99%
rename from source/libs/poppler/poppler-0.28.0/poppler/Page.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/Page.cc
index ecdff32f693eddb3b666878c006fbf3a117e33d9..98c13c14ff8ca1afa4859e9cf5df91c356ada55b 100644
--- a/source/libs/poppler/poppler-0.28.0/poppler/Page.cc
+++ b/source/libs/poppler/poppler-0.29.0/poppler/Page.cc
@@ -25,7 +25,7 @@
// Copyright (C) 2008 Brad Hards <bradh@kde.org>
// Copyright (C) 2008 Ilya Gorenbein <igorenbein@finjan.com>
// Copyright (C) 2012, 2013 Fabio D'Urso <fabiodurso@hotmail.it>
-// Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2013, 2014 Thomas Freitag <Thomas.Freitag@alfa.de>
// Copyright (C) 2013 Jason Crain <jason@aquaticape.us>
// Copyright (C) 2013 Adrian Johnson <ajohnson@redneon.com>
//
@@ -672,7 +672,7 @@ GBool Page::loadThumb(unsigned char **data_out,
obj1.free ();
dict->lookup ("CS", &obj1);
}
- colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
+ colorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
obj1.free();
if (!colorSpace) {
fprintf (stderr, "Error: Cannot parse color space\n");
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Page.h b/source/libs/poppler/poppler-0.29.0/poppler/Page.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Page.h
rename to source/libs/poppler/poppler-0.29.0/poppler/Page.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/PageLabelInfo.cc b/source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/PageLabelInfo.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/PageLabelInfo.h b/source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/PageLabelInfo.h
rename to source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/PageLabelInfo_p.h b/source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo_p.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/PageLabelInfo_p.h
rename to source/libs/poppler/poppler-0.29.0/poppler/PageLabelInfo_p.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/PageTransition.cc b/source/libs/poppler/poppler-0.29.0/poppler/PageTransition.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/PageTransition.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/PageTransition.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/PageTransition.h b/source/libs/poppler/poppler-0.29.0/poppler/PageTransition.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/PageTransition.h
rename to source/libs/poppler/poppler-0.29.0/poppler/PageTransition.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Parser.cc b/source/libs/poppler/poppler-0.29.0/poppler/Parser.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Parser.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/Parser.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Parser.h b/source/libs/poppler/poppler-0.29.0/poppler/Parser.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Parser.h
rename to source/libs/poppler/poppler-0.29.0/poppler/Parser.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/PopplerCache.cc b/source/libs/poppler/poppler-0.29.0/poppler/PopplerCache.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/PopplerCache.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/PopplerCache.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/PopplerCache.h b/source/libs/poppler/poppler-0.29.0/poppler/PopplerCache.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/PopplerCache.h
rename to source/libs/poppler/poppler-0.29.0/poppler/PopplerCache.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/PreScanOutputDev.cc b/source/libs/poppler/poppler-0.29.0/poppler/PreScanOutputDev.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/PreScanOutputDev.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/PreScanOutputDev.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/PreScanOutputDev.h b/source/libs/poppler/poppler-0.29.0/poppler/PreScanOutputDev.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/PreScanOutputDev.h
rename to source/libs/poppler/poppler-0.29.0/poppler/PreScanOutputDev.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/ProfileData.cc b/source/libs/poppler/poppler-0.29.0/poppler/ProfileData.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/ProfileData.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/ProfileData.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/ProfileData.h b/source/libs/poppler/poppler-0.29.0/poppler/ProfileData.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/ProfileData.h
rename to source/libs/poppler/poppler-0.29.0/poppler/ProfileData.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Rendition.cc b/source/libs/poppler/poppler-0.29.0/poppler/Rendition.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Rendition.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/Rendition.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Rendition.h b/source/libs/poppler/poppler-0.29.0/poppler/Rendition.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Rendition.h
rename to source/libs/poppler/poppler-0.29.0/poppler/Rendition.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/SecurityHandler.cc b/source/libs/poppler/poppler-0.29.0/poppler/SecurityHandler.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/SecurityHandler.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/SecurityHandler.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/SecurityHandler.h b/source/libs/poppler/poppler-0.29.0/poppler/SecurityHandler.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/SecurityHandler.h
rename to source/libs/poppler/poppler-0.29.0/poppler/SecurityHandler.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Sound.cc b/source/libs/poppler/poppler-0.29.0/poppler/Sound.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Sound.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/Sound.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Sound.h b/source/libs/poppler/poppler-0.29.0/poppler/Sound.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Sound.h
rename to source/libs/poppler/poppler-0.29.0/poppler/Sound.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/SplashOutputDev.cc b/source/libs/poppler/poppler-0.29.0/poppler/SplashOutputDev.cc
similarity index 96%
rename from source/libs/poppler/poppler-0.28.0/poppler/SplashOutputDev.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/SplashOutputDev.cc
index 0eaeb79f9890d7150f2719bf09c79a761d754f15..bfb07eb7315691ada4233475aeb956b0d2509025 100644
--- a/source/libs/poppler/poppler-0.28.0/poppler/SplashOutputDev.cc
+++ b/source/libs/poppler/poppler-0.29.0/poppler/SplashOutputDev.cc
@@ -33,6 +33,7 @@
// Copyright (C) 2013 Lu Wang <coolwanglu@gmail.com>
// Copyright (C) 2013 Li Junling <lijunling@sina.com>
// Copyright (C) 2014 Ed Porras <ed@moto-research.com>
+// Copyright (C) 2014 Richard PALO <richard@netbsd.org>
//
// 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
@@ -85,8 +86,10 @@ extern "C" int unlink(char *filename);
#ifdef __sun
#include <ieeefp.h>
+#ifndef isfinite
#define isfinite(x) finite(x)
#endif
+#endif
static inline void convertGfxColor(SplashColorPtr dest,
SplashColorMode colorMode,
@@ -450,22 +453,26 @@ static void splashOutBlendMultiply(SplashColorPtr src, SplashColorPtr dest,
#if SPLASH_CMYK
if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
- SplashColor rgbSrc;
- SplashColor rgbDest;
- SplashColor rgbBlend;
- cmykToRGB(src, rgbSrc);
- cmykToRGB(dest, rgbDest);
- for (i = 0; i < 3; ++i) {
- rgbBlend[i] = (rgbDest[i] * rgbSrc[i]) / 255;
+ for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+ dest[i] = 255 - dest[i];
+ src[i] = 255 - src[i];
}
- rgbToCMYK(rgbBlend, blend);
- } else
+ }
#endif
{
for (i = 0; i < splashColorModeNComps[cm]; ++i) {
blend[i] = (dest[i] * src[i]) / 255;
}
}
+#if SPLASH_CMYK
+ if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
+ for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+ dest[i] = 255 - dest[i];
+ src[i] = 255 - src[i];
+ blend[i] = 255 - blend[i];
+ }
+ }
+#endif
}
static void splashOutBlendScreen(SplashColorPtr src, SplashColorPtr dest,
@@ -474,22 +481,26 @@ static void splashOutBlendScreen(SplashColorPtr src, SplashColorPtr dest,
#if SPLASH_CMYK
if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
- SplashColor rgbSrc;
- SplashColor rgbDest;
- SplashColor rgbBlend;
- cmykToRGB(src, rgbSrc);
- cmykToRGB(dest, rgbDest);
- for (i = 0; i < 3; ++i) {
- rgbBlend[i] = rgbDest[i] + rgbSrc[i] - (rgbDest[i] * rgbSrc[i]) / 255;
+ for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+ dest[i] = 255 - dest[i];
+ src[i] = 255 - src[i];
}
- rgbToCMYK(rgbBlend, blend);
- } else
+ }
#endif
{
for (i = 0; i < splashColorModeNComps[cm]; ++i) {
blend[i] = dest[i] + src[i] - (dest[i] * src[i]) / 255;
}
}
+#if SPLASH_CMYK
+ if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
+ for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+ dest[i] = 255 - dest[i];
+ src[i] = 255 - src[i];
+ blend[i] = 255 - blend[i];
+ }
+ }
+#endif
}
static void splashOutBlendOverlay(SplashColorPtr src, SplashColorPtr dest,
@@ -498,18 +509,11 @@ static void splashOutBlendOverlay(SplashColorPtr src, SplashColorPtr dest,
#if SPLASH_CMYK
if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
- SplashColor rgbSrc;
- SplashColor rgbDest;
- SplashColor rgbBlend;
- cmykToRGB(src, rgbSrc);
- cmykToRGB(dest, rgbDest);
- for (i = 0; i < 3; ++i) {
- rgbBlend[i] = rgbDest[i] < 0x80
- ? (rgbSrc[i] * 2 * rgbDest[i]) / 255
- : 255 - 2 * ((255 - rgbSrc[i]) * (255 - rgbDest[i])) / 255;
+ for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+ dest[i] = 255 - dest[i];
+ src[i] = 255 - src[i];
}
- rgbToCMYK(rgbBlend, blend);
- } else
+ }
#endif
{
for (i = 0; i < splashColorModeNComps[cm]; ++i) {
@@ -518,6 +522,15 @@ static void splashOutBlendOverlay(SplashColorPtr src, SplashColorPtr dest,
: 255 - 2 * ((255 - src[i]) * (255 - dest[i])) / 255;
}
}
+#if SPLASH_CMYK
+ if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
+ for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+ dest[i] = 255 - dest[i];
+ src[i] = 255 - src[i];
+ blend[i] = 255 - blend[i];
+ }
+ }
+#endif
}
static void splashOutBlendDarken(SplashColorPtr src, SplashColorPtr dest,
@@ -526,22 +539,26 @@ static void splashOutBlendDarken(SplashColorPtr src, SplashColorPtr dest,
#if SPLASH_CMYK
if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
- SplashColor rgbSrc;
- SplashColor rgbDest;
- SplashColor rgbBlend;
- cmykToRGB(src, rgbSrc);
- cmykToRGB(dest, rgbDest);
- for (i = 0; i < 3; ++i) {
- rgbBlend[i] = rgbDest[i] < rgbSrc[i] ? rgbDest[i] : rgbSrc[i];
+ for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+ dest[i] = 255 - dest[i];
+ src[i] = 255 - src[i];
}
- rgbToCMYK(rgbBlend, blend);
- } else
+ }
#endif
{
for (i = 0; i < splashColorModeNComps[cm]; ++i) {
blend[i] = dest[i] < src[i] ? dest[i] : src[i];
}
}
+#if SPLASH_CMYK
+ if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
+ for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+ dest[i] = 255 - dest[i];
+ src[i] = 255 - src[i];
+ blend[i] = 255 - blend[i];
+ }
+ }
+#endif
}
static void splashOutBlendLighten(SplashColorPtr src, SplashColorPtr dest,
@@ -550,22 +567,26 @@ static void splashOutBlendLighten(SplashColorPtr src, SplashColorPtr dest,
#if SPLASH_CMYK
if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
- SplashColor rgbSrc;
- SplashColor rgbDest;
- SplashColor rgbBlend;
- cmykToRGB(src, rgbSrc);
- cmykToRGB(dest, rgbDest);
- for (i = 0; i < 3; ++i) {
- rgbBlend[i] = rgbDest[i] > rgbSrc[i] ? rgbDest[i] : rgbSrc[i];
+ for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+ dest[i] = 255 - dest[i];
+ src[i] = 255 - src[i];
}
- rgbToCMYK(rgbBlend, blend);
- } else
+ }
#endif
{
for (i = 0; i < splashColorModeNComps[cm]; ++i) {
blend[i] = dest[i] > src[i] ? dest[i] : src[i];
}
}
+#if SPLASH_CMYK
+ if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
+ for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+ dest[i] = 255 - dest[i];
+ src[i] = 255 - src[i];
+ blend[i] = 255 - blend[i];
+ }
+ }
+#endif
}
static void splashOutBlendColorDodge(SplashColorPtr src, SplashColorPtr dest,
@@ -575,21 +596,11 @@ static void splashOutBlendColorDodge(SplashColorPtr src, SplashColorPtr dest,
#if SPLASH_CMYK
if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
- SplashColor rgbSrc;
- SplashColor rgbDest;
- SplashColor rgbBlend;
- cmykToRGB(src, rgbSrc);
- cmykToRGB(dest, rgbDest);
- for (i = 0; i < 3; ++i) {
- if (rgbSrc[i] == 255) {
- rgbBlend[i] = 255;
- } else {
- x = (rgbDest[i] * 255) / (255 - rgbSrc[i]);
- rgbBlend[i] = x <= 255 ? x : 255;
- }
+ for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+ dest[i] = 255 - dest[i];
+ src[i] = 255 - src[i];
}
- rgbToCMYK(rgbBlend, blend);
- } else
+ }
#endif
{
for (i = 0; i < splashColorModeNComps[cm]; ++i) {
@@ -601,6 +612,15 @@ static void splashOutBlendColorDodge(SplashColorPtr src, SplashColorPtr dest,
}
}
}
+#if SPLASH_CMYK
+ if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
+ for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+ dest[i] = 255 - dest[i];
+ src[i] = 255 - src[i];
+ blend[i] = 255 - blend[i];
+ }
+ }
+#endif
}
static void splashOutBlendColorBurn(SplashColorPtr src, SplashColorPtr dest,
@@ -609,21 +629,11 @@ static void splashOutBlendColorBurn(SplashColorPtr src, SplashColorPtr dest,
#if SPLASH_CMYK
if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
- SplashColor rgbSrc;
- SplashColor rgbDest;
- SplashColor rgbBlend;
- cmykToRGB(src, rgbSrc);
- cmykToRGB(dest, rgbDest);
- for (i = 0; i < 3; ++i) {
- if (rgbSrc[i] == 0) {
- rgbBlend[i] = 0;
- } else {
- x = ((255 - rgbDest[i]) * 255) / rgbSrc[i];
- rgbBlend[i] = x <= 255 ? 255 - x : 0;
- }
+ for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+ dest[i] = 255 - dest[i];
+ src[i] = 255 - src[i];
}
- rgbToCMYK(rgbBlend, blend);
- } else
+ }
#endif
{
for (i = 0; i < splashColorModeNComps[cm]; ++i) {
@@ -635,6 +645,15 @@ static void splashOutBlendColorBurn(SplashColorPtr src, SplashColorPtr dest,
}
}
}
+#if SPLASH_CMYK
+ if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
+ for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+ dest[i] = 255 - dest[i];
+ src[i] = 255 - src[i];
+ blend[i] = 255 - blend[i];
+ }
+ }
+#endif
}
static void splashOutBlendHardLight(SplashColorPtr src, SplashColorPtr dest,
@@ -643,18 +662,11 @@ static void splashOutBlendHardLight(SplashColorPtr src, SplashColorPtr dest,
#if SPLASH_CMYK
if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
- SplashColor rgbSrc;
- SplashColor rgbDest;
- SplashColor rgbBlend;
- cmykToRGB(src, rgbSrc);
- cmykToRGB(dest, rgbDest);
- for (i = 0; i < 3; ++i) {
- rgbBlend[i] = rgbSrc[i] < 0x80
- ? (rgbDest[i] * 2 * rgbSrc[i]) / 255
- : 255 - 2 * ((255 - rgbDest[i]) * (255 - rgbSrc[i])) / 255;
+ for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+ dest[i] = 255 - dest[i];
+ src[i] = 255 - src[i];
}
- rgbToCMYK(rgbBlend, blend);
- } else
+ }
#endif
{
for (i = 0; i < splashColorModeNComps[cm]; ++i) {
@@ -663,6 +675,15 @@ static void splashOutBlendHardLight(SplashColorPtr src, SplashColorPtr dest,
: 255 - 2 * ((255 - dest[i]) * (255 - src[i])) / 255;
}
}
+#if SPLASH_CMYK
+ if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
+ for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+ dest[i] = 255 - dest[i];
+ src[i] = 255 - src[i];
+ blend[i] = 255 - blend[i];
+ }
+ }
+#endif
}
static void splashOutBlendSoftLight(SplashColorPtr src, SplashColorPtr dest,
@@ -671,25 +692,11 @@ static void splashOutBlendSoftLight(SplashColorPtr src, SplashColorPtr dest,
#if SPLASH_CMYK
if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
- SplashColor rgbSrc;
- SplashColor rgbDest;
- SplashColor rgbBlend;
- cmykToRGB(src, rgbSrc);
- cmykToRGB(dest, rgbDest);
- for (i = 0; i < 3; ++i) {
- if (rgbSrc[i] < 0x80) {
- rgbBlend[i] = rgbDest[i] - (255 - 2 * rgbSrc[i]) * rgbDest[i] * (255 - rgbDest[i]) / (255 * 255);
- } else {
- if (rgbDest[i] < 0x40) {
- x = (((((16 * rgbDest[i] - 12 * 255) * rgbDest[i]) / 255) + 4 * 255) * rgbDest[i]) / 255;
- } else {
- x = (int)sqrt(255.0 * rgbDest[i]);
- }
- rgbBlend[i] = rgbDest[i] + (2 * rgbSrc[i] - 255) * (x - rgbDest[i]) / 255;
- }
+ for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+ dest[i] = 255 - dest[i];
+ src[i] = 255 - src[i];
}
- rgbToCMYK(rgbBlend, blend);
- } else
+ }
#endif
{
for (i = 0; i < splashColorModeNComps[cm]; ++i) {
@@ -705,6 +712,15 @@ static void splashOutBlendSoftLight(SplashColorPtr src, SplashColorPtr dest,
}
}
}
+#if SPLASH_CMYK
+ if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
+ for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+ dest[i] = 255 - dest[i];
+ src[i] = 255 - src[i];
+ blend[i] = 255 - blend[i];
+ }
+ }
+#endif
}
static void splashOutBlendDifference(SplashColorPtr src, SplashColorPtr dest,
@@ -714,22 +730,32 @@ static void splashOutBlendDifference(SplashColorPtr src, SplashColorPtr dest,
#if SPLASH_CMYK
if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
- SplashColor rgbSrc;
- SplashColor rgbDest;
- SplashColor rgbBlend;
- cmykToRGB(src, rgbSrc);
- cmykToRGB(dest, rgbDest);
- for (i = 0; i < 3; ++i) {
- rgbBlend[i] = rgbDest[i] < rgbSrc[i] ? rgbSrc[i] - rgbDest[i] : rgbDest[i] - rgbSrc[i];
+ for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+ dest[i] = 255 - dest[i];
+ src[i] = 255 - src[i];
}
- rgbToCMYK(rgbBlend, blend);
- } else
+ }
#endif
{
for (i = 0; i < splashColorModeNComps[cm]; ++i) {
blend[i] = dest[i] < src[i] ? src[i] - dest[i] : dest[i] - src[i];
}
}
+#if SPLASH_CMYK
+ if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
+ for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+ dest[i] = 255 - dest[i];
+ src[i] = 255 - src[i];
+ blend[i] = 255 - blend[i];
+ }
+ }
+ if (cm == splashModeDeviceN8) {
+ for (i = 4; i < splashColorModeNComps[cm]; ++i) {
+ if (dest[i] == 0 && src[i] == 0)
+ blend[i] = 0;
+ }
+ }
+#endif
}
static void splashOutBlendExclusion(SplashColorPtr src, SplashColorPtr dest,
@@ -738,22 +764,32 @@ static void splashOutBlendExclusion(SplashColorPtr src, SplashColorPtr dest,
#if SPLASH_CMYK
if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
- SplashColor rgbSrc;
- SplashColor rgbDest;
- SplashColor rgbBlend;
- cmykToRGB(src, rgbSrc);
- cmykToRGB(dest, rgbDest);
- for (i = 0; i < 3; ++i) {
- rgbBlend[i] = rgbDest[i] + rgbSrc[i] - (2 * rgbDest[i] * rgbSrc[i]) / 255;
+ for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+ dest[i] = 255 - dest[i];
+ src[i] = 255 - src[i];
}
- rgbToCMYK(rgbBlend, blend);
- } else
+ }
#endif
{
for (i = 0; i < splashColorModeNComps[cm]; ++i) {
blend[i] = dest[i] + src[i] - (2 * dest[i] * src[i]) / 255;
}
}
+#if SPLASH_CMYK
+ if (cm == splashModeCMYK8 || cm == splashModeDeviceN8) {
+ for (i = 0; i < splashColorModeNComps[cm]; ++i) {
+ dest[i] = 255 - dest[i];
+ src[i] = 255 - src[i];
+ blend[i] = 255 - blend[i];
+ }
+ }
+ if (cm == splashModeDeviceN8) {
+ for (i = 4; i < splashColorModeNComps[cm]; ++i) {
+ if (dest[i] == 0 && src[i] == 0)
+ blend[i] = 0;
+ }
+ }
+#endif
}
static int getLum(int r, int g, int b) {
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/SplashOutputDev.h b/source/libs/poppler/poppler-0.29.0/poppler/SplashOutputDev.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/SplashOutputDev.h
rename to source/libs/poppler/poppler-0.29.0/poppler/SplashOutputDev.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/StdinCachedFile.cc b/source/libs/poppler/poppler-0.29.0/poppler/StdinCachedFile.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/StdinCachedFile.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/StdinCachedFile.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/StdinCachedFile.h b/source/libs/poppler/poppler-0.29.0/poppler/StdinCachedFile.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/StdinCachedFile.h
rename to source/libs/poppler/poppler-0.29.0/poppler/StdinCachedFile.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/StdinPDFDocBuilder.cc b/source/libs/poppler/poppler-0.29.0/poppler/StdinPDFDocBuilder.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/StdinPDFDocBuilder.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/StdinPDFDocBuilder.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/StdinPDFDocBuilder.h b/source/libs/poppler/poppler-0.29.0/poppler/StdinPDFDocBuilder.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/StdinPDFDocBuilder.h
rename to source/libs/poppler/poppler-0.29.0/poppler/StdinPDFDocBuilder.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Stream-CCITT.h b/source/libs/poppler/poppler-0.29.0/poppler/Stream-CCITT.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Stream-CCITT.h
rename to source/libs/poppler/poppler-0.29.0/poppler/Stream-CCITT.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Stream.cc b/source/libs/poppler/poppler-0.29.0/poppler/Stream.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Stream.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/Stream.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/Stream.h b/source/libs/poppler/poppler-0.29.0/poppler/Stream.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/Stream.h
rename to source/libs/poppler/poppler-0.29.0/poppler/Stream.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/StructElement.cc b/source/libs/poppler/poppler-0.29.0/poppler/StructElement.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/StructElement.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/StructElement.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/StructElement.h b/source/libs/poppler/poppler-0.29.0/poppler/StructElement.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/StructElement.h
rename to source/libs/poppler/poppler-0.29.0/poppler/StructElement.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/StructTreeRoot.cc b/source/libs/poppler/poppler-0.29.0/poppler/StructTreeRoot.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/StructTreeRoot.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/StructTreeRoot.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/StructTreeRoot.h b/source/libs/poppler/poppler-0.29.0/poppler/StructTreeRoot.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/StructTreeRoot.h
rename to source/libs/poppler/poppler-0.29.0/poppler/StructTreeRoot.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/TextOutputDev.cc b/source/libs/poppler/poppler-0.29.0/poppler/TextOutputDev.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/TextOutputDev.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/TextOutputDev.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/TextOutputDev.h b/source/libs/poppler/poppler-0.29.0/poppler/TextOutputDev.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/TextOutputDev.h
rename to source/libs/poppler/poppler-0.29.0/poppler/TextOutputDev.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/UTF.cc b/source/libs/poppler/poppler-0.29.0/poppler/UTF.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/UTF.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/UTF.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/UTF.h b/source/libs/poppler/poppler-0.29.0/poppler/UTF.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/UTF.h
rename to source/libs/poppler/poppler-0.29.0/poppler/UTF.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/UTF8.h b/source/libs/poppler/poppler-0.29.0/poppler/UTF8.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/UTF8.h
rename to source/libs/poppler/poppler-0.29.0/poppler/UTF8.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/UnicodeCClassTables.h b/source/libs/poppler/poppler-0.29.0/poppler/UnicodeCClassTables.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/UnicodeCClassTables.h
rename to source/libs/poppler/poppler-0.29.0/poppler/UnicodeCClassTables.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/UnicodeCompTables.h b/source/libs/poppler/poppler-0.29.0/poppler/UnicodeCompTables.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/UnicodeCompTables.h
rename to source/libs/poppler/poppler-0.29.0/poppler/UnicodeCompTables.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/UnicodeDecompTables.h b/source/libs/poppler/poppler-0.29.0/poppler/UnicodeDecompTables.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/UnicodeDecompTables.h
rename to source/libs/poppler/poppler-0.29.0/poppler/UnicodeDecompTables.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/UnicodeMap.cc b/source/libs/poppler/poppler-0.29.0/poppler/UnicodeMap.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/UnicodeMap.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/UnicodeMap.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/UnicodeMap.h b/source/libs/poppler/poppler-0.29.0/poppler/UnicodeMap.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/UnicodeMap.h
rename to source/libs/poppler/poppler-0.29.0/poppler/UnicodeMap.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/UnicodeMapTables.h b/source/libs/poppler/poppler-0.29.0/poppler/UnicodeMapTables.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/UnicodeMapTables.h
rename to source/libs/poppler/poppler-0.29.0/poppler/UnicodeMapTables.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/UnicodeTypeTable.cc b/source/libs/poppler/poppler-0.29.0/poppler/UnicodeTypeTable.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/UnicodeTypeTable.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/UnicodeTypeTable.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/UnicodeTypeTable.h b/source/libs/poppler/poppler-0.29.0/poppler/UnicodeTypeTable.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/UnicodeTypeTable.h
rename to source/libs/poppler/poppler-0.29.0/poppler/UnicodeTypeTable.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/ViewerPreferences.cc b/source/libs/poppler/poppler-0.29.0/poppler/ViewerPreferences.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/ViewerPreferences.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/ViewerPreferences.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/ViewerPreferences.h b/source/libs/poppler/poppler-0.29.0/poppler/ViewerPreferences.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/ViewerPreferences.h
rename to source/libs/poppler/poppler-0.29.0/poppler/ViewerPreferences.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/XRef.cc b/source/libs/poppler/poppler-0.29.0/poppler/XRef.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/XRef.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/XRef.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/XRef.h b/source/libs/poppler/poppler-0.29.0/poppler/XRef.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/XRef.h
rename to source/libs/poppler/poppler-0.29.0/poppler/XRef.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/XpdfPluginAPI.cc b/source/libs/poppler/poppler-0.29.0/poppler/XpdfPluginAPI.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/XpdfPluginAPI.cc
rename to source/libs/poppler/poppler-0.29.0/poppler/XpdfPluginAPI.cc
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/XpdfPluginAPI.h b/source/libs/poppler/poppler-0.29.0/poppler/XpdfPluginAPI.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/XpdfPluginAPI.h
rename to source/libs/poppler/poppler-0.29.0/poppler/XpdfPluginAPI.h
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/gen-unicode-tables.py b/source/libs/poppler/poppler-0.29.0/poppler/gen-unicode-tables.py
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/gen-unicode-tables.py
rename to source/libs/poppler/poppler-0.29.0/poppler/gen-unicode-tables.py
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/poppler-config.h.cmake b/source/libs/poppler/poppler-0.29.0/poppler/poppler-config.h.cmake
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/poppler-config.h.cmake
rename to source/libs/poppler/poppler-0.29.0/poppler/poppler-config.h.cmake
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/poppler-config.h.in b/source/libs/poppler/poppler-0.29.0/poppler/poppler-config.h.in
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/poppler-config.h.in
rename to source/libs/poppler/poppler-0.29.0/poppler/poppler-config.h.in
diff --git a/source/libs/poppler/poppler-0.28.0/poppler/strtok_r.cpp b/source/libs/poppler/poppler-0.29.0/poppler/strtok_r.cpp
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/poppler/strtok_r.cpp
rename to source/libs/poppler/poppler-0.29.0/poppler/strtok_r.cpp
diff --git a/source/libs/poppler/poppler-0.28.0/splash/Makefile.am b/source/libs/poppler/poppler-0.29.0/splash/Makefile.am
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/Makefile.am
rename to source/libs/poppler/poppler-0.29.0/splash/Makefile.am
diff --git a/source/libs/poppler/poppler-0.28.0/splash/Splash.cc b/source/libs/poppler/poppler-0.29.0/splash/Splash.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/Splash.cc
rename to source/libs/poppler/poppler-0.29.0/splash/Splash.cc
diff --git a/source/libs/poppler/poppler-0.28.0/splash/Splash.h b/source/libs/poppler/poppler-0.29.0/splash/Splash.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/Splash.h
rename to source/libs/poppler/poppler-0.29.0/splash/Splash.h
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashBitmap.cc b/source/libs/poppler/poppler-0.29.0/splash/SplashBitmap.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashBitmap.cc
rename to source/libs/poppler/poppler-0.29.0/splash/SplashBitmap.cc
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashBitmap.h b/source/libs/poppler/poppler-0.29.0/splash/SplashBitmap.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashBitmap.h
rename to source/libs/poppler/poppler-0.29.0/splash/SplashBitmap.h
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashClip.cc b/source/libs/poppler/poppler-0.29.0/splash/SplashClip.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashClip.cc
rename to source/libs/poppler/poppler-0.29.0/splash/SplashClip.cc
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashClip.h b/source/libs/poppler/poppler-0.29.0/splash/SplashClip.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashClip.h
rename to source/libs/poppler/poppler-0.29.0/splash/SplashClip.h
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashErrorCodes.h b/source/libs/poppler/poppler-0.29.0/splash/SplashErrorCodes.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashErrorCodes.h
rename to source/libs/poppler/poppler-0.29.0/splash/SplashErrorCodes.h
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashFTFont.cc b/source/libs/poppler/poppler-0.29.0/splash/SplashFTFont.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashFTFont.cc
rename to source/libs/poppler/poppler-0.29.0/splash/SplashFTFont.cc
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashFTFont.h b/source/libs/poppler/poppler-0.29.0/splash/SplashFTFont.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashFTFont.h
rename to source/libs/poppler/poppler-0.29.0/splash/SplashFTFont.h
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashFTFontEngine.cc b/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontEngine.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashFTFontEngine.cc
rename to source/libs/poppler/poppler-0.29.0/splash/SplashFTFontEngine.cc
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashFTFontEngine.h b/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontEngine.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashFTFontEngine.h
rename to source/libs/poppler/poppler-0.29.0/splash/SplashFTFontEngine.h
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashFTFontFile.cc b/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontFile.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashFTFontFile.cc
rename to source/libs/poppler/poppler-0.29.0/splash/SplashFTFontFile.cc
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashFTFontFile.h b/source/libs/poppler/poppler-0.29.0/splash/SplashFTFontFile.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashFTFontFile.h
rename to source/libs/poppler/poppler-0.29.0/splash/SplashFTFontFile.h
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashFont.cc b/source/libs/poppler/poppler-0.29.0/splash/SplashFont.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashFont.cc
rename to source/libs/poppler/poppler-0.29.0/splash/SplashFont.cc
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashFont.h b/source/libs/poppler/poppler-0.29.0/splash/SplashFont.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashFont.h
rename to source/libs/poppler/poppler-0.29.0/splash/SplashFont.h
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashFontEngine.cc b/source/libs/poppler/poppler-0.29.0/splash/SplashFontEngine.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashFontEngine.cc
rename to source/libs/poppler/poppler-0.29.0/splash/SplashFontEngine.cc
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashFontEngine.h b/source/libs/poppler/poppler-0.29.0/splash/SplashFontEngine.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashFontEngine.h
rename to source/libs/poppler/poppler-0.29.0/splash/SplashFontEngine.h
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashFontFile.cc b/source/libs/poppler/poppler-0.29.0/splash/SplashFontFile.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashFontFile.cc
rename to source/libs/poppler/poppler-0.29.0/splash/SplashFontFile.cc
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashFontFile.h b/source/libs/poppler/poppler-0.29.0/splash/SplashFontFile.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashFontFile.h
rename to source/libs/poppler/poppler-0.29.0/splash/SplashFontFile.h
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashFontFileID.cc b/source/libs/poppler/poppler-0.29.0/splash/SplashFontFileID.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashFontFileID.cc
rename to source/libs/poppler/poppler-0.29.0/splash/SplashFontFileID.cc
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashFontFileID.h b/source/libs/poppler/poppler-0.29.0/splash/SplashFontFileID.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashFontFileID.h
rename to source/libs/poppler/poppler-0.29.0/splash/SplashFontFileID.h
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashGlyphBitmap.h b/source/libs/poppler/poppler-0.29.0/splash/SplashGlyphBitmap.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashGlyphBitmap.h
rename to source/libs/poppler/poppler-0.29.0/splash/SplashGlyphBitmap.h
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashMath.h b/source/libs/poppler/poppler-0.29.0/splash/SplashMath.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashMath.h
rename to source/libs/poppler/poppler-0.29.0/splash/SplashMath.h
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashPath.cc b/source/libs/poppler/poppler-0.29.0/splash/SplashPath.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashPath.cc
rename to source/libs/poppler/poppler-0.29.0/splash/SplashPath.cc
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashPath.h b/source/libs/poppler/poppler-0.29.0/splash/SplashPath.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashPath.h
rename to source/libs/poppler/poppler-0.29.0/splash/SplashPath.h
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashPattern.cc b/source/libs/poppler/poppler-0.29.0/splash/SplashPattern.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashPattern.cc
rename to source/libs/poppler/poppler-0.29.0/splash/SplashPattern.cc
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashPattern.h b/source/libs/poppler/poppler-0.29.0/splash/SplashPattern.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashPattern.h
rename to source/libs/poppler/poppler-0.29.0/splash/SplashPattern.h
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashScreen.cc b/source/libs/poppler/poppler-0.29.0/splash/SplashScreen.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashScreen.cc
rename to source/libs/poppler/poppler-0.29.0/splash/SplashScreen.cc
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashScreen.h b/source/libs/poppler/poppler-0.29.0/splash/SplashScreen.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashScreen.h
rename to source/libs/poppler/poppler-0.29.0/splash/SplashScreen.h
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashState.cc b/source/libs/poppler/poppler-0.29.0/splash/SplashState.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashState.cc
rename to source/libs/poppler/poppler-0.29.0/splash/SplashState.cc
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashState.h b/source/libs/poppler/poppler-0.29.0/splash/SplashState.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashState.h
rename to source/libs/poppler/poppler-0.29.0/splash/SplashState.h
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashT1Font.cc b/source/libs/poppler/poppler-0.29.0/splash/SplashT1Font.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashT1Font.cc
rename to source/libs/poppler/poppler-0.29.0/splash/SplashT1Font.cc
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashT1Font.h b/source/libs/poppler/poppler-0.29.0/splash/SplashT1Font.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashT1Font.h
rename to source/libs/poppler/poppler-0.29.0/splash/SplashT1Font.h
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashT1FontEngine.cc b/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontEngine.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashT1FontEngine.cc
rename to source/libs/poppler/poppler-0.29.0/splash/SplashT1FontEngine.cc
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashT1FontEngine.h b/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontEngine.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashT1FontEngine.h
rename to source/libs/poppler/poppler-0.29.0/splash/SplashT1FontEngine.h
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashT1FontFile.cc b/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontFile.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashT1FontFile.cc
rename to source/libs/poppler/poppler-0.29.0/splash/SplashT1FontFile.cc
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashT1FontFile.h b/source/libs/poppler/poppler-0.29.0/splash/SplashT1FontFile.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashT1FontFile.h
rename to source/libs/poppler/poppler-0.29.0/splash/SplashT1FontFile.h
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashTypes.h b/source/libs/poppler/poppler-0.29.0/splash/SplashTypes.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashTypes.h
rename to source/libs/poppler/poppler-0.29.0/splash/SplashTypes.h
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashXPath.cc b/source/libs/poppler/poppler-0.29.0/splash/SplashXPath.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashXPath.cc
rename to source/libs/poppler/poppler-0.29.0/splash/SplashXPath.cc
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashXPath.h b/source/libs/poppler/poppler-0.29.0/splash/SplashXPath.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashXPath.h
rename to source/libs/poppler/poppler-0.29.0/splash/SplashXPath.h
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashXPathScanner.cc b/source/libs/poppler/poppler-0.29.0/splash/SplashXPathScanner.cc
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashXPathScanner.cc
rename to source/libs/poppler/poppler-0.29.0/splash/SplashXPathScanner.cc
diff --git a/source/libs/poppler/poppler-0.28.0/splash/SplashXPathScanner.h b/source/libs/poppler/poppler-0.29.0/splash/SplashXPathScanner.h
similarity index 100%
rename from source/libs/poppler/poppler-0.28.0/splash/SplashXPathScanner.h
rename to source/libs/poppler/poppler-0.29.0/splash/SplashXPathScanner.h
diff --git a/source/libs/poppler/version.ac b/source/libs/poppler/version.ac
index 0cabf88176ce1993a4e8a91eb9e5d9d8f415c176..27dab4080f096f773d4c269a97470505c51498e3 100644
--- a/source/libs/poppler/version.ac
+++ b/source/libs/poppler/version.ac
@@ -8,4 +8,4 @@ dnl
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current poppler version
-m4_define([poppler_version], [0.28.0])
+m4_define([poppler_version], [0.29.0])
diff --git a/source/libs/zlib/ChangeLog b/source/libs/zlib/ChangeLog
index 1d6cd49c1183ab553f3518f01611a5f6ca01c2f6..74cdaa57d3ed258034d3cc2204ab8ac030b6f47c 100644
--- a/source/libs/zlib/ChangeLog
+++ b/source/libs/zlib/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-03 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Added KPSE_COMPILER_VISIBILITY.
+ * Makefile.am [AM_CFLAGS]: Added $(VISIBILITY_CFLAGS).
+
2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS.
diff --git a/source/libs/zlib/Makefile.am b/source/libs/zlib/Makefile.am
index adb52b75c153981ad1d8537abbf13722dbda6557..4456426c7d455cb71220878e70b14b40de70f7da 100644
--- a/source/libs/zlib/Makefile.am
+++ b/source/libs/zlib/Makefile.am
@@ -22,6 +22,7 @@ dist-hook:
SUBDIRS = . include
AM_CPPFLAGS = -I$(top_srcdir)/$(ZLIB_TREE) $(ZLIB_DEFINES)
+AM_CFLAGS = $(VISIBILITY_CFLAGS) # $(WARNING_CFLAGS)
noinst_LIBRARIES = libz.a
diff --git a/source/libs/zlib/Makefile.in b/source/libs/zlib/Makefile.in
index 0b2328dd029270183cbf5a502690bb4ce6c5be74..7e8f05ca083ddaedf96dccd9c82879b5e20bc569 100644
--- a/source/libs/zlib/Makefile.in
+++ b/source/libs/zlib/Makefile.in
@@ -549,6 +549,7 @@ top_srcdir = @top_srcdir@
EXTRA_DIST = $(ZLIB_TREE) $(ZLIB_TREE)-PATCHES
SUBDIRS = . include
AM_CPPFLAGS = -I$(top_srcdir)/$(ZLIB_TREE) $(ZLIB_DEFINES)
+AM_CFLAGS = $(VISIBILITY_CFLAGS) # $(WARNING_CFLAGS)
noinst_LIBRARIES = libz.a
nodist_libz_a_SOURCES = \
@ZLIB_TREE@/adler32.c \
diff --git a/source/libs/zlib/configure b/source/libs/zlib/configure
index a81e8a5d2521a7cdcd4c555ae8b60ac920998ec1..f55d179936d86149403f3112a713a3e2c8adabfd 100755
--- a/source/libs/zlib/configure
+++ b/source/libs/zlib/configure
@@ -4719,8 +4719,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
void foo(void){printf("foo\n");}
_ACEOF
# FIXME: Add tests for non-GNU compilers
-for kpse_flag in '-fvisibility=hidden'; do
- CFLAGS="$kpse_save_flags $kpse_flag"
+for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do
+ CFLAGS="$kpse_save_flags -Werror $kpse_flag"
if ac_fn_c_try_compile "$LINENO"; then :
kpse_cv_visibility_cflags=$kpse_flag; break
fi
diff --git a/source/libs/zziplib/ChangeLog b/source/libs/zziplib/ChangeLog
index 995e618e337b35dc26a6d178b72e6314a98ff599..1a40ce7ff9f6dd05078e2a814ef65549aea513a2 100644
--- a/source/libs/zziplib/ChangeLog
+++ b/source/libs/zziplib/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-03 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Added KPSE_COMPILER_VISIBILITY.
+ * Makefile.am [AM_CFLAGS]: Added $(VISIBILITY_CFLAGS).
+
2014-07-11 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.ac: Reenable mmap for 32- and 64-bit Windows.
diff --git a/source/libs/zziplib/Makefile.am b/source/libs/zziplib/Makefile.am
index b2d58e595029c90c18225abb21dcb4d35e31429a..0a15a6ecb84f7bb49096ae1cfd6448c3cc414a6f 100644
--- a/source/libs/zziplib/Makefile.am
+++ b/source/libs/zziplib/Makefile.am
@@ -26,7 +26,7 @@ SUBDIRS = . include/zzip
AM_CPPFLAGS = -Iinclude -I$(top_srcdir)/$(ZZIPLIB_TREE) $(ZLIB_INCLUDES)
AM_CPPFLAGS += $(ZZIPLIB_DEFINES)
-AM_CFLAGS = $(WARNING_CFLAGS)
+AM_CFLAGS = $(VISIBILITY_CFLAGS) $(WARNING_CFLAGS)
noinst_LIBRARIES=libzzip.a
diff --git a/source/libs/zziplib/Makefile.in b/source/libs/zziplib/Makefile.in
index 2a9310543a70067af1121946fbc3b20ecfa7ba13..f6cce8de7a2f099fae263eaf04e2743af5d95412 100644
--- a/source/libs/zziplib/Makefile.in
+++ b/source/libs/zziplib/Makefile.in
@@ -102,6 +102,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_sys_largefile_sensitive.m4 \
$(top_srcdir)/m4/ax_prefix_config_h.m4 \
$(top_srcdir)/m4/zziplib-aligned-access.m4 \
$(top_srcdir)/../../m4/kpse-common.m4 \
+ $(top_srcdir)/../../m4/kpse-visibility.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
@@ -502,6 +503,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
ZLIB_DEPEND = @ZLIB_DEPEND@
ZLIB_INCLUDES = @ZLIB_INCLUDES@
@@ -562,7 +564,7 @@ EXTRA_DIST = $(ZZIPLIB_TREE) $(ZZIPLIB_TREE)-PATCHES
SUBDIRS = . include/zzip
AM_CPPFLAGS = -Iinclude -I$(top_srcdir)/$(ZZIPLIB_TREE) \
$(ZLIB_INCLUDES) $(ZZIPLIB_DEFINES)
-AM_CFLAGS = $(WARNING_CFLAGS)
+AM_CFLAGS = $(VISIBILITY_CFLAGS) $(WARNING_CFLAGS)
noinst_LIBRARIES = libzzip.a
nodist_libzzip_a_SOURCES = \
@ZZIPLIB_TREE@/zzip/dir.c \
diff --git a/source/libs/zziplib/aclocal.m4 b/source/libs/zziplib/aclocal.m4
index df7a4354cbcf2077e0edc0d7924587c3a63e0c62..045726fd96bc61b288e88cc92fcf1a99142059af 100644
--- a/source/libs/zziplib/aclocal.m4
+++ b/source/libs/zziplib/aclocal.m4
@@ -1187,5 +1187,6 @@ m4_include([m4/ac_sys_largefile_sensitive.m4])
m4_include([m4/ax_prefix_config_h.m4])
m4_include([m4/zziplib-aligned-access.m4])
m4_include([../../m4/kpse-common.m4])
+m4_include([../../m4/kpse-visibility.m4])
m4_include([../../m4/kpse-warnings.m4])
m4_include([../../m4/kpse-zlib-flags.m4])
diff --git a/source/libs/zziplib/configure b/source/libs/zziplib/configure
index 83933ff36eab34c9f9a19c9a4865d78f93d55b20..2674f1c84e50c8fd357b819725a091491fa869bb 100755
--- a/source/libs/zziplib/configure
+++ b/source/libs/zziplib/configure
@@ -637,6 +637,7 @@ ZZIPLIB_DEFINES
EGREP
GREP
CPP
+VISIBILITY_CFLAGS
LN_S
RANLIB
host_os
@@ -5103,6 +5104,56 @@ $as_echo "no, using $LN_S" >&6; }
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for C to hide external symbols" >&5
+$as_echo_n "checking CFLAGS for C to hide external symbols... " >&6; }
+if ${kpse_cv_visibility_cflags+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+kpse_cv_visibility_cflags=unknown
+kpse_save_flags=$CFLAGS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
+ extern void foo(void);
+ void foo(void){printf("foo\n");}
+_ACEOF
+# FIXME: Add tests for non-GNU compilers
+for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do
+ CFLAGS="$kpse_save_flags -Werror $kpse_flag"
+ if ac_fn_c_try_compile "$LINENO"; then :
+ kpse_cv_visibility_cflags=$kpse_flag; break
+fi
+rm -f core conftest.err conftest.$ac_objext
+done
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_visibility_cflags" >&5
+$as_echo "$kpse_cv_visibility_cflags" >&6; }
+CFLAGS=$kpse_save_flags
+case $kpse_cv_visibility_cflags in #(
+ unknown) :
+ ;; #(
+ *) :
+ VISIBILITY_CFLAGS=$kpse_cv_visibility_cflags
+ ;;
+esac
+
+
+
+
+
# Checks for header files.
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
diff --git a/source/libs/zziplib/configure.ac b/source/libs/zziplib/configure.ac
index b6c13707c3f841c00173f2039bd17338c7596482..ba31a4c165b98e31770a1b27ea8d09f066819fcd 100644
--- a/source/libs/zziplib/configure.ac
+++ b/source/libs/zziplib/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2010-2013 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2010-2014 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl based on zziplib-0.13.58:
dnl Copyright (C) 2009 Guido Draheim <guido@gmx.de> for ZZipLib.SF.net
@@ -25,6 +25,8 @@ AC_PROG_CC
AC_PROG_RANLIB
AC_PROG_LN_S
+KPSE_COMPILER_VISIBILITY
+
# Checks for header files.
AC_HEADER_STDC
AC_HEADER_DIRENT
diff --git a/source/libs/zziplib/include/zzip/Makefile.in b/source/libs/zziplib/include/zzip/Makefile.in
index edbeb462e61405a667cebf00e6d84268e741f0f7..02cf02f12793cf472c54d0dc84e991c951dd1fd0 100644
--- a/source/libs/zziplib/include/zzip/Makefile.in
+++ b/source/libs/zziplib/include/zzip/Makefile.in
@@ -85,6 +85,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_sys_largefile_sensitive.m4 \
$(top_srcdir)/m4/ax_prefix_config_h.m4 \
$(top_srcdir)/m4/zziplib-aligned-access.m4 \
$(top_srcdir)/../../m4/kpse-common.m4 \
+ $(top_srcdir)/../../m4/kpse-visibility.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
$(top_srcdir)/version.ac $(top_srcdir)/configure.ac
@@ -163,6 +164,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
WARNING_CFLAGS = @WARNING_CFLAGS@
ZLIB_DEPEND = @ZLIB_DEPEND@
ZLIB_INCLUDES = @ZLIB_INCLUDES@
diff --git a/source/m4/ChangeLog b/source/m4/ChangeLog
index 15d9eeada3b3e4e0e9d45dbf2f3a30e9282dca90..bf616b32a8d85d1f384a0011c8d524d58ac4e6b1 100644
--- a/source/m4/ChangeLog
+++ b/source/m4/ChangeLog
@@ -1,3 +1,19 @@
+2014-12-06 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kpse-options.m4: Set platform name to ${host_alias-$host}.
+
+2014-12-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kpse-luajit-flags.m4: LuaJIT is now a Libtool library.
+
+2014-12-02 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kpse-visibility.m4: Also try -fvisibility-inlines-hidden.
+
+2014-11-17 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kpse-win32.m4: Check for WIN64 and AC_SUBST([WIN_WRAPPER]).
+
2014-10-22 Peter Breitenlohner <peb@mppmu.mpg.de>
* kpse-lua52-flags.m4: Lua52 is now a Libtool library.
diff --git a/source/m4/kpse-lua52-flags.m4 b/source/m4/kpse-lua52-flags.m4
index 20801945a0dec5475c858c41d183b7b33ad007db..d214af5531a09f1e505cba85d57aa206ee8ea840 100644
--- a/source/m4/kpse-lua52-flags.m4
+++ b/source/m4/kpse-lua52-flags.m4
@@ -10,7 +10,7 @@
# Set the make variables LUA52_INCLUDES and LUA52_LIBS to the CPPFLAGS and
# LIBS required for the `-ltexlua52' library in libs/lua52/ of the TL tree.
AC_DEFUN([KPSE_LUA52_FLAGS], [dnl
-_KPSE_LIB_FLAGS([lua52], [texlua52], [tree],
+_KPSE_LIB_FLAGS([lua52], [texlua52], [lt tree],
[-IBLD/libs/lua52/include], [BLD/libs/lua52/libtexlua52.la], [],
[], [${top_builddir}/../../libs/lua52/include/lua.h])[]dnl
]) # KPSE_LUA52_FLAGS
@@ -18,7 +18,7 @@ _KPSE_LIB_FLAGS([lua52], [texlua52], [tree],
# KPSE_LUA52_DEFINES
# ------------------
# Set the make variable LUA52_DEFINES to the CPPFLAGS required when
-# compiling or using the `-llua52' library.
+# compiling or using the `-ltexlua52' library.
AC_DEFUN([KPSE_LUA52_DEFINES], [dnl
AC_REQUIRE([KPSE_CHECK_WIN32])[]dnl
AC_SUBST([LUA52_DEFINES], ['-DLUA_COMPAT_MODULE -DLUAI_HASHLIMIT=6'])
diff --git a/source/m4/kpse-luajit-flags.m4 b/source/m4/kpse-luajit-flags.m4
index 21e1e32b603d05b170ee2580134ca8237aa8cf9e..e846c3087f2943930c0552b8b91c35506f84c5b7 100644
--- a/source/m4/kpse-luajit-flags.m4
+++ b/source/m4/kpse-luajit-flags.m4
@@ -8,17 +8,17 @@
# KPSE_LUAJIT_FLAGS
# -----------------
# Set the make variables LUAJIT_INCLUDES and LUAJIT_LIBS to the CPPFLAGS and
-# LIBS required for the `-lluajit' library in libs/luajit/ of the TL tree.
+# LIBS required for the `-ltexluajit' library in libs/luajit/ of the TL tree.
AC_DEFUN([KPSE_LUAJIT_FLAGS], [dnl
-_KPSE_LIB_FLAGS([luajit], [luajit], [tree],
- [-IBLD/libs/luajit/include], [BLD/libs/luajit/libluajit.a], [],
+_KPSE_LIB_FLAGS([luajit], [texluajit], [lt tree],
+ [-IBLD/libs/luajit/include], [BLD/libs/luajit/libtexluajit.la], [],
[], [${top_builddir}/../../libs/luajit/include/luajit.h])[]dnl
]) # KPSE_LUAJIT_FLAGS
# KPSE_LUAJIT_DEFINES
# -------------------
# Set the make variable LUAJIT_DEFINES to the CPPFLAGS required when
-# compiling or using the `-lluajit' library.
+# compiling or using the `-ltexluajit' library.
# Set the make variable LUAJIT_LDEXTRA to the LDFLAGS required when
# linking with the `-lluajit' library.
AC_DEFUN([KPSE_LUAJIT_DEFINES], [dnl
diff --git a/source/m4/kpse-options.m4 b/source/m4/kpse-options.m4
index a96edab08c301475e27f6029848825bb03011b98..32e5a0eccd49df6dadc2f62bba5fcd7c6b5b53b0 100644
--- a/source/m4/kpse-options.m4
+++ b/source/m4/kpse-options.m4
@@ -1,12 +1,10 @@
# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 0
-
# KPSE_OPTIONS
# ------------
# Provide configure options used by the higher level TL directories
@@ -18,11 +16,11 @@ AC_ARG_ENABLE([multiplatform],
[put executables into bin/PLATFORM and libraries into lib/PLATFORM]))[]dnl
if test "x$enable_multiplatform" = xyes; then
if test "x$bindir" = 'x${exec_prefix}/bin'; then
- bindir="$bindir/$host"
+ bindir="$bindir/${host_alias-$host}"
ac_configure_args="$ac_configure_args '--bindir=$bindir'"
fi
if test "x$libdir" = 'x${exec_prefix}/lib'; then
- libdir="$libdir/$host"
+ libdir="$libdir/${host_alias-$host}"
ac_configure_args="$ac_configure_args '--libdir=$libdir'"
fi
fi
diff --git a/source/m4/kpse-setup.m4 b/source/m4/kpse-setup.m4
index 59a883e2e41c853d1fd4adfb4fdc231414fb41e3..8767c3f59df9363fa18a8511274c0062e3f389fe 100644
--- a/source/m4/kpse-setup.m4
+++ b/source/m4/kpse-setup.m4
@@ -259,7 +259,7 @@ m4_popdef([Kpse_add])[]dnl
# _KPSE_RECURSE(LIST, TEXT, COND, [PREFIX])
# -----------------------------------------
-# Internal subroutine. Determine which of the libraies or programs in
+# Internal subroutine. Determine which of the libraries or programs in
# kpse_LIST_pkgs to build, and set output variables MAKE_SUBDIRS and
# CONF_SUBDIRS. Cause 'make dist', 'configure -hr', and 'autoreconf'
# to recurse into all existing ones.
diff --git a/source/m4/kpse-visibility.m4 b/source/m4/kpse-visibility.m4
index 740fc459a539831322a0ea9dd9db91f119d01635..f5db6f9da098d5028b015d0413d8e6b34f5cda8d 100644
--- a/source/m4/kpse-visibility.m4
+++ b/source/m4/kpse-visibility.m4
@@ -1,5 +1,5 @@
# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2013, 2014 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holders
# give unlimited permission to copy and/or distribute it,
@@ -60,8 +60,8 @@ AC_LANG_CONFTEST([AC_LANG_SOURCE([[#include <stdio.h>
extern void foo(void);
void foo(void){printf("foo\n");}]])])
# FIXME: Add tests for non-GNU compilers
-for kpse_flag in '-fvisibility=hidden'; do
- AS_TR_CPP($2)="$kpse_save_flags $kpse_flag"
+for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do
+ AS_TR_CPP($2)="$kpse_save_flags -Werror $kpse_flag"
AC_COMPILE_IFELSE([], [kpse_cv_visibility_$2=$kpse_flag; break])
done
AC_LANG_POP([$1])
diff --git a/source/m4/kpse-win32.m4 b/source/m4/kpse-win32.m4
index 4f1ac0851492a1a4bb2475768978cbd20f2a742d..9d6375404faa55ccd2e09fe1d0001c66aff2ae8e 100644
--- a/source/m4/kpse-win32.m4
+++ b/source/m4/kpse-win32.m4
@@ -13,10 +13,10 @@ AC_CACHE_CHECK([for native WIN32 or MINGW32],
[kpse_cv_have_win32],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifndef WIN32
choke me
-#endif]], [[]])],
+#endif]])],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifndef __MINGW32__
choke me
-#endif]], [[]])],
+#endif]])],
[kpse_cv_have_win32=mingw32],
[kpse_cv_have_win32=native])],
[kpse_cv_have_win32=no])])
@@ -43,8 +43,19 @@ AM_CONDITIONAL([MINGW32], [test "x$kpse_cv_have_win32" = xmingw32])
# Define the conditionals WIN32 and WIN32_WRAP.
AC_DEFUN([KPSE_COND_WIN32_WRAP], [dnl
AC_REQUIRE([KPSE_COND_WIN32])[]dnl
+AC_CACHE_CHECK([for WIN64],
+ [kpse_cv_have_win64],
+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifndef _WIN64
+ choke me
+#endif]])],
+ [kpse_cv_have_win64=yes],
+ [kpse_cv_have_win64=no])])
+AS_CASE([$kpse_cv_have_win64],
+ [yes], [WIN_WRAPPER=w64_wrapper],
+ [WIN_WRAPPER=w32_wrapper])
+AC_SUBST([WIN_WRAPPER])
AM_CONDITIONAL([WIN32_WRAP],
- [test -r "$srcdir/../../texk/texlive/w32_wrapper/runscript.exe"])
+ [test -r "$srcdir/../../texk/texlive/$WIN_WRAPPER/runscript.exe"])
]) # KPSE_COND_WIN32_WRAP
# KPSE_WIN32_CALL
diff --git a/source/m4/libtool.m4 b/source/m4/libtool.m4
index 068f0d8be0408374264266bf0a646c85ce140cc0..9c089e004798b4adf89468e750fdbebeff98c2fc 100644
--- a/source/m4/libtool.m4
+++ b/source/m4/libtool.m4
@@ -1840,7 +1840,7 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
@@ -2342,20 +2342,70 @@ aix[[4-9]]*)
fi
;;
esac
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
# AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
# soname into executable. Probably we can add versioning support to
# collect2, so additional links can be useful in future.
- if test yes = "$aix_use_runtimelinking"; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
# instead of lib<name>.a to let people know that these are not
# typical AIX shared libraries.
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
- else
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a[(]lib.so.V[)]'
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
library_names_spec='$libname$release.a $libname.a'
soname_spec='$libname$release$shared_ext$major'
- fi
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
shlibpath_var=LIBPATH
fi
;;
@@ -2543,7 +2593,7 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
need_version=no
need_lib_prefix=no
;;
@@ -2808,11 +2858,32 @@ openbsd* | bitrig*)
os2*)
libname_spec='$name'
+ version_type=windows
shrext_cmds=.dll
+ need_version=no
need_lib_prefix=no
- library_names_spec='$libname$shared_ext $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
;;
osf3* | osf4* | osf5*)
@@ -2888,7 +2959,7 @@ sysv4*MP*)
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
need_lib_prefix=no
need_version=no
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
@@ -3452,6 +3523,9 @@ sysv4 | sysv4.3*)
tpf*)
lt_cv_deplibs_check_method=pass_all
;;
+os2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
])
@@ -4060,6 +4134,11 @@ m4_if([$1], [CXX], [
# (--disable-auto-import) libraries
m4_if([$1], [GCJ], [],
[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ case $host_os in
+ os2*)
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
# PIC is the default on this platform
@@ -4379,6 +4458,11 @@ m4_if([$1], [CXX], [
# (--disable-auto-import) libraries
m4_if([$1], [GCJ], [],
[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ case $host_os in
+ os2*)
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
@@ -4476,6 +4560,11 @@ m4_if([$1], [CXX], [
# built for inclusion in a dll (and should export symbols for example).
m4_if([$1], [GCJ], [],
[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ case $host_os in
+ os2*)
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+ ;;
+ esac
;;
hpux9* | hpux10* | hpux11*)
@@ -4725,13 +4814,17 @@ m4_if([$1], [CXX], [
case $host_os in
aix[[4-9]]*)
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global defined
- # symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
;;
pw32*)
@@ -4942,6 +5035,34 @@ _LT_EOF
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
+ os2*)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ shrext_cmds=.dll
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -5015,6 +5136,9 @@ _LT_EOF
fi
case $cc_basename in
+ tcc*)
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
+ ;;
xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
_LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
@@ -5144,19 +5268,35 @@ _LT_EOF
no_entry_flag=
else
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global
- # defined symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
@@ -5164,6 +5304,13 @@ _LT_EOF
break
fi
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -5183,6 +5330,14 @@ _LT_EOF
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
_LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # traditional, no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ ;;
+ esac
if test yes = "$GCC"; then
case $host_os in aix4.[[012]]|aix4.[[012]].*)
@@ -5210,6 +5365,11 @@ _LT_EOF
if test yes = "$aix_use_runtimelinking"; then
shared_flag="$shared_flag "'$wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
if test ia64 = "$host_cpu"; then
@@ -5222,6 +5382,8 @@ _LT_EOF
else
shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
@@ -5229,7 +5391,7 @@ _LT_EOF
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to export.
_LT_TAGVAR(always_export_symbols, $1)=yes
- if test yes = "$aix_use_runtimelinking"; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
@@ -5260,8 +5422,20 @@ _LT_EOF
_LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds its shared libraries.
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $wl-bnoentry $compiler_flags $wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared libraries.
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+ else
+ # used by -dlpreopen to get the symbols
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -5515,6 +5689,16 @@ _LT_EOF
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
+ linux*)
+ case $cc_basename in
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+
netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
@@ -5560,8 +5744,28 @@ _LT_EOF
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_TAGVAR(hardcode_minus_L, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ shrext_cmds=.dll
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
;;
osf3*)
@@ -5956,8 +6160,12 @@ if test -n "$compiler"; then
;;
aix[[4-9]]*)
- if test ia64 != "$host_cpu" && test no = "$aix_use_runtimelinking"; then
- test yes = "$enable_shared" && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -6145,7 +6353,19 @@ if test yes != "$_lt_caught_CXX_error"; then
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
@@ -6155,6 +6375,13 @@ if test yes != "$_lt_caught_CXX_error"; then
;;
esac
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -6174,6 +6401,14 @@ if test yes != "$_lt_caught_CXX_error"; then
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
_LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ ;;
+ esac
if test yes = "$GXX"; then
case $host_os in aix4.[[012]]|aix4.[[012]].*)
@@ -6200,6 +6435,11 @@ if test yes != "$_lt_caught_CXX_error"; then
if test yes = "$aix_use_runtimelinking"; then
shared_flag=$shared_flag' $wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
if test ia64 = "$host_cpu"; then
@@ -6212,6 +6452,8 @@ if test yes != "$_lt_caught_CXX_error"; then
else
shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
@@ -6220,10 +6462,11 @@ if test yes != "$_lt_caught_CXX_error"; then
# underscore (_), so it is better to generate a list of symbols to
# export.
_LT_TAGVAR(always_export_symbols, $1)=yes
- if test yes = "$aix_use_runtimelinking"; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+ # The "-G" linker flag allows undefined symbols.
+ _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
# Determine the default libpath from the value encoded in an empty
# executable.
_LT_SYS_MODULE_PATH_AIX([$1])
@@ -6252,9 +6495,21 @@ if test yes != "$_lt_caught_CXX_error"; then
_LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds its shared
- # libraries.
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $wl-bnoentry $compiler_flags $wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared
+ # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+ else
+ # used by -dlpreopen to get the symbols
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -6354,6 +6609,34 @@ if test yes != "$_lt_caught_CXX_error"; then
_LT_DARWIN_LINKER_FEATURES($1)
;;
+ os2*)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ shrext_cmds=.dll
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+
dgux*)
case $cc_basename in
ec++*)
@@ -7407,8 +7690,12 @@ if test yes != "$_lt_disable_F77"; then
fi
;;
aix[[4-9]]*)
- if test ia64 != "$host_cpu" && test no = "$aix_use_runtimelinking"; then
- test yes = "$enable_shared" && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -7541,8 +7828,12 @@ if test yes != "$_lt_disable_FC"; then
fi
;;
aix[[4-9]]*)
- if test ia64 != "$host_cpu" && test no = "$aix_use_runtimelinking"; then
- test yes = "$enable_shared" && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
diff --git a/source/m4/ltoptions.m4 b/source/m4/ltoptions.m4
index de6520ed0a1e158fe05f13075591dd8cb2d1edae..f51ec8c0c90ad3f109dfb4c14a4ca845988f45ed 100644
--- a/source/m4/ltoptions.m4
+++ b/source/m4/ltoptions.m4
@@ -82,6 +82,8 @@ m4_if([$1],[LT_INIT],[
_LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
_LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
[_LT_ENABLE_FAST_INSTALL])
+ _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
+ [_LT_WITH_AIX_SONAME([aix])])
])
])# _LT_SET_OPTIONS
@@ -319,6 +321,59 @@ dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+# _LT_WITH_AIX_SONAME([DEFAULT])
+# ----------------------------------
+# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'.
+m4_define([_LT_WITH_AIX_SONAME],
+[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
+shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[[5-9]]*,yes)
+ AC_MSG_CHECKING([which variant of shared library versioning to provide])
+ AC_ARG_WITH([aix-soname],
+ [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
+ [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
+ [case $withval in
+ aix|svr4|both)
+ ;;
+ *)
+ AC_MSG_ERROR([Unknown argument to --with-aix-soname])
+ ;;
+ esac
+ lt_cv_with_aix_soname=$with_aix_soname],
+ [AC_CACHE_VAL([lt_cv_with_aix_soname],
+ [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
+ with_aix_soname=$lt_cv_with_aix_soname])
+ AC_MSG_RESULT([$with_aix_soname])
+ if test aix != "$with_aix_soname"; then
+ # For the AIX way of multilib, we name the shared archive member
+ # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+ # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+ # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+ # the AIX toolchain works better with OBJECT_MODE set (default 32).
+ if test 64 = "${OBJECT_MODE-32}"; then
+ shared_archive_member_spec=shr_64
+ else
+ shared_archive_member_spec=shr
+ fi
+ fi
+ ;;
+*)
+ with_aix_soname=aix
+ ;;
+esac
+
+_LT_DECL([], [shared_archive_member_spec], [0],
+ [Shared archive member basename, for filename based shared library versioning on AIX])dnl
+])# _LT_WITH_AIX_SONAME
+
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
+
+
# _LT_WITH_PIC([MODE])
# --------------------
# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
diff --git a/source/m4/ltversion.m4 b/source/m4/ltversion.m4
index 3535ff40b2cc279eaa908af61e0aecc3b90636a2..cb6da687ba69192ca6088704d71c86532428e679 100644
--- a/source/m4/ltversion.m4
+++ b/source/m4/ltversion.m4
@@ -9,15 +9,15 @@
# @configure_input@
-# serial 4105 ltversion.m4
+# serial 4151 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.4.2.458.26-92994])
-m4_define([LT_PACKAGE_REVISION], [2.4.3])
+m4_define([LT_PACKAGE_VERSION], [2.4.4])
+m4_define([LT_PACKAGE_REVISION], [2.4.4])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.2.458.26-92994'
-macro_revision='2.4.3'
+[macro_version='2.4.4'
+macro_revision='2.4.4'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
diff --git a/source/reautoconf b/source/reautoconf
old mode 100755
new mode 100644
diff --git a/source/tardate.ac b/source/tardate.ac
index b369c56b81a140885c98a1cdddf4d8232c20b3bc..5736e5a9ecf4f859c8e31dd64d06b833b7885b05 100644
--- a/source/tardate.ac
+++ b/source/tardate.ac
@@ -8,4 +8,4 @@ dnl
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current TeX Live tarball version
-m4_define([tex_live_tardate], [2014-08-22])
+m4_define([tex_live_tardate], [2014-11-24])
diff --git a/source/texk/README b/source/texk/README
index d1d6ee2fe4da50114e66945d3e8c637e7dda36cf..912be8e234f0ac0411c7ac652a401c59fc3d4596 100644
--- a/source/texk/README
+++ b/source/texk/README
@@ -1,4 +1,4 @@
-$Id: README 35175 2014-09-15 09:15:29Z peter $
+$Id: README 35661 2014-11-25 08:47:42Z peter $
Copyright 2006-2012 TeX Users Group.
You may freely use, modify and/or distribute this file.
@@ -89,8 +89,6 @@ ptexenc - maintained here, by us (akira et al.)
seetexk - ?
-tetex - scripts maintained here, by us
-
tex4htk - checked 25apr11
http://tug.org/tex4ht/
diff --git a/source/texk/configure b/source/texk/configure
index 2f314e4725608da03ccf03947c34ebf9e0e73fab..595aad1f88a3dc85226cb8cc3206eaa5593351c3 100755
--- a/source/texk/configure
+++ b/source/texk/configure
@@ -3071,11 +3071,11 @@ if test "${enable_multiplatform+set}" = set; then :
fi
if test "x$enable_multiplatform" = xyes; then
if test "x$bindir" = 'x${exec_prefix}/bin'; then
- bindir="$bindir/$host"
+ bindir="$bindir/${host_alias-$host}"
ac_configure_args="$ac_configure_args '--bindir=$bindir'"
fi
if test "x$libdir" = 'x${exec_prefix}/lib'; then
- libdir="$libdir/$host"
+ libdir="$libdir/${host_alias-$host}"
ac_configure_args="$ac_configure_args '--libdir=$libdir'"
fi
fi
diff --git a/source/texk/kpathsea/ChangeLog b/source/texk/kpathsea/ChangeLog
index 83909d9844f8059445b50fd7d26177296ff15c0d..8e8bc495d171bc36f1fc6ad2540eb96e46862cce 100644
--- a/source/texk/kpathsea/ChangeLog
+++ b/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,15 @@
+2014-12-06 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am [kpathsea.h]: Improved output for silent rules.
+
+2014-12-05 Karl Berry <karl@tug.org>
+
+ * kpsewhich.c (help_formats): new fn for new option --help-formats.
+ (help_message): split off code from here.
+ (USAGE): document it.
+ (read_command_line): recognize it.
+ Suggestion from Julian Gilbey, tex-k 4 Dec 2014 13:34:23.
+
2014-10-20 Peter Breitenlohner <peb@mppmu.mpg.de>
* db.c (db_names): Use initialized non-const strings to avoid warning.
diff --git a/source/texk/kpathsea/Makefile.am b/source/texk/kpathsea/Makefile.am
index 03c0cfab060d9abf8a416b8ef2291a491320738a..17ab473710a911353a0c3da45bd194221009cf7e 100644
--- a/source/texk/kpathsea/Makefile.am
+++ b/source/texk/kpathsea/Makefile.am
@@ -220,15 +220,13 @@ stamp-kpathsea: Makefile paths.h
echo '/* collecting all public kpathsea headers. */'; \
for f in config.h paths.h $(direct_headers); do \
echo "#include <kpathsea/$$f>"; \
- done ) >kpathsea.tmp
- @if cmp -s kpathsea.h kpathsea.tmp 2>/dev/null; then \
+ done ) >kpathsea.tmp && \
+ if cmp -s kpathsea.h kpathsea.tmp 2>/dev/null; then \
echo "kpathsea.h is unchanged"; \
else \
- echo "cp kpathsea.tmp kpathsea.h"; \
+ echo "generated kpathsea.h"; \
cp kpathsea.tmp kpathsea.h; \
- fi
- rm -f kpathsea.tmp
- date >$@
+ fi && rm -f kpathsea.tmp && date >$@
EXTRA_DIST += bsnl.awk cnf-to-paths.awk
diff --git a/source/texk/kpathsea/Makefile.in b/source/texk/kpathsea/Makefile.in
index f118d63e20a4030aa6f77ff729e44f18805b4351..56e5e28dd45d97fa38efbe75d48fb47b2a517f22 100644
--- a/source/texk/kpathsea/Makefile.in
+++ b/source/texk/kpathsea/Makefile.in
@@ -110,8 +110,8 @@ 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 strstr.c strcasecmp.c strtol.c \
- putenv.c $(dist_noinst_SCRIPTS) $(dist_web2c_SCRIPTS) \
+ $(srcdir)/kpathsea.pc.in strcasecmp.c putenv.c strtol.c \
+ strstr.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 \
@@ -2254,15 +2254,13 @@ stamp-kpathsea: Makefile paths.h
echo '/* collecting all public kpathsea headers. */'; \
for f in config.h paths.h $(direct_headers); do \
echo "#include <kpathsea/$$f>"; \
- done ) >kpathsea.tmp
- @if cmp -s kpathsea.h kpathsea.tmp 2>/dev/null; then \
+ done ) >kpathsea.tmp && \
+ if cmp -s kpathsea.h kpathsea.tmp 2>/dev/null; then \
echo "kpathsea.h is unchanged"; \
else \
- echo "cp kpathsea.tmp kpathsea.h"; \
+ echo "generated kpathsea.h"; \
cp kpathsea.tmp kpathsea.h; \
- fi
- rm -f kpathsea.tmp
- date >$@
+ fi && rm -f kpathsea.tmp && date >$@
install-exec-local: installdirs-am
@WIN32_FALSE@ @for f in $(dist_noinst_SCRIPTS); do \
diff --git a/source/texk/kpathsea/configure b/source/texk/kpathsea/configure
index 2bf63c29290eab41f60ebcc5ede77e5ddea13704..b7e640ad13926ecf2b5ccea120e4c2c8f5115eeb 100755
--- a/source/texk/kpathsea/configure
+++ b/source/texk/kpathsea/configure
@@ -774,6 +774,7 @@ enable_shared
enable_static
with_pic
enable_fast_install
+with_aix_soname
with_gnu_ld
with_sysroot
enable_libtool_lock
@@ -1447,6 +1448,9 @@ Optional Packages:
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
both]
+ --with-aix-soname=aix|svr4|both
+ shared library versioning (aka "SONAME") variant to
+ provide on AIX, [default=aix].
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-sysroot[=DIR] Search for dependent libraries within DIR (or the
compiler's sysroot if not specified).
@@ -4286,8 +4290,8 @@ esac
-macro_version='2.4.2.458.26-92994'
-macro_revision='2.4.3'
+macro_version='2.4.4'
+macro_revision='2.4.4'
@@ -5656,6 +5660,9 @@ sysv4 | sysv4.3*)
tpf*)
lt_cv_deplibs_check_method=pass_all
;;
+os2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
fi
@@ -8644,6 +8651,58 @@ fi
+ shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[5-9]*,yes)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+
+# Check whether --with-aix-soname was given.
+if test "${with_aix_soname+set}" = set; then :
+ withval=$with_aix_soname; case $withval in
+ aix|svr4|both)
+ ;;
+ *)
+ as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+ ;;
+ esac
+ lt_cv_with_aix_soname=$with_aix_soname
+else
+ if ${lt_cv_with_aix_soname+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_with_aix_soname=aix
+fi
+
+ with_aix_soname=$lt_cv_with_aix_soname
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
+ if test aix != "$with_aix_soname"; then
+ # For the AIX way of multilib, we name the shared archive member
+ # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+ # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+ # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+ # the AIX toolchain works better with OBJECT_MODE set (default 32).
+ if test 64 = "${OBJECT_MODE-32}"; then
+ shared_archive_member_spec=shr_64
+ else
+ shared_archive_member_spec=shr
+ fi
+ fi
+ ;;
+*)
+ with_aix_soname=aix
+ ;;
+esac
+
+
+
+
+
+
+
@@ -9082,6 +9141,11 @@ lt_prog_compiler_static=
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
lt_prog_compiler_pic='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
@@ -9178,6 +9242,11 @@ lt_prog_compiler_static=
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static='$wl-static'
+ ;;
+ esac
;;
hpux9* | hpux10* | hpux11*)
@@ -9818,6 +9887,34 @@ _LT_EOF
link_all_deplibs=yes
;;
+ os2*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ allow_undefined_flag=unsupported
+ shrext_cmds=.dll
+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes=yes
+ ;;
+
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
@@ -9891,6 +9988,9 @@ _LT_EOF
fi
case $cc_basename in
+ tcc*)
+ export_dynamic_flag_spec='-rdynamic'
+ ;;
xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
@@ -10020,19 +10120,35 @@ _LT_EOF
no_entry_flag=
else
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global
- # defined symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
@@ -10040,6 +10156,13 @@ _LT_EOF
break
fi
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -10059,6 +10182,14 @@ _LT_EOF
hardcode_libdir_separator=':'
link_all_deplibs=yes
file_list_spec='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # traditional, no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ hardcode_direct=no
+ hardcode_direct_absolute=no
+ ;;
+ esac
if test yes = "$GCC"; then
case $host_os in aix4.[012]|aix4.[012].*)
@@ -10086,6 +10217,11 @@ _LT_EOF
if test yes = "$aix_use_runtimelinking"; then
shared_flag="$shared_flag "'$wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
if test ia64 = "$host_cpu"; then
@@ -10098,6 +10234,8 @@ _LT_EOF
else
shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
@@ -10105,7 +10243,7 @@ _LT_EOF
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to export.
always_export_symbols=yes
- if test yes = "$aix_use_runtimelinking"; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
allow_undefined_flag='-berok'
@@ -10220,8 +10358,20 @@ fi
whole_archive_flag_spec='$convenience'
fi
archive_cmds_need_lc=yes
- # This is similar to how AIX traditionally builds its shared libraries.
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $wl-bnoentry $compiler_flags $wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+ else
+ # used by -dlpreopen to get the symbols
+ archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -10540,6 +10690,16 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
link_all_deplibs=yes
;;
+ linux*)
+ case $cc_basename in
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ ld_shlibs=yes
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+
netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
@@ -10585,8 +10745,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ shrext_cmds=.dll
+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes=yes
;;
osf3*)
@@ -11145,20 +11325,70 @@ aix[4-9]*)
fi
;;
esac
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
# AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
# soname into executable. Probably we can add versioning support to
# collect2, so additional links can be useful in future.
- if test yes = "$aix_use_runtimelinking"; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
# instead of lib<name>.a to let people know that these are not
# typical AIX shared libraries.
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
- else
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a(lib.so.V)'
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
library_names_spec='$libname$release.a $libname.a'
soname_spec='$libname$release$shared_ext$major'
- fi
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
shlibpath_var=LIBPATH
fi
;;
@@ -11346,7 +11576,7 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
need_version=no
need_lib_prefix=no
;;
@@ -11630,11 +11860,32 @@ openbsd* | bitrig*)
os2*)
libname_spec='$name'
+ version_type=windows
shrext_cmds=.dll
+ need_version=no
need_lib_prefix=no
- library_names_spec='$libname$shared_ext $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
;;
osf3* | osf4* | osf5*)
@@ -11710,7 +11961,7 @@ sysv4*MP*)
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
need_lib_prefix=no
need_version=no
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
@@ -12239,7 +12490,7 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
@@ -12345,7 +12596,7 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
@@ -12494,8 +12745,12 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
;;
aix[4-9]*)
- if test ia64 != "$host_cpu" && test no = "$aix_use_runtimelinking"; then
- test yes = "$enable_shared" && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -14610,6 +14865,7 @@ enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
@@ -15653,6 +15909,9 @@ pic_mode=$pic_mode
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
# Shell to use when invoking shell scripts.
SHELL=$lt_SHELL
diff --git a/source/texk/kpathsea/kpsewhich.c b/source/texk/kpathsea/kpsewhich.c
index 3078fe3086a955ce1211e8456930a094ae687d7f..8992b3b84429880235b189b6bc2697903e9fe2a9 100644
--- a/source/texk/kpathsea/kpsewhich.c
+++ b/source/texk/kpathsea/kpsewhich.c
@@ -415,7 +415,7 @@ lookup (kpathsea kpse, string name)
/* Help message. */
#define USAGE "\n\
-Standalone path lookup and expansion for Kpathsea.\n\
+Standalone path lookup and expansion for the Kpathsea library.\n\
The default is to look up each FILENAME in turn and report its\n\
first match (if any) to standard output.\n\
\n\
@@ -431,7 +431,8 @@ to also use -engine, or nothing will be returned; in particular,\n\
-expand-path=STRING output complete path expansion of STRING.\n\
-expand-var=STRING output variable expansion of STRING.\n\
-format=NAME use file type NAME (see list below).\n\
--help print this message and exit.\n\
+-help display this message and exit.\n\
+-help-formats display information about all supported file formats.\n\
-interactive ask for additional filenames to look up.\n\
[-no]-mktex=FMT disable/enable mktexFMT generation (FMT=pk/mf/tex/tfm).\n\
-mode=STRING set device name for $MAKETEX_MODE to STRING; no default.\n\
@@ -443,23 +444,30 @@ to also use -engine, or nothing will be returned; in particular,\n\
-show-path=NAME output search path for file type NAME (list below).\n\
-subdir=STRING only output matches whose directory ends with STRING.\n\
-var-value=STRING output the value of variable $STRING.\n\
--version print version number and exit.\n \
+-version display version information number and exit.\n \
"
static void
help_message (kpathsea kpse, string *argv)
{
- int f; /* kpse_file_format_type */
-
printf ("Usage: %s [OPTION]... [FILENAME]...\n", argv[0]);
fputs (USAGE, stdout);
putchar ('\n');
fputs (kpathsea_bug_address, stdout);
+ fputs ("Kpathsea home page: http://tug.org/kpathsea/\n", stdout);
+ exit (0);
+}
+
+static void
+help_formats (kpathsea kpse, string *argv)
+{
+ int f; /* kpse_file_format_type */
/* Have to set this for init_format to work. */
kpathsea_set_program_name (kpse, argv[0], progname);
- puts ("\nRecognized format names and their (abbreviations) and suffixes:");
+ puts (kpathsea_version_string);
+ puts ("\nRecognized Kpathsea format names and their (abbreviations) and suffixes:");
for (f = 0; f < kpse_last_format; f++) {
const_string *ext;
@@ -500,10 +508,10 @@ help_message (kpathsea kpse, string *argv)
printf (" [original path (from %s) = %s]\n",
kpse->format_info[f].path_source, kpse->format_info[f].raw_path);
- printf (" [expanded path = %s]\n",
- kpse->format_info[f].path);
}
+ fputs ("\nTo see paths after expansion, use --show-path=FMT.\n\n", stdout);
+ fputs (kpathsea_bug_address, stdout);
exit (0);
}
@@ -527,6 +535,7 @@ static struct option long_options[]
{ "expand-var", 1, 0, 0 },
{ "format", 1, 0, 0 },
{ "help", 0, 0, 0 },
+ { "help-formats", 0, 0, 0 },
{ "interactive", 0, (int *) &interactive, 1 },
{ "mktex", 1, 0, 0 },
{ "mode", 1, 0, 0 },
@@ -583,6 +592,9 @@ read_command_line (kpathsea kpse, int argc, string *argv)
} else if (ARGUMENT_IS ("help")) {
help_message (kpse, argv);
+ } else if (ARGUMENT_IS ("help-formats")) {
+ help_formats (kpse, argv);
+
} else if (ARGUMENT_IS ("mktex")) {
kpathsea_maketex_option (kpse, optarg, true);
must_exist = 1; /* otherwise it never gets called */
diff --git a/source/texk/texlive/ChangeLog b/source/texk/texlive/ChangeLog
index 2fe43b5633f14f2a956a63c4cfc7f2d3395d1f97..5f9639ef4bf27e4129e8819ab1791cff2ee3392d 100644
--- a/source/texk/texlive/ChangeLog
+++ b/source/texk/texlive/ChangeLog
@@ -1,3 +1,13 @@
+2014-11-18 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * w64_wrapper/runscript.{dll,exe}: Now compiled with Mingw64 to
+ make them independent from msvcr100.dll.
+
+2014-11-17 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * w64_wrapper: Directory with WIN64 executables.
+ * Makefile.am: Add the new directory.
+
2014-07-15 Peter Breitenlohner <peb@mppmu.mpg.de>
* w32_wrapper/callexe.c: Replace the deprecated spawnvp() by
diff --git a/source/texk/texlive/Makefile.am b/source/texk/texlive/Makefile.am
index 3b617605028eea35ccd5cce9a9acf62927ae5b74..ab4c5d27cb9c3dffdc19430a2f409af044ae7177 100644
--- a/source/texk/texlive/Makefile.am
+++ b/source/texk/texlive/Makefile.am
@@ -8,9 +8,9 @@ if LINKED_SCRIPTS
SUBDIRS += linked_scripts
endif LINKED_SCRIPTS
-## Windows wrapper sources.
+## Windows wrapper and sources.
##
-EXTRA_DIST = w32_wrapper
+EXTRA_DIST = w32_wrapper w64_wrapper
## Tests
##
diff --git a/source/texk/texlive/Makefile.in b/source/texk/texlive/Makefile.in
index 08cde43a9434b164ffd444cae4c2941f543842be..aed50619a9951e5656686dfe4a944c1562446d5d 100644
--- a/source/texk/texlive/Makefile.in
+++ b/source/texk/texlive/Makefile.in
@@ -444,6 +444,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WIN_WRAPPER = @WIN_WRAPPER@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -487,7 +488,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = tl_scripts $(am__append_1)
-EXTRA_DIST = w32_wrapper $(TESTS)
+EXTRA_DIST = w32_wrapper w64_wrapper $(TESTS)
TESTS = tests/updmap-cmdline-test.pl
all: all-recursive
diff --git a/source/texk/texlive/configure b/source/texk/texlive/configure
index 3a2d6da9e44f75044427e4a87abccc097ad0954b..664a58b451f4ac832541886df4e528b16234594f 100755
--- a/source/texk/texlive/configure
+++ b/source/texk/texlive/configure
@@ -591,6 +591,7 @@ LTLIBOBJS
LIBOBJS
WIN32_WRAP_FALSE
WIN32_WRAP_TRUE
+WIN_WRAPPER
WIN32_FALSE
WIN32_TRUE
LN_S
@@ -3593,7 +3594,41 @@ else
fi
- if test -r "$srcdir/../../texk/texlive/w32_wrapper/runscript.exe"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WIN64" >&5
+$as_echo_n "checking for WIN64... " >&6; }
+if ${kpse_cv_have_win64+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifndef _WIN64
+ choke me
+#endif
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ kpse_cv_have_win64=yes
+else
+ kpse_cv_have_win64=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win64" >&5
+$as_echo "$kpse_cv_have_win64" >&6; }
+case $kpse_cv_have_win64 in #(
+ yes) :
+ WIN_WRAPPER=w64_wrapper ;; #(
+ *) :
+ WIN_WRAPPER=w32_wrapper ;;
+esac
+
+ if test -r "$srcdir/../../texk/texlive/$WIN_WRAPPER/runscript.exe"; then
WIN32_WRAP_TRUE=
WIN32_WRAP_FALSE='#'
else
diff --git a/source/texk/texlive/linked_scripts/ChangeLog b/source/texk/texlive/linked_scripts/ChangeLog
index 694c28d4a0121c34088a8281d9e81b5a8056ab90..a48f9ca7370a6e33b446cd5b3e036a5c3f02b25e 100644
--- a/source/texk/texlive/linked_scripts/ChangeLog
+++ b/source/texk/texlive/linked_scripts/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-17 Karl Berry <karl@tug.org>
+
+ * Makefile.am: Use WIN_WRAPPER (w32_wrapper or w64_wrapper).
+
2014-07-18 Karl Berry <karl@tug.org>
* Makefile.am (bin_links): mkluatexfontdb gone.
diff --git a/source/texk/texlive/linked_scripts/Makefile.am b/source/texk/texlive/linked_scripts/Makefile.am
index d55a854cabbbbf84b91ab9c6dd9da05b00961fc4..dd9cf08d2fb17e8e9b67e04a2c4985affd559161 100644
--- a/source/texk/texlive/linked_scripts/Makefile.am
+++ b/source/texk/texlive/linked_scripts/Makefile.am
@@ -39,9 +39,11 @@ installdirs-local:
## On Unix systems a symlink from $(bindir) to the script is installed
## for all of them; on Windows nothing is installed in $(bindir) for
## `shell' scripts whereas for `other' (usually perl, lua, ...) scripts
-## the standard wrapper ../w32_wrapper/runscript.exe is installed or the
-## ConTeXt wrapper ../w32_wrapper/context/mtxrun.exe for `context'
-## scripts.
+## the standard wrapper ../$(WIN_WRAPPER)/runscript.exe is installed or
+## the ConTeXt wrapper ../$(WIN_WRAPPER)/context/mtxrun.exe for
+## `context' scripts.
+##
+## WIN_WRAPPER is w32_wrapper for 32-bit or w64_wrapper for 64-bit.
##
## Some /bin/sh scripts are listed as `other' or `context'
## scripts because they are correctly handled by the wrapper binaries.
@@ -200,7 +202,7 @@ bin_links = \
# ../../texmf-dist/scripts/foo/foo.pl. That way we save a bit of disk
# space, but more importantly omit duplication, and most
# importantly of all make it possible to invoke the same Perl script on
-# Windows (see ../w32_wrapper).
+# Windows (see ../$(WIN_WRAPPER)).
#
# The installation into texmf*/scripts is ideally done with ctan2tl.
# The copy of the wrapper for Windows is also done by ctan2tl. (And
@@ -217,8 +219,8 @@ bin_links = \
#
EXTRA_DIST += ../../../build-aux/relpath
relpath = $(SHELL) $(top_srcdir)/../../build-aux/relpath
-runscript = $(top_srcdir)/w32_wrapper/runscript.exe
-ctxscript = $(top_srcdir)/w32_wrapper/context/mtxrun.exe
+runscript = $(top_srcdir)/$(WIN_WRAPPER)/runscript.exe
+ctxscript = $(top_srcdir)/$(WIN_WRAPPER)/context/mtxrun.exe
install-data-hook: installdirs-local
if WIN32
@for s in $(texmf_other_scripts); do \
@@ -226,15 +228,15 @@ if WIN32
echo "$(INSTALL_SCRIPT) '$(runscript)' '$(DESTDIR)$(bindir)/$$t.exe'"; \
$(INSTALL_SCRIPT) $(runscript) $(DESTDIR)$(bindir)/$$t.exe; \
done
- $(INSTALL_SCRIPT) $(top_srcdir)/w32_wrapper/runscript.dll $(DESTDIR)$(bindir)
- $(INSTALL_SCRIPT) $(top_srcdir)/w32_wrapper/runscript.exe $(DESTDIR)$(bindir)
- $(INSTALL_SCRIPT) $(top_srcdir)/w32_wrapper/runscript.tlu $(DESTDIR)$(bindir)
+ $(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/runscript.dll $(DESTDIR)$(bindir)
+ $(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/runscript.exe $(DESTDIR)$(bindir)
+ $(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/runscript.tlu $(DESTDIR)$(bindir)
@for s in $(texmf_context_scripts); do \
t=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \
echo "$(INSTALL_SCRIPT) '$(ctxscript)' '$(DESTDIR)$(bindir)/$$t.exe'"; \
$(INSTALL_SCRIPT) $(ctxscript) $(DESTDIR)$(bindir)/$$t.exe; \
done
- $(INSTALL_SCRIPT) $(top_srcdir)/w32_wrapper/context/mtxrun.dll $(DESTDIR)$(bindir)
+ $(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/context/mtxrun.dll $(DESTDIR)$(bindir)
$(INSTALL_SCRIPT) $(srcdir)/context/stubs/unix/mtxrun $(DESTDIR)$(bindir)/mtxrun.lua
@for s in $(bin_links); do \
link=`echo $$s | sed 's,.*:,,'`; \
diff --git a/source/texk/texlive/linked_scripts/Makefile.in b/source/texk/texlive/linked_scripts/Makefile.in
index 091b6b321e29c223320b5f3b844d8e0a8fa0b886..0e6f7e409848c43325c08caf2ab6be3f1f800a5e 100644
--- a/source/texk/texlive/linked_scripts/Makefile.in
+++ b/source/texk/texlive/linked_scripts/Makefile.in
@@ -182,6 +182,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WIN_WRAPPER = @WIN_WRAPPER@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -231,7 +232,7 @@ DISTCLEANFILES = scripts-list
# ../../texmf-dist/scripts/foo/foo.pl. That way we save a bit of disk
# space, but more importantly omit duplication, and most
# importantly of all make it possible to invoke the same Perl script on
-# Windows (see ../w32_wrapper).
+# Windows (see ../$(WIN_WRAPPER)).
#
# The installation into texmf*/scripts is ideally done with ctan2tl.
# The copy of the wrapper for Windows is also done by ctan2tl. (And
@@ -400,8 +401,8 @@ bin_links = \
pdfcrop:rpdfcrop
relpath = $(SHELL) $(top_srcdir)/../../build-aux/relpath
-runscript = $(top_srcdir)/w32_wrapper/runscript.exe
-ctxscript = $(top_srcdir)/w32_wrapper/context/mtxrun.exe
+runscript = $(top_srcdir)/$(WIN_WRAPPER)/runscript.exe
+ctxscript = $(top_srcdir)/$(WIN_WRAPPER)/context/mtxrun.exe
@WIN32_TRUE@WINEXT = $(EXEEXT)
shell_scripts = $(texmf_shell_scripts) $(texmf_context_scripts)
all: all-am
@@ -657,15 +658,15 @@ install-data-hook: installdirs-local
@WIN32_TRUE@ echo "$(INSTALL_SCRIPT) '$(runscript)' '$(DESTDIR)$(bindir)/$$t.exe'"; \
@WIN32_TRUE@ $(INSTALL_SCRIPT) $(runscript) $(DESTDIR)$(bindir)/$$t.exe; \
@WIN32_TRUE@ done
-@WIN32_TRUE@ $(INSTALL_SCRIPT) $(top_srcdir)/w32_wrapper/runscript.dll $(DESTDIR)$(bindir)
-@WIN32_TRUE@ $(INSTALL_SCRIPT) $(top_srcdir)/w32_wrapper/runscript.exe $(DESTDIR)$(bindir)
-@WIN32_TRUE@ $(INSTALL_SCRIPT) $(top_srcdir)/w32_wrapper/runscript.tlu $(DESTDIR)$(bindir)
+@WIN32_TRUE@ $(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/runscript.dll $(DESTDIR)$(bindir)
+@WIN32_TRUE@ $(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/runscript.exe $(DESTDIR)$(bindir)
+@WIN32_TRUE@ $(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/runscript.tlu $(DESTDIR)$(bindir)
@WIN32_TRUE@ @for s in $(texmf_context_scripts); do \
@WIN32_TRUE@ t=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \
@WIN32_TRUE@ echo "$(INSTALL_SCRIPT) '$(ctxscript)' '$(DESTDIR)$(bindir)/$$t.exe'"; \
@WIN32_TRUE@ $(INSTALL_SCRIPT) $(ctxscript) $(DESTDIR)$(bindir)/$$t.exe; \
@WIN32_TRUE@ done
-@WIN32_TRUE@ $(INSTALL_SCRIPT) $(top_srcdir)/w32_wrapper/context/mtxrun.dll $(DESTDIR)$(bindir)
+@WIN32_TRUE@ $(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/context/mtxrun.dll $(DESTDIR)$(bindir)
@WIN32_TRUE@ $(INSTALL_SCRIPT) $(srcdir)/context/stubs/unix/mtxrun $(DESTDIR)$(bindir)/mtxrun.lua
@WIN32_TRUE@ @for s in $(bin_links); do \
@WIN32_TRUE@ link=`echo $$s | sed 's,.*:,,'`; \
diff --git a/source/texk/texlive/tl_scripts/ChangeLog b/source/texk/texlive/tl_scripts/ChangeLog
index 4fc944e3bc0259481a5102533c9bbb7c5ca39a51..29d74589b72cba0066de315a0553dba933b81981 100644
--- a/source/texk/texlive/tl_scripts/ChangeLog
+++ b/source/texk/texlive/tl_scripts/ChangeLog
@@ -1,3 +1,24 @@
+2014-11-20 Karl Berry <karl@tug.org>
+
+ * fmtutil.sh: (init_log_warnings, log_warning): remove.
+ (main): change log_warning calls to log_failure.
+ (flush_msg_buffers, byebye): no warnings any more.
+
+ * fmtutil-sys.sh: doc fixes.
+
+ * updmap-sys.sh: prepend directory of executable to $PATH.
+
+2014-11-17 Karl Berry <karl@tug.org>
+
+ * fmtutil.sh: install (modified) patch from Zephyrus C,
+ 29 May 2014 00:15:15,
+ http://tug.org/pipermail/tex-live/2014-May/035443.html.
+ (setupTmpDir): call byebye instead of cleanup, to display msgs.
+ (byebye): exit 1 if warnings, not just errors.
+ (verbose): do not assume && ... || precedence.
+ (main): set setupTmpDir (and trap in general) earlier.
+ (run_initex): check for mv and cp failure, e.g., full file system.
+
2014-07-28 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am (run-texlinks): Install the required files.
diff --git a/source/texk/texlive/tl_scripts/Makefile.in b/source/texk/texlive/tl_scripts/Makefile.in
index a589541673dfe41508d0dcfeb684b9ed8b3bbe33..63eec8946564d5a640e409bd39564629292b9c76 100644
--- a/source/texk/texlive/tl_scripts/Makefile.in
+++ b/source/texk/texlive/tl_scripts/Makefile.in
@@ -197,6 +197,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+WIN_WRAPPER = @WIN_WRAPPER@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -268,7 +269,7 @@ nodist_bin_SCRIPTS = $(am__append_1)
scriptsdir = texmf-dist/scripts/texlive
all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
@WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe)
-@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
+@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/$(WIN_WRAPPER)/runscript.exe
#
#
texmfdir = $(datarootdir)/$(scriptsdir)
diff --git a/source/texk/texlive/tl_scripts/fmtutil-sys.sh b/source/texk/texlive/tl_scripts/fmtutil-sys.sh
index 4091c8cd6aea7b345914c068baea5e08cebf9954..a272b66d00717262b77948e6a0beb3baec2eb134 100755
--- a/source/texk/texlive/tl_scripts/fmtutil-sys.sh
+++ b/source/texk/texlive/tl_scripts/fmtutil-sys.sh
@@ -1,9 +1,7 @@
#!/bin/sh
-# $Id: fmtutil-sys.sh 34641 2014-07-17 16:38:18Z karl $
-# fmtutil-sys: Thomas Esser, public domain.
-
-# wrapper script for fmtutil with TEXMFVAR and TEXMFCONFIG set to
-# TEXMFSYSVAR / TEXMFSYSCONFIG
+# $Id: fmtutil-sys.sh 35626 2014-11-20 19:08:47Z karl $
+# fmtutil-sys - arrange for fmtutil to affect system directories.
+# Public domain. Originally written by Thomas Esser.
test -f /bin/ksh && test -z "$RUNNING_KSH" \
&& { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
@@ -17,7 +15,6 @@ unset RUNNING_BSH
# hack around a bug in zsh:
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
-export PATH
# preferentially use subprograms from our own directory.
mydir=`echo "$0" | sed 's,/[^/]*$,,'`
diff --git a/source/texk/texlive/tl_scripts/fmtutil.sh b/source/texk/texlive/tl_scripts/fmtutil.sh
index 494635cd3c6d3b592e82a07b1ed160d7ba99c838..408e42b4d599dfc66a418eb396cc4415011dad25 100755
--- a/source/texk/texlive/tl_scripts/fmtutil.sh
+++ b/source/texk/texlive/tl_scripts/fmtutil.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: fmtutil.sh 34641 2014-07-17 16:38:18Z karl $
+# $Id: fmtutil.sh 35626 2014-11-20 19:08:47Z karl $
# fmtutil - utility to maintain format files.
# Public domain. Originally written by Thomas Esser.
# Run with --help for usage.
@@ -63,15 +63,15 @@ mydir=`echo "$0" | sed 's,/[^/]*$,,'`
mydir=`cd "$mydir" && pwd`
PATH="$mydir:$PATH"; export PATH
-version='$Id: fmtutil.sh 34641 2014-07-17 16:38:18Z karl $'
+version='$Id: fmtutil.sh 35626 2014-11-20 19:08:47Z karl $'
progname=fmtutil
argv0=$0
cnf=fmtutil.cnf # name of the config file
###############################################################################
-# cleanup()
+# cleanup ERRCODE, where ERRCODE=1 for failure and 0 for success.
# clean up the temp area and exit with proper exit status
-###############################################################################
+#
cleanup()
{
rc=$1
@@ -79,12 +79,11 @@ cleanup()
$needsCleanup && test -n "$tmpdir" && test -d "$tmpdir" \
&& { cd / && rm -rf "$tmpdir"; }
(exit $rc); exit $rc
-}
+}
###############################################################################
-# help() and version()
-# display help (or version) message and exit
-###############################################################################
+# help() and version() - display help resp. version message and exit 0.
+#
help()
{
cat <<eof
@@ -111,7 +110,8 @@ Optional behavior:
--no-error-if-no-engine ENGINE1,ENGINE2,...
exit successfully even if the required engine
is missing, if it is included in this list
- --no-error-if-no-format exit successfully if no format is selected
+ --no-error-if-no-format exit successfully even if no format is selected;
+ e.g., used by tlmgr together with --byengine
--quiet be silent
--dolinks (not implemented, just for compatibility)
--force (not implemented, just for compatibility)
@@ -157,14 +157,13 @@ eof
}
###############################################################################
-# setupTmpDir()
-# set up a temp directory and a trap to remove it
-###############################################################################
+# setupTmpDir() - set up a temp directory and a trap to remove it (via byebye)
+#
setupTmpDir()
{
$needsCleanup && return
- trap 'cleanup 1' 1 2 3 7 13 15
+ trap 'byebye 1' 1 2 3 7 13 15
needsCleanup=true
(umask 077; mkdir "$tmpdir") \
|| abort "could not create directory \`$tmpdir'"
@@ -174,7 +173,7 @@ setupTmpDir()
# configReplace(file, pattern, line)
# The first line in file that matches pattern gets replaced by line.
# line will be added at the end of the file if pattern does not match.
-###############################################################################
+#
configReplace()
{
file=$1; pat=$2; line=$3
@@ -194,28 +193,25 @@ eof
}
###############################################################################
-# setmatch(match)
-# setting the "match state" to true or false. Used to see if there was at
-# least one match.
-###############################################################################
+# setmatch(MATCH) - set the "match state" to MATCH (true or false).
+# Used to see if there was at least one match.
+#
setmatch()
{
match=$1
}
###############################################################################
-# getmatch()
-# return success if there was at least one match.
-###############################################################################
+# getmatch() - return success if there was at least one match.
+#
getmatch()
{
test "x$match" = xtrue
}
###############################################################################
-# initTexmfMain()
-# get $MT_TEXMFMAIN from $TEXMFMAIN
-###############################################################################
+# initTexmfMain() - set $MT_TEXMFMAIN from $TEXMFMAIN, if not already set.
+#
initTexmfMain()
{
case $MT_TEXMFMAIN in
@@ -227,8 +223,8 @@ initTexmfMain()
###############################################################################
# cache_vars()
# locate files / kpathsea variables and export variables to environment
-# this speeds up future calls to e.g. mktexupd
-###############################################################################
+# to speed up future calls to e.g. mktexupd.
+#
cache_vars()
{
: ${MT_VARTEXFONTS=`kpsewhich --expand-var='$VARTEXFONTS' | sed 's%^!!%%'`}
@@ -244,9 +240,8 @@ cache_vars()
}
###############################################################################
-# abort(errmsg)
-# print `errmsg' to stderr and exit with error code 1
-###############################################################################
+# abort(ERRMSG) print ERRMSG to stderr and exit with error code 1
+#
abort()
{
echo "$progname: $1." >&2
@@ -254,10 +249,9 @@ abort()
}
###############################################################################
-# maybe_abort(errmsg)
-# print `errmsg' to stderr and
-# unless noAbortFlag is set exit with error code 1
-###############################################################################
+# maybe_abort(ERRMSG) print ERRMSG to stderr; then, if
+# noAbortFlag is set, do nothing; if not set, exit with error code 1.
+#
maybe_abort()
{
echo "$progname: $1." >&2
@@ -265,71 +259,82 @@ maybe_abort()
}
###############################################################################
-# verboseMsg(msg)
-# print `msg' to stderr is $verbose is true
-###############################################################################
+# verboseMsg(MSG) - print MSG to stderr if $verbose is true
+#
verboseMsg() {
$verboseFlag && verbose echo ${1+"$@"}
}
###############################################################################
-# byebye()
-# report any failures and exit the program
-###############################################################################
-byebye()
+# flush_msg_buffers() - Called from byebye() to print accumulated
+# error messages.
+#
+# global variable `flush_msg_buffers_called' is set true to detect
+# recursive calls during error/trap processing. If the redirection of
+# "cat" fails due to full file system, say, we get an error condition.
+#
+flush_msg_buffers()
{
- if $has_warnings; then
- {
- cat <<eof
-
-###############################################################################
-$progname: Warning! Some warnings have been issued.
-Visit the log files in directory
- $destdir
-for details.
-###############################################################################
-
-This is a summary of all \`warning' messages:
-$log_warning_msg
-eof
- } >&2
- fi
+ if $flush_msg_buffers_called; then return; fi
+ flush_msg_buffers_called=true
if $has_errors; then
{
cat <<eof
###############################################################################
-$progname: Error! Not all formats have been built successfully.
-Visit the log files in directory
- $destdir
-for details.
+$progname: Error! Not all formats built successfully.
+$progname: See log files in directory: $destdir
###############################################################################
-
-This is a summary of all \`failed' messages:
+$progname: Summary of all \`failed' messages:
$log_failure_msg
+###############################################################################
eof
} >&2
- cleanup 1
- else
- cleanup 0
fi
}
###############################################################################
-# init_log_warning()
-# reset the list of warning messages
-###############################################################################
-init_log_warning()
+# byebye([RETURNCODE]) - report any failures and exit the program
+#
+# The argument RETURNCODE is optional. When byebye is called indirectly
+# through trap processing, it is passed a RETURNCODE of 1, and the
+# program then exits with status 1.
+#
+# If RETURNCODE is not given, the program exits with status 1 if
+# log_failure has been called, and 0 otherwise.
+#
+# byebye invokes flush_msg_buffers to print the messages accumulated by
+# the previous calls to log_failure. Thus, unless byebye is called,
+# this flushing does not take place, and the messages are not reported.
+#
+byebye()
{
- log_warning_msg=
- has_warnings=false
+ flush_msg_buffers # dump any accumulated output
+
+ # If we are passed an explicit non-zero error code, obey it.
+ force_error=false
+ test -n "$1" && test "x$1" != x0 && force_error=true
+
+ if $force_error; then
+ verboseMsg "$progname: Error(s) found, exiting unsuccessfully."
+ cleanup 1
+ else
+ verboseMsg "$progname: No errors, exiting successfully."
+ cleanup 0
+ fi
}
###############################################################################
-# init_log_failure()
-# reset the list of failure messages
-###############################################################################
+# init_log_failure() - reset the list of failure messages
+#
+# Usage scenario:
+# init_log_failure
+# ...
+# log_failure
+# ...
+# byebye (will flush the message and exit).
+#
init_log_failure()
{
log_failure_msg=
@@ -337,27 +342,9 @@ init_log_failure()
}
###############################################################################
-# log_warning(errmsg)
-# report and save warning message `errmsg'
-###############################################################################
-log_warning()
-{
- echo "Warning: $@" >&2
- if test -z "$log_warning_msg"; then
- log_warning_msg="$@"
- else
- OLDIFS=$IFS; IFS=
- log_warning_msg="$log_warning_msg
-$@"
- IFS=$OLDIFS
- fi
- has_warnings=true
-}
-
-###############################################################################
-# log_failure(errmsg)
-# report and save failure message `errmsg'
-###############################################################################
+# log_failure(FAILMSG) - report and save failure message FAILMSG
+# and set global variable has_errors to true.
+#
log_failure()
{
echo "Error: $@" >&2
@@ -373,28 +360,35 @@ $@"
}
###############################################################################
-# verbose (cmd)
-# execute cmd. Redirect output depending on $mktexfmtMode.
-###############################################################################
+# verbose(CMD) - execute CMD, redirecting output to stderr if $mktexfmtMode
+# is true, to stdout otherwise.
+#
+# This is because when we are called as mktexfmt, we want to output one
+# line and one line only to stdout: the name of the generated fmt file,
+# which kpathsea can read and handle.
+#
verbose()
{
- $mktexfmtMode && ${1+"$@"} >&2 || ${1+"$@"}
+ if $mktexfmtMode; then
+ ${1+"$@"} >&2
+ else
+ ${1+"$@"}
+ fi
}
###############################################################################
-# mktexdir(args)
-# call mktexdir script, disable all features (to prevent sticky directories)
-###############################################################################
+# mktexdir(ARGS) - call mktexdir script with ARGS,
+# disable all features (to prevent sticky directories)
+#
mktexdir()
-{
+{
initTexmfMain
MT_FEATURES=none "$MT_TEXMFMAIN/web2c/mktexdir" "$@" >&2
}
###############################################################################
-# tcfmgr(args)
-# call tcfmgr script
-###############################################################################
+# tcfmgr(ARGS) - call tcfmgr script with ARGS.
+#
tcfmgr()
{
initTexmfMain
@@ -402,9 +396,8 @@ tcfmgr()
}
###############################################################################
-# mktexupd(args)
-# call mktexupd script
-###############################################################################
+# mktexupd(ARGS) - call mktexupd script with ARGS
+#
mktexupd()
{
initTexmfMain
@@ -412,10 +405,9 @@ mktexupd()
}
###############################################################################
-# main()
-# parse commandline arguments, initialize variables,
-# switch into temp. direcrory, execute desired command
-###############################################################################
+# main() - parse commandline arguments, initialize variables,
+# switch into temp direcrory, execute desired command.
+#
main()
{
destdir= # global variable: where do we put the format files?
@@ -430,6 +422,10 @@ main()
# eradicate double slashes to avoid kpathsea expansion.
tmpdir=`echo ${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ | sed s,//,/,g`
+ flush_msg_buffers_called=false # avoid recursion in error/trap processing
+ init_log_failure # must be before setupTmpDir since trap inside calls byebye
+ setupTmpDir # sets up trap for robust cleanup of tmpdir and more
+
# mktexfmtMode: if called as mktexfmt, set to true. Will echo the
# first generated filename after successful generation to stdout then
# (and nothing else), since kpathsea can only deal with one.
@@ -532,7 +528,6 @@ main()
if test -n "$cfgmaint"; then
if test -z "$cfgparam"; then
- setupTmpDir
co=`tcfmgr --tmp $tmpdir --cmd co --file $cnf`
test $? = 0 || cleanup 1
set x $co; shift
@@ -599,12 +594,11 @@ main()
# due to KPSE_DOT, we don't search the current directory, so include
# it explicitly for formats that \write and later on \read
TEXINPUTS="$tmpdir:$TEXINPUTS"; export TEXINPUTS
- # for formats that load other formats (e.g., jadetex loads latex.fmt),
+ # for formats that load other formats (e.g., jadetex loads latex.fmt),
# add the current directory to TEXFORMATS, too. Currently unnecessary
# for MFBASES and MPMEMS.
TEXFORMATS="$tmpdir:$TEXFORMATS"; export TEXFORMATS
- setupTmpDir
cd "$tmpdir" || cleanup 1
# make local paths absolute:
@@ -618,10 +612,9 @@ main()
esac
cache_vars
- init_log_failure
- init_log_warning
+
# execute the desired command:
- case "$cmd" in
+ case "$cmd" in
all)
recreate_all;;
missing)
@@ -643,7 +636,7 @@ main()
# parse_line(config_line) sets global variables:
# format: name of the format, e.g. pdflatex
# engine: name of the TeX engine, e.g. tex, etex, pdftex
-# texargs: flags for initex and name of the ini file (e.g. -mltex frlatex.ini)
+# texargs: flags for initex and name of ini file (e.g. -mltex frlatex.ini)
# fmtfile: name of the format file (without directory, but with extension)
#
# Support for building internationalized formats sets:
@@ -657,7 +650,7 @@ main()
# inside the 4th field in fmtutil.cnf.
#
# exit code: returns error code if the ini file is not installed
-###############################################################################
+#
parse_line()
{
case $1 in
@@ -697,13 +690,14 @@ parse_line()
}
###############################################################################
-# find_hyphenfile(format, hyphenation) searches for hyphenation along
-# searchpath of format
-# exit code: returns error is file is not found
-###############################################################################
+# find_hyphenfile(FORMAT, HYPHENATION) - search for HYPHENATION
+# along search path of FORMAT
+# exit code: returns error code if file is not found
+#
find_hyphenfile()
{
- format="$1"; hyphenation="`echo $2 | sed 's/,/ /g'`"
+ format="$1"
+ hyphenation="`echo $2 | sed 's/,/ /g'`"
case $hyphenation in
-) ;;
*) kpsewhich -progname="$format" -format=tex $hyphenation;;
@@ -711,10 +705,9 @@ find_hyphenfile()
}
###############################################################################
-# find_info_for_name(format)
-# Look up the config line for format `format' and call parse_line to set
-# global variables.
-###############################################################################
+# find_info_for_name(FORMAT) - look up config line for FORMAT
+# and call parse_line to set global variables.
+#
find_info_for_name()
{
format="$1"
@@ -726,12 +719,11 @@ find_info_for_name()
}
###############################################################################
-# run_initex()
-# Calls initex. Assumes that global variables are set by parse_line.
-###############################################################################
+# run_initex() - run initex.
+# Assumes that global variables are set by parse_line.
+#
run_initex()
{
-
# install a pool file and set tcx flag if requested in lang= option:
rm -f *.pool
poolfile=
@@ -794,26 +786,29 @@ run_initex()
fulldestdir="$destdir"
fi
mkdir -p "$fulldestdir"
+
if test -f "$fmtfile"; then
- grep '^! ' $format.log >/dev/null 2>&1 &&
- log_warning "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' possibly failed."
+ grep '^! ' $format.log >/dev/null 2>&1 && log_failure \
+ "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' had errors."
+
+ # Definitely avoid user interaction for the following mv/cp commands.
+ mv "$format.log" "$fulldestdir/$format.log" </dev/null \
+ || log_failure "\`mv $format.log $fulldestdir/$format.log' failed"
- # We don't want user-interaction for the following "mv" commands:
- mv "$format.log" "$fulldestdir/$format.log" </dev/null
- #
destfile=$fulldestdir/$fmtfile
+ #
if mv "$fmtfile" "$destfile" </dev/null; then
verboseMsg "$progname: $destfile installed."
#
# As a special special case, we create mplib-luatex.mem for use by
# the mplib embedded in luatex if it doesn't already exist. (We
# never update it if it does exist.)
- #
+ #
# This is used by the luamplib package. This way, an expert user
# who wants to try a new version of luatex (hence with a new
# version of mplib) can manually update mplib-luatex.mem without
# having to tamper with mpost itself.
- #
+ #
if test "x$format" = xmpost && test "x$engine" = xmpost; then
mplib_mem_name=mplib-luatex.mem
mplib_mem_file=$fulldestdir/$mplib_mem_name
@@ -822,7 +817,8 @@ run_initex()
if cp "$destfile" "$mplib_mem_file" </dev/null; then
mktexupd "$fulldestdir" "$mplib_mem_name"
else
- log_warning "cp $destfile $mplib_mem_file failed."
+ # failure to copy merits failure handling: e.g., full file system.
+ log_failure "cp $destfile $mplib_mem_file failed."
fi
else
verboseMsg "$progname: $mplib_mem_file already exists, not updating."
@@ -834,6 +830,13 @@ run_initex()
&& echo "$destfile" && mktexfmtFirst=false
#
mktexupd "$fulldestdir" "$fmtfile"
+ else
+ log_failure "'mv $fmtfile $destfile' failed"
+ if test -f "$destfile"; then
+ # remove the empty file possibly left over if a near-full file system.
+ verboseMsg "Removing partial file $destfile after mv failure ..."
+ rm -f $destfile || log_failure "rm -f $destfile failed."
+ fi
fi
else
log_failure "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' failed"
@@ -841,10 +844,9 @@ run_initex()
}
###############################################################################
-# recreate_loop()
-# for each line in config file: check match-condition and recreate format
-# if there is a match
-###############################################################################
+# recreate_loop() - for each line in $cnf_file:
+# call check_match and run_initex if there is a match.
+#
recreate_loop()
{
OIFS=$IFS
@@ -861,10 +863,10 @@ recreate_loop()
}
###############################################################################
-# listcfg_loop()
-# prints all format definitions in config files (enabled and disabled ones)
-# for supported formats (i.e. for those which have an existing ini file)
-###############################################################################
+# listcfg_loop() - print all format definitions in config files,
+# both enabled and disabled,
+# but only for supported formats (= those with an existing ini file)
+#
listcfg_loop()
{
OIFS=$IFS
@@ -879,9 +881,8 @@ listcfg_loop()
}
###############################################################################
-# check_match()
-# recreate all formats
-###############################################################################
+# check_match() - recreate all formats
+#
check_match()
{
$need_find_hyphenfile && \
@@ -891,9 +892,8 @@ check_match()
}
###############################################################################
-# recreate_by_fmt(fmtname)
-# recreate all versions of fmtname
-###############################################################################
+# recreate_by_fmt(FMTNAME) - recreate all versions of FMTNAME
+#
recreate_by_fmt()
{
fmtname=$1
@@ -902,9 +902,8 @@ recreate_by_fmt()
}
###############################################################################
-# create_missing()
-# create all missing format files
-###############################################################################
+# create_missing() - create all missing format files
+#
create_missing()
{
# match_cmd='test ! -f $destdir/$fmtfile'
@@ -913,9 +912,8 @@ create_missing()
}
###############################################################################
-# recreate_existing()
-# recreate only existing format files
-###############################################################################
+# recreate_existing() - recreate only already-existing format files
+#
recreate_existing()
{
match_cmd='test -f "`kpsewhich -engine=$texengine -progname=$format $fmtfile`"'
@@ -923,9 +921,8 @@ recreate_existing()
}
###############################################################################
-# recreate_all()
-# recreate all formats
-###############################################################################
+# recreate_all() - recreate all formats
+#
recreate_all()
{
match_cmd=true
@@ -933,9 +930,8 @@ recreate_all()
}
###############################################################################
-# recreate_by_hyphenfile(hyphenfile)
-# recreate all formats that depend on hyphenfile
-###############################################################################
+# recreate_by_hyphenfile(HYPHFILE) - recreate formats depending on HYPHFILE
+#
recreate_by_hyphenfile()
{
hyphenfile=$1
@@ -964,9 +960,8 @@ recreate_by_hyphenfile()
}
###############################################################################
-# recreate_by_engine(enginename)
-# recreate all formats that are based on enginename
-###############################################################################
+# recreate_by_engine(ENGINE) - recreate formats based on ENGINE
+#
recreate_by_engine()
{
enginename=$1
@@ -982,15 +977,11 @@ recreate_by_engine()
getmatch || maybe_abort "no format depends on engine \`$enginename'"
}
-
-
###############################################################################
-# show_hyphen_file(format)
-# prints full name of the hyphenfile for format
+# show_hyphen_file(FORMAT) - print full name of the hyphenfile for FORMAT
+# exit code: returns error code if the ini file is not installed or
+# if the hyphen file cannot be found
#
-# exit code: returns error code if the ini file is not installed or if
-# the hyphen file cannot be found
-###############################################################################
show_hyphen_file()
{
fmtname=$1
@@ -1005,9 +996,8 @@ show_hyphen_file()
}
###############################################################################
-# disablefmt(format)
-# disables format in configuration file
-###############################################################################
+# disablefmt(FORMAT) - disable FORMAT in configuration file
+#
disablefmt()
{
grep "^$1[ ]" $cnf_file >/dev/null || { (exit 0); return 0; }
@@ -1021,9 +1011,8 @@ eof
}
###############################################################################
-# enablefmt(format)
-# enables format in configuration file
-###############################################################################
+# enablefmt(FORMAT) - enable FORMAT in configuration file
+#
enablefmt()
{
grep "^#![ ]*$1[ ]" $cnf_file >/dev/null || { (exit 0); return 0; }
@@ -1036,4 +1025,6 @@ eof
}
main ${1+"$@"}
+
+# we should not get here
cleanup 0
diff --git a/source/texk/texlive/tl_scripts/updmap-sys.sh b/source/texk/texlive/tl_scripts/updmap-sys.sh
index edf3c9d6e743469fbf6846b5c0a3b272d6e9d412..4daaf9b3257acb2449eb31e495b835fb3ff321da 100755
--- a/source/texk/texlive/tl_scripts/updmap-sys.sh
+++ b/source/texk/texlive/tl_scripts/updmap-sys.sh
@@ -1,9 +1,7 @@
#!/bin/sh
-
-# updmap-sys: Thomas Esser, public domain.
-
-# wrapper script for updmap with TEXMFVAR and TEXMFCONFIG set to
-# TEXMFSYSVAR / TEXMFSYSCONFIG
+# $Id: updmap-sys.sh 35626 2014-11-20 19:08:47Z karl $
+# updmap-sys - arrange for updmap to affect system directories.
+# Public domain. Originally written by Thomas Esser.
test -f /bin/ksh && test -z "$RUNNING_KSH" \
&& { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
@@ -15,16 +13,12 @@ test -f /bin/bsh && test -z "$RUNNING_BSH" \
&& { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; }
unset RUNNING_BSH
-export PATH
+# preferentially use subprograms from our own directory.
+mydir=`echo "$0" | sed 's,/[^/]*$,,'`
+mydir=`cd "$mydir" && pwd`
+PATH="$mydir:$PATH"; export PATH
# hack around a bug in zsh:
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
-# v=`kpsewhich -var-value TEXMFSYSVAR`
-# c=`kpsewhich -var-value TEXMFSYSCONFIG`
-
-# TEXMFVAR="$v"
-# TEXMFCONFIG="$c"
-# export TEXMFVAR TEXMFCONFIG
-
exec updmap --sys ${1+"$@"}
diff --git a/source/texk/texlive/w64_wrapper/context/mtxrun.dll b/source/texk/texlive/w64_wrapper/context/mtxrun.dll
new file mode 100755
index 0000000000000000000000000000000000000000..91050273583b157e2c0bab7d784f0ce4f2389080
Binary files /dev/null and b/source/texk/texlive/w64_wrapper/context/mtxrun.dll differ
diff --git a/source/texk/texlive/w64_wrapper/context/mtxrun.exe b/source/texk/texlive/w64_wrapper/context/mtxrun.exe
new file mode 100755
index 0000000000000000000000000000000000000000..93290a6e0a8841400c73bbbaf210742e2e37b23a
Binary files /dev/null and b/source/texk/texlive/w64_wrapper/context/mtxrun.exe differ
diff --git a/source/texk/texlive/w64_wrapper/runscript.dll b/source/texk/texlive/w64_wrapper/runscript.dll
new file mode 100755
index 0000000000000000000000000000000000000000..2294fb59591da75a8491074e68591e819c1a5531
Binary files /dev/null and b/source/texk/texlive/w64_wrapper/runscript.dll differ
diff --git a/source/texk/texlive/w64_wrapper/runscript.exe b/source/texk/texlive/w64_wrapper/runscript.exe
new file mode 100755
index 0000000000000000000000000000000000000000..baa241d679c44763fff4eb4cf7b50d97cc31bd63
Binary files /dev/null and b/source/texk/texlive/w64_wrapper/runscript.exe differ
diff --git a/source/texk/texlive/w64_wrapper/runscript.tlu b/source/texk/texlive/w64_wrapper/runscript.tlu
new file mode 100644
index 0000000000000000000000000000000000000000..921c1887d7ff9d4c0911ac999d79c2ba32e05005
--- /dev/null
+++ b/source/texk/texlive/w64_wrapper/runscript.tlu
@@ -0,0 +1,679 @@
+
+
+local svnrevision = string.match("$Revision: 33766 $", "%d+") or "0"
+local svndate = string.match("$Date: 2014-04-30 18:03:08 +0200 (Wed, 30 Apr 2014) $", "[-%d]+") or "2009-12-04"
+local bannerstr = "runscript wrapper utility (rev. " ..
+ svnrevision .. ", " .. svndate .. ")\n" ..
+ "usage: runscript script-name [arguments]\n" ..
+ "try -help [-v] for more information"
+
+local helpstr = [[
+
+ Script wrappers in TeX Live on Windows
+
+ Rationale
+
+ Wrappers enable use of scripts on Windows as regular programs.
+ They are also required for some binary programs to set up the
+ right environment for them.
+
+ Batch scripts can be used for wrapping but they are not as universal
+ as binaries (there are some odd cases where they don't work) and
+ it is hard to make them robust and secure. Compiled binary wrappers
+ don't suffer from these problems but they are harder to write, debug
+ and maintain in comparison to scripts. For these reasons a hybrid
+ approach is taken that combines a binary stub with a launcher script.
+
+ Adding wrappers for user scripts
+
+ The script wrapping machinery is not limited to scripts shipped with
+ TeX Live. You can also use it for script programs from manually
+ installed packages. This should minimize problems when using them
+ with TeX Live.
+
+ First, make sure that there is an interpreter program available on
+ your system for the script you want to use. Interpreters for Perl
+ and Lua are bundled with TeX Live, all others have to be installed
+ independently. Lua scripts are the most efficient to run, so if you
+ consider writing a new script, that would be the recommended choice.
+
+ The following script types and their file extensions are currently
+ supported and searched in that order:
+
+ Lua (.tlu;.texlua;.lua) -- included
+ Perl (.pl) -- included
+ Ruby (.rb) -- requires installation
+ Python (.py) -- requires installation
+ Tcl (.tcl) -- requires installation
+ Java (.jar) -- requires installation
+ VBScript (.vbs) -- part of Windows
+ JScript (.js) -- part of Windows
+ Batch (.bat;.cmd) -- part of Windows
+
+ Finally, Unix-style extensionless scripts are searched as last and
+ the interpreter program is established based on the she-bang (#!)
+ specification on the very first line of the script. This can be
+ an arbitrary program but it must be present on the search path.
+
+ Next, the script program needs to be installed somewhere below the
+ 'scripts' directory under one of the TEXMF trees (consult the
+ documentation or texmf/web2c/texmf.cnf file for a list). You may
+ need to update the file search database afterwards with:
+
+ mktexlsr [TEXMFDIR]
+
+ It is also possible to use scripts that are outside of TEXMF hierarchy
+ by adjusting TEXMFSCRIPTS environment or kpathsea variable, see
+ kpathsea documentation for more information on setting its variables.
+
+ Test if the script can be located with:
+
+ kpsewhich --format=texmfscripts <script-name>.<ext>
+
+ This should output the full path to the script if everything is
+ properly installed and configured. If this test is successful,
+ the script can be run immediately with:
+
+ runscript <script-name> [script arguments]
+
+ If you prefer to call the script program simply by its name, copy
+ and rename bin/win64/runscript.exe to <script-name>.exe and put it
+ somewhere on the search path.]]
+
+local docstr = [[
+
+ Wrapper structure
+
+ Wrappers consist of small binary stubs and a common texlua script.
+ The binary stubs are all the same, just different names (but CLI
+ and GUI stubs differ, see below, and GUI stubs are actually all
+ different due to different embedded icons).
+
+ The job of the binary stub is twofold: (a) call the texlua launcher
+ script 'runscript.tlu' from the same directory (or more precisely
+ from the directory containing 'runscript.dll') and (b) pass to it
+ argv[0] and the unparsed argument string as the last two arguments
+ (after adding a sentinel argument, which ends with a new line
+ character). Arbitrary C strings can be passed, because the script
+ is executed by linking with luatex.dll and calling the lua
+ interpreter internally rather than by spawning a new process.
+
+ There are two flavours of the binary stub: one for CLI programs
+ and another one for GUI programs. The GUI variant does not open
+ a console window nor does it block the command prompt if started
+ from there. It also uses a dialog box to display an error message
+ in addition to outputting to stderr.
+
+ The stubs are further split into a common DLL and EXE proxies
+ to it. This is for maintenance reasons - updates can be done by
+ replacement of a single DLL rather than all binary stubs.
+
+ The launcher script knows, which variant has been used to invoke it
+ based on the sentinel argument. The lack of this argument means
+ that it was invoked in a standard way, i.e., through texlua.exe.
+
+ All the hard work of locating a script/program to execute happens
+ in the launcher script. The located script/program is always
+ executed directly by spawning its interpreter (or binary) in a new
+ process. The system shell (cmd.exe) is never called (except for
+ batch scripts, of course). If the located script happens to be
+ a (tex)lua script, it is loaded and called internally from within
+ this script, i.e. no new process is spawned. Execution is done
+ using a protected call, so any compile or runtime errors are catched.
+
+ Source files
+
+ runscript.tlu launcher script for locating and dispatching
+ target scripts/programs
+ runscript_dll.c common DLL part of the binary stubs; locates and
+ calls the launcher script
+ runscript_exe.c EXE proxy to the common DLL for CLI mode stubs
+ wrunscript_exe.c EXE proxy to the common DLL for GUI mode stubs
+
+ Compilation of binaries (requires luatex.dll in the same directory)
+
+ with gcc (size optimized):
+
+ gcc -Os -s -shared -o runscript.dll runscript_dll.c -L./ -lluatex
+ gcc -Os -s -o runscript.exe runscript_exe.c -L./ -lrunscript
+ gcc -mwindows -Os -s -o wrunscript.exe wrunscript_exe.c -L./ -lrunscript
+
+ with tcc (extra small size):
+
+ tiny_impdef luatex.dll
+ tcc -shared -o runscript.dll runscript_dll.c luatex.def
+ tcc -o runscript.exe runscript_exe.c runscript.def
+ tcc -o wrunscript.exe wrunscript_exe.c runscript.def
+
+ License
+
+ Originally written in 2009 by Tomasz M. Trzeciak, Public Domain.
+
+ Prior work:
+ 'tl-w32-wrapper.texlua' by Reinhard Kotucha and Norbert Preining.
+ 'tl-w32-wrapper.cmd' by Tomasz M. Trzeciak.
+
+ Changelog
+
+ 2009/12/04
+ - initial version
+ 2009/12/15
+ - minor fixes for path & extension list parsing
+ 2010/01/09
+ - added support for GUI mode stubs
+ 2010/02/28
+ - enable GUI mode stubs for dviout, psv and texworks;
+ - added generic handling of sys programs
+ - added restricted repstopdf to alias_table
+ 2010/03/13
+ - added 'readme.txt' and changelog
+ - added support and docs for calling user added scripts;
+ (use path of 'runscript.dll' instead of .exe stub to
+ locate 'runscript.tlu' script)
+ - limit search for shell_escape_commands to system trees
+ - added function for creating directory hierarchy
+ - fixed directory creation for dviout & texworks aliases
+ - fixed arg[0] of repstopdf & rpdfcrop
+ 2010/03/28
+ - restructured docs, added --help and --version options
+ (available only when invoked under 'runscript' name)
+ - use TEXMF_RESTRICTED_SCRIPTS kpse var for searching
+ shell_escape_commands
+ - changed command validation to handle a list of commands
+ - prepend GUI mode command(s) to the command list
+ - added support for .tcl scripts
+ 2010/03/31
+ - fixed fatal bug in extention_map definition for GUI mode
+ 2010/04/15
+ - encapsulated main chunk in a function to execute with
+ pcall for more robustness and better error catching
+ - added texdoctk to scripts4tlperl table
+ - added tlgs and tlperl to alias_table; callable as e.g.:
+ runscript tlperl ...
+ - doc tweaks
+ 2010/04/22
+ - ensure only backslash is used in USERPROFILE variable
+ (Adobe Reader crash case)
+ - fixed argument processing for direct execution under texlua
+ - more doc tweaks
+ 2010/05/30
+ - Windows XP or newer required to run TeXworks
+ 2010/06/04
+ - added support for Perl scripts starting with eval-exec-perl
+ construct in place of she-bang (#!)
+ 2010/06/25
+ - run internal tlperl only with our Perl
+ - added fontinst to alias_table
+ - added support for all tex4ht commands from mk4ht.pl
+ - removed some unsued aliases
+ - some code refactoring and cleanup
+ 2010/12/28
+ - use of external Perl now requires kpathsea variable
+ TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL to be explicitly set to 1
+ - alias_table replaced with if-elseif-end tests to streamline
+ special cases and to avoid hardcoding of texmf* file paths
+ - added a2ping to special cases (requires -x switch to Perl)
+ - set ASYMPTOTE_GS (for asy) to full path to tlgs
+ 2011/01/09
+ - removed tex4ht commands starting with ht from mk4ht aliases;
+ they have their own scripts and mk4ht calls them internally,
+ so aliasing results in an infinite recursion
+ - removed alias for fontinst (no fontinst.exe any more)
+ - fixed GUI-mode interpreter for Ruby
+ 2011/09/10
+ - added -dDisableFAPI=true to psview argument list. Needed by
+ gs-9.xx
+ 2012/03/12
+ - added '-i', '.' to psview argument list (author's request)
+ - added environment clean up from Perl specific variables
+ (when not using external Perl)
+ 2012/08/05
+ - added alias for fmtutil
+ 2013/05/09
+ - added alias mkluatexfontdb -> luaotfload-tool
+ 2013/07/03
+ - fix for psview and UNC paths in unix-style
+ - remove not needed is_abs_path function
+ 2013/08/07
+ - handle updmap-sys via updmap --sys
+ 2013/08/08
+ - allow overriding gs/gs_dll/gs_lib with kpse variables
+ TEXLIVE_WINDOWS_EXTERNAL_GS, ..._GS_LIB, ..._GS_DLL
+ 2013/08/30
+ - do not pass -NULL to dviout, to allow users changing and
+ saving settings. Patch by Yusuke KUROKI
+ 2013/09/22
+ - add TEXMFDIST/fonts to the GS_LIB path. Patch by Yusuke KUROKI
+ 2014/04/30
+ - fix for argument duplication in fmtutil
+]]
+
+-- HELPER SUBROUTINES --
+
+-- quotes string with spaces
+local function _q(str)
+ str = string.gsub(str, '"', '') -- disallow embedded double quotes
+ return string.find(str, "%s") and '"'..str..'"' or str
+end
+
+-- prepends directories to path if they are not already there
+local function prepend_path(path, ...)
+ local pathcmp = string.lower(string.gsub(path, '/', '\\'))..';'
+ for k = 1, select('#', ...) do
+ local dir = string.lower(string.gsub(select(k, ...), '/', '\\'))..';'
+ if not string.find(pathcmp, dir, 1, true) then path = dir..path end
+ end
+ return path
+end
+
+-- searches the PATH for a file
+local function search_path(fname, PATH, PATHEXT)
+ if string.find(fname, '[/\\]') then
+ return nil, "directory part not allowed for PATH search: "..fname
+ end
+ PATH = PATH or os.getenv('PATH')
+ PATHEXT = PATHEXT or '\0' -- '\0' for no extension
+ for dir in string.gmatch(PATH, '[^;]+') do
+ local dirsep = (string.find(dir, '\\') and '\\' or '/')
+ for ext in string.gmatch(PATHEXT, '[^;]+') do
+ local f = dir..dirsep..fname..ext
+ if lfs.isfile(f) then return f, ext end
+ end
+ end
+ return nil, "file or program not on PATH: "..fname
+end
+
+-- tests for tex4ht command (as given in mk4ht.pl)
+-- except for commands starting with 'ht' (they have their own scripts)
+local function is_tex4ht_command(progname)
+ local prefixes = 'xh uxh xhm mz oo es js jm tei teim db dbm w jh jh1'
+ local formats = 'context latex tex texi xelatex xetex'
+ for p in string.gmatch(prefixes, '%S+') do
+ for q in string.gmatch(formats, '%S+') do
+ if (progname == p..q) then
+ -- we have a hit, but not all combinations are valid
+ return (p ~= 'teim' and p ~= 'dbm') or (q ~= 'xelatex' and q~= 'xetex')
+ end
+ end
+ end
+ return false
+end
+
+-- locates texmfscript to execute
+local function find_texmfscript(progname, ext_list)
+ ext_list = ext_list or '\0'
+ for ext in string.gmatch(ext_list, '[^;]+') do
+ local progfullname = kpse.find_file(progname..ext, 'texmfscripts')
+ if progfullname then return progfullname, ext end
+ end
+ return nil, "no appropriate script or program found: "..progname
+end
+
+-- converts the #! line to arg table
+-- used for scripts w/o extension
+-- only the two most common cases are considered:
+-- #! /path/to/command [options]
+-- #! /usr/bin/env command [options]
+-- ([options] after the command are retained as well)
+local function shebang_to_argv(progfullname)
+ local fid, errmsg = io.open(progfullname, 'r')
+ if not fid then return nil, errmsg end
+ local fstln = fid:read('*line')
+ fid:close()
+ if string.find(fstln, "eval.*exit.*exec.*perl") then
+ -- special case of Perl's time-honoured "totally devious construct":
+ -- eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q'
+ return {"perl"}
+ elseif (string.sub(fstln, 1, 2) ~= '#!') then
+ return nil, "don't know how to execute script: "..progfullname
+ end
+ local argv = string.explode( string.sub(fstln, 3) ) -- split on spaces
+ argv[1] = string.match(argv[1], '[^/]+$')
+ if (argv[1] == 'env') then table.remove(argv, 1) end
+ return argv
+end
+
+-- checks if command exists on the path and returns its full path
+local function check_command(cmdlist, PATH)
+ for cmd in string.gmatch(cmdlist, '%S+') do
+ local cmdext = cmd..(string.find(cmd, '%.[^\\/.]*$') and '' or '.exe')
+ local fullcmd = search_path(cmdext, PATH)
+ if fullcmd then
+ return fullcmd, cmd
+ end
+ end
+ return nil, 'program not found (not part of TeX Live): '..cmdlist
+end
+
+-- creates directory or directory hierarchy
+local function mkdir_plus(dir)
+ if lfs.mkdir(dir) then
+ return true
+ end
+ -- try with system's mkdir in case we need to create intermediate dirs too
+ local ret = os.spawn({[0]=search_path("cmd.exe"),
+ string.format('cmd.exe /x /c mkdir "%s"', dir)})
+ if ret == 0 then
+ return true
+ else
+ return nil, string.format("cannot create directory (error code %d): %s", ret, dir)
+ end
+end
+
+-- MAIN_CHUNK -- encapsulated in a function for more robust execution with pcall
+
+local function MAIN_CHUNK()
+
+-- preprocess arguments
+
+local guimode = false
+local argline = ''
+-- check for the sentinel argment coming from the .exe stub
+if arg[#arg-2] and ( string.sub(arg[#arg-2], -1) == '\n' ) then
+ -- argv[0] and unparsed argument line are passed
+ -- from the .exe stub as the two last arguments
+ -- pop them up from the arg table
+ argline = table.remove(arg) -- pop unparsed arguments
+ arg[0] = table.remove(arg) -- pop C stub's argv[0]
+ guimode = (table.remove(arg) == 'GUI_MODE\n') -- pop sentinel argument
+else
+ -- we must be called as: texlua runscript.tlu progname ...
+ -- this is treated the same as: runscript[.exe] progname ...
+ -- we don't have the unparsed arument line in this case, so construct one
+ for k = #arg, 1, -1 do argline = _q(arg[k]) .. ' ' .. argline end
+end
+
+-- program name
+
+-- lower arg[0] : get file name part : remove extension
+local progname, substcount = string.lower(arg[0]):gsub('^.*[\\/]', ''):gsub('%.[^.]*$', '')
+-- special behaviour when called under 'runscript' name
+if (progname == 'runscript') then
+ -- we are called as: runscript progname ...
+ -- or as: runscript --help|-h|--version ...
+ -- handle options first (only --help and --version)
+ local opt, param = {}, nil
+ while true do
+ -- remove the first argument from the arg table and from the argline string
+ -- (this argument should have no embedded spaces!)
+ param = table.remove(arg, 1)
+ if not param then break end
+ argline = string.gsub(argline, '^%S+%s*', '')
+ local optname = string.lower(param):match('^%-%-?(.*)$')
+ if not optname then
+ break
+ elseif (optname == 'h') or (optname == 'help') then
+ opt.help = true
+ elseif (optname == 'v') then
+ opt.v = true
+ elseif (optname == 'version') then
+ opt.version = true
+ else
+ error("unknown option: "..param.."\n"..bannerstr)
+ end
+ end
+ if opt.help then
+ print(helpstr)
+ if opt.v then print(docstr) end
+ os.exit(0)
+ elseif opt.version or opt.v then
+ print(bannerstr)
+ os.exit(0)
+ end
+ -- make sure progname is valid
+ arg[0] = assert(param, "not enough arguments!\n"..bannerstr)
+ progname = string.lower(arg[0]):gsub('^.*[\\/]', ''):gsub('%.[^.]*$', '')
+ assert(progname == string.lower(arg[0]), "bad command name: " .. arg[0])
+end
+-- special case of sys programs
+progname, substcount = string.gsub(progname, '%-sys$', '')
+local sysprog = (substcount > 0) -- true if there was a -sys suffix removed
+-- prevent recursive calls to this script
+assert(progname ~= 'runscript', "oops! wrapping the wrapper?")
+
+-- kpse and environment set-up
+
+-- init kpathsea
+local k = -1
+while arg[k-1] do k = k - 1 end -- in case of a call: luatex --luaonly ...
+local lua_binary = arg[k]
+kpse.set_program_name(lua_binary, progname)
+-- various dir-vars
+local TEXDIR = kpse.var_value('SELFAUTOPARENT')
+local TEXMFDIST = kpse.var_value('TEXMFDIST')
+local BINDIR = kpse.var_value('SELFAUTOLOC')
+local PATH = os.getenv('PATH') or ''
+-- restricted programs
+local shell_escape_commands = string.lower(kpse.var_value('shell_escape_commands') or '')
+local is_restricted_progname = string.find( ','..shell_escape_commands..',',
+ ','..progname..',', 1, true)
+if is_restricted_progname then
+ -- limit search path to the restricted (system) trees
+ -- (not really necessary for entries in the alias_table,
+ -- because they are not searched for with kpathsea)
+ os.setenv('TEXMFSCRIPTS', kpse.var_value('TEXMF_RESTRICTED_SCRIPTS'))
+end
+-- perl stuff
+local scripts4tlperl = {
+ tlperl = true,
+ updmap = true,
+ ['updmap-sys'] = true,
+}
+local try_extern_perl = (kpse.var_value('TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL') == '1') and
+ not (guimode or is_restricted_progname or scripts4tlperl[progname])
+local PERLEXE = try_extern_perl and search_path('perl.exe', PATH)
+if not PERLEXE then
+ PERLEXE = TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
+ os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
+ PATH = prepend_path(PATH, TEXDIR..'/tlpkg/tlperl/bin')
+ local PERLENV = 'PERL5OPT;PERLIO;PERLIO_DEBUG;PERLLIB;PERL5DB;PERL5DB_THREADED;' ..
+ 'PERL5SHELL;PERL_ALLOW_NON_IFS_LSP;PERL_DEBUG_MSTATS;' ..
+ 'PERL_DESTRUCT_LEVEL;PERL_DL_NONLAZY;PERL_ENCODING;PERL_HASH_SEED;' ..
+ 'PERL_HASH_SEED_DEBUG;PERL_ROOT;PERL_SIGNALS;PERL_UNICODE'
+ for var in string.gmatch(PERLENV, '[^;]+') do os.setenv(var, nil) end
+end
+-- gs stuff
+local override_gs
+if not is_restricted_progname then
+ override_gs = kpse.var_value('TEXLIVE_WINDOWS_EXTERNAL_GS')
+end
+-- the full path to the executable
+local GSEXE
+-- the directory where the gs executable resides
+local GSDIR
+-- the name of the gs executable
+local GSNAME
+if override_gs then
+ -- first check whether we got an absolute path or only executable name
+ if string.find(override_gs, '[/\\]') then
+ GSEXE = override_gs
+ else
+ -- search in the path
+ GSEXE = search_path(override_gs, PATH)
+ end
+end
+if GSEXE then
+ -- split the dir and progname part so that we can set the path
+ -- work on a string with all forward slashes
+ local foo = string.lower(string.gsub(GSEXE, '\\', '/'))
+ GSNAME = string.gsub(foo, '^.*[\\/]', '')
+ GSDIR = string.gsub(foo, '^(.*)[\\/].*$', '%1')
+ -- search also for a GS_DLL setting
+ -- we do not need to check for is_restricted_progname, since
+ -- GSEXE is only defined when it is not set
+ local GSDLL = kpse.var_value('TEXLIVE_WINDOWS_EXTERNAL_GS_DLL')
+ if GSDLL then
+ os.setenv('GS_DLL', GSDLL)
+ end
+ local GSLIB = kpse.var_value('TEXLIVE_WINDOWS_EXTERNAL_GS_LIB')
+ if GSLIB then
+ os.setenv('GS_LIB', GSLIB)
+ end
+else
+ -- use built in gs
+ os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts;'
+ ..os.getenv('WINDIR')..'/Fonts;'..TEXMFDIST..'/fonts')
+ os.setenv('GS_DLL', TEXDIR..'/tlpkg/tlgs/bin/gsdll32.dll')
+ GSEXE = TEXDIR..'/tlpkg/tlgs/bin/gswin32c.exe'
+ GSNAME = 'gswin32c.exe'
+ GSDIR = TEXDIR..'/tlpkg/tlgs/bin'
+end
+-- now setup the path so that the gs program will be found
+PATH = prepend_path(PATH, GSDIR, BINDIR)
+os.setenv('PATH', PATH);
+
+-- sys stuff
+if (sysprog and not (progname == 'updmap')) then
+ os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))
+ os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))
+end
+-- Adobe Reader crash case: make sure USERPROFILE is not "slashed"
+os.setenv("USERPROFILE", os.getenv("USERPROFILE"):gsub('/', '\\'))
+
+-- extension to interpeter mapping
+
+-- the extension is mapped to argv table
+-- the command to execute is given as the first element of the table
+-- (it can be a whitespace separated list of names to try)
+local extension_map = {
+ ['.bat'] = {'cmd', '/c', 'call'},
+ ['.jar'] = {'java.exe', '-jar'},
+ ['.pl' ] = {'perl.exe'},
+ ['.py' ] = {'python.exe'},
+ ['.rb' ] = {'ruby.exe'},
+ ['.tcl'] = {'tclsh.exe tclsh85.exe tclsh84.exe'},
+ ['.vbs'] = {'cscript.exe', '-nologo'},
+}
+if guimode then
+ -- for GUI mode wrappers we try GUI mode interpeters where possible
+ extension_map['.jar'][1] = 'javaw.exe ' .. extension_map['.jar'][1]
+ extension_map['.pl' ][1] = 'wperl.exe ' .. extension_map['.pl' ][1]
+ extension_map['.py' ][1] = 'pythonw.exe ' .. extension_map['.py' ][1]
+ extension_map['.rb' ][1] = 'rubyw.exe ' .. extension_map['.rb' ][1]
+ extension_map['.tcl'][1] = 'wish.exe wish85.exe wish84.exe ' .. extension_map['.tcl'][1]
+ extension_map['.vbs'][1] = 'wscript.exe ' .. extension_map['.vbs'][1]
+end
+extension_map['.cmd'] = extension_map['.bat']
+extension_map['.js'] = extension_map['.vbs']
+
+-- set up argv table
+
+local ARGV = nil
+
+-- special cases (aliases)
+
+if is_tex4ht_command(progname) then
+ argline = progname .. ' ' .. argline
+ progname = 'mk4ht'
+elseif progname == 'a2ping' then
+ table.insert(extension_map['.pl'], '-x')
+elseif progname == 'updmap' then
+ if sysprog then
+ argline = progname .. ' --sys ' .. argline
+ end
+elseif progname == 'asy' then
+ os.setenv('ASYMPTOTE_GS', GSEXE)
+ os.setenv('CYGWIN', 'nodosfilewarning')
+ ARGV = {[0]=TEXDIR..'/tlpkg/asymptote/asy.exe', 'asy'}
+elseif progname == 'dviout' then
+ local fontsdir = kpse.var_value('TEXMFVAR') .. '/fonts'
+ if (lfs.attributes(fontsdir, 'mode') ~= 'directory') then
+ assert(mkdir_plus(fontsdir))
+ end
+ local tfmpath = kpse.show_path('tfm')
+ tfmpath = string.gsub(tfmpath, '!!', '')
+ tfmpath = string.gsub(tfmpath, '/', '\\')
+ local texrt = {}
+ for d in string.gmatch(tfmpath, '([^;]+\\fonts)\\tfm[^;]*') do
+ if (lfs.attributes(d, 'mode') == 'directory') then
+ table.insert(texrt, d)
+ end
+ end
+ local par = [["-gen=']] .. string.gsub(TEXDIR, '/', '\\') ..
+ [[\tlpkg\dviout\gen_pk'" "-TEXROOT=']] ..
+ table.concat(texrt, ';') .. [['" "-gsx=']] .. GSEXE .. [['"]];
+ ARGV = {[0]=TEXDIR..'/tlpkg/dviout/dviout.exe', 'dviout', par}
+elseif progname == 'fmtutil' and sysprog then
+ ARGV = {[0]=BINDIR..'/fmtutil.exe', 'fmtutil'}
+elseif progname == 'mkluatexfontdb' then
+ progname = 'luaotfload-tool'
+ table.insert(arg, '--alias=mkluatexfontdb')
+elseif progname == 'psv' then
+ argline = '-sINPUT='..argline
+ ARGV = {[0]=TEXDIR..'/tlpkg/tlpsv/gswxlua.exe', 'gswxlua',
+ '-dDisableFAPI=true',
+ '-l', (_q(TEXDIR..'/tlpkg/tlpsv/psv.wx.lua'):gsub('/','\\')),
+ '-p', (_q(TEXDIR..'/tlpkg/tlpsv/psv_view.ps'):gsub('/','\\')),
+ '-i', '.'}
+elseif progname == 'repstopdf' or progname == 'rpdfcrop' then
+ argline = '--restricted ' .. argline
+ progname = string.sub(progname, 2, -1)
+elseif progname == 'texworks' then
+ local winver = tonumber(string.match(os.uname().version, '%D*(%d+%.?%d*)'))
+ assert(winver >= 5.01, "Windows XP or newer required to run TeXworks")
+ local TW_LIBPATH = kpse.var_value('TW_LIBPATH') or
+ kpse.var_value('TEXMFCONFIG')..'/texworks'
+ local TW_INIPATH = kpse.var_value('TW_INIPATH') or TW_LIBPATH
+ os.setenv('TW_LIBPATH', TW_LIBPATH)
+ os.setenv('TW_INIPATH', TW_INIPATH)
+ if (TW_INIPATH and lfs.attributes(TW_INIPATH, 'mode') ~= 'directory') then
+ -- TeXworks needs directory holding its configuration to exist
+ assert(mkdir_plus(TW_INIPATH))
+ end
+ ARGV = {[0]=TEXDIR..'/tlpkg/texworks/texworks.exe', 'texworks'}
+elseif progname == 'tlgs' then
+ ARGV = {[0]=GSEXE, GSNAME}
+elseif progname == 'tlperl' then
+ ARGV = {[0]=PERLEXE, 'perl'}
+end
+
+-- general case
+
+if not ARGV then
+ local extlist = '.tlu;.texlua;.lua;.pl;.rb;.py;.tcl;.jar;.vbs;.js;.bat;.cmd;\0'
+ local progfullname = search_path(progname, BINDIR, '.tlu;.bat;.cmd') or
+ assert(find_texmfscript(progname, extlist))
+ local ext = string.match(string.lower(progfullname), '%.[^\\/.]*$') or ''
+ if (ext == '.lua') or (ext == '.tlu') or (ext == '.texlua') then -- lua script
+ arg[0] = progfullname
+ else
+ ARGV = extension_map[ext] or assert(shebang_to_argv(progfullname))
+ table.insert(ARGV, _q(progfullname))
+ if not ARGV[0] then
+ ARGV[0], ARGV[1] = assert(check_command(ARGV[1], PATH))
+ end
+ end
+end
+
+-- run the program/script
+
+if ARGV then
+ table.insert(ARGV, argline) -- pass through original arguments
+ local ret = assert(os.spawn(ARGV))
+ if ret ~= 0 then
+ local dbginfo = debug.getinfo(1)
+ local errormsg = string.format("%s:%d: command failed with exit code %d:\n%s",
+ dbginfo.short_src, dbginfo.currentline - 2,
+ ret, table.concat(ARGV, ' ') )
+ os.setenv('RUNSCRIPT_ERROR_MESSAGE', errormsg)
+ io.stderr:write(errormsg, '\n')
+ end
+ os.exit(ret)
+else -- must be a lua script
+ dofile(arg[0])
+end
+
+end -- MAIN_CHUNK
+
+-- execute MAIN_CHUNK with pcall to catch any runtime errors
+
+local success, errormsg = pcall(MAIN_CHUNK)
+if not success then
+ os.setenv('RUNSCRIPT_ERROR_MESSAGE', errormsg)
+ error(errormsg)
+end
+
+-- about RUNSCRIPT_ERROR_MESSAGE environment variable:
+-- it stores an error message that is catched and displayed
+-- in a message box on the C side at process exit
+-- (currently used only by gui mode stubs)
diff --git a/source/texk/web2c/Makefile.in b/source/texk/web2c/Makefile.in
index 3723ffad560c7e71779f922e3209f6f7de797515..a14a5a1c654b3d5f5665373a253e312480c9c0c1 100644
--- a/source/texk/web2c/Makefile.in
+++ b/source/texk/web2c/Makefile.in
@@ -14,6 +14,10 @@
@SET_MAKE@
+
+
+
+
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__make_running_with_option = \
@@ -79,22 +83,37 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEEXT) \
- mf-nowin$(EXEEXT) mpost$(EXEEXT) luatex$(EXEEXT) \
- luajittex$(EXEEXT) txt2zlib$(EXEEXT)
-bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_2) \
- ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_3) \
- $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \
+ mf-nowin$(EXEEXT) mpost$(EXEEXT) pmpost$(EXEEXT) \
+ upmpost$(EXEEXT) etex$(EXEEXT) ptex$(EXEEXT) $(am__EXEEXT_2) \
+ eptex$(EXEEXT) uptex$(EXEEXT) $(am__EXEEXT_3) euptex$(EXEEXT) \
+ pdftex$(EXEEXT) ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) \
+ luatex$(EXEEXT) luajittex$(EXEEXT) txt2zlib$(EXEEXT) \
+ xetex$(EXEEXT) $(am__EXEEXT_4) aleph$(EXEEXT) synctex$(EXEEXT)
+bin_PROGRAMS = tangle$(EXEEXT) ctangle$(EXEEXT) $(am__EXEEXT_5) \
+ ctie$(EXEEXT) cweave$(EXEEXT) tie$(EXEEXT) $(am__EXEEXT_6) \
$(am__EXEEXT_7) $(am__EXEEXT_8) $(am__EXEEXT_9) \
- $(am__EXEEXT_10)
+ $(am__EXEEXT_10) $(am__EXEEXT_11) $(am__EXEEXT_12) \
+ $(am__EXEEXT_13) $(am__EXEEXT_14) $(am__EXEEXT_15) \
+ $(am__EXEEXT_16) $(am__EXEEXT_17) $(am__EXEEXT_18) \
+ $(am__EXEEXT_19) $(am__EXEEXT_20) $(am__EXEEXT_21) \
+ $(am__EXEEXT_22) $(am__EXEEXT_23) $(am__EXEEXT_24) \
+ $(am__EXEEXT_25) $(am__EXEEXT_26) $(am__EXEEXT_27)
noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
- $(am__EXEEXT_15) $(am__EXEEXT_16) $(am__EXEEXT_17) \
- $(am__EXEEXT_18)
-check_PROGRAMS = $(am__EXEEXT_11) $(am__EXEEXT_12) $(am__EXEEXT_13) \
- $(am__EXEEXT_14) md5main$(EXEEXT)
-TESTS = tangle.test $(am__EXEEXT_21) ctiedir/ctie.test \
+ $(am__EXEEXT_37) $(am__EXEEXT_38) $(am__EXEEXT_39) \
+ $(am__EXEEXT_40) $(am__EXEEXT_41) $(am__EXEEXT_42)
+check_PROGRAMS = $(am__EXEEXT_28) $(am__EXEEXT_29) $(am__EXEEXT_30) \
+ $(am__EXEEXT_31) $(am__EXEEXT_32) $(am__EXEEXT_33) \
+ $(am__EXEEXT_34) $(am__EXEEXT_35) $(am__EXEEXT_36) \
+ md5main$(EXEEXT)
+TESTS = tangle.test $(am__EXEEXT_45) ctiedir/ctie.test \
cwebdir/cweave.test tiedir/tie.test $(am__append_6) \
$(am__append_14) $(am__append_23) $(am__append_37) \
- $(am__append_38) libmd5/md5.test
+ $(am__append_38) $(am__append_40) $(am__append_46) \
+ $(am__append_50) $(am__append_52) $(am__append_58) \
+ $(am__append_62) $(am__append_64) $(am__append_70) \
+ $(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 \
@@ -128,9 +147,10 @@ DIST_COMMON = $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am \
$(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 \
+ $(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 \
@@ -169,20 +189,174 @@ DIST_COMMON = $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am \
@MP_TRUE@am__append_24 = pltotf tftopl
@MP_TRUE@am__append_25 = mptrap.diffs
@MP_TRUE@am__append_26 = mptrap-clean
-@LUATEX_TRUE@am__append_27 = luatex
-@LUATEX_TRUE@@WIN32_TRUE@am__append_28 = call_luatex
-@LUATEX_TRUE@@WIN32_TRUE@am__append_29 = install-luatex-links
-@LUATEX_TRUE@@WIN32_TRUE@am__append_30 = uninstall-luatex-links
-@LUATEX_TRUE@@WIN32_FALSE@am__append_31 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
-@LUAJITTEX_TRUE@am__append_32 = luajittex
-@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_33 = call_luajittex
-@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_34 = install-luajittex-links
-@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_35 = uninstall-luajittex-links
-@LUAJITTEX_TRUE@@WIN32_FALSE@am__append_36 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc
-@LUATEX_TRUE@am__append_37 = $(luatex_tests)
-@LUAJITTEX_TRUE@am__append_38 = $(luajittex_tests)
-@LUATEX_TRUE@@cross_FALSE@am__append_39 = txt2zlib
-@OTANGLE_TRUE@am__append_40 = pltotf tftopl
+@PMP_TRUE@am__append_27 = pmpost
+@PMP_TRUE@@WIN32_TRUE@am__append_28 = call_pmpost
+@PMP_TRUE@@WIN32_TRUE@am__append_29 = install-pmpost-links
+@PMP_TRUE@@WIN32_TRUE@am__append_30 = uninstall-pmpost-links
+@PMP_TRUE@@WIN32_FALSE@am__append_31 = pmpost$(EXEEXT):pdvitomp
+@UPMP_TRUE@am__append_32 = upmpost
+@UPMP_TRUE@@WIN32_TRUE@am__append_33 = call_upmpost
+@UPMP_TRUE@@WIN32_TRUE@am__append_34 = install-upmpost-links
+@UPMP_TRUE@@WIN32_TRUE@am__append_35 = uninstall-upmpost-links
+@UPMP_TRUE@@WIN32_FALSE@am__append_36 = upmpost$(EXEEXT):updvitomp
+@PMP_TRUE@am__append_37 = $(pmpost_tests)
+@UPMP_TRUE@am__append_38 = $(upmpost_tests)
+@ETEX_TRUE@am__append_39 = etex
+@ETEX_TRUE@am__append_40 = $(etex_tests)
+@ETEX_TRUE@am__append_41 = dvitype pltotf tftopl
+@ETEX_TRUE@am__append_42 = etrip.diffs
+@ETEX_TRUE@am__append_43 = etrip-clean
+@PTEX_TRUE@am__append_44 = ptex
+@PWEB_TRUE@am__append_45 = $(pweb_programs)
+@PTEX_TRUE@am__append_46 = $(ptex_tests)
+@PTEX_TRUE@am__append_47 = dvitype pltotf tftopl
+@PTEX_TRUE@am__append_48 = ptrip.diffs
+@PTEX_TRUE@am__append_49 = ptrip-clean
+@PWEB_TRUE@am__append_50 = $(pweb_tests)
+@EPTEX_TRUE@am__append_51 = eptex
+@EPTEX_TRUE@am__append_52 = $(eptex_tests)
+@EPTEX_TRUE@am__append_53 = dvitype pltotf tftopl
+@EPTEX_TRUE@am__append_54 = eptrip.diffs
+@EPTEX_TRUE@am__append_55 = eptrip-clean
+@UPTEX_TRUE@am__append_56 = uptex
+@UPWEB_TRUE@am__append_57 = $(upweb_programs)
+@UPTEX_TRUE@am__append_58 = $(uptex_tests)
+@UPTEX_TRUE@am__append_59 = dvitype pltotf tftopl
+@UPTEX_TRUE@am__append_60 = uptrip.diffs
+@UPTEX_TRUE@am__append_61 = uptrip-clean
+@UPWEB_TRUE@am__append_62 = $(upweb_tests)
+@EUPTEX_TRUE@am__append_63 = euptex
+@EUPTEX_TRUE@am__append_64 = $(euptex_tests)
+@EUPTEX_TRUE@am__append_65 = dvitype pltotf tftopl
+@EUPTEX_TRUE@am__append_66 = euptrip.diffs
+@EUPTEX_TRUE@am__append_67 = euptrip-clean
+@MINGW32_TRUE@am__append_68 = \
+@MINGW32_TRUE@ pdftexdir/regex/regex.c \
+@MINGW32_TRUE@ pdftexdir/regex/regex.h
+
+@PDFTEX_TRUE@am__append_69 = pdftex ttf2afm pdftosrc
+@PDFTEX_TRUE@am__append_70 = $(pdftex_tests) $(ttf2afm_tests) \
+@PDFTEX_TRUE@ $(pdftosrc_tests)
+@LUATEX_TRUE@am__append_71 = luatex
+@LUATEX_TRUE@@WIN32_TRUE@am__append_72 = call_luatex
+@LUATEX_TRUE@@WIN32_TRUE@am__append_73 = install-luatex-links
+@LUATEX_TRUE@@WIN32_TRUE@am__append_74 = uninstall-luatex-links
+@LUATEX_TRUE@@WIN32_FALSE@am__append_75 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
+@LUAJITTEX_TRUE@am__append_76 = luajittex
+@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_77 = call_luajittex
+@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_78 = install-luajittex-links
+@LUAJITTEX_TRUE@@WIN32_TRUE@am__append_79 = uninstall-luajittex-links
+@LUAJITTEX_TRUE@@WIN32_FALSE@am__append_80 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc
+@LUATEX_TRUE@am__append_81 = $(luatex_tests)
+@LUAJITTEX_TRUE@am__append_82 = $(luajittex_tests)
+@LUATEX_TRUE@@cross_FALSE@am__append_83 = txt2zlib
+@XETEX_TRUE@am__append_84 = xetex
+@XETEX_MACOSX_TRUE@am__append_85 = -DXETEX_MAC
+@XETEX_MACOSX_FALSE@am__append_86 = $(FONTCONFIG_INCLUDES)
+@XETEX_MACOSX_FALSE@am__append_87 = $(FONTCONFIG_LIBS)
+@XETEX_MACOSX_TRUE@am__append_88 = \
+@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.cpp \
+@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.h \
+@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontMgr_Mac.mm \
+@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontMgr_Mac.h \
+@XETEX_MACOSX_TRUE@ xetexdir/XeTeX_mac.c
+
+@XETEX_MACOSX_FALSE@am__append_89 = \
+@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.cpp \
+@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.h
+
+@XETEX_TRUE@am__append_90 = $(xetex_tests)
+@OTANGLE_TRUE@am__append_91 = $(omegaware_programs)
+@OTANGLE_TRUE@am__append_92 = $(OTANGLE_tests) $(OMFONTS_tests)
+@OTANGLE_TRUE@am__append_93 = pltotf tftopl
+@ALEPH_TRUE@am__append_94 = aleph
+@ALEPH_TRUE@am__append_95 = $(aleph_tests)
+@SYNCTEX_TRUE@am__append_96 = synctex
+@TEX_SYNCTEX_TRUE@am__append_97 = -I$(srcdir)/synctexdir \
+@TEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
+@TEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-tex.h\"
+@TEX_SYNCTEX_TRUE@am__append_98 = $(ZLIB_LIBS)
+@TEX_SYNCTEX_TRUE@am__append_99 = $(ZLIB_DEPEND)
+@TEX_SYNCTEX_TRUE@am__append_100 = \
+@TEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
+@TEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
+@TEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
+@TEX_SYNCTEX_TRUE@ synctexdir/synctex-tex.h
+
+@ETEX_SYNCTEX_TRUE@am__append_101 = -I$(srcdir)/synctexdir \
+@ETEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
+@ETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-etex.h\"
+@ETEX_SYNCTEX_TRUE@am__append_102 = $(ZLIB_LIBS)
+@ETEX_SYNCTEX_TRUE@am__append_103 = $(ZLIB_DEPEND)
+@ETEX_SYNCTEX_TRUE@am__append_104 = \
+@ETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
+@ETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
+@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
+@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-etex.h
+
+@PTEX_SYNCTEX_TRUE@am__append_105 = -I$(srcdir)/synctexdir \
+@PTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
+@PTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-ptex.h\"
+@PTEX_SYNCTEX_TRUE@am__append_106 = $(ZLIB_LIBS)
+@PTEX_SYNCTEX_TRUE@am__append_107 = $(ZLIB_DEPEND)
+@PTEX_SYNCTEX_TRUE@am__append_108 = \
+@PTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
+@PTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
+@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
+@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-ptex.h
+
+@UPTEX_SYNCTEX_TRUE@am__append_109 = -I$(srcdir)/synctexdir \
+@UPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
+@UPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-uptex.h\"
+@UPTEX_SYNCTEX_TRUE@am__append_110 = $(ZLIB_LIBS)
+@UPTEX_SYNCTEX_TRUE@am__append_111 = $(ZLIB_DEPEND)
+@UPTEX_SYNCTEX_TRUE@am__append_112 = \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-uptex.h
+
+@EPTEX_SYNCTEX_TRUE@am__append_113 = -I$(srcdir)/synctexdir \
+@EPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
+@EPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-eptex.h\"
+@EPTEX_SYNCTEX_TRUE@am__append_114 = $(ZLIB_LIBS)
+@EPTEX_SYNCTEX_TRUE@am__append_115 = $(ZLIB_DEPEND)
+@EPTEX_SYNCTEX_TRUE@am__append_116 = \
+@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
+@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
+@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
+@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-eptex.h
+
+@EUPTEX_SYNCTEX_TRUE@am__append_117 = -I$(srcdir)/synctexdir \
+@EUPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
+@EUPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-euptex.h\"
+@EUPTEX_SYNCTEX_TRUE@am__append_118 = $(ZLIB_LIBS)
+@EUPTEX_SYNCTEX_TRUE@am__append_119 = $(ZLIB_DEPEND)
+@EUPTEX_SYNCTEX_TRUE@am__append_120 = \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-euptex.h
+
+@PDFTEX_SYNCTEX_TRUE@am__append_121 = -I$(srcdir)/synctexdir \
+@PDFTEX_SYNCTEX_TRUE@ -D__SyncTeX__ \
+@PDFTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\"
+@PDFTEX_SYNCTEX_TRUE@am__append_122 = \
+@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
+@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
+@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
+@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-pdftex.h
+
+@XETEX_SYNCTEX_TRUE@am__append_123 = -I$(srcdir)/synctexdir \
+@XETEX_SYNCTEX_TRUE@ -D__SyncTeX__ \
+@XETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-xetex.h\"
+@XETEX_SYNCTEX_TRUE@am__append_124 = \
+@XETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
+@XETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
+@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
+@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-xetex.h
+
+@SYNCTEX_TRUE@am__append_125 = $(synctex_tests)
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
@@ -199,6 +373,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
$(top_srcdir)/../../m4/kpse-lex.m4 \
+ $(top_srcdir)/../../m4/kpse-lib-version.m4 \
$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
$(top_srcdir)/../../m4/kpse-lt-hack.m4 \
$(top_srcdir)/../../m4/kpse-lua52-flags.m4 \
@@ -222,6 +397,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/ltversion.m4 \
$(top_srcdir)/../../m4/lt~obsolete.m4 \
$(top_srcdir)/../../version.ac $(top_srcdir)/ac/web2c.ac \
+ $(top_srcdir)/synctexdir/ac/synctex.ac \
+ $(top_srcdir)/synctexdir/synctex_parser_version.txt \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -231,8 +408,40 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/w2c/c-auto.h ff-config.h
CONFIG_CLEAN_FILES = omegafonts/Makefile otps/Makefile \
otps/win32/Makefile window/Makefile web2c-sh tangle-sh \
- ctangleboot-sh silent-sh callexe.c
+ ctangleboot-sh silent-sh synctexdir/synctex.pc callexe.c
CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libdir)" \
+ "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
+ "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(pkgconfigdir)" \
+ "$(DESTDIR)$(syncincludedir)"
+LIBRARIES = $(lib_LIBRARIES)
ARFLAGS = cru
AM_V_AR = $(am__v_AR_@AM_V@)
am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
@@ -335,6 +544,10 @@ am__objects_2 = luatexdir/luafontloader/fontforge/fontforge/libjitff_a-autohint.
luatexdir/luafontloader/src/libjitff_a-luafflib.$(OBJEXT)
nodist_libjitff_a_OBJECTS = $(am__objects_2)
libjitff_a_OBJECTS = $(nodist_libjitff_a_OBJECTS)
+libkanji_a_AR = $(AR) $(ARFLAGS)
+libkanji_a_LIBADD =
+am_libkanji_a_OBJECTS = ptexdir/libkanji_a-kanji.$(OBJEXT)
+libkanji_a_OBJECTS = $(am_libkanji_a_OBJECTS)
libluajitmisc_a_AR = $(AR) $(ARFLAGS)
libluajitmisc_a_LIBADD =
am__objects_3 = \
@@ -654,6 +867,54 @@ am_libmputil_a_OBJECTS = mplibdir/libmputil_a-avl.$(OBJEXT) \
mplibdir/libmputil_a-decNumber.$(OBJEXT) \
mplibdir/libmputil_a-decContext.$(OBJEXT)
libmputil_a_OBJECTS = $(am_libmputil_a_OBJECTS)
+libpdftex_a_AR = $(AR) $(ARFLAGS)
+libpdftex_a_LIBADD =
+am__libpdftex_a_SOURCES_DIST = pdftexdir/avl.c pdftexdir/avl.h \
+ pdftexdir/avlstuff.c pdftexdir/avlstuff.h pdftexdir/epdf.c \
+ pdftexdir/image.h pdftexdir/mapfile.c pdftexdir/pdftex.h \
+ pdftexdir/pdftex-common.h pdftexdir/pdftoepdf.cc \
+ pdftexdir/pkin.c pdftexdir/ptexlib.h pdftexdir/ptexmac.h \
+ pdftexdir/subfont.c pdftexdir/tounicode.c pdftexdir/utils.c \
+ pdftexdir/vfpacket.c pdftexdir/writeenc.c \
+ pdftexdir/writefont.c pdftexdir/writeimg.c \
+ pdftexdir/writejbig2.c pdftexdir/writejpg.c \
+ pdftexdir/writepng.c pdftexdir/writet1.c pdftexdir/writet3.c \
+ pdftexdir/writettf.c pdftexdir/writettf.h pdftexdir/writezip.c \
+ pdftexdir/regex/regex.c pdftexdir/regex/regex.h
+@MINGW32_TRUE@am__objects_21 = \
+@MINGW32_TRUE@ pdftexdir/regex/libpdftex_a-regex.$(OBJEXT)
+am_libpdftex_a_OBJECTS = pdftexdir/libpdftex_a-avl.$(OBJEXT) \
+ pdftexdir/libpdftex_a-avlstuff.$(OBJEXT) \
+ pdftexdir/libpdftex_a-epdf.$(OBJEXT) \
+ pdftexdir/libpdftex_a-mapfile.$(OBJEXT) \
+ pdftexdir/libpdftex_a-pdftoepdf.$(OBJEXT) \
+ pdftexdir/libpdftex_a-pkin.$(OBJEXT) \
+ pdftexdir/libpdftex_a-subfont.$(OBJEXT) \
+ pdftexdir/libpdftex_a-tounicode.$(OBJEXT) \
+ pdftexdir/libpdftex_a-utils.$(OBJEXT) \
+ pdftexdir/libpdftex_a-vfpacket.$(OBJEXT) \
+ pdftexdir/libpdftex_a-writeenc.$(OBJEXT) \
+ pdftexdir/libpdftex_a-writefont.$(OBJEXT) \
+ pdftexdir/libpdftex_a-writeimg.$(OBJEXT) \
+ pdftexdir/libpdftex_a-writejbig2.$(OBJEXT) \
+ pdftexdir/libpdftex_a-writejpg.$(OBJEXT) \
+ pdftexdir/libpdftex_a-writepng.$(OBJEXT) \
+ pdftexdir/libpdftex_a-writet1.$(OBJEXT) \
+ pdftexdir/libpdftex_a-writet3.$(OBJEXT) \
+ pdftexdir/libpdftex_a-writettf.$(OBJEXT) \
+ pdftexdir/libpdftex_a-writezip.$(OBJEXT) $(am__objects_21)
+libpdftex_a_OBJECTS = $(am_libpdftex_a_OBJECTS)
+libsynctex_a_AR = $(AR) $(ARFLAGS)
+libsynctex_a_LIBADD =
+am__objects_22 = synctexdir/libsynctex_a-synctex_parser.$(OBJEXT) \
+ synctexdir/libsynctex_a-synctex_parser_utils.$(OBJEXT)
+nodist_libsynctex_a_OBJECTS = $(am__objects_22)
+libsynctex_a_OBJECTS = $(nodist_libsynctex_a_OBJECTS)
+libukanji_a_AR = $(AR) $(ARFLAGS)
+libukanji_a_LIBADD =
+am_libukanji_a_OBJECTS = uptexdir/libukanji_a-kanji.$(OBJEXT) \
+ uptexdir/libukanji_a-kanji_dump.$(OBJEXT)
+libukanji_a_OBJECTS = $(am_libukanji_a_OBJECTS)
libunilib_a_AR = $(AR) $(ARFLAGS)
libunilib_a_LIBADD =
am_libunilib_a_OBJECTS = \
@@ -668,40 +929,129 @@ am_libunilib_a_OBJECTS = \
luatexdir/unilib/libunilib_a-ustring.$(OBJEXT) \
luatexdir/unilib/libunilib_a-utype.$(OBJEXT)
libunilib_a_OBJECTS = $(am_libunilib_a_OBJECTS)
+libxetex_a_AR = $(AR) $(ARFLAGS)
+libxetex_a_LIBADD =
+am__libxetex_a_SOURCES_DIST = xetexdir/MathTable.h \
+ xetexdir/XeTeXFontInst.cpp xetexdir/XeTeXFontInst.h \
+ xetexdir/XeTeXFontMgr.cpp xetexdir/XeTeXFontMgr.h \
+ xetexdir/XeTeXLayoutInterface.cpp \
+ xetexdir/XeTeXLayoutInterface.h xetexdir/XeTeXOTMath.cpp \
+ xetexdir/XeTeXOTMath.h xetexdir/XeTeX_ext.c \
+ xetexdir/XeTeX_ext.h xetexdir/XeTeX_pic.c xetexdir/XeTeX_web.h \
+ xetexdir/XeTeXswap.h xetexdir/trans.c xetexdir/trans.h \
+ xetexdir/hz.cpp xetexdir/xetex.h xetexdir/pdfimage.cpp \
+ xetexdir/pdfimage.h xetexdir/image/bmpimage.c \
+ xetexdir/image/bmpimage.h xetexdir/image/jpegimage.c \
+ xetexdir/image/jpegimage.h xetexdir/image/mfileio.c \
+ xetexdir/image/mfileio.h xetexdir/image/numbers.c \
+ xetexdir/image/numbers.h xetexdir/image/pngimage.c \
+ xetexdir/image/pngimage.h xetexdir/XeTeXFontInst_Mac.cpp \
+ xetexdir/XeTeXFontInst_Mac.h xetexdir/XeTeXFontMgr_Mac.mm \
+ xetexdir/XeTeXFontMgr_Mac.h xetexdir/XeTeX_mac.c \
+ xetexdir/XeTeXFontMgr_FC.cpp xetexdir/XeTeXFontMgr_FC.h
+@XETEX_MACOSX_TRUE@am__objects_23 = xetexdir/libxetex_a-XeTeXFontInst_Mac.$(OBJEXT) \
+@XETEX_MACOSX_TRUE@ xetexdir/libxetex_a-XeTeXFontMgr_Mac.$(OBJEXT) \
+@XETEX_MACOSX_TRUE@ xetexdir/libxetex_a-XeTeX_mac.$(OBJEXT)
+@XETEX_MACOSX_FALSE@am__objects_24 = xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT)
+am_libxetex_a_OBJECTS = xetexdir/libxetex_a-XeTeXFontInst.$(OBJEXT) \
+ xetexdir/libxetex_a-XeTeXFontMgr.$(OBJEXT) \
+ xetexdir/libxetex_a-XeTeXLayoutInterface.$(OBJEXT) \
+ xetexdir/libxetex_a-XeTeXOTMath.$(OBJEXT) \
+ xetexdir/libxetex_a-XeTeX_ext.$(OBJEXT) \
+ xetexdir/libxetex_a-XeTeX_pic.$(OBJEXT) \
+ xetexdir/libxetex_a-trans.$(OBJEXT) \
+ xetexdir/libxetex_a-hz.$(OBJEXT) \
+ xetexdir/libxetex_a-pdfimage.$(OBJEXT) \
+ xetexdir/image/libxetex_a-bmpimage.$(OBJEXT) \
+ xetexdir/image/libxetex_a-jpegimage.$(OBJEXT) \
+ xetexdir/image/libxetex_a-mfileio.$(OBJEXT) \
+ xetexdir/image/libxetex_a-numbers.$(OBJEXT) \
+ xetexdir/image/libxetex_a-pngimage.$(OBJEXT) $(am__objects_23) \
+ $(am__objects_24)
+libxetex_a_OBJECTS = $(am_libxetex_a_OBJECTS)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+libsynctex_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_libsynctex_la_OBJECTS = synctexdir/libsynctex_la-synctex_parser.lo \
+ synctexdir/libsynctex_la-synctex_parser_utils.lo
+libsynctex_la_OBJECTS = $(am_libsynctex_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 =
+libsynctex_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(libsynctex_la_LDFLAGS) $(LDFLAGS) -o $@
am__EXEEXT_1 = bibtex$(EXEEXT) dvicopy$(EXEEXT) dvitype$(EXEEXT) \
gftodvi$(EXEEXT) gftopk$(EXEEXT) gftype$(EXEEXT) mft$(EXEEXT) \
patgen$(EXEEXT) pktogf$(EXEEXT) pktype$(EXEEXT) \
pltotf$(EXEEXT) pooltype$(EXEEXT) tftopl$(EXEEXT) \
vftovp$(EXEEXT) vptovf$(EXEEXT) weave$(EXEEXT)
-@WEB_TRUE@am__EXEEXT_2 = $(am__EXEEXT_1)
-@TEX_TRUE@am__EXEEXT_3 = tex$(EXEEXT)
-@TEX_TRUE@@WIN32_TRUE@am__EXEEXT_4 = initex$(EXEEXT)
-@MF_TRUE@am__EXEEXT_5 = mf$(EXEEXT)
-@MFN_TRUE@@MF_TRUE@am__EXEEXT_6 = mf-nowin$(EXEEXT)
-@MF_TRUE@@WIN32_TRUE@am__EXEEXT_7 = inimf$(EXEEXT)
-@MP_TRUE@am__EXEEXT_8 = mpost$(EXEEXT)
-@LUATEX_TRUE@am__EXEEXT_9 = luatex$(EXEEXT)
-@LUAJITTEX_TRUE@am__EXEEXT_10 = luajittex$(EXEEXT)
-am__installdirs = "$(DESTDIR)$(bindir)"
-@TEX_TRUE@am__EXEEXT_11 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+am__EXEEXT_2 = pbibtex$(EXEEXT) pdvitype$(EXEEXT) ppltotf$(EXEEXT) \
+ ptftopl$(EXEEXT)
+am__EXEEXT_3 = upbibtex$(EXEEXT) updvitype$(EXEEXT) uppltotf$(EXEEXT) \
+ uptftopl$(EXEEXT)
+am__EXEEXT_4 = odvicopy$(EXEEXT) odvitype$(EXEEXT) otangle$(EXEEXT) \
+ wofm2opl$(EXEEXT) wopl2ofm$(EXEEXT) wovf2ovp$(EXEEXT) \
+ wovp2ovf$(EXEEXT)
+@WEB_TRUE@am__EXEEXT_5 = $(am__EXEEXT_1)
+@TEX_TRUE@am__EXEEXT_6 = tex$(EXEEXT)
+@TEX_TRUE@@WIN32_TRUE@am__EXEEXT_7 = initex$(EXEEXT)
+@MF_TRUE@am__EXEEXT_8 = mf$(EXEEXT)
+@MFN_TRUE@@MF_TRUE@am__EXEEXT_9 = mf-nowin$(EXEEXT)
+@MF_TRUE@@WIN32_TRUE@am__EXEEXT_10 = inimf$(EXEEXT)
+@MP_TRUE@am__EXEEXT_11 = mpost$(EXEEXT)
+@PMP_TRUE@am__EXEEXT_12 = pmpost$(EXEEXT)
+@UPMP_TRUE@am__EXEEXT_13 = upmpost$(EXEEXT)
+@ETEX_TRUE@am__EXEEXT_14 = etex$(EXEEXT)
+@PTEX_TRUE@am__EXEEXT_15 = ptex$(EXEEXT)
+@PWEB_TRUE@am__EXEEXT_16 = $(am__EXEEXT_2)
+@EPTEX_TRUE@am__EXEEXT_17 = eptex$(EXEEXT)
+@UPTEX_TRUE@am__EXEEXT_18 = uptex$(EXEEXT)
+@UPWEB_TRUE@am__EXEEXT_19 = $(am__EXEEXT_3)
+@EUPTEX_TRUE@am__EXEEXT_20 = euptex$(EXEEXT)
+@PDFTEX_TRUE@am__EXEEXT_21 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
+@PDFTEX_TRUE@ pdftosrc$(EXEEXT)
+@LUATEX_TRUE@am__EXEEXT_22 = luatex$(EXEEXT)
+@LUAJITTEX_TRUE@am__EXEEXT_23 = luajittex$(EXEEXT)
+@XETEX_TRUE@am__EXEEXT_24 = xetex$(EXEEXT)
+@OTANGLE_TRUE@am__EXEEXT_25 = $(am__EXEEXT_4)
+@ALEPH_TRUE@am__EXEEXT_26 = aleph$(EXEEXT)
+@SYNCTEX_TRUE@am__EXEEXT_27 = synctex$(EXEEXT)
+@TEX_TRUE@am__EXEEXT_28 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
@TEX_TRUE@ tftopl$(EXEEXT)
-@MF_TRUE@am__EXEEXT_12 = gftype$(EXEEXT) tftopl$(EXEEXT)
-@MP_TRUE@am__EXEEXT_13 = pltotf$(EXEEXT) tftopl$(EXEEXT)
-@OTANGLE_TRUE@am__EXEEXT_14 = pltotf$(EXEEXT) tftopl$(EXEEXT)
-@MP_TRUE@@WIN32_TRUE@am__EXEEXT_15 = call_mpost$(EXEEXT)
-@LUATEX_TRUE@@WIN32_TRUE@am__EXEEXT_16 = call_luatex$(EXEEXT)
-@LUAJITTEX_TRUE@@WIN32_TRUE@am__EXEEXT_17 = call_luajittex$(EXEEXT)
-@LUATEX_TRUE@@cross_FALSE@am__EXEEXT_18 = txt2zlib$(EXEEXT)
+@MF_TRUE@am__EXEEXT_29 = gftype$(EXEEXT) tftopl$(EXEEXT)
+@MP_TRUE@am__EXEEXT_30 = pltotf$(EXEEXT) tftopl$(EXEEXT)
+@ETEX_TRUE@am__EXEEXT_31 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@ETEX_TRUE@ tftopl$(EXEEXT)
+@PTEX_TRUE@am__EXEEXT_32 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@PTEX_TRUE@ tftopl$(EXEEXT)
+@EPTEX_TRUE@am__EXEEXT_33 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@EPTEX_TRUE@ tftopl$(EXEEXT)
+@UPTEX_TRUE@am__EXEEXT_34 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@UPTEX_TRUE@ tftopl$(EXEEXT)
+@EUPTEX_TRUE@am__EXEEXT_35 = dvitype$(EXEEXT) pltotf$(EXEEXT) \
+@EUPTEX_TRUE@ tftopl$(EXEEXT)
+@OTANGLE_TRUE@am__EXEEXT_36 = pltotf$(EXEEXT) tftopl$(EXEEXT)
+@MP_TRUE@@WIN32_TRUE@am__EXEEXT_37 = call_mpost$(EXEEXT)
+@PMP_TRUE@@WIN32_TRUE@am__EXEEXT_38 = call_pmpost$(EXEEXT)
+@UPMP_TRUE@@WIN32_TRUE@am__EXEEXT_39 = call_upmpost$(EXEEXT)
+@LUATEX_TRUE@@WIN32_TRUE@am__EXEEXT_40 = call_luatex$(EXEEXT)
+@LUAJITTEX_TRUE@@WIN32_TRUE@am__EXEEXT_41 = call_luajittex$(EXEEXT)
+@LUATEX_TRUE@@cross_FALSE@am__EXEEXT_42 = txt2zlib$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+dist_aleph_OBJECTS = alephdir/aleph-aleph.$(OBJEXT) \
+ alephdir/aleph-alephbis.$(OBJEXT) \
+ alephdir/aleph-alephextra.$(OBJEXT)
+am__objects_25 = aleph-alephini.$(OBJEXT) aleph-aleph0.$(OBJEXT)
+nodist_aleph_OBJECTS = $(am__objects_25) aleph-aleph-pool.$(OBJEXT)
+aleph_OBJECTS = $(dist_aleph_OBJECTS) $(nodist_aleph_OBJECTS)
+am__DEPENDENCIES_2 = $(proglib) $(am__DEPENDENCIES_1)
+aleph_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
nodist_bibtex_OBJECTS = bibtex.$(OBJEXT)
bibtex_OBJECTS = $(nodist_bibtex_OBJECTS)
bibtex_LDADD = $(LDADD)
-am__DEPENDENCIES_1 =
bibtex_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 =
nodist_call_luajittex_OBJECTS = call_luajittex-callexe.$(OBJEXT)
call_luajittex_OBJECTS = $(nodist_call_luajittex_OBJECTS)
call_luajittex_DEPENDENCIES =
@@ -711,6 +1061,12 @@ call_luatex_DEPENDENCIES =
nodist_call_mpost_OBJECTS = call_mpost-callexe.$(OBJEXT)
call_mpost_OBJECTS = $(nodist_call_mpost_OBJECTS)
call_mpost_DEPENDENCIES =
+nodist_call_pmpost_OBJECTS = call_pmpost-callexe.$(OBJEXT)
+call_pmpost_OBJECTS = $(nodist_call_pmpost_OBJECTS)
+call_pmpost_DEPENDENCIES =
+nodist_call_upmpost_OBJECTS = call_upmpost-callexe.$(OBJEXT)
+call_upmpost_OBJECTS = $(nodist_call_upmpost_OBJECTS)
+call_upmpost_DEPENDENCIES =
nodist_ctangle_OBJECTS = ctangle.$(OBJEXT) cweb.$(OBJEXT)
ctangle_OBJECTS = $(nodist_ctangle_OBJECTS)
ctangle_LDADD = $(LDADD)
@@ -734,6 +1090,42 @@ nodist_dvitype_OBJECTS = dvitype.$(OBJEXT)
dvitype_OBJECTS = $(nodist_dvitype_OBJECTS)
dvitype_LDADD = $(LDADD)
dvitype_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
+am__dist_eptex_SOURCES_DIST = eptexdir/eptexextra.c \
+ eptexdir/eptexextra.h eptexdir/eptex_version.h \
+ synctexdir/synctex.c synctexdir/synctex.h \
+ synctexdir/synctex-common.h synctexdir/synctex-eptex.h
+@EPTEX_SYNCTEX_TRUE@am__objects_26 = \
+@EPTEX_SYNCTEX_TRUE@ synctexdir/eptex-synctex.$(OBJEXT)
+dist_eptex_OBJECTS = eptexdir/eptex-eptexextra.$(OBJEXT) \
+ $(am__objects_26)
+am__objects_27 = eptex-eptexini.$(OBJEXT) eptex-eptex0.$(OBJEXT)
+nodist_eptex_OBJECTS = $(am__objects_27) eptex-eptex-pool.$(OBJEXT)
+eptex_OBJECTS = $(dist_eptex_OBJECTS) $(nodist_eptex_OBJECTS)
+@EPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
+am__dist_etex_SOURCES_DIST = etexdir/etexextra.c etexdir/etexextra.h \
+ etexdir/etex_version.h synctexdir/synctex.c \
+ synctexdir/synctex.h synctexdir/synctex-common.h \
+ synctexdir/synctex-etex.h
+@ETEX_SYNCTEX_TRUE@am__objects_28 = synctexdir/etex-synctex.$(OBJEXT)
+dist_etex_OBJECTS = etexdir/etex-etexextra.$(OBJEXT) $(am__objects_28)
+am__objects_29 = etex-etexini.$(OBJEXT) etex-etex0.$(OBJEXT)
+nodist_etex_OBJECTS = $(am__objects_29) etex-etex-pool.$(OBJEXT)
+etex_OBJECTS = $(dist_etex_OBJECTS) $(nodist_etex_OBJECTS)
+@ETEX_SYNCTEX_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
+etex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_4)
+am__dist_euptex_SOURCES_DIST = euptexdir/euptexextra.c \
+ euptexdir/euptexextra.h synctexdir/synctex.c \
+ synctexdir/synctex.h synctexdir/synctex-common.h \
+ synctexdir/synctex-euptex.h
+@EUPTEX_SYNCTEX_TRUE@am__objects_30 = \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/euptex-synctex.$(OBJEXT)
+dist_euptex_OBJECTS = euptexdir/euptex-euptexextra.$(OBJEXT) \
+ $(am__objects_30)
+am__objects_31 = euptex-euptexini.$(OBJEXT) euptex-euptex0.$(OBJEXT)
+nodist_euptex_OBJECTS = $(am__objects_31) euptex-euptex-pool.$(OBJEXT)
+euptex_OBJECTS = $(dist_euptex_OBJECTS) $(nodist_euptex_OBJECTS)
+@EUPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
am_gftodvi_OBJECTS =
nodist_gftodvi_OBJECTS = gftodvi.$(OBJEXT)
gftodvi_OBJECTS = $(am_gftodvi_OBJECTS) $(nodist_gftodvi_OBJECTS)
@@ -753,12 +1145,11 @@ inimf_DEPENDENCIES =
nodist_initex_OBJECTS = initex-callexe.$(OBJEXT)
initex_OBJECTS = $(nodist_initex_OBJECTS)
initex_DEPENDENCIES =
-am__objects_21 = luatexdir/luajittex-luatex.$(OBJEXT) \
+am__objects_32 = luatexdir/luajittex-luatex.$(OBJEXT) \
mplibdir/luajittex-lmplib.$(OBJEXT)
-nodist_luajittex_OBJECTS = $(am__objects_21)
+nodist_luajittex_OBJECTS = $(am__objects_32)
luajittex_OBJECTS = $(nodist_luajittex_OBJECTS)
-am__DEPENDENCIES_2 = $(proglib) $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_3 = libmplib.a $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_6 = libmplib.a $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -767,11 +1158,11 @@ am__DEPENDENCIES_3 = libmplib.a $(am__DEPENDENCIES_1) \
luajittex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(luajittex_CXXFLAGS) \
$(CXXFLAGS) $(luajittex_LDFLAGS) $(LDFLAGS) -o $@
-am__objects_22 = luatexdir/luatex-luatex.$(OBJEXT) \
+am__objects_33 = luatexdir/luatex-luatex.$(OBJEXT) \
mplibdir/luatex-lmplib.$(OBJEXT)
-nodist_luatex_OBJECTS = $(am__objects_22)
+nodist_luatex_OBJECTS = $(am__objects_33)
luatex_OBJECTS = $(nodist_luatex_OBJECTS)
-am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
luatex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(luatex_CXXFLAGS) \
$(CXXFLAGS) $(luatex_LDFLAGS) $(LDFLAGS) -o $@
@@ -780,12 +1171,12 @@ md5main_OBJECTS = $(am_md5main_OBJECTS)
md5main_DEPENDENCIES = libmd5.a
dist_mf_OBJECTS = mf-mfextra.$(OBJEXT)
mf_OBJECTS = $(dist_mf_OBJECTS)
-@WIN32_FALSE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) \
+@WIN32_FALSE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1) \
@WIN32_FALSE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@WIN32_FALSE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@WIN32_FALSE@ $(am__DEPENDENCIES_1)
mf_DEPENDENCIES = libmf.a $(am__DEPENDENCIES_2) $(windowlib) \
- $(am__DEPENDENCIES_5)
+ $(am__DEPENDENCIES_8)
dist_mf_nowin_OBJECTS = mf_nowin-mfextra.$(OBJEXT)
mf_nowin_OBJECTS = $(dist_mf_nowin_OBJECTS)
mf_nowin_DEPENDENCIES = libmf.a $(am__DEPENDENCIES_2) $(windowlib)
@@ -793,17 +1184,59 @@ nodist_mft_OBJECTS = mft.$(OBJEXT)
mft_OBJECTS = $(nodist_mft_OBJECTS)
mft_LDADD = $(LDADD)
mft_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am__objects_23 = mpost-mpxout.$(OBJEXT)
-nodist_mpost_OBJECTS = mpost-mpost.$(OBJEXT) $(am__objects_23)
+am__objects_34 = mpost-mpxout.$(OBJEXT)
+nodist_mpost_OBJECTS = mpost-mpost.$(OBJEXT) $(am__objects_34)
mpost_OBJECTS = $(nodist_mpost_OBJECTS)
mpost_DEPENDENCIES = libmplib.a $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libmputil.a
+nodist_odvicopy_OBJECTS = odvicopy.$(OBJEXT)
+odvicopy_OBJECTS = $(nodist_odvicopy_OBJECTS)
+odvicopy_LDADD = $(LDADD)
+odvicopy_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
+nodist_odvitype_OBJECTS = odvitype.$(OBJEXT)
+odvitype_OBJECTS = $(nodist_odvitype_OBJECTS)
+odvitype_LDADD = $(LDADD)
+odvitype_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
+nodist_otangle_OBJECTS = otangle.$(OBJEXT)
+otangle_OBJECTS = $(nodist_otangle_OBJECTS)
+otangle_LDADD = $(LDADD)
+otangle_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
nodist_patgen_OBJECTS = patgen.$(OBJEXT)
patgen_OBJECTS = $(nodist_patgen_OBJECTS)
patgen_LDADD = $(LDADD)
patgen_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
+am_pbibtex_OBJECTS =
+nodist_pbibtex_OBJECTS = pbibtex-pbibtex.$(OBJEXT)
+pbibtex_OBJECTS = $(am_pbibtex_OBJECTS) $(nodist_pbibtex_OBJECTS)
+am__DEPENDENCIES_9 = libkanji.a $(pproglib) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_2)
+am__dist_pdftex_SOURCES_DIST = pdftexdir/pdftexextra.c \
+ pdftexdir/pdftexextra.h pdftexdir/pdftex_version.h \
+ pdftexdir/etex_version.h synctexdir/synctex.c \
+ synctexdir/synctex.h synctexdir/synctex-common.h \
+ synctexdir/synctex-pdftex.h
+@PDFTEX_SYNCTEX_TRUE@am__objects_35 = \
+@PDFTEX_SYNCTEX_TRUE@ synctexdir/pdftex-synctex.$(OBJEXT)
+dist_pdftex_OBJECTS = pdftexdir/pdftex-pdftexextra.$(OBJEXT) \
+ $(am__objects_35)
+am__objects_36 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT)
+nodist_pdftex_OBJECTS = $(am__objects_36) pdftex-pdftex-pool.$(OBJEXT)
+pdftex_OBJECTS = $(dist_pdftex_OBJECTS) $(nodist_pdftex_OBJECTS)
+am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) libmd5.a
+pdftex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftex_CXXFLAGS) \
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_pdftosrc_OBJECTS = pdftexdir/pdftosrc-pdftosrc.$(OBJEXT)
+pdftosrc_OBJECTS = $(am_pdftosrc_OBJECTS)
+pdftosrc_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftosrc_CXXFLAGS) \
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_pdvitype_OBJECTS =
+nodist_pdvitype_OBJECTS = pdvitype-pdvitype.$(OBJEXT)
+pdvitype_OBJECTS = $(am_pdvitype_OBJECTS) $(nodist_pdvitype_OBJECTS)
nodist_pktogf_OBJECTS = pktogf.$(OBJEXT)
pktogf_OBJECTS = $(nodist_pktogf_OBJECTS)
pktogf_LDADD = $(LDADD)
@@ -816,10 +1249,49 @@ nodist_pltotf_OBJECTS = pltotf.$(OBJEXT)
pltotf_OBJECTS = $(nodist_pltotf_OBJECTS)
pltotf_LDADD = $(LDADD)
pltotf_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
+am__objects_37 = pmpost-pmp.$(OBJEXT)
+am__objects_38 = pmpost-pmpmath.$(OBJEXT)
+am__objects_39 = pmpost-pmpmathbinary.$(OBJEXT)
+am__objects_40 = pmpost-pmpmathdecimal.$(OBJEXT)
+am__objects_41 = pmpost-pmpmathdouble.$(OBJEXT)
+am__objects_42 = pmpost-pmpstrings.$(OBJEXT)
+am__objects_43 = pmpost-pmpxout.$(OBJEXT)
+am__objects_44 = pmpost-ppngout.$(OBJEXT)
+am__objects_45 = pmpost-ppsout.$(OBJEXT)
+am__objects_46 = pmpost-psvgout.$(OBJEXT)
+nodist_pmpost_OBJECTS = $(am__objects_37) $(am__objects_38) \
+ $(am__objects_39) $(am__objects_40) $(am__objects_41) \
+ pmpost-pmpost.$(OBJEXT) $(am__objects_42) $(am__objects_43) \
+ $(am__objects_44) $(am__objects_45) $(am__objects_46) \
+ pmpost-ptfmin.$(OBJEXT)
+pmpost_OBJECTS = $(nodist_pmpost_OBJECTS)
+pmpost_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libmputil.a
nodist_pooltype_OBJECTS = pooltype.$(OBJEXT)
pooltype_OBJECTS = $(nodist_pooltype_OBJECTS)
pooltype_LDADD = $(LDADD)
pooltype_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
+am_ppltotf_OBJECTS =
+nodist_ppltotf_OBJECTS = ppltotf-ppltotf.$(OBJEXT)
+ppltotf_OBJECTS = $(am_ppltotf_OBJECTS) $(nodist_ppltotf_OBJECTS)
+am__dist_ptex_SOURCES_DIST = ptexdir/ptexextra.c ptexdir/ptexextra.h \
+ ptexdir/ptex_version.h synctexdir/synctex.c \
+ synctexdir/synctex.h synctexdir/synctex-common.h \
+ synctexdir/synctex-ptex.h
+@PTEX_SYNCTEX_TRUE@am__objects_47 = synctexdir/ptex-synctex.$(OBJEXT)
+dist_ptex_OBJECTS = ptexdir/ptex-ptexextra.$(OBJEXT) $(am__objects_47)
+am__objects_48 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT)
+nodist_ptex_OBJECTS = $(am__objects_48) ptex-ptex-pool.$(OBJEXT)
+ptex_OBJECTS = $(dist_ptex_OBJECTS) $(nodist_ptex_OBJECTS)
+@PTEX_SYNCTEX_TRUE@am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1)
+am_ptftopl_OBJECTS =
+nodist_ptftopl_OBJECTS = ptftopl-ptftopl.$(OBJEXT)
+ptftopl_OBJECTS = $(am_ptftopl_OBJECTS) $(nodist_ptftopl_OBJECTS)
+am_synctex_OBJECTS = synctexdir/synctex-synctex_main.$(OBJEXT)
+synctex_OBJECTS = $(am_synctex_OBJECTS)
+synctex_DEPENDENCIES = $(libsynctex) $(am__DEPENDENCIES_1)
nodist_tangle_OBJECTS = tangle.$(OBJEXT)
tangle_OBJECTS = $(nodist_tangle_OBJECTS)
tangle_LDADD = $(LDADD)
@@ -827,11 +1299,17 @@ tangle_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
nodist_tangleboot_OBJECTS = tangleboot.$(OBJEXT)
tangleboot_OBJECTS = $(nodist_tangleboot_OBJECTS)
tangleboot_LDADD = $(LDADD)
-dist_tex_OBJECTS = tex-texextra.$(OBJEXT)
-am__objects_24 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
-nodist_tex_OBJECTS = $(am__objects_24) tex-tex-pool.$(OBJEXT)
+am__dist_tex_SOURCES_DIST = texextra.c synctexdir/synctex.c \
+ synctexdir/synctex.h synctexdir/synctex-common.h \
+ synctexdir/synctex-tex.h
+@TEX_SYNCTEX_TRUE@am__objects_49 = synctexdir/tex-synctex.$(OBJEXT)
+dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_49)
+am__objects_50 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
+nodist_tex_OBJECTS = $(am__objects_50) tex-tex-pool.$(OBJEXT)
tex_OBJECTS = $(dist_tex_OBJECTS) $(nodist_tex_OBJECTS)
-tex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
+@TEX_SYNCTEX_TRUE@am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1)
+tex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_12)
nodist_tftopl_OBJECTS = tftopl.$(OBJEXT)
tftopl_OBJECTS = $(nodist_tftopl_OBJECTS)
tftopl_LDADD = $(LDADD)
@@ -840,8 +1318,59 @@ nodist_tie_OBJECTS = tie-tie.$(OBJEXT)
tie_OBJECTS = $(nodist_tie_OBJECTS)
tie_LDADD = $(LDADD)
tie_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
+am_ttf2afm_OBJECTS = pdftexdir/ttf2afm-ttf2afm.$(OBJEXT)
+ttf2afm_OBJECTS = $(am_ttf2afm_OBJECTS)
+ttf2afm_LDADD = $(LDADD)
nodist_txt2zlib_OBJECTS = txt2zlib-txt2zlib.$(OBJEXT)
txt2zlib_OBJECTS = $(nodist_txt2zlib_OBJECTS)
+am_upbibtex_OBJECTS =
+nodist_upbibtex_OBJECTS = upbibtex-upbibtex.$(OBJEXT)
+upbibtex_OBJECTS = $(am_upbibtex_OBJECTS) $(nodist_upbibtex_OBJECTS)
+am__DEPENDENCIES_13 = libukanji.a $(pproglib) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_2)
+am_updvitype_OBJECTS =
+nodist_updvitype_OBJECTS = updvitype-updvitype.$(OBJEXT)
+updvitype_OBJECTS = $(am_updvitype_OBJECTS) \
+ $(nodist_updvitype_OBJECTS)
+am__objects_51 = upmpost-pmp.$(OBJEXT)
+am__objects_52 = upmpost-pmpmath.$(OBJEXT)
+am__objects_53 = upmpost-pmpmathbinary.$(OBJEXT)
+am__objects_54 = upmpost-pmpmathdecimal.$(OBJEXT)
+am__objects_55 = upmpost-pmpmathdouble.$(OBJEXT)
+am__objects_56 = upmpost-pmpstrings.$(OBJEXT)
+am__objects_57 = upmpost-pmpxout.$(OBJEXT)
+am__objects_58 = upmpost-ppngout.$(OBJEXT)
+am__objects_59 = upmpost-ppsout.$(OBJEXT)
+am__objects_60 = upmpost-psvgout.$(OBJEXT)
+am__objects_61 = $(am__objects_51) $(am__objects_52) $(am__objects_53) \
+ $(am__objects_54) $(am__objects_55) upmpost-pmpost.$(OBJEXT) \
+ $(am__objects_56) $(am__objects_57) $(am__objects_58) \
+ $(am__objects_59) $(am__objects_60) upmpost-ptfmin.$(OBJEXT)
+nodist_upmpost_OBJECTS = $(am__objects_61)
+upmpost_OBJECTS = $(nodist_upmpost_OBJECTS)
+am__DEPENDENCIES_14 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libmputil.a
+upmpost_DEPENDENCIES = $(am__DEPENDENCIES_14)
+am_uppltotf_OBJECTS =
+nodist_uppltotf_OBJECTS = uppltotf-uppltotf.$(OBJEXT)
+uppltotf_OBJECTS = $(am_uppltotf_OBJECTS) $(nodist_uppltotf_OBJECTS)
+am__dist_uptex_SOURCES_DIST = uptexdir/uptexextra.c \
+ uptexdir/uptexextra.h uptexdir/uptex_version.h \
+ synctexdir/synctex.c synctexdir/synctex.h \
+ synctexdir/synctex-common.h synctexdir/synctex-uptex.h
+@UPTEX_SYNCTEX_TRUE@am__objects_62 = \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/uptex-synctex.$(OBJEXT)
+dist_uptex_OBJECTS = uptexdir/uptex-uptexextra.$(OBJEXT) \
+ $(am__objects_62)
+am__objects_63 = uptex-uptexini.$(OBJEXT) uptex-uptex0.$(OBJEXT)
+nodist_uptex_OBJECTS = $(am__objects_63) uptex-uptex-pool.$(OBJEXT)
+uptex_OBJECTS = $(dist_uptex_OBJECTS) $(nodist_uptex_OBJECTS)
+@UPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_15 = $(am__DEPENDENCIES_1)
+am_uptftopl_OBJECTS =
+nodist_uptftopl_OBJECTS = uptftopl-uptftopl.$(OBJEXT)
+uptftopl_OBJECTS = $(am_uptftopl_OBJECTS) $(nodist_uptftopl_OBJECTS)
nodist_vftovp_OBJECTS = vftovp.$(OBJEXT)
vftovp_OBJECTS = $(nodist_vftovp_OBJECTS)
vftovp_LDADD = $(LDADD)
@@ -854,6 +1383,45 @@ nodist_weave_OBJECTS = weave.$(OBJEXT)
weave_OBJECTS = $(nodist_weave_OBJECTS)
weave_LDADD = $(LDADD)
weave_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
+nodist_wofm2opl_OBJECTS = ofm2opl.$(OBJEXT)
+wofm2opl_OBJECTS = $(nodist_wofm2opl_OBJECTS)
+wofm2opl_LDADD = $(LDADD)
+wofm2opl_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
+nodist_wopl2ofm_OBJECTS = opl2ofm.$(OBJEXT)
+wopl2ofm_OBJECTS = $(nodist_wopl2ofm_OBJECTS)
+wopl2ofm_LDADD = $(LDADD)
+wopl2ofm_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
+nodist_wovf2ovp_OBJECTS = ovf2ovp.$(OBJEXT)
+wovf2ovp_OBJECTS = $(nodist_wovf2ovp_OBJECTS)
+wovf2ovp_LDADD = $(LDADD)
+wovf2ovp_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
+nodist_wovp2ovf_OBJECTS = ovp2ovf.$(OBJEXT)
+wovp2ovf_OBJECTS = $(nodist_wovp2ovf_OBJECTS)
+wovp2ovf_LDADD = $(LDADD)
+wovp2ovf_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
+am__dist_xetex_SOURCES_DIST = xetexdir/xetexextra.c \
+ xetexdir/xetexextra.h xetexdir/etex_version.h \
+ xetexdir/xetex_version.h synctexdir/synctex.c \
+ synctexdir/synctex.h synctexdir/synctex-common.h \
+ synctexdir/synctex-xetex.h
+@XETEX_SYNCTEX_TRUE@am__objects_64 = \
+@XETEX_SYNCTEX_TRUE@ synctexdir/xetex-synctex.$(OBJEXT)
+dist_xetex_OBJECTS = xetexdir/xetex-xetexextra.$(OBJEXT) \
+ $(am__objects_64)
+am__objects_65 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
+nodist_xetex_OBJECTS = $(am__objects_65) xetex-xetex-pool.$(OBJEXT)
+xetex_OBJECTS = $(dist_xetex_OBJECTS) $(nodist_xetex_OBJECTS)
+@XETEX_MACOSX_FALSE@am__DEPENDENCIES_16 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_17 = $(libxetex) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_16)
+xetex_DEPENDENCIES = $(am__DEPENDENCIES_17) $(am__DEPENDENCIES_2) \
+ $(am__DEPENDENCIES_1)
+xetex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(xetex_CXXFLAGS) \
+ $(CXXFLAGS) $(xetex_LDFLAGS) $(LDFLAGS) -o $@
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -905,8 +1473,26 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
am__v_CXXLD_1 =
+OBJCXXCOMPILE = $(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS)
+LTOBJCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(OBJCXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS)
+AM_V_OBJCXX = $(am__v_OBJCXX_@AM_V@)
+am__v_OBJCXX_ = $(am__v_OBJCXX_@AM_DEFAULT_V@)
+am__v_OBJCXX_0 = @echo " OBJCXX " $@;
+am__v_OBJCXX_1 =
+OBJCXXLD = $(OBJCXX)
+OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@)
+am__v_OBJCXXLD_ = $(am__v_OBJCXXLD_@AM_DEFAULT_V@)
+am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@;
+am__v_OBJCXXLD_1 =
SOURCES = $(nodist_libff_a_SOURCES) $(nodist_libjitff_a_SOURCES) \
- $(nodist_libluajitmisc_a_SOURCES) \
+ $(libkanji_a_SOURCES) $(nodist_libluajitmisc_a_SOURCES) \
$(nodist_libluajitsocket_a_SOURCES) \
$(dist_libluajittex_a_SOURCES) \
$(nodist_libluajittex_a_SOURCES) \
@@ -914,12 +1500,20 @@ SOURCES = $(nodist_libff_a_SOURCES) $(nodist_libjitff_a_SOURCES) \
$(nodist_libluasocket_a_SOURCES) $(dist_libluatex_a_SOURCES) \
$(nodist_libluatex_a_SOURCES) $(libmd5_a_SOURCES) \
$(nodist_libmf_a_SOURCES) $(nodist_libmplib_a_SOURCES) \
- $(libmputil_a_SOURCES) $(libunilib_a_SOURCES) \
+ $(libmputil_a_SOURCES) $(libpdftex_a_SOURCES) \
+ $(EXTRA_libpdftex_a_SOURCES) $(nodist_libsynctex_a_SOURCES) \
+ $(libukanji_a_SOURCES) $(libunilib_a_SOURCES) \
+ $(libxetex_a_SOURCES) $(libsynctex_la_SOURCES) \
+ $(dist_aleph_SOURCES) $(nodist_aleph_SOURCES) \
$(nodist_bibtex_SOURCES) $(nodist_call_luajittex_SOURCES) \
$(nodist_call_luatex_SOURCES) $(nodist_call_mpost_SOURCES) \
+ $(nodist_call_pmpost_SOURCES) $(nodist_call_upmpost_SOURCES) \
$(nodist_ctangle_SOURCES) $(nodist_ctangleboot_SOURCES) \
$(nodist_ctie_SOURCES) $(nodist_cweave_SOURCES) \
$(nodist_dvicopy_SOURCES) $(nodist_dvitype_SOURCES) \
+ $(dist_eptex_SOURCES) $(nodist_eptex_SOURCES) \
+ $(dist_etex_SOURCES) $(nodist_etex_SOURCES) \
+ $(dist_euptex_SOURCES) $(nodist_euptex_SOURCES) \
$(gftodvi_SOURCES) $(nodist_gftodvi_SOURCES) \
$(nodist_gftopk_SOURCES) $(nodist_gftype_SOURCES) \
$(nodist_inimf_SOURCES) $(nodist_initex_SOURCES) \
@@ -927,19 +1521,50 @@ SOURCES = $(nodist_libff_a_SOURCES) $(nodist_libjitff_a_SOURCES) \
$(nodist_luatex_SOURCES) $(nodist_EXTRA_luatex_SOURCES) \
$(md5main_SOURCES) $(dist_mf_SOURCES) $(dist_mf_nowin_SOURCES) \
$(nodist_mft_SOURCES) $(nodist_mpost_SOURCES) \
- $(nodist_patgen_SOURCES) $(nodist_pktogf_SOURCES) \
+ $(nodist_odvicopy_SOURCES) $(nodist_odvitype_SOURCES) \
+ $(nodist_otangle_SOURCES) $(nodist_patgen_SOURCES) \
+ $(pbibtex_SOURCES) $(nodist_pbibtex_SOURCES) \
+ $(dist_pdftex_SOURCES) $(nodist_pdftex_SOURCES) \
+ $(nodist_EXTRA_pdftex_SOURCES) $(pdftosrc_SOURCES) \
+ $(nodist_EXTRA_pdftosrc_SOURCES) $(pdvitype_SOURCES) \
+ $(nodist_pdvitype_SOURCES) $(nodist_pktogf_SOURCES) \
$(nodist_pktype_SOURCES) $(nodist_pltotf_SOURCES) \
- $(nodist_pooltype_SOURCES) $(nodist_tangle_SOURCES) \
- $(nodist_tangleboot_SOURCES) $(dist_tex_SOURCES) \
- $(nodist_tex_SOURCES) $(nodist_tftopl_SOURCES) \
- $(nodist_tie_SOURCES) $(nodist_txt2zlib_SOURCES) \
+ $(nodist_pmpost_SOURCES) $(nodist_pooltype_SOURCES) \
+ $(ppltotf_SOURCES) $(nodist_ppltotf_SOURCES) \
+ $(dist_ptex_SOURCES) $(nodist_ptex_SOURCES) $(ptftopl_SOURCES) \
+ $(nodist_ptftopl_SOURCES) $(synctex_SOURCES) \
+ $(nodist_tangle_SOURCES) $(nodist_tangleboot_SOURCES) \
+ $(dist_tex_SOURCES) $(nodist_tex_SOURCES) \
+ $(nodist_tftopl_SOURCES) $(nodist_tie_SOURCES) \
+ $(ttf2afm_SOURCES) $(EXTRA_ttf2afm_SOURCES) \
+ $(nodist_txt2zlib_SOURCES) $(upbibtex_SOURCES) \
+ $(nodist_upbibtex_SOURCES) $(updvitype_SOURCES) \
+ $(nodist_updvitype_SOURCES) $(nodist_upmpost_SOURCES) \
+ $(uppltotf_SOURCES) $(nodist_uppltotf_SOURCES) \
+ $(dist_uptex_SOURCES) $(nodist_uptex_SOURCES) \
+ $(uptftopl_SOURCES) $(nodist_uptftopl_SOURCES) \
$(nodist_vftovp_SOURCES) $(nodist_vptovf_SOURCES) \
- $(nodist_weave_SOURCES)
-DIST_SOURCES = $(dist_libluajittex_a_SOURCES) \
+ $(nodist_weave_SOURCES) $(nodist_wofm2opl_SOURCES) \
+ $(nodist_wopl2ofm_SOURCES) $(nodist_wovf2ovp_SOURCES) \
+ $(nodist_wovp2ovf_SOURCES) $(dist_xetex_SOURCES) \
+ $(nodist_xetex_SOURCES) $(nodist_EXTRA_xetex_SOURCES)
+DIST_SOURCES = $(libkanji_a_SOURCES) $(dist_libluajittex_a_SOURCES) \
$(dist_libluatex_a_SOURCES) $(libmd5_a_SOURCES) \
- $(libmputil_a_SOURCES) $(libunilib_a_SOURCES) \
- $(gftodvi_SOURCES) $(md5main_SOURCES) $(dist_mf_SOURCES) \
- $(dist_mf_nowin_SOURCES) $(dist_tex_SOURCES)
+ $(libmputil_a_SOURCES) $(am__libpdftex_a_SOURCES_DIST) \
+ $(EXTRA_libpdftex_a_SOURCES) $(libukanji_a_SOURCES) \
+ $(libunilib_a_SOURCES) $(am__libxetex_a_SOURCES_DIST) \
+ $(libsynctex_la_SOURCES) $(dist_aleph_SOURCES) \
+ $(am__dist_eptex_SOURCES_DIST) $(am__dist_etex_SOURCES_DIST) \
+ $(am__dist_euptex_SOURCES_DIST) $(gftodvi_SOURCES) \
+ $(md5main_SOURCES) $(dist_mf_SOURCES) $(dist_mf_nowin_SOURCES) \
+ $(pbibtex_SOURCES) $(am__dist_pdftex_SOURCES_DIST) \
+ $(pdftosrc_SOURCES) $(pdvitype_SOURCES) $(ppltotf_SOURCES) \
+ $(am__dist_ptex_SOURCES_DIST) $(ptftopl_SOURCES) \
+ $(synctex_SOURCES) $(am__dist_tex_SOURCES_DIST) \
+ $(ttf2afm_SOURCES) $(EXTRA_ttf2afm_SOURCES) \
+ $(upbibtex_SOURCES) $(updvitype_SOURCES) $(uppltotf_SOURCES) \
+ $(am__dist_uptex_SOURCES_DIST) $(uptftopl_SOURCES) \
+ $(am__dist_xetex_SOURCES_DIST)
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
ctags-recursive dvi-recursive html-recursive info-recursive \
install-data-recursive install-dvi-recursive \
@@ -953,6 +1578,14 @@ am__can_run_installinfo = \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
+man1dir = $(mandir)/man1
+man5dir = $(mandir)/man5
+NROFF = nroff
+MANS = $(dist_man_MANS) $(nodist_man_MANS)
+DATA = $(pkgconfig_DATA)
+am__syncinclude_HEADERS_DIST = synctexdir/synctex_parser.h \
+ synctexdir/synctex_parser_utils.h
+HEADERS = $(syncinclude_HEADERS)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
am__recursive_targets = \
@@ -1004,33 +1637,6 @@ am__tty_colors = { \
std='[m'; \
fi; \
}
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
am__recheck_rx = ^[ ]*:recheck:[ ]*
am__global_test_result_rx = ^[ ]*:global-test-result:[ ]*
am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]*
@@ -1165,13 +1771,13 @@ am__set_TESTS_bases = \
bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
bases=`echo $$bases`
RECHECK_LOGS = $(TEST_LOGS)
-am__EXEEXT_19 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
+am__EXEEXT_43 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
gftopk.test gftype.test mft.test patgen.test pktogf.test \
pktype.test pltotf.test pooltype.test tftopl.test vftovp.test \
vptovf.test weave.test
-am__EXEEXT_20 = $(am__EXEEXT_19) tests/bibtex-openout-test.pl \
+am__EXEEXT_44 = $(am__EXEEXT_43) tests/bibtex-openout-test.pl \
tests/bibtex-longline-test.pl tests/bibtex-mem.test
-@WEB_TRUE@am__EXEEXT_21 = $(am__EXEEXT_20)
+@WEB_TRUE@am__EXEEXT_45 = $(am__EXEEXT_44)
TEST_SUITE_LOG = test-suite.log
TEST_EXTENSIONS = @EXEEXT@ .test
LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver
@@ -1364,6 +1970,8 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+SYNCTEXVERSION = @SYNCTEXVERSION@
+SYNCTEX_LT_VERSINFO = @SYNCTEX_LT_VERSINFO@
TANGLE = @TANGLE@
TANGLEBOOT = @TANGLEBOOT@
TECKIT_DEPEND = @TECKIT_DEPEND@
@@ -1371,6 +1979,7 @@ TECKIT_INCLUDES = @TECKIT_INCLUDES@
TECKIT_LIBS = @TECKIT_LIBS@
TIE = @TIE@
VERSION = @VERSION@
+WANTEDLIBS = @WANTEDLIBS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WARNING_OBJCXXFLAGS = @WARNING_OBJCXXFLAGS@
@@ -1458,11 +2067,12 @@ AM_OBJCXXFLAGS = ## $(WARNING_OBJCXXFLAGS)
version = $(WEB2CVERSION)
SUBDIRS = doc lib man web2c . window omegafonts otps
proglib = lib/lib.a
-dist_man_MANS =
+dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
nodist_man_MANS =
-EXTRA_LIBRARIES = libmf.a libmputil.a libmplib.a libluasocket.a \
- libluajitsocket.a libluamisc.a libluajitmisc.a libunilib.a \
- libff.a libjitff.a libluatex.a libluajittex.a libmd5.a
+EXTRA_LIBRARIES = libmf.a libmputil.a libmplib.a libkanji.a \
+ libukanji.a libpdftex.a libluasocket.a libluajitsocket.a \
+ libluamisc.a libluajitmisc.a libunilib.a libff.a libjitff.a \
+ libluatex.a libluajittex.a libxetex.a libsynctex.a libmd5.a
EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
triptrap-sh tangle.web tangle.ch tangleboot.pin cwebdir \
ctangleboot.cin cwebboot.cin cwebboot.hin tangle.test \
@@ -1506,7 +2116,58 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
triptrap/trip.tex triptrap/trip.typ triptrap/trip1.in \
triptrap/trip2.in triptrap/tripin.log triptrap/tripman.tex \
triptrap/tripos.tex triptrap/writeo triptrap/writeo.2 \
- mplibdir/ChangeLog $(mpost_web) $(mp_tests) $(libmplib_web) \
+ mplibdir/ChangeLog $(mpost_web) $(mp_tests) \
+ pmpostdir/ChangeLog $(pmpost_web) $(pmpost_tests) \
+ $(upmpost_tests) pmpostdir/tests/psample.mp $(libmplib_web) \
+ $(etex_web_srcs) $(etex_ch_srcs) etexdir/ChangeLog \
+ etexdir/etex_gen.tex $(etex_tests) tests/wprob.tex \
+ etexdir/etrip/etrip.diffs etexdir/etrip/etrip.fot \
+ etexdir/etrip/etrip.log etexdir/etrip/etrip.out \
+ etexdir/etrip/etrip.pl etexdir/etrip/etrip.tex \
+ etexdir/etrip/etrip.typ etexdir/etrip/etrip1.in \
+ etexdir/etrip/etrip2.in etexdir/etrip/etrip3.in \
+ etexdir/etrip/etripin.log etexdir/etrip/etripman.tex \
+ etexdir/etrip/texmf.cnf etexdir/etrip/trip2.in $(ptex_tests) \
+ $(pweb_tests) $(ptex_web_srcs) $(ptex_ch_srcs) \
+ ptexdir/ptex.defines ptexdir/pbibtex.ch web2c/cvtbib.sed \
+ ptexdir/pdvitype.ch ptexdir/ppltotf.ch ptexdir/ptftopl.ch \
+ ptexdir/COPYRIGHT ptexdir/COPYRIGHT.jis ptexdir/ChangeLog \
+ ptexdir/Changes.txt ptexdir/INSTALL.txt ptexdir/README.txt \
+ ptexdir/tests/nissya_bib.aux ptexdir/tests/nissya.bst \
+ ptexdir/tests/sample.bib tests/memdata1.bst tests/memdata2.bst \
+ tests/memdata3.bst ptexdir/tests/goth10.tfm \
+ ptexdir/tests/sample.dvi ptexdir/tests/min10.pl \
+ ptexdir/tests/min10.tfm ptexdir/tests/tmin10.pl \
+ ptexdir/tests/tmin10.tfm ptexdir/ptrip/ptrip.diffs \
+ ptexdir/ptrip/texmf.cnf $(eptex_tests) $(eptex_web_srcs) \
+ $(eptex_ch_srcs) eptexdir/eptex.defines eptexdir/ChangeLog \
+ eptexdir/Changes.txt eptexdir/README.txt \
+ eptexdir/eptrip/eptrip.diffs eptexdir/eptrip/eptrip.log \
+ eptexdir/eptrip/eptrip.tex eptexdir/eptrip/texmf.cnf \
+ $(uptex_tests) $(upweb_tests) $(uptex_web_srcs) \
+ $(uptex_ch_srcs) uptexdir/uptex.defines ptexdir/pbibtex.ch \
+ uptexdir/upbibtex.ch ptexdir/pdvitype.ch uptexdir/updvitype.ch \
+ ptexdir/ppltotf.ch uptexdir/uppltotf.ch ptexdir/ptftopl.ch \
+ uptexdir/uptftopl.ch uptexdir/COPYRIGHT uptexdir/COPYRIGHT.jis \
+ uptexdir/ChangeLog uptexdir/tests/min10.pl \
+ uptexdir/tests/min10.tfm uptexdir/tests/tmin10.pl \
+ uptexdir/tests/tmin10.tfm uptexdir/uptrip/uptrip.diffs \
+ uptexdir/uptrip/texmf.cnf $(euptex_tests) $(euptex_web_srcs) \
+ $(euptex_ch_srcs) euptexdir/euptex.defines euptexdir/COPYRIGHT \
+ euptexdir/COPYRIGHT.jis euptexdir/ChangeLog \
+ euptexdir/EUPTEX.txt eptexdir/eptrip/eptrip.log \
+ eptexdir/eptrip/eptrip.tex euptexdir/euptrip/euptrip.diffs \
+ euptexdir/euptrip/texmf.cnf pdftexdir/regex/COPYING.LIB \
+ pdftexdir/regex/README $(pdftex_ch_srcs) \
+ pdftexdir/pdftex.defines pdftexdir/ChangeLog pdftexdir/NEWS \
+ pdftexdir/README pdftexdir/change-files.txt $(pdftex_tests) \
+ tests/wprob.tex pdftexdir/tests/pdfimage.tex tests/1-4.jpg \
+ tests/B.pdf tests/basic.tex tests/lily-ledger-broken.png \
+ $(ttf2afm_tests) pdftexdir/tests/postV3.afm \
+ pdftexdir/tests/postV3.ttf pdftexdir/tests/postV7.afm \
+ pdftexdir/tests/postV7.ttf $(pdftosrc_tests) \
+ pdftexdir/tests/test-13.pdf pdftexdir/tests/test-13.xref \
+ pdftexdir/tests/test-15.pdf pdftexdir/tests/test-15.xref \
$(libluasocket_sources) luatexdir/luasocket/src/ftp_lua.c \
luatexdir/luasocket/src/headers_lua.c \
luatexdir/luasocket/src/http_lua.c \
@@ -1601,7 +2262,71 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
luatexdir/getluatexsvnversion.sh $(luatex_tests) \
$(luajittex_tests) luatexdir/tests/luaimage.tex tests/1-4.jpg \
tests/B.pdf tests/basic.tex tests/lily-ledger-broken.png \
- libmd5/md5.test
+ $(xetex_web_srcs) $(xetex_ch_srcs) xetexdir/xetex.defines \
+ xetexdir/ChangeLog xetexdir/COPYING xetexdir/NEWS \
+ xetexdir/image/README xetexdir/unicode-char-prep.pl \
+ xetexdir/xewebmac.tex $(xetex_tests) xetexdir/tests/bug73.log \
+ xetexdir/tests/bug73.tex omegaware/README omegaware/ChangeLog \
+ $(odvicopy_sources) $(odvitype_sources) omegaware/ofm2opl.web \
+ omegaware/ofm2opl.up omegaware/ofm2opl.ch \
+ omegaware/opl2ofm.web omegaware/opl2ofm.up \
+ omegaware/opl2ofm.ch $(otangle_sources) omegaware/ovf2ovp.web \
+ 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 \
+ synctexdir/synctex_parser_version.txt synctexdir/tests \
+ synctexdir/synctex-common.h synctexdir/synctex.c \
+ synctexdir/synctex.defines synctexdir/synctex.h \
+ synctexdir/synctex-def.ch0 synctexdir/synctex-mem.ch0 \
+ synctexdir/synctex-mem.ch2 synctexdir/synctex-rec.ch0 \
+ synctexdir/synctex-rec.ch1 synctexdir/synctex-rec.ch2 \
+ synctexdir/synctex-e-mem.ch0 synctexdir/synctex-e-mem.ch1 \
+ synctexdir/synctex-e-rec.ch0 synctexdir/synctex-p-mem.ch0 \
+ synctexdir/synctex-p-mem.ch1 synctexdir/synctex-p-rec.ch0 \
+ synctexdir/synctex-p-rec.ch1 synctexdir/synctex-ep-mem.ch0 \
+ synctexdir/synctex-ep-mem.ch1 synctexdir/synctex-pdf-rec.ch2 \
+ synctexdir/synctex-xe-rec.ch3 $(synctex_tests) libmd5/md5.test
DISTCLEANFILES = $(EXTRA_LIBRARIES) CXXLD.sh tangle.c tangle.h \
tangle.p tangle-web2c tangleboot.c tangleboot.h tangleboot.p \
tangleboot-web2c ctangle.c cweb.c cweb.h common-ctangle \
@@ -1623,19 +2348,72 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) CXXLD.sh tangle.c tangle.h \
$(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 \
+ ptests/xexampl.bbl ptests/xexampl.blg ptests/memtest.bib \
+ ptests/memtest?.* ptests/xstory.dvityp ptests/xpagenum.typ \
+ ptests/xcmr10.tfm ptests/xcmr10.pl ptests/xsample.typ \
+ ptests/x*min10.* ptrip.diffs $(nodist_eptex_SOURCES) eptex.web \
+ eptex.ch eptex-web2c eptex.p eptex.pool eptex-tangle \
+ eptrip.diffs $(upweb_programs:=.c) $(upweb_programs:=.h) \
+ $(upweb_programs:=.p) $(upweb_programs:=-web2c) \
+ $(upweb_programs:=.web) $(nodist_uptex_SOURCES) uptex.web \
+ uptex.ch uptex-web2c uptex.p uptex.pool uptex-tangle \
+ uptests/xexampl.aux uptests/xexampl.bbl uptests/xexampl.blg \
+ uptests/xstory.dvityp uptests/xpagenum.typ uptests/xcmr10.tfm \
+ uptests/xcmr10.pl uptests/x*min10.* uptrip.diffs \
+ $(nodist_euptex_SOURCES) euptex.web euptex.ch euptex-web2c \
+ euptex.p euptex.pool euptex-tangle euptrip.diffs \
+ $(nodist_pdftex_SOURCES) pdftex.ch pdftex-web2c pdftex.p \
+ pdftex.pool pdftex-tangle pwprob.log pwprob.tex pdfimage.fmt \
+ pdfimage.log pdfimage.pdf postV3.afm postV7.afm test-13.pdf \
+ test-13.xref test-15.pdf test-15.xref \
$(nodist_libluatex_sources) luaimage.* luajitimage.* \
- txt2zlib.c
+ txt2zlib.c $(nodist_xetex_SOURCES) xetex.web xetex.ch \
+ xetex-web2c xetex.p xetex.pool xetex-tangle bug73.fmt \
+ 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
CLEANFILES =
-TRIPTRAP_CLEAN = $(am__append_9) $(am__append_17) $(am__append_26)
-TRIPTRAP = $(am__append_8) $(am__append_16) $(am__append_25)
+TRIPTRAP_CLEAN = $(am__append_9) $(am__append_17) $(am__append_26) \
+ $(am__append_43) $(am__append_49) $(am__append_55) \
+ $(am__append_61) $(am__append_67)
+TRIPTRAP = $(am__append_8) $(am__append_16) $(am__append_25) \
+ $(am__append_42) $(am__append_48) $(am__append_54) \
+ $(am__append_60) $(am__append_66)
bin_links = $(am__append_5) $(am__append_13) $(am__append_22) \
- $(am__append_31) $(am__append_36)
-install_exe_links = $(am__append_20) $(am__append_29) $(am__append_34)
+ $(am__append_31) $(am__append_36) $(am__append_75) \
+ $(am__append_80)
+install_exe_links = $(am__append_20) $(am__append_29) $(am__append_34) \
+ $(am__append_73) $(am__append_78)
uninstall_exe_links = $(am__append_21) $(am__append_30) \
- $(am__append_35)
+ $(am__append_35) $(am__append_74) $(am__append_79)
NEVER_DIST = `find . -name .svn` cwebdir/cweave.log cwebdir/cweave.trs \
ctiedir/ctie.log ctiedir/ctie.trs tiedir/tie.log \
tiedir/tie.trs
@@ -1738,18 +2516,18 @@ tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C
initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
nodist_initex_SOURCES = callexe.c
initex_LDADD =
-tex_CPPFLAGS = $(AM_CPPFLAGS)
+tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_97)
# With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs)
+tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_98)
# TeX C sources
tex_c_h = texini.c tex0.c texcoerce.h texd.h
nodist_tex_SOURCES = $(tex_c_h) tex-pool.c
-dist_tex_SOURCES = texextra.c
+dist_tex_SOURCES = texextra.c $(am__append_100)
# We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h
+tex_prereq = texd.h $(am__append_99)
tex_ch_srcs = \
tex.web \
tex.ch \
@@ -1809,6 +2587,53 @@ nodist_mpost_SOURCES = mpost.c $(mpxout_c_h)
mpxout_c_h = mpxout.c mpxout.h
mpost_web = mplibdir/mpost.w mplibdir/mpxout.w
mp_tests = mplibdir/dvitomp.test mplibdir/mptraptest
+call_pmpost_CPPFLAGS = -DEXEPROG=\"pmpost.exe\"
+nodist_call_pmpost_SOURCES = callexe.c
+call_pmpost_LDADD =
+call_upmpost_CPPFLAGS = -DEXEPROG=\"upmpost.exe\"
+nodist_call_upmpost_SOURCES = callexe.c
+call_upmpost_LDADD =
+pmpost_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_INCLUDES) $(CAIRO_INCLUDES) $(PIXMAN_INCLUDES) \
+ $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
+
+pmpost_LDADD = $(PTEXENC_LIBS) $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \
+ $(CAIRO_LIBS) $(PIXMAN_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) libmputil.a
+
+upmpost_CPPFLAGS = -DUPMP $(pmpost_CPPFLAGS)
+upmpost_LDADD = $(pmpost_LDADD)
+
+# Creating one file: just one rule
+pmp_ctangle = $(ctangle_silent)CWEBINPUTS=.:$(srcdir)/pmpostdir $(ctangle)
+# Creating several files: need stamp file and two rules with identical recipes
+pmp_ctangle_sh = CWEBINPUTS=.:$(srcdir)/pmpostdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(CTANGLE)
+nodist_pmpost_SOURCES = $(pmp_c_h) $(pmpmath_c_h) $(pmpmathbinary_c_h) $(pmpmathdecimal_c_h) \
+ $(pmpmathdouble_c_h) pmpost.c $(pmpstrings_c_h) $(pmpxout_c_h) \
+ $(ppngout_c_h) $(ppsout_c_h) $(psvgout_c_h) ptfmin.c
+
+pmp_c_h = pmp.c pmplib.h pmpmp.h
+pmpmath_c_h = pmpmath.c pmpmath.h
+pmpmathbinary_c_h = pmpmathbinary.c pmpmathbinary.h
+pmpmathdecimal_c_h = pmpmathdecimal.c pmpmathdecimal.h
+pmpmathdouble_c_h = pmpmathdouble.c pmpmathdouble.h
+pmpstrings_c_h = pmpstrings.h pmpstrings.c
+pmpxout_c_h = pmpxout.c pmpxout.h
+ppngout_c_h = pmplibpng.h pmppngout.h ppngout.c
+ppsout_c_h = pmppsout.h ppsout.c pmplibps.h
+psvgout_c_h = pmplibsvg.h pmpsvgout.h psvgout.c
+nodist_upmpost_SOURCES = $(nodist_pmpost_SOURCES)
+
+# sed script
+pmp_sed_main = 's/mpxout\.h/pmpxout.h/;s/mpmp\.h/pmpmp.h/;s/mplib\.h/pmplib.h/;s/mpstrings\.h/pmpstrings.h/'
+pmp_sed_math = 's/mpmath\([a-z]*\)\.h/pmpmath\1.h/'
+pmp_sed_ps = 's/mplibps\.h/pmplibps.h/;s/mppsout\.h/pmppsout.h/'
+pmp_sed_svg = 's/mplibsvg\.h/pmplibsvg.h/;s/mpsvgout\.h/pmpsvgout.h/'
+pmp_sed_png = 's/mplibpng\.h/pmplibpng.h/;s/mppngout\.h/pmppngout.h/'
+pmp_sed = sed -e $(pmp_sed_main) -e $(pmp_sed_math) -e $(pmp_sed_ps) -e $(pmp_sed_svg) -e $(pmp_sed_png)
+pmpost_web = pmpostdir/pmp.ch pmpostdir/pmpost.ch pmpostdir/pmpxout.ch pmpostdir/ppsout.ch \
+ pmpostdir/psvgout.ch pmpostdir/ptfmin.ch
+
+pmpost_tests = pmpostdir/pmpost.test pmpostdir/pmpsamp.test
+upmpost_tests = pmpostdir/upmpost.test pmpostdir/upmpsamp.test
libmputil_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
libmputil_a_SOURCES = mplibdir/avl.h mplibdir/avl.c mplibdir/decNumber.c mplibdir/decNumber.h \
mplibdir/decNumberLocal.h mplibdir/decContext.h mplibdir/decContext.c
@@ -1832,6 +2657,305 @@ libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \
mplibdir/pngout.w mplibdir/mpmath.w mplibdir/mpmathbinary.w \
mplibdir/mpmathdecimal.w mplibdir/mpmathdouble.w \
mplibdir/mpstrings.w mplibdir/tfmin.w
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_101)
+
+# With --enable-ipc, e-TeX may need to link with -lsocket.
+etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_102)
+
+# e-TeX C sources
+etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
+nodist_etex_SOURCES = $(etex_c_h) etex-pool.c
+dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \
+ etexdir/etex_version.h $(am__append_104)
+
+# We must create etexd.h and etexdir/etex_version.h before building the etex_OBJECTS.
+etex_prereq = etexd.h etexdir/etex_version.h $(am__append_103)
+etex_web_srcs = \
+ tex.web \
+ etexdir/etex.ch
+
+etex_ch_srcs = \
+ etexdir/tex.ch0 \
+ tex.ch \
+ enctex.ch \
+ $(etex_ch_synctex) \
+ etexdir/tex.ch1 \
+ etexdir/tex.ech \
+ tex-binpool.ch
+
+
+# e-TeX Tests
+#
+etex_tests = etexdir/wprob.test etexdir/etriptest
+ptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
+ptex_ldadd = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD)
+ptex_dependencies = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies)
+p_tangle = $(tangle_silent)WEBINPUTS=.:$(srcdir)/ptexdir:$(srcdir) $(buildenv) $(TANGLE)
+pweb_programs = pbibtex pdvitype ppltotf ptftopl
+
+# pTeX Tests
+#
+ptex_tests = ptexdir/ptriptest
+pweb_tests = ptexdir/pbibtex.test ptexdir/pdvitype.test \
+ ptexdir/ppltotf.test ptexdir/ptftopl.test \
+ ptexdir/pbibtex-openout-test.pl \
+ ptexdir/pbibtex-longline-test.pl ptexdir/pbibtex-mem.test \
+ ptexdir/nissya.test ptexdir/sample.test ptexdir/yokotate.test
+pproglib = lib/libp.a
+libkanji_a_SOURCES = ptexdir/kanji.c ptexdir/kanji.h
+libkanji_a_CPPFLAGS = $(ptex_cppflags)
+ptex_CPPFLAGS = $(ptex_cppflags) $(am__append_105)
+
+# With --enable-ipc, pTeX may need to link with -lsocket.
+ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs) $(am__append_106)
+ptex_DEPENDENCIES = $(ptex_dependencies)
+
+# pTeX C sources
+ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h
+nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c
+dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h \
+ ptexdir/ptex_version.h $(am__append_108)
+
+# We must create ptexd.h and ptexdir/ptex_version.h before building the ptex_OBJECTS.
+ptex_prereq = ptexd.h ptexdir/ptex_version.h $(am__append_107)
+ptex_web_srcs = \
+ tex.web \
+ tex.ch
+
+ptex_ch_srcs = \
+ ptexdir/ptex-base.ch \
+ $(ptex_ch_synctex) \
+ tex-binpool.ch
+
+nodist_pbibtex_SOURCES = pbibtex.c pbibtex.h
+pbibtex_SOURCES = ptexdir/kanji.h
+pbibtex_CPPFLAGS = $(ptex_cppflags)
+pbibtex_LDADD = $(ptex_ldadd)
+pbibtex_DEPENDENCIES = $(ptex_dependencies)
+nodist_pdvitype_SOURCES = pdvitype.c pdvitype.h
+pdvitype_SOURCES = ptexdir/kanji.h
+pdvitype_CPPFLAGS = $(ptex_cppflags) -DHEX_CHAR_CODE
+pdvitype_LDADD = $(ptex_ldadd)
+pdvitype_DEPENDENCIES = $(ptex_dependencies)
+nodist_ppltotf_SOURCES = ppltotf.c ppltotf.h
+ppltotf_SOURCES = ptexdir/kanji.h
+ppltotf_CPPFLAGS = $(ptex_cppflags) -DPRESERVE_PUTC
+ppltotf_LDADD = $(ptex_ldadd)
+ppltotf_DEPENDENCIES = $(ptex_dependencies)
+nodist_ptftopl_SOURCES = ptftopl.c ptftopl.h
+ptftopl_SOURCES = ptexdir/kanji.h
+ptftopl_CPPFLAGS = $(ptex_cppflags)
+ptftopl_LDADD = $(ptex_ldadd)
+ptftopl_DEPENDENCIES = $(ptex_dependencies)
+
+# e-pTeX Tests
+#
+eptex_tests = eptexdir/eptriptest
+eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_113)
+
+# With --enable-ipc, e-pTeX may need to link with -lsocket.
+eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
+ $(ipc_socketlibs) $(am__append_114)
+eptex_DEPENDENCIES = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies)
+
+# e-pTeX C sources
+eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h
+nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c
+dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h \
+ eptexdir/eptex_version.h $(am__append_116)
+
+# We must create eptexd.h and eptexdir/eptex_version.h before building the eptex_OBJECTS.
+eptex_prereq = eptexd.h etexdir/etex_version.h ptexdir/ptex_version.h \
+ eptexdir/eptex_version.h $(am__append_115)
+eptex_web_srcs = \
+ tex.web \
+ etexdir/etex.ch \
+ etexdir/tex.ch0 \
+ tex.ch \
+ etexdir/tex.ech
+
+eptex_ch_srcs = \
+ eptexdir/eptex-base.ch \
+ eptexdir/etex.ch0 \
+ ptexdir/ptex-base.ch \
+ eptexdir/eptex.ech \
+ eptexdir/etex.ch1 \
+ $(eptex_ch_synctex) \
+ eptexdir/fam256.ch \
+ eptexdir/pdfutils.ch \
+ tex-binpool.ch
+
+uptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
+uptex_ldadd = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD)
+uptex_dependencies = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies)
+up_tangle = $(tangle_silent)WEBINPUTS=.:$(srcdir)/uptexdir:$(srcdir) $(buildenv) $(TANGLE)
+upweb_programs = upbibtex updvitype uppltotf uptftopl
+
+# upTeX Tests
+uptex_tests = uptexdir/uptriptest
+upweb_tests = uptexdir/upbibtex.test uptexdir/updvitype.test \
+ uptexdir/uppltotf.test uptexdir/uptftopl.test \
+ uptexdir/yokotate.test
+libukanji_a_SOURCES = uptexdir/kanji.c uptexdir/kanji.h uptexdir/kanji_dump.c
+libukanji_a_CPPFLAGS = $(uptex_cppflags)
+uptex_CPPFLAGS = $(uptex_cppflags) $(am__append_109)
+
+# With --enable-ipc, upTeX may need to link with -lsocket.
+uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs) $(am__append_110)
+uptex_DEPENDENCIES = $(uptex_dependencies)
+
+# upTeX C sources
+uptex_c_h = uptexini.c uptex0.c uptexcoerce.h uptexd.h
+nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c
+dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h \
+ uptexdir/uptex_version.h $(am__append_112)
+
+# We must create uptexd.h and uptexdir/uptex_version.h before building the uptex_OBJECTS.
+uptex_prereq = uptexd.h ptexdir/ptex_version.h \
+ uptexdir/uptex_version.h $(am__append_111)
+uptex_web_srcs = \
+ tex.web \
+ tex.ch
+
+uptex_ch_srcs = \
+ ptexdir/ptex-base.ch \
+ uptexdir/uptex-m.ch \
+ $(uptex_ch_synctex) \
+ tex-binpool.ch
+
+nodist_upbibtex_SOURCES = upbibtex.c upbibtex.h
+upbibtex_SOURCES = uptexdir/kanji.h
+upbibtex_CPPFLAGS = $(uptex_cppflags)
+upbibtex_LDADD = $(uptex_ldadd)
+upbibtex_DEPENDENCIES = $(uptex_dependencies)
+nodist_updvitype_SOURCES = updvitype.c updvitype.h
+updvitype_SOURCES = uptexdir/kanji.h
+updvitype_CPPFLAGS = $(uptex_cppflags) -DHEX_CHAR_CODE
+updvitype_LDADD = $(uptex_ldadd)
+updvitype_DEPENDENCIES = $(uptex_dependencies)
+nodist_uppltotf_SOURCES = uppltotf.c uppltotf.h
+uppltotf_SOURCES = uptexdir/kanji.h
+uppltotf_CPPFLAGS = $(uptex_cppflags) -DPRESERVE_PUTC
+uppltotf_LDADD = $(uptex_ldadd)
+uppltotf_DEPENDENCIES = $(uptex_dependencies)
+nodist_uptftopl_SOURCES = uptftopl.c uptftopl.h
+uptftopl_SOURCES = uptexdir/kanji.h
+uptftopl_CPPFLAGS = $(uptex_cppflags)
+uptftopl_LDADD = $(uptex_ldadd)
+uptftopl_DEPENDENCIES = $(uptex_dependencies)
+
+# e-upTeX Tests
+#
+euptex_tests = euptexdir/euptriptest
+euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(am__append_117)
+
+# With --enable-ipc, e-upTeX may need to link with -lsocket.
+euptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
+ $(ipc_socketlibs) $(am__append_118)
+euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies)
+
+# e-upTeX C sources
+euptex_c_h = euptexini.c euptex0.c euptexcoerce.h euptexd.h
+nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c
+dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h \
+ $(am__append_120)
+
+# We must create euptexd.h and [eu]ptexdir/[eu]ptex_version.h before building the euptex_OBJECTS.
+euptex_prereq = euptexd.h etexdir/etex_version.h \
+ ptexdir/ptex_version.h eptexdir/eptex_version.h \
+ uptexdir/uptex_version.h $(am__append_119)
+euptex_web_srcs = \
+ tex.web \
+ etexdir/etex.ch \
+ etexdir/tex.ch0 \
+ tex.ch \
+ etexdir/tex.ech
+
+euptex_ch_srcs = \
+ eptexdir/etex.ch0 \
+ ptexdir/ptex-base.ch \
+ uptexdir/uptex-m.ch \
+ euptexdir/euptex.ch0 \
+ eptexdir/eptex.ech \
+ euptexdir/euptex.ch1 \
+ eptexdir/etex.ch1 \
+ $(euptex_ch_synctex) \
+ eptexdir/fam256.ch \
+ euptexdir/pdfstrcmp-eup-pre.ch \
+ eptexdir/pdfutils.ch \
+ euptexdir/pdfstrcmp-eup-post.ch \
+ tex-binpool.ch
+
+libpdftex_a_CPPFLAGS = $(REGEX_INCLUDES) $(pdftex_cppflags)
+libpdftex_a_CXXFLAGS = # $(WARNING_CXXFLAGS)
+libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \
+ pdftexdir/avlstuff.c pdftexdir/avlstuff.h pdftexdir/epdf.c \
+ pdftexdir/image.h pdftexdir/mapfile.c pdftexdir/pdftex.h \
+ pdftexdir/pdftex-common.h pdftexdir/pdftoepdf.cc \
+ pdftexdir/pkin.c pdftexdir/ptexlib.h pdftexdir/ptexmac.h \
+ pdftexdir/subfont.c pdftexdir/tounicode.c pdftexdir/utils.c \
+ pdftexdir/vfpacket.c pdftexdir/writeenc.c \
+ pdftexdir/writefont.c pdftexdir/writeimg.c \
+ pdftexdir/writejbig2.c pdftexdir/writejpg.c \
+ pdftexdir/writepng.c pdftexdir/writet1.c pdftexdir/writet3.c \
+ pdftexdir/writettf.c pdftexdir/writettf.h pdftexdir/writezip.c \
+ $(am__append_68)
+@MINGW32_TRUE@REGEX_INCLUDES = -I$(srcdir)/pdftexdir/regex
+EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c \
+ pdftexdir/regex/regcomp.c pdftexdir/regex/regex_internal.c \
+ pdftexdir/regex/regex_internal.h pdftexdir/regex/regexec.c
+pdftex_cppflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) \
+ $(XPDF_INCLUDES) -I$(srcdir)/libmd5 -I$(srcdir)/pdftexdir
+
+# used for both pdftex and pdftosrc.
+pdftex_ldadd = $(LIBPNG_LIBS) $(ZLIB_LIBS) $(XPDF_LIBS) libmd5.a
+pdftex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) \
+ $(ZLIB_DEPEND) $(XPDF_DEPEND) libmd5.a
+
+# Force Automake to use CXXLD for linking
+nodist_EXTRA_pdftex_SOURCES = dummy.cxx
+pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(TANGLE)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_121)
+pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
+
+# With --enable-ipc, pdfTeX may need to link with -lsocket.
+pdftex_LDADD = libpdftex.a $(pdftex_ldadd) $(LDADD) $(ipc_socketlibs)
+pdftex_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a
+
+# We must create libpdftex.a etc before building the pdftex_OBJECTS.
+pdftex_prereq = libpdftex.a pdftexdir/etex_version.h pdftexdir/pdftex_version.h
+pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h
+nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c
+dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
+ pdftexdir/pdftex_version.h pdftexdir/etex_version.h \
+ $(am__append_122)
+pdftex_ch_srcs = \
+ pdftexdir/pdftex.web \
+ pdftexdir/tex.ch0 \
+ tex.ch \
+ enctex.ch \
+ $(pdftex_ch_synctex) \
+ pdftexdir/pdftex.ch \
+ tex-binpool.ch
+
+
+# pdfTeX Tests
+#
+pdftex_tests = pdftexdir/wprob.test pdftexdir/pdftex.test pdftexdir/pdfimage.test
+ttf2afm_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/pdftexdir
+ttf2afm_SOURCES = pdftexdir/ttf2afm.c
+ttf2afm_DEPENDENCIES = $(default_dependencies)
+EXTRA_ttf2afm_SOURCES = pdftexdir/macnames.c
+ttf2afm_tests = pdftexdir/ttf2afm.test
+
+# Force Automake to use CXXLD for linking
+nodist_EXTRA_pdftosrc_SOURCES = dummy.cxx
+pdftosrc_CPPFLAGS = $(pdftex_cppflags)
+pdftosrc_CXXFLAGS = # $(WARNING_CXXFLAGS)
+pdftosrc_SOURCES = pdftexdir/pdftosrc.cc
+pdftosrc_LDADD = $(pdftex_ldadd) $(LDADD)
+pdftosrc_DEPENDENCIES = $(pdftex_dependencies)
+pdftosrc_tests = pdftexdir/pdftosrc.test
libluasocket_a_DEPENDENCIES = $(ZLIB_DEPEND)
libluajitsocket_a_DEPENDENCIES = $(ZLIB_DEPEND)
libluasocket_a_CPPFLAGS = \
@@ -2230,6 +3354,274 @@ nodist_txt2zlib_SOURCES = txt2zlib.c
txt2zlib_CPPFLAGS = $(ZLIB_INCLUDES)
txt2zlib_DEPENDENCIES = $(ZLIB_DEPEND)
txt2zlib_LDADD = $(ZLIB_LIBS)
+
+# Force Automake to use CXXLD for linking
+nodist_EXTRA_xetex_SOURCES = dummy.cxx
+xe_tangle = WEBINPUTS=.:$(srcdir)/xetexdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(OTANGLE)
+libxetex = libxetex.a
+xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \
+ $(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(HARFBUZZ_INCLUDES) \
+ $(GRAPHITE2_INCLUDES) $(POPPLER_INCLUDES) $(LIBPNG_INCLUDES) \
+ $(ZLIB_INCLUDES) $(am__append_85) $(am__append_86)
+xetex_ldadd = $(libxetex) $(HARFBUZZ_LIBS) $(GRAPHITE2_LIBS) \
+ $(ICU_LIBS) $(TECKIT_LIBS) $(POPPLER_LIBS) $(LIBPNG_LIBS) \
+ $(FREETYPE2_LIBS) $(ZLIB_LIBS) $(am__append_87)
+xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \
+ $(TECKIT_DEPEND) $(HARFBUZZ_DEPEND) $(GRAPHITE2_DEPEND) \
+ $(POPPLER_DEPEND) $(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) \
+ $(ZLIB_DEPEND)
+@XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework ApplicationServices -framework Cocoa
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_123)
+xetex_CFLAGS = # $(WARNING_CFLAGS)
+xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
+xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
+
+# We must create libxetex.a etc before building the xetex_OBJECTS
+xetex_prereq = $(libxetex) xetexdir/etex_version.h xetexdir/xetex_version.h
+xetex_c_h = xetexini.c xetex0.c xetexcoerce.h xetexd.h
+nodist_xetex_SOURCES = $(xetex_c_h) xetex-pool.c
+dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \
+ xetexdir/etex_version.h xetexdir/xetex_version.h \
+ $(am__append_124)
+xetex_ch_srcs = \
+ xetexdir/xetex.web \
+ xetexdir/tex.ch0 \
+ tex.ch \
+ $(xetex_ch_synctex) \
+ xetexdir/xetex.ch \
+ $(xetex_post_ch_synctex) \
+ tex-binpool.ch
+
+libxetex_a_CPPFLAGS = $(xetex_cppflags)
+libxetex_a_CFLAGS = # $(WARNING_CFLAGS)
+libxetex_a_CXXFLAGS = # $(WARNING_CXXFLAGS)
+libxetex_a_OBJCXXFLAGS = # $(WARNING_OBJCXXFLAGS)
+libxetex_a_SOURCES = xetexdir/MathTable.h xetexdir/XeTeXFontInst.cpp \
+ xetexdir/XeTeXFontInst.h xetexdir/XeTeXFontMgr.cpp \
+ xetexdir/XeTeXFontMgr.h xetexdir/XeTeXLayoutInterface.cpp \
+ xetexdir/XeTeXLayoutInterface.h xetexdir/XeTeXOTMath.cpp \
+ xetexdir/XeTeXOTMath.h xetexdir/XeTeX_ext.c \
+ xetexdir/XeTeX_ext.h xetexdir/XeTeX_pic.c xetexdir/XeTeX_web.h \
+ xetexdir/XeTeXswap.h xetexdir/trans.c xetexdir/trans.h \
+ xetexdir/hz.cpp xetexdir/xetex.h xetexdir/pdfimage.cpp \
+ xetexdir/pdfimage.h xetexdir/image/bmpimage.c \
+ xetexdir/image/bmpimage.h xetexdir/image/jpegimage.c \
+ xetexdir/image/jpegimage.h xetexdir/image/mfileio.c \
+ xetexdir/image/mfileio.h xetexdir/image/numbers.c \
+ xetexdir/image/numbers.h xetexdir/image/pngimage.c \
+ xetexdir/image/pngimage.h $(am__append_88) $(am__append_89)
+
+# We must create xetexd.h etc. before building the libxetex_a_OBJECTS.
+libxetex_prereq = xetexd.h $(xetex_dependencies)
+
+# XeTeX Tests
+#
+xetex_tests = \
+ xetexdir/xetex-bug73.test \
+ xetexdir/xetex.test
+
+omegaware_programs = odvicopy odvitype otangle wofm2opl wopl2ofm wovf2ovp wovp2ovf
+ow_tangle = WEBINPUTS=$(srcdir)/omegaware $(buildenv) $(TANGLE)
+ow_otangle = WEBINPUTS=.:$(srcdir)/omegaware $(buildenv) $(OTANGLE)
+nodist_odvicopy_SOURCES = odvicopy.c odvicopy.h
+odvicopy_sources = omegaware/odvicopy.web omegaware/odvicopy.ch
+nodist_odvitype_SOURCES = odvitype.c odvitype.h
+odvitype_sources = omegaware/odvitype.web omegaware/odvitype.ch
+nodist_wofm2opl_SOURCES = ofm2opl.c ofm2opl.h
+nodist_wopl2ofm_SOURCES = opl2ofm.c opl2ofm.h
+nodist_otangle_SOURCES = otangle.c otangle.h
+otangle_sources = omegaware/otangle.web omegaware/otangle.ch
+nodist_wovf2ovp_SOURCES = ovf2ovp.c ovf2ovp.h
+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 \
+ omegaware/yannis.test
+
+al_tangle = WEBINPUTS=.:$(srcdir) AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(OTANGLE)
+
+# With --enable-ipc, Aleph may need to link with -lsocket.
+aleph_LDADD = $(LDADD) $(ipc_socketlibs)
+aleph_CPPFLAGS = -I$(srcdir)/alephdir $(AM_CPPFLAGS)
+
+# Aleph C sources
+aleph_c_h = alephini.c aleph0.c alephcoerce.h alephd.h
+nodist_aleph_SOURCES = $(aleph_c_h) aleph-pool.c
+dist_aleph_SOURCES = \
+ alephdir/aleph.c \
+ alephdir/alephbis.c \
+ alephdir/alephextra.c \
+ alephdir/alephextra.h \
+ alephdir/alephmem.h
+
+
+# Generate aleph.web
+aleph_web_srcs = \
+ tex.web \
+ alephdir/om16bit.ch \
+ alephdir/omstr.ch \
+ alephdir/omfont.ch \
+ alephdir/omchar.ch \
+ alephdir/omfi.ch \
+ alephdir/ompar.ch \
+ alephdir/omocp.ch \
+ alephdir/omfilter.ch \
+ alephdir/omtrans.ch \
+ alephdir/omdir.ch \
+ alephdir/eobase.ch \
+ alephdir/eofmt.ch \
+ alephdir/eomem.ch \
+ alephdir/eo16bit.ch \
+ alephdir/eoext.ch \
+ alephdir/eoeqtb.ch \
+ alephdir/eofix.ch \
+ alephdir/eocprt.ch \
+ alephdir/eonewdir.ch \
+ alephdir/eover.ch \
+ alephdir/eopage.ch \
+ alephdir/eochar.ch
+
+
+# Generate aleph.ch
+aleph_ch_srcs = \
+ alephdir/com16bit.ch \
+ alephdir/comstr.ch \
+ alephdir/comfont.ch \
+ alephdir/comchar.ch \
+ alephdir/comfi.ch \
+ alephdir/compar.ch \
+ alephdir/comocp.ch \
+ alephdir/comfilter.ch \
+ alephdir/comtrans.ch \
+ alephdir/comdir.ch \
+ alephdir/comsrcspec.ch \
+ alephdir/ceostuff.ch
+
+
+# Aleph Tests
+#
+aleph_tests = alephdir/aleph.test
+synctex_SOURCES = \
+ synctexdir/synctex_main.c
+
+synctex_CPPFLAGS = -I$(srcdir)/synctexdir
+@SYSTEM_ZLIB_FALSE@libsynctex = libsynctex.a
+@SYSTEM_ZLIB_TRUE@libsynctex = libsynctex.la
+synctex_LDADD = $(libsynctex) $(ZLIB_LIBS)
+EXTRA_LTLIBRARIES = libsynctex.la
+@SYNCTEX_TRUE@@SYSTEM_ZLIB_TRUE@lib_LTLIBRARIES = $(WANTEDLIBS)
+@SYNCTEX_TRUE@@SYSTEM_ZLIB_FALSE@lib_LIBRARIES = libsynctex.a
+libsynctex_la_CPPFLAGS = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -DSYNCTEX_USE_LOCAL_HEADER
+libsynctex_a_CPPFLAGS = $(libsynctex_la_CPPFLAGS)
+libsynctex_la_LDFLAGS = -rpath @libdir@ -bindir @bindir@ -no-undefined -version-info $(SYNCTEX_LT_VERSINFO)
+libsynctex_la_LIBADD = $(ZLIB_LIBS)
+libsynctex_la_SOURCES = \
+ synctexdir/synctex_parser.c \
+ synctexdir/synctex_parser_local.h \
+ synctexdir/synctex_parser_utils.c
+
+nodist_libsynctex_a_SOURCES = $(libsynctex_la_SOURCES)
+syncincludedir = ${includedir}/synctex
+pkgconfigdir = ${libdir}/pkgconfig
+@SYNCTEX_TRUE@syncinclude_HEADERS = \
+@SYNCTEX_TRUE@ synctexdir/synctex_parser.h \
+@SYNCTEX_TRUE@ synctexdir/synctex_parser_utils.h
+
+@SYNCTEX_TRUE@pkgconfig_DATA = synctexdir/synctex.pc
+@TEX_SYNCTEX_TRUE@tex_ch_synctex = \
+@TEX_SYNCTEX_TRUE@ synctexdir/synctex-def.ch0 \
+@TEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch0 \
+@TEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch2 \
+@TEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch0 \
+@TEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch1 \
+@TEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch2
+
+@ETEX_SYNCTEX_TRUE@etex_ch_synctex = \
+@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-def.ch0 \
+@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch0 \
+@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-e-mem.ch0 \
+@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-e-mem.ch1 \
+@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch0 \
+@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch1 \
+@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-e-rec.ch0
+
+@PTEX_SYNCTEX_TRUE@ptex_ch_synctex = \
+@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-def.ch0 \
+@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-mem.ch0 \
+@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch0 \
+@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-mem.ch1 \
+@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch0 \
+@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch0 \
+@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch1 \
+@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch2 \
+@PTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch1
+
+@UPTEX_SYNCTEX_TRUE@uptex_ch_synctex = \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-def.ch0 \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-mem.ch0 \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch0 \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-mem.ch1 \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch0 \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch0 \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch1 \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch2 \
+@UPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch1
+
+@EPTEX_SYNCTEX_TRUE@eptex_ch_synctex = \
+@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-def.ch0 \
+@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-ep-mem.ch0 \
+@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch0 \
+@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-e-mem.ch0 \
+@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-ep-mem.ch1 \
+@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch0 \
+@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch0 \
+@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch1 \
+@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-e-rec.ch0 \
+@EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch1
+
+@EUPTEX_SYNCTEX_TRUE@euptex_ch_synctex = \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-def.ch0 \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-ep-mem.ch0 \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch0 \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-e-mem.ch0 \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-ep-mem.ch1 \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch0 \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch0 \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch1 \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-e-rec.ch0 \
+@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch1
+
+@PDFTEX_SYNCTEX_TRUE@pdftex_ch_synctex = \
+@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-def.ch0 \
+@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch0 \
+@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-e-mem.ch0 \
+@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-e-mem.ch1 \
+@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch0 \
+@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch1 \
+@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-e-rec.ch0 \
+@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-pdf-rec.ch2
+
+@XETEX_SYNCTEX_TRUE@xetex_ch_synctex = \
+@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-xe-def.ch0 \
+@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch0 \
+@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-e-mem.ch1 \
+@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch0 \
+@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-xe-rec.ch0
+
+@XETEX_SYNCTEX_TRUE@xetex_post_ch_synctex = \
+@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-xe-rec.ch3
+
+
+# SyncTeX Tests
+#
+synctex_tests = synctexdir/synctex.test
libmd5_a_CPPFLAGS = -I$(srcdir)/libmd5
libmd5_a_SOURCES = libmd5/md5.c libmd5/md5.h
md5main_CPPFLAGS = -I$(srcdir)/libmd5
@@ -2239,7 +3631,7 @@ all: ff-config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
-.SUFFIXES: .c .cc .cin .cxx .h .hin .lo .log .o .obj .p .pin .test .test$(EXEEXT) .trs
+.SUFFIXES: .c .cc .cin .cpp .cxx .h .hin .lo .log .mm .o .obj .p .pin .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.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__configure_deps)
@@ -2313,6 +3705,39 @@ ctangleboot-sh: $(top_builddir)/config.status $(srcdir)/ctangleboot-sh.in
cd $(top_builddir) && $(SHELL) ./config.status $@
silent-sh: $(top_builddir)/config.status $(srcdir)/silent-sh.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+synctexdir/synctex.pc: $(top_builddir)/config.status $(top_srcdir)/synctexdir/synctex.pc.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+install-libLIBRARIES: $(lib_LIBRARIES)
+ @$(NORMAL_INSTALL)
+ @list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \
+ list2=; for p in $$list; do \
+ if test -f $$p; then \
+ list2="$$list2 $$p"; \
+ else :; fi; \
+ done; \
+ test -z "$$list2" || { \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+ echo " $(INSTALL_DATA) $$list2 '$(DESTDIR)$(libdir)'"; \
+ $(INSTALL_DATA) $$list2 "$(DESTDIR)$(libdir)" || exit $$?; }
+ @$(POST_INSTALL)
+ @list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \
+ for p in $$list; do \
+ if test -f $$p; then \
+ $(am__strip_dir) \
+ echo " ( cd '$(DESTDIR)$(libdir)' && $(RANLIB) $$f )"; \
+ ( cd "$(DESTDIR)$(libdir)" && $(RANLIB) $$f ) || exit $$?; \
+ else :; fi; \
+ done
+
+uninstall-libLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ @list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(libdir)'; $(am__uninstall_files_from_dir)
+
+clean-libLIBRARIES:
+ -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
luatexdir/luafontloader/fontforge/fontforge/$(am__dirstamp):
@$(MKDIR_P) luatexdir/luafontloader/fontforge/fontforge
@: > luatexdir/luafontloader/fontforge/fontforge/$(am__dirstamp)
@@ -2605,6 +4030,19 @@ libjitff.a: $(libjitff_a_OBJECTS) $(libjitff_a_DEPENDENCIES) $(EXTRA_libjitff_a_
$(AM_V_at)-rm -f libjitff.a
$(AM_V_AR)$(libjitff_a_AR) libjitff.a $(libjitff_a_OBJECTS) $(libjitff_a_LIBADD)
$(AM_V_at)$(RANLIB) libjitff.a
+ptexdir/$(am__dirstamp):
+ @$(MKDIR_P) ptexdir
+ @: > ptexdir/$(am__dirstamp)
+ptexdir/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) ptexdir/$(DEPDIR)
+ @: > ptexdir/$(DEPDIR)/$(am__dirstamp)
+ptexdir/libkanji_a-kanji.$(OBJEXT): ptexdir/$(am__dirstamp) \
+ ptexdir/$(DEPDIR)/$(am__dirstamp)
+
+libkanji.a: $(libkanji_a_OBJECTS) $(libkanji_a_DEPENDENCIES) $(EXTRA_libkanji_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libkanji.a
+ $(AM_V_AR)$(libkanji_a_AR) libkanji.a $(libkanji_a_OBJECTS) $(libkanji_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libkanji.a
luatexdir/luafilesystem/src/$(am__dirstamp):
@$(MKDIR_P) luatexdir/luafilesystem/src
@: > luatexdir/luafilesystem/src/$(am__dirstamp)
@@ -3034,6 +4472,103 @@ libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputi
$(AM_V_at)-rm -f libmputil.a
$(AM_V_AR)$(libmputil_a_AR) libmputil.a $(libmputil_a_OBJECTS) $(libmputil_a_LIBADD)
$(AM_V_at)$(RANLIB) libmputil.a
+pdftexdir/$(am__dirstamp):
+ @$(MKDIR_P) pdftexdir
+ @: > pdftexdir/$(am__dirstamp)
+pdftexdir/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) pdftexdir/$(DEPDIR)
+ @: > pdftexdir/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/libpdftex_a-avl.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/libpdftex_a-avlstuff.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/libpdftex_a-epdf.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/libpdftex_a-mapfile.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/libpdftex_a-pdftoepdf.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/libpdftex_a-pkin.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/libpdftex_a-subfont.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/libpdftex_a-tounicode.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/libpdftex_a-utils.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/libpdftex_a-vfpacket.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/libpdftex_a-writeenc.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/libpdftex_a-writefont.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/libpdftex_a-writeimg.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/libpdftex_a-writejbig2.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/libpdftex_a-writejpg.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/libpdftex_a-writepng.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/libpdftex_a-writet1.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/libpdftex_a-writet3.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/libpdftex_a-writettf.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/libpdftex_a-writezip.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/regex/$(am__dirstamp):
+ @$(MKDIR_P) pdftexdir/regex
+ @: > pdftexdir/regex/$(am__dirstamp)
+pdftexdir/regex/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) pdftexdir/regex/$(DEPDIR)
+ @: > pdftexdir/regex/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/regex/libpdftex_a-regex.$(OBJEXT): \
+ pdftexdir/regex/$(am__dirstamp) \
+ pdftexdir/regex/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/libpdftex_a-macnames.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/regex/libpdftex_a-regcomp.$(OBJEXT): \
+ pdftexdir/regex/$(am__dirstamp) \
+ pdftexdir/regex/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/regex/libpdftex_a-regex_internal.$(OBJEXT): \
+ pdftexdir/regex/$(am__dirstamp) \
+ pdftexdir/regex/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/regex/libpdftex_a-regexec.$(OBJEXT): \
+ pdftexdir/regex/$(am__dirstamp) \
+ pdftexdir/regex/$(DEPDIR)/$(am__dirstamp)
+
+libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) $(EXTRA_libpdftex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libpdftex.a
+ $(AM_V_AR)$(libpdftex_a_AR) libpdftex.a $(libpdftex_a_OBJECTS) $(libpdftex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libpdftex.a
+synctexdir/libsynctex_a-synctex_parser.$(OBJEXT): \
+ synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+synctexdir/libsynctex_a-synctex_parser_utils.$(OBJEXT): \
+ synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+libsynctex.a: $(libsynctex_a_OBJECTS) $(libsynctex_a_DEPENDENCIES) $(EXTRA_libsynctex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libsynctex.a
+ $(AM_V_AR)$(libsynctex_a_AR) libsynctex.a $(libsynctex_a_OBJECTS) $(libsynctex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libsynctex.a
+uptexdir/$(am__dirstamp):
+ @$(MKDIR_P) uptexdir
+ @: > uptexdir/$(am__dirstamp)
+uptexdir/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) uptexdir/$(DEPDIR)
+ @: > uptexdir/$(DEPDIR)/$(am__dirstamp)
+uptexdir/libukanji_a-kanji.$(OBJEXT): uptexdir/$(am__dirstamp) \
+ uptexdir/$(DEPDIR)/$(am__dirstamp)
+uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$(am__dirstamp) \
+ uptexdir/$(DEPDIR)/$(am__dirstamp)
+
+libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES) $(EXTRA_libukanji_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libukanji.a
+ $(AM_V_AR)$(libukanji_a_AR) libukanji.a $(libukanji_a_OBJECTS) $(libukanji_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libukanji.a
luatexdir/unilib/$(am__dirstamp):
@$(MKDIR_P) luatexdir/unilib
@: > luatexdir/unilib/$(am__dirstamp)
@@ -3075,6 +4610,108 @@ libunilib.a: $(libunilib_a_OBJECTS) $(libunilib_a_DEPENDENCIES) $(EXTRA_libunili
$(AM_V_at)-rm -f libunilib.a
$(AM_V_AR)$(libunilib_a_AR) libunilib.a $(libunilib_a_OBJECTS) $(libunilib_a_LIBADD)
$(AM_V_at)$(RANLIB) libunilib.a
+xetexdir/$(am__dirstamp):
+ @$(MKDIR_P) xetexdir
+ @: > xetexdir/$(am__dirstamp)
+xetexdir/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) xetexdir/$(DEPDIR)
+ @: > xetexdir/$(DEPDIR)/$(am__dirstamp)
+xetexdir/libxetex_a-XeTeXFontInst.$(OBJEXT): xetexdir/$(am__dirstamp) \
+ xetexdir/$(DEPDIR)/$(am__dirstamp)
+xetexdir/libxetex_a-XeTeXFontMgr.$(OBJEXT): xetexdir/$(am__dirstamp) \
+ xetexdir/$(DEPDIR)/$(am__dirstamp)
+xetexdir/libxetex_a-XeTeXLayoutInterface.$(OBJEXT): \
+ xetexdir/$(am__dirstamp) xetexdir/$(DEPDIR)/$(am__dirstamp)
+xetexdir/libxetex_a-XeTeXOTMath.$(OBJEXT): xetexdir/$(am__dirstamp) \
+ xetexdir/$(DEPDIR)/$(am__dirstamp)
+xetexdir/libxetex_a-XeTeX_ext.$(OBJEXT): xetexdir/$(am__dirstamp) \
+ xetexdir/$(DEPDIR)/$(am__dirstamp)
+xetexdir/libxetex_a-XeTeX_pic.$(OBJEXT): xetexdir/$(am__dirstamp) \
+ xetexdir/$(DEPDIR)/$(am__dirstamp)
+xetexdir/libxetex_a-trans.$(OBJEXT): xetexdir/$(am__dirstamp) \
+ xetexdir/$(DEPDIR)/$(am__dirstamp)
+xetexdir/libxetex_a-hz.$(OBJEXT): xetexdir/$(am__dirstamp) \
+ xetexdir/$(DEPDIR)/$(am__dirstamp)
+xetexdir/libxetex_a-pdfimage.$(OBJEXT): xetexdir/$(am__dirstamp) \
+ xetexdir/$(DEPDIR)/$(am__dirstamp)
+xetexdir/image/$(am__dirstamp):
+ @$(MKDIR_P) xetexdir/image
+ @: > xetexdir/image/$(am__dirstamp)
+xetexdir/image/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) xetexdir/image/$(DEPDIR)
+ @: > xetexdir/image/$(DEPDIR)/$(am__dirstamp)
+xetexdir/image/libxetex_a-bmpimage.$(OBJEXT): \
+ xetexdir/image/$(am__dirstamp) \
+ xetexdir/image/$(DEPDIR)/$(am__dirstamp)
+xetexdir/image/libxetex_a-jpegimage.$(OBJEXT): \
+ xetexdir/image/$(am__dirstamp) \
+ xetexdir/image/$(DEPDIR)/$(am__dirstamp)
+xetexdir/image/libxetex_a-mfileio.$(OBJEXT): \
+ xetexdir/image/$(am__dirstamp) \
+ xetexdir/image/$(DEPDIR)/$(am__dirstamp)
+xetexdir/image/libxetex_a-numbers.$(OBJEXT): \
+ xetexdir/image/$(am__dirstamp) \
+ xetexdir/image/$(DEPDIR)/$(am__dirstamp)
+xetexdir/image/libxetex_a-pngimage.$(OBJEXT): \
+ xetexdir/image/$(am__dirstamp) \
+ xetexdir/image/$(DEPDIR)/$(am__dirstamp)
+xetexdir/libxetex_a-XeTeXFontInst_Mac.$(OBJEXT): \
+ xetexdir/$(am__dirstamp) xetexdir/$(DEPDIR)/$(am__dirstamp)
+xetexdir/libxetex_a-XeTeXFontMgr_Mac.$(OBJEXT): \
+ xetexdir/$(am__dirstamp) xetexdir/$(DEPDIR)/$(am__dirstamp)
+xetexdir/libxetex_a-XeTeX_mac.$(OBJEXT): xetexdir/$(am__dirstamp) \
+ xetexdir/$(DEPDIR)/$(am__dirstamp)
+xetexdir/libxetex_a-XeTeXFontMgr_FC.$(OBJEXT): \
+ xetexdir/$(am__dirstamp) xetexdir/$(DEPDIR)/$(am__dirstamp)
+
+libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libxetex.a
+ $(AM_V_AR)$(libxetex_a_AR) libxetex.a $(libxetex_a_OBJECTS) $(libxetex_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libxetex.a
+
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ list2=; for p in $$list; do \
+ if test -f $$p; then \
+ list2="$$list2 $$p"; \
+ else :; fi; \
+ done; \
+ test -z "$$list2" || { \
+ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+ }
+
+uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+ for p in $$list; do \
+ $(am__strip_dir) \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+ done
+
+clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; \
+ locs=`for p in $$list; do echo $$p; done | \
+ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+ sort -u`; \
+ test -z "$$locs" || { \
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+synctexdir/libsynctex_la-synctex_parser.lo: \
+ synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+synctexdir/libsynctex_la-synctex_parser_utils.lo: \
+ synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+libsynctex.la: $(libsynctex_la_OBJECTS) $(libsynctex_la_DEPENDENCIES) $(EXTRA_libsynctex_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(libsynctex_la_LINK) $(libsynctex_la_OBJECTS) $(libsynctex_la_LIBADD) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
@@ -3142,6 +4779,22 @@ clean-noinstPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
+alephdir/$(am__dirstamp):
+ @$(MKDIR_P) alephdir
+ @: > alephdir/$(am__dirstamp)
+alephdir/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) alephdir/$(DEPDIR)
+ @: > alephdir/$(DEPDIR)/$(am__dirstamp)
+alephdir/aleph-aleph.$(OBJEXT): alephdir/$(am__dirstamp) \
+ alephdir/$(DEPDIR)/$(am__dirstamp)
+alephdir/aleph-alephbis.$(OBJEXT): alephdir/$(am__dirstamp) \
+ alephdir/$(DEPDIR)/$(am__dirstamp)
+alephdir/aleph-alephextra.$(OBJEXT): alephdir/$(am__dirstamp) \
+ alephdir/$(DEPDIR)/$(am__dirstamp)
+
+aleph$(EXEEXT): $(aleph_OBJECTS) $(aleph_DEPENDENCIES) $(EXTRA_aleph_DEPENDENCIES)
+ @rm -f aleph$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(aleph_OBJECTS) $(aleph_LDADD) $(LIBS)
bibtex$(EXEEXT): $(bibtex_OBJECTS) $(bibtex_DEPENDENCIES) $(EXTRA_bibtex_DEPENDENCIES)
@rm -f bibtex$(EXEEXT)
@@ -3159,6 +4812,14 @@ call_mpost$(EXEEXT): $(call_mpost_OBJECTS) $(call_mpost_DEPENDENCIES) $(EXTRA_ca
@rm -f call_mpost$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(call_mpost_OBJECTS) $(call_mpost_LDADD) $(LIBS)
+call_pmpost$(EXEEXT): $(call_pmpost_OBJECTS) $(call_pmpost_DEPENDENCIES) $(EXTRA_call_pmpost_DEPENDENCIES)
+ @rm -f call_pmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_pmpost_OBJECTS) $(call_pmpost_LDADD) $(LIBS)
+
+call_upmpost$(EXEEXT): $(call_upmpost_OBJECTS) $(call_upmpost_DEPENDENCIES) $(EXTRA_call_upmpost_DEPENDENCIES)
+ @rm -f call_upmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_upmpost_OBJECTS) $(call_upmpost_LDADD) $(LIBS)
+
ctangle$(EXEEXT): $(ctangle_OBJECTS) $(ctangle_DEPENDENCIES) $(EXTRA_ctangle_DEPENDENCIES)
@rm -f ctangle$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(ctangle_OBJECTS) $(ctangle_LDADD) $(LIBS)
@@ -3182,6 +4843,48 @@ dvicopy$(EXEEXT): $(dvicopy_OBJECTS) $(dvicopy_DEPENDENCIES) $(EXTRA_dvicopy_DEP
dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES)
@rm -f dvitype$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(dvitype_OBJECTS) $(dvitype_LDADD) $(LIBS)
+eptexdir/$(am__dirstamp):
+ @$(MKDIR_P) eptexdir
+ @: > eptexdir/$(am__dirstamp)
+eptexdir/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) eptexdir/$(DEPDIR)
+ @: > eptexdir/$(DEPDIR)/$(am__dirstamp)
+eptexdir/eptex-eptexextra.$(OBJEXT): eptexdir/$(am__dirstamp) \
+ eptexdir/$(DEPDIR)/$(am__dirstamp)
+synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES)
+ @rm -f eptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(eptex_OBJECTS) $(eptex_LDADD) $(LIBS)
+etexdir/$(am__dirstamp):
+ @$(MKDIR_P) etexdir
+ @: > etexdir/$(am__dirstamp)
+etexdir/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) etexdir/$(DEPDIR)
+ @: > etexdir/$(DEPDIR)/$(am__dirstamp)
+etexdir/etex-etexextra.$(OBJEXT): etexdir/$(am__dirstamp) \
+ etexdir/$(DEPDIR)/$(am__dirstamp)
+synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+etex$(EXEEXT): $(etex_OBJECTS) $(etex_DEPENDENCIES) $(EXTRA_etex_DEPENDENCIES)
+ @rm -f etex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(etex_OBJECTS) $(etex_LDADD) $(LIBS)
+euptexdir/$(am__dirstamp):
+ @$(MKDIR_P) euptexdir
+ @: > euptexdir/$(am__dirstamp)
+euptexdir/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) euptexdir/$(DEPDIR)
+ @: > euptexdir/$(DEPDIR)/$(am__dirstamp)
+euptexdir/euptex-euptexextra.$(OBJEXT): euptexdir/$(am__dirstamp) \
+ euptexdir/$(DEPDIR)/$(am__dirstamp)
+synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+euptex$(EXEEXT): $(euptex_OBJECTS) $(euptex_DEPENDENCIES) $(EXTRA_euptex_DEPENDENCIES)
+ @rm -f euptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(euptex_OBJECTS) $(euptex_LDADD) $(LIBS)
gftodvi$(EXEEXT): $(gftodvi_OBJECTS) $(gftodvi_DEPENDENCIES) $(EXTRA_gftodvi_DEPENDENCIES)
@rm -f gftodvi$(EXEEXT)
@@ -3247,10 +4950,44 @@ mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) $(EXTRA_mpost_DEPENDENCIE
@rm -f mpost$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(mpost_OBJECTS) $(mpost_LDADD) $(LIBS)
+odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) $(EXTRA_odvicopy_DEPENDENCIES)
+ @rm -f odvicopy$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(odvicopy_OBJECTS) $(odvicopy_LDADD) $(LIBS)
+
+odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) $(EXTRA_odvitype_DEPENDENCIES)
+ @rm -f odvitype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(odvitype_OBJECTS) $(odvitype_LDADD) $(LIBS)
+
+otangle$(EXEEXT): $(otangle_OBJECTS) $(otangle_DEPENDENCIES) $(EXTRA_otangle_DEPENDENCIES)
+ @rm -f otangle$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(otangle_OBJECTS) $(otangle_LDADD) $(LIBS)
+
patgen$(EXEEXT): $(patgen_OBJECTS) $(patgen_DEPENDENCIES) $(EXTRA_patgen_DEPENDENCIES)
@rm -f patgen$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(patgen_OBJECTS) $(patgen_LDADD) $(LIBS)
+pbibtex$(EXEEXT): $(pbibtex_OBJECTS) $(pbibtex_DEPENDENCIES) $(EXTRA_pbibtex_DEPENDENCIES)
+ @rm -f pbibtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pbibtex_OBJECTS) $(pbibtex_LDADD) $(LIBS)
+pdftexdir/pdftex-pdftexextra.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+synctexdir/pdftex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+pdftex$(EXEEXT): $(pdftex_OBJECTS) $(pdftex_DEPENDENCIES) $(EXTRA_pdftex_DEPENDENCIES)
+ @rm -f pdftex$(EXEEXT)
+ $(AM_V_CXXLD)$(pdftex_LINK) $(pdftex_OBJECTS) $(pdftex_LDADD) $(LIBS)
+pdftexdir/pdftosrc-pdftosrc.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+
+pdftosrc$(EXEEXT): $(pdftosrc_OBJECTS) $(pdftosrc_DEPENDENCIES) $(EXTRA_pdftosrc_DEPENDENCIES)
+ @rm -f pdftosrc$(EXEEXT)
+ $(AM_V_CXXLD)$(pdftosrc_LINK) $(pdftosrc_OBJECTS) $(pdftosrc_LDADD) $(LIBS)
+
+pdvitype$(EXEEXT): $(pdvitype_OBJECTS) $(pdvitype_DEPENDENCIES) $(EXTRA_pdvitype_DEPENDENCIES)
+ @rm -f pdvitype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pdvitype_OBJECTS) $(pdvitype_LDADD) $(LIBS)
+
pktogf$(EXEEXT): $(pktogf_OBJECTS) $(pktogf_DEPENDENCIES) $(EXTRA_pktogf_DEPENDENCIES)
@rm -f pktogf$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(pktogf_OBJECTS) $(pktogf_LDADD) $(LIBS)
@@ -3263,10 +5000,36 @@ pltotf$(EXEEXT): $(pltotf_OBJECTS) $(pltotf_DEPENDENCIES) $(EXTRA_pltotf_DEPENDE
@rm -f pltotf$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(pltotf_OBJECTS) $(pltotf_LDADD) $(LIBS)
+pmpost$(EXEEXT): $(pmpost_OBJECTS) $(pmpost_DEPENDENCIES) $(EXTRA_pmpost_DEPENDENCIES)
+ @rm -f pmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(pmpost_OBJECTS) $(pmpost_LDADD) $(LIBS)
+
pooltype$(EXEEXT): $(pooltype_OBJECTS) $(pooltype_DEPENDENCIES) $(EXTRA_pooltype_DEPENDENCIES)
@rm -f pooltype$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(pooltype_OBJECTS) $(pooltype_LDADD) $(LIBS)
+ppltotf$(EXEEXT): $(ppltotf_OBJECTS) $(ppltotf_DEPENDENCIES) $(EXTRA_ppltotf_DEPENDENCIES)
+ @rm -f ppltotf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ppltotf_OBJECTS) $(ppltotf_LDADD) $(LIBS)
+ptexdir/ptex-ptexextra.$(OBJEXT): ptexdir/$(am__dirstamp) \
+ ptexdir/$(DEPDIR)/$(am__dirstamp)
+synctexdir/ptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+ptex$(EXEEXT): $(ptex_OBJECTS) $(ptex_DEPENDENCIES) $(EXTRA_ptex_DEPENDENCIES)
+ @rm -f ptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ptex_OBJECTS) $(ptex_LDADD) $(LIBS)
+
+ptftopl$(EXEEXT): $(ptftopl_OBJECTS) $(ptftopl_DEPENDENCIES) $(EXTRA_ptftopl_DEPENDENCIES)
+ @rm -f ptftopl$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ptftopl_OBJECTS) $(ptftopl_LDADD) $(LIBS)
+synctexdir/synctex-synctex_main.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+synctex$(EXEEXT): $(synctex_OBJECTS) $(synctex_DEPENDENCIES) $(EXTRA_synctex_DEPENDENCIES)
+ @rm -f synctex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(synctex_OBJECTS) $(synctex_LDADD) $(LIBS)
+
tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) $(EXTRA_tangle_DEPENDENCIES)
@rm -f tangle$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(tangle_OBJECTS) $(tangle_LDADD) $(LIBS)
@@ -3274,6 +5037,8 @@ tangle$(EXEEXT): $(tangle_OBJECTS) $(tangle_DEPENDENCIES) $(EXTRA_tangle_DEPENDE
tangleboot$(EXEEXT): $(tangleboot_OBJECTS) $(tangleboot_DEPENDENCIES) $(EXTRA_tangleboot_DEPENDENCIES)
@rm -f tangleboot$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(tangleboot_OBJECTS) $(tangleboot_LDADD) $(LIBS)
+synctexdir/tex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
tex$(EXEEXT): $(tex_OBJECTS) $(tex_DEPENDENCIES) $(EXTRA_tex_DEPENDENCIES)
@rm -f tex$(EXEEXT)
@@ -3286,11 +5051,47 @@ tftopl$(EXEEXT): $(tftopl_OBJECTS) $(tftopl_DEPENDENCIES) $(EXTRA_tftopl_DEPENDE
tie$(EXEEXT): $(tie_OBJECTS) $(tie_DEPENDENCIES) $(EXTRA_tie_DEPENDENCIES)
@rm -f tie$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(tie_OBJECTS) $(tie_LDADD) $(LIBS)
+pdftexdir/ttf2afm-ttf2afm.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+pdftexdir/ttf2afm-macnames.$(OBJEXT): pdftexdir/$(am__dirstamp) \
+ pdftexdir/$(DEPDIR)/$(am__dirstamp)
+
+ttf2afm$(EXEEXT): $(ttf2afm_OBJECTS) $(ttf2afm_DEPENDENCIES) $(EXTRA_ttf2afm_DEPENDENCIES)
+ @rm -f ttf2afm$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(ttf2afm_OBJECTS) $(ttf2afm_LDADD) $(LIBS)
txt2zlib$(EXEEXT): $(txt2zlib_OBJECTS) $(txt2zlib_DEPENDENCIES) $(EXTRA_txt2zlib_DEPENDENCIES)
@rm -f txt2zlib$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(txt2zlib_OBJECTS) $(txt2zlib_LDADD) $(LIBS)
+upbibtex$(EXEEXT): $(upbibtex_OBJECTS) $(upbibtex_DEPENDENCIES) $(EXTRA_upbibtex_DEPENDENCIES)
+ @rm -f upbibtex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(upbibtex_OBJECTS) $(upbibtex_LDADD) $(LIBS)
+
+updvitype$(EXEEXT): $(updvitype_OBJECTS) $(updvitype_DEPENDENCIES) $(EXTRA_updvitype_DEPENDENCIES)
+ @rm -f updvitype$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(updvitype_OBJECTS) $(updvitype_LDADD) $(LIBS)
+
+upmpost$(EXEEXT): $(upmpost_OBJECTS) $(upmpost_DEPENDENCIES) $(EXTRA_upmpost_DEPENDENCIES)
+ @rm -f upmpost$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(upmpost_OBJECTS) $(upmpost_LDADD) $(LIBS)
+
+uppltotf$(EXEEXT): $(uppltotf_OBJECTS) $(uppltotf_DEPENDENCIES) $(EXTRA_uppltotf_DEPENDENCIES)
+ @rm -f uppltotf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(uppltotf_OBJECTS) $(uppltotf_LDADD) $(LIBS)
+uptexdir/uptex-uptexextra.$(OBJEXT): uptexdir/$(am__dirstamp) \
+ uptexdir/$(DEPDIR)/$(am__dirstamp)
+synctexdir/uptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+uptex$(EXEEXT): $(uptex_OBJECTS) $(uptex_DEPENDENCIES) $(EXTRA_uptex_DEPENDENCIES)
+ @rm -f uptex$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(uptex_OBJECTS) $(uptex_LDADD) $(LIBS)
+
+uptftopl$(EXEEXT): $(uptftopl_OBJECTS) $(uptftopl_DEPENDENCIES) $(EXTRA_uptftopl_DEPENDENCIES)
+ @rm -f uptftopl$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(uptftopl_OBJECTS) $(uptftopl_LDADD) $(LIBS)
+
vftovp$(EXEEXT): $(vftovp_OBJECTS) $(vftovp_DEPENDENCIES) $(EXTRA_vftovp_DEPENDENCIES)
@rm -f vftovp$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(vftovp_OBJECTS) $(vftovp_LDADD) $(LIBS)
@@ -3303,8 +5104,36 @@ weave$(EXEEXT): $(weave_OBJECTS) $(weave_DEPENDENCIES) $(EXTRA_weave_DEPENDENCIE
@rm -f weave$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(weave_OBJECTS) $(weave_LDADD) $(LIBS)
+wofm2opl$(EXEEXT): $(wofm2opl_OBJECTS) $(wofm2opl_DEPENDENCIES) $(EXTRA_wofm2opl_DEPENDENCIES)
+ @rm -f wofm2opl$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wofm2opl_OBJECTS) $(wofm2opl_LDADD) $(LIBS)
+
+wopl2ofm$(EXEEXT): $(wopl2ofm_OBJECTS) $(wopl2ofm_DEPENDENCIES) $(EXTRA_wopl2ofm_DEPENDENCIES)
+ @rm -f wopl2ofm$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wopl2ofm_OBJECTS) $(wopl2ofm_LDADD) $(LIBS)
+
+wovf2ovp$(EXEEXT): $(wovf2ovp_OBJECTS) $(wovf2ovp_DEPENDENCIES) $(EXTRA_wovf2ovp_DEPENDENCIES)
+ @rm -f wovf2ovp$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wovf2ovp_OBJECTS) $(wovf2ovp_LDADD) $(LIBS)
+
+wovp2ovf$(EXEEXT): $(wovp2ovf_OBJECTS) $(wovp2ovf_DEPENDENCIES) $(EXTRA_wovp2ovf_DEPENDENCIES)
+ @rm -f wovp2ovf$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(wovp2ovf_OBJECTS) $(wovp2ovf_LDADD) $(LIBS)
+xetexdir/xetex-xetexextra.$(OBJEXT): xetexdir/$(am__dirstamp) \
+ xetexdir/$(DEPDIR)/$(am__dirstamp)
+synctexdir/xetex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
+ synctexdir/$(DEPDIR)/$(am__dirstamp)
+
+xetex$(EXEEXT): $(xetex_OBJECTS) $(xetex_DEPENDENCIES) $(EXTRA_xetex_DEPENDENCIES)
+ @rm -f xetex$(EXEEXT)
+ $(AM_V_CXXLD)$(xetex_LINK) $(xetex_OBJECTS) $(xetex_LDADD) $(LIBS)
+
mostlyclean-compile:
-rm -f *.$(OBJEXT)
+ -rm -f alephdir/*.$(OBJEXT)
+ -rm -f eptexdir/*.$(OBJEXT)
+ -rm -f etexdir/*.$(OBJEXT)
+ -rm -f euptexdir/*.$(OBJEXT)
-rm -f libmd5/*.$(OBJEXT)
-rm -f luatexdir/*.$(OBJEXT)
-rm -f luatexdir/lua/*.$(OBJEXT)
@@ -3322,15 +5151,27 @@ mostlyclean-compile:
-rm -f luatexdir/unilib/*.$(OBJEXT)
-rm -f luatexdir/utils/*.$(OBJEXT)
-rm -f mplibdir/*.$(OBJEXT)
+ -rm -f pdftexdir/*.$(OBJEXT)
+ -rm -f pdftexdir/regex/*.$(OBJEXT)
+ -rm -f ptexdir/*.$(OBJEXT)
-rm -f synctexdir/*.$(OBJEXT)
+ -rm -f synctexdir/*.lo
+ -rm -f uptexdir/*.$(OBJEXT)
+ -rm -f xetexdir/*.$(OBJEXT)
+ -rm -f xetexdir/image/*.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aleph-aleph-pool.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aleph-aleph0.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aleph-alephini.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bibtex.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/call_luajittex-callexe.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/call_luatex-callexe.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/call_mpost-callexe.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/call_pmpost-callexe.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/call_upmpost-callexe.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctangle.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctangleboot.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctie.Po@am__quote@
@@ -3339,6 +5180,15 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cwebboot.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvicopy.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dvitype.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eptex-eptex-pool.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eptex-eptex0.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eptex-eptexini.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etex-etex-pool.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etex-etex0.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/etex-etexini.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/euptex-euptex-pool.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/euptex-euptex0.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/euptex-euptexini.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gftodvi.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gftopk.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gftype.Po@am__quote@
@@ -3558,11 +5408,42 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mft.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpost-mpost.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpost-mpxout.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/odvicopy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/odvitype.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ofm2opl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opl2ofm.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/otangle.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ovf2ovp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ovp2ovf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/patgen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pbibtex-pbibtex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdftex-dummy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdftex-pdftex-pool.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdftex-pdftex0.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdftex-pdftexini.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdftosrc-dummy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pdvitype-pdvitype.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pktogf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pktype.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pltotf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmpost-pmp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmpost-pmpmath.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmpost-pmpmathbinary.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmpost-pmpmathdecimal.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmpost-pmpmathdouble.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmpost-pmpost.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmpost-pmpstrings.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmpost-pmpxout.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmpost-ppngout.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmpost-ppsout.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmpost-psvgout.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmpost-ptfmin.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pooltype.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppltotf-ppltotf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-ptex-pool.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-ptex0.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptex-ptexini.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptftopl-ptftopl.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tangle.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tangleboot.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tex-tex-pool.Po@am__quote@
@@ -3572,9 +5453,38 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tftopl.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tie-tie.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/txt2zlib-txt2zlib.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upbibtex-upbibtex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/updvitype-updvitype.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upmpost-pmp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upmpost-pmpmath.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upmpost-pmpmathbinary.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upmpost-pmpmathdecimal.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upmpost-pmpmathdouble.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upmpost-pmpost.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upmpost-pmpstrings.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upmpost-pmpxout.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upmpost-ppngout.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upmpost-ppsout.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upmpost-psvgout.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/upmpost-ptfmin.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uppltotf-uppltotf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptex-uptex-pool.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptex-uptex0.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptex-uptexini.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptftopl-uptftopl.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vftovp.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vptovf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xetex-dummy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xetex-xetex-pool.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xetex-xetex0.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xetex-xetexini.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@alephdir/$(DEPDIR)/aleph-aleph.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@alephdir/$(DEPDIR)/aleph-alephbis.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@alephdir/$(DEPDIR)/aleph-alephextra.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@eptexdir/$(DEPDIR)/eptex-eptexextra.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@etexdir/$(DEPDIR)/etex-etexextra.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@euptexdir/$(DEPDIR)/euptex-euptexextra.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libmd5/$(DEPDIR)/libmd5_a-md5.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@libmd5/$(DEPDIR)/md5main-md5main.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@luatexdir/$(DEPDIR)/luajittex-luatex.Po@am__quote@
@@ -3778,8 +5688,74 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@mplibdir/$(DEPDIR)/libmputil_a-decNumber.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@mplibdir/$(DEPDIR)/luajittex-lmplib.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@mplibdir/$(DEPDIR)/luatex-lmplib.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/libpdftex_a-avl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/libpdftex_a-avlstuff.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/libpdftex_a-epdf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/libpdftex_a-macnames.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/libpdftex_a-mapfile.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/libpdftex_a-pdftoepdf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/libpdftex_a-pkin.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/libpdftex_a-subfont.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/libpdftex_a-tounicode.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/libpdftex_a-utils.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/libpdftex_a-vfpacket.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/libpdftex_a-writeenc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/libpdftex_a-writefont.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/libpdftex_a-writeimg.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/libpdftex_a-writejbig2.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/libpdftex_a-writejpg.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/libpdftex_a-writepng.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/libpdftex_a-writet1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/libpdftex_a-writet3.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/libpdftex_a-writettf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/libpdftex_a-writezip.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/pdftex-pdftexextra.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/pdftosrc-pdftosrc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/ttf2afm-macnames.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/$(DEPDIR)/ttf2afm-ttf2afm.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/regex/$(DEPDIR)/libpdftex_a-regcomp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/regex/$(DEPDIR)/libpdftex_a-regex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/regex/$(DEPDIR)/libpdftex_a-regex_internal.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@pdftexdir/regex/$(DEPDIR)/libpdftex_a-regexec.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ptexdir/$(DEPDIR)/libkanji_a-kanji.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ptexdir/$(DEPDIR)/ptex-ptexextra.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/eptex-synctex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/etex-synctex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/euptex-synctex.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/libluajittex_a-synctex.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/libluatex_a-synctex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/libsynctex_a-synctex_parser.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/libsynctex_a-synctex_parser_utils.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser_utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/pdftex-synctex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/ptex-synctex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/synctex-synctex_main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/tex-synctex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/uptex-synctex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@synctexdir/$(DEPDIR)/xetex-synctex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@uptexdir/$(DEPDIR)/libukanji_a-kanji.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@uptexdir/$(DEPDIR)/libukanji_a-kanji_dump.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@uptexdir/$(DEPDIR)/uptex-uptexextra.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst_Mac.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr_FC.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr_Mac.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xetexdir/$(DEPDIR)/libxetex_a-XeTeXLayoutInterface.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xetexdir/$(DEPDIR)/libxetex_a-XeTeXOTMath.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xetexdir/$(DEPDIR)/libxetex_a-XeTeX_ext.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xetexdir/$(DEPDIR)/libxetex_a-XeTeX_mac.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xetexdir/$(DEPDIR)/libxetex_a-XeTeX_pic.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xetexdir/$(DEPDIR)/libxetex_a-hz.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xetexdir/$(DEPDIR)/libxetex_a-pdfimage.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xetexdir/$(DEPDIR)/libxetex_a-trans.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xetexdir/$(DEPDIR)/xetex-xetexextra.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xetexdir/image/$(DEPDIR)/libxetex_a-bmpimage.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xetexdir/image/$(DEPDIR)/libxetex_a-jpegimage.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xetexdir/image/$(DEPDIR)/libxetex_a-mfileio.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xetexdir/image/$(DEPDIR)/libxetex_a-numbers.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xetexdir/image/$(DEPDIR)/libxetex_a-pngimage.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -5037,6 +7013,20 @@ luatexdir/luafontloader/src/libjitff_a-luafflib.obj: luatexdir/luafontloader/src
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libjitff_a_CPPFLAGS) $(CPPFLAGS) $(libjitff_a_CFLAGS) $(CFLAGS) -c -o luatexdir/luafontloader/src/libjitff_a-luafflib.obj `if test -f 'luatexdir/luafontloader/src/luafflib.c'; then $(CYGPATH_W) 'luatexdir/luafontloader/src/luafflib.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/luafontloader/src/luafflib.c'; fi`
+ptexdir/libkanji_a-kanji.o: ptexdir/kanji.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkanji_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptexdir/libkanji_a-kanji.o -MD -MP -MF ptexdir/$(DEPDIR)/libkanji_a-kanji.Tpo -c -o ptexdir/libkanji_a-kanji.o `test -f 'ptexdir/kanji.c' || echo '$(srcdir)/'`ptexdir/kanji.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ptexdir/$(DEPDIR)/libkanji_a-kanji.Tpo ptexdir/$(DEPDIR)/libkanji_a-kanji.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptexdir/kanji.c' object='ptexdir/libkanji_a-kanji.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkanji_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptexdir/libkanji_a-kanji.o `test -f 'ptexdir/kanji.c' || echo '$(srcdir)/'`ptexdir/kanji.c
+
+ptexdir/libkanji_a-kanji.obj: ptexdir/kanji.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkanji_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptexdir/libkanji_a-kanji.obj -MD -MP -MF ptexdir/$(DEPDIR)/libkanji_a-kanji.Tpo -c -o ptexdir/libkanji_a-kanji.obj `if test -f 'ptexdir/kanji.c'; then $(CYGPATH_W) 'ptexdir/kanji.c'; else $(CYGPATH_W) '$(srcdir)/ptexdir/kanji.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ptexdir/$(DEPDIR)/libkanji_a-kanji.Tpo ptexdir/$(DEPDIR)/libkanji_a-kanji.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptexdir/kanji.c' object='ptexdir/libkanji_a-kanji.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkanji_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptexdir/libkanji_a-kanji.obj `if test -f 'ptexdir/kanji.c'; then $(CYGPATH_W) 'ptexdir/kanji.c'; else $(CYGPATH_W) '$(srcdir)/ptexdir/kanji.c'; fi`
+
luatexdir/luafilesystem/src/libluajitmisc_a-lfs.o: luatexdir/luafilesystem/src/lfs.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluajitmisc_a_CPPFLAGS) $(CPPFLAGS) $(libluajitmisc_a_CFLAGS) $(CFLAGS) -MT luatexdir/luafilesystem/src/libluajitmisc_a-lfs.o -MD -MP -MF luatexdir/luafilesystem/src/$(DEPDIR)/libluajitmisc_a-lfs.Tpo -c -o luatexdir/luafilesystem/src/libluajitmisc_a-lfs.o `test -f 'luatexdir/luafilesystem/src/lfs.c' || echo '$(srcdir)/'`luatexdir/luafilesystem/src/lfs.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/luafilesystem/src/$(DEPDIR)/libluajitmisc_a-lfs.Tpo luatexdir/luafilesystem/src/$(DEPDIR)/libluajitmisc_a-lfs.Po
@@ -9237,75 +11227,467 @@ mplibdir/libmputil_a-decContext.obj: mplibdir/decContext.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmputil_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mplibdir/libmputil_a-decContext.obj `if test -f 'mplibdir/decContext.c'; then $(CYGPATH_W) 'mplibdir/decContext.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/decContext.c'; fi`
-luatexdir/unilib/libunilib_a-ArabicForms.o: luatexdir/unilib/ArabicForms.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -MT luatexdir/unilib/libunilib_a-ArabicForms.o -MD -MP -MF luatexdir/unilib/$(DEPDIR)/libunilib_a-ArabicForms.Tpo -c -o luatexdir/unilib/libunilib_a-ArabicForms.o `test -f 'luatexdir/unilib/ArabicForms.c' || echo '$(srcdir)/'`luatexdir/unilib/ArabicForms.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/unilib/$(DEPDIR)/libunilib_a-ArabicForms.Tpo luatexdir/unilib/$(DEPDIR)/libunilib_a-ArabicForms.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/unilib/ArabicForms.c' object='luatexdir/unilib/libunilib_a-ArabicForms.o' libtool=no @AMDEPBACKSLASH@
+pdftexdir/libpdftex_a-avl.o: pdftexdir/avl.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-avl.o -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-avl.Tpo -c -o pdftexdir/libpdftex_a-avl.o `test -f 'pdftexdir/avl.c' || echo '$(srcdir)/'`pdftexdir/avl.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-avl.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-avl.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/avl.c' object='pdftexdir/libpdftex_a-avl.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/unilib/libunilib_a-ArabicForms.o `test -f 'luatexdir/unilib/ArabicForms.c' || echo '$(srcdir)/'`luatexdir/unilib/ArabicForms.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-avl.o `test -f 'pdftexdir/avl.c' || echo '$(srcdir)/'`pdftexdir/avl.c
-luatexdir/unilib/libunilib_a-ArabicForms.obj: luatexdir/unilib/ArabicForms.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -MT luatexdir/unilib/libunilib_a-ArabicForms.obj -MD -MP -MF luatexdir/unilib/$(DEPDIR)/libunilib_a-ArabicForms.Tpo -c -o luatexdir/unilib/libunilib_a-ArabicForms.obj `if test -f 'luatexdir/unilib/ArabicForms.c'; then $(CYGPATH_W) 'luatexdir/unilib/ArabicForms.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/unilib/ArabicForms.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/unilib/$(DEPDIR)/libunilib_a-ArabicForms.Tpo luatexdir/unilib/$(DEPDIR)/libunilib_a-ArabicForms.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/unilib/ArabicForms.c' object='luatexdir/unilib/libunilib_a-ArabicForms.obj' libtool=no @AMDEPBACKSLASH@
+pdftexdir/libpdftex_a-avl.obj: pdftexdir/avl.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-avl.obj -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-avl.Tpo -c -o pdftexdir/libpdftex_a-avl.obj `if test -f 'pdftexdir/avl.c'; then $(CYGPATH_W) 'pdftexdir/avl.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/avl.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-avl.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-avl.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/avl.c' object='pdftexdir/libpdftex_a-avl.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/unilib/libunilib_a-ArabicForms.obj `if test -f 'luatexdir/unilib/ArabicForms.c'; then $(CYGPATH_W) 'luatexdir/unilib/ArabicForms.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/unilib/ArabicForms.c'; fi`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-avl.obj `if test -f 'pdftexdir/avl.c'; then $(CYGPATH_W) 'pdftexdir/avl.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/avl.c'; fi`
-luatexdir/unilib/libunilib_a-alphabet.o: luatexdir/unilib/alphabet.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -MT luatexdir/unilib/libunilib_a-alphabet.o -MD -MP -MF luatexdir/unilib/$(DEPDIR)/libunilib_a-alphabet.Tpo -c -o luatexdir/unilib/libunilib_a-alphabet.o `test -f 'luatexdir/unilib/alphabet.c' || echo '$(srcdir)/'`luatexdir/unilib/alphabet.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/unilib/$(DEPDIR)/libunilib_a-alphabet.Tpo luatexdir/unilib/$(DEPDIR)/libunilib_a-alphabet.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/unilib/alphabet.c' object='luatexdir/unilib/libunilib_a-alphabet.o' libtool=no @AMDEPBACKSLASH@
+pdftexdir/libpdftex_a-avlstuff.o: pdftexdir/avlstuff.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-avlstuff.o -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-avlstuff.Tpo -c -o pdftexdir/libpdftex_a-avlstuff.o `test -f 'pdftexdir/avlstuff.c' || echo '$(srcdir)/'`pdftexdir/avlstuff.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-avlstuff.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-avlstuff.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/avlstuff.c' object='pdftexdir/libpdftex_a-avlstuff.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/unilib/libunilib_a-alphabet.o `test -f 'luatexdir/unilib/alphabet.c' || echo '$(srcdir)/'`luatexdir/unilib/alphabet.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-avlstuff.o `test -f 'pdftexdir/avlstuff.c' || echo '$(srcdir)/'`pdftexdir/avlstuff.c
-luatexdir/unilib/libunilib_a-alphabet.obj: luatexdir/unilib/alphabet.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -MT luatexdir/unilib/libunilib_a-alphabet.obj -MD -MP -MF luatexdir/unilib/$(DEPDIR)/libunilib_a-alphabet.Tpo -c -o luatexdir/unilib/libunilib_a-alphabet.obj `if test -f 'luatexdir/unilib/alphabet.c'; then $(CYGPATH_W) 'luatexdir/unilib/alphabet.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/unilib/alphabet.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/unilib/$(DEPDIR)/libunilib_a-alphabet.Tpo luatexdir/unilib/$(DEPDIR)/libunilib_a-alphabet.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/unilib/alphabet.c' object='luatexdir/unilib/libunilib_a-alphabet.obj' libtool=no @AMDEPBACKSLASH@
+pdftexdir/libpdftex_a-avlstuff.obj: pdftexdir/avlstuff.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-avlstuff.obj -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-avlstuff.Tpo -c -o pdftexdir/libpdftex_a-avlstuff.obj `if test -f 'pdftexdir/avlstuff.c'; then $(CYGPATH_W) 'pdftexdir/avlstuff.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/avlstuff.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-avlstuff.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-avlstuff.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/avlstuff.c' object='pdftexdir/libpdftex_a-avlstuff.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/unilib/libunilib_a-alphabet.obj `if test -f 'luatexdir/unilib/alphabet.c'; then $(CYGPATH_W) 'luatexdir/unilib/alphabet.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/unilib/alphabet.c'; fi`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-avlstuff.obj `if test -f 'pdftexdir/avlstuff.c'; then $(CYGPATH_W) 'pdftexdir/avlstuff.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/avlstuff.c'; fi`
-luatexdir/unilib/libunilib_a-char.o: luatexdir/unilib/char.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -MT luatexdir/unilib/libunilib_a-char.o -MD -MP -MF luatexdir/unilib/$(DEPDIR)/libunilib_a-char.Tpo -c -o luatexdir/unilib/libunilib_a-char.o `test -f 'luatexdir/unilib/char.c' || echo '$(srcdir)/'`luatexdir/unilib/char.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/unilib/$(DEPDIR)/libunilib_a-char.Tpo luatexdir/unilib/$(DEPDIR)/libunilib_a-char.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/unilib/char.c' object='luatexdir/unilib/libunilib_a-char.o' libtool=no @AMDEPBACKSLASH@
+pdftexdir/libpdftex_a-epdf.o: pdftexdir/epdf.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-epdf.o -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-epdf.Tpo -c -o pdftexdir/libpdftex_a-epdf.o `test -f 'pdftexdir/epdf.c' || echo '$(srcdir)/'`pdftexdir/epdf.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-epdf.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-epdf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/epdf.c' object='pdftexdir/libpdftex_a-epdf.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/unilib/libunilib_a-char.o `test -f 'luatexdir/unilib/char.c' || echo '$(srcdir)/'`luatexdir/unilib/char.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-epdf.o `test -f 'pdftexdir/epdf.c' || echo '$(srcdir)/'`pdftexdir/epdf.c
-luatexdir/unilib/libunilib_a-char.obj: luatexdir/unilib/char.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -MT luatexdir/unilib/libunilib_a-char.obj -MD -MP -MF luatexdir/unilib/$(DEPDIR)/libunilib_a-char.Tpo -c -o luatexdir/unilib/libunilib_a-char.obj `if test -f 'luatexdir/unilib/char.c'; then $(CYGPATH_W) 'luatexdir/unilib/char.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/unilib/char.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/unilib/$(DEPDIR)/libunilib_a-char.Tpo luatexdir/unilib/$(DEPDIR)/libunilib_a-char.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/unilib/char.c' object='luatexdir/unilib/libunilib_a-char.obj' libtool=no @AMDEPBACKSLASH@
+pdftexdir/libpdftex_a-epdf.obj: pdftexdir/epdf.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-epdf.obj -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-epdf.Tpo -c -o pdftexdir/libpdftex_a-epdf.obj `if test -f 'pdftexdir/epdf.c'; then $(CYGPATH_W) 'pdftexdir/epdf.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/epdf.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-epdf.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-epdf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/epdf.c' object='pdftexdir/libpdftex_a-epdf.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/unilib/libunilib_a-char.obj `if test -f 'luatexdir/unilib/char.c'; then $(CYGPATH_W) 'luatexdir/unilib/char.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/unilib/char.c'; fi`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-epdf.obj `if test -f 'pdftexdir/epdf.c'; then $(CYGPATH_W) 'pdftexdir/epdf.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/epdf.c'; fi`
-luatexdir/unilib/libunilib_a-cjk.o: luatexdir/unilib/cjk.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -MT luatexdir/unilib/libunilib_a-cjk.o -MD -MP -MF luatexdir/unilib/$(DEPDIR)/libunilib_a-cjk.Tpo -c -o luatexdir/unilib/libunilib_a-cjk.o `test -f 'luatexdir/unilib/cjk.c' || echo '$(srcdir)/'`luatexdir/unilib/cjk.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/unilib/$(DEPDIR)/libunilib_a-cjk.Tpo luatexdir/unilib/$(DEPDIR)/libunilib_a-cjk.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/unilib/cjk.c' object='luatexdir/unilib/libunilib_a-cjk.o' libtool=no @AMDEPBACKSLASH@
+pdftexdir/libpdftex_a-mapfile.o: pdftexdir/mapfile.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-mapfile.o -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-mapfile.Tpo -c -o pdftexdir/libpdftex_a-mapfile.o `test -f 'pdftexdir/mapfile.c' || echo '$(srcdir)/'`pdftexdir/mapfile.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-mapfile.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-mapfile.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/mapfile.c' object='pdftexdir/libpdftex_a-mapfile.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/unilib/libunilib_a-cjk.o `test -f 'luatexdir/unilib/cjk.c' || echo '$(srcdir)/'`luatexdir/unilib/cjk.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-mapfile.o `test -f 'pdftexdir/mapfile.c' || echo '$(srcdir)/'`pdftexdir/mapfile.c
-luatexdir/unilib/libunilib_a-cjk.obj: luatexdir/unilib/cjk.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -MT luatexdir/unilib/libunilib_a-cjk.obj -MD -MP -MF luatexdir/unilib/$(DEPDIR)/libunilib_a-cjk.Tpo -c -o luatexdir/unilib/libunilib_a-cjk.obj `if test -f 'luatexdir/unilib/cjk.c'; then $(CYGPATH_W) 'luatexdir/unilib/cjk.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/unilib/cjk.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/unilib/$(DEPDIR)/libunilib_a-cjk.Tpo luatexdir/unilib/$(DEPDIR)/libunilib_a-cjk.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/unilib/cjk.c' object='luatexdir/unilib/libunilib_a-cjk.obj' libtool=no @AMDEPBACKSLASH@
+pdftexdir/libpdftex_a-mapfile.obj: pdftexdir/mapfile.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-mapfile.obj -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-mapfile.Tpo -c -o pdftexdir/libpdftex_a-mapfile.obj `if test -f 'pdftexdir/mapfile.c'; then $(CYGPATH_W) 'pdftexdir/mapfile.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/mapfile.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-mapfile.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-mapfile.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/mapfile.c' object='pdftexdir/libpdftex_a-mapfile.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/unilib/libunilib_a-cjk.obj `if test -f 'luatexdir/unilib/cjk.c'; then $(CYGPATH_W) 'luatexdir/unilib/cjk.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/unilib/cjk.c'; fi`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-mapfile.obj `if test -f 'pdftexdir/mapfile.c'; then $(CYGPATH_W) 'pdftexdir/mapfile.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/mapfile.c'; fi`
-luatexdir/unilib/libunilib_a-gwwiconv.o: luatexdir/unilib/gwwiconv.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -MT luatexdir/unilib/libunilib_a-gwwiconv.o -MD -MP -MF luatexdir/unilib/$(DEPDIR)/libunilib_a-gwwiconv.Tpo -c -o luatexdir/unilib/libunilib_a-gwwiconv.o `test -f 'luatexdir/unilib/gwwiconv.c' || echo '$(srcdir)/'`luatexdir/unilib/gwwiconv.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/unilib/$(DEPDIR)/libunilib_a-gwwiconv.Tpo luatexdir/unilib/$(DEPDIR)/libunilib_a-gwwiconv.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/unilib/gwwiconv.c' object='luatexdir/unilib/libunilib_a-gwwiconv.o' libtool=no @AMDEPBACKSLASH@
+pdftexdir/libpdftex_a-pkin.o: pdftexdir/pkin.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-pkin.o -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-pkin.Tpo -c -o pdftexdir/libpdftex_a-pkin.o `test -f 'pdftexdir/pkin.c' || echo '$(srcdir)/'`pdftexdir/pkin.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-pkin.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-pkin.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/pkin.c' object='pdftexdir/libpdftex_a-pkin.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/unilib/libunilib_a-gwwiconv.o `test -f 'luatexdir/unilib/gwwiconv.c' || echo '$(srcdir)/'`luatexdir/unilib/gwwiconv.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-pkin.o `test -f 'pdftexdir/pkin.c' || echo '$(srcdir)/'`pdftexdir/pkin.c
-luatexdir/unilib/libunilib_a-gwwiconv.obj: luatexdir/unilib/gwwiconv.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -MT luatexdir/unilib/libunilib_a-gwwiconv.obj -MD -MP -MF luatexdir/unilib/$(DEPDIR)/libunilib_a-gwwiconv.Tpo -c -o luatexdir/unilib/libunilib_a-gwwiconv.obj `if test -f 'luatexdir/unilib/gwwiconv.c'; then $(CYGPATH_W) 'luatexdir/unilib/gwwiconv.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/unilib/gwwiconv.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/unilib/$(DEPDIR)/libunilib_a-gwwiconv.Tpo luatexdir/unilib/$(DEPDIR)/libunilib_a-gwwiconv.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/unilib/gwwiconv.c' object='luatexdir/unilib/libunilib_a-gwwiconv.obj' libtool=no @AMDEPBACKSLASH@
+pdftexdir/libpdftex_a-pkin.obj: pdftexdir/pkin.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-pkin.obj -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-pkin.Tpo -c -o pdftexdir/libpdftex_a-pkin.obj `if test -f 'pdftexdir/pkin.c'; then $(CYGPATH_W) 'pdftexdir/pkin.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/pkin.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-pkin.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-pkin.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/pkin.c' object='pdftexdir/libpdftex_a-pkin.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/unilib/libunilib_a-gwwiconv.obj `if test -f 'luatexdir/unilib/gwwiconv.c'; then $(CYGPATH_W) 'luatexdir/unilib/gwwiconv.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/unilib/gwwiconv.c'; fi`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-pkin.obj `if test -f 'pdftexdir/pkin.c'; then $(CYGPATH_W) 'pdftexdir/pkin.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/pkin.c'; fi`
+
+pdftexdir/libpdftex_a-subfont.o: pdftexdir/subfont.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-subfont.o -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-subfont.Tpo -c -o pdftexdir/libpdftex_a-subfont.o `test -f 'pdftexdir/subfont.c' || echo '$(srcdir)/'`pdftexdir/subfont.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-subfont.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-subfont.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/subfont.c' object='pdftexdir/libpdftex_a-subfont.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-subfont.o `test -f 'pdftexdir/subfont.c' || echo '$(srcdir)/'`pdftexdir/subfont.c
+
+pdftexdir/libpdftex_a-subfont.obj: pdftexdir/subfont.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-subfont.obj -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-subfont.Tpo -c -o pdftexdir/libpdftex_a-subfont.obj `if test -f 'pdftexdir/subfont.c'; then $(CYGPATH_W) 'pdftexdir/subfont.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/subfont.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-subfont.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-subfont.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/subfont.c' object='pdftexdir/libpdftex_a-subfont.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-subfont.obj `if test -f 'pdftexdir/subfont.c'; then $(CYGPATH_W) 'pdftexdir/subfont.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/subfont.c'; fi`
+
+pdftexdir/libpdftex_a-tounicode.o: pdftexdir/tounicode.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-tounicode.o -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-tounicode.Tpo -c -o pdftexdir/libpdftex_a-tounicode.o `test -f 'pdftexdir/tounicode.c' || echo '$(srcdir)/'`pdftexdir/tounicode.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-tounicode.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-tounicode.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/tounicode.c' object='pdftexdir/libpdftex_a-tounicode.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-tounicode.o `test -f 'pdftexdir/tounicode.c' || echo '$(srcdir)/'`pdftexdir/tounicode.c
+
+pdftexdir/libpdftex_a-tounicode.obj: pdftexdir/tounicode.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-tounicode.obj -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-tounicode.Tpo -c -o pdftexdir/libpdftex_a-tounicode.obj `if test -f 'pdftexdir/tounicode.c'; then $(CYGPATH_W) 'pdftexdir/tounicode.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/tounicode.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-tounicode.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-tounicode.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/tounicode.c' object='pdftexdir/libpdftex_a-tounicode.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-tounicode.obj `if test -f 'pdftexdir/tounicode.c'; then $(CYGPATH_W) 'pdftexdir/tounicode.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/tounicode.c'; fi`
+
+pdftexdir/libpdftex_a-utils.o: pdftexdir/utils.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-utils.o -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-utils.Tpo -c -o pdftexdir/libpdftex_a-utils.o `test -f 'pdftexdir/utils.c' || echo '$(srcdir)/'`pdftexdir/utils.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-utils.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/utils.c' object='pdftexdir/libpdftex_a-utils.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-utils.o `test -f 'pdftexdir/utils.c' || echo '$(srcdir)/'`pdftexdir/utils.c
+
+pdftexdir/libpdftex_a-utils.obj: pdftexdir/utils.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-utils.obj -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-utils.Tpo -c -o pdftexdir/libpdftex_a-utils.obj `if test -f 'pdftexdir/utils.c'; then $(CYGPATH_W) 'pdftexdir/utils.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/utils.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-utils.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/utils.c' object='pdftexdir/libpdftex_a-utils.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-utils.obj `if test -f 'pdftexdir/utils.c'; then $(CYGPATH_W) 'pdftexdir/utils.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/utils.c'; fi`
+
+pdftexdir/libpdftex_a-vfpacket.o: pdftexdir/vfpacket.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-vfpacket.o -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-vfpacket.Tpo -c -o pdftexdir/libpdftex_a-vfpacket.o `test -f 'pdftexdir/vfpacket.c' || echo '$(srcdir)/'`pdftexdir/vfpacket.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-vfpacket.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-vfpacket.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/vfpacket.c' object='pdftexdir/libpdftex_a-vfpacket.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-vfpacket.o `test -f 'pdftexdir/vfpacket.c' || echo '$(srcdir)/'`pdftexdir/vfpacket.c
+
+pdftexdir/libpdftex_a-vfpacket.obj: pdftexdir/vfpacket.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-vfpacket.obj -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-vfpacket.Tpo -c -o pdftexdir/libpdftex_a-vfpacket.obj `if test -f 'pdftexdir/vfpacket.c'; then $(CYGPATH_W) 'pdftexdir/vfpacket.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/vfpacket.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-vfpacket.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-vfpacket.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/vfpacket.c' object='pdftexdir/libpdftex_a-vfpacket.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-vfpacket.obj `if test -f 'pdftexdir/vfpacket.c'; then $(CYGPATH_W) 'pdftexdir/vfpacket.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/vfpacket.c'; fi`
+
+pdftexdir/libpdftex_a-writeenc.o: pdftexdir/writeenc.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-writeenc.o -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-writeenc.Tpo -c -o pdftexdir/libpdftex_a-writeenc.o `test -f 'pdftexdir/writeenc.c' || echo '$(srcdir)/'`pdftexdir/writeenc.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-writeenc.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-writeenc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/writeenc.c' object='pdftexdir/libpdftex_a-writeenc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-writeenc.o `test -f 'pdftexdir/writeenc.c' || echo '$(srcdir)/'`pdftexdir/writeenc.c
+
+pdftexdir/libpdftex_a-writeenc.obj: pdftexdir/writeenc.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-writeenc.obj -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-writeenc.Tpo -c -o pdftexdir/libpdftex_a-writeenc.obj `if test -f 'pdftexdir/writeenc.c'; then $(CYGPATH_W) 'pdftexdir/writeenc.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/writeenc.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-writeenc.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-writeenc.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/writeenc.c' object='pdftexdir/libpdftex_a-writeenc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-writeenc.obj `if test -f 'pdftexdir/writeenc.c'; then $(CYGPATH_W) 'pdftexdir/writeenc.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/writeenc.c'; fi`
+
+pdftexdir/libpdftex_a-writefont.o: pdftexdir/writefont.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-writefont.o -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-writefont.Tpo -c -o pdftexdir/libpdftex_a-writefont.o `test -f 'pdftexdir/writefont.c' || echo '$(srcdir)/'`pdftexdir/writefont.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-writefont.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-writefont.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/writefont.c' object='pdftexdir/libpdftex_a-writefont.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-writefont.o `test -f 'pdftexdir/writefont.c' || echo '$(srcdir)/'`pdftexdir/writefont.c
+
+pdftexdir/libpdftex_a-writefont.obj: pdftexdir/writefont.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-writefont.obj -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-writefont.Tpo -c -o pdftexdir/libpdftex_a-writefont.obj `if test -f 'pdftexdir/writefont.c'; then $(CYGPATH_W) 'pdftexdir/writefont.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/writefont.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-writefont.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-writefont.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/writefont.c' object='pdftexdir/libpdftex_a-writefont.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-writefont.obj `if test -f 'pdftexdir/writefont.c'; then $(CYGPATH_W) 'pdftexdir/writefont.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/writefont.c'; fi`
+
+pdftexdir/libpdftex_a-writeimg.o: pdftexdir/writeimg.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-writeimg.o -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-writeimg.Tpo -c -o pdftexdir/libpdftex_a-writeimg.o `test -f 'pdftexdir/writeimg.c' || echo '$(srcdir)/'`pdftexdir/writeimg.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-writeimg.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-writeimg.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/writeimg.c' object='pdftexdir/libpdftex_a-writeimg.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-writeimg.o `test -f 'pdftexdir/writeimg.c' || echo '$(srcdir)/'`pdftexdir/writeimg.c
+
+pdftexdir/libpdftex_a-writeimg.obj: pdftexdir/writeimg.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-writeimg.obj -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-writeimg.Tpo -c -o pdftexdir/libpdftex_a-writeimg.obj `if test -f 'pdftexdir/writeimg.c'; then $(CYGPATH_W) 'pdftexdir/writeimg.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/writeimg.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-writeimg.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-writeimg.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/writeimg.c' object='pdftexdir/libpdftex_a-writeimg.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-writeimg.obj `if test -f 'pdftexdir/writeimg.c'; then $(CYGPATH_W) 'pdftexdir/writeimg.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/writeimg.c'; fi`
+
+pdftexdir/libpdftex_a-writejbig2.o: pdftexdir/writejbig2.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-writejbig2.o -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-writejbig2.Tpo -c -o pdftexdir/libpdftex_a-writejbig2.o `test -f 'pdftexdir/writejbig2.c' || echo '$(srcdir)/'`pdftexdir/writejbig2.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-writejbig2.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-writejbig2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/writejbig2.c' object='pdftexdir/libpdftex_a-writejbig2.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-writejbig2.o `test -f 'pdftexdir/writejbig2.c' || echo '$(srcdir)/'`pdftexdir/writejbig2.c
+
+pdftexdir/libpdftex_a-writejbig2.obj: pdftexdir/writejbig2.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-writejbig2.obj -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-writejbig2.Tpo -c -o pdftexdir/libpdftex_a-writejbig2.obj `if test -f 'pdftexdir/writejbig2.c'; then $(CYGPATH_W) 'pdftexdir/writejbig2.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/writejbig2.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-writejbig2.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-writejbig2.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/writejbig2.c' object='pdftexdir/libpdftex_a-writejbig2.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-writejbig2.obj `if test -f 'pdftexdir/writejbig2.c'; then $(CYGPATH_W) 'pdftexdir/writejbig2.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/writejbig2.c'; fi`
+
+pdftexdir/libpdftex_a-writejpg.o: pdftexdir/writejpg.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-writejpg.o -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-writejpg.Tpo -c -o pdftexdir/libpdftex_a-writejpg.o `test -f 'pdftexdir/writejpg.c' || echo '$(srcdir)/'`pdftexdir/writejpg.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-writejpg.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-writejpg.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/writejpg.c' object='pdftexdir/libpdftex_a-writejpg.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-writejpg.o `test -f 'pdftexdir/writejpg.c' || echo '$(srcdir)/'`pdftexdir/writejpg.c
+
+pdftexdir/libpdftex_a-writejpg.obj: pdftexdir/writejpg.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-writejpg.obj -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-writejpg.Tpo -c -o pdftexdir/libpdftex_a-writejpg.obj `if test -f 'pdftexdir/writejpg.c'; then $(CYGPATH_W) 'pdftexdir/writejpg.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/writejpg.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-writejpg.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-writejpg.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/writejpg.c' object='pdftexdir/libpdftex_a-writejpg.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-writejpg.obj `if test -f 'pdftexdir/writejpg.c'; then $(CYGPATH_W) 'pdftexdir/writejpg.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/writejpg.c'; fi`
+
+pdftexdir/libpdftex_a-writepng.o: pdftexdir/writepng.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-writepng.o -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-writepng.Tpo -c -o pdftexdir/libpdftex_a-writepng.o `test -f 'pdftexdir/writepng.c' || echo '$(srcdir)/'`pdftexdir/writepng.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-writepng.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-writepng.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/writepng.c' object='pdftexdir/libpdftex_a-writepng.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-writepng.o `test -f 'pdftexdir/writepng.c' || echo '$(srcdir)/'`pdftexdir/writepng.c
+
+pdftexdir/libpdftex_a-writepng.obj: pdftexdir/writepng.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-writepng.obj -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-writepng.Tpo -c -o pdftexdir/libpdftex_a-writepng.obj `if test -f 'pdftexdir/writepng.c'; then $(CYGPATH_W) 'pdftexdir/writepng.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/writepng.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-writepng.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-writepng.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/writepng.c' object='pdftexdir/libpdftex_a-writepng.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-writepng.obj `if test -f 'pdftexdir/writepng.c'; then $(CYGPATH_W) 'pdftexdir/writepng.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/writepng.c'; fi`
+
+pdftexdir/libpdftex_a-writet1.o: pdftexdir/writet1.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-writet1.o -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-writet1.Tpo -c -o pdftexdir/libpdftex_a-writet1.o `test -f 'pdftexdir/writet1.c' || echo '$(srcdir)/'`pdftexdir/writet1.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-writet1.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-writet1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/writet1.c' object='pdftexdir/libpdftex_a-writet1.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-writet1.o `test -f 'pdftexdir/writet1.c' || echo '$(srcdir)/'`pdftexdir/writet1.c
+
+pdftexdir/libpdftex_a-writet1.obj: pdftexdir/writet1.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-writet1.obj -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-writet1.Tpo -c -o pdftexdir/libpdftex_a-writet1.obj `if test -f 'pdftexdir/writet1.c'; then $(CYGPATH_W) 'pdftexdir/writet1.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/writet1.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-writet1.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-writet1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/writet1.c' object='pdftexdir/libpdftex_a-writet1.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-writet1.obj `if test -f 'pdftexdir/writet1.c'; then $(CYGPATH_W) 'pdftexdir/writet1.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/writet1.c'; fi`
+
+pdftexdir/libpdftex_a-writet3.o: pdftexdir/writet3.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-writet3.o -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-writet3.Tpo -c -o pdftexdir/libpdftex_a-writet3.o `test -f 'pdftexdir/writet3.c' || echo '$(srcdir)/'`pdftexdir/writet3.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-writet3.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-writet3.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/writet3.c' object='pdftexdir/libpdftex_a-writet3.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-writet3.o `test -f 'pdftexdir/writet3.c' || echo '$(srcdir)/'`pdftexdir/writet3.c
+
+pdftexdir/libpdftex_a-writet3.obj: pdftexdir/writet3.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-writet3.obj -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-writet3.Tpo -c -o pdftexdir/libpdftex_a-writet3.obj `if test -f 'pdftexdir/writet3.c'; then $(CYGPATH_W) 'pdftexdir/writet3.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/writet3.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-writet3.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-writet3.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/writet3.c' object='pdftexdir/libpdftex_a-writet3.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-writet3.obj `if test -f 'pdftexdir/writet3.c'; then $(CYGPATH_W) 'pdftexdir/writet3.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/writet3.c'; fi`
+
+pdftexdir/libpdftex_a-writettf.o: pdftexdir/writettf.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-writettf.o -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-writettf.Tpo -c -o pdftexdir/libpdftex_a-writettf.o `test -f 'pdftexdir/writettf.c' || echo '$(srcdir)/'`pdftexdir/writettf.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-writettf.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-writettf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/writettf.c' object='pdftexdir/libpdftex_a-writettf.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-writettf.o `test -f 'pdftexdir/writettf.c' || echo '$(srcdir)/'`pdftexdir/writettf.c
+
+pdftexdir/libpdftex_a-writettf.obj: pdftexdir/writettf.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-writettf.obj -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-writettf.Tpo -c -o pdftexdir/libpdftex_a-writettf.obj `if test -f 'pdftexdir/writettf.c'; then $(CYGPATH_W) 'pdftexdir/writettf.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/writettf.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-writettf.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-writettf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/writettf.c' object='pdftexdir/libpdftex_a-writettf.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-writettf.obj `if test -f 'pdftexdir/writettf.c'; then $(CYGPATH_W) 'pdftexdir/writettf.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/writettf.c'; fi`
+
+pdftexdir/libpdftex_a-writezip.o: pdftexdir/writezip.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-writezip.o -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-writezip.Tpo -c -o pdftexdir/libpdftex_a-writezip.o `test -f 'pdftexdir/writezip.c' || echo '$(srcdir)/'`pdftexdir/writezip.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-writezip.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-writezip.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/writezip.c' object='pdftexdir/libpdftex_a-writezip.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-writezip.o `test -f 'pdftexdir/writezip.c' || echo '$(srcdir)/'`pdftexdir/writezip.c
+
+pdftexdir/libpdftex_a-writezip.obj: pdftexdir/writezip.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-writezip.obj -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-writezip.Tpo -c -o pdftexdir/libpdftex_a-writezip.obj `if test -f 'pdftexdir/writezip.c'; then $(CYGPATH_W) 'pdftexdir/writezip.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/writezip.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-writezip.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-writezip.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/writezip.c' object='pdftexdir/libpdftex_a-writezip.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-writezip.obj `if test -f 'pdftexdir/writezip.c'; then $(CYGPATH_W) 'pdftexdir/writezip.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/writezip.c'; fi`
+
+pdftexdir/regex/libpdftex_a-regex.o: pdftexdir/regex/regex.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/regex/libpdftex_a-regex.o -MD -MP -MF pdftexdir/regex/$(DEPDIR)/libpdftex_a-regex.Tpo -c -o pdftexdir/regex/libpdftex_a-regex.o `test -f 'pdftexdir/regex/regex.c' || echo '$(srcdir)/'`pdftexdir/regex/regex.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/regex/$(DEPDIR)/libpdftex_a-regex.Tpo pdftexdir/regex/$(DEPDIR)/libpdftex_a-regex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/regex/regex.c' object='pdftexdir/regex/libpdftex_a-regex.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/regex/libpdftex_a-regex.o `test -f 'pdftexdir/regex/regex.c' || echo '$(srcdir)/'`pdftexdir/regex/regex.c
+
+pdftexdir/regex/libpdftex_a-regex.obj: pdftexdir/regex/regex.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/regex/libpdftex_a-regex.obj -MD -MP -MF pdftexdir/regex/$(DEPDIR)/libpdftex_a-regex.Tpo -c -o pdftexdir/regex/libpdftex_a-regex.obj `if test -f 'pdftexdir/regex/regex.c'; then $(CYGPATH_W) 'pdftexdir/regex/regex.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/regex/regex.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/regex/$(DEPDIR)/libpdftex_a-regex.Tpo pdftexdir/regex/$(DEPDIR)/libpdftex_a-regex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/regex/regex.c' object='pdftexdir/regex/libpdftex_a-regex.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/regex/libpdftex_a-regex.obj `if test -f 'pdftexdir/regex/regex.c'; then $(CYGPATH_W) 'pdftexdir/regex/regex.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/regex/regex.c'; fi`
+
+pdftexdir/libpdftex_a-macnames.o: pdftexdir/macnames.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-macnames.o -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-macnames.Tpo -c -o pdftexdir/libpdftex_a-macnames.o `test -f 'pdftexdir/macnames.c' || echo '$(srcdir)/'`pdftexdir/macnames.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-macnames.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-macnames.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/macnames.c' object='pdftexdir/libpdftex_a-macnames.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-macnames.o `test -f 'pdftexdir/macnames.c' || echo '$(srcdir)/'`pdftexdir/macnames.c
+
+pdftexdir/libpdftex_a-macnames.obj: pdftexdir/macnames.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/libpdftex_a-macnames.obj -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-macnames.Tpo -c -o pdftexdir/libpdftex_a-macnames.obj `if test -f 'pdftexdir/macnames.c'; then $(CYGPATH_W) 'pdftexdir/macnames.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/macnames.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-macnames.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-macnames.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/macnames.c' object='pdftexdir/libpdftex_a-macnames.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/libpdftex_a-macnames.obj `if test -f 'pdftexdir/macnames.c'; then $(CYGPATH_W) 'pdftexdir/macnames.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/macnames.c'; fi`
+
+pdftexdir/regex/libpdftex_a-regcomp.o: pdftexdir/regex/regcomp.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/regex/libpdftex_a-regcomp.o -MD -MP -MF pdftexdir/regex/$(DEPDIR)/libpdftex_a-regcomp.Tpo -c -o pdftexdir/regex/libpdftex_a-regcomp.o `test -f 'pdftexdir/regex/regcomp.c' || echo '$(srcdir)/'`pdftexdir/regex/regcomp.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/regex/$(DEPDIR)/libpdftex_a-regcomp.Tpo pdftexdir/regex/$(DEPDIR)/libpdftex_a-regcomp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/regex/regcomp.c' object='pdftexdir/regex/libpdftex_a-regcomp.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/regex/libpdftex_a-regcomp.o `test -f 'pdftexdir/regex/regcomp.c' || echo '$(srcdir)/'`pdftexdir/regex/regcomp.c
+
+pdftexdir/regex/libpdftex_a-regcomp.obj: pdftexdir/regex/regcomp.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/regex/libpdftex_a-regcomp.obj -MD -MP -MF pdftexdir/regex/$(DEPDIR)/libpdftex_a-regcomp.Tpo -c -o pdftexdir/regex/libpdftex_a-regcomp.obj `if test -f 'pdftexdir/regex/regcomp.c'; then $(CYGPATH_W) 'pdftexdir/regex/regcomp.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/regex/regcomp.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/regex/$(DEPDIR)/libpdftex_a-regcomp.Tpo pdftexdir/regex/$(DEPDIR)/libpdftex_a-regcomp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/regex/regcomp.c' object='pdftexdir/regex/libpdftex_a-regcomp.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/regex/libpdftex_a-regcomp.obj `if test -f 'pdftexdir/regex/regcomp.c'; then $(CYGPATH_W) 'pdftexdir/regex/regcomp.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/regex/regcomp.c'; fi`
+
+pdftexdir/regex/libpdftex_a-regex_internal.o: pdftexdir/regex/regex_internal.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/regex/libpdftex_a-regex_internal.o -MD -MP -MF pdftexdir/regex/$(DEPDIR)/libpdftex_a-regex_internal.Tpo -c -o pdftexdir/regex/libpdftex_a-regex_internal.o `test -f 'pdftexdir/regex/regex_internal.c' || echo '$(srcdir)/'`pdftexdir/regex/regex_internal.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/regex/$(DEPDIR)/libpdftex_a-regex_internal.Tpo pdftexdir/regex/$(DEPDIR)/libpdftex_a-regex_internal.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/regex/regex_internal.c' object='pdftexdir/regex/libpdftex_a-regex_internal.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/regex/libpdftex_a-regex_internal.o `test -f 'pdftexdir/regex/regex_internal.c' || echo '$(srcdir)/'`pdftexdir/regex/regex_internal.c
+
+pdftexdir/regex/libpdftex_a-regex_internal.obj: pdftexdir/regex/regex_internal.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/regex/libpdftex_a-regex_internal.obj -MD -MP -MF pdftexdir/regex/$(DEPDIR)/libpdftex_a-regex_internal.Tpo -c -o pdftexdir/regex/libpdftex_a-regex_internal.obj `if test -f 'pdftexdir/regex/regex_internal.c'; then $(CYGPATH_W) 'pdftexdir/regex/regex_internal.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/regex/regex_internal.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/regex/$(DEPDIR)/libpdftex_a-regex_internal.Tpo pdftexdir/regex/$(DEPDIR)/libpdftex_a-regex_internal.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/regex/regex_internal.c' object='pdftexdir/regex/libpdftex_a-regex_internal.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/regex/libpdftex_a-regex_internal.obj `if test -f 'pdftexdir/regex/regex_internal.c'; then $(CYGPATH_W) 'pdftexdir/regex/regex_internal.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/regex/regex_internal.c'; fi`
+
+pdftexdir/regex/libpdftex_a-regexec.o: pdftexdir/regex/regexec.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/regex/libpdftex_a-regexec.o -MD -MP -MF pdftexdir/regex/$(DEPDIR)/libpdftex_a-regexec.Tpo -c -o pdftexdir/regex/libpdftex_a-regexec.o `test -f 'pdftexdir/regex/regexec.c' || echo '$(srcdir)/'`pdftexdir/regex/regexec.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/regex/$(DEPDIR)/libpdftex_a-regexec.Tpo pdftexdir/regex/$(DEPDIR)/libpdftex_a-regexec.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/regex/regexec.c' object='pdftexdir/regex/libpdftex_a-regexec.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/regex/libpdftex_a-regexec.o `test -f 'pdftexdir/regex/regexec.c' || echo '$(srcdir)/'`pdftexdir/regex/regexec.c
+
+pdftexdir/regex/libpdftex_a-regexec.obj: pdftexdir/regex/regexec.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/regex/libpdftex_a-regexec.obj -MD -MP -MF pdftexdir/regex/$(DEPDIR)/libpdftex_a-regexec.Tpo -c -o pdftexdir/regex/libpdftex_a-regexec.obj `if test -f 'pdftexdir/regex/regexec.c'; then $(CYGPATH_W) 'pdftexdir/regex/regexec.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/regex/regexec.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/regex/$(DEPDIR)/libpdftex_a-regexec.Tpo pdftexdir/regex/$(DEPDIR)/libpdftex_a-regexec.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/regex/regexec.c' object='pdftexdir/regex/libpdftex_a-regexec.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/regex/libpdftex_a-regexec.obj `if test -f 'pdftexdir/regex/regexec.c'; then $(CYGPATH_W) 'pdftexdir/regex/regexec.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/regex/regexec.c'; fi`
+
+synctexdir/libsynctex_a-synctex_parser.o: synctexdir/synctex_parser.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsynctex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/libsynctex_a-synctex_parser.o -MD -MP -MF synctexdir/$(DEPDIR)/libsynctex_a-synctex_parser.Tpo -c -o synctexdir/libsynctex_a-synctex_parser.o `test -f 'synctexdir/synctex_parser.c' || echo '$(srcdir)/'`synctexdir/synctex_parser.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/libsynctex_a-synctex_parser.Tpo synctexdir/$(DEPDIR)/libsynctex_a-synctex_parser.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex_parser.c' object='synctexdir/libsynctex_a-synctex_parser.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsynctex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/libsynctex_a-synctex_parser.o `test -f 'synctexdir/synctex_parser.c' || echo '$(srcdir)/'`synctexdir/synctex_parser.c
+
+synctexdir/libsynctex_a-synctex_parser.obj: synctexdir/synctex_parser.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsynctex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/libsynctex_a-synctex_parser.obj -MD -MP -MF synctexdir/$(DEPDIR)/libsynctex_a-synctex_parser.Tpo -c -o synctexdir/libsynctex_a-synctex_parser.obj `if test -f 'synctexdir/synctex_parser.c'; then $(CYGPATH_W) 'synctexdir/synctex_parser.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex_parser.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/libsynctex_a-synctex_parser.Tpo synctexdir/$(DEPDIR)/libsynctex_a-synctex_parser.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex_parser.c' object='synctexdir/libsynctex_a-synctex_parser.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsynctex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/libsynctex_a-synctex_parser.obj `if test -f 'synctexdir/synctex_parser.c'; then $(CYGPATH_W) 'synctexdir/synctex_parser.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex_parser.c'; fi`
+
+synctexdir/libsynctex_a-synctex_parser_utils.o: synctexdir/synctex_parser_utils.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsynctex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/libsynctex_a-synctex_parser_utils.o -MD -MP -MF synctexdir/$(DEPDIR)/libsynctex_a-synctex_parser_utils.Tpo -c -o synctexdir/libsynctex_a-synctex_parser_utils.o `test -f 'synctexdir/synctex_parser_utils.c' || echo '$(srcdir)/'`synctexdir/synctex_parser_utils.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/libsynctex_a-synctex_parser_utils.Tpo synctexdir/$(DEPDIR)/libsynctex_a-synctex_parser_utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex_parser_utils.c' object='synctexdir/libsynctex_a-synctex_parser_utils.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsynctex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/libsynctex_a-synctex_parser_utils.o `test -f 'synctexdir/synctex_parser_utils.c' || echo '$(srcdir)/'`synctexdir/synctex_parser_utils.c
+
+synctexdir/libsynctex_a-synctex_parser_utils.obj: synctexdir/synctex_parser_utils.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsynctex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/libsynctex_a-synctex_parser_utils.obj -MD -MP -MF synctexdir/$(DEPDIR)/libsynctex_a-synctex_parser_utils.Tpo -c -o synctexdir/libsynctex_a-synctex_parser_utils.obj `if test -f 'synctexdir/synctex_parser_utils.c'; then $(CYGPATH_W) 'synctexdir/synctex_parser_utils.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex_parser_utils.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/libsynctex_a-synctex_parser_utils.Tpo synctexdir/$(DEPDIR)/libsynctex_a-synctex_parser_utils.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex_parser_utils.c' object='synctexdir/libsynctex_a-synctex_parser_utils.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsynctex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/libsynctex_a-synctex_parser_utils.obj `if test -f 'synctexdir/synctex_parser_utils.c'; then $(CYGPATH_W) 'synctexdir/synctex_parser_utils.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex_parser_utils.c'; fi`
+
+uptexdir/libukanji_a-kanji.o: uptexdir/kanji.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libukanji_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uptexdir/libukanji_a-kanji.o -MD -MP -MF uptexdir/$(DEPDIR)/libukanji_a-kanji.Tpo -c -o uptexdir/libukanji_a-kanji.o `test -f 'uptexdir/kanji.c' || echo '$(srcdir)/'`uptexdir/kanji.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) uptexdir/$(DEPDIR)/libukanji_a-kanji.Tpo uptexdir/$(DEPDIR)/libukanji_a-kanji.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='uptexdir/kanji.c' object='uptexdir/libukanji_a-kanji.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libukanji_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uptexdir/libukanji_a-kanji.o `test -f 'uptexdir/kanji.c' || echo '$(srcdir)/'`uptexdir/kanji.c
+
+uptexdir/libukanji_a-kanji.obj: uptexdir/kanji.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libukanji_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uptexdir/libukanji_a-kanji.obj -MD -MP -MF uptexdir/$(DEPDIR)/libukanji_a-kanji.Tpo -c -o uptexdir/libukanji_a-kanji.obj `if test -f 'uptexdir/kanji.c'; then $(CYGPATH_W) 'uptexdir/kanji.c'; else $(CYGPATH_W) '$(srcdir)/uptexdir/kanji.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) uptexdir/$(DEPDIR)/libukanji_a-kanji.Tpo uptexdir/$(DEPDIR)/libukanji_a-kanji.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='uptexdir/kanji.c' object='uptexdir/libukanji_a-kanji.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libukanji_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uptexdir/libukanji_a-kanji.obj `if test -f 'uptexdir/kanji.c'; then $(CYGPATH_W) 'uptexdir/kanji.c'; else $(CYGPATH_W) '$(srcdir)/uptexdir/kanji.c'; fi`
+
+uptexdir/libukanji_a-kanji_dump.o: uptexdir/kanji_dump.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libukanji_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uptexdir/libukanji_a-kanji_dump.o -MD -MP -MF uptexdir/$(DEPDIR)/libukanji_a-kanji_dump.Tpo -c -o uptexdir/libukanji_a-kanji_dump.o `test -f 'uptexdir/kanji_dump.c' || echo '$(srcdir)/'`uptexdir/kanji_dump.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) uptexdir/$(DEPDIR)/libukanji_a-kanji_dump.Tpo uptexdir/$(DEPDIR)/libukanji_a-kanji_dump.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='uptexdir/kanji_dump.c' object='uptexdir/libukanji_a-kanji_dump.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libukanji_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uptexdir/libukanji_a-kanji_dump.o `test -f 'uptexdir/kanji_dump.c' || echo '$(srcdir)/'`uptexdir/kanji_dump.c
+
+uptexdir/libukanji_a-kanji_dump.obj: uptexdir/kanji_dump.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libukanji_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uptexdir/libukanji_a-kanji_dump.obj -MD -MP -MF uptexdir/$(DEPDIR)/libukanji_a-kanji_dump.Tpo -c -o uptexdir/libukanji_a-kanji_dump.obj `if test -f 'uptexdir/kanji_dump.c'; then $(CYGPATH_W) 'uptexdir/kanji_dump.c'; else $(CYGPATH_W) '$(srcdir)/uptexdir/kanji_dump.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) uptexdir/$(DEPDIR)/libukanji_a-kanji_dump.Tpo uptexdir/$(DEPDIR)/libukanji_a-kanji_dump.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='uptexdir/kanji_dump.c' object='uptexdir/libukanji_a-kanji_dump.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libukanji_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uptexdir/libukanji_a-kanji_dump.obj `if test -f 'uptexdir/kanji_dump.c'; then $(CYGPATH_W) 'uptexdir/kanji_dump.c'; else $(CYGPATH_W) '$(srcdir)/uptexdir/kanji_dump.c'; fi`
+
+luatexdir/unilib/libunilib_a-ArabicForms.o: luatexdir/unilib/ArabicForms.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -MT luatexdir/unilib/libunilib_a-ArabicForms.o -MD -MP -MF luatexdir/unilib/$(DEPDIR)/libunilib_a-ArabicForms.Tpo -c -o luatexdir/unilib/libunilib_a-ArabicForms.o `test -f 'luatexdir/unilib/ArabicForms.c' || echo '$(srcdir)/'`luatexdir/unilib/ArabicForms.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/unilib/$(DEPDIR)/libunilib_a-ArabicForms.Tpo luatexdir/unilib/$(DEPDIR)/libunilib_a-ArabicForms.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/unilib/ArabicForms.c' object='luatexdir/unilib/libunilib_a-ArabicForms.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/unilib/libunilib_a-ArabicForms.o `test -f 'luatexdir/unilib/ArabicForms.c' || echo '$(srcdir)/'`luatexdir/unilib/ArabicForms.c
+
+luatexdir/unilib/libunilib_a-ArabicForms.obj: luatexdir/unilib/ArabicForms.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -MT luatexdir/unilib/libunilib_a-ArabicForms.obj -MD -MP -MF luatexdir/unilib/$(DEPDIR)/libunilib_a-ArabicForms.Tpo -c -o luatexdir/unilib/libunilib_a-ArabicForms.obj `if test -f 'luatexdir/unilib/ArabicForms.c'; then $(CYGPATH_W) 'luatexdir/unilib/ArabicForms.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/unilib/ArabicForms.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/unilib/$(DEPDIR)/libunilib_a-ArabicForms.Tpo luatexdir/unilib/$(DEPDIR)/libunilib_a-ArabicForms.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/unilib/ArabicForms.c' object='luatexdir/unilib/libunilib_a-ArabicForms.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/unilib/libunilib_a-ArabicForms.obj `if test -f 'luatexdir/unilib/ArabicForms.c'; then $(CYGPATH_W) 'luatexdir/unilib/ArabicForms.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/unilib/ArabicForms.c'; fi`
+
+luatexdir/unilib/libunilib_a-alphabet.o: luatexdir/unilib/alphabet.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -MT luatexdir/unilib/libunilib_a-alphabet.o -MD -MP -MF luatexdir/unilib/$(DEPDIR)/libunilib_a-alphabet.Tpo -c -o luatexdir/unilib/libunilib_a-alphabet.o `test -f 'luatexdir/unilib/alphabet.c' || echo '$(srcdir)/'`luatexdir/unilib/alphabet.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/unilib/$(DEPDIR)/libunilib_a-alphabet.Tpo luatexdir/unilib/$(DEPDIR)/libunilib_a-alphabet.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/unilib/alphabet.c' object='luatexdir/unilib/libunilib_a-alphabet.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/unilib/libunilib_a-alphabet.o `test -f 'luatexdir/unilib/alphabet.c' || echo '$(srcdir)/'`luatexdir/unilib/alphabet.c
+
+luatexdir/unilib/libunilib_a-alphabet.obj: luatexdir/unilib/alphabet.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -MT luatexdir/unilib/libunilib_a-alphabet.obj -MD -MP -MF luatexdir/unilib/$(DEPDIR)/libunilib_a-alphabet.Tpo -c -o luatexdir/unilib/libunilib_a-alphabet.obj `if test -f 'luatexdir/unilib/alphabet.c'; then $(CYGPATH_W) 'luatexdir/unilib/alphabet.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/unilib/alphabet.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/unilib/$(DEPDIR)/libunilib_a-alphabet.Tpo luatexdir/unilib/$(DEPDIR)/libunilib_a-alphabet.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/unilib/alphabet.c' object='luatexdir/unilib/libunilib_a-alphabet.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/unilib/libunilib_a-alphabet.obj `if test -f 'luatexdir/unilib/alphabet.c'; then $(CYGPATH_W) 'luatexdir/unilib/alphabet.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/unilib/alphabet.c'; fi`
+
+luatexdir/unilib/libunilib_a-char.o: luatexdir/unilib/char.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -MT luatexdir/unilib/libunilib_a-char.o -MD -MP -MF luatexdir/unilib/$(DEPDIR)/libunilib_a-char.Tpo -c -o luatexdir/unilib/libunilib_a-char.o `test -f 'luatexdir/unilib/char.c' || echo '$(srcdir)/'`luatexdir/unilib/char.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/unilib/$(DEPDIR)/libunilib_a-char.Tpo luatexdir/unilib/$(DEPDIR)/libunilib_a-char.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/unilib/char.c' object='luatexdir/unilib/libunilib_a-char.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/unilib/libunilib_a-char.o `test -f 'luatexdir/unilib/char.c' || echo '$(srcdir)/'`luatexdir/unilib/char.c
+
+luatexdir/unilib/libunilib_a-char.obj: luatexdir/unilib/char.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -MT luatexdir/unilib/libunilib_a-char.obj -MD -MP -MF luatexdir/unilib/$(DEPDIR)/libunilib_a-char.Tpo -c -o luatexdir/unilib/libunilib_a-char.obj `if test -f 'luatexdir/unilib/char.c'; then $(CYGPATH_W) 'luatexdir/unilib/char.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/unilib/char.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/unilib/$(DEPDIR)/libunilib_a-char.Tpo luatexdir/unilib/$(DEPDIR)/libunilib_a-char.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/unilib/char.c' object='luatexdir/unilib/libunilib_a-char.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/unilib/libunilib_a-char.obj `if test -f 'luatexdir/unilib/char.c'; then $(CYGPATH_W) 'luatexdir/unilib/char.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/unilib/char.c'; fi`
+
+luatexdir/unilib/libunilib_a-cjk.o: luatexdir/unilib/cjk.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -MT luatexdir/unilib/libunilib_a-cjk.o -MD -MP -MF luatexdir/unilib/$(DEPDIR)/libunilib_a-cjk.Tpo -c -o luatexdir/unilib/libunilib_a-cjk.o `test -f 'luatexdir/unilib/cjk.c' || echo '$(srcdir)/'`luatexdir/unilib/cjk.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/unilib/$(DEPDIR)/libunilib_a-cjk.Tpo luatexdir/unilib/$(DEPDIR)/libunilib_a-cjk.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/unilib/cjk.c' object='luatexdir/unilib/libunilib_a-cjk.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/unilib/libunilib_a-cjk.o `test -f 'luatexdir/unilib/cjk.c' || echo '$(srcdir)/'`luatexdir/unilib/cjk.c
+
+luatexdir/unilib/libunilib_a-cjk.obj: luatexdir/unilib/cjk.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -MT luatexdir/unilib/libunilib_a-cjk.obj -MD -MP -MF luatexdir/unilib/$(DEPDIR)/libunilib_a-cjk.Tpo -c -o luatexdir/unilib/libunilib_a-cjk.obj `if test -f 'luatexdir/unilib/cjk.c'; then $(CYGPATH_W) 'luatexdir/unilib/cjk.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/unilib/cjk.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/unilib/$(DEPDIR)/libunilib_a-cjk.Tpo luatexdir/unilib/$(DEPDIR)/libunilib_a-cjk.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/unilib/cjk.c' object='luatexdir/unilib/libunilib_a-cjk.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/unilib/libunilib_a-cjk.obj `if test -f 'luatexdir/unilib/cjk.c'; then $(CYGPATH_W) 'luatexdir/unilib/cjk.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/unilib/cjk.c'; fi`
+
+luatexdir/unilib/libunilib_a-gwwiconv.o: luatexdir/unilib/gwwiconv.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -MT luatexdir/unilib/libunilib_a-gwwiconv.o -MD -MP -MF luatexdir/unilib/$(DEPDIR)/libunilib_a-gwwiconv.Tpo -c -o luatexdir/unilib/libunilib_a-gwwiconv.o `test -f 'luatexdir/unilib/gwwiconv.c' || echo '$(srcdir)/'`luatexdir/unilib/gwwiconv.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/unilib/$(DEPDIR)/libunilib_a-gwwiconv.Tpo luatexdir/unilib/$(DEPDIR)/libunilib_a-gwwiconv.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/unilib/gwwiconv.c' object='luatexdir/unilib/libunilib_a-gwwiconv.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/unilib/libunilib_a-gwwiconv.o `test -f 'luatexdir/unilib/gwwiconv.c' || echo '$(srcdir)/'`luatexdir/unilib/gwwiconv.c
+
+luatexdir/unilib/libunilib_a-gwwiconv.obj: luatexdir/unilib/gwwiconv.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -MT luatexdir/unilib/libunilib_a-gwwiconv.obj -MD -MP -MF luatexdir/unilib/$(DEPDIR)/libunilib_a-gwwiconv.Tpo -c -o luatexdir/unilib/libunilib_a-gwwiconv.obj `if test -f 'luatexdir/unilib/gwwiconv.c'; then $(CYGPATH_W) 'luatexdir/unilib/gwwiconv.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/unilib/gwwiconv.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) luatexdir/unilib/$(DEPDIR)/libunilib_a-gwwiconv.Tpo luatexdir/unilib/$(DEPDIR)/libunilib_a-gwwiconv.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='luatexdir/unilib/gwwiconv.c' object='luatexdir/unilib/libunilib_a-gwwiconv.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/unilib/libunilib_a-gwwiconv.obj `if test -f 'luatexdir/unilib/gwwiconv.c'; then $(CYGPATH_W) 'luatexdir/unilib/gwwiconv.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/unilib/gwwiconv.c'; fi`
luatexdir/unilib/libunilib_a-ucharmap.o: luatexdir/unilib/ucharmap.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -MT luatexdir/unilib/libunilib_a-ucharmap.o -MD -MP -MF luatexdir/unilib/$(DEPDIR)/libunilib_a-ucharmap.Tpo -c -o luatexdir/unilib/libunilib_a-ucharmap.o `test -f 'luatexdir/unilib/ucharmap.c' || echo '$(srcdir)/'`luatexdir/unilib/ucharmap.c
@@ -9377,6 +11759,230 @@ luatexdir/unilib/libunilib_a-utype.obj: luatexdir/unilib/utype.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunilib_a_CPPFLAGS) $(CPPFLAGS) $(libunilib_a_CFLAGS) $(CFLAGS) -c -o luatexdir/unilib/libunilib_a-utype.obj `if test -f 'luatexdir/unilib/utype.c'; then $(CYGPATH_W) 'luatexdir/unilib/utype.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/unilib/utype.c'; fi`
+xetexdir/libxetex_a-XeTeX_ext.o: xetexdir/XeTeX_ext.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/libxetex_a-XeTeX_ext.o -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-XeTeX_ext.Tpo -c -o xetexdir/libxetex_a-XeTeX_ext.o `test -f 'xetexdir/XeTeX_ext.c' || echo '$(srcdir)/'`xetexdir/XeTeX_ext.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-XeTeX_ext.Tpo xetexdir/$(DEPDIR)/libxetex_a-XeTeX_ext.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xetexdir/XeTeX_ext.c' object='xetexdir/libxetex_a-XeTeX_ext.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/libxetex_a-XeTeX_ext.o `test -f 'xetexdir/XeTeX_ext.c' || echo '$(srcdir)/'`xetexdir/XeTeX_ext.c
+
+xetexdir/libxetex_a-XeTeX_ext.obj: xetexdir/XeTeX_ext.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/libxetex_a-XeTeX_ext.obj -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-XeTeX_ext.Tpo -c -o xetexdir/libxetex_a-XeTeX_ext.obj `if test -f 'xetexdir/XeTeX_ext.c'; then $(CYGPATH_W) 'xetexdir/XeTeX_ext.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeX_ext.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-XeTeX_ext.Tpo xetexdir/$(DEPDIR)/libxetex_a-XeTeX_ext.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xetexdir/XeTeX_ext.c' object='xetexdir/libxetex_a-XeTeX_ext.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/libxetex_a-XeTeX_ext.obj `if test -f 'xetexdir/XeTeX_ext.c'; then $(CYGPATH_W) 'xetexdir/XeTeX_ext.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeX_ext.c'; fi`
+
+xetexdir/libxetex_a-XeTeX_pic.o: xetexdir/XeTeX_pic.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/libxetex_a-XeTeX_pic.o -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-XeTeX_pic.Tpo -c -o xetexdir/libxetex_a-XeTeX_pic.o `test -f 'xetexdir/XeTeX_pic.c' || echo '$(srcdir)/'`xetexdir/XeTeX_pic.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-XeTeX_pic.Tpo xetexdir/$(DEPDIR)/libxetex_a-XeTeX_pic.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xetexdir/XeTeX_pic.c' object='xetexdir/libxetex_a-XeTeX_pic.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/libxetex_a-XeTeX_pic.o `test -f 'xetexdir/XeTeX_pic.c' || echo '$(srcdir)/'`xetexdir/XeTeX_pic.c
+
+xetexdir/libxetex_a-XeTeX_pic.obj: xetexdir/XeTeX_pic.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/libxetex_a-XeTeX_pic.obj -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-XeTeX_pic.Tpo -c -o xetexdir/libxetex_a-XeTeX_pic.obj `if test -f 'xetexdir/XeTeX_pic.c'; then $(CYGPATH_W) 'xetexdir/XeTeX_pic.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeX_pic.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-XeTeX_pic.Tpo xetexdir/$(DEPDIR)/libxetex_a-XeTeX_pic.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xetexdir/XeTeX_pic.c' object='xetexdir/libxetex_a-XeTeX_pic.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/libxetex_a-XeTeX_pic.obj `if test -f 'xetexdir/XeTeX_pic.c'; then $(CYGPATH_W) 'xetexdir/XeTeX_pic.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeX_pic.c'; fi`
+
+xetexdir/libxetex_a-trans.o: xetexdir/trans.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/libxetex_a-trans.o -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-trans.Tpo -c -o xetexdir/libxetex_a-trans.o `test -f 'xetexdir/trans.c' || echo '$(srcdir)/'`xetexdir/trans.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-trans.Tpo xetexdir/$(DEPDIR)/libxetex_a-trans.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xetexdir/trans.c' object='xetexdir/libxetex_a-trans.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/libxetex_a-trans.o `test -f 'xetexdir/trans.c' || echo '$(srcdir)/'`xetexdir/trans.c
+
+xetexdir/libxetex_a-trans.obj: xetexdir/trans.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/libxetex_a-trans.obj -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-trans.Tpo -c -o xetexdir/libxetex_a-trans.obj `if test -f 'xetexdir/trans.c'; then $(CYGPATH_W) 'xetexdir/trans.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/trans.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-trans.Tpo xetexdir/$(DEPDIR)/libxetex_a-trans.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xetexdir/trans.c' object='xetexdir/libxetex_a-trans.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/libxetex_a-trans.obj `if test -f 'xetexdir/trans.c'; then $(CYGPATH_W) 'xetexdir/trans.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/trans.c'; fi`
+
+xetexdir/image/libxetex_a-bmpimage.o: xetexdir/image/bmpimage.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/image/libxetex_a-bmpimage.o -MD -MP -MF xetexdir/image/$(DEPDIR)/libxetex_a-bmpimage.Tpo -c -o xetexdir/image/libxetex_a-bmpimage.o `test -f 'xetexdir/image/bmpimage.c' || echo '$(srcdir)/'`xetexdir/image/bmpimage.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) xetexdir/image/$(DEPDIR)/libxetex_a-bmpimage.Tpo xetexdir/image/$(DEPDIR)/libxetex_a-bmpimage.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xetexdir/image/bmpimage.c' object='xetexdir/image/libxetex_a-bmpimage.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/image/libxetex_a-bmpimage.o `test -f 'xetexdir/image/bmpimage.c' || echo '$(srcdir)/'`xetexdir/image/bmpimage.c
+
+xetexdir/image/libxetex_a-bmpimage.obj: xetexdir/image/bmpimage.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/image/libxetex_a-bmpimage.obj -MD -MP -MF xetexdir/image/$(DEPDIR)/libxetex_a-bmpimage.Tpo -c -o xetexdir/image/libxetex_a-bmpimage.obj `if test -f 'xetexdir/image/bmpimage.c'; then $(CYGPATH_W) 'xetexdir/image/bmpimage.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/image/bmpimage.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) xetexdir/image/$(DEPDIR)/libxetex_a-bmpimage.Tpo xetexdir/image/$(DEPDIR)/libxetex_a-bmpimage.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xetexdir/image/bmpimage.c' object='xetexdir/image/libxetex_a-bmpimage.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/image/libxetex_a-bmpimage.obj `if test -f 'xetexdir/image/bmpimage.c'; then $(CYGPATH_W) 'xetexdir/image/bmpimage.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/image/bmpimage.c'; fi`
+
+xetexdir/image/libxetex_a-jpegimage.o: xetexdir/image/jpegimage.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/image/libxetex_a-jpegimage.o -MD -MP -MF xetexdir/image/$(DEPDIR)/libxetex_a-jpegimage.Tpo -c -o xetexdir/image/libxetex_a-jpegimage.o `test -f 'xetexdir/image/jpegimage.c' || echo '$(srcdir)/'`xetexdir/image/jpegimage.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) xetexdir/image/$(DEPDIR)/libxetex_a-jpegimage.Tpo xetexdir/image/$(DEPDIR)/libxetex_a-jpegimage.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xetexdir/image/jpegimage.c' object='xetexdir/image/libxetex_a-jpegimage.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/image/libxetex_a-jpegimage.o `test -f 'xetexdir/image/jpegimage.c' || echo '$(srcdir)/'`xetexdir/image/jpegimage.c
+
+xetexdir/image/libxetex_a-jpegimage.obj: xetexdir/image/jpegimage.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/image/libxetex_a-jpegimage.obj -MD -MP -MF xetexdir/image/$(DEPDIR)/libxetex_a-jpegimage.Tpo -c -o xetexdir/image/libxetex_a-jpegimage.obj `if test -f 'xetexdir/image/jpegimage.c'; then $(CYGPATH_W) 'xetexdir/image/jpegimage.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/image/jpegimage.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) xetexdir/image/$(DEPDIR)/libxetex_a-jpegimage.Tpo xetexdir/image/$(DEPDIR)/libxetex_a-jpegimage.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xetexdir/image/jpegimage.c' object='xetexdir/image/libxetex_a-jpegimage.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/image/libxetex_a-jpegimage.obj `if test -f 'xetexdir/image/jpegimage.c'; then $(CYGPATH_W) 'xetexdir/image/jpegimage.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/image/jpegimage.c'; fi`
+
+xetexdir/image/libxetex_a-mfileio.o: xetexdir/image/mfileio.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/image/libxetex_a-mfileio.o -MD -MP -MF xetexdir/image/$(DEPDIR)/libxetex_a-mfileio.Tpo -c -o xetexdir/image/libxetex_a-mfileio.o `test -f 'xetexdir/image/mfileio.c' || echo '$(srcdir)/'`xetexdir/image/mfileio.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) xetexdir/image/$(DEPDIR)/libxetex_a-mfileio.Tpo xetexdir/image/$(DEPDIR)/libxetex_a-mfileio.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xetexdir/image/mfileio.c' object='xetexdir/image/libxetex_a-mfileio.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/image/libxetex_a-mfileio.o `test -f 'xetexdir/image/mfileio.c' || echo '$(srcdir)/'`xetexdir/image/mfileio.c
+
+xetexdir/image/libxetex_a-mfileio.obj: xetexdir/image/mfileio.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/image/libxetex_a-mfileio.obj -MD -MP -MF xetexdir/image/$(DEPDIR)/libxetex_a-mfileio.Tpo -c -o xetexdir/image/libxetex_a-mfileio.obj `if test -f 'xetexdir/image/mfileio.c'; then $(CYGPATH_W) 'xetexdir/image/mfileio.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/image/mfileio.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) xetexdir/image/$(DEPDIR)/libxetex_a-mfileio.Tpo xetexdir/image/$(DEPDIR)/libxetex_a-mfileio.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xetexdir/image/mfileio.c' object='xetexdir/image/libxetex_a-mfileio.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/image/libxetex_a-mfileio.obj `if test -f 'xetexdir/image/mfileio.c'; then $(CYGPATH_W) 'xetexdir/image/mfileio.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/image/mfileio.c'; fi`
+
+xetexdir/image/libxetex_a-numbers.o: xetexdir/image/numbers.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/image/libxetex_a-numbers.o -MD -MP -MF xetexdir/image/$(DEPDIR)/libxetex_a-numbers.Tpo -c -o xetexdir/image/libxetex_a-numbers.o `test -f 'xetexdir/image/numbers.c' || echo '$(srcdir)/'`xetexdir/image/numbers.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) xetexdir/image/$(DEPDIR)/libxetex_a-numbers.Tpo xetexdir/image/$(DEPDIR)/libxetex_a-numbers.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xetexdir/image/numbers.c' object='xetexdir/image/libxetex_a-numbers.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/image/libxetex_a-numbers.o `test -f 'xetexdir/image/numbers.c' || echo '$(srcdir)/'`xetexdir/image/numbers.c
+
+xetexdir/image/libxetex_a-numbers.obj: xetexdir/image/numbers.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/image/libxetex_a-numbers.obj -MD -MP -MF xetexdir/image/$(DEPDIR)/libxetex_a-numbers.Tpo -c -o xetexdir/image/libxetex_a-numbers.obj `if test -f 'xetexdir/image/numbers.c'; then $(CYGPATH_W) 'xetexdir/image/numbers.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/image/numbers.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) xetexdir/image/$(DEPDIR)/libxetex_a-numbers.Tpo xetexdir/image/$(DEPDIR)/libxetex_a-numbers.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xetexdir/image/numbers.c' object='xetexdir/image/libxetex_a-numbers.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/image/libxetex_a-numbers.obj `if test -f 'xetexdir/image/numbers.c'; then $(CYGPATH_W) 'xetexdir/image/numbers.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/image/numbers.c'; fi`
+
+xetexdir/image/libxetex_a-pngimage.o: xetexdir/image/pngimage.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/image/libxetex_a-pngimage.o -MD -MP -MF xetexdir/image/$(DEPDIR)/libxetex_a-pngimage.Tpo -c -o xetexdir/image/libxetex_a-pngimage.o `test -f 'xetexdir/image/pngimage.c' || echo '$(srcdir)/'`xetexdir/image/pngimage.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) xetexdir/image/$(DEPDIR)/libxetex_a-pngimage.Tpo xetexdir/image/$(DEPDIR)/libxetex_a-pngimage.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xetexdir/image/pngimage.c' object='xetexdir/image/libxetex_a-pngimage.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/image/libxetex_a-pngimage.o `test -f 'xetexdir/image/pngimage.c' || echo '$(srcdir)/'`xetexdir/image/pngimage.c
+
+xetexdir/image/libxetex_a-pngimage.obj: xetexdir/image/pngimage.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/image/libxetex_a-pngimage.obj -MD -MP -MF xetexdir/image/$(DEPDIR)/libxetex_a-pngimage.Tpo -c -o xetexdir/image/libxetex_a-pngimage.obj `if test -f 'xetexdir/image/pngimage.c'; then $(CYGPATH_W) 'xetexdir/image/pngimage.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/image/pngimage.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) xetexdir/image/$(DEPDIR)/libxetex_a-pngimage.Tpo xetexdir/image/$(DEPDIR)/libxetex_a-pngimage.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xetexdir/image/pngimage.c' object='xetexdir/image/libxetex_a-pngimage.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/image/libxetex_a-pngimage.obj `if test -f 'xetexdir/image/pngimage.c'; then $(CYGPATH_W) 'xetexdir/image/pngimage.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/image/pngimage.c'; fi`
+
+xetexdir/libxetex_a-XeTeX_mac.o: xetexdir/XeTeX_mac.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/libxetex_a-XeTeX_mac.o -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-XeTeX_mac.Tpo -c -o xetexdir/libxetex_a-XeTeX_mac.o `test -f 'xetexdir/XeTeX_mac.c' || echo '$(srcdir)/'`xetexdir/XeTeX_mac.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-XeTeX_mac.Tpo xetexdir/$(DEPDIR)/libxetex_a-XeTeX_mac.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xetexdir/XeTeX_mac.c' object='xetexdir/libxetex_a-XeTeX_mac.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/libxetex_a-XeTeX_mac.o `test -f 'xetexdir/XeTeX_mac.c' || echo '$(srcdir)/'`xetexdir/XeTeX_mac.c
+
+xetexdir/libxetex_a-XeTeX_mac.obj: xetexdir/XeTeX_mac.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -MT xetexdir/libxetex_a-XeTeX_mac.obj -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-XeTeX_mac.Tpo -c -o xetexdir/libxetex_a-XeTeX_mac.obj `if test -f 'xetexdir/XeTeX_mac.c'; then $(CYGPATH_W) 'xetexdir/XeTeX_mac.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeX_mac.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-XeTeX_mac.Tpo xetexdir/$(DEPDIR)/libxetex_a-XeTeX_mac.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xetexdir/XeTeX_mac.c' object='xetexdir/libxetex_a-XeTeX_mac.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o xetexdir/libxetex_a-XeTeX_mac.obj `if test -f 'xetexdir/XeTeX_mac.c'; then $(CYGPATH_W) 'xetexdir/XeTeX_mac.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeX_mac.c'; fi`
+
+synctexdir/libsynctex_la-synctex_parser.lo: synctexdir/synctex_parser.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsynctex_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/libsynctex_la-synctex_parser.lo -MD -MP -MF synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser.Tpo -c -o synctexdir/libsynctex_la-synctex_parser.lo `test -f 'synctexdir/synctex_parser.c' || echo '$(srcdir)/'`synctexdir/synctex_parser.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser.Tpo synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex_parser.c' object='synctexdir/libsynctex_la-synctex_parser.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsynctex_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/libsynctex_la-synctex_parser.lo `test -f 'synctexdir/synctex_parser.c' || echo '$(srcdir)/'`synctexdir/synctex_parser.c
+
+synctexdir/libsynctex_la-synctex_parser_utils.lo: synctexdir/synctex_parser_utils.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsynctex_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/libsynctex_la-synctex_parser_utils.lo -MD -MP -MF synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser_utils.Tpo -c -o synctexdir/libsynctex_la-synctex_parser_utils.lo `test -f 'synctexdir/synctex_parser_utils.c' || echo '$(srcdir)/'`synctexdir/synctex_parser_utils.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser_utils.Tpo synctexdir/$(DEPDIR)/libsynctex_la-synctex_parser_utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex_parser_utils.c' object='synctexdir/libsynctex_la-synctex_parser_utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsynctex_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/libsynctex_la-synctex_parser_utils.lo `test -f 'synctexdir/synctex_parser_utils.c' || echo '$(srcdir)/'`synctexdir/synctex_parser_utils.c
+
+alephdir/aleph-aleph.o: alephdir/aleph.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT alephdir/aleph-aleph.o -MD -MP -MF alephdir/$(DEPDIR)/aleph-aleph.Tpo -c -o alephdir/aleph-aleph.o `test -f 'alephdir/aleph.c' || echo '$(srcdir)/'`alephdir/aleph.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) alephdir/$(DEPDIR)/aleph-aleph.Tpo alephdir/$(DEPDIR)/aleph-aleph.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='alephdir/aleph.c' object='alephdir/aleph-aleph.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o alephdir/aleph-aleph.o `test -f 'alephdir/aleph.c' || echo '$(srcdir)/'`alephdir/aleph.c
+
+alephdir/aleph-aleph.obj: alephdir/aleph.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT alephdir/aleph-aleph.obj -MD -MP -MF alephdir/$(DEPDIR)/aleph-aleph.Tpo -c -o alephdir/aleph-aleph.obj `if test -f 'alephdir/aleph.c'; then $(CYGPATH_W) 'alephdir/aleph.c'; else $(CYGPATH_W) '$(srcdir)/alephdir/aleph.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) alephdir/$(DEPDIR)/aleph-aleph.Tpo alephdir/$(DEPDIR)/aleph-aleph.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='alephdir/aleph.c' object='alephdir/aleph-aleph.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o alephdir/aleph-aleph.obj `if test -f 'alephdir/aleph.c'; then $(CYGPATH_W) 'alephdir/aleph.c'; else $(CYGPATH_W) '$(srcdir)/alephdir/aleph.c'; fi`
+
+alephdir/aleph-alephbis.o: alephdir/alephbis.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT alephdir/aleph-alephbis.o -MD -MP -MF alephdir/$(DEPDIR)/aleph-alephbis.Tpo -c -o alephdir/aleph-alephbis.o `test -f 'alephdir/alephbis.c' || echo '$(srcdir)/'`alephdir/alephbis.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) alephdir/$(DEPDIR)/aleph-alephbis.Tpo alephdir/$(DEPDIR)/aleph-alephbis.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='alephdir/alephbis.c' object='alephdir/aleph-alephbis.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o alephdir/aleph-alephbis.o `test -f 'alephdir/alephbis.c' || echo '$(srcdir)/'`alephdir/alephbis.c
+
+alephdir/aleph-alephbis.obj: alephdir/alephbis.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT alephdir/aleph-alephbis.obj -MD -MP -MF alephdir/$(DEPDIR)/aleph-alephbis.Tpo -c -o alephdir/aleph-alephbis.obj `if test -f 'alephdir/alephbis.c'; then $(CYGPATH_W) 'alephdir/alephbis.c'; else $(CYGPATH_W) '$(srcdir)/alephdir/alephbis.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) alephdir/$(DEPDIR)/aleph-alephbis.Tpo alephdir/$(DEPDIR)/aleph-alephbis.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='alephdir/alephbis.c' object='alephdir/aleph-alephbis.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o alephdir/aleph-alephbis.obj `if test -f 'alephdir/alephbis.c'; then $(CYGPATH_W) 'alephdir/alephbis.c'; else $(CYGPATH_W) '$(srcdir)/alephdir/alephbis.c'; fi`
+
+alephdir/aleph-alephextra.o: alephdir/alephextra.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT alephdir/aleph-alephextra.o -MD -MP -MF alephdir/$(DEPDIR)/aleph-alephextra.Tpo -c -o alephdir/aleph-alephextra.o `test -f 'alephdir/alephextra.c' || echo '$(srcdir)/'`alephdir/alephextra.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) alephdir/$(DEPDIR)/aleph-alephextra.Tpo alephdir/$(DEPDIR)/aleph-alephextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='alephdir/alephextra.c' object='alephdir/aleph-alephextra.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o alephdir/aleph-alephextra.o `test -f 'alephdir/alephextra.c' || echo '$(srcdir)/'`alephdir/alephextra.c
+
+alephdir/aleph-alephextra.obj: alephdir/alephextra.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT alephdir/aleph-alephextra.obj -MD -MP -MF alephdir/$(DEPDIR)/aleph-alephextra.Tpo -c -o alephdir/aleph-alephextra.obj `if test -f 'alephdir/alephextra.c'; then $(CYGPATH_W) 'alephdir/alephextra.c'; else $(CYGPATH_W) '$(srcdir)/alephdir/alephextra.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) alephdir/$(DEPDIR)/aleph-alephextra.Tpo alephdir/$(DEPDIR)/aleph-alephextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='alephdir/alephextra.c' object='alephdir/aleph-alephextra.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o alephdir/aleph-alephextra.obj `if test -f 'alephdir/alephextra.c'; then $(CYGPATH_W) 'alephdir/alephextra.c'; else $(CYGPATH_W) '$(srcdir)/alephdir/alephextra.c'; fi`
+
+aleph-alephini.o: alephini.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT aleph-alephini.o -MD -MP -MF $(DEPDIR)/aleph-alephini.Tpo -c -o aleph-alephini.o `test -f 'alephini.c' || echo '$(srcdir)/'`alephini.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/aleph-alephini.Tpo $(DEPDIR)/aleph-alephini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='alephini.c' object='aleph-alephini.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o aleph-alephini.o `test -f 'alephini.c' || echo '$(srcdir)/'`alephini.c
+
+aleph-alephini.obj: alephini.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT aleph-alephini.obj -MD -MP -MF $(DEPDIR)/aleph-alephini.Tpo -c -o aleph-alephini.obj `if test -f 'alephini.c'; then $(CYGPATH_W) 'alephini.c'; else $(CYGPATH_W) '$(srcdir)/alephini.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/aleph-alephini.Tpo $(DEPDIR)/aleph-alephini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='alephini.c' object='aleph-alephini.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o aleph-alephini.obj `if test -f 'alephini.c'; then $(CYGPATH_W) 'alephini.c'; else $(CYGPATH_W) '$(srcdir)/alephini.c'; fi`
+
+aleph-aleph0.o: aleph0.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT aleph-aleph0.o -MD -MP -MF $(DEPDIR)/aleph-aleph0.Tpo -c -o aleph-aleph0.o `test -f 'aleph0.c' || echo '$(srcdir)/'`aleph0.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/aleph-aleph0.Tpo $(DEPDIR)/aleph-aleph0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='aleph0.c' object='aleph-aleph0.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o aleph-aleph0.o `test -f 'aleph0.c' || echo '$(srcdir)/'`aleph0.c
+
+aleph-aleph0.obj: aleph0.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT aleph-aleph0.obj -MD -MP -MF $(DEPDIR)/aleph-aleph0.Tpo -c -o aleph-aleph0.obj `if test -f 'aleph0.c'; then $(CYGPATH_W) 'aleph0.c'; else $(CYGPATH_W) '$(srcdir)/aleph0.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/aleph-aleph0.Tpo $(DEPDIR)/aleph-aleph0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='aleph0.c' object='aleph-aleph0.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o aleph-aleph0.obj `if test -f 'aleph0.c'; then $(CYGPATH_W) 'aleph0.c'; else $(CYGPATH_W) '$(srcdir)/aleph0.c'; fi`
+
+aleph-aleph-pool.o: aleph-pool.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT aleph-aleph-pool.o -MD -MP -MF $(DEPDIR)/aleph-aleph-pool.Tpo -c -o aleph-aleph-pool.o `test -f 'aleph-pool.c' || echo '$(srcdir)/'`aleph-pool.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/aleph-aleph-pool.Tpo $(DEPDIR)/aleph-aleph-pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='aleph-pool.c' object='aleph-aleph-pool.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o aleph-aleph-pool.o `test -f 'aleph-pool.c' || echo '$(srcdir)/'`aleph-pool.c
+
+aleph-aleph-pool.obj: aleph-pool.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT aleph-aleph-pool.obj -MD -MP -MF $(DEPDIR)/aleph-aleph-pool.Tpo -c -o aleph-aleph-pool.obj `if test -f 'aleph-pool.c'; then $(CYGPATH_W) 'aleph-pool.c'; else $(CYGPATH_W) '$(srcdir)/aleph-pool.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/aleph-aleph-pool.Tpo $(DEPDIR)/aleph-aleph-pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='aleph-pool.c' object='aleph-aleph-pool.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o aleph-aleph-pool.obj `if test -f 'aleph-pool.c'; then $(CYGPATH_W) 'aleph-pool.c'; else $(CYGPATH_W) '$(srcdir)/aleph-pool.c'; fi`
+
call_luajittex-callexe.o: callexe.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_luajittex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT call_luajittex-callexe.o -MD -MP -MF $(DEPDIR)/call_luajittex-callexe.Tpo -c -o call_luajittex-callexe.o `test -f 'callexe.c' || echo '$(srcdir)/'`callexe.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/call_luajittex-callexe.Tpo $(DEPDIR)/call_luajittex-callexe.Po
@@ -9419,6 +12025,244 @@ call_mpost-callexe.obj: callexe.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o call_mpost-callexe.obj `if test -f 'callexe.c'; then $(CYGPATH_W) 'callexe.c'; else $(CYGPATH_W) '$(srcdir)/callexe.c'; fi`
+call_pmpost-callexe.o: callexe.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT call_pmpost-callexe.o -MD -MP -MF $(DEPDIR)/call_pmpost-callexe.Tpo -c -o call_pmpost-callexe.o `test -f 'callexe.c' || echo '$(srcdir)/'`callexe.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/call_pmpost-callexe.Tpo $(DEPDIR)/call_pmpost-callexe.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='callexe.c' object='call_pmpost-callexe.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o call_pmpost-callexe.o `test -f 'callexe.c' || echo '$(srcdir)/'`callexe.c
+
+call_pmpost-callexe.obj: callexe.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT call_pmpost-callexe.obj -MD -MP -MF $(DEPDIR)/call_pmpost-callexe.Tpo -c -o call_pmpost-callexe.obj `if test -f 'callexe.c'; then $(CYGPATH_W) 'callexe.c'; else $(CYGPATH_W) '$(srcdir)/callexe.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/call_pmpost-callexe.Tpo $(DEPDIR)/call_pmpost-callexe.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='callexe.c' object='call_pmpost-callexe.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o call_pmpost-callexe.obj `if test -f 'callexe.c'; then $(CYGPATH_W) 'callexe.c'; else $(CYGPATH_W) '$(srcdir)/callexe.c'; fi`
+
+call_upmpost-callexe.o: callexe.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT call_upmpost-callexe.o -MD -MP -MF $(DEPDIR)/call_upmpost-callexe.Tpo -c -o call_upmpost-callexe.o `test -f 'callexe.c' || echo '$(srcdir)/'`callexe.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/call_upmpost-callexe.Tpo $(DEPDIR)/call_upmpost-callexe.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='callexe.c' object='call_upmpost-callexe.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o call_upmpost-callexe.o `test -f 'callexe.c' || echo '$(srcdir)/'`callexe.c
+
+call_upmpost-callexe.obj: callexe.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT call_upmpost-callexe.obj -MD -MP -MF $(DEPDIR)/call_upmpost-callexe.Tpo -c -o call_upmpost-callexe.obj `if test -f 'callexe.c'; then $(CYGPATH_W) 'callexe.c'; else $(CYGPATH_W) '$(srcdir)/callexe.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/call_upmpost-callexe.Tpo $(DEPDIR)/call_upmpost-callexe.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='callexe.c' object='call_upmpost-callexe.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o call_upmpost-callexe.obj `if test -f 'callexe.c'; then $(CYGPATH_W) 'callexe.c'; else $(CYGPATH_W) '$(srcdir)/callexe.c'; fi`
+
+eptexdir/eptex-eptexextra.o: eptexdir/eptexextra.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptexdir/eptex-eptexextra.o -MD -MP -MF eptexdir/$(DEPDIR)/eptex-eptexextra.Tpo -c -o eptexdir/eptex-eptexextra.o `test -f 'eptexdir/eptexextra.c' || echo '$(srcdir)/'`eptexdir/eptexextra.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) eptexdir/$(DEPDIR)/eptex-eptexextra.Tpo eptexdir/$(DEPDIR)/eptex-eptexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eptexdir/eptexextra.c' object='eptexdir/eptex-eptexextra.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptexdir/eptex-eptexextra.o `test -f 'eptexdir/eptexextra.c' || echo '$(srcdir)/'`eptexdir/eptexextra.c
+
+eptexdir/eptex-eptexextra.obj: eptexdir/eptexextra.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptexdir/eptex-eptexextra.obj -MD -MP -MF eptexdir/$(DEPDIR)/eptex-eptexextra.Tpo -c -o eptexdir/eptex-eptexextra.obj `if test -f 'eptexdir/eptexextra.c'; then $(CYGPATH_W) 'eptexdir/eptexextra.c'; else $(CYGPATH_W) '$(srcdir)/eptexdir/eptexextra.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) eptexdir/$(DEPDIR)/eptex-eptexextra.Tpo eptexdir/$(DEPDIR)/eptex-eptexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eptexdir/eptexextra.c' object='eptexdir/eptex-eptexextra.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptexdir/eptex-eptexextra.obj `if test -f 'eptexdir/eptexextra.c'; then $(CYGPATH_W) 'eptexdir/eptexextra.c'; else $(CYGPATH_W) '$(srcdir)/eptexdir/eptexextra.c'; fi`
+
+synctexdir/eptex-synctex.o: synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/eptex-synctex.o -MD -MP -MF synctexdir/$(DEPDIR)/eptex-synctex.Tpo -c -o synctexdir/eptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/eptex-synctex.Tpo synctexdir/$(DEPDIR)/eptex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/eptex-synctex.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/eptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+
+synctexdir/eptex-synctex.obj: synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/eptex-synctex.obj -MD -MP -MF synctexdir/$(DEPDIR)/eptex-synctex.Tpo -c -o synctexdir/eptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/eptex-synctex.Tpo synctexdir/$(DEPDIR)/eptex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/eptex-synctex.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/eptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+
+eptex-eptexini.o: eptexini.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptex-eptexini.o -MD -MP -MF $(DEPDIR)/eptex-eptexini.Tpo -c -o eptex-eptexini.o `test -f 'eptexini.c' || echo '$(srcdir)/'`eptexini.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/eptex-eptexini.Tpo $(DEPDIR)/eptex-eptexini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eptexini.c' object='eptex-eptexini.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptex-eptexini.o `test -f 'eptexini.c' || echo '$(srcdir)/'`eptexini.c
+
+eptex-eptexini.obj: eptexini.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptex-eptexini.obj -MD -MP -MF $(DEPDIR)/eptex-eptexini.Tpo -c -o eptex-eptexini.obj `if test -f 'eptexini.c'; then $(CYGPATH_W) 'eptexini.c'; else $(CYGPATH_W) '$(srcdir)/eptexini.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/eptex-eptexini.Tpo $(DEPDIR)/eptex-eptexini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eptexini.c' object='eptex-eptexini.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptex-eptexini.obj `if test -f 'eptexini.c'; then $(CYGPATH_W) 'eptexini.c'; else $(CYGPATH_W) '$(srcdir)/eptexini.c'; fi`
+
+eptex-eptex0.o: eptex0.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptex-eptex0.o -MD -MP -MF $(DEPDIR)/eptex-eptex0.Tpo -c -o eptex-eptex0.o `test -f 'eptex0.c' || echo '$(srcdir)/'`eptex0.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/eptex-eptex0.Tpo $(DEPDIR)/eptex-eptex0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eptex0.c' object='eptex-eptex0.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptex-eptex0.o `test -f 'eptex0.c' || echo '$(srcdir)/'`eptex0.c
+
+eptex-eptex0.obj: eptex0.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptex-eptex0.obj -MD -MP -MF $(DEPDIR)/eptex-eptex0.Tpo -c -o eptex-eptex0.obj `if test -f 'eptex0.c'; then $(CYGPATH_W) 'eptex0.c'; else $(CYGPATH_W) '$(srcdir)/eptex0.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/eptex-eptex0.Tpo $(DEPDIR)/eptex-eptex0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eptex0.c' object='eptex-eptex0.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptex-eptex0.obj `if test -f 'eptex0.c'; then $(CYGPATH_W) 'eptex0.c'; else $(CYGPATH_W) '$(srcdir)/eptex0.c'; fi`
+
+eptex-eptex-pool.o: eptex-pool.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptex-eptex-pool.o -MD -MP -MF $(DEPDIR)/eptex-eptex-pool.Tpo -c -o eptex-eptex-pool.o `test -f 'eptex-pool.c' || echo '$(srcdir)/'`eptex-pool.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/eptex-eptex-pool.Tpo $(DEPDIR)/eptex-eptex-pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eptex-pool.c' object='eptex-eptex-pool.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptex-eptex-pool.o `test -f 'eptex-pool.c' || echo '$(srcdir)/'`eptex-pool.c
+
+eptex-eptex-pool.obj: eptex-pool.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptex-eptex-pool.obj -MD -MP -MF $(DEPDIR)/eptex-eptex-pool.Tpo -c -o eptex-eptex-pool.obj `if test -f 'eptex-pool.c'; then $(CYGPATH_W) 'eptex-pool.c'; else $(CYGPATH_W) '$(srcdir)/eptex-pool.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/eptex-eptex-pool.Tpo $(DEPDIR)/eptex-eptex-pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eptex-pool.c' object='eptex-eptex-pool.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptex-eptex-pool.obj `if test -f 'eptex-pool.c'; then $(CYGPATH_W) 'eptex-pool.c'; else $(CYGPATH_W) '$(srcdir)/eptex-pool.c'; fi`
+
+etexdir/etex-etexextra.o: etexdir/etexextra.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT etexdir/etex-etexextra.o -MD -MP -MF etexdir/$(DEPDIR)/etex-etexextra.Tpo -c -o etexdir/etex-etexextra.o `test -f 'etexdir/etexextra.c' || echo '$(srcdir)/'`etexdir/etexextra.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) etexdir/$(DEPDIR)/etex-etexextra.Tpo etexdir/$(DEPDIR)/etex-etexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='etexdir/etexextra.c' object='etexdir/etex-etexextra.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o etexdir/etex-etexextra.o `test -f 'etexdir/etexextra.c' || echo '$(srcdir)/'`etexdir/etexextra.c
+
+etexdir/etex-etexextra.obj: etexdir/etexextra.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT etexdir/etex-etexextra.obj -MD -MP -MF etexdir/$(DEPDIR)/etex-etexextra.Tpo -c -o etexdir/etex-etexextra.obj `if test -f 'etexdir/etexextra.c'; then $(CYGPATH_W) 'etexdir/etexextra.c'; else $(CYGPATH_W) '$(srcdir)/etexdir/etexextra.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) etexdir/$(DEPDIR)/etex-etexextra.Tpo etexdir/$(DEPDIR)/etex-etexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='etexdir/etexextra.c' object='etexdir/etex-etexextra.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o etexdir/etex-etexextra.obj `if test -f 'etexdir/etexextra.c'; then $(CYGPATH_W) 'etexdir/etexextra.c'; else $(CYGPATH_W) '$(srcdir)/etexdir/etexextra.c'; fi`
+
+synctexdir/etex-synctex.o: synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/etex-synctex.o -MD -MP -MF synctexdir/$(DEPDIR)/etex-synctex.Tpo -c -o synctexdir/etex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/etex-synctex.Tpo synctexdir/$(DEPDIR)/etex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/etex-synctex.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/etex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+
+synctexdir/etex-synctex.obj: synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/etex-synctex.obj -MD -MP -MF synctexdir/$(DEPDIR)/etex-synctex.Tpo -c -o synctexdir/etex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/etex-synctex.Tpo synctexdir/$(DEPDIR)/etex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/etex-synctex.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/etex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+
+etex-etexini.o: etexini.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT etex-etexini.o -MD -MP -MF $(DEPDIR)/etex-etexini.Tpo -c -o etex-etexini.o `test -f 'etexini.c' || echo '$(srcdir)/'`etexini.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/etex-etexini.Tpo $(DEPDIR)/etex-etexini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='etexini.c' object='etex-etexini.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o etex-etexini.o `test -f 'etexini.c' || echo '$(srcdir)/'`etexini.c
+
+etex-etexini.obj: etexini.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT etex-etexini.obj -MD -MP -MF $(DEPDIR)/etex-etexini.Tpo -c -o etex-etexini.obj `if test -f 'etexini.c'; then $(CYGPATH_W) 'etexini.c'; else $(CYGPATH_W) '$(srcdir)/etexini.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/etex-etexini.Tpo $(DEPDIR)/etex-etexini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='etexini.c' object='etex-etexini.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o etex-etexini.obj `if test -f 'etexini.c'; then $(CYGPATH_W) 'etexini.c'; else $(CYGPATH_W) '$(srcdir)/etexini.c'; fi`
+
+etex-etex0.o: etex0.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT etex-etex0.o -MD -MP -MF $(DEPDIR)/etex-etex0.Tpo -c -o etex-etex0.o `test -f 'etex0.c' || echo '$(srcdir)/'`etex0.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/etex-etex0.Tpo $(DEPDIR)/etex-etex0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='etex0.c' object='etex-etex0.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o etex-etex0.o `test -f 'etex0.c' || echo '$(srcdir)/'`etex0.c
+
+etex-etex0.obj: etex0.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT etex-etex0.obj -MD -MP -MF $(DEPDIR)/etex-etex0.Tpo -c -o etex-etex0.obj `if test -f 'etex0.c'; then $(CYGPATH_W) 'etex0.c'; else $(CYGPATH_W) '$(srcdir)/etex0.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/etex-etex0.Tpo $(DEPDIR)/etex-etex0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='etex0.c' object='etex-etex0.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o etex-etex0.obj `if test -f 'etex0.c'; then $(CYGPATH_W) 'etex0.c'; else $(CYGPATH_W) '$(srcdir)/etex0.c'; fi`
+
+etex-etex-pool.o: etex-pool.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT etex-etex-pool.o -MD -MP -MF $(DEPDIR)/etex-etex-pool.Tpo -c -o etex-etex-pool.o `test -f 'etex-pool.c' || echo '$(srcdir)/'`etex-pool.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/etex-etex-pool.Tpo $(DEPDIR)/etex-etex-pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='etex-pool.c' object='etex-etex-pool.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o etex-etex-pool.o `test -f 'etex-pool.c' || echo '$(srcdir)/'`etex-pool.c
+
+etex-etex-pool.obj: etex-pool.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT etex-etex-pool.obj -MD -MP -MF $(DEPDIR)/etex-etex-pool.Tpo -c -o etex-etex-pool.obj `if test -f 'etex-pool.c'; then $(CYGPATH_W) 'etex-pool.c'; else $(CYGPATH_W) '$(srcdir)/etex-pool.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/etex-etex-pool.Tpo $(DEPDIR)/etex-etex-pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='etex-pool.c' object='etex-etex-pool.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o etex-etex-pool.obj `if test -f 'etex-pool.c'; then $(CYGPATH_W) 'etex-pool.c'; else $(CYGPATH_W) '$(srcdir)/etex-pool.c'; fi`
+
+euptexdir/euptex-euptexextra.o: euptexdir/euptexextra.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT euptexdir/euptex-euptexextra.o -MD -MP -MF euptexdir/$(DEPDIR)/euptex-euptexextra.Tpo -c -o euptexdir/euptex-euptexextra.o `test -f 'euptexdir/euptexextra.c' || echo '$(srcdir)/'`euptexdir/euptexextra.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) euptexdir/$(DEPDIR)/euptex-euptexextra.Tpo euptexdir/$(DEPDIR)/euptex-euptexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='euptexdir/euptexextra.c' object='euptexdir/euptex-euptexextra.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o euptexdir/euptex-euptexextra.o `test -f 'euptexdir/euptexextra.c' || echo '$(srcdir)/'`euptexdir/euptexextra.c
+
+euptexdir/euptex-euptexextra.obj: euptexdir/euptexextra.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT euptexdir/euptex-euptexextra.obj -MD -MP -MF euptexdir/$(DEPDIR)/euptex-euptexextra.Tpo -c -o euptexdir/euptex-euptexextra.obj `if test -f 'euptexdir/euptexextra.c'; then $(CYGPATH_W) 'euptexdir/euptexextra.c'; else $(CYGPATH_W) '$(srcdir)/euptexdir/euptexextra.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) euptexdir/$(DEPDIR)/euptex-euptexextra.Tpo euptexdir/$(DEPDIR)/euptex-euptexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='euptexdir/euptexextra.c' object='euptexdir/euptex-euptexextra.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o euptexdir/euptex-euptexextra.obj `if test -f 'euptexdir/euptexextra.c'; then $(CYGPATH_W) 'euptexdir/euptexextra.c'; else $(CYGPATH_W) '$(srcdir)/euptexdir/euptexextra.c'; fi`
+
+synctexdir/euptex-synctex.o: synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/euptex-synctex.o -MD -MP -MF synctexdir/$(DEPDIR)/euptex-synctex.Tpo -c -o synctexdir/euptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/euptex-synctex.Tpo synctexdir/$(DEPDIR)/euptex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/euptex-synctex.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/euptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+
+synctexdir/euptex-synctex.obj: synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/euptex-synctex.obj -MD -MP -MF synctexdir/$(DEPDIR)/euptex-synctex.Tpo -c -o synctexdir/euptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/euptex-synctex.Tpo synctexdir/$(DEPDIR)/euptex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/euptex-synctex.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/euptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+
+euptex-euptexini.o: euptexini.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT euptex-euptexini.o -MD -MP -MF $(DEPDIR)/euptex-euptexini.Tpo -c -o euptex-euptexini.o `test -f 'euptexini.c' || echo '$(srcdir)/'`euptexini.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/euptex-euptexini.Tpo $(DEPDIR)/euptex-euptexini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='euptexini.c' object='euptex-euptexini.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o euptex-euptexini.o `test -f 'euptexini.c' || echo '$(srcdir)/'`euptexini.c
+
+euptex-euptexini.obj: euptexini.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT euptex-euptexini.obj -MD -MP -MF $(DEPDIR)/euptex-euptexini.Tpo -c -o euptex-euptexini.obj `if test -f 'euptexini.c'; then $(CYGPATH_W) 'euptexini.c'; else $(CYGPATH_W) '$(srcdir)/euptexini.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/euptex-euptexini.Tpo $(DEPDIR)/euptex-euptexini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='euptexini.c' object='euptex-euptexini.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o euptex-euptexini.obj `if test -f 'euptexini.c'; then $(CYGPATH_W) 'euptexini.c'; else $(CYGPATH_W) '$(srcdir)/euptexini.c'; fi`
+
+euptex-euptex0.o: euptex0.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT euptex-euptex0.o -MD -MP -MF $(DEPDIR)/euptex-euptex0.Tpo -c -o euptex-euptex0.o `test -f 'euptex0.c' || echo '$(srcdir)/'`euptex0.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/euptex-euptex0.Tpo $(DEPDIR)/euptex-euptex0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='euptex0.c' object='euptex-euptex0.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o euptex-euptex0.o `test -f 'euptex0.c' || echo '$(srcdir)/'`euptex0.c
+
+euptex-euptex0.obj: euptex0.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT euptex-euptex0.obj -MD -MP -MF $(DEPDIR)/euptex-euptex0.Tpo -c -o euptex-euptex0.obj `if test -f 'euptex0.c'; then $(CYGPATH_W) 'euptex0.c'; else $(CYGPATH_W) '$(srcdir)/euptex0.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/euptex-euptex0.Tpo $(DEPDIR)/euptex-euptex0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='euptex0.c' object='euptex-euptex0.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o euptex-euptex0.obj `if test -f 'euptex0.c'; then $(CYGPATH_W) 'euptex0.c'; else $(CYGPATH_W) '$(srcdir)/euptex0.c'; fi`
+
+euptex-euptex-pool.o: euptex-pool.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT euptex-euptex-pool.o -MD -MP -MF $(DEPDIR)/euptex-euptex-pool.Tpo -c -o euptex-euptex-pool.o `test -f 'euptex-pool.c' || echo '$(srcdir)/'`euptex-pool.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/euptex-euptex-pool.Tpo $(DEPDIR)/euptex-euptex-pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='euptex-pool.c' object='euptex-euptex-pool.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o euptex-euptex-pool.o `test -f 'euptex-pool.c' || echo '$(srcdir)/'`euptex-pool.c
+
+euptex-euptex-pool.obj: euptex-pool.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT euptex-euptex-pool.obj -MD -MP -MF $(DEPDIR)/euptex-euptex-pool.Tpo -c -o euptex-euptex-pool.obj `if test -f 'euptex-pool.c'; then $(CYGPATH_W) 'euptex-pool.c'; else $(CYGPATH_W) '$(srcdir)/euptex-pool.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/euptex-euptex-pool.Tpo $(DEPDIR)/euptex-euptex-pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='euptex-pool.c' object='euptex-euptex-pool.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(euptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o euptex-euptex-pool.obj `if test -f 'euptex-pool.c'; then $(CYGPATH_W) 'euptex-pool.c'; else $(CYGPATH_W) '$(srcdir)/euptex-pool.c'; fi`
+
inimf-callexe.o: callexe.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(inimf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT inimf-callexe.o -MD -MP -MF $(DEPDIR)/inimf-callexe.Tpo -c -o inimf-callexe.o `test -f 'callexe.c' || echo '$(srcdir)/'`callexe.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/inimf-callexe.Tpo $(DEPDIR)/inimf-callexe.Po
@@ -9573,6 +12417,384 @@ mpost-mpxout.obj: mpxout.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpost-mpxout.obj `if test -f 'mpxout.c'; then $(CYGPATH_W) 'mpxout.c'; else $(CYGPATH_W) '$(srcdir)/mpxout.c'; fi`
+pbibtex-pbibtex.o: pbibtex.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pbibtex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pbibtex-pbibtex.o -MD -MP -MF $(DEPDIR)/pbibtex-pbibtex.Tpo -c -o pbibtex-pbibtex.o `test -f 'pbibtex.c' || echo '$(srcdir)/'`pbibtex.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pbibtex-pbibtex.Tpo $(DEPDIR)/pbibtex-pbibtex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pbibtex.c' object='pbibtex-pbibtex.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pbibtex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pbibtex-pbibtex.o `test -f 'pbibtex.c' || echo '$(srcdir)/'`pbibtex.c
+
+pbibtex-pbibtex.obj: pbibtex.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pbibtex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pbibtex-pbibtex.obj -MD -MP -MF $(DEPDIR)/pbibtex-pbibtex.Tpo -c -o pbibtex-pbibtex.obj `if test -f 'pbibtex.c'; then $(CYGPATH_W) 'pbibtex.c'; else $(CYGPATH_W) '$(srcdir)/pbibtex.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pbibtex-pbibtex.Tpo $(DEPDIR)/pbibtex-pbibtex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pbibtex.c' object='pbibtex-pbibtex.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pbibtex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pbibtex-pbibtex.obj `if test -f 'pbibtex.c'; then $(CYGPATH_W) 'pbibtex.c'; else $(CYGPATH_W) '$(srcdir)/pbibtex.c'; fi`
+
+pdftexdir/pdftex-pdftexextra.o: pdftexdir/pdftexextra.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/pdftex-pdftexextra.o -MD -MP -MF pdftexdir/$(DEPDIR)/pdftex-pdftexextra.Tpo -c -o pdftexdir/pdftex-pdftexextra.o `test -f 'pdftexdir/pdftexextra.c' || echo '$(srcdir)/'`pdftexdir/pdftexextra.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/pdftex-pdftexextra.Tpo pdftexdir/$(DEPDIR)/pdftex-pdftexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/pdftexextra.c' object='pdftexdir/pdftex-pdftexextra.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/pdftex-pdftexextra.o `test -f 'pdftexdir/pdftexextra.c' || echo '$(srcdir)/'`pdftexdir/pdftexextra.c
+
+pdftexdir/pdftex-pdftexextra.obj: pdftexdir/pdftexextra.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/pdftex-pdftexextra.obj -MD -MP -MF pdftexdir/$(DEPDIR)/pdftex-pdftexextra.Tpo -c -o pdftexdir/pdftex-pdftexextra.obj `if test -f 'pdftexdir/pdftexextra.c'; then $(CYGPATH_W) 'pdftexdir/pdftexextra.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/pdftexextra.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/pdftex-pdftexextra.Tpo pdftexdir/$(DEPDIR)/pdftex-pdftexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/pdftexextra.c' object='pdftexdir/pdftex-pdftexextra.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/pdftex-pdftexextra.obj `if test -f 'pdftexdir/pdftexextra.c'; then $(CYGPATH_W) 'pdftexdir/pdftexextra.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/pdftexextra.c'; fi`
+
+synctexdir/pdftex-synctex.o: synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/pdftex-synctex.o -MD -MP -MF synctexdir/$(DEPDIR)/pdftex-synctex.Tpo -c -o synctexdir/pdftex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/pdftex-synctex.Tpo synctexdir/$(DEPDIR)/pdftex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/pdftex-synctex.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/pdftex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+
+synctexdir/pdftex-synctex.obj: synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/pdftex-synctex.obj -MD -MP -MF synctexdir/$(DEPDIR)/pdftex-synctex.Tpo -c -o synctexdir/pdftex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/pdftex-synctex.Tpo synctexdir/$(DEPDIR)/pdftex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/pdftex-synctex.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/pdftex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+
+pdftex-pdftexini.o: pdftexini.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftex-pdftexini.o -MD -MP -MF $(DEPDIR)/pdftex-pdftexini.Tpo -c -o pdftex-pdftexini.o `test -f 'pdftexini.c' || echo '$(srcdir)/'`pdftexini.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pdftex-pdftexini.Tpo $(DEPDIR)/pdftex-pdftexini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexini.c' object='pdftex-pdftexini.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftex-pdftexini.o `test -f 'pdftexini.c' || echo '$(srcdir)/'`pdftexini.c
+
+pdftex-pdftexini.obj: pdftexini.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftex-pdftexini.obj -MD -MP -MF $(DEPDIR)/pdftex-pdftexini.Tpo -c -o pdftex-pdftexini.obj `if test -f 'pdftexini.c'; then $(CYGPATH_W) 'pdftexini.c'; else $(CYGPATH_W) '$(srcdir)/pdftexini.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pdftex-pdftexini.Tpo $(DEPDIR)/pdftex-pdftexini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexini.c' object='pdftex-pdftexini.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftex-pdftexini.obj `if test -f 'pdftexini.c'; then $(CYGPATH_W) 'pdftexini.c'; else $(CYGPATH_W) '$(srcdir)/pdftexini.c'; fi`
+
+pdftex-pdftex0.o: pdftex0.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftex-pdftex0.o -MD -MP -MF $(DEPDIR)/pdftex-pdftex0.Tpo -c -o pdftex-pdftex0.o `test -f 'pdftex0.c' || echo '$(srcdir)/'`pdftex0.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pdftex-pdftex0.Tpo $(DEPDIR)/pdftex-pdftex0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftex0.c' object='pdftex-pdftex0.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftex-pdftex0.o `test -f 'pdftex0.c' || echo '$(srcdir)/'`pdftex0.c
+
+pdftex-pdftex0.obj: pdftex0.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftex-pdftex0.obj -MD -MP -MF $(DEPDIR)/pdftex-pdftex0.Tpo -c -o pdftex-pdftex0.obj `if test -f 'pdftex0.c'; then $(CYGPATH_W) 'pdftex0.c'; else $(CYGPATH_W) '$(srcdir)/pdftex0.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pdftex-pdftex0.Tpo $(DEPDIR)/pdftex-pdftex0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftex0.c' object='pdftex-pdftex0.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftex-pdftex0.obj `if test -f 'pdftex0.c'; then $(CYGPATH_W) 'pdftex0.c'; else $(CYGPATH_W) '$(srcdir)/pdftex0.c'; fi`
+
+pdftex-pdftex-pool.o: pdftex-pool.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftex-pdftex-pool.o -MD -MP -MF $(DEPDIR)/pdftex-pdftex-pool.Tpo -c -o pdftex-pdftex-pool.o `test -f 'pdftex-pool.c' || echo '$(srcdir)/'`pdftex-pool.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pdftex-pdftex-pool.Tpo $(DEPDIR)/pdftex-pdftex-pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftex-pool.c' object='pdftex-pdftex-pool.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftex-pdftex-pool.o `test -f 'pdftex-pool.c' || echo '$(srcdir)/'`pdftex-pool.c
+
+pdftex-pdftex-pool.obj: pdftex-pool.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftex-pdftex-pool.obj -MD -MP -MF $(DEPDIR)/pdftex-pdftex-pool.Tpo -c -o pdftex-pdftex-pool.obj `if test -f 'pdftex-pool.c'; then $(CYGPATH_W) 'pdftex-pool.c'; else $(CYGPATH_W) '$(srcdir)/pdftex-pool.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pdftex-pdftex-pool.Tpo $(DEPDIR)/pdftex-pdftex-pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftex-pool.c' object='pdftex-pdftex-pool.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftex-pdftex-pool.obj `if test -f 'pdftex-pool.c'; then $(CYGPATH_W) 'pdftex-pool.c'; else $(CYGPATH_W) '$(srcdir)/pdftex-pool.c'; fi`
+
+pdvitype-pdvitype.o: pdvitype.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdvitype-pdvitype.o -MD -MP -MF $(DEPDIR)/pdvitype-pdvitype.Tpo -c -o pdvitype-pdvitype.o `test -f 'pdvitype.c' || echo '$(srcdir)/'`pdvitype.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pdvitype-pdvitype.Tpo $(DEPDIR)/pdvitype-pdvitype.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdvitype.c' object='pdvitype-pdvitype.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdvitype-pdvitype.o `test -f 'pdvitype.c' || echo '$(srcdir)/'`pdvitype.c
+
+pdvitype-pdvitype.obj: pdvitype.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdvitype-pdvitype.obj -MD -MP -MF $(DEPDIR)/pdvitype-pdvitype.Tpo -c -o pdvitype-pdvitype.obj `if test -f 'pdvitype.c'; then $(CYGPATH_W) 'pdvitype.c'; else $(CYGPATH_W) '$(srcdir)/pdvitype.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pdvitype-pdvitype.Tpo $(DEPDIR)/pdvitype-pdvitype.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdvitype.c' object='pdvitype-pdvitype.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdvitype-pdvitype.obj `if test -f 'pdvitype.c'; then $(CYGPATH_W) 'pdvitype.c'; else $(CYGPATH_W) '$(srcdir)/pdvitype.c'; fi`
+
+pmpost-pmp.o: pmp.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmp.o -MD -MP -MF $(DEPDIR)/pmpost-pmp.Tpo -c -o pmpost-pmp.o `test -f 'pmp.c' || echo '$(srcdir)/'`pmp.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmp.Tpo $(DEPDIR)/pmpost-pmp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmp.c' object='pmpost-pmp.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmp.o `test -f 'pmp.c' || echo '$(srcdir)/'`pmp.c
+
+pmpost-pmp.obj: pmp.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmp.obj -MD -MP -MF $(DEPDIR)/pmpost-pmp.Tpo -c -o pmpost-pmp.obj `if test -f 'pmp.c'; then $(CYGPATH_W) 'pmp.c'; else $(CYGPATH_W) '$(srcdir)/pmp.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmp.Tpo $(DEPDIR)/pmpost-pmp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmp.c' object='pmpost-pmp.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmp.obj `if test -f 'pmp.c'; then $(CYGPATH_W) 'pmp.c'; else $(CYGPATH_W) '$(srcdir)/pmp.c'; fi`
+
+pmpost-pmpmath.o: pmpmath.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpmath.o -MD -MP -MF $(DEPDIR)/pmpost-pmpmath.Tpo -c -o pmpost-pmpmath.o `test -f 'pmpmath.c' || echo '$(srcdir)/'`pmpmath.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpmath.Tpo $(DEPDIR)/pmpost-pmpmath.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmath.c' object='pmpost-pmpmath.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpmath.o `test -f 'pmpmath.c' || echo '$(srcdir)/'`pmpmath.c
+
+pmpost-pmpmath.obj: pmpmath.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpmath.obj -MD -MP -MF $(DEPDIR)/pmpost-pmpmath.Tpo -c -o pmpost-pmpmath.obj `if test -f 'pmpmath.c'; then $(CYGPATH_W) 'pmpmath.c'; else $(CYGPATH_W) '$(srcdir)/pmpmath.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpmath.Tpo $(DEPDIR)/pmpost-pmpmath.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmath.c' object='pmpost-pmpmath.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpmath.obj `if test -f 'pmpmath.c'; then $(CYGPATH_W) 'pmpmath.c'; else $(CYGPATH_W) '$(srcdir)/pmpmath.c'; fi`
+
+pmpost-pmpmathbinary.o: pmpmathbinary.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpmathbinary.o -MD -MP -MF $(DEPDIR)/pmpost-pmpmathbinary.Tpo -c -o pmpost-pmpmathbinary.o `test -f 'pmpmathbinary.c' || echo '$(srcdir)/'`pmpmathbinary.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpmathbinary.Tpo $(DEPDIR)/pmpost-pmpmathbinary.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmathbinary.c' object='pmpost-pmpmathbinary.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpmathbinary.o `test -f 'pmpmathbinary.c' || echo '$(srcdir)/'`pmpmathbinary.c
+
+pmpost-pmpmathbinary.obj: pmpmathbinary.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpmathbinary.obj -MD -MP -MF $(DEPDIR)/pmpost-pmpmathbinary.Tpo -c -o pmpost-pmpmathbinary.obj `if test -f 'pmpmathbinary.c'; then $(CYGPATH_W) 'pmpmathbinary.c'; else $(CYGPATH_W) '$(srcdir)/pmpmathbinary.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpmathbinary.Tpo $(DEPDIR)/pmpost-pmpmathbinary.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmathbinary.c' object='pmpost-pmpmathbinary.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpmathbinary.obj `if test -f 'pmpmathbinary.c'; then $(CYGPATH_W) 'pmpmathbinary.c'; else $(CYGPATH_W) '$(srcdir)/pmpmathbinary.c'; fi`
+
+pmpost-pmpmathdecimal.o: pmpmathdecimal.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpmathdecimal.o -MD -MP -MF $(DEPDIR)/pmpost-pmpmathdecimal.Tpo -c -o pmpost-pmpmathdecimal.o `test -f 'pmpmathdecimal.c' || echo '$(srcdir)/'`pmpmathdecimal.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpmathdecimal.Tpo $(DEPDIR)/pmpost-pmpmathdecimal.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmathdecimal.c' object='pmpost-pmpmathdecimal.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpmathdecimal.o `test -f 'pmpmathdecimal.c' || echo '$(srcdir)/'`pmpmathdecimal.c
+
+pmpost-pmpmathdecimal.obj: pmpmathdecimal.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpmathdecimal.obj -MD -MP -MF $(DEPDIR)/pmpost-pmpmathdecimal.Tpo -c -o pmpost-pmpmathdecimal.obj `if test -f 'pmpmathdecimal.c'; then $(CYGPATH_W) 'pmpmathdecimal.c'; else $(CYGPATH_W) '$(srcdir)/pmpmathdecimal.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpmathdecimal.Tpo $(DEPDIR)/pmpost-pmpmathdecimal.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmathdecimal.c' object='pmpost-pmpmathdecimal.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpmathdecimal.obj `if test -f 'pmpmathdecimal.c'; then $(CYGPATH_W) 'pmpmathdecimal.c'; else $(CYGPATH_W) '$(srcdir)/pmpmathdecimal.c'; fi`
+
+pmpost-pmpmathdouble.o: pmpmathdouble.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpmathdouble.o -MD -MP -MF $(DEPDIR)/pmpost-pmpmathdouble.Tpo -c -o pmpost-pmpmathdouble.o `test -f 'pmpmathdouble.c' || echo '$(srcdir)/'`pmpmathdouble.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpmathdouble.Tpo $(DEPDIR)/pmpost-pmpmathdouble.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmathdouble.c' object='pmpost-pmpmathdouble.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpmathdouble.o `test -f 'pmpmathdouble.c' || echo '$(srcdir)/'`pmpmathdouble.c
+
+pmpost-pmpmathdouble.obj: pmpmathdouble.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpmathdouble.obj -MD -MP -MF $(DEPDIR)/pmpost-pmpmathdouble.Tpo -c -o pmpost-pmpmathdouble.obj `if test -f 'pmpmathdouble.c'; then $(CYGPATH_W) 'pmpmathdouble.c'; else $(CYGPATH_W) '$(srcdir)/pmpmathdouble.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpmathdouble.Tpo $(DEPDIR)/pmpost-pmpmathdouble.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmathdouble.c' object='pmpost-pmpmathdouble.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpmathdouble.obj `if test -f 'pmpmathdouble.c'; then $(CYGPATH_W) 'pmpmathdouble.c'; else $(CYGPATH_W) '$(srcdir)/pmpmathdouble.c'; fi`
+
+pmpost-pmpost.o: pmpost.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpost.o -MD -MP -MF $(DEPDIR)/pmpost-pmpost.Tpo -c -o pmpost-pmpost.o `test -f 'pmpost.c' || echo '$(srcdir)/'`pmpost.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpost.Tpo $(DEPDIR)/pmpost-pmpost.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpost.c' object='pmpost-pmpost.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpost.o `test -f 'pmpost.c' || echo '$(srcdir)/'`pmpost.c
+
+pmpost-pmpost.obj: pmpost.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpost.obj -MD -MP -MF $(DEPDIR)/pmpost-pmpost.Tpo -c -o pmpost-pmpost.obj `if test -f 'pmpost.c'; then $(CYGPATH_W) 'pmpost.c'; else $(CYGPATH_W) '$(srcdir)/pmpost.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpost.Tpo $(DEPDIR)/pmpost-pmpost.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpost.c' object='pmpost-pmpost.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpost.obj `if test -f 'pmpost.c'; then $(CYGPATH_W) 'pmpost.c'; else $(CYGPATH_W) '$(srcdir)/pmpost.c'; fi`
+
+pmpost-pmpstrings.o: pmpstrings.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpstrings.o -MD -MP -MF $(DEPDIR)/pmpost-pmpstrings.Tpo -c -o pmpost-pmpstrings.o `test -f 'pmpstrings.c' || echo '$(srcdir)/'`pmpstrings.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpstrings.Tpo $(DEPDIR)/pmpost-pmpstrings.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpstrings.c' object='pmpost-pmpstrings.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpstrings.o `test -f 'pmpstrings.c' || echo '$(srcdir)/'`pmpstrings.c
+
+pmpost-pmpstrings.obj: pmpstrings.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpstrings.obj -MD -MP -MF $(DEPDIR)/pmpost-pmpstrings.Tpo -c -o pmpost-pmpstrings.obj `if test -f 'pmpstrings.c'; then $(CYGPATH_W) 'pmpstrings.c'; else $(CYGPATH_W) '$(srcdir)/pmpstrings.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpstrings.Tpo $(DEPDIR)/pmpost-pmpstrings.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpstrings.c' object='pmpost-pmpstrings.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpstrings.obj `if test -f 'pmpstrings.c'; then $(CYGPATH_W) 'pmpstrings.c'; else $(CYGPATH_W) '$(srcdir)/pmpstrings.c'; fi`
+
+pmpost-pmpxout.o: pmpxout.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpxout.o -MD -MP -MF $(DEPDIR)/pmpost-pmpxout.Tpo -c -o pmpost-pmpxout.o `test -f 'pmpxout.c' || echo '$(srcdir)/'`pmpxout.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpxout.Tpo $(DEPDIR)/pmpost-pmpxout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpxout.c' object='pmpost-pmpxout.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpxout.o `test -f 'pmpxout.c' || echo '$(srcdir)/'`pmpxout.c
+
+pmpost-pmpxout.obj: pmpxout.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-pmpxout.obj -MD -MP -MF $(DEPDIR)/pmpost-pmpxout.Tpo -c -o pmpost-pmpxout.obj `if test -f 'pmpxout.c'; then $(CYGPATH_W) 'pmpxout.c'; else $(CYGPATH_W) '$(srcdir)/pmpxout.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-pmpxout.Tpo $(DEPDIR)/pmpost-pmpxout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpxout.c' object='pmpost-pmpxout.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-pmpxout.obj `if test -f 'pmpxout.c'; then $(CYGPATH_W) 'pmpxout.c'; else $(CYGPATH_W) '$(srcdir)/pmpxout.c'; fi`
+
+pmpost-ppngout.o: ppngout.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-ppngout.o -MD -MP -MF $(DEPDIR)/pmpost-ppngout.Tpo -c -o pmpost-ppngout.o `test -f 'ppngout.c' || echo '$(srcdir)/'`ppngout.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-ppngout.Tpo $(DEPDIR)/pmpost-ppngout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ppngout.c' object='pmpost-ppngout.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-ppngout.o `test -f 'ppngout.c' || echo '$(srcdir)/'`ppngout.c
+
+pmpost-ppngout.obj: ppngout.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-ppngout.obj -MD -MP -MF $(DEPDIR)/pmpost-ppngout.Tpo -c -o pmpost-ppngout.obj `if test -f 'ppngout.c'; then $(CYGPATH_W) 'ppngout.c'; else $(CYGPATH_W) '$(srcdir)/ppngout.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-ppngout.Tpo $(DEPDIR)/pmpost-ppngout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ppngout.c' object='pmpost-ppngout.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-ppngout.obj `if test -f 'ppngout.c'; then $(CYGPATH_W) 'ppngout.c'; else $(CYGPATH_W) '$(srcdir)/ppngout.c'; fi`
+
+pmpost-ppsout.o: ppsout.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-ppsout.o -MD -MP -MF $(DEPDIR)/pmpost-ppsout.Tpo -c -o pmpost-ppsout.o `test -f 'ppsout.c' || echo '$(srcdir)/'`ppsout.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-ppsout.Tpo $(DEPDIR)/pmpost-ppsout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ppsout.c' object='pmpost-ppsout.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-ppsout.o `test -f 'ppsout.c' || echo '$(srcdir)/'`ppsout.c
+
+pmpost-ppsout.obj: ppsout.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-ppsout.obj -MD -MP -MF $(DEPDIR)/pmpost-ppsout.Tpo -c -o pmpost-ppsout.obj `if test -f 'ppsout.c'; then $(CYGPATH_W) 'ppsout.c'; else $(CYGPATH_W) '$(srcdir)/ppsout.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-ppsout.Tpo $(DEPDIR)/pmpost-ppsout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ppsout.c' object='pmpost-ppsout.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-ppsout.obj `if test -f 'ppsout.c'; then $(CYGPATH_W) 'ppsout.c'; else $(CYGPATH_W) '$(srcdir)/ppsout.c'; fi`
+
+pmpost-psvgout.o: psvgout.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-psvgout.o -MD -MP -MF $(DEPDIR)/pmpost-psvgout.Tpo -c -o pmpost-psvgout.o `test -f 'psvgout.c' || echo '$(srcdir)/'`psvgout.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-psvgout.Tpo $(DEPDIR)/pmpost-psvgout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='psvgout.c' object='pmpost-psvgout.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-psvgout.o `test -f 'psvgout.c' || echo '$(srcdir)/'`psvgout.c
+
+pmpost-psvgout.obj: psvgout.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-psvgout.obj -MD -MP -MF $(DEPDIR)/pmpost-psvgout.Tpo -c -o pmpost-psvgout.obj `if test -f 'psvgout.c'; then $(CYGPATH_W) 'psvgout.c'; else $(CYGPATH_W) '$(srcdir)/psvgout.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-psvgout.Tpo $(DEPDIR)/pmpost-psvgout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='psvgout.c' object='pmpost-psvgout.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-psvgout.obj `if test -f 'psvgout.c'; then $(CYGPATH_W) 'psvgout.c'; else $(CYGPATH_W) '$(srcdir)/psvgout.c'; fi`
+
+pmpost-ptfmin.o: ptfmin.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-ptfmin.o -MD -MP -MF $(DEPDIR)/pmpost-ptfmin.Tpo -c -o pmpost-ptfmin.o `test -f 'ptfmin.c' || echo '$(srcdir)/'`ptfmin.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-ptfmin.Tpo $(DEPDIR)/pmpost-ptfmin.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptfmin.c' object='pmpost-ptfmin.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-ptfmin.o `test -f 'ptfmin.c' || echo '$(srcdir)/'`ptfmin.c
+
+pmpost-ptfmin.obj: ptfmin.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pmpost-ptfmin.obj -MD -MP -MF $(DEPDIR)/pmpost-ptfmin.Tpo -c -o pmpost-ptfmin.obj `if test -f 'ptfmin.c'; then $(CYGPATH_W) 'ptfmin.c'; else $(CYGPATH_W) '$(srcdir)/ptfmin.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pmpost-ptfmin.Tpo $(DEPDIR)/pmpost-ptfmin.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptfmin.c' object='pmpost-ptfmin.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pmpost-ptfmin.obj `if test -f 'ptfmin.c'; then $(CYGPATH_W) 'ptfmin.c'; else $(CYGPATH_W) '$(srcdir)/ptfmin.c'; fi`
+
+ppltotf-ppltotf.o: ppltotf.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ppltotf-ppltotf.o -MD -MP -MF $(DEPDIR)/ppltotf-ppltotf.Tpo -c -o ppltotf-ppltotf.o `test -f 'ppltotf.c' || echo '$(srcdir)/'`ppltotf.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ppltotf-ppltotf.Tpo $(DEPDIR)/ppltotf-ppltotf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ppltotf.c' object='ppltotf-ppltotf.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ppltotf-ppltotf.o `test -f 'ppltotf.c' || echo '$(srcdir)/'`ppltotf.c
+
+ppltotf-ppltotf.obj: ppltotf.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ppltotf-ppltotf.obj -MD -MP -MF $(DEPDIR)/ppltotf-ppltotf.Tpo -c -o ppltotf-ppltotf.obj `if test -f 'ppltotf.c'; then $(CYGPATH_W) 'ppltotf.c'; else $(CYGPATH_W) '$(srcdir)/ppltotf.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ppltotf-ppltotf.Tpo $(DEPDIR)/ppltotf-ppltotf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ppltotf.c' object='ppltotf-ppltotf.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ppltotf-ppltotf.obj `if test -f 'ppltotf.c'; then $(CYGPATH_W) 'ppltotf.c'; else $(CYGPATH_W) '$(srcdir)/ppltotf.c'; fi`
+
+ptexdir/ptex-ptexextra.o: ptexdir/ptexextra.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptexdir/ptex-ptexextra.o -MD -MP -MF ptexdir/$(DEPDIR)/ptex-ptexextra.Tpo -c -o ptexdir/ptex-ptexextra.o `test -f 'ptexdir/ptexextra.c' || echo '$(srcdir)/'`ptexdir/ptexextra.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ptexdir/$(DEPDIR)/ptex-ptexextra.Tpo ptexdir/$(DEPDIR)/ptex-ptexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptexdir/ptexextra.c' object='ptexdir/ptex-ptexextra.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptexdir/ptex-ptexextra.o `test -f 'ptexdir/ptexextra.c' || echo '$(srcdir)/'`ptexdir/ptexextra.c
+
+ptexdir/ptex-ptexextra.obj: ptexdir/ptexextra.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptexdir/ptex-ptexextra.obj -MD -MP -MF ptexdir/$(DEPDIR)/ptex-ptexextra.Tpo -c -o ptexdir/ptex-ptexextra.obj `if test -f 'ptexdir/ptexextra.c'; then $(CYGPATH_W) 'ptexdir/ptexextra.c'; else $(CYGPATH_W) '$(srcdir)/ptexdir/ptexextra.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ptexdir/$(DEPDIR)/ptex-ptexextra.Tpo ptexdir/$(DEPDIR)/ptex-ptexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptexdir/ptexextra.c' object='ptexdir/ptex-ptexextra.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptexdir/ptex-ptexextra.obj `if test -f 'ptexdir/ptexextra.c'; then $(CYGPATH_W) 'ptexdir/ptexextra.c'; else $(CYGPATH_W) '$(srcdir)/ptexdir/ptexextra.c'; fi`
+
+synctexdir/ptex-synctex.o: synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/ptex-synctex.o -MD -MP -MF synctexdir/$(DEPDIR)/ptex-synctex.Tpo -c -o synctexdir/ptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/ptex-synctex.Tpo synctexdir/$(DEPDIR)/ptex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/ptex-synctex.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/ptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+
+synctexdir/ptex-synctex.obj: synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/ptex-synctex.obj -MD -MP -MF synctexdir/$(DEPDIR)/ptex-synctex.Tpo -c -o synctexdir/ptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/ptex-synctex.Tpo synctexdir/$(DEPDIR)/ptex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/ptex-synctex.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/ptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+
+ptex-ptexini.o: ptexini.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-ptexini.o -MD -MP -MF $(DEPDIR)/ptex-ptexini.Tpo -c -o ptex-ptexini.o `test -f 'ptexini.c' || echo '$(srcdir)/'`ptexini.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ptex-ptexini.Tpo $(DEPDIR)/ptex-ptexini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptexini.c' object='ptex-ptexini.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptexini.o `test -f 'ptexini.c' || echo '$(srcdir)/'`ptexini.c
+
+ptex-ptexini.obj: ptexini.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-ptexini.obj -MD -MP -MF $(DEPDIR)/ptex-ptexini.Tpo -c -o ptex-ptexini.obj `if test -f 'ptexini.c'; then $(CYGPATH_W) 'ptexini.c'; else $(CYGPATH_W) '$(srcdir)/ptexini.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ptex-ptexini.Tpo $(DEPDIR)/ptex-ptexini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptexini.c' object='ptex-ptexini.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptexini.obj `if test -f 'ptexini.c'; then $(CYGPATH_W) 'ptexini.c'; else $(CYGPATH_W) '$(srcdir)/ptexini.c'; fi`
+
+ptex-ptex0.o: ptex0.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-ptex0.o -MD -MP -MF $(DEPDIR)/ptex-ptex0.Tpo -c -o ptex-ptex0.o `test -f 'ptex0.c' || echo '$(srcdir)/'`ptex0.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ptex-ptex0.Tpo $(DEPDIR)/ptex-ptex0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptex0.c' object='ptex-ptex0.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptex0.o `test -f 'ptex0.c' || echo '$(srcdir)/'`ptex0.c
+
+ptex-ptex0.obj: ptex0.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-ptex0.obj -MD -MP -MF $(DEPDIR)/ptex-ptex0.Tpo -c -o ptex-ptex0.obj `if test -f 'ptex0.c'; then $(CYGPATH_W) 'ptex0.c'; else $(CYGPATH_W) '$(srcdir)/ptex0.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ptex-ptex0.Tpo $(DEPDIR)/ptex-ptex0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptex0.c' object='ptex-ptex0.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptex0.obj `if test -f 'ptex0.c'; then $(CYGPATH_W) 'ptex0.c'; else $(CYGPATH_W) '$(srcdir)/ptex0.c'; fi`
+
+ptex-ptex-pool.o: ptex-pool.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-ptex-pool.o -MD -MP -MF $(DEPDIR)/ptex-ptex-pool.Tpo -c -o ptex-ptex-pool.o `test -f 'ptex-pool.c' || echo '$(srcdir)/'`ptex-pool.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ptex-ptex-pool.Tpo $(DEPDIR)/ptex-ptex-pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptex-pool.c' object='ptex-ptex-pool.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptex-pool.o `test -f 'ptex-pool.c' || echo '$(srcdir)/'`ptex-pool.c
+
+ptex-ptex-pool.obj: ptex-pool.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptex-ptex-pool.obj -MD -MP -MF $(DEPDIR)/ptex-ptex-pool.Tpo -c -o ptex-ptex-pool.obj `if test -f 'ptex-pool.c'; then $(CYGPATH_W) 'ptex-pool.c'; else $(CYGPATH_W) '$(srcdir)/ptex-pool.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ptex-ptex-pool.Tpo $(DEPDIR)/ptex-ptex-pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptex-pool.c' object='ptex-ptex-pool.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptex-ptex-pool.obj `if test -f 'ptex-pool.c'; then $(CYGPATH_W) 'ptex-pool.c'; else $(CYGPATH_W) '$(srcdir)/ptex-pool.c'; fi`
+
+ptftopl-ptftopl.o: ptftopl.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptftopl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptftopl-ptftopl.o -MD -MP -MF $(DEPDIR)/ptftopl-ptftopl.Tpo -c -o ptftopl-ptftopl.o `test -f 'ptftopl.c' || echo '$(srcdir)/'`ptftopl.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ptftopl-ptftopl.Tpo $(DEPDIR)/ptftopl-ptftopl.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptftopl.c' object='ptftopl-ptftopl.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptftopl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptftopl-ptftopl.o `test -f 'ptftopl.c' || echo '$(srcdir)/'`ptftopl.c
+
+ptftopl-ptftopl.obj: ptftopl.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptftopl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ptftopl-ptftopl.obj -MD -MP -MF $(DEPDIR)/ptftopl-ptftopl.Tpo -c -o ptftopl-ptftopl.obj `if test -f 'ptftopl.c'; then $(CYGPATH_W) 'ptftopl.c'; else $(CYGPATH_W) '$(srcdir)/ptftopl.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/ptftopl-ptftopl.Tpo $(DEPDIR)/ptftopl-ptftopl.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptftopl.c' object='ptftopl-ptftopl.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ptftopl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ptftopl-ptftopl.obj `if test -f 'ptftopl.c'; then $(CYGPATH_W) 'ptftopl.c'; else $(CYGPATH_W) '$(srcdir)/ptftopl.c'; fi`
+
+synctexdir/synctex-synctex_main.o: synctexdir/synctex_main.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(synctex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/synctex-synctex_main.o -MD -MP -MF synctexdir/$(DEPDIR)/synctex-synctex_main.Tpo -c -o synctexdir/synctex-synctex_main.o `test -f 'synctexdir/synctex_main.c' || echo '$(srcdir)/'`synctexdir/synctex_main.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/synctex-synctex_main.Tpo synctexdir/$(DEPDIR)/synctex-synctex_main.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex_main.c' object='synctexdir/synctex-synctex_main.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(synctex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/synctex-synctex_main.o `test -f 'synctexdir/synctex_main.c' || echo '$(srcdir)/'`synctexdir/synctex_main.c
+
+synctexdir/synctex-synctex_main.obj: synctexdir/synctex_main.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(synctex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/synctex-synctex_main.obj -MD -MP -MF synctexdir/$(DEPDIR)/synctex-synctex_main.Tpo -c -o synctexdir/synctex-synctex_main.obj `if test -f 'synctexdir/synctex_main.c'; then $(CYGPATH_W) 'synctexdir/synctex_main.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex_main.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/synctex-synctex_main.Tpo synctexdir/$(DEPDIR)/synctex-synctex_main.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex_main.c' object='synctexdir/synctex-synctex_main.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(synctex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/synctex-synctex_main.obj `if test -f 'synctexdir/synctex_main.c'; then $(CYGPATH_W) 'synctexdir/synctex_main.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex_main.c'; fi`
+
tex-texextra.o: texextra.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tex-texextra.o -MD -MP -MF $(DEPDIR)/tex-texextra.Tpo -c -o tex-texextra.o `test -f 'texextra.c' || echo '$(srcdir)/'`texextra.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tex-texextra.Tpo $(DEPDIR)/tex-texextra.Po
@@ -9585,7 +12807,21 @@ tex-texextra.obj: texextra.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tex-texextra.Tpo $(DEPDIR)/tex-texextra.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='texextra.c' object='tex-texextra.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tex-texextra.obj `if test -f 'texextra.c'; then $(CYGPATH_W) 'texextra.c'; else $(CYGPATH_W) '$(srcdir)/texextra.c'; fi`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tex-texextra.obj `if test -f 'texextra.c'; then $(CYGPATH_W) 'texextra.c'; else $(CYGPATH_W) '$(srcdir)/texextra.c'; fi`
+
+synctexdir/tex-synctex.o: synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/tex-synctex.o -MD -MP -MF synctexdir/$(DEPDIR)/tex-synctex.Tpo -c -o synctexdir/tex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/tex-synctex.Tpo synctexdir/$(DEPDIR)/tex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/tex-synctex.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/tex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+
+synctexdir/tex-synctex.obj: synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/tex-synctex.obj -MD -MP -MF synctexdir/$(DEPDIR)/tex-synctex.Tpo -c -o synctexdir/tex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/tex-synctex.Tpo synctexdir/$(DEPDIR)/tex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/tex-synctex.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/tex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
tex-texini.o: texini.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tex-texini.o -MD -MP -MF $(DEPDIR)/tex-texini.Tpo -c -o tex-texini.o `test -f 'texini.c' || echo '$(srcdir)/'`texini.c
@@ -9643,6 +12879,34 @@ tie-tie.obj: tie.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tie_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tie-tie.obj `if test -f 'tie.c'; then $(CYGPATH_W) 'tie.c'; else $(CYGPATH_W) '$(srcdir)/tie.c'; fi`
+pdftexdir/ttf2afm-ttf2afm.o: pdftexdir/ttf2afm.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ttf2afm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/ttf2afm-ttf2afm.o -MD -MP -MF pdftexdir/$(DEPDIR)/ttf2afm-ttf2afm.Tpo -c -o pdftexdir/ttf2afm-ttf2afm.o `test -f 'pdftexdir/ttf2afm.c' || echo '$(srcdir)/'`pdftexdir/ttf2afm.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/ttf2afm-ttf2afm.Tpo pdftexdir/$(DEPDIR)/ttf2afm-ttf2afm.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/ttf2afm.c' object='pdftexdir/ttf2afm-ttf2afm.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ttf2afm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/ttf2afm-ttf2afm.o `test -f 'pdftexdir/ttf2afm.c' || echo '$(srcdir)/'`pdftexdir/ttf2afm.c
+
+pdftexdir/ttf2afm-ttf2afm.obj: pdftexdir/ttf2afm.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ttf2afm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/ttf2afm-ttf2afm.obj -MD -MP -MF pdftexdir/$(DEPDIR)/ttf2afm-ttf2afm.Tpo -c -o pdftexdir/ttf2afm-ttf2afm.obj `if test -f 'pdftexdir/ttf2afm.c'; then $(CYGPATH_W) 'pdftexdir/ttf2afm.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/ttf2afm.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/ttf2afm-ttf2afm.Tpo pdftexdir/$(DEPDIR)/ttf2afm-ttf2afm.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/ttf2afm.c' object='pdftexdir/ttf2afm-ttf2afm.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ttf2afm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/ttf2afm-ttf2afm.obj `if test -f 'pdftexdir/ttf2afm.c'; then $(CYGPATH_W) 'pdftexdir/ttf2afm.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/ttf2afm.c'; fi`
+
+pdftexdir/ttf2afm-macnames.o: pdftexdir/macnames.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ttf2afm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/ttf2afm-macnames.o -MD -MP -MF pdftexdir/$(DEPDIR)/ttf2afm-macnames.Tpo -c -o pdftexdir/ttf2afm-macnames.o `test -f 'pdftexdir/macnames.c' || echo '$(srcdir)/'`pdftexdir/macnames.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/ttf2afm-macnames.Tpo pdftexdir/$(DEPDIR)/ttf2afm-macnames.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/macnames.c' object='pdftexdir/ttf2afm-macnames.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ttf2afm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/ttf2afm-macnames.o `test -f 'pdftexdir/macnames.c' || echo '$(srcdir)/'`pdftexdir/macnames.c
+
+pdftexdir/ttf2afm-macnames.obj: pdftexdir/macnames.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ttf2afm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftexdir/ttf2afm-macnames.obj -MD -MP -MF pdftexdir/$(DEPDIR)/ttf2afm-macnames.Tpo -c -o pdftexdir/ttf2afm-macnames.obj `if test -f 'pdftexdir/macnames.c'; then $(CYGPATH_W) 'pdftexdir/macnames.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/macnames.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/ttf2afm-macnames.Tpo pdftexdir/$(DEPDIR)/ttf2afm-macnames.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pdftexdir/macnames.c' object='pdftexdir/ttf2afm-macnames.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ttf2afm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pdftexdir/ttf2afm-macnames.obj `if test -f 'pdftexdir/macnames.c'; then $(CYGPATH_W) 'pdftexdir/macnames.c'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/macnames.c'; fi`
+
txt2zlib-txt2zlib.o: txt2zlib.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(txt2zlib_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT txt2zlib-txt2zlib.o -MD -MP -MF $(DEPDIR)/txt2zlib-txt2zlib.Tpo -c -o txt2zlib-txt2zlib.o `test -f 'txt2zlib.c' || echo '$(srcdir)/'`txt2zlib.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/txt2zlib-txt2zlib.Tpo $(DEPDIR)/txt2zlib-txt2zlib.Po
@@ -9657,6 +12921,370 @@ txt2zlib-txt2zlib.obj: txt2zlib.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(txt2zlib_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o txt2zlib-txt2zlib.obj `if test -f 'txt2zlib.c'; then $(CYGPATH_W) 'txt2zlib.c'; else $(CYGPATH_W) '$(srcdir)/txt2zlib.c'; fi`
+upbibtex-upbibtex.o: upbibtex.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upbibtex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upbibtex-upbibtex.o -MD -MP -MF $(DEPDIR)/upbibtex-upbibtex.Tpo -c -o upbibtex-upbibtex.o `test -f 'upbibtex.c' || echo '$(srcdir)/'`upbibtex.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upbibtex-upbibtex.Tpo $(DEPDIR)/upbibtex-upbibtex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='upbibtex.c' object='upbibtex-upbibtex.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upbibtex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upbibtex-upbibtex.o `test -f 'upbibtex.c' || echo '$(srcdir)/'`upbibtex.c
+
+upbibtex-upbibtex.obj: upbibtex.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upbibtex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upbibtex-upbibtex.obj -MD -MP -MF $(DEPDIR)/upbibtex-upbibtex.Tpo -c -o upbibtex-upbibtex.obj `if test -f 'upbibtex.c'; then $(CYGPATH_W) 'upbibtex.c'; else $(CYGPATH_W) '$(srcdir)/upbibtex.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upbibtex-upbibtex.Tpo $(DEPDIR)/upbibtex-upbibtex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='upbibtex.c' object='upbibtex-upbibtex.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upbibtex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upbibtex-upbibtex.obj `if test -f 'upbibtex.c'; then $(CYGPATH_W) 'upbibtex.c'; else $(CYGPATH_W) '$(srcdir)/upbibtex.c'; fi`
+
+updvitype-updvitype.o: updvitype.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(updvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT updvitype-updvitype.o -MD -MP -MF $(DEPDIR)/updvitype-updvitype.Tpo -c -o updvitype-updvitype.o `test -f 'updvitype.c' || echo '$(srcdir)/'`updvitype.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/updvitype-updvitype.Tpo $(DEPDIR)/updvitype-updvitype.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='updvitype.c' object='updvitype-updvitype.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(updvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o updvitype-updvitype.o `test -f 'updvitype.c' || echo '$(srcdir)/'`updvitype.c
+
+updvitype-updvitype.obj: updvitype.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(updvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT updvitype-updvitype.obj -MD -MP -MF $(DEPDIR)/updvitype-updvitype.Tpo -c -o updvitype-updvitype.obj `if test -f 'updvitype.c'; then $(CYGPATH_W) 'updvitype.c'; else $(CYGPATH_W) '$(srcdir)/updvitype.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/updvitype-updvitype.Tpo $(DEPDIR)/updvitype-updvitype.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='updvitype.c' object='updvitype-updvitype.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(updvitype_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o updvitype-updvitype.obj `if test -f 'updvitype.c'; then $(CYGPATH_W) 'updvitype.c'; else $(CYGPATH_W) '$(srcdir)/updvitype.c'; fi`
+
+upmpost-pmp.o: pmp.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmp.o -MD -MP -MF $(DEPDIR)/upmpost-pmp.Tpo -c -o upmpost-pmp.o `test -f 'pmp.c' || echo '$(srcdir)/'`pmp.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmp.Tpo $(DEPDIR)/upmpost-pmp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmp.c' object='upmpost-pmp.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmp.o `test -f 'pmp.c' || echo '$(srcdir)/'`pmp.c
+
+upmpost-pmp.obj: pmp.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmp.obj -MD -MP -MF $(DEPDIR)/upmpost-pmp.Tpo -c -o upmpost-pmp.obj `if test -f 'pmp.c'; then $(CYGPATH_W) 'pmp.c'; else $(CYGPATH_W) '$(srcdir)/pmp.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmp.Tpo $(DEPDIR)/upmpost-pmp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmp.c' object='upmpost-pmp.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmp.obj `if test -f 'pmp.c'; then $(CYGPATH_W) 'pmp.c'; else $(CYGPATH_W) '$(srcdir)/pmp.c'; fi`
+
+upmpost-pmpmath.o: pmpmath.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpmath.o -MD -MP -MF $(DEPDIR)/upmpost-pmpmath.Tpo -c -o upmpost-pmpmath.o `test -f 'pmpmath.c' || echo '$(srcdir)/'`pmpmath.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpmath.Tpo $(DEPDIR)/upmpost-pmpmath.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmath.c' object='upmpost-pmpmath.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpmath.o `test -f 'pmpmath.c' || echo '$(srcdir)/'`pmpmath.c
+
+upmpost-pmpmath.obj: pmpmath.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpmath.obj -MD -MP -MF $(DEPDIR)/upmpost-pmpmath.Tpo -c -o upmpost-pmpmath.obj `if test -f 'pmpmath.c'; then $(CYGPATH_W) 'pmpmath.c'; else $(CYGPATH_W) '$(srcdir)/pmpmath.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpmath.Tpo $(DEPDIR)/upmpost-pmpmath.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmath.c' object='upmpost-pmpmath.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpmath.obj `if test -f 'pmpmath.c'; then $(CYGPATH_W) 'pmpmath.c'; else $(CYGPATH_W) '$(srcdir)/pmpmath.c'; fi`
+
+upmpost-pmpmathbinary.o: pmpmathbinary.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpmathbinary.o -MD -MP -MF $(DEPDIR)/upmpost-pmpmathbinary.Tpo -c -o upmpost-pmpmathbinary.o `test -f 'pmpmathbinary.c' || echo '$(srcdir)/'`pmpmathbinary.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpmathbinary.Tpo $(DEPDIR)/upmpost-pmpmathbinary.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmathbinary.c' object='upmpost-pmpmathbinary.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpmathbinary.o `test -f 'pmpmathbinary.c' || echo '$(srcdir)/'`pmpmathbinary.c
+
+upmpost-pmpmathbinary.obj: pmpmathbinary.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpmathbinary.obj -MD -MP -MF $(DEPDIR)/upmpost-pmpmathbinary.Tpo -c -o upmpost-pmpmathbinary.obj `if test -f 'pmpmathbinary.c'; then $(CYGPATH_W) 'pmpmathbinary.c'; else $(CYGPATH_W) '$(srcdir)/pmpmathbinary.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpmathbinary.Tpo $(DEPDIR)/upmpost-pmpmathbinary.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmathbinary.c' object='upmpost-pmpmathbinary.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpmathbinary.obj `if test -f 'pmpmathbinary.c'; then $(CYGPATH_W) 'pmpmathbinary.c'; else $(CYGPATH_W) '$(srcdir)/pmpmathbinary.c'; fi`
+
+upmpost-pmpmathdecimal.o: pmpmathdecimal.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpmathdecimal.o -MD -MP -MF $(DEPDIR)/upmpost-pmpmathdecimal.Tpo -c -o upmpost-pmpmathdecimal.o `test -f 'pmpmathdecimal.c' || echo '$(srcdir)/'`pmpmathdecimal.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpmathdecimal.Tpo $(DEPDIR)/upmpost-pmpmathdecimal.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmathdecimal.c' object='upmpost-pmpmathdecimal.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpmathdecimal.o `test -f 'pmpmathdecimal.c' || echo '$(srcdir)/'`pmpmathdecimal.c
+
+upmpost-pmpmathdecimal.obj: pmpmathdecimal.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpmathdecimal.obj -MD -MP -MF $(DEPDIR)/upmpost-pmpmathdecimal.Tpo -c -o upmpost-pmpmathdecimal.obj `if test -f 'pmpmathdecimal.c'; then $(CYGPATH_W) 'pmpmathdecimal.c'; else $(CYGPATH_W) '$(srcdir)/pmpmathdecimal.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpmathdecimal.Tpo $(DEPDIR)/upmpost-pmpmathdecimal.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmathdecimal.c' object='upmpost-pmpmathdecimal.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpmathdecimal.obj `if test -f 'pmpmathdecimal.c'; then $(CYGPATH_W) 'pmpmathdecimal.c'; else $(CYGPATH_W) '$(srcdir)/pmpmathdecimal.c'; fi`
+
+upmpost-pmpmathdouble.o: pmpmathdouble.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpmathdouble.o -MD -MP -MF $(DEPDIR)/upmpost-pmpmathdouble.Tpo -c -o upmpost-pmpmathdouble.o `test -f 'pmpmathdouble.c' || echo '$(srcdir)/'`pmpmathdouble.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpmathdouble.Tpo $(DEPDIR)/upmpost-pmpmathdouble.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmathdouble.c' object='upmpost-pmpmathdouble.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpmathdouble.o `test -f 'pmpmathdouble.c' || echo '$(srcdir)/'`pmpmathdouble.c
+
+upmpost-pmpmathdouble.obj: pmpmathdouble.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpmathdouble.obj -MD -MP -MF $(DEPDIR)/upmpost-pmpmathdouble.Tpo -c -o upmpost-pmpmathdouble.obj `if test -f 'pmpmathdouble.c'; then $(CYGPATH_W) 'pmpmathdouble.c'; else $(CYGPATH_W) '$(srcdir)/pmpmathdouble.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpmathdouble.Tpo $(DEPDIR)/upmpost-pmpmathdouble.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpmathdouble.c' object='upmpost-pmpmathdouble.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpmathdouble.obj `if test -f 'pmpmathdouble.c'; then $(CYGPATH_W) 'pmpmathdouble.c'; else $(CYGPATH_W) '$(srcdir)/pmpmathdouble.c'; fi`
+
+upmpost-pmpost.o: pmpost.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpost.o -MD -MP -MF $(DEPDIR)/upmpost-pmpost.Tpo -c -o upmpost-pmpost.o `test -f 'pmpost.c' || echo '$(srcdir)/'`pmpost.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpost.Tpo $(DEPDIR)/upmpost-pmpost.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpost.c' object='upmpost-pmpost.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpost.o `test -f 'pmpost.c' || echo '$(srcdir)/'`pmpost.c
+
+upmpost-pmpost.obj: pmpost.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpost.obj -MD -MP -MF $(DEPDIR)/upmpost-pmpost.Tpo -c -o upmpost-pmpost.obj `if test -f 'pmpost.c'; then $(CYGPATH_W) 'pmpost.c'; else $(CYGPATH_W) '$(srcdir)/pmpost.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpost.Tpo $(DEPDIR)/upmpost-pmpost.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpost.c' object='upmpost-pmpost.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpost.obj `if test -f 'pmpost.c'; then $(CYGPATH_W) 'pmpost.c'; else $(CYGPATH_W) '$(srcdir)/pmpost.c'; fi`
+
+upmpost-pmpstrings.o: pmpstrings.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpstrings.o -MD -MP -MF $(DEPDIR)/upmpost-pmpstrings.Tpo -c -o upmpost-pmpstrings.o `test -f 'pmpstrings.c' || echo '$(srcdir)/'`pmpstrings.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpstrings.Tpo $(DEPDIR)/upmpost-pmpstrings.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpstrings.c' object='upmpost-pmpstrings.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpstrings.o `test -f 'pmpstrings.c' || echo '$(srcdir)/'`pmpstrings.c
+
+upmpost-pmpstrings.obj: pmpstrings.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpstrings.obj -MD -MP -MF $(DEPDIR)/upmpost-pmpstrings.Tpo -c -o upmpost-pmpstrings.obj `if test -f 'pmpstrings.c'; then $(CYGPATH_W) 'pmpstrings.c'; else $(CYGPATH_W) '$(srcdir)/pmpstrings.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpstrings.Tpo $(DEPDIR)/upmpost-pmpstrings.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpstrings.c' object='upmpost-pmpstrings.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpstrings.obj `if test -f 'pmpstrings.c'; then $(CYGPATH_W) 'pmpstrings.c'; else $(CYGPATH_W) '$(srcdir)/pmpstrings.c'; fi`
+
+upmpost-pmpxout.o: pmpxout.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpxout.o -MD -MP -MF $(DEPDIR)/upmpost-pmpxout.Tpo -c -o upmpost-pmpxout.o `test -f 'pmpxout.c' || echo '$(srcdir)/'`pmpxout.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpxout.Tpo $(DEPDIR)/upmpost-pmpxout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpxout.c' object='upmpost-pmpxout.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpxout.o `test -f 'pmpxout.c' || echo '$(srcdir)/'`pmpxout.c
+
+upmpost-pmpxout.obj: pmpxout.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-pmpxout.obj -MD -MP -MF $(DEPDIR)/upmpost-pmpxout.Tpo -c -o upmpost-pmpxout.obj `if test -f 'pmpxout.c'; then $(CYGPATH_W) 'pmpxout.c'; else $(CYGPATH_W) '$(srcdir)/pmpxout.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-pmpxout.Tpo $(DEPDIR)/upmpost-pmpxout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pmpxout.c' object='upmpost-pmpxout.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-pmpxout.obj `if test -f 'pmpxout.c'; then $(CYGPATH_W) 'pmpxout.c'; else $(CYGPATH_W) '$(srcdir)/pmpxout.c'; fi`
+
+upmpost-ppngout.o: ppngout.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-ppngout.o -MD -MP -MF $(DEPDIR)/upmpost-ppngout.Tpo -c -o upmpost-ppngout.o `test -f 'ppngout.c' || echo '$(srcdir)/'`ppngout.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-ppngout.Tpo $(DEPDIR)/upmpost-ppngout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ppngout.c' object='upmpost-ppngout.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-ppngout.o `test -f 'ppngout.c' || echo '$(srcdir)/'`ppngout.c
+
+upmpost-ppngout.obj: ppngout.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-ppngout.obj -MD -MP -MF $(DEPDIR)/upmpost-ppngout.Tpo -c -o upmpost-ppngout.obj `if test -f 'ppngout.c'; then $(CYGPATH_W) 'ppngout.c'; else $(CYGPATH_W) '$(srcdir)/ppngout.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-ppngout.Tpo $(DEPDIR)/upmpost-ppngout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ppngout.c' object='upmpost-ppngout.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-ppngout.obj `if test -f 'ppngout.c'; then $(CYGPATH_W) 'ppngout.c'; else $(CYGPATH_W) '$(srcdir)/ppngout.c'; fi`
+
+upmpost-ppsout.o: ppsout.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-ppsout.o -MD -MP -MF $(DEPDIR)/upmpost-ppsout.Tpo -c -o upmpost-ppsout.o `test -f 'ppsout.c' || echo '$(srcdir)/'`ppsout.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-ppsout.Tpo $(DEPDIR)/upmpost-ppsout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ppsout.c' object='upmpost-ppsout.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-ppsout.o `test -f 'ppsout.c' || echo '$(srcdir)/'`ppsout.c
+
+upmpost-ppsout.obj: ppsout.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-ppsout.obj -MD -MP -MF $(DEPDIR)/upmpost-ppsout.Tpo -c -o upmpost-ppsout.obj `if test -f 'ppsout.c'; then $(CYGPATH_W) 'ppsout.c'; else $(CYGPATH_W) '$(srcdir)/ppsout.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-ppsout.Tpo $(DEPDIR)/upmpost-ppsout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ppsout.c' object='upmpost-ppsout.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-ppsout.obj `if test -f 'ppsout.c'; then $(CYGPATH_W) 'ppsout.c'; else $(CYGPATH_W) '$(srcdir)/ppsout.c'; fi`
+
+upmpost-psvgout.o: psvgout.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-psvgout.o -MD -MP -MF $(DEPDIR)/upmpost-psvgout.Tpo -c -o upmpost-psvgout.o `test -f 'psvgout.c' || echo '$(srcdir)/'`psvgout.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-psvgout.Tpo $(DEPDIR)/upmpost-psvgout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='psvgout.c' object='upmpost-psvgout.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-psvgout.o `test -f 'psvgout.c' || echo '$(srcdir)/'`psvgout.c
+
+upmpost-psvgout.obj: psvgout.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-psvgout.obj -MD -MP -MF $(DEPDIR)/upmpost-psvgout.Tpo -c -o upmpost-psvgout.obj `if test -f 'psvgout.c'; then $(CYGPATH_W) 'psvgout.c'; else $(CYGPATH_W) '$(srcdir)/psvgout.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-psvgout.Tpo $(DEPDIR)/upmpost-psvgout.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='psvgout.c' object='upmpost-psvgout.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-psvgout.obj `if test -f 'psvgout.c'; then $(CYGPATH_W) 'psvgout.c'; else $(CYGPATH_W) '$(srcdir)/psvgout.c'; fi`
+
+upmpost-ptfmin.o: ptfmin.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-ptfmin.o -MD -MP -MF $(DEPDIR)/upmpost-ptfmin.Tpo -c -o upmpost-ptfmin.o `test -f 'ptfmin.c' || echo '$(srcdir)/'`ptfmin.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-ptfmin.Tpo $(DEPDIR)/upmpost-ptfmin.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptfmin.c' object='upmpost-ptfmin.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-ptfmin.o `test -f 'ptfmin.c' || echo '$(srcdir)/'`ptfmin.c
+
+upmpost-ptfmin.obj: ptfmin.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT upmpost-ptfmin.obj -MD -MP -MF $(DEPDIR)/upmpost-ptfmin.Tpo -c -o upmpost-ptfmin.obj `if test -f 'ptfmin.c'; then $(CYGPATH_W) 'ptfmin.c'; else $(CYGPATH_W) '$(srcdir)/ptfmin.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/upmpost-ptfmin.Tpo $(DEPDIR)/upmpost-ptfmin.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='ptfmin.c' object='upmpost-ptfmin.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o upmpost-ptfmin.obj `if test -f 'ptfmin.c'; then $(CYGPATH_W) 'ptfmin.c'; else $(CYGPATH_W) '$(srcdir)/ptfmin.c'; fi`
+
+uppltotf-uppltotf.o: uppltotf.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uppltotf-uppltotf.o -MD -MP -MF $(DEPDIR)/uppltotf-uppltotf.Tpo -c -o uppltotf-uppltotf.o `test -f 'uppltotf.c' || echo '$(srcdir)/'`uppltotf.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/uppltotf-uppltotf.Tpo $(DEPDIR)/uppltotf-uppltotf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='uppltotf.c' object='uppltotf-uppltotf.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uppltotf-uppltotf.o `test -f 'uppltotf.c' || echo '$(srcdir)/'`uppltotf.c
+
+uppltotf-uppltotf.obj: uppltotf.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uppltotf-uppltotf.obj -MD -MP -MF $(DEPDIR)/uppltotf-uppltotf.Tpo -c -o uppltotf-uppltotf.obj `if test -f 'uppltotf.c'; then $(CYGPATH_W) 'uppltotf.c'; else $(CYGPATH_W) '$(srcdir)/uppltotf.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/uppltotf-uppltotf.Tpo $(DEPDIR)/uppltotf-uppltotf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='uppltotf.c' object='uppltotf-uppltotf.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uppltotf_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uppltotf-uppltotf.obj `if test -f 'uppltotf.c'; then $(CYGPATH_W) 'uppltotf.c'; else $(CYGPATH_W) '$(srcdir)/uppltotf.c'; fi`
+
+uptexdir/uptex-uptexextra.o: uptexdir/uptexextra.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uptexdir/uptex-uptexextra.o -MD -MP -MF uptexdir/$(DEPDIR)/uptex-uptexextra.Tpo -c -o uptexdir/uptex-uptexextra.o `test -f 'uptexdir/uptexextra.c' || echo '$(srcdir)/'`uptexdir/uptexextra.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) uptexdir/$(DEPDIR)/uptex-uptexextra.Tpo uptexdir/$(DEPDIR)/uptex-uptexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='uptexdir/uptexextra.c' object='uptexdir/uptex-uptexextra.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uptexdir/uptex-uptexextra.o `test -f 'uptexdir/uptexextra.c' || echo '$(srcdir)/'`uptexdir/uptexextra.c
+
+uptexdir/uptex-uptexextra.obj: uptexdir/uptexextra.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uptexdir/uptex-uptexextra.obj -MD -MP -MF uptexdir/$(DEPDIR)/uptex-uptexextra.Tpo -c -o uptexdir/uptex-uptexextra.obj `if test -f 'uptexdir/uptexextra.c'; then $(CYGPATH_W) 'uptexdir/uptexextra.c'; else $(CYGPATH_W) '$(srcdir)/uptexdir/uptexextra.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) uptexdir/$(DEPDIR)/uptex-uptexextra.Tpo uptexdir/$(DEPDIR)/uptex-uptexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='uptexdir/uptexextra.c' object='uptexdir/uptex-uptexextra.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uptexdir/uptex-uptexextra.obj `if test -f 'uptexdir/uptexextra.c'; then $(CYGPATH_W) 'uptexdir/uptexextra.c'; else $(CYGPATH_W) '$(srcdir)/uptexdir/uptexextra.c'; fi`
+
+synctexdir/uptex-synctex.o: synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/uptex-synctex.o -MD -MP -MF synctexdir/$(DEPDIR)/uptex-synctex.Tpo -c -o synctexdir/uptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/uptex-synctex.Tpo synctexdir/$(DEPDIR)/uptex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/uptex-synctex.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/uptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+
+synctexdir/uptex-synctex.obj: synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/uptex-synctex.obj -MD -MP -MF synctexdir/$(DEPDIR)/uptex-synctex.Tpo -c -o synctexdir/uptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/uptex-synctex.Tpo synctexdir/$(DEPDIR)/uptex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/uptex-synctex.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/uptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+
+uptex-uptexini.o: uptexini.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uptex-uptexini.o -MD -MP -MF $(DEPDIR)/uptex-uptexini.Tpo -c -o uptex-uptexini.o `test -f 'uptexini.c' || echo '$(srcdir)/'`uptexini.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/uptex-uptexini.Tpo $(DEPDIR)/uptex-uptexini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='uptexini.c' object='uptex-uptexini.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uptex-uptexini.o `test -f 'uptexini.c' || echo '$(srcdir)/'`uptexini.c
+
+uptex-uptexini.obj: uptexini.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uptex-uptexini.obj -MD -MP -MF $(DEPDIR)/uptex-uptexini.Tpo -c -o uptex-uptexini.obj `if test -f 'uptexini.c'; then $(CYGPATH_W) 'uptexini.c'; else $(CYGPATH_W) '$(srcdir)/uptexini.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/uptex-uptexini.Tpo $(DEPDIR)/uptex-uptexini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='uptexini.c' object='uptex-uptexini.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uptex-uptexini.obj `if test -f 'uptexini.c'; then $(CYGPATH_W) 'uptexini.c'; else $(CYGPATH_W) '$(srcdir)/uptexini.c'; fi`
+
+uptex-uptex0.o: uptex0.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uptex-uptex0.o -MD -MP -MF $(DEPDIR)/uptex-uptex0.Tpo -c -o uptex-uptex0.o `test -f 'uptex0.c' || echo '$(srcdir)/'`uptex0.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/uptex-uptex0.Tpo $(DEPDIR)/uptex-uptex0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='uptex0.c' object='uptex-uptex0.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uptex-uptex0.o `test -f 'uptex0.c' || echo '$(srcdir)/'`uptex0.c
+
+uptex-uptex0.obj: uptex0.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uptex-uptex0.obj -MD -MP -MF $(DEPDIR)/uptex-uptex0.Tpo -c -o uptex-uptex0.obj `if test -f 'uptex0.c'; then $(CYGPATH_W) 'uptex0.c'; else $(CYGPATH_W) '$(srcdir)/uptex0.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/uptex-uptex0.Tpo $(DEPDIR)/uptex-uptex0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='uptex0.c' object='uptex-uptex0.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uptex-uptex0.obj `if test -f 'uptex0.c'; then $(CYGPATH_W) 'uptex0.c'; else $(CYGPATH_W) '$(srcdir)/uptex0.c'; fi`
+
+uptex-uptex-pool.o: uptex-pool.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uptex-uptex-pool.o -MD -MP -MF $(DEPDIR)/uptex-uptex-pool.Tpo -c -o uptex-uptex-pool.o `test -f 'uptex-pool.c' || echo '$(srcdir)/'`uptex-pool.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/uptex-uptex-pool.Tpo $(DEPDIR)/uptex-uptex-pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='uptex-pool.c' object='uptex-uptex-pool.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uptex-uptex-pool.o `test -f 'uptex-pool.c' || echo '$(srcdir)/'`uptex-pool.c
+
+uptex-uptex-pool.obj: uptex-pool.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uptex-uptex-pool.obj -MD -MP -MF $(DEPDIR)/uptex-uptex-pool.Tpo -c -o uptex-uptex-pool.obj `if test -f 'uptex-pool.c'; then $(CYGPATH_W) 'uptex-pool.c'; else $(CYGPATH_W) '$(srcdir)/uptex-pool.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/uptex-uptex-pool.Tpo $(DEPDIR)/uptex-uptex-pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='uptex-pool.c' object='uptex-uptex-pool.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uptex-uptex-pool.obj `if test -f 'uptex-pool.c'; then $(CYGPATH_W) 'uptex-pool.c'; else $(CYGPATH_W) '$(srcdir)/uptex-pool.c'; fi`
+
+uptftopl-uptftopl.o: uptftopl.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptftopl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uptftopl-uptftopl.o -MD -MP -MF $(DEPDIR)/uptftopl-uptftopl.Tpo -c -o uptftopl-uptftopl.o `test -f 'uptftopl.c' || echo '$(srcdir)/'`uptftopl.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/uptftopl-uptftopl.Tpo $(DEPDIR)/uptftopl-uptftopl.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='uptftopl.c' object='uptftopl-uptftopl.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptftopl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uptftopl-uptftopl.o `test -f 'uptftopl.c' || echo '$(srcdir)/'`uptftopl.c
+
+uptftopl-uptftopl.obj: uptftopl.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptftopl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uptftopl-uptftopl.obj -MD -MP -MF $(DEPDIR)/uptftopl-uptftopl.Tpo -c -o uptftopl-uptftopl.obj `if test -f 'uptftopl.c'; then $(CYGPATH_W) 'uptftopl.c'; else $(CYGPATH_W) '$(srcdir)/uptftopl.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/uptftopl-uptftopl.Tpo $(DEPDIR)/uptftopl-uptftopl.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='uptftopl.c' object='uptftopl-uptftopl.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(uptftopl_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uptftopl-uptftopl.obj `if test -f 'uptftopl.c'; then $(CYGPATH_W) 'uptftopl.c'; else $(CYGPATH_W) '$(srcdir)/uptftopl.c'; fi`
+
+xetexdir/xetex-xetexextra.o: xetexdir/xetexextra.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -MT xetexdir/xetex-xetexextra.o -MD -MP -MF xetexdir/$(DEPDIR)/xetex-xetexextra.Tpo -c -o xetexdir/xetex-xetexextra.o `test -f 'xetexdir/xetexextra.c' || echo '$(srcdir)/'`xetexdir/xetexextra.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/xetex-xetexextra.Tpo xetexdir/$(DEPDIR)/xetex-xetexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xetexdir/xetexextra.c' object='xetexdir/xetex-xetexextra.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -c -o xetexdir/xetex-xetexextra.o `test -f 'xetexdir/xetexextra.c' || echo '$(srcdir)/'`xetexdir/xetexextra.c
+
+xetexdir/xetex-xetexextra.obj: xetexdir/xetexextra.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -MT xetexdir/xetex-xetexextra.obj -MD -MP -MF xetexdir/$(DEPDIR)/xetex-xetexextra.Tpo -c -o xetexdir/xetex-xetexextra.obj `if test -f 'xetexdir/xetexextra.c'; then $(CYGPATH_W) 'xetexdir/xetexextra.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/xetexextra.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/xetex-xetexextra.Tpo xetexdir/$(DEPDIR)/xetex-xetexextra.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xetexdir/xetexextra.c' object='xetexdir/xetex-xetexextra.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -c -o xetexdir/xetex-xetexextra.obj `if test -f 'xetexdir/xetexextra.c'; then $(CYGPATH_W) 'xetexdir/xetexextra.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/xetexextra.c'; fi`
+
+synctexdir/xetex-synctex.o: synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -MT synctexdir/xetex-synctex.o -MD -MP -MF synctexdir/$(DEPDIR)/xetex-synctex.Tpo -c -o synctexdir/xetex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/xetex-synctex.Tpo synctexdir/$(DEPDIR)/xetex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/xetex-synctex.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -c -o synctexdir/xetex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
+
+synctexdir/xetex-synctex.obj: synctexdir/synctex.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -MT synctexdir/xetex-synctex.obj -MD -MP -MF synctexdir/$(DEPDIR)/xetex-synctex.Tpo -c -o synctexdir/xetex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/xetex-synctex.Tpo synctexdir/$(DEPDIR)/xetex-synctex.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/xetex-synctex.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -c -o synctexdir/xetex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
+
+xetex-xetexini.o: xetexini.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -MT xetex-xetexini.o -MD -MP -MF $(DEPDIR)/xetex-xetexini.Tpo -c -o xetex-xetexini.o `test -f 'xetexini.c' || echo '$(srcdir)/'`xetexini.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xetex-xetexini.Tpo $(DEPDIR)/xetex-xetexini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xetexini.c' object='xetex-xetexini.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -c -o xetex-xetexini.o `test -f 'xetexini.c' || echo '$(srcdir)/'`xetexini.c
+
+xetex-xetexini.obj: xetexini.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -MT xetex-xetexini.obj -MD -MP -MF $(DEPDIR)/xetex-xetexini.Tpo -c -o xetex-xetexini.obj `if test -f 'xetexini.c'; then $(CYGPATH_W) 'xetexini.c'; else $(CYGPATH_W) '$(srcdir)/xetexini.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xetex-xetexini.Tpo $(DEPDIR)/xetex-xetexini.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xetexini.c' object='xetex-xetexini.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -c -o xetex-xetexini.obj `if test -f 'xetexini.c'; then $(CYGPATH_W) 'xetexini.c'; else $(CYGPATH_W) '$(srcdir)/xetexini.c'; fi`
+
+xetex-xetex0.o: xetex0.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -MT xetex-xetex0.o -MD -MP -MF $(DEPDIR)/xetex-xetex0.Tpo -c -o xetex-xetex0.o `test -f 'xetex0.c' || echo '$(srcdir)/'`xetex0.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xetex-xetex0.Tpo $(DEPDIR)/xetex-xetex0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xetex0.c' object='xetex-xetex0.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -c -o xetex-xetex0.o `test -f 'xetex0.c' || echo '$(srcdir)/'`xetex0.c
+
+xetex-xetex0.obj: xetex0.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -MT xetex-xetex0.obj -MD -MP -MF $(DEPDIR)/xetex-xetex0.Tpo -c -o xetex-xetex0.obj `if test -f 'xetex0.c'; then $(CYGPATH_W) 'xetex0.c'; else $(CYGPATH_W) '$(srcdir)/xetex0.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xetex-xetex0.Tpo $(DEPDIR)/xetex-xetex0.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xetex0.c' object='xetex-xetex0.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -c -o xetex-xetex0.obj `if test -f 'xetex0.c'; then $(CYGPATH_W) 'xetex0.c'; else $(CYGPATH_W) '$(srcdir)/xetex0.c'; fi`
+
+xetex-xetex-pool.o: xetex-pool.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -MT xetex-xetex-pool.o -MD -MP -MF $(DEPDIR)/xetex-xetex-pool.Tpo -c -o xetex-xetex-pool.o `test -f 'xetex-pool.c' || echo '$(srcdir)/'`xetex-pool.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xetex-xetex-pool.Tpo $(DEPDIR)/xetex-xetex-pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xetex-pool.c' object='xetex-xetex-pool.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -c -o xetex-xetex-pool.o `test -f 'xetex-pool.c' || echo '$(srcdir)/'`xetex-pool.c
+
+xetex-xetex-pool.obj: xetex-pool.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -MT xetex-xetex-pool.obj -MD -MP -MF $(DEPDIR)/xetex-xetex-pool.Tpo -c -o xetex-xetex-pool.obj `if test -f 'xetex-pool.c'; then $(CYGPATH_W) 'xetex-pool.c'; else $(CYGPATH_W) '$(srcdir)/xetex-pool.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xetex-xetex-pool.Tpo $(DEPDIR)/xetex-xetex-pool.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xetex-pool.c' object='xetex-xetex-pool.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CFLAGS) $(CFLAGS) -c -o xetex-xetex-pool.obj `if test -f 'xetex-pool.c'; then $(CYGPATH_W) 'xetex-pool.c'; else $(CYGPATH_W) '$(srcdir)/xetex-pool.c'; fi`
+
.cc.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -9765,6 +13393,132 @@ libluatex_a-pdftoepdf.obj: pdftoepdf.cc
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libluatex_a_CPPFLAGS) $(CPPFLAGS) $(libluatex_a_CXXFLAGS) $(CXXFLAGS) -c -o libluatex_a-pdftoepdf.obj `if test -f 'pdftoepdf.cc'; then $(CYGPATH_W) 'pdftoepdf.cc'; else $(CYGPATH_W) '$(srcdir)/pdftoepdf.cc'; fi`
+pdftexdir/libpdftex_a-pdftoepdf.o: pdftexdir/pdftoepdf.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(libpdftex_a_CXXFLAGS) $(CXXFLAGS) -MT pdftexdir/libpdftex_a-pdftoepdf.o -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-pdftoepdf.Tpo -c -o pdftexdir/libpdftex_a-pdftoepdf.o `test -f 'pdftexdir/pdftoepdf.cc' || echo '$(srcdir)/'`pdftexdir/pdftoepdf.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-pdftoepdf.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-pdftoepdf.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='pdftexdir/pdftoepdf.cc' object='pdftexdir/libpdftex_a-pdftoepdf.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(libpdftex_a_CXXFLAGS) $(CXXFLAGS) -c -o pdftexdir/libpdftex_a-pdftoepdf.o `test -f 'pdftexdir/pdftoepdf.cc' || echo '$(srcdir)/'`pdftexdir/pdftoepdf.cc
+
+pdftexdir/libpdftex_a-pdftoepdf.obj: pdftexdir/pdftoepdf.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(libpdftex_a_CXXFLAGS) $(CXXFLAGS) -MT pdftexdir/libpdftex_a-pdftoepdf.obj -MD -MP -MF pdftexdir/$(DEPDIR)/libpdftex_a-pdftoepdf.Tpo -c -o pdftexdir/libpdftex_a-pdftoepdf.obj `if test -f 'pdftexdir/pdftoepdf.cc'; then $(CYGPATH_W) 'pdftexdir/pdftoepdf.cc'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/pdftoepdf.cc'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/libpdftex_a-pdftoepdf.Tpo pdftexdir/$(DEPDIR)/libpdftex_a-pdftoepdf.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='pdftexdir/pdftoepdf.cc' object='pdftexdir/libpdftex_a-pdftoepdf.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(libpdftex_a_CXXFLAGS) $(CXXFLAGS) -c -o pdftexdir/libpdftex_a-pdftoepdf.obj `if test -f 'pdftexdir/pdftoepdf.cc'; then $(CYGPATH_W) 'pdftexdir/pdftoepdf.cc'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/pdftoepdf.cc'; fi`
+
+xetexdir/libxetex_a-XeTeXFontInst.o: xetexdir/XeTeXFontInst.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -MT xetexdir/libxetex_a-XeTeXFontInst.o -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst.Tpo -c -o xetexdir/libxetex_a-XeTeXFontInst.o `test -f 'xetexdir/XeTeXFontInst.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXFontInst.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst.Tpo xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='xetexdir/XeTeXFontInst.cpp' object='xetexdir/libxetex_a-XeTeXFontInst.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -c -o xetexdir/libxetex_a-XeTeXFontInst.o `test -f 'xetexdir/XeTeXFontInst.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXFontInst.cpp
+
+xetexdir/libxetex_a-XeTeXFontInst.obj: xetexdir/XeTeXFontInst.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -MT xetexdir/libxetex_a-XeTeXFontInst.obj -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst.Tpo -c -o xetexdir/libxetex_a-XeTeXFontInst.obj `if test -f 'xetexdir/XeTeXFontInst.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXFontInst.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXFontInst.cpp'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst.Tpo xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='xetexdir/XeTeXFontInst.cpp' object='xetexdir/libxetex_a-XeTeXFontInst.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -c -o xetexdir/libxetex_a-XeTeXFontInst.obj `if test -f 'xetexdir/XeTeXFontInst.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXFontInst.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXFontInst.cpp'; fi`
+
+xetexdir/libxetex_a-XeTeXFontMgr.o: xetexdir/XeTeXFontMgr.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -MT xetexdir/libxetex_a-XeTeXFontMgr.o -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr.Tpo -c -o xetexdir/libxetex_a-XeTeXFontMgr.o `test -f 'xetexdir/XeTeXFontMgr.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXFontMgr.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr.Tpo xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='xetexdir/XeTeXFontMgr.cpp' object='xetexdir/libxetex_a-XeTeXFontMgr.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -c -o xetexdir/libxetex_a-XeTeXFontMgr.o `test -f 'xetexdir/XeTeXFontMgr.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXFontMgr.cpp
+
+xetexdir/libxetex_a-XeTeXFontMgr.obj: xetexdir/XeTeXFontMgr.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -MT xetexdir/libxetex_a-XeTeXFontMgr.obj -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr.Tpo -c -o xetexdir/libxetex_a-XeTeXFontMgr.obj `if test -f 'xetexdir/XeTeXFontMgr.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXFontMgr.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXFontMgr.cpp'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr.Tpo xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='xetexdir/XeTeXFontMgr.cpp' object='xetexdir/libxetex_a-XeTeXFontMgr.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -c -o xetexdir/libxetex_a-XeTeXFontMgr.obj `if test -f 'xetexdir/XeTeXFontMgr.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXFontMgr.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXFontMgr.cpp'; fi`
+
+xetexdir/libxetex_a-XeTeXLayoutInterface.o: xetexdir/XeTeXLayoutInterface.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -MT xetexdir/libxetex_a-XeTeXLayoutInterface.o -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-XeTeXLayoutInterface.Tpo -c -o xetexdir/libxetex_a-XeTeXLayoutInterface.o `test -f 'xetexdir/XeTeXLayoutInterface.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXLayoutInterface.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-XeTeXLayoutInterface.Tpo xetexdir/$(DEPDIR)/libxetex_a-XeTeXLayoutInterface.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='xetexdir/XeTeXLayoutInterface.cpp' object='xetexdir/libxetex_a-XeTeXLayoutInterface.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -c -o xetexdir/libxetex_a-XeTeXLayoutInterface.o `test -f 'xetexdir/XeTeXLayoutInterface.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXLayoutInterface.cpp
+
+xetexdir/libxetex_a-XeTeXLayoutInterface.obj: xetexdir/XeTeXLayoutInterface.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -MT xetexdir/libxetex_a-XeTeXLayoutInterface.obj -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-XeTeXLayoutInterface.Tpo -c -o xetexdir/libxetex_a-XeTeXLayoutInterface.obj `if test -f 'xetexdir/XeTeXLayoutInterface.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXLayoutInterface.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXLayoutInterface.cpp'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-XeTeXLayoutInterface.Tpo xetexdir/$(DEPDIR)/libxetex_a-XeTeXLayoutInterface.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='xetexdir/XeTeXLayoutInterface.cpp' object='xetexdir/libxetex_a-XeTeXLayoutInterface.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -c -o xetexdir/libxetex_a-XeTeXLayoutInterface.obj `if test -f 'xetexdir/XeTeXLayoutInterface.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXLayoutInterface.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXLayoutInterface.cpp'; fi`
+
+xetexdir/libxetex_a-XeTeXOTMath.o: xetexdir/XeTeXOTMath.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -MT xetexdir/libxetex_a-XeTeXOTMath.o -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-XeTeXOTMath.Tpo -c -o xetexdir/libxetex_a-XeTeXOTMath.o `test -f 'xetexdir/XeTeXOTMath.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXOTMath.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-XeTeXOTMath.Tpo xetexdir/$(DEPDIR)/libxetex_a-XeTeXOTMath.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='xetexdir/XeTeXOTMath.cpp' object='xetexdir/libxetex_a-XeTeXOTMath.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -c -o xetexdir/libxetex_a-XeTeXOTMath.o `test -f 'xetexdir/XeTeXOTMath.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXOTMath.cpp
+
+xetexdir/libxetex_a-XeTeXOTMath.obj: xetexdir/XeTeXOTMath.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -MT xetexdir/libxetex_a-XeTeXOTMath.obj -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-XeTeXOTMath.Tpo -c -o xetexdir/libxetex_a-XeTeXOTMath.obj `if test -f 'xetexdir/XeTeXOTMath.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXOTMath.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXOTMath.cpp'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-XeTeXOTMath.Tpo xetexdir/$(DEPDIR)/libxetex_a-XeTeXOTMath.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='xetexdir/XeTeXOTMath.cpp' object='xetexdir/libxetex_a-XeTeXOTMath.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -c -o xetexdir/libxetex_a-XeTeXOTMath.obj `if test -f 'xetexdir/XeTeXOTMath.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXOTMath.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXOTMath.cpp'; fi`
+
+xetexdir/libxetex_a-hz.o: xetexdir/hz.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -MT xetexdir/libxetex_a-hz.o -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-hz.Tpo -c -o xetexdir/libxetex_a-hz.o `test -f 'xetexdir/hz.cpp' || echo '$(srcdir)/'`xetexdir/hz.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-hz.Tpo xetexdir/$(DEPDIR)/libxetex_a-hz.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='xetexdir/hz.cpp' object='xetexdir/libxetex_a-hz.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -c -o xetexdir/libxetex_a-hz.o `test -f 'xetexdir/hz.cpp' || echo '$(srcdir)/'`xetexdir/hz.cpp
+
+xetexdir/libxetex_a-hz.obj: xetexdir/hz.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -MT xetexdir/libxetex_a-hz.obj -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-hz.Tpo -c -o xetexdir/libxetex_a-hz.obj `if test -f 'xetexdir/hz.cpp'; then $(CYGPATH_W) 'xetexdir/hz.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/hz.cpp'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-hz.Tpo xetexdir/$(DEPDIR)/libxetex_a-hz.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='xetexdir/hz.cpp' object='xetexdir/libxetex_a-hz.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -c -o xetexdir/libxetex_a-hz.obj `if test -f 'xetexdir/hz.cpp'; then $(CYGPATH_W) 'xetexdir/hz.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/hz.cpp'; fi`
+
+xetexdir/libxetex_a-pdfimage.o: xetexdir/pdfimage.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -MT xetexdir/libxetex_a-pdfimage.o -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-pdfimage.Tpo -c -o xetexdir/libxetex_a-pdfimage.o `test -f 'xetexdir/pdfimage.cpp' || echo '$(srcdir)/'`xetexdir/pdfimage.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-pdfimage.Tpo xetexdir/$(DEPDIR)/libxetex_a-pdfimage.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='xetexdir/pdfimage.cpp' object='xetexdir/libxetex_a-pdfimage.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -c -o xetexdir/libxetex_a-pdfimage.o `test -f 'xetexdir/pdfimage.cpp' || echo '$(srcdir)/'`xetexdir/pdfimage.cpp
+
+xetexdir/libxetex_a-pdfimage.obj: xetexdir/pdfimage.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -MT xetexdir/libxetex_a-pdfimage.obj -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-pdfimage.Tpo -c -o xetexdir/libxetex_a-pdfimage.obj `if test -f 'xetexdir/pdfimage.cpp'; then $(CYGPATH_W) 'xetexdir/pdfimage.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/pdfimage.cpp'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-pdfimage.Tpo xetexdir/$(DEPDIR)/libxetex_a-pdfimage.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='xetexdir/pdfimage.cpp' object='xetexdir/libxetex_a-pdfimage.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -c -o xetexdir/libxetex_a-pdfimage.obj `if test -f 'xetexdir/pdfimage.cpp'; then $(CYGPATH_W) 'xetexdir/pdfimage.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/pdfimage.cpp'; fi`
+
+xetexdir/libxetex_a-XeTeXFontInst_Mac.o: xetexdir/XeTeXFontInst_Mac.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -MT xetexdir/libxetex_a-XeTeXFontInst_Mac.o -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst_Mac.Tpo -c -o xetexdir/libxetex_a-XeTeXFontInst_Mac.o `test -f 'xetexdir/XeTeXFontInst_Mac.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXFontInst_Mac.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst_Mac.Tpo xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst_Mac.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='xetexdir/XeTeXFontInst_Mac.cpp' object='xetexdir/libxetex_a-XeTeXFontInst_Mac.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -c -o xetexdir/libxetex_a-XeTeXFontInst_Mac.o `test -f 'xetexdir/XeTeXFontInst_Mac.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXFontInst_Mac.cpp
+
+xetexdir/libxetex_a-XeTeXFontInst_Mac.obj: xetexdir/XeTeXFontInst_Mac.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -MT xetexdir/libxetex_a-XeTeXFontInst_Mac.obj -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst_Mac.Tpo -c -o xetexdir/libxetex_a-XeTeXFontInst_Mac.obj `if test -f 'xetexdir/XeTeXFontInst_Mac.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXFontInst_Mac.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXFontInst_Mac.cpp'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst_Mac.Tpo xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontInst_Mac.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='xetexdir/XeTeXFontInst_Mac.cpp' object='xetexdir/libxetex_a-XeTeXFontInst_Mac.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -c -o xetexdir/libxetex_a-XeTeXFontInst_Mac.obj `if test -f 'xetexdir/XeTeXFontInst_Mac.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXFontInst_Mac.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXFontInst_Mac.cpp'; fi`
+
+xetexdir/libxetex_a-XeTeXFontMgr_FC.o: xetexdir/XeTeXFontMgr_FC.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -MT xetexdir/libxetex_a-XeTeXFontMgr_FC.o -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr_FC.Tpo -c -o xetexdir/libxetex_a-XeTeXFontMgr_FC.o `test -f 'xetexdir/XeTeXFontMgr_FC.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXFontMgr_FC.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr_FC.Tpo xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr_FC.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='xetexdir/XeTeXFontMgr_FC.cpp' object='xetexdir/libxetex_a-XeTeXFontMgr_FC.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -c -o xetexdir/libxetex_a-XeTeXFontMgr_FC.o `test -f 'xetexdir/XeTeXFontMgr_FC.cpp' || echo '$(srcdir)/'`xetexdir/XeTeXFontMgr_FC.cpp
+
+xetexdir/libxetex_a-XeTeXFontMgr_FC.obj: xetexdir/XeTeXFontMgr_FC.cpp
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -MT xetexdir/libxetex_a-XeTeXFontMgr_FC.obj -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr_FC.Tpo -c -o xetexdir/libxetex_a-XeTeXFontMgr_FC.obj `if test -f 'xetexdir/XeTeXFontMgr_FC.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXFontMgr_FC.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXFontMgr_FC.cpp'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr_FC.Tpo xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr_FC.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='xetexdir/XeTeXFontMgr_FC.cpp' object='xetexdir/libxetex_a-XeTeXFontMgr_FC.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CXXFLAGS) $(CXXFLAGS) -c -o xetexdir/libxetex_a-XeTeXFontMgr_FC.obj `if test -f 'xetexdir/XeTeXFontMgr_FC.cpp'; then $(CYGPATH_W) 'xetexdir/XeTeXFontMgr_FC.cpp'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXFontMgr_FC.cpp'; fi`
+
luajittex-dummy.o: dummy.cxx
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(luajittex_CPPFLAGS) $(CPPFLAGS) $(luajittex_CXXFLAGS) $(CXXFLAGS) -MT luajittex-dummy.o -MD -MP -MF $(DEPDIR)/luajittex-dummy.Tpo -c -o luajittex-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/luajittex-dummy.Tpo $(DEPDIR)/luajittex-dummy.Po
@@ -9793,6 +13547,86 @@ luatex-dummy.obj: dummy.cxx
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(luatex_CPPFLAGS) $(CPPFLAGS) $(luatex_CXXFLAGS) $(CXXFLAGS) -c -o luatex-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi`
+pdftex-dummy.o: dummy.cxx
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(pdftex_CXXFLAGS) $(CXXFLAGS) -MT pdftex-dummy.o -MD -MP -MF $(DEPDIR)/pdftex-dummy.Tpo -c -o pdftex-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pdftex-dummy.Tpo $(DEPDIR)/pdftex-dummy.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='dummy.cxx' object='pdftex-dummy.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(pdftex_CXXFLAGS) $(CXXFLAGS) -c -o pdftex-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx
+
+pdftex-dummy.obj: dummy.cxx
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(pdftex_CXXFLAGS) $(CXXFLAGS) -MT pdftex-dummy.obj -MD -MP -MF $(DEPDIR)/pdftex-dummy.Tpo -c -o pdftex-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pdftex-dummy.Tpo $(DEPDIR)/pdftex-dummy.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='dummy.cxx' object='pdftex-dummy.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(pdftex_CXXFLAGS) $(CXXFLAGS) -c -o pdftex-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi`
+
+pdftexdir/pdftosrc-pdftosrc.o: pdftexdir/pdftosrc.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftosrc_CPPFLAGS) $(CPPFLAGS) $(pdftosrc_CXXFLAGS) $(CXXFLAGS) -MT pdftexdir/pdftosrc-pdftosrc.o -MD -MP -MF pdftexdir/$(DEPDIR)/pdftosrc-pdftosrc.Tpo -c -o pdftexdir/pdftosrc-pdftosrc.o `test -f 'pdftexdir/pdftosrc.cc' || echo '$(srcdir)/'`pdftexdir/pdftosrc.cc
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/pdftosrc-pdftosrc.Tpo pdftexdir/$(DEPDIR)/pdftosrc-pdftosrc.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='pdftexdir/pdftosrc.cc' object='pdftexdir/pdftosrc-pdftosrc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftosrc_CPPFLAGS) $(CPPFLAGS) $(pdftosrc_CXXFLAGS) $(CXXFLAGS) -c -o pdftexdir/pdftosrc-pdftosrc.o `test -f 'pdftexdir/pdftosrc.cc' || echo '$(srcdir)/'`pdftexdir/pdftosrc.cc
+
+pdftexdir/pdftosrc-pdftosrc.obj: pdftexdir/pdftosrc.cc
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftosrc_CPPFLAGS) $(CPPFLAGS) $(pdftosrc_CXXFLAGS) $(CXXFLAGS) -MT pdftexdir/pdftosrc-pdftosrc.obj -MD -MP -MF pdftexdir/$(DEPDIR)/pdftosrc-pdftosrc.Tpo -c -o pdftexdir/pdftosrc-pdftosrc.obj `if test -f 'pdftexdir/pdftosrc.cc'; then $(CYGPATH_W) 'pdftexdir/pdftosrc.cc'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/pdftosrc.cc'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) pdftexdir/$(DEPDIR)/pdftosrc-pdftosrc.Tpo pdftexdir/$(DEPDIR)/pdftosrc-pdftosrc.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='pdftexdir/pdftosrc.cc' object='pdftexdir/pdftosrc-pdftosrc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftosrc_CPPFLAGS) $(CPPFLAGS) $(pdftosrc_CXXFLAGS) $(CXXFLAGS) -c -o pdftexdir/pdftosrc-pdftosrc.obj `if test -f 'pdftexdir/pdftosrc.cc'; then $(CYGPATH_W) 'pdftexdir/pdftosrc.cc'; else $(CYGPATH_W) '$(srcdir)/pdftexdir/pdftosrc.cc'; fi`
+
+pdftosrc-dummy.o: dummy.cxx
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftosrc_CPPFLAGS) $(CPPFLAGS) $(pdftosrc_CXXFLAGS) $(CXXFLAGS) -MT pdftosrc-dummy.o -MD -MP -MF $(DEPDIR)/pdftosrc-dummy.Tpo -c -o pdftosrc-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pdftosrc-dummy.Tpo $(DEPDIR)/pdftosrc-dummy.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='dummy.cxx' object='pdftosrc-dummy.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftosrc_CPPFLAGS) $(CPPFLAGS) $(pdftosrc_CXXFLAGS) $(CXXFLAGS) -c -o pdftosrc-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx
+
+pdftosrc-dummy.obj: dummy.cxx
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftosrc_CPPFLAGS) $(CPPFLAGS) $(pdftosrc_CXXFLAGS) $(CXXFLAGS) -MT pdftosrc-dummy.obj -MD -MP -MF $(DEPDIR)/pdftosrc-dummy.Tpo -c -o pdftosrc-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pdftosrc-dummy.Tpo $(DEPDIR)/pdftosrc-dummy.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='dummy.cxx' object='pdftosrc-dummy.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftosrc_CPPFLAGS) $(CPPFLAGS) $(pdftosrc_CXXFLAGS) $(CXXFLAGS) -c -o pdftosrc-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi`
+
+xetex-dummy.o: dummy.cxx
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CXXFLAGS) $(CXXFLAGS) -MT xetex-dummy.o -MD -MP -MF $(DEPDIR)/xetex-dummy.Tpo -c -o xetex-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xetex-dummy.Tpo $(DEPDIR)/xetex-dummy.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='dummy.cxx' object='xetex-dummy.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CXXFLAGS) $(CXXFLAGS) -c -o xetex-dummy.o `test -f 'dummy.cxx' || echo '$(srcdir)/'`dummy.cxx
+
+xetex-dummy.obj: dummy.cxx
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CXXFLAGS) $(CXXFLAGS) -MT xetex-dummy.obj -MD -MP -MF $(DEPDIR)/xetex-dummy.Tpo -c -o xetex-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi`
+@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xetex-dummy.Tpo $(DEPDIR)/xetex-dummy.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='dummy.cxx' object='xetex-dummy.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(xetex_CXXFLAGS) $(CXXFLAGS) -c -o xetex-dummy.obj `if test -f 'dummy.cxx'; then $(CYGPATH_W) 'dummy.cxx'; else $(CYGPATH_W) '$(srcdir)/dummy.cxx'; fi`
+
+.cpp.o:
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
.cxx.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
@@ -9817,14 +13651,181 @@ luatex-dummy.obj: dummy.cxx
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+.mm.o:
+@am__fastdepOBJCXX_TRUE@ $(AM_V_OBJCXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepOBJCXX_TRUE@ $(OBJCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepOBJCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepOBJCXX_FALSE@ $(AM_V_OBJCXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepOBJCXX_FALSE@ DEPDIR=$(DEPDIR) $(OBJCXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepOBJCXX_FALSE@ $(AM_V_OBJCXX@am__nodep@)$(OBJCXXCOMPILE) -c -o $@ $<
+
+.mm.obj:
+@am__fastdepOBJCXX_TRUE@ $(AM_V_OBJCXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepOBJCXX_TRUE@ $(OBJCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepOBJCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepOBJCXX_FALSE@ $(AM_V_OBJCXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepOBJCXX_FALSE@ DEPDIR=$(DEPDIR) $(OBJCXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepOBJCXX_FALSE@ $(AM_V_OBJCXX@am__nodep@)$(OBJCXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.mm.lo:
+@am__fastdepOBJCXX_TRUE@ $(AM_V_OBJCXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepOBJCXX_TRUE@ $(LTOBJCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepOBJCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepOBJCXX_FALSE@ $(AM_V_OBJCXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepOBJCXX_FALSE@ DEPDIR=$(DEPDIR) $(OBJCXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepOBJCXX_FALSE@ $(AM_V_OBJCXX@am__nodep@)$(LTOBJCXXCOMPILE) -c -o $@ $<
+
+xetexdir/libxetex_a-XeTeXFontMgr_Mac.o: xetexdir/XeTeXFontMgr_Mac.mm
+@am__fastdepOBJCXX_TRUE@ $(AM_V_OBJCXX)$(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_OBJCXXFLAGS) $(OBJCXXFLAGS) -MT xetexdir/libxetex_a-XeTeXFontMgr_Mac.o -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr_Mac.Tpo -c -o xetexdir/libxetex_a-XeTeXFontMgr_Mac.o `test -f 'xetexdir/XeTeXFontMgr_Mac.mm' || echo '$(srcdir)/'`xetexdir/XeTeXFontMgr_Mac.mm
+@am__fastdepOBJCXX_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr_Mac.Tpo xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr_Mac.Po
+@AMDEP_TRUE@@am__fastdepOBJCXX_FALSE@ $(AM_V_OBJCXX)source='xetexdir/XeTeXFontMgr_Mac.mm' object='xetexdir/libxetex_a-XeTeXFontMgr_Mac.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepOBJCXX_FALSE@ DEPDIR=$(DEPDIR) $(OBJCXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepOBJCXX_FALSE@ $(AM_V_OBJCXX@am__nodep@)$(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_OBJCXXFLAGS) $(OBJCXXFLAGS) -c -o xetexdir/libxetex_a-XeTeXFontMgr_Mac.o `test -f 'xetexdir/XeTeXFontMgr_Mac.mm' || echo '$(srcdir)/'`xetexdir/XeTeXFontMgr_Mac.mm
+
+xetexdir/libxetex_a-XeTeXFontMgr_Mac.obj: xetexdir/XeTeXFontMgr_Mac.mm
+@am__fastdepOBJCXX_TRUE@ $(AM_V_OBJCXX)$(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_OBJCXXFLAGS) $(OBJCXXFLAGS) -MT xetexdir/libxetex_a-XeTeXFontMgr_Mac.obj -MD -MP -MF xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr_Mac.Tpo -c -o xetexdir/libxetex_a-XeTeXFontMgr_Mac.obj `if test -f 'xetexdir/XeTeXFontMgr_Mac.mm'; then $(CYGPATH_W) 'xetexdir/XeTeXFontMgr_Mac.mm'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXFontMgr_Mac.mm'; fi`
+@am__fastdepOBJCXX_TRUE@ $(AM_V_at)$(am__mv) xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr_Mac.Tpo xetexdir/$(DEPDIR)/libxetex_a-XeTeXFontMgr_Mac.Po
+@AMDEP_TRUE@@am__fastdepOBJCXX_FALSE@ $(AM_V_OBJCXX)source='xetexdir/XeTeXFontMgr_Mac.mm' object='xetexdir/libxetex_a-XeTeXFontMgr_Mac.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepOBJCXX_FALSE@ DEPDIR=$(DEPDIR) $(OBJCXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepOBJCXX_FALSE@ $(AM_V_OBJCXX@am__nodep@)$(OBJCXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_OBJCXXFLAGS) $(OBJCXXFLAGS) -c -o xetexdir/libxetex_a-XeTeXFontMgr_Mac.obj `if test -f 'xetexdir/XeTeXFontMgr_Mac.mm'; then $(CYGPATH_W) 'xetexdir/XeTeXFontMgr_Mac.mm'; else $(CYGPATH_W) '$(srcdir)/xetexdir/XeTeXFontMgr_Mac.mm'; fi`
+
mostlyclean-libtool:
-rm -f *.lo
clean-libtool:
-rm -rf .libs _libs
+ -rm -rf synctexdir/.libs synctexdir/_libs
distclean-libtool:
-rm -f libtool config.lt
+install-man1: $(dist_man_MANS) $(nodist_man_MANS)
+ @$(NORMAL_INSTALL)
+ @list1=''; \
+ list2='$(dist_man_MANS) $(nodist_man_MANS)'; \
+ test -n "$(man1dir)" \
+ && test -n "`echo $$list1$$list2`" \
+ || exit 0; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+ { for i in $$list1; do echo "$$i"; done; \
+ if test -n "$$list2"; then \
+ for i in $$list2; do echo "$$i"; done \
+ | sed -n '/\.1[a-z]*$$/p'; \
+ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+ done | \
+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+ sed 'N;N;s,\n, ,g' | { \
+ list=; while read file base inst; do \
+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+ fi; \
+ done; \
+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+ while read files; do \
+ test -z "$$files" || { \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+ done; }
+
+uninstall-man1:
+ @$(NORMAL_UNINSTALL)
+ @list=''; test -n "$(man1dir)" || exit 0; \
+ files=`{ for i in $$list; do echo "$$i"; done; \
+ l2='$(dist_man_MANS) $(nodist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+ sed -n '/\.1[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+install-man5: $(dist_man_MANS) $(nodist_man_MANS)
+ @$(NORMAL_INSTALL)
+ @list1=''; \
+ list2='$(dist_man_MANS) $(nodist_man_MANS)'; \
+ test -n "$(man5dir)" \
+ && test -n "`echo $$list1$$list2`" \
+ || exit 0; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \
+ { for i in $$list1; do echo "$$i"; done; \
+ if test -n "$$list2"; then \
+ for i in $$list2; do echo "$$i"; done \
+ | sed -n '/\.5[a-z]*$$/p'; \
+ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+ done | \
+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+ sed 'N;N;s,\n, ,g' | { \
+ list=; while read file base inst; do \
+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
+ fi; \
+ done; \
+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+ while read files; do \
+ test -z "$$files" || { \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
+ done; }
+
+uninstall-man5:
+ @$(NORMAL_UNINSTALL)
+ @list=''; test -n "$(man5dir)" || exit 0; \
+ files=`{ for i in $$list; do echo "$$i"; done; \
+ l2='$(dist_man_MANS) $(nodist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+ sed -n '/\.5[a-z]*$$/p'; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+ dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
+install-pkgconfigDATA: $(pkgconfig_DATA)
+ @$(NORMAL_INSTALL)
+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
+ done
+
+uninstall-pkgconfigDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
+install-syncincludeHEADERS: $(syncinclude_HEADERS)
+ @$(NORMAL_INSTALL)
+ @list='$(syncinclude_HEADERS)'; test -n "$(syncincludedir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(syncincludedir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(syncincludedir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(syncincludedir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(syncincludedir)" || exit $$?; \
+ done
+
+uninstall-syncincludeHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(syncinclude_HEADERS)'; test -n "$(syncincludedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(syncincludedir)'; $(am__uninstall_files_from_dir)
# This directory's subdirectories are mostly independent; you can cd
# into them and run 'make' without going through this Makefile.
@@ -10115,6 +14116,55 @@ mplibdir/mptraptest.log: mplibdir/mptraptest
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
+etexdir/etriptest.log: etexdir/etriptest
+ @p='etexdir/etriptest'; \
+ b='etexdir/etriptest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+ptexdir/ptriptest.log: ptexdir/ptriptest
+ @p='ptexdir/ptriptest'; \
+ b='ptexdir/ptriptest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+ptexdir/pbibtex-openout-test.pl.log: ptexdir/pbibtex-openout-test.pl
+ @p='ptexdir/pbibtex-openout-test.pl'; \
+ b='ptexdir/pbibtex-openout-test.pl'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+ptexdir/pbibtex-longline-test.pl.log: ptexdir/pbibtex-longline-test.pl
+ @p='ptexdir/pbibtex-longline-test.pl'; \
+ b='ptexdir/pbibtex-longline-test.pl'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+eptexdir/eptriptest.log: eptexdir/eptriptest
+ @p='eptexdir/eptriptest'; \
+ b='eptexdir/eptriptest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+uptexdir/uptriptest.log: uptexdir/uptriptest
+ @p='uptexdir/uptriptest'; \
+ b='uptexdir/uptriptest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+euptexdir/euptriptest.log: euptexdir/euptriptest
+ @p='euptexdir/euptriptest'; \
+ b='euptexdir/euptriptest'; \
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
.test.log:
@p='$<'; \
$(am__set_b); \
@@ -10325,10 +14375,13 @@ check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-recursive
-all-am: Makefile $(PROGRAMS) ff-config.h
+all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(MANS) \
+ $(DATA) $(HEADERS) ff-config.h
+install-binPROGRAMS: install-libLTLIBRARIES
+
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(bindir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(syncincludedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
@@ -10361,6 +14414,14 @@ clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -rm -f alephdir/$(DEPDIR)/$(am__dirstamp)
+ -rm -f alephdir/$(am__dirstamp)
+ -rm -f eptexdir/$(DEPDIR)/$(am__dirstamp)
+ -rm -f eptexdir/$(am__dirstamp)
+ -rm -f etexdir/$(DEPDIR)/$(am__dirstamp)
+ -rm -f etexdir/$(am__dirstamp)
+ -rm -f euptexdir/$(DEPDIR)/$(am__dirstamp)
+ -rm -f euptexdir/$(am__dirstamp)
-rm -f libmd5/$(DEPDIR)/$(am__dirstamp)
-rm -f libmd5/$(am__dirstamp)
-rm -f luatexdir/$(DEPDIR)/$(am__dirstamp)
@@ -10395,8 +14456,20 @@ distclean-generic:
-rm -f luatexdir/utils/$(am__dirstamp)
-rm -f mplibdir/$(DEPDIR)/$(am__dirstamp)
-rm -f mplibdir/$(am__dirstamp)
+ -rm -f pdftexdir/$(DEPDIR)/$(am__dirstamp)
+ -rm -f pdftexdir/$(am__dirstamp)
+ -rm -f pdftexdir/regex/$(DEPDIR)/$(am__dirstamp)
+ -rm -f pdftexdir/regex/$(am__dirstamp)
+ -rm -f ptexdir/$(DEPDIR)/$(am__dirstamp)
+ -rm -f ptexdir/$(am__dirstamp)
-rm -f synctexdir/$(DEPDIR)/$(am__dirstamp)
-rm -f synctexdir/$(am__dirstamp)
+ -rm -f uptexdir/$(DEPDIR)/$(am__dirstamp)
+ -rm -f uptexdir/$(am__dirstamp)
+ -rm -f xetexdir/$(DEPDIR)/$(am__dirstamp)
+ -rm -f xetexdir/$(am__dirstamp)
+ -rm -f xetexdir/image/$(DEPDIR)/$(am__dirstamp)
+ -rm -f xetexdir/image/$(am__dirstamp)
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@@ -10405,11 +14478,12 @@ maintainer-clean-generic:
clean: clean-recursive
clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
- clean-libtool clean-local clean-noinstPROGRAMS mostlyclean-am
+ clean-libLIBRARIES clean-libLTLIBRARIES clean-libtool \
+ clean-local clean-noinstPROGRAMS mostlyclean-am
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf ./$(DEPDIR) libmd5/$(DEPDIR) luatexdir/$(DEPDIR) luatexdir/lua/$(DEPDIR) luatexdir/luafilesystem/src/$(DEPDIR) luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR) luatexdir/luafontloader/fontforge/gutils/$(DEPDIR) luatexdir/luafontloader/src/$(DEPDIR) luatexdir/luamd5/$(DEPDIR) luatexdir/luapeg/$(DEPDIR) luatexdir/luaprofiler/$(DEPDIR) luatexdir/luasocket/src/$(DEPDIR) luatexdir/luazip/src/$(DEPDIR) luatexdir/luazlib/$(DEPDIR) luatexdir/slnunicode/$(DEPDIR) luatexdir/unilib/$(DEPDIR) luatexdir/utils/$(DEPDIR) mplibdir/$(DEPDIR) synctexdir/$(DEPDIR)
+ -rm -rf ./$(DEPDIR) alephdir/$(DEPDIR) eptexdir/$(DEPDIR) etexdir/$(DEPDIR) euptexdir/$(DEPDIR) libmd5/$(DEPDIR) luatexdir/$(DEPDIR) luatexdir/lua/$(DEPDIR) luatexdir/luafilesystem/src/$(DEPDIR) luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR) luatexdir/luafontloader/fontforge/gutils/$(DEPDIR) luatexdir/luafontloader/src/$(DEPDIR) luatexdir/luamd5/$(DEPDIR) luatexdir/luapeg/$(DEPDIR) luatexdir/luaprofiler/$(DEPDIR) luatexdir/luasocket/src/$(DEPDIR) luatexdir/luazip/src/$(DEPDIR) luatexdir/luazlib/$(DEPDIR) luatexdir/slnunicode/$(DEPDIR) luatexdir/unilib/$(DEPDIR) luatexdir/utils/$(DEPDIR) mplibdir/$(DEPDIR) pdftexdir/$(DEPDIR) pdftexdir/regex/$(DEPDIR) ptexdir/$(DEPDIR) synctexdir/$(DEPDIR) uptexdir/$(DEPDIR) xetexdir/$(DEPDIR) xetexdir/image/$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-libtool distclean-tags
@@ -10426,13 +14500,15 @@ info: info-recursive
info-am:
-install-data-am:
+install-data-am: install-man install-pkgconfigDATA \
+ install-syncincludeHEADERS
install-dvi: install-dvi-recursive
install-dvi-am:
-install-exec-am: install-binPROGRAMS
+install-exec-am: install-binPROGRAMS install-libLIBRARIES \
+ install-libLTLIBRARIES
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
install-html: install-html-recursive
@@ -10443,7 +14519,7 @@ install-info: install-info-recursive
install-info-am:
-install-man:
+install-man: install-man1 install-man5
install-pdf: install-pdf-recursive
@@ -10458,7 +14534,7 @@ installcheck-am:
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
- -rm -rf ./$(DEPDIR) libmd5/$(DEPDIR) luatexdir/$(DEPDIR) luatexdir/lua/$(DEPDIR) luatexdir/luafilesystem/src/$(DEPDIR) luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR) luatexdir/luafontloader/fontforge/gutils/$(DEPDIR) luatexdir/luafontloader/src/$(DEPDIR) luatexdir/luamd5/$(DEPDIR) luatexdir/luapeg/$(DEPDIR) luatexdir/luaprofiler/$(DEPDIR) luatexdir/luasocket/src/$(DEPDIR) luatexdir/luazip/src/$(DEPDIR) luatexdir/luazlib/$(DEPDIR) luatexdir/slnunicode/$(DEPDIR) luatexdir/unilib/$(DEPDIR) luatexdir/utils/$(DEPDIR) mplibdir/$(DEPDIR) synctexdir/$(DEPDIR)
+ -rm -rf ./$(DEPDIR) alephdir/$(DEPDIR) eptexdir/$(DEPDIR) etexdir/$(DEPDIR) euptexdir/$(DEPDIR) libmd5/$(DEPDIR) luatexdir/$(DEPDIR) luatexdir/lua/$(DEPDIR) luatexdir/luafilesystem/src/$(DEPDIR) luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR) luatexdir/luafontloader/fontforge/gutils/$(DEPDIR) luatexdir/luafontloader/src/$(DEPDIR) luatexdir/luamd5/$(DEPDIR) luatexdir/luapeg/$(DEPDIR) luatexdir/luaprofiler/$(DEPDIR) luatexdir/luasocket/src/$(DEPDIR) luatexdir/luazip/src/$(DEPDIR) luatexdir/luazlib/$(DEPDIR) luatexdir/slnunicode/$(DEPDIR) luatexdir/unilib/$(DEPDIR) luatexdir/utils/$(DEPDIR) mplibdir/$(DEPDIR) pdftexdir/$(DEPDIR) pdftexdir/regex/$(DEPDIR) ptexdir/$(DEPDIR) synctexdir/$(DEPDIR) uptexdir/$(DEPDIR) xetexdir/$(DEPDIR) xetexdir/image/$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -10475,15 +14551,20 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-binPROGRAMS
+uninstall-am: uninstall-binPROGRAMS uninstall-libLIBRARIES \
+ uninstall-libLTLIBRARIES uninstall-man uninstall-pkgconfigDATA \
+ uninstall-syncincludeHEADERS
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+uninstall-man: uninstall-man1 uninstall-man5
+
.MAKE: $(am__recursive_targets) all check-am install-am \
install-exec-am install-strip uninstall-am
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
am--refresh check check-TESTS check-am clean clean-binPROGRAMS \
- clean-checkPROGRAMS clean-cscope clean-generic clean-libtool \
+ clean-checkPROGRAMS clean-cscope clean-generic \
+ clean-libLIBRARIES clean-libLTLIBRARIES clean-libtool \
clean-local clean-noinstPROGRAMS cscope cscopelist-am ctags \
ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \
dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \
@@ -10493,13 +14574,18 @@ uninstall-am: uninstall-binPROGRAMS
install install-am install-binPROGRAMS install-data \
install-data-am install-dvi install-dvi-am install-exec \
install-exec-am install-exec-hook install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
+ install-info install-info-am install-libLIBRARIES \
+ install-libLTLIBRARIES install-man install-man1 install-man5 \
+ install-pdf install-pdf-am install-pkgconfigDATA install-ps \
+ install-ps-am install-strip install-syncincludeHEADERS \
installcheck installcheck-am installdirs installdirs-am \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am recheck tags tags-am uninstall \
- uninstall-am uninstall-binPROGRAMS uninstall-hook
+ uninstall-am uninstall-binPROGRAMS uninstall-hook \
+ uninstall-libLIBRARIES uninstall-libLTLIBRARIES uninstall-man \
+ uninstall-man1 uninstall-man5 uninstall-pkgconfigDATA \
+ uninstall-syncincludeHEADERS
dist-hook:
@@ -10780,6 +14866,85 @@ mptrap.diffs: mpost$(EXEEXT)
mptrap-clean:
rm -rf mptrapdir
+.PHONY: install-pmpost-links install-upmpost-links uninstall-pmpost-links uninstall-upmpost-links
+@WIN32_TRUE@install-pmpost-links: call_pmpost$(EXEEXT)
+@WIN32_TRUE@ $(INSTALL_PROGRAM) call_pmpost$(EXEEXT) $(DESTDIR)$(bindir)/pdvitomp$(EXEEXT)
+@WIN32_TRUE@install-upmpost-links: call_upmpost$(EXEEXT)
+@WIN32_TRUE@ $(INSTALL_PROGRAM) call_upmpost$(EXEEXT) $(DESTDIR)$(bindir)/updvitomp$(EXEEXT)
+@WIN32_TRUE@uninstall-pmpost-links:
+@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/pdvitomp$(EXEEXT)
+@WIN32_TRUE@uninstall-upmpost-links:
+@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/updvitomp$(EXEEXT)
+
+pmp.w: mplibdir/mp.w
+ $(AM_V_GEN)$(pmp_sed) $(srcdir)/mplibdir/mp.w >$@
+pmpmath.c: mpmath.c
+ $(AM_V_GEN)$(pmp_sed) mpmath.c >$@
+pmpmath.h: mpmath.h
+ $(AM_V_GEN)$(pmp_sed) mpmath.h >$@
+pmpmathbinary.c: mpmathbinary.c
+ $(AM_V_GEN)$(pmp_sed) mpmathbinary.c >$@
+pmpmathbinary.h: mpmathbinary.h
+ $(AM_V_GEN)$(pmp_sed) mpmathbinary.h >$@
+pmpmathdecimal.c: mpmathdecimal.c
+ $(AM_V_GEN)$(pmp_sed) mpmathdecimal.c >$@
+pmpmathdecimal.h: mpmathdecimal.h
+ $(AM_V_GEN)$(pmp_sed) mpmathdecimal.h >$@
+pmpmathdouble.c: mpmathdouble.c
+ $(AM_V_GEN)$(pmp_sed) mpmathdouble.c >$@
+pmpmathdouble.h: mpmathdouble.h
+ $(AM_V_GEN)$(pmp_sed) mpmathdouble.h >$@
+pmpost.w: mplibdir/mpost.w
+ $(AM_V_GEN)$(pmp_sed) $(srcdir)/mplibdir/mpost.w >$@
+pmpstrings.c: mpstrings.c
+ $(AM_V_GEN)$(pmp_sed) mpstrings.c >$@
+pmpstrings.h: mpstrings.h
+ $(AM_V_GEN)$(pmp_sed) mpstrings.h >$@
+pmpxout.w: mplibdir/mpxout.w
+ $(AM_V_GEN)$(pmp_sed) $(srcdir)/mplibdir/mpxout.w >$@
+pmplibpng.h: mplibpng.h
+ $(AM_V_GEN)$(pmp_sed) mplibpng.h >$@
+pmppngout.h: mppngout.h
+ $(AM_V_GEN)$(pmp_sed) mppngout.h >$@
+ppngout.c: pngout.c
+ $(AM_V_GEN)$(pmp_sed) pngout.c >$@
+ppsout.w: mplibdir/psout.w
+ $(AM_V_GEN)$(pmp_sed) $(srcdir)/mplibdir/psout.w >$@
+psvgout.w: mplibdir/svgout.w
+ $(AM_V_GEN)$(pmp_sed) $(srcdir)/mplibdir/svgout.w >$@
+ptfmin.w: mplibdir/tfmin.w
+ $(AM_V_GEN)$(pmp_sed) $(srcdir)/mplibdir/tfmin.w >$@
+
+# Creating one file: just one rule
+pmpost.c: ctangle$(EXEEXT) pmpost.w pmpostdir/pmpost.ch
+ $(pmp_ctangle) pmpost pmpost
+ptfmin.c: ctangle$(EXEEXT) ptfmin.w pmpostdir/ptfmin.ch
+ $(pmp_ctangle) ptfmin ptfmin
+
+# Creating several files: need stamp file and two rules with identical recipes
+$(pmp_c_h): pmp-tangle
+ @$(pmp_ctangle_sh) pmp pmp
+pmp-tangle: ctangle$(EXEEXT) pmp.w pmpostdir/pmp.ch tangle-sh
+ @$(pmp_ctangle_sh) pmp pmp
+
+$(pmpxout_c_h): pmpxout-tangle
+ @$(pmp_ctangle_sh) pmpxout pmpxout
+pmpxout-tangle: ctangle$(EXEEXT) pmpxout.w pmpostdir/pmpxout.ch tangle-sh
+ @$(pmp_ctangle_sh) pmpxout pmpxout
+
+$(ppsout_c_h): ppsout-tangle
+ @$(pmp_ctangle_sh) ppsout ppsout
+ppsout-tangle: ctangle$(EXEEXT) ppsout.w pmpostdir/ppsout.ch tangle-sh
+ @$(pmp_ctangle_sh) ppsout ppsout
+
+$(psvgout_c_h): psvgout-tangle
+ @$(pmp_ctangle_sh) psvgout psvgout
+psvgout-tangle: ctangle$(EXEEXT) psvgout.w pmpostdir/psvgout.ch tangle-sh
+ @$(pmp_ctangle_sh) psvgout psvgout
+
+$(pmpost_OBJECTS) $(upmpost_OBJECTS): $(nodist_pmpost_SOURCES) $(PTEXENC_DEPEND) \
+ $(LIBPNG_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND)
+
# Creating one file: just one rule
tfmin.c: ctangle$(EXEEXT) mplibdir/tfmin.w
$(mp_ctangle) tfmin.w
@@ -10831,6 +14996,263 @@ svgout-tangle: ctangle$(EXEEXT) mplibdir/svgout.w tangle-sh
@$(mp_ctangle_sh) svgout
$(libmplib_a_OBJECTS): $(nodist_libmplib_a_SOURCES) $(KPATHSEA_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND)
+$(etex_OBJECTS): $(etex_prereq)
+
+$(etex_c_h): etex-web2c
+ @$(web2c) etex
+etex-web2c: etex.p $(web2c_texmf)
+ @$(web2c) etex
+
+etex-pool.c: etex.pool etexd.h $(makecpool_stamp)
+ $(makecpool) etex >$@ || rm -f $@
+
+# Tangling e-TeX
+etex.p etex.pool: etex-tangle
+ @$(texmf_tangle) etex etex
+etex-tangle: tangle$(EXEEXT) etex.web etex.ch tangle-sh
+ @$(texmf_tangle) etex etex
+
+# Extract etex version
+$(srcdir)/etexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ etexdir/etex.ch
+ $(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
+ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Generate etex.web
+etex.web: tie$(EXEEXT) $(etex_web_srcs)
+ $(tie) -m etex.web $(etex_web_srcs)
+
+# Generate etex.ch
+etex.ch: tie$(EXEEXT) etex.web $(etex_ch_srcs)
+ $(tie) -c etex.ch etex.web $(etex_ch_srcs)
+etrip.diffs: etex$(EXEEXT)
+ $(triptrap_diffs) $@
+.PHONY: etrip-clean
+etrip-clean:
+ rm -rf etripdir
+# Rebuild $(pproglib)
+$(pproglib): $(KPATHSEA_DEPEND) ${srcdir}/lib/*.c
+ cd lib && $(MAKE) $(AM_MAKEFLAGS) libp.a
+$(ptex_OBJECTS): $(ptex_prereq)
+
+$(ptex_c_h): ptex-web2c
+ @$(web2c) ptex
+ptex-web2c: ptex.p $(web2c_texmf) ptexdir/ptex.defines
+ @$(web2c) ptex
+
+ptex-pool.c: ptex.pool ptexd.h $(makecpool_stamp)
+ $(makecpool) ptex >$@ || rm -f $@
+
+# Tangling pTeX
+ptex.p ptex.pool: ptex-tangle
+ @$(texmf_tangle) ptex ptex
+ptex-tangle: tangle$(EXEEXT) ptex.web ptex.ch tangle-sh
+ @$(texmf_tangle) ptex ptex
+
+# Extract ptex version
+$(srcdir)/ptexdir/ptex_version.h: @MAINTAINER_MODE_TRUE@ ptexdir/ptex-base.ch
+ $(AM_V_GEN)grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex-base.ch \
+ | sed "s/^.*'-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Generate ptex.web
+ptex.web: tie$(EXEEXT) $(ptex_web_srcs)
+ $(tie) -m ptex.web $(ptex_web_srcs)
+
+# Generate ptex.ch
+ptex.ch: tie$(EXEEXT) ptex.web $(ptex_ch_srcs)
+ $(tie) -c ptex.ch ptex.web $(ptex_ch_srcs)
+pbibtex.c pbibtex.h: pbibtex-web2c
+ @$(web2c) pbibtex
+pbibtex-web2c: pbibtex.p $(web2c_depend) ptexdir/ptex.defines web2c/cvtbib.sed
+ @$(web2c) pbibtex
+pbibtex.p: tangle$(EXEEXT) pbibtex.web ptexdir/pbibtex.ch
+ $(p_tangle) pbibtex pbibtex
+pbibtex.web: tie$(EXEEXT) bibtex.web bibtex.ch
+ $(tie) -m pbibtex.web bibtex.web bibtex.ch
+pdvitype.c pdvitype.h: pdvitype-web2c
+ @$(web2c) pdvitype
+pdvitype-web2c: pdvitype.p $(web2c_depend) ptexdir/ptex.defines
+ @$(web2c) pdvitype
+pdvitype.p: tangle$(EXEEXT) pdvitype.web ptexdir/pdvitype.ch
+ $(p_tangle) pdvitype pdvitype
+pdvitype.web: tie$(EXEEXT) dvitype.web dvitype.ch
+ $(tie) -m pdvitype.web dvitype.web dvitype.ch
+ppltotf.c ppltotf.h: ppltotf-web2c
+ @$(web2c) ppltotf
+ppltotf-web2c: ppltotf.p $(web2c_depend) ptexdir/ptex.defines
+ @$(web2c) ppltotf
+ppltotf.p: tangle$(EXEEXT) ppltotf.web ptexdir/ppltotf.ch
+ $(p_tangle) ppltotf ppltotf
+ppltotf.web: tie$(EXEEXT) pltotf.web pltotf.ch
+ $(tie) -m ppltotf.web pltotf.web pltotf.ch
+ptftopl.c ptftopl.h: ptftopl-web2c
+ @$(web2c) ptftopl
+ptftopl-web2c: ptftopl.p $(web2c_depend) ptexdir/ptex.defines
+ @$(web2c) ptftopl
+ptftopl.p: tangle$(EXEEXT) ptftopl.web ptexdir/ptftopl.ch
+ $(p_tangle) ptftopl ptftopl
+ptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch
+ $(tie) -m ptftopl.web tftopl.web tftopl.ch
+ptrip.diffs: ptex$(EXEEXT)
+ $(triptrap_diffs) $@
+.PHONY: ptrip-clean
+ptrip-clean:
+ rm -rf ptripdir
+$(eptex_OBJECTS): $(eptex_prereq)
+
+$(eptex_c_h): eptex-web2c
+ @$(web2c) eptex
+eptex-web2c: eptex.p $(web2c_texmf) eptexdir/eptex.defines
+ @$(web2c) eptex
+
+eptex-pool.c: eptex.pool eptexd.h $(makecpool_stamp)
+ $(makecpool) eptex >$@ || rm -f $@
+
+# Tangling e-pTeX
+eptex.p eptex.pool: eptex-tangle
+ @$(texmf_tangle) eptex eptex
+eptex-tangle: tangle$(EXEEXT) eptex.web eptex.ch tangle-sh
+ @$(texmf_tangle) eptex eptex
+
+# Extract eptex version
+$(srcdir)/eptexdir/eptex_version.h: @MAINTAINER_MODE_TRUE@ eptexdir/eptex.ech
+ $(AM_V_GEN)grep '^@d epTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \
+ | sed "s/^.*'-/#define EPTEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Generate eptex.web
+eptex.web: tie$(EXEEXT) $(eptex_web_srcs)
+ $(tie) -m eptex.web $(eptex_web_srcs)
+
+# Generate eptex.ch
+eptex.ch: tie$(EXEEXT) eptex.web $(eptex_ch_srcs)
+ $(tie) -c eptex.ch eptex.web $(eptex_ch_srcs)
+eptrip.diffs: eptex$(EXEEXT)
+ $(triptrap_diffs) $@
+.PHONY: eptrip-clean
+eptrip-clean:
+ rm -rf eptripdir
+$(uptex_OBJECTS): $(uptex_prereq)
+
+$(uptex_c_h): uptex-web2c
+ @$(web2c) uptex
+uptex-web2c: uptex.p $(web2c_texmf) uptexdir/uptex.defines
+ @$(web2c) uptex
+
+uptex-pool.c: uptex.pool uptexd.h $(makecpool_stamp)
+ $(makecpool) uptex >$@ || rm -f $@
+
+# Tangling upTeX
+uptex.p uptex.pool: uptex-tangle
+ @$(texmf_tangle) uptex uptex
+uptex-tangle: tangle$(EXEEXT) uptex.web uptex.ch tangle-sh
+ @$(texmf_tangle) uptex uptex
+
+# Extract uptex version
+$(srcdir)/uptexdir/uptex_version.h: @MAINTAINER_MODE_TRUE@ uptexdir/uptex-m.ch
+ $(AM_V_GEN)grep '^@d upTeX_version_string==' $(srcdir)/uptexdir/uptex-m.ch \
+ | sed "s/^.*'-/#define UPTEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Generate uptex.web
+uptex.web: tie$(EXEEXT) $(uptex_web_srcs)
+ $(tie) -m uptex.web $(uptex_web_srcs)
+
+# Generate uptex.ch
+uptex.ch: tie$(EXEEXT) uptex.web $(uptex_ch_srcs)
+ $(tie) -c uptex.ch uptex.web $(uptex_ch_srcs)
+upbibtex.c upbibtex.h: upbibtex-web2c
+ @$(web2c) upbibtex
+upbibtex-web2c: upbibtex.p $(web2c_depend) uptexdir/uptex.defines web2c/cvtbib.sed
+ @$(web2c) upbibtex
+upbibtex.p: tangle$(EXEEXT) upbibtex.web uptexdir/upbibtex.ch
+ $(up_tangle) upbibtex upbibtex
+upbibtex.web: tie$(EXEEXT) bibtex.web bibtex.ch ptexdir/pbibtex.ch
+ $(tie) -m upbibtex.web bibtex.web bibtex.ch ptexdir/pbibtex.ch
+updvitype.c updvitype.h: updvitype-web2c
+ @$(web2c) updvitype
+updvitype-web2c: updvitype.p $(web2c_depend) uptexdir/uptex.defines
+ @$(web2c) updvitype
+updvitype.p: tangle$(EXEEXT) updvitype.web uptexdir/updvitype.ch
+ $(up_tangle) updvitype updvitype
+updvitype.web: tie$(EXEEXT) dvitype.web dvitype.ch ptexdir/pdvitype.ch
+ $(tie) -m updvitype.web dvitype.web dvitype.ch ptexdir/pdvitype.ch
+uppltotf.c uppltotf.h: uppltotf-web2c
+ @$(web2c) uppltotf
+uppltotf-web2c: uppltotf.p $(web2c_depend) uptexdir/uptex.defines
+ @$(web2c) uppltotf
+uppltotf.p: tangle$(EXEEXT) uppltotf.web uptexdir/uppltotf.ch
+ $(up_tangle) uppltotf uppltotf
+uppltotf.web: tie$(EXEEXT) pltotf.web pltotf.ch ptexdir/ppltotf.ch
+ $(tie) -m uppltotf.web pltotf.web pltotf.ch ptexdir/ppltotf.ch
+uptftopl.c uptftopl.h: uptftopl-web2c
+ @$(web2c) uptftopl
+uptftopl-web2c: uptftopl.p $(web2c_depend) uptexdir/uptex.defines
+ @$(web2c) uptftopl
+uptftopl.p: tangle$(EXEEXT) uptftopl.web uptexdir/uptftopl.ch
+ $(up_tangle) uptftopl uptftopl
+uptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch ptexdir/ptftopl.ch
+ $(tie) -m uptftopl.web tftopl.web tftopl.ch ptexdir/ptftopl.ch
+uptrip.diffs: uptex$(EXEEXT)
+ $(triptrap_diffs) $@
+.PHONY: uptrip-clean
+uptrip-clean:
+ rm -rf uptripdir
+$(euptex_OBJECTS): $(euptex_prereq)
+
+$(euptex_c_h): euptex-web2c
+ @$(web2c) euptex
+euptex-web2c: euptex.p $(web2c_texmf) euptexdir/euptex.defines
+ @$(web2c) euptex
+
+euptex-pool.c: euptex.pool euptexd.h $(makecpool_stamp)
+ $(makecpool) euptex >$@ || rm -f $@
+
+# Tangling e-upTeX
+euptex.p euptex.pool: euptex-tangle
+ @$(texmf_tangle) euptex euptex
+euptex-tangle: tangle$(EXEEXT) euptex.web euptex.ch tangle-sh
+ @$(texmf_tangle) euptex euptex
+
+# Generate euptex.web
+euptex.web: tie$(EXEEXT) $(euptex_web_srcs)
+ $(tie) -m euptex.web $(euptex_web_srcs)
+
+# Generate euptex.ch
+euptex.ch: tie$(EXEEXT) euptex.web $(euptex_ch_srcs)
+ $(tie) -c euptex.ch euptex.web $(euptex_ch_srcs)
+euptrip.diffs: euptex$(EXEEXT)
+ $(triptrap_diffs) $@
+.PHONY: euptrip-clean
+euptrip-clean:
+ rm -rf euptripdir
+
+# We must create pdftexd.h (and xpdf...) before building the libpdftex_a_OBJECTS.
+$(libpdftex_a_OBJECTS): pdftexd.h $(XPDF_DEPEND) $(ZLIB_DEPEND) $(LIBPNG_DEPEND)
+$(pdftex_OBJECTS): $(pdftex_prereq)
+$(pdftex_c_h): pdftex-web2c
+ @$(web2c) pdftex
+pdftex-web2c: pdftex.p $(web2c_texmf) pdftexdir/pdftex.defines
+ @$(web2c) pdftex
+pdftex.p pdftex.pool: pdftex-tangle
+ @$(pdf_tangle) pdftex pdftex
+pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex.ch tangle-sh
+ @$(pdf_tangle) pdftex pdftex
+pdftex-pool.c: pdftex.pool pdftexd.h $(makecpool_stamp)
+ $(makecpool) pdftex >$@ || rm -f $@
+
+# Extract pdftex version
+$(srcdir)/pdftexdir/pdftex_version.h: @MAINTAINER_MODE_TRUE@ pdftexdir/pdftex.web
+ $(AM_V_GEN)grep '^@d pdftex_version_string==' $(srcdir)/pdftexdir/pdftex.web \
+ | sed "s/^.*'-/#define PDFTEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Extract etex version
+$(srcdir)/pdftexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ pdftexdir/pdftex.web
+ $(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/pdftexdir/pdftex.web \
+ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Generate pdftex.ch
+pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs)
+ $(tie) -c pdftex.ch $(pdftex_ch_srcs)
+
+$(pdftosrc_OBJECTS): $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(XPDF_DEPEND)
$(libluasocket_a_OBJECTS): $(LUA_DEPEND)
$(libluajitsocket_a_OBJECTS): $(LUAJIT_DEPEND)
@@ -11076,6 +15498,108 @@ $(luajittex_OBJECTS): libluajittex.a
@WIN32_TRUE@uninstall-luajittex-links:
@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/texluajit$(EXEEXT)
@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/texluajitc$(EXEEXT)
+$(xetex_OBJECTS): $(xetex_prereq)
+
+$(xetex_c_h): xetex-web2c
+ @$(web2c) xetex
+xetex-web2c: xetex.p $(web2c_texmf) xetexdir/xetex.defines
+ @$(web2c) xetex
+
+xetex-pool.c: xetex.pool xetexd.h $(makecpool_stamp)
+ $(makecpool) xetex >$@ || rm -f $@
+
+xetex.p xetex.pool: xetex-tangle
+ @$(xe_tangle) xetex xetex
+xetex-tangle: otangle$(EXEEXT) xetexdir/xetex.web xetex.ch tangle-sh
+ @$(xe_tangle) xetex xetex
+
+# Extract etex version
+$(srcdir)/xetexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ xetexdir/xetex.web
+ $(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/xetexdir/xetex.web \
+ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+$(srcdir)/xetexdir/xetex_version.h: @MAINTAINER_MODE_TRUE@ xetexdir/xetex.web
+ $(AM_V_GEN)grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.web \
+ | sed "s/^.*'-/#define XETEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+xetex.ch: tie$(EXEEXT) $(xetex_ch_srcs)
+ $(tie) -c xetex.ch $(xetex_ch_srcs)
+$(libxetex_a_OBJECTS): $(libxetex_prereq)
+odvicopy.c odvicopy.h: odvicopy-web2c
+ @$(web2c) odvicopy
+odvicopy-web2c: odvicopy.p $(web2c_depend)
+ @$(web2c) odvicopy
+odvicopy.p: tangle$(EXEEXT) $(odvicopy_sources)
+ $(tangle_silent)$(ow_tangle) odvicopy odvicopy
+odvitype.c odvitype.h: odvitype-web2c
+ @$(web2c) odvitype
+odvitype-web2c: odvitype.p $(web2c_depend)
+ @$(web2c) odvitype
+odvitype.p: tangle$(EXEEXT) $(odvitype_sources)
+ $(tangle_silent)$(ow_tangle) odvitype odvitype
+ofm2opl.c ofm2opl.h: ofm2opl-web2c
+ @$(web2c) ofm2opl
+ofm2opl-web2c: ofm2opl.p $(web2c_depend)
+ @$(web2c) ofm2opl
+ofm2opl.p: otangle$(EXEEXT) ofm2opl.web omegaware/ofm2opl.ch
+ $(tangle_silent)$(ow_otangle) ofm2opl ofm2opl
+ofm2opl.web: tie$(EXEEXT) omegaware/ofm2opl.web omegaware/ofm2opl.up
+ $(tie) -m ofm2opl.web omegaware/ofm2opl.web omegaware/ofm2opl.up
+opl2ofm.c opl2ofm.h: opl2ofm-web2c
+ @$(web2c) opl2ofm
+opl2ofm-web2c: opl2ofm.p $(web2c_depend)
+ @$(web2c) opl2ofm
+opl2ofm.p: otangle$(EXEEXT) opl2ofm.web omegaware/opl2ofm.ch
+ $(tangle_silent)$(ow_otangle) opl2ofm opl2ofm
+opl2ofm.web: tie$(EXEEXT) omegaware/opl2ofm.web omegaware/opl2ofm.up
+ $(tie) -m opl2ofm.web omegaware/opl2ofm.web omegaware/opl2ofm.up
+otangle.c otangle.h: otangle-web2c
+ @$(web2c) otangle
+otangle-web2c: otangle.p $(web2c_depend)
+ @$(web2c) otangle
+otangle.p: tangle$(EXEEXT) $(otangle_sources)
+ $(tangle_silent)$(ow_tangle) otangle otangle
+ovf2ovp.c ovf2ovp.h: ovf2ovp-web2c
+ @$(web2c) ovf2ovp
+ovf2ovp-web2c: ovf2ovp.p $(web2c_depend)
+ @$(web2c) ovf2ovp
+ovf2ovp.p: otangle$(EXEEXT) ovf2ovp.web omegaware/ovf2ovp.ch
+ $(tangle_silent)$(ow_otangle) ovf2ovp ovf2ovp
+ovf2ovp.web: tie$(EXEEXT) omegaware/ovf2ovp.web omegaware/ovf2ovp.up
+ $(tie) -m ovf2ovp.web omegaware/ovf2ovp.web omegaware/ovf2ovp.up
+ovp2ovf.c ovp2ovf.h: ovp2ovf-web2c
+ @$(web2c) ovp2ovf
+ovp2ovf-web2c: ovp2ovf.p $(web2c_depend)
+ @$(web2c) ovp2ovf
+ovp2ovf.p: otangle$(EXEEXT) ovp2ovf.web omegaware/ovp2ovf.ch
+ $(tangle_silent)$(ow_otangle) ovp2ovf ovp2ovf
+ovp2ovf.web: tie$(EXEEXT) omegaware/ovp2ovf.web omegaware/ovp2ovf.up
+ $(tie) -m ovp2ovf.web omegaware/ovp2ovf.web omegaware/ovp2ovf.up
+
+# We must create alephd.h before building the aleph_OBJECTS.
+$(aleph_OBJECTS): alephd.h
+
+$(aleph_c_h): aleph-web2c
+ @$(web2c) aleph
+aleph-web2c: aleph.p $(web2c_texmf) alephdir/aleph.defines
+ @$(web2c) aleph
+aleph-pool.c: aleph.pool alephd.h $(makecpool_stamp)
+ $(makecpool) aleph >$@ || rm -f $@
+
+# Tangling Aleph
+aleph.p aleph.pool: aleph-tangle
+ @$(al_tangle) aleph aleph
+aleph-tangle: otangle$(EXEEXT) aleph.web aleph.ch tangle-sh
+ @$(al_tangle) aleph aleph
+aleph.web: tie$(EXEEXT) $(aleph_web_srcs)
+ $(tie) -m aleph.web $(aleph_web_srcs)
+aleph.ch: tie$(EXEEXT) aleph.web $(aleph_ch_srcs)
+ $(tie) -c aleph.ch aleph.web $(aleph_ch_srcs)
+
+$(synctex_OBJECTS): $(libsynctex)
+
+$(libsynctex_la_OBJECTS): $(ZLIB_DEPEND)
+$(libsynctex_a_OBJECTS): $(ZLIB_DEPEND)
.PHONY: install-bin-links uninstall-bin-links
install-bin-links:
diff --git a/source/texk/web2c/aclocal.m4 b/source/texk/web2c/aclocal.m4
index a1dd423c3f272ef7e37784c1585abeb3121a0fbb..18fbfb555eeeefc7ee22776d4e1f249a89472e09 100644
--- a/source/texk/web2c/aclocal.m4
+++ b/source/texk/web2c/aclocal.m4
@@ -1234,6 +1234,7 @@ m4_include([../../m4/kpse-harfbuzz-flags.m4])
m4_include([../../m4/kpse-icu-flags.m4])
m4_include([../../m4/kpse-kpathsea-flags.m4])
m4_include([../../m4/kpse-lex.m4])
+m4_include([../../m4/kpse-lib-version.m4])
m4_include([../../m4/kpse-libpng-flags.m4])
m4_include([../../m4/kpse-lt-hack.m4])
m4_include([../../m4/kpse-lua52-flags.m4])
diff --git a/source/texk/web2c/alephdir/am/aleph.am b/source/texk/web2c/alephdir/am/aleph.am
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..b7c65729d50bd43bbefad371d8a514b636fdb806 100644
--- a/source/texk/web2c/alephdir/am/aleph.am
+++ b/source/texk/web2c/alephdir/am/aleph.am
@@ -0,0 +1,111 @@
+## texk/web2c/alephdir/am/aleph.am: Makefile fragment for Aleph.
+##
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+
+## Aleph
+##
+if ALEPH
+bin_PROGRAMS += aleph
+endif ALEPH
+EXTRA_PROGRAMS += aleph
+
+al_tangle = WEBINPUTS=.:$(srcdir) AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(OTANGLE)
+
+# With --enable-ipc, Aleph may need to link with -lsocket.
+aleph_LDADD = $(LDADD) $(ipc_socketlibs)
+
+aleph_CPPFLAGS = -I$(srcdir)/alephdir $(AM_CPPFLAGS)
+
+# Aleph C sources
+aleph_c_h = alephini.c aleph0.c alephcoerce.h alephd.h
+nodist_aleph_SOURCES = $(aleph_c_h) aleph-pool.c
+dist_aleph_SOURCES = \
+ alephdir/aleph.c \
+ alephdir/alephbis.c \
+ alephdir/alephextra.c \
+ alephdir/alephextra.h \
+ alephdir/alephmem.h
+
+# We must create alephd.h before building the aleph_OBJECTS.
+$(aleph_OBJECTS): alephd.h
+
+$(aleph_c_h): aleph-web2c
+ @$(web2c) aleph
+aleph-web2c: aleph.p $(web2c_texmf) alephdir/aleph.defines
+ @$(web2c) aleph
+aleph-pool.c: aleph.pool alephd.h $(makecpool_stamp)
+ $(makecpool) aleph >$@ || rm -f $@
+
+# Tangling Aleph
+aleph.p aleph.pool: aleph-tangle
+ @$(al_tangle) aleph aleph
+aleph-tangle: otangle$(EXEEXT) aleph.web aleph.ch tangle-sh
+ @$(al_tangle) aleph aleph
+
+# Generate aleph.web
+aleph_web_srcs = \
+ tex.web \
+ alephdir/om16bit.ch \
+ alephdir/omstr.ch \
+ alephdir/omfont.ch \
+ alephdir/omchar.ch \
+ alephdir/omfi.ch \
+ alephdir/ompar.ch \
+ alephdir/omocp.ch \
+ alephdir/omfilter.ch \
+ alephdir/omtrans.ch \
+ alephdir/omdir.ch \
+ alephdir/eobase.ch \
+ alephdir/eofmt.ch \
+ alephdir/eomem.ch \
+ alephdir/eo16bit.ch \
+ alephdir/eoext.ch \
+ alephdir/eoeqtb.ch \
+ alephdir/eofix.ch \
+ alephdir/eocprt.ch \
+ alephdir/eonewdir.ch \
+ alephdir/eover.ch \
+ alephdir/eopage.ch \
+ alephdir/eochar.ch
+aleph.web: tie$(EXEEXT) $(aleph_web_srcs)
+ $(tie) -m aleph.web $(aleph_web_srcs)
+
+# Generate aleph.ch
+aleph_ch_srcs = \
+ alephdir/com16bit.ch \
+ alephdir/comstr.ch \
+ alephdir/comfont.ch \
+ alephdir/comchar.ch \
+ alephdir/comfi.ch \
+ alephdir/compar.ch \
+ alephdir/comocp.ch \
+ alephdir/comfilter.ch \
+ alephdir/comtrans.ch \
+ alephdir/comdir.ch \
+ alephdir/comsrcspec.ch \
+ alephdir/ceostuff.ch
+aleph.ch: tie$(EXEEXT) aleph.web $(aleph_ch_srcs)
+ $(tie) -c aleph.ch aleph.web $(aleph_ch_srcs)
+
+##
+EXTRA_DIST += $(aleph_web_srcs) $(aleph_ch_srcs)
+
+DISTCLEANFILES += $(nodist_aleph_SOURCES) aleph.web aleph.ch aleph-web2c \
+ aleph.p aleph.pool aleph-tangle
+
+EXTRA_DIST += \
+ alephdir/ChangeLog \
+ alephdir/aleph.defines \
+ alephdir/aleph.version
+
+# Aleph Tests
+#
+aleph_tests = alephdir/aleph.test
+
+EXTRA_DIST += $(aleph_tests)
+
+if ALEPH
+TESTS += $(aleph_tests)
+endif ALEPH
+
diff --git a/source/texk/web2c/configure b/source/texk/web2c/configure
index 43e5a84693849f55a3433134a964fcebb44e12a8..ea8a26464a67f8e74565a45f919dac935cbfde1f 100755
--- a/source/texk/web2c/configure
+++ b/source/texk/web2c/configure
@@ -638,6 +638,13 @@ am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
subdirs
+WANTEDLIBS
+SYNCTEX_LT_VERSINFO
+SYNCTEXVERSION
+SYNCTEX_FALSE
+SYNCTEX_TRUE
+SYSTEM_ZLIB_FALSE
+SYSTEM_ZLIB_TRUE
OTANGLE
TIE
CTANGLE
@@ -956,6 +963,7 @@ enable_shared
enable_static
with_pic
enable_fast_install
+with_aix_soname
with_gnu_ld
with_sysroot
enable_libtool_lock
@@ -1741,6 +1749,9 @@ Optional Packages:
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
both]
+ --with-aix-soname=aix|svr4|both
+ shared library versioning (aka "SONAME") variant to
+ provide on AIX, [default=aix].
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-sysroot[=DIR] Search for dependent libraries within DIR (or the
compiler's sysroot if not specified).
@@ -4888,8 +4899,8 @@ esac
-macro_version='2.4.2.458.26-92994'
-macro_revision='2.4.3'
+macro_version='2.4.4'
+macro_revision='2.4.4'
@@ -6258,6 +6269,9 @@ sysv4 | sysv4.3*)
tpf*)
lt_cv_deplibs_check_method=pass_all
;;
+os2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
fi
@@ -9246,6 +9260,58 @@ fi
+ shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[5-9]*,yes)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+
+# Check whether --with-aix-soname was given.
+if test "${with_aix_soname+set}" = set; then :
+ withval=$with_aix_soname; case $withval in
+ aix|svr4|both)
+ ;;
+ *)
+ as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+ ;;
+ esac
+ lt_cv_with_aix_soname=$with_aix_soname
+else
+ if ${lt_cv_with_aix_soname+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_with_aix_soname=aix
+fi
+
+ with_aix_soname=$lt_cv_with_aix_soname
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
+ if test aix != "$with_aix_soname"; then
+ # For the AIX way of multilib, we name the shared archive member
+ # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+ # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+ # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+ # the AIX toolchain works better with OBJECT_MODE set (default 32).
+ if test 64 = "${OBJECT_MODE-32}"; then
+ shared_archive_member_spec=shr_64
+ else
+ shared_archive_member_spec=shr
+ fi
+ fi
+ ;;
+*)
+ with_aix_soname=aix
+ ;;
+esac
+
+
+
+
+
+
+
@@ -9684,6 +9750,11 @@ lt_prog_compiler_static=
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
lt_prog_compiler_pic='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
@@ -9780,6 +9851,11 @@ lt_prog_compiler_static=
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static='$wl-static'
+ ;;
+ esac
;;
hpux9* | hpux10* | hpux11*)
@@ -10420,6 +10496,34 @@ _LT_EOF
link_all_deplibs=yes
;;
+ os2*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ allow_undefined_flag=unsupported
+ shrext_cmds=.dll
+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes=yes
+ ;;
+
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
@@ -10493,6 +10597,9 @@ _LT_EOF
fi
case $cc_basename in
+ tcc*)
+ export_dynamic_flag_spec='-rdynamic'
+ ;;
xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
@@ -10622,19 +10729,35 @@ _LT_EOF
no_entry_flag=
else
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global
- # defined symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
@@ -10642,6 +10765,13 @@ _LT_EOF
break
fi
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -10661,6 +10791,14 @@ _LT_EOF
hardcode_libdir_separator=':'
link_all_deplibs=yes
file_list_spec='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # traditional, no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ hardcode_direct=no
+ hardcode_direct_absolute=no
+ ;;
+ esac
if test yes = "$GCC"; then
case $host_os in aix4.[012]|aix4.[012].*)
@@ -10688,6 +10826,11 @@ _LT_EOF
if test yes = "$aix_use_runtimelinking"; then
shared_flag="$shared_flag "'$wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
if test ia64 = "$host_cpu"; then
@@ -10700,6 +10843,8 @@ _LT_EOF
else
shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
@@ -10707,7 +10852,7 @@ _LT_EOF
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to export.
always_export_symbols=yes
- if test yes = "$aix_use_runtimelinking"; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
allow_undefined_flag='-berok'
@@ -10822,8 +10967,20 @@ fi
whole_archive_flag_spec='$convenience'
fi
archive_cmds_need_lc=yes
- # This is similar to how AIX traditionally builds its shared libraries.
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $wl-bnoentry $compiler_flags $wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+ else
+ # used by -dlpreopen to get the symbols
+ archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -11142,6 +11299,16 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
link_all_deplibs=yes
;;
+ linux*)
+ case $cc_basename in
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ ld_shlibs=yes
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+
netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
@@ -11187,8 +11354,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ shrext_cmds=.dll
+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes=yes
;;
osf3*)
@@ -11747,20 +11934,70 @@ aix[4-9]*)
fi
;;
esac
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
# AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
# soname into executable. Probably we can add versioning support to
# collect2, so additional links can be useful in future.
- if test yes = "$aix_use_runtimelinking"; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
# instead of lib<name>.a to let people know that these are not
# typical AIX shared libraries.
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
- else
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a(lib.so.V)'
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
library_names_spec='$libname$release.a $libname.a'
soname_spec='$libname$release$shared_ext$major'
- fi
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
shlibpath_var=LIBPATH
fi
;;
@@ -11948,7 +12185,7 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
need_version=no
need_lib_prefix=no
;;
@@ -12232,11 +12469,32 @@ openbsd* | bitrig*)
os2*)
libname_spec='$name'
+ version_type=windows
shrext_cmds=.dll
+ need_version=no
need_lib_prefix=no
- library_names_spec='$libname$shared_ext $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
;;
osf3* | osf4* | osf5*)
@@ -12312,7 +12570,7 @@ sysv4*MP*)
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
need_lib_prefix=no
need_version=no
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
@@ -12841,7 +13099,7 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
@@ -12947,7 +13205,7 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
@@ -13096,8 +13354,12 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
;;
aix[4-9]*)
- if test ia64 != "$host_cpu" && test no = "$aix_use_runtimelinking"; then
- test yes = "$enable_shared" && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -14830,7 +15092,19 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
@@ -14840,6 +15114,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
;;
esac
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -14859,6 +15140,14 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
hardcode_libdir_separator_CXX=':'
link_all_deplibs_CXX=yes
file_list_spec_CXX='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ hardcode_direct_CXX=no
+ hardcode_direct_absolute_CXX=no
+ ;;
+ esac
if test yes = "$GXX"; then
case $host_os in aix4.[012]|aix4.[012].*)
@@ -14885,6 +15174,11 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
if test yes = "$aix_use_runtimelinking"; then
shared_flag=$shared_flag' $wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
if test ia64 = "$host_cpu"; then
@@ -14897,6 +15191,8 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
else
shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
@@ -14905,10 +15201,11 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
# underscore (_), so it is better to generate a list of symbols to
# export.
always_export_symbols_CXX=yes
- if test yes = "$aix_use_runtimelinking"; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
- allow_undefined_flag_CXX='-berok'
+ # The "-G" linker flag allows undefined symbols.
+ no_undefined_flag_CXX='-bernotok'
# Determine the default libpath from the value encoded in an empty
# executable.
if test set = "${lt_cv_aix_libpath+set}"; then
@@ -15021,9 +15318,21 @@ fi
whole_archive_flag_spec_CXX='$convenience'
fi
archive_cmds_need_lc_CXX=yes
- # This is similar to how AIX traditionally builds its shared
- # libraries.
- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $wl-bnoentry $compiler_flags $wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ archive_expsym_cmds_CXX='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared
+ # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+ else
+ # used by -dlpreopen to get the symbols
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ archive_expsym_cmds_CXX="$archive_expsym_cmds_CXX"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -15155,6 +15464,34 @@ fi
;;
+ os2*)
+ hardcode_libdir_flag_spec_CXX='-L$libdir'
+ hardcode_minus_L_CXX=yes
+ allow_undefined_flag_CXX=unsupported
+ shrext_cmds=.dll
+ archive_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds_CXX='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds_CXX='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes_CXX=yes
+ ;;
+
dgux*)
case $cc_basename in
ec++*)
@@ -16081,6 +16418,11 @@ lt_prog_compiler_static_CXX=
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static_CXX='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
# PIC is the default on this platform
@@ -16618,13 +16960,17 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
case $host_os in
aix[4-9]*)
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global defined
- # symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds_CXX='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
;;
pw32*)
@@ -16846,20 +17192,70 @@ aix[4-9]*)
fi
;;
esac
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
# AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
# soname into executable. Probably we can add versioning support to
# collect2, so additional links can be useful in future.
- if test yes = "$aix_use_runtimelinking"; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
# instead of lib<name>.a to let people know that these are not
# typical AIX shared libraries.
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
- else
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a(lib.so.V)'
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
library_names_spec='$libname$release.a $libname.a'
soname_spec='$libname$release$shared_ext$major'
- fi
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
shlibpath_var=LIBPATH
fi
;;
@@ -17045,7 +17441,7 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
need_version=no
need_lib_prefix=no
;;
@@ -17329,11 +17725,32 @@ openbsd* | bitrig*)
os2*)
libname_spec='$name'
+ version_type=windows
shrext_cmds=.dll
+ need_version=no
need_lib_prefix=no
- library_names_spec='$libname$shared_ext $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
;;
osf3* | osf4* | osf5*)
@@ -17409,7 +17826,7 @@ sysv4*MP*)
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
need_lib_prefix=no
need_version=no
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
@@ -21946,6 +22363,7 @@ enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
@@ -22388,6 +22806,9 @@ pic_mode=$pic_mode
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
# Shell to use when invoking shell scripts.
SHELL=$lt_SHELL
@@ -23182,11 +23603,11 @@ $(LUA52_DEPEND): ${top_builddir}/../../libs/lua52/include/lua.h
${top_builddir}/../../libs/lua52/include/lua.h:
cd ${top_builddir}/../../libs/lua52 && $(MAKE) $(AM_MAKEFLAGS) rebuild'
-## _KPSE_LIB_FLAGS: Setup luajit (-lluajit) flags
+## _KPSE_LIB_FLAGS: Setup luajit (-ltexluajit) flags
LUAJIT_INCLUDES="-I$kpse_BLD/libs/luajit/include"
- LUAJIT_LIBS="$kpse_BLD/libs/luajit/libluajit.a"
- LUAJIT_DEPEND='${top_builddir}/../../libs/luajit/libluajit.a'
- LUAJIT_RULE='# Rebuild libluajit
+ LUAJIT_LIBS="$kpse_BLD/libs/luajit/libtexluajit.la"
+ LUAJIT_DEPEND='${top_builddir}/../../libs/luajit/libtexluajit.la'
+ LUAJIT_RULE='# Rebuild libtexluajit
$(LUAJIT_DEPEND): ${top_builddir}/../../libs/luajit/include/luajit.h
cd ${top_builddir}/../../libs/luajit && $(MAKE) $(AM_MAKEFLAGS) rebuild
${top_builddir}/../../libs/luajit/include/luajit.h:
@@ -24205,6 +24626,39 @@ ac_config_files="$ac_config_files ctangleboot-sh"
ac_config_files="$ac_config_files silent-sh"
+## texk/web2c/synctexdir/ac/synctex.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
+ if test "x$with_system_zlib" = xyes; then
+ SYSTEM_ZLIB_TRUE=
+ SYSTEM_ZLIB_FALSE='#'
+else
+ SYSTEM_ZLIB_TRUE='#'
+ SYSTEM_ZLIB_FALSE=
+fi
+
+
+ if test "x$enable_synctex" != xno; then
+ SYNCTEX_TRUE=
+ SYNCTEX_FALSE='#'
+else
+ SYNCTEX_TRUE='#'
+ SYNCTEX_FALSE=
+fi
+
+
+
+SYNCTEXVERSION=1.17.0
+
+
+SYNCTEX_LT_VERSINFO=18:0:17
+
+if test "x$enable_synctex" != xno; then :
+ WANTEDLIBS=libsynctex.la
+
+fi
+
+ac_config_files="$ac_config_files synctexdir/synctex.pc"
+
+
if test "x$host_alias" != x && test "x$build_alias" = x; then :
@@ -24505,6 +24959,14 @@ if test -z "${UPWEB_TRUE}" && test -z "${UPWEB_FALSE}"; then
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${SYSTEM_ZLIB_TRUE}" && test -z "${SYSTEM_ZLIB_FALSE}"; then
+ as_fn_error $? "conditional \"SYSTEM_ZLIB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${SYNCTEX_TRUE}" && test -z "${SYNCTEX_FALSE}"; then
+ as_fn_error $? "conditional \"SYNCTEX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
@@ -25110,6 +25572,7 @@ enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
@@ -25502,6 +25965,7 @@ do
"tangle-sh") CONFIG_FILES="$CONFIG_FILES tangle-sh" ;;
"ctangleboot-sh") CONFIG_FILES="$CONFIG_FILES ctangleboot-sh" ;;
"silent-sh") CONFIG_FILES="$CONFIG_FILES silent-sh" ;;
+ "synctexdir/synctex.pc") CONFIG_FILES="$CONFIG_FILES synctexdir/synctex.pc" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
@@ -26296,6 +26760,9 @@ pic_mode=$pic_mode
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
# Shell to use when invoking shell scripts.
SHELL=$lt_SHELL
diff --git a/source/texk/web2c/doc/Makefile.in b/source/texk/web2c/doc/Makefile.in
index 4915ac1520774fdd162e83bba4757beb9bde4bbd..0f66c96b90e48662ae6ea9982bd73b86daf3ec2d 100644
--- a/source/texk/web2c/doc/Makefile.in
+++ b/source/texk/web2c/doc/Makefile.in
@@ -96,6 +96,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
$(top_srcdir)/../../m4/kpse-lex.m4 \
+ $(top_srcdir)/../../m4/kpse-lib-version.m4 \
$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
$(top_srcdir)/../../m4/kpse-lt-hack.m4 \
$(top_srcdir)/../../m4/kpse-lua52-flags.m4 \
@@ -119,6 +120,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/ltversion.m4 \
$(top_srcdir)/../../m4/lt~obsolete.m4 \
$(top_srcdir)/../../version.ac $(top_srcdir)/ac/web2c.ac \
+ $(top_srcdir)/synctexdir/ac/synctex.ac \
+ $(top_srcdir)/synctexdir/synctex_parser_version.txt \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -346,6 +349,8 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+SYNCTEXVERSION = @SYNCTEXVERSION@
+SYNCTEX_LT_VERSINFO = @SYNCTEX_LT_VERSINFO@
TANGLE = @TANGLE@
TANGLEBOOT = @TANGLEBOOT@
TECKIT_DEPEND = @TECKIT_DEPEND@
@@ -353,6 +358,7 @@ TECKIT_INCLUDES = @TECKIT_INCLUDES@
TECKIT_LIBS = @TECKIT_LIBS@
TIE = @TIE@
VERSION = @VERSION@
+WANTEDLIBS = @WANTEDLIBS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WARNING_OBJCXXFLAGS = @WARNING_OBJCXXFLAGS@
diff --git a/source/texk/web2c/eptexdir/am/eptex.am b/source/texk/web2c/eptexdir/am/eptex.am
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..579e75428922db1537fda5748e54062386bbfd18 100644
--- a/source/texk/web2c/eptexdir/am/eptex.am
+++ b/source/texk/web2c/eptexdir/am/eptex.am
@@ -0,0 +1,110 @@
+## texk/web2c/eptexdir/am/eptex.am: Makefile fragment for e-pTeX.
+##
+## Copyright (C) 2011-2014 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+
+## e-pTeX
+##
+if EPTEX
+bin_PROGRAMS += eptex
+endif EPTEX
+EXTRA_PROGRAMS += eptex
+
+# e-pTeX Tests
+#
+eptex_tests = eptexdir/eptriptest
+
+EXTRA_DIST += $(eptex_tests)
+
+eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
+
+# With --enable-ipc, e-pTeX may need to link with -lsocket.
+eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) $(ipc_socketlibs)
+eptex_DEPENDENCIES = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies)
+
+# e-pTeX C sources
+eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h
+nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c
+dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h eptexdir/eptex_version.h
+
+# We must create eptexd.h and eptexdir/eptex_version.h before building the eptex_OBJECTS.
+eptex_prereq = eptexd.h etexdir/etex_version.h ptexdir/ptex_version.h eptexdir/eptex_version.h
+$(eptex_OBJECTS): $(eptex_prereq)
+
+$(eptex_c_h): eptex-web2c
+ @$(web2c) eptex
+eptex-web2c: eptex.p $(web2c_texmf) eptexdir/eptex.defines
+ @$(web2c) eptex
+
+eptex-pool.c: eptex.pool eptexd.h $(makecpool_stamp)
+ $(makecpool) eptex >$@ || rm -f $@
+
+# Tangling e-pTeX
+eptex.p eptex.pool: eptex-tangle
+ @$(texmf_tangle) eptex eptex
+eptex-tangle: tangle$(EXEEXT) eptex.web eptex.ch tangle-sh
+ @$(texmf_tangle) eptex eptex
+
+# Extract eptex version
+$(srcdir)/eptexdir/eptex_version.h: @MAINTAINER_MODE_TRUE@ eptexdir/eptex.ech
+ $(AM_V_GEN)grep '^@d epTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \
+ | sed "s/^.*'-/#define EPTEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Generate eptex.web
+eptex.web: tie$(EXEEXT) $(eptex_web_srcs)
+ $(tie) -m eptex.web $(eptex_web_srcs)
+eptex_web_srcs = \
+ tex.web \
+ etexdir/etex.ch \
+ etexdir/tex.ch0 \
+ tex.ch \
+ etexdir/tex.ech
+
+# Generate eptex.ch
+eptex.ch: tie$(EXEEXT) eptex.web $(eptex_ch_srcs)
+ $(tie) -c eptex.ch eptex.web $(eptex_ch_srcs)
+eptex_ch_srcs = \
+ eptexdir/eptex-base.ch \
+ eptexdir/etex.ch0 \
+ ptexdir/ptex-base.ch \
+ eptexdir/eptex.ech \
+ eptexdir/etex.ch1 \
+ $(eptex_ch_synctex) \
+ eptexdir/fam256.ch \
+ eptexdir/pdfutils.ch \
+ tex-binpool.ch
+
+EXTRA_DIST += $(eptex_web_srcs) $(eptex_ch_srcs) eptexdir/eptex.defines
+
+DISTCLEANFILES += $(nodist_eptex_SOURCES) eptex.web eptex.ch eptex-web2c \
+ eptex.p eptex.pool eptex-tangle
+
+##
+EXTRA_DIST += \
+ eptexdir/ChangeLog \
+ eptexdir/Changes.txt \
+ eptexdir/README.txt
+
+if EPTEX
+TESTS += $(eptex_tests)
+check_PROGRAMS += dvitype pltotf tftopl
+TRIPTRAP += eptrip.diffs
+TRIPTRAP_CLEAN += eptrip-clean
+endif EPTEX
+
+## Test data and results
+##
+## eptexdir/eptriptest
+EXTRA_DIST += \
+ eptexdir/eptrip/eptrip.diffs \
+ eptexdir/eptrip/eptrip.log \
+ eptexdir/eptrip/eptrip.tex \
+ eptexdir/eptrip/texmf.cnf
+eptrip.diffs: eptex$(EXEEXT)
+ $(triptrap_diffs) $@
+.PHONY: eptrip-clean
+eptrip-clean:
+ rm -rf eptripdir
+
+DISTCLEANFILES += eptrip.diffs
+
diff --git a/source/texk/web2c/etexdir/am/etex.am b/source/texk/web2c/etexdir/am/etex.am
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..05d86297c22791e32338fe879c084a676d3fe07b 100644
--- a/source/texk/web2c/etexdir/am/etex.am
+++ b/source/texk/web2c/etexdir/am/etex.am
@@ -0,0 +1,115 @@
+## texk/web2c/etexdir/am/etex.am: Makefile fragment for e-TeX.
+##
+## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+
+## e-TeX
+##
+if ETEX
+bin_PROGRAMS += etex
+endif ETEX
+EXTRA_PROGRAMS += etex
+
+etex_CPPFLAGS = $(AM_CPPFLAGS)
+
+# With --enable-ipc, e-TeX may need to link with -lsocket.
+etex_LDADD = $(LDADD) $(ipc_socketlibs)
+
+# e-TeX C sources
+etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
+nodist_etex_SOURCES = $(etex_c_h) etex-pool.c
+dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h etexdir/etex_version.h
+
+# We must create etexd.h and etexdir/etex_version.h before building the etex_OBJECTS.
+etex_prereq = etexd.h etexdir/etex_version.h
+$(etex_OBJECTS): $(etex_prereq)
+
+$(etex_c_h): etex-web2c
+ @$(web2c) etex
+etex-web2c: etex.p $(web2c_texmf)
+ @$(web2c) etex
+
+etex-pool.c: etex.pool etexd.h $(makecpool_stamp)
+ $(makecpool) etex >$@ || rm -f $@
+
+# Tangling e-TeX
+etex.p etex.pool: etex-tangle
+ @$(texmf_tangle) etex etex
+etex-tangle: tangle$(EXEEXT) etex.web etex.ch tangle-sh
+ @$(texmf_tangle) etex etex
+
+# Extract etex version
+$(srcdir)/etexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ etexdir/etex.ch
+ $(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
+ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Generate etex.web
+etex.web: tie$(EXEEXT) $(etex_web_srcs)
+ $(tie) -m etex.web $(etex_web_srcs)
+etex_web_srcs = \
+ tex.web \
+ etexdir/etex.ch
+
+# Generate etex.ch
+etex.ch: tie$(EXEEXT) etex.web $(etex_ch_srcs)
+ $(tie) -c etex.ch etex.web $(etex_ch_srcs)
+etex_ch_srcs = \
+ etexdir/tex.ch0 \
+ tex.ch \
+ enctex.ch \
+ $(etex_ch_synctex) \
+ etexdir/tex.ch1 \
+ etexdir/tex.ech \
+ tex-binpool.ch
+##
+EXTRA_DIST += $(etex_web_srcs) $(etex_ch_srcs)
+
+DISTCLEANFILES += $(nodist_etex_SOURCES) etex.web etex.ch etex-web2c \
+ etex.p etex.pool etex-tangle
+
+EXTRA_DIST += \
+ etexdir/ChangeLog \
+ etexdir/etex_gen.tex
+
+# e-TeX Tests
+#
+etex_tests = etexdir/wprob.test etexdir/etriptest
+
+EXTRA_DIST += $(etex_tests)
+
+if ETEX
+TESTS += $(etex_tests)
+check_PROGRAMS += dvitype pltotf tftopl
+TRIPTRAP += etrip.diffs
+TRIPTRAP_CLEAN += etrip-clean
+endif ETEX
+DISTCLEANFILES += etrip.diffs
+
+## wprob.test
+EXTRA_DIST += tests/wprob.tex
+DISTCLEANFILES += ewprob.log ewprob.tex
+## etriptest
+etrip.diffs: etex$(EXEEXT)
+ $(triptrap_diffs) $@
+.PHONY: etrip-clean
+etrip-clean:
+ rm -rf etripdir
+
+## Test data
+##
+EXTRA_DIST += \
+ etexdir/etrip/etrip.diffs \
+ etexdir/etrip/etrip.fot \
+ etexdir/etrip/etrip.log \
+ etexdir/etrip/etrip.out \
+ etexdir/etrip/etrip.pl \
+ etexdir/etrip/etrip.tex \
+ etexdir/etrip/etrip.typ \
+ etexdir/etrip/etrip1.in \
+ etexdir/etrip/etrip2.in \
+ etexdir/etrip/etrip3.in \
+ etexdir/etrip/etripin.log \
+ etexdir/etrip/etripman.tex \
+ etexdir/etrip/texmf.cnf \
+ etexdir/etrip/trip2.in
+
diff --git a/source/texk/web2c/euptexdir/am/euptex.am b/source/texk/web2c/euptexdir/am/euptex.am
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..6cb847d055ed38af6fa66c5ada144ca4f508bc7a 100644
--- a/source/texk/web2c/euptexdir/am/euptex.am
+++ b/source/texk/web2c/euptexdir/am/euptex.am
@@ -0,0 +1,111 @@
+## texk/web2c/euptexdir/am/euptex.am: Makefile fragment for e-upTeX.
+##
+## Copyright (C) 2011-2014 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+
+## e-upTeX
+##
+if EUPTEX
+bin_PROGRAMS += euptex
+endif EUPTEX
+EXTRA_PROGRAMS += euptex
+
+# e-upTeX Tests
+#
+euptex_tests = euptexdir/euptriptest
+
+EXTRA_DIST += $(euptex_tests)
+
+euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
+
+# With --enable-ipc, e-upTeX may need to link with -lsocket.
+euptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) $(ipc_socketlibs)
+euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies)
+
+# e-upTeX C sources
+euptex_c_h = euptexini.c euptex0.c euptexcoerce.h euptexd.h
+nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c
+dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h
+
+# We must create euptexd.h and [eu]ptexdir/[eu]ptex_version.h before building the euptex_OBJECTS.
+euptex_prereq = euptexd.h etexdir/etex_version.h ptexdir/ptex_version.h \
+ eptexdir/eptex_version.h uptexdir/uptex_version.h
+$(euptex_OBJECTS): $(euptex_prereq)
+
+$(euptex_c_h): euptex-web2c
+ @$(web2c) euptex
+euptex-web2c: euptex.p $(web2c_texmf) euptexdir/euptex.defines
+ @$(web2c) euptex
+
+euptex-pool.c: euptex.pool euptexd.h $(makecpool_stamp)
+ $(makecpool) euptex >$@ || rm -f $@
+
+# Tangling e-upTeX
+euptex.p euptex.pool: euptex-tangle
+ @$(texmf_tangle) euptex euptex
+euptex-tangle: tangle$(EXEEXT) euptex.web euptex.ch tangle-sh
+ @$(texmf_tangle) euptex euptex
+
+# Generate euptex.web
+euptex.web: tie$(EXEEXT) $(euptex_web_srcs)
+ $(tie) -m euptex.web $(euptex_web_srcs)
+euptex_web_srcs = \
+ tex.web \
+ etexdir/etex.ch \
+ etexdir/tex.ch0 \
+ tex.ch \
+ etexdir/tex.ech
+
+# Generate euptex.ch
+euptex.ch: tie$(EXEEXT) euptex.web $(euptex_ch_srcs)
+ $(tie) -c euptex.ch euptex.web $(euptex_ch_srcs)
+euptex_ch_srcs = \
+ eptexdir/etex.ch0 \
+ ptexdir/ptex-base.ch \
+ uptexdir/uptex-m.ch \
+ euptexdir/euptex.ch0 \
+ eptexdir/eptex.ech \
+ euptexdir/euptex.ch1 \
+ eptexdir/etex.ch1 \
+ $(euptex_ch_synctex) \
+ eptexdir/fam256.ch \
+ euptexdir/pdfstrcmp-eup-pre.ch \
+ eptexdir/pdfutils.ch \
+ euptexdir/pdfstrcmp-eup-post.ch \
+ tex-binpool.ch
+
+EXTRA_DIST += $(euptex_web_srcs) $(euptex_ch_srcs) euptexdir/euptex.defines
+
+DISTCLEANFILES += $(nodist_euptex_SOURCES) euptex.web euptex.ch euptex-web2c \
+ euptex.p euptex.pool euptex-tangle
+
+##
+EXTRA_DIST += \
+ euptexdir/COPYRIGHT \
+ euptexdir/COPYRIGHT.jis \
+ euptexdir/ChangeLog \
+ euptexdir/EUPTEX.txt
+
+if EUPTEX
+TESTS += $(euptex_tests)
+check_PROGRAMS += dvitype pltotf tftopl
+TRIPTRAP += euptrip.diffs
+TRIPTRAP_CLEAN += euptrip-clean
+endif EUPTEX
+
+## Test data and results
+##
+## eptexdir/eptriptest
+EXTRA_DIST += \
+ eptexdir/eptrip/eptrip.log \
+ eptexdir/eptrip/eptrip.tex \
+ euptexdir/euptrip/euptrip.diffs \
+ euptexdir/euptrip/texmf.cnf
+euptrip.diffs: euptex$(EXEEXT)
+ $(triptrap_diffs) $@
+.PHONY: euptrip-clean
+euptrip-clean:
+ rm -rf euptripdir
+
+DISTCLEANFILES += euptrip.diffs
+
diff --git a/source/texk/web2c/lib/ChangeLog b/source/texk/web2c/lib/ChangeLog
index 566d6d43aac2103d0836b6ed3e8b364ad0b9a764..99eb4bb6b6b2d55e4cee70c82aa3154aedb8f067 100644
--- a/source/texk/web2c/lib/ChangeLog
+++ b/source/texk/web2c/lib/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-06 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * texmfmp.c: Avoid MinGW64 warnings (INVALID_SOCKET => -1).
+
2014-11-03 Akira Kakuto <kakuto@fuk.kinidai.ac.jp>
* texmfmp.c: Indentation.
diff --git a/source/texk/web2c/lib/Makefile.in b/source/texk/web2c/lib/Makefile.in
index d7f16b355baff4f427a0214a70eb2c960dd7cce5..ba53b1c38857f1f54e272f3890c34d9973f2a7a9 100644
--- a/source/texk/web2c/lib/Makefile.in
+++ b/source/texk/web2c/lib/Makefile.in
@@ -97,6 +97,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
$(top_srcdir)/../../m4/kpse-lex.m4 \
+ $(top_srcdir)/../../m4/kpse-lib-version.m4 \
$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
$(top_srcdir)/../../m4/kpse-lt-hack.m4 \
$(top_srcdir)/../../m4/kpse-lua52-flags.m4 \
@@ -120,6 +121,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/ltversion.m4 \
$(top_srcdir)/../../m4/lt~obsolete.m4 \
$(top_srcdir)/../../version.ac $(top_srcdir)/ac/web2c.ac \
+ $(top_srcdir)/synctexdir/ac/synctex.ac \
+ $(top_srcdir)/synctexdir/synctex_parser_version.txt \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -342,6 +345,8 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+SYNCTEXVERSION = @SYNCTEXVERSION@
+SYNCTEX_LT_VERSINFO = @SYNCTEX_LT_VERSINFO@
TANGLE = @TANGLE@
TANGLEBOOT = @TANGLEBOOT@
TECKIT_DEPEND = @TECKIT_DEPEND@
@@ -349,6 +354,7 @@ TECKIT_INCLUDES = @TECKIT_INCLUDES@
TECKIT_LIBS = @TECKIT_LIBS@
TIE = @TIE@
VERSION = @VERSION@
+WANTEDLIBS = @WANTEDLIBS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WARNING_OBJCXXFLAGS = @WARNING_OBJCXXFLAGS@
diff --git a/source/texk/web2c/lib/texmfmp.c b/source/texk/web2c/lib/texmfmp.c
index 7d224726e59e06d1eb76d5743cbd01058446f4a1..00e32e6328323499d3bdaa6cf08df40aa9674450 100644
--- a/source/texk/web2c/lib/texmfmp.c
+++ b/source/texk/web2c/lib/texmfmp.c
@@ -1127,10 +1127,7 @@ ipc_make_name (void)
return ipc_addr_len;
}
-#ifndef INVALID_SOCKET
-# define INVALID_SOCKET (-1)
-#endif
-static int sock = INVALID_SOCKET;
+static int sock = -1;
#ifdef WIN32
# define CLOSE_SOCKET(s) closesocket (s); WSACleanup ()
@@ -1141,7 +1138,7 @@ static int sock = INVALID_SOCKET;
static int
ipc_is_open (void)
{
- return sock != INVALID_SOCKET;
+ return sock != -1;
}
static void
@@ -1154,7 +1151,7 @@ ipc_open_out (void) {
#ifdef IPC_DEBUG
fputs ("tex: Opening socket for IPC output ...\n", stderr);
#endif
- if (sock != INVALID_SOCKET) {
+ if (sock != -1) {
return;
}
@@ -1170,13 +1167,13 @@ ipc_open_out (void) {
sock = socket (IPC_AF, SOCK_STREAM, 0);
#ifdef IPC_DEBUG
- if(sock != INVALID_SOCKET)
+ if(sock != -1)
fprintf(stderr, "tex: Socket handle is %d\n", sock);
else
fprintf(stderr, "tex: Socket is invalid.\n");
#endif
- if (sock != INVALID_SOCKET) {
+ if (sock != -1) {
if (connect (sock, ipc_addr, ipc_addr_len) != 0 ||
#ifdef WIN32
ioctlsocket (sock, FIONBIO, &mode) < 0
@@ -1185,7 +1182,7 @@ ipc_open_out (void) {
#endif
) {
CLOSE_SOCKET (sock);
- sock = INVALID_SOCKET;
+ sock = -1;
#ifdef IPC_DEBUG
fputs ("tex: IPC socket cannot be connected.\n", stderr);
fputs ("tex: Socket is closed.\n", stderr);
@@ -1206,7 +1203,7 @@ ipc_close_out (void)
#endif
if (ipc_is_open ()) {
CLOSE_SOCKET (sock);
- sock = INVALID_SOCKET;
+ sock = -1;
}
}
diff --git a/source/texk/web2c/luatexdir/lua/lnodelib.c b/source/texk/web2c/luatexdir/lua/lnodelib.c
index 7af2eea0b93a1a0050a0363ddaf6adc172536dd4..c9e0d56060c98dfe089c8613266e64ede402221e 100644
--- a/source/texk/web2c/luatexdir/lua/lnodelib.c
+++ b/source/texk/web2c/luatexdir/lua/lnodelib.c
@@ -4179,7 +4179,7 @@ static int lua_nodelib_has_glyph(lua_State * L)
halfword *a;
halfword h = (halfword) *(check_isnode(L,1)) ;
while (h != null) {
- if (type(h) == glyph_node) {
+ if ( (type(h) == glyph_node) || (type(h) == disc_node)) {
fast_metatable(h);
return 1;
} else {
@@ -4196,7 +4196,7 @@ static int lua_nodelib_direct_has_glyph(lua_State * L)
{
halfword h = (halfword) lua_tonumber(L,1) ;
while (h != null) {
- if (type(h) == glyph_node) {
+ if ((type(h) == glyph_node) || (type(h) == disc_node)) {
nodelib_pushdirect(h);
return 1;
} else {
diff --git a/source/texk/web2c/man/ChangeLog b/source/texk/web2c/man/ChangeLog
index 9893f36b5a343496ab5efcf27b3db90f3aff9c65..f2e1d058dfa07d4dd3a042b123b57af1e7a1f927 100644
--- a/source/texk/web2c/man/ChangeLog
+++ b/source/texk/web2c/man/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-02 Karl Berry <karl@tug.org>
+
+ * patgen.man: Kuiken's ushyphmax.tex not in TL for some years.
+ (Report from Mojca.)
+
2011-04-12 Taco Hoekwater <taco@metapost.org>
* luatex.man: update to version 0.70
diff --git a/source/texk/web2c/man/Makefile.in b/source/texk/web2c/man/Makefile.in
index 423415a6246901842e411caf0c2f4257245c4416..0920773a57a1d34baf1ac2624b132c6105f989da 100644
--- a/source/texk/web2c/man/Makefile.in
+++ b/source/texk/web2c/man/Makefile.in
@@ -111,6 +111,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
$(top_srcdir)/../../m4/kpse-lex.m4 \
+ $(top_srcdir)/../../m4/kpse-lib-version.m4 \
$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
$(top_srcdir)/../../m4/kpse-lt-hack.m4 \
$(top_srcdir)/../../m4/kpse-lua52-flags.m4 \
@@ -134,6 +135,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/ltversion.m4 \
$(top_srcdir)/../../m4/lt~obsolete.m4 \
$(top_srcdir)/../../version.ac $(top_srcdir)/ac/web2c.ac \
+ $(top_srcdir)/synctexdir/ac/synctex.ac \
+ $(top_srcdir)/synctexdir/synctex_parser_version.txt \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -323,6 +326,8 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+SYNCTEXVERSION = @SYNCTEXVERSION@
+SYNCTEX_LT_VERSINFO = @SYNCTEX_LT_VERSINFO@
TANGLE = @TANGLE@
TANGLEBOOT = @TANGLEBOOT@
TECKIT_DEPEND = @TECKIT_DEPEND@
@@ -330,6 +335,7 @@ TECKIT_INCLUDES = @TECKIT_INCLUDES@
TECKIT_LIBS = @TECKIT_LIBS@
TIE = @TIE@
VERSION = @VERSION@
+WANTEDLIBS = @WANTEDLIBS@
WARNING_CFLAGS = @WARNING_CFLAGS@
WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
WARNING_OBJCXXFLAGS = @WARNING_OBJCXXFLAGS@
diff --git a/source/texk/web2c/man/patgen.man b/source/texk/web2c/man/patgen.man
index c8cdc12a975cd12d65cb40f01aa05ff22cc6a745..36bc1f7d057557d3adb085a779d7d70ede3c4221 100644
--- a/source/texk/web2c/man/patgen.man
+++ b/source/texk/web2c/man/patgen.man
@@ -1,4 +1,4 @@
-.TH PATGEN 1 "7 April 2010" "Web2C @VERSION@"
+.TH PATGEN 1 "2 December 2014" "Web2C @VERSION@"
.\"=====================================================================
.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
.if n .ds TX TeX
@@ -22,7 +22,9 @@ patgen \- generate patterns for TeX hyphenation
.SH DESCRIPTION
This manual page is not meant to be exhaustive.
See also the Info file or manual
-.IR "Web2C: A TeX implementation" .
+.I "Web2C: A TeX implementation"
+available as part of the TeX Live distribution or at
+.IR http://tug.org/web2c .
.PP
The
.I patgen
@@ -162,11 +164,14 @@ produce a hyphenated word list.
The original hyphenation patterns for English, by Donald Knuth and Frank
Liang.
.TP
-.I $TEXMFMAIN/tex/generic/hyphen/ushyphmax.tex
-Maximal hyphenation patterns for English, extended by Gerard Kuiken.
+.I http://www.ctan.org/pkg/ushyph
+Additional hyphenation patterns for English, extended by Gerard Kuiken.
+.TP
+.I http://www.ctan.org/pkg/hyph-utf8
+Collected hyphenation patterns for many languages in many formats.
.TP
.I http://www.ctan.org/tex-archive/language/
-Patterns and support for many other languages
+General CTAN directory for patterns and support for many other languages.
.\"=====================================================================
.SH "SEE ALSO"
Frank Liang and Peter Breitenlohner,
diff --git a/source/texk/web2c/mplibdir/ChangeLog b/source/texk/web2c/mplibdir/ChangeLog
index 1db36e644ac8ba675e570c778bf4c7d7b8ea6bba..2b91f635e35127c2835bedd74cb40fa0901f1007 100644
--- a/source/texk/web2c/mplibdir/ChangeLog
+++ b/source/texk/web2c/mplibdir/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-04 Luigi Scarso <luigi.scarso@gmail.com>
+
+ * mpost.w: fixed exit values to match metafont/old metapost behavior.
+ (thanks to Wojciech A. Koszek <wkoszek@freebsd.org>).
+
2014-11-05 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* psout.w: Sync with the trunk. Luigi fixes to avoid enormous number
diff --git a/source/texk/web2c/mplibdir/mpost.w b/source/texk/web2c/mplibdir/mpost.w
index 2ead2724b28610056b260ac7a5c503447c5e6e9c..7c9e24b60537495faeb4e7a8652c47f5e388baf4 100644
--- a/source/texk/web2c/mplibdir/mpost.w
+++ b/source/texk/web2c/mplibdir/mpost.w
@@ -1,4 +1,4 @@
-% $Id: mpost.w 2007 2014-04-10 11:13:03Z taco $
+% $Id: mpost.w 2048 2014-12-04 10:26:26Z luigi $
%
% This file is part of MetaPost;
% the MetaPost program is in the public domain.
@@ -1380,13 +1380,15 @@ main (int argc, char **argv)
if (mp==NULL)
exit(EXIT_FAILURE);
history = mp_status(mp);
- if (history!=0)
+ if (history!=0 && history!=mp_warning_issued)
exit(history);
if (set_list!=NULL) {
run_set_list(mp);
}
history = mp_run(mp);
(void)mp_finish(mp);
- exit(history);
+ if (history!=0 && history!=mp_warning_issued)
+ exit(history);
+ else
+ exit(0);
}
-
diff --git a/source/texk/web2c/omegafonts/Makefile.in b/source/texk/web2c/omegafonts/Makefile.in
index 1263948fb882b8c4fd639b01e17969c825e79619..0a214f48c68d4f140581567759c650e659e19de1 100644
--- a/source/texk/web2c/omegafonts/Makefile.in
+++ b/source/texk/web2c/omegafonts/Makefile.in
@@ -1 +1,1345 @@
-all:
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+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 \
+ $(top_srcdir)/../../m4/kpse-asm.m4 \
+ $(top_srcdir)/../../m4/kpse-cairo-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-common.m4 \
+ $(top_srcdir)/../../m4/kpse-cross.m4 \
+ $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
+ $(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-gmp-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-graphite2-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-icu-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-lex.m4 \
+ $(top_srcdir)/../../m4/kpse-lib-version.m4 \
+ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-lt-hack.m4 \
+ $(top_srcdir)/../../m4/kpse-lua52-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-luajit-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \
+ $(top_srcdir)/../../m4/kpse-mpfr-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-pixman-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-poppler-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-socket-libs.m4 \
+ $(top_srcdir)/../../m4/kpse-teckit-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-warnings.m4 \
+ $(top_srcdir)/../../m4/kpse-web2c.m4 \
+ $(top_srcdir)/../../m4/kpse-win32.m4 \
+ $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-zziplib-flags.m4 \
+ $(top_srcdir)/../../m4/libtool.m4 \
+ $(top_srcdir)/../../m4/ltoptions.m4 \
+ $(top_srcdir)/../../m4/ltsugar.m4 \
+ $(top_srcdir)/../../m4/ltversion.m4 \
+ $(top_srcdir)/../../m4/lt~obsolete.m4 \
+ $(top_srcdir)/../../version.ac $(top_srcdir)/ac/web2c.ac \
+ $(top_srcdir)/synctexdir/ac/synctex.ac \
+ $(top_srcdir)/synctexdir/synctex_parser_version.txt \
+ $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/w2c/c-auto.h \
+ $(top_builddir)/ff-config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+@OTANGLE_TRUE@am__EXEEXT_1 = omfonts$(EXEEXT)
+am__installdirs = "$(DESTDIR)$(bindir)"
+PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+am__dirstamp = $(am__leading_dot)dirstamp
+nodist_call_omfonts_OBJECTS = ../call_omfonts-callexe.$(OBJEXT)
+call_omfonts_OBJECTS = $(nodist_call_omfonts_OBJECTS)
+call_omfonts_DEPENDENCIES =
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 =
+am_omfonts_OBJECTS = char_routines.$(OBJEXT) dimen_routines.$(OBJEXT) \
+ error_routines.$(OBJEXT) extra_routines.$(OBJEXT) \
+ font_routines.$(OBJEXT) header_routines.$(OBJEXT) \
+ ligkern_routines.$(OBJEXT) list_routines.$(OBJEXT) \
+ omfonts.$(OBJEXT) out_ofm.$(OBJEXT) out_routines.$(OBJEXT) \
+ param_routines.$(OBJEXT) parse_ofm.$(OBJEXT) \
+ pl-parser.$(OBJEXT) pl-lexer.$(OBJEXT) \
+ print_routines.$(OBJEXT)
+omfonts_OBJECTS = $(am_omfonts_OBJECTS)
+omfonts_LDADD = $(LDADD)
+am__DEPENDENCIES_1 =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/w2c -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
+@MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ ||
+LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS)
+LTLEXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(LEX) $(AM_LFLAGS) $(LFLAGS)
+AM_V_LEX = $(am__v_LEX_@AM_V@)
+am__v_LEX_ = $(am__v_LEX_@AM_DEFAULT_V@)
+am__v_LEX_0 = @echo " LEX " $@;
+am__v_LEX_1 =
+YLWRAP = $(top_srcdir)/../../build-aux/ylwrap
+@MAINTAINER_MODE_FALSE@am__skipyacc = test -f $@ ||
+am__yacc_c2h = sed -e s/cc$$/hh/ -e s/cpp$$/hpp/ -e s/cxx$$/hxx/ \
+ -e s/c++$$/h++/ -e s/c$$/h/
+YACCCOMPILE = $(YACC) $(AM_YFLAGS) $(YFLAGS)
+LTYACCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(YACC) $(AM_YFLAGS) $(YFLAGS)
+AM_V_YACC = $(am__v_YACC_@AM_V@)
+am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@)
+am__v_YACC_0 = @echo " YACC " $@;
+am__v_YACC_1 =
+SOURCES = $(nodist_call_omfonts_SOURCES) $(omfonts_SOURCES)
+DIST_SOURCES = $(omfonts_SOURCES)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__tty_colors_dummy = \
+ mgn= red= grn= lgn= blu= brg= std=; \
+ am__color_tests=no
+am__tty_colors = { \
+ $(am__tty_colors_dummy); \
+ if test "X$(AM_COLOR_TESTS)" = Xno; then \
+ am__color_tests=no; \
+ elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+ am__color_tests=yes; \
+ elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+ am__color_tests=yes; \
+ fi; \
+ if test $$am__color_tests = yes; then \
+ red='[0;31m'; \
+ grn='[0;32m'; \
+ lgn='[1;32m'; \
+ blu='[1;34m'; \
+ mgn='[0;35m'; \
+ brg='[1m'; \
+ std='[m'; \
+ fi; \
+}
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+am__recheck_rx = ^[ ]*:recheck:[ ]*
+am__global_test_result_rx = ^[ ]*:global-test-result:[ ]*
+am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+ recheck = 1; \
+ while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+ { \
+ if (rc < 0) \
+ { \
+ if ((getline line2 < ($$0 ".log")) < 0) \
+ recheck = 0; \
+ break; \
+ } \
+ else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+ { \
+ recheck = 0; \
+ break; \
+ } \
+ else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+ { \
+ break; \
+ } \
+ }; \
+ if (recheck) \
+ print $$0; \
+ close ($$0 ".trs"); \
+ close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+ print "fatal: making $@: " msg | "cat >&2"; \
+ exit 1; \
+} \
+function rst_section(header) \
+{ \
+ print header; \
+ len = length(header); \
+ for (i = 1; i <= len; i = i + 1) \
+ printf "="; \
+ printf "\n\n"; \
+} \
+{ \
+ copy_in_global_log = 1; \
+ global_test_result = "RUN"; \
+ while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+ { \
+ if (rc < 0) \
+ fatal("failed to read from " $$0 ".trs"); \
+ if (line ~ /$(am__global_test_result_rx)/) \
+ { \
+ sub("$(am__global_test_result_rx)", "", line); \
+ sub("[ ]*$$", "", line); \
+ global_test_result = line; \
+ } \
+ else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+ copy_in_global_log = 0; \
+ }; \
+ if (copy_in_global_log) \
+ { \
+ rst_section(global_test_result ": " $$0); \
+ while ((rc = (getline line < ($$0 ".log"))) != 0) \
+ { \
+ if (rc < 0) \
+ fatal("failed to read from " $$0 ".log"); \
+ print line; \
+ }; \
+ printf "\n"; \
+ }; \
+ close ($$0 ".trs"); \
+ close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+ --color-tests "$$am__color_tests" \
+ --enable-hard-errors "$$am__enable_hard_errors" \
+ --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test. Creates the
+# directory for the log if needed. Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log. Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT. Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup); \
+$(am__vpath_adj_setup) $(am__vpath_adj) \
+$(am__tty_colors); \
+srcdir=$(srcdir); export srcdir; \
+case "$@" in \
+ */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \
+ *) am__odir=.;; \
+esac; \
+test "x$$am__odir" = x"." || test -d "$$am__odir" \
+ || $(MKDIR_P) "$$am__odir" || exit $$?; \
+if test -f "./$$f"; then dir=./; \
+elif test -f "$$f"; then dir=; \
+else dir="$(srcdir)/"; fi; \
+tst=$$dir$$f; log='$@'; \
+if test -n '$(DISABLE_HARD_ERRORS)'; then \
+ am__enable_hard_errors=no; \
+else \
+ am__enable_hard_errors=yes; \
+fi; \
+case " $(XFAIL_TESTS) " in \
+ *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \
+ am__expect_failure=yes;; \
+ *) \
+ am__expect_failure=no;; \
+esac; \
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed). The result is saved in the shell variable
+# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+ bases='$(TEST_LOGS)'; \
+ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+ bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+ $(TEST_LOG_FLAGS)
+am__set_b = \
+ case '$@' in \
+ */*) \
+ case '$*' in \
+ */*) b='$*';; \
+ *) b=`echo '$@' | sed 's/\.log$$//'`; \
+ esac;; \
+ *) \
+ b='$*';; \
+ esac
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CAIRO_DEPEND = @CAIRO_DEPEND@
+CAIRO_INCLUDES = @CAIRO_INCLUDES@
+CAIRO_LIBS = @CAIRO_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CTANGLE = @CTANGLE@
+CTANGLEBOOT = @CTANGLEBOOT@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FONTCONFIG_INCLUDES = @FONTCONFIG_INCLUDES@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
+FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
+FREETYPE2_LIBS = @FREETYPE2_LIBS@
+FT2_CONFIG = @FT2_CONFIG@
+GMP_DEPEND = @GMP_DEPEND@
+GMP_INCLUDES = @GMP_INCLUDES@
+GMP_LIBS = @GMP_LIBS@
+GRAPHITE2_DEPEND = @GRAPHITE2_DEPEND@
+GRAPHITE2_INCLUDES = @GRAPHITE2_INCLUDES@
+GRAPHITE2_LIBS = @GRAPHITE2_LIBS@
+GREP = @GREP@
+HARFBUZZ_DEPEND = @HARFBUZZ_DEPEND@
+HARFBUZZ_INCLUDES = @HARFBUZZ_INCLUDES@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+ICU_CONFIG = @ICU_CONFIG@
+ICU_DEPEND = @ICU_DEPEND@
+ICU_INCLUDES = @ICU_INCLUDES@
+ICU_LIBS = @ICU_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
+KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
+KPATHSEA_LIBS = @KPATHSEA_LIBS@
+KPATHSEA_PATHS_H = @KPATHSEA_PATHS_H@
+KPSEWHICH = @KPSEWHICH@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBPNG_DEPEND = @LIBPNG_DEPEND@
+LIBPNG_INCLUDES = @LIBPNG_INCLUDES@
+LIBPNG_LIBS = @LIBPNG_LIBS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LUA52_DEFINES = @LUA52_DEFINES@
+LUA52_DEPEND = @LUA52_DEPEND@
+LUA52_INCLUDES = @LUA52_INCLUDES@
+LUA52_LIBS = @LUA52_LIBS@
+LUAJIT_DEFINES = @LUAJIT_DEFINES@
+LUAJIT_DEPEND = @LUAJIT_DEPEND@
+LUAJIT_INCLUDES = @LUAJIT_INCLUDES@
+LUAJIT_LDEXTRA = @LUAJIT_LDEXTRA@
+LUAJIT_LIBS = @LUAJIT_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MPFR_DEPEND = @MPFR_DEPEND@
+MPFR_INCLUDES = @MPFR_INCLUDES@
+MPFR_LIBS = @MPFR_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJCXX = @OBJCXX@
+OBJCXXDEPMODE = @OBJCXXDEPMODE@
+OBJCXXFLAGS = @OBJCXXFLAGS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTANGLE = @OTANGLE@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PIXMAN_DEPEND = @PIXMAN_DEPEND@
+PIXMAN_INCLUDES = @PIXMAN_INCLUDES@
+PIXMAN_LIBS = @PIXMAN_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+POPPLER_DEPEND = @POPPLER_DEPEND@
+POPPLER_INCLUDES = @POPPLER_INCLUDES@
+POPPLER_LIBS = @POPPLER_LIBS@
+PTEXENC_DEPEND = @PTEXENC_DEPEND@
+PTEXENC_INCLUDES = @PTEXENC_INCLUDES@
+PTEXENC_LIBS = @PTEXENC_LIBS@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+SYNCTEXVERSION = @SYNCTEXVERSION@
+SYNCTEX_LT_VERSINFO = @SYNCTEX_LT_VERSINFO@
+TANGLE = @TANGLE@
+TANGLEBOOT = @TANGLEBOOT@
+TECKIT_DEPEND = @TECKIT_DEPEND@
+TECKIT_INCLUDES = @TECKIT_INCLUDES@
+TECKIT_LIBS = @TECKIT_LIBS@
+TIE = @TIE@
+VERSION = @VERSION@
+WANTEDLIBS = @WANTEDLIBS@
+WARNING_CFLAGS = @WARNING_CFLAGS@
+WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
+WARNING_OBJCXXFLAGS = @WARNING_OBJCXXFLAGS@
+WEB2CVERSION = @WEB2CVERSION@
+XMKMF = @XMKMF@
+XPDF_DEPEND = @XPDF_DEPEND@
+XPDF_INCLUDES = @XPDF_INCLUDES@
+XPDF_LIBS = @XPDF_LIBS@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+ZLIB_DEPEND = @ZLIB_DEPEND@
+ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ZLIB_LIBS = @ZLIB_LIBS@
+ZZIPLIB_DEPEND = @ZZIPLIB_DEPEND@
+ZZIPLIB_INCLUDES = @ZZIPLIB_INCLUDES@
+ZZIPLIB_LIBS = @ZZIPLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_OBJCXX = @ac_ct_OBJCXX@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+ipc_socketlibs = @ipc_socketlibs@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lua_socketlibs = @lua_socketlibs@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+subdirs = @subdirs@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+wlibs = @wlibs@
+x_ext_lib = @x_ext_lib@
+x_tool_libs = @x_tool_libs@
+AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES) -DNOT_WEB2C
+AM_CFLAGS = $(WARNING_CFLAGS)
+AM_YFLAGS = -d -v
+proglib = ../lib/lib.a
+omfonts_SOURCES = \
+ char_routines.c \
+ char_routines.h \
+ dimen_routines.c \
+ dimen_routines.h \
+ dvi.h \
+ error_routines.c \
+ error_routines.h \
+ extra_routines.c \
+ extra_routines.h \
+ font_routines.c \
+ font_routines.h \
+ header_routines.c \
+ header_routines.h \
+ ligkern_routines.c \
+ ligkern_routines.h \
+ list_routines.c \
+ list_routines.h \
+ manifests.h \
+ omfonts.c \
+ omfonts.h \
+ out_ofm.c \
+ out_ofm.h \
+ out_routines.c \
+ out_routines.h \
+ param_routines.c \
+ param_routines.h \
+ parse_ofm.c \
+ parse_ofm.h \
+ parser.h \
+ pl-parser.y \
+ pl-lexer.l \
+ print_routines.c \
+ print_routines.h
+
+LDADD = $(proglib) $(KPATHSEA_LIBS)
+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*
+linked_programs = ofm2opl opl2ofm ovf2ovp ovp2ovf
+bin_links = \
+ omfonts$(EXEEXT):ofm2opl \
+ omfonts$(EXEEXT):opl2ofm \
+ omfonts$(EXEEXT):ovf2ovp \
+ omfonts$(EXEEXT):ovp2ovf
+
+OMFONTS_tests = 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
+
+@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
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .l .lo .log .o .obj .test .test$(EXEEXT) .trs .y
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../../am/bin_links.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ 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*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ 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_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p \
+ || test -f $$p1 \
+ ; then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' \
+ -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+uninstall-binPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' \
+ `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+ @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
+
+clean-noinstPROGRAMS:
+ @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
+../$(am__dirstamp):
+ @$(MKDIR_P) ..
+ @: > ../$(am__dirstamp)
+../$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) ../$(DEPDIR)
+ @: > ../$(DEPDIR)/$(am__dirstamp)
+../call_omfonts-callexe.$(OBJEXT): ../$(am__dirstamp) \
+ ../$(DEPDIR)/$(am__dirstamp)
+
+call_omfonts$(EXEEXT): $(call_omfonts_OBJECTS) $(call_omfonts_DEPENDENCIES) $(EXTRA_call_omfonts_DEPENDENCIES)
+ @rm -f call_omfonts$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(call_omfonts_OBJECTS) $(call_omfonts_LDADD) $(LIBS)
+pl-parser.h: pl-parser.c
+ @if test ! -f $@; then rm -f pl-parser.c; else :; fi
+ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) pl-parser.c; else :; fi
+
+omfonts$(EXEEXT): $(omfonts_OBJECTS) $(omfonts_DEPENDENCIES) $(EXTRA_omfonts_DEPENDENCIES)
+ @rm -f omfonts$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(omfonts_OBJECTS) $(omfonts_LDADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+ -rm -f ../*.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@../$(DEPDIR)/call_omfonts-callexe.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/char_routines.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dimen_routines.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error_routines.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extra_routines.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/font_routines.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/header_routines.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ligkern_routines.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list_routines.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omfonts.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/out_ofm.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/out_routines.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/param_routines.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse_ofm.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pl-lexer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pl-parser.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print_routines.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+../call_omfonts-callexe.o: ../callexe.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_omfonts_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ../call_omfonts-callexe.o -MD -MP -MF ../$(DEPDIR)/call_omfonts-callexe.Tpo -c -o ../call_omfonts-callexe.o `test -f '../callexe.c' || echo '$(srcdir)/'`../callexe.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../$(DEPDIR)/call_omfonts-callexe.Tpo ../$(DEPDIR)/call_omfonts-callexe.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../callexe.c' object='../call_omfonts-callexe.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_omfonts_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../call_omfonts-callexe.o `test -f '../callexe.c' || echo '$(srcdir)/'`../callexe.c
+
+../call_omfonts-callexe.obj: ../callexe.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_omfonts_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ../call_omfonts-callexe.obj -MD -MP -MF ../$(DEPDIR)/call_omfonts-callexe.Tpo -c -o ../call_omfonts-callexe.obj `if test -f '../callexe.c'; then $(CYGPATH_W) '../callexe.c'; else $(CYGPATH_W) '$(srcdir)/../callexe.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../$(DEPDIR)/call_omfonts-callexe.Tpo ../$(DEPDIR)/call_omfonts-callexe.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../callexe.c' object='../call_omfonts-callexe.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_omfonts_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../call_omfonts-callexe.obj `if test -f '../callexe.c'; then $(CYGPATH_W) '../callexe.c'; else $(CYGPATH_W) '$(srcdir)/../callexe.c'; fi`
+
+.l.c:
+ $(AM_V_LEX)$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
+
+.y.c:
+ $(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h `echo $@ | $(am__yacc_c2h)` y.output $*.output -- $(YACCCOMPILE)
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ set x; \
+ here=`pwd`; \
+ $(am__define_uniq_tagged_files); \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+ rm -f $< $@
+ $(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+ @:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+ @$(am__set_TESTS_bases); \
+ am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+ redo_bases=`for i in $$bases; do \
+ am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+ done`; \
+ if test -n "$$redo_bases"; then \
+ redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+ redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+ if $(am__make_dryrun); then :; else \
+ rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+ fi; \
+ fi; \
+ if test -n "$$am__remaking_logs"; then \
+ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+ "recursion detected" >&2; \
+ else \
+ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+ fi; \
+ if $(am__make_dryrun); then :; else \
+ st=0; \
+ errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+ for i in $$redo_bases; do \
+ test -f $$i.trs && test -r $$i.trs \
+ || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+ test -f $$i.log && test -r $$i.log \
+ || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+ done; \
+ test $$st -eq 0 || exit 1; \
+ fi
+ @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+ ws='[ ]'; \
+ results=`for b in $$bases; do echo $$b.trs; done`; \
+ test -n "$$results" || results=/dev/null; \
+ all=` grep "^$$ws*:test-result:" $$results | wc -l`; \
+ pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \
+ fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \
+ skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \
+ xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+ xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+ error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+ if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+ success=true; \
+ else \
+ success=false; \
+ fi; \
+ br='==================='; br=$$br$$br$$br$$br; \
+ result_count () \
+ { \
+ if test x"$$1" = x"--maybe-color"; then \
+ maybe_colorize=yes; \
+ elif test x"$$1" = x"--no-color"; then \
+ maybe_colorize=no; \
+ else \
+ echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+ fi; \
+ shift; \
+ desc=$$1 count=$$2; \
+ if test $$maybe_colorize = yes && test $$count -gt 0; then \
+ color_start=$$3 color_end=$$std; \
+ else \
+ color_start= color_end=; \
+ fi; \
+ echo "$${color_start}# $$desc $$count$${color_end}"; \
+ }; \
+ create_testsuite_report () \
+ { \
+ result_count $$1 "TOTAL:" $$all "$$brg"; \
+ result_count $$1 "PASS: " $$pass "$$grn"; \
+ result_count $$1 "SKIP: " $$skip "$$blu"; \
+ result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+ result_count $$1 "FAIL: " $$fail "$$red"; \
+ result_count $$1 "XPASS:" $$xpass "$$red"; \
+ result_count $$1 "ERROR:" $$error "$$mgn"; \
+ }; \
+ { \
+ echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
+ $(am__rst_title); \
+ create_testsuite_report --no-color; \
+ echo; \
+ echo ".. contents:: :depth: 2"; \
+ echo; \
+ for b in $$bases; do echo $$b; done \
+ | $(am__create_global_log); \
+ } >$(TEST_SUITE_LOG).tmp || exit 1; \
+ mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \
+ if $$success; then \
+ col="$$grn"; \
+ else \
+ col="$$red"; \
+ test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \
+ fi; \
+ echo "$${col}$$br$${std}"; \
+ echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \
+ echo "$${col}$$br$${std}"; \
+ create_testsuite_report --maybe-color; \
+ echo "$$col$$br$$std"; \
+ if $$success; then :; else \
+ echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
+ if test -n "$(PACKAGE_BUGREPORT)"; then \
+ echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
+ fi; \
+ echo "$$col$$br$$std"; \
+ fi; \
+ $$success || exit 1
+
+check-TESTS:
+ @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
+ @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ @set +e; $(am__set_TESTS_bases); \
+ log_list=`for i in $$bases; do echo $$i.log; done`; \
+ trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+ log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+ exit $$?;
+recheck: all
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ @set +e; $(am__set_TESTS_bases); \
+ bases=`for i in $$bases; do echo $$i; done \
+ | $(am__list_recheck_tests)` || exit 1; \
+ log_list=`for i in $$bases; do echo $$i.log; done`; \
+ log_list=`echo $$log_list`; \
+ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+ am__force_recheck=am--force-recheck \
+ TEST_LOGS="$$log_list"; \
+ exit $$?
+.test.log:
+ @p='$<'; \
+ $(am__set_b); \
+ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@ @p='$<'; \
+@am__EXEEXT_TRUE@ $(am__set_b); \
+@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+ for dir in "$(DESTDIR)$(bindir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+ -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+ -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+ -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -rm -f ../$(DEPDIR)/$(am__dirstamp)
+ -rm -f ../$(am__dirstamp)
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+ -rm -f pl-lexer.c
+ -rm -f pl-parser.c
+ -rm -f pl-parser.h
+@OTANGLE_FALSE@install-exec-hook:
+@OTANGLE_FALSE@uninstall-hook:
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libtool \
+ clean-noinstPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+ -rm -rf ../$(DEPDIR) ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -rf ../$(DEPDIR) ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+.MAKE: check-am install-am install-exec-am install-strip uninstall-am
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
+ clean-binPROGRAMS clean-generic clean-libtool \
+ clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-binPROGRAMS install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-exec-hook install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ recheck tags tags-am uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-hook
+
+
+# Rebuild $(proglib)
+$(proglib): ${top_srcdir}/lib/*.c
+ cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
+
+@KPATHSEA_RULE@
+.PHONY: install-bin-links uninstall-bin-links
+
+install-bin-links:
+@WIN32_FALSE@ @cd $(DESTDIR)$(bindir) && \
+@WIN32_FALSE@ for s in $(bin_links); do \
+@WIN32_FALSE@ link=`echo $$s | sed 's,.*:,,'`; \
+@WIN32_FALSE@ file=`echo $$s | sed 's,:.*,,'`; \
+@WIN32_FALSE@ rm -f $$link; \
+@WIN32_FALSE@ echo "creating link '$$link' -> '$$file'"; \
+@WIN32_FALSE@ $(LN_S) $$file $$link || exit 1; \
+@WIN32_FALSE@ done
+
+uninstall-bin-links:
+@WIN32_FALSE@ @for s in $(bin_links); do \
+@WIN32_FALSE@ link=`echo $$s | sed 's,.*:,,'`; \
+@WIN32_FALSE@ rm -f $(DESTDIR)$(bindir)/$$link; \
+@WIN32_FALSE@ done
+
+@OTANGLE_TRUE@install-exec-hook: install-bin-links
+@OTANGLE_TRUE@@WIN32_TRUE@ for f in $(linked_programs); do \
+@OTANGLE_TRUE@@WIN32_TRUE@ $(INSTALL_PROGRAM) call_omfonts$(EXEEXT) $(DESTDIR)$(bindir)/$$f$(EXEEXT) || exit 1; \
+@OTANGLE_TRUE@@WIN32_TRUE@ done
+@OTANGLE_TRUE@uninstall-hook: uninstall-bin-links
+@OTANGLE_TRUE@@WIN32_TRUE@ for f in $(linked_programs); do \
+@OTANGLE_TRUE@@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/$$f$(EXEEXT); \
+@OTANGLE_TRUE@@WIN32_TRUE@ done
+
+# 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.
+.NOEXPORT:
diff --git a/source/texk/web2c/omegaware/am/omegaware.am b/source/texk/web2c/omegaware/am/omegaware.am
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..342f973fb861d51c82062f1581ed506db631069c 100644
--- a/source/texk/web2c/omegaware/am/omegaware.am
+++ b/source/texk/web2c/omegaware/am/omegaware.am
@@ -0,0 +1,196 @@
+## texk/web2c/omegaware/am/omegaware.am: Makefile fragment for omegaware web programs.
+##
+## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+
+omegaware_programs = odvicopy odvitype otangle wofm2opl wopl2ofm wovf2ovp wovp2ovf
+
+if OTANGLE
+bin_PROGRAMS += $(omegaware_programs)
+endif OTANGLE
+EXTRA_PROGRAMS += $(omegaware_programs)
+
+EXTRA_DIST += omegaware/README omegaware/ChangeLog
+DISTCLEANFILES += $(omegaware_programs:=.c) $(omegaware_programs:=.h) \
+ $(omegaware_programs:=.p) $(omegaware_programs:=-web2c)
+
+ow_tangle = WEBINPUTS=$(srcdir)/omegaware $(buildenv) $(TANGLE)
+ow_otangle = WEBINPUTS=.:$(srcdir)/omegaware $(buildenv) $(OTANGLE)
+
+nodist_odvicopy_SOURCES = odvicopy.c odvicopy.h
+odvicopy.c odvicopy.h: odvicopy-web2c
+ @$(web2c) odvicopy
+odvicopy-web2c: odvicopy.p $(web2c_depend)
+ @$(web2c) odvicopy
+EXTRA_DIST += $(odvicopy_sources)
+odvicopy_sources = omegaware/odvicopy.web omegaware/odvicopy.ch
+odvicopy.p: tangle$(EXEEXT) $(odvicopy_sources)
+ $(tangle_silent)$(ow_tangle) odvicopy odvicopy
+
+nodist_odvitype_SOURCES = odvitype.c odvitype.h
+odvitype.c odvitype.h: odvitype-web2c
+ @$(web2c) odvitype
+odvitype-web2c: odvitype.p $(web2c_depend)
+ @$(web2c) odvitype
+EXTRA_DIST += $(odvitype_sources)
+odvitype_sources = omegaware/odvitype.web omegaware/odvitype.ch
+odvitype.p: tangle$(EXEEXT) $(odvitype_sources)
+ $(tangle_silent)$(ow_tangle) odvitype odvitype
+
+nodist_wofm2opl_SOURCES = ofm2opl.c ofm2opl.h
+ofm2opl.c ofm2opl.h: ofm2opl-web2c
+ @$(web2c) ofm2opl
+ofm2opl-web2c: ofm2opl.p $(web2c_depend)
+ @$(web2c) ofm2opl
+ofm2opl.p: otangle$(EXEEXT) ofm2opl.web omegaware/ofm2opl.ch
+ $(tangle_silent)$(ow_otangle) ofm2opl ofm2opl
+ofm2opl.web: tie$(EXEEXT) omegaware/ofm2opl.web omegaware/ofm2opl.up
+ $(tie) -m ofm2opl.web omegaware/ofm2opl.web omegaware/ofm2opl.up
+EXTRA_DIST += omegaware/ofm2opl.web omegaware/ofm2opl.up omegaware/ofm2opl.ch
+DISTCLEANFILES += ofm2opl.web
+
+nodist_wopl2ofm_SOURCES = opl2ofm.c opl2ofm.h
+opl2ofm.c opl2ofm.h: opl2ofm-web2c
+ @$(web2c) opl2ofm
+opl2ofm-web2c: opl2ofm.p $(web2c_depend)
+ @$(web2c) opl2ofm
+opl2ofm.p: otangle$(EXEEXT) opl2ofm.web omegaware/opl2ofm.ch
+ $(tangle_silent)$(ow_otangle) opl2ofm opl2ofm
+opl2ofm.web: tie$(EXEEXT) omegaware/opl2ofm.web omegaware/opl2ofm.up
+ $(tie) -m opl2ofm.web omegaware/opl2ofm.web omegaware/opl2ofm.up
+EXTRA_DIST += omegaware/opl2ofm.web omegaware/opl2ofm.up omegaware/opl2ofm.ch
+DISTCLEANFILES += opl2ofm.web
+
+nodist_otangle_SOURCES = otangle.c otangle.h
+otangle.c otangle.h: otangle-web2c
+ @$(web2c) otangle
+otangle-web2c: otangle.p $(web2c_depend)
+ @$(web2c) otangle
+EXTRA_DIST += $(otangle_sources)
+otangle_sources = omegaware/otangle.web omegaware/otangle.ch
+otangle.p: tangle$(EXEEXT) $(otangle_sources)
+ $(tangle_silent)$(ow_tangle) otangle otangle
+
+nodist_wovf2ovp_SOURCES = ovf2ovp.c ovf2ovp.h
+ovf2ovp.c ovf2ovp.h: ovf2ovp-web2c
+ @$(web2c) ovf2ovp
+ovf2ovp-web2c: ovf2ovp.p $(web2c_depend)
+ @$(web2c) ovf2ovp
+ovf2ovp.p: otangle$(EXEEXT) ovf2ovp.web omegaware/ovf2ovp.ch
+ $(tangle_silent)$(ow_otangle) ovf2ovp ovf2ovp
+ovf2ovp.web: tie$(EXEEXT) omegaware/ovf2ovp.web omegaware/ovf2ovp.up
+ $(tie) -m ovf2ovp.web omegaware/ovf2ovp.web omegaware/ovf2ovp.up
+EXTRA_DIST += omegaware/ovf2ovp.web omegaware/ovf2ovp.up omegaware/ovf2ovp.ch
+DISTCLEANFILES += ovf2ovp.web
+
+nodist_wovp2ovf_SOURCES = ovp2ovf.c ovp2ovf.h
+ovp2ovf.c ovp2ovf.h: ovp2ovf-web2c
+ @$(web2c) ovp2ovf
+ovp2ovf-web2c: ovp2ovf.p $(web2c_depend)
+ @$(web2c) ovp2ovf
+ovp2ovf.p: otangle$(EXEEXT) ovp2ovf.web omegaware/ovp2ovf.ch
+ $(tangle_silent)$(ow_otangle) ovp2ovf ovp2ovf
+ovp2ovf.web: tie$(EXEEXT) omegaware/ovp2ovf.web omegaware/ovp2ovf.up
+ $(tie) -m ovp2ovf.web omegaware/ovp2ovf.web omegaware/ovp2ovf.up
+EXTRA_DIST += omegaware/ovp2ovf.web omegaware/ovp2ovf.up omegaware/ovp2ovf.ch
+DISTCLEANFILES += ovp2ovf.web
+
+## Tests
+##
+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 \
+ omegaware/yannis.test
+EXTRA_DIST += $(OTANGLE_tests) $(OMFONTS_tests)
+
+if OTANGLE
+TESTS += $(OTANGLE_tests) $(OMFONTS_tests)
+endif OTANGLE
+
+## omegaware/charwd.test
+EXTRA_DIST += omegaware/tests/charwd-r.pl omegaware/tests/charwd-v.vpl
+DISTCLEANFILES += omegaware/tests/charwdr.* omegaware/tests/charwdv.*
+## omegaware/check.test
+EXTRA_DIST += \
+ omegaware/tests/check.ofm omegaware/tests/check.opl omegaware/tests/checked.opl
+DISTCLEANFILES += omegaware/tests/xcheck*
+## omegaware/level1.test
+EXTRA_DIST += omegaware/tests/level1.opl
+DISTCLEANFILES += omegaware/tests/xlevel1.*
+## omegaware/ligkern.test
+EXTRA_DIST += \
+ 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
+DISTCLEANFILES += omegaware/tests/xlig*.*
+## omegaware/odvicopy.test (and ofonts.test)
+EXTRA_DIST += \
+ 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
+DISTCLEANFILES += ofont*vf
+## omegaware/odvitype.test (and odvicopy.test, ofonts.test)
+EXTRA_DIST += 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
+DISTCLEANFILES += omegaware/tests/xofont*
+## omegaware/ofonts.test
+EXTRA_DIST += 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/omfonts.test
+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/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.*
+## omegaware/repeat.test
+EXTRA_DIST += omegaware/tests/repeat.opl omegaware/tests/repeated.opl
+DISTCLEANFILES += omegaware/tests/xrepeated.*
+## omegaware/selectfont.test
+EXTRA_DIST += omegaware/tests/sample.out omegaware/tests/sample.ovp \
+ omegaware/tests/sample0-h.opl
+DISTCLEANFILES += omegaware/tests/sample*.ofm omegaware/tests/sample*.ovf \
+ omegaware/tests/sample1-h.opl omegaware/tests/xsample*.out
+## omegaware/shorten.test
+EXTRA_DIST += omegaware/tests/shorten.opl
+DISTCLEANFILES += omegaware/tests/shortend.*
+## omegaware/specialhex.test
+EXTRA_DIST += omegaware/tests/specialhex.ovp
+DISTCLEANFILES += omegaware/tests/specialhex.ofm omegaware/tests/specialhex.opl \
+ omegaware/tests/specialhex.ovf omegaware/tests/xspecialhex.*
+## omegaware/vrepeat.test
+EXTRA_DIST += \
+ omegaware/tests/vrepeat0.ofm omegaware/tests/vrepeat0.opl \
+ omegaware/tests/vrepeat1.ofm omegaware/tests/vrepeat1.opl \
+ omegaware/tests/vrepeat1.ovf omegaware/tests/vrepeat1.ovp
+DISTCLEANFILES += omegaware/tests/yrepeat*
+## omegaware/yannis.test
+EXTRA_DIST += \
+ omegaware/tests/arabicr.pl omegaware/tests/arabic.ovp
+DISTCLEANFILES += omegaware/tests/*yarabic*
+
diff --git a/source/texk/web2c/otps/Makefile.in b/source/texk/web2c/otps/Makefile.in
index 1263948fb882b8c4fd639b01e17969c825e79619..0b39797f55550ba824552c195d42d04e465ea8c5 100644
--- a/source/texk/web2c/otps/Makefile.in
+++ b/source/texk/web2c/otps/Makefile.in
@@ -1 +1,1406 @@
-all:
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+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 \
+ $(top_srcdir)/../../m4/kpse-cairo-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-common.m4 \
+ $(top_srcdir)/../../m4/kpse-cross.m4 \
+ $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
+ $(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-gmp-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-graphite2-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-icu-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-lex.m4 \
+ $(top_srcdir)/../../m4/kpse-lib-version.m4 \
+ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-lt-hack.m4 \
+ $(top_srcdir)/../../m4/kpse-lua52-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-luajit-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \
+ $(top_srcdir)/../../m4/kpse-mpfr-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-pixman-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-poppler-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-socket-libs.m4 \
+ $(top_srcdir)/../../m4/kpse-teckit-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-warnings.m4 \
+ $(top_srcdir)/../../m4/kpse-web2c.m4 \
+ $(top_srcdir)/../../m4/kpse-win32.m4 \
+ $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-zziplib-flags.m4 \
+ $(top_srcdir)/../../m4/libtool.m4 \
+ $(top_srcdir)/../../m4/ltoptions.m4 \
+ $(top_srcdir)/../../m4/ltsugar.m4 \
+ $(top_srcdir)/../../m4/ltversion.m4 \
+ $(top_srcdir)/../../m4/lt~obsolete.m4 \
+ $(top_srcdir)/../../version.ac $(top_srcdir)/ac/web2c.ac \
+ $(top_srcdir)/synctexdir/ac/synctex.ac \
+ $(top_srcdir)/synctexdir/synctex_parser_version.txt \
+ $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/w2c/c-auto.h \
+ $(top_builddir)/ff-config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__EXEEXT_1 = otp2ocp$(EXEEXT) outocp$(EXEEXT)
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
+ "$(DESTDIR)$(man1dir)"
+PROGRAMS = $(bin_PROGRAMS)
+am_otp2ocp_OBJECTS = otp-parser.$(OBJEXT) otp-lexer.$(OBJEXT) \
+ otp2ocp.$(OBJEXT) routines.$(OBJEXT)
+otp2ocp_OBJECTS = $(am_otp2ocp_OBJECTS)
+otp2ocp_LDADD = $(LDADD)
+am__DEPENDENCIES_1 =
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 =
+am_outocp_OBJECTS = outocp.$(OBJEXT)
+outocp_OBJECTS = $(am_outocp_OBJECTS)
+outocp_LDADD = $(LDADD)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
+SCRIPTS = $(bin_SCRIPTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/w2c -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
+@MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ ||
+LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS)
+LTLEXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(LEX) $(AM_LFLAGS) $(LFLAGS)
+AM_V_LEX = $(am__v_LEX_@AM_V@)
+am__v_LEX_ = $(am__v_LEX_@AM_DEFAULT_V@)
+am__v_LEX_0 = @echo " LEX " $@;
+am__v_LEX_1 =
+YLWRAP = $(top_srcdir)/../../build-aux/ylwrap
+@MAINTAINER_MODE_FALSE@am__skipyacc = test -f $@ ||
+am__yacc_c2h = sed -e s/cc$$/hh/ -e s/cpp$$/hpp/ -e s/cxx$$/hxx/ \
+ -e s/c++$$/h++/ -e s/c$$/h/
+YACCCOMPILE = $(YACC) $(AM_YFLAGS) $(YFLAGS)
+LTYACCCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(YACC) $(AM_YFLAGS) $(YFLAGS)
+AM_V_YACC = $(am__v_YACC_@AM_V@)
+am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@)
+am__v_YACC_0 = @echo " YACC " $@;
+am__v_YACC_1 =
+SOURCES = $(otp2ocp_SOURCES) $(outocp_SOURCES)
+DIST_SOURCES = $(otp2ocp_SOURCES) $(outocp_SOURCES)
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+ ctags-recursive dvi-recursive html-recursive info-recursive \
+ install-data-recursive install-dvi-recursive \
+ install-exec-recursive install-html-recursive \
+ install-info-recursive install-pdf-recursive \
+ install-ps-recursive install-recursive installcheck-recursive \
+ installdirs-recursive pdf-recursive ps-recursive \
+ tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+man1dir = $(mandir)/man1
+NROFF = nroff
+MANS = $(dist_man1_MANS)
+HEADERS = $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+ check recheck distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__tty_colors_dummy = \
+ mgn= red= grn= lgn= blu= brg= std=; \
+ am__color_tests=no
+am__tty_colors = { \
+ $(am__tty_colors_dummy); \
+ if test "X$(AM_COLOR_TESTS)" = Xno; then \
+ am__color_tests=no; \
+ elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+ am__color_tests=yes; \
+ elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+ am__color_tests=yes; \
+ fi; \
+ if test $$am__color_tests = yes; then \
+ red='[0;31m'; \
+ grn='[0;32m'; \
+ lgn='[1;32m'; \
+ blu='[1;34m'; \
+ mgn='[0;35m'; \
+ brg='[1m'; \
+ std='[m'; \
+ fi; \
+}
+am__recheck_rx = ^[ ]*:recheck:[ ]*
+am__global_test_result_rx = ^[ ]*:global-test-result:[ ]*
+am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+ recheck = 1; \
+ while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+ { \
+ if (rc < 0) \
+ { \
+ if ((getline line2 < ($$0 ".log")) < 0) \
+ recheck = 0; \
+ break; \
+ } \
+ else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+ { \
+ recheck = 0; \
+ break; \
+ } \
+ else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+ { \
+ break; \
+ } \
+ }; \
+ if (recheck) \
+ print $$0; \
+ close ($$0 ".trs"); \
+ close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+ print "fatal: making $@: " msg | "cat >&2"; \
+ exit 1; \
+} \
+function rst_section(header) \
+{ \
+ print header; \
+ len = length(header); \
+ for (i = 1; i <= len; i = i + 1) \
+ printf "="; \
+ printf "\n\n"; \
+} \
+{ \
+ copy_in_global_log = 1; \
+ global_test_result = "RUN"; \
+ while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+ { \
+ if (rc < 0) \
+ fatal("failed to read from " $$0 ".trs"); \
+ if (line ~ /$(am__global_test_result_rx)/) \
+ { \
+ sub("$(am__global_test_result_rx)", "", line); \
+ sub("[ ]*$$", "", line); \
+ global_test_result = line; \
+ } \
+ else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+ copy_in_global_log = 0; \
+ }; \
+ if (copy_in_global_log) \
+ { \
+ rst_section(global_test_result ": " $$0); \
+ while ((rc = (getline line < ($$0 ".log"))) != 0) \
+ { \
+ if (rc < 0) \
+ fatal("failed to read from " $$0 ".log"); \
+ print line; \
+ }; \
+ printf "\n"; \
+ }; \
+ close ($$0 ".trs"); \
+ close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+ --color-tests "$$am__color_tests" \
+ --enable-hard-errors "$$am__enable_hard_errors" \
+ --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test. Creates the
+# directory for the log if needed. Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log. Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT. Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup); \
+$(am__vpath_adj_setup) $(am__vpath_adj) \
+$(am__tty_colors); \
+srcdir=$(srcdir); export srcdir; \
+case "$@" in \
+ */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \
+ *) am__odir=.;; \
+esac; \
+test "x$$am__odir" = x"." || test -d "$$am__odir" \
+ || $(MKDIR_P) "$$am__odir" || exit $$?; \
+if test -f "./$$f"; then dir=./; \
+elif test -f "$$f"; then dir=; \
+else dir="$(srcdir)/"; fi; \
+tst=$$dir$$f; log='$@'; \
+if test -n '$(DISABLE_HARD_ERRORS)'; then \
+ am__enable_hard_errors=no; \
+else \
+ am__enable_hard_errors=yes; \
+fi; \
+case " $(XFAIL_TESTS) " in \
+ *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \
+ am__expect_failure=yes;; \
+ *) \
+ am__expect_failure=no;; \
+esac; \
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed). The result is saved in the shell variable
+# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+ bases='$(TEST_LOGS)'; \
+ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+ bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/../../build-aux/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+ $(TEST_LOG_FLAGS)
+am__set_b = \
+ case '$@' in \
+ */*) \
+ case '$*' in \
+ */*) b='$*';; \
+ *) b=`echo '$@' | sed 's/\.log$$//'`; \
+ esac;; \
+ *) \
+ b='$*';; \
+ esac
+DIST_SUBDIRS = win32
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CAIRO_DEPEND = @CAIRO_DEPEND@
+CAIRO_INCLUDES = @CAIRO_INCLUDES@
+CAIRO_LIBS = @CAIRO_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CTANGLE = @CTANGLE@
+CTANGLEBOOT = @CTANGLEBOOT@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FONTCONFIG_INCLUDES = @FONTCONFIG_INCLUDES@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
+FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
+FREETYPE2_LIBS = @FREETYPE2_LIBS@
+FT2_CONFIG = @FT2_CONFIG@
+GMP_DEPEND = @GMP_DEPEND@
+GMP_INCLUDES = @GMP_INCLUDES@
+GMP_LIBS = @GMP_LIBS@
+GRAPHITE2_DEPEND = @GRAPHITE2_DEPEND@
+GRAPHITE2_INCLUDES = @GRAPHITE2_INCLUDES@
+GRAPHITE2_LIBS = @GRAPHITE2_LIBS@
+GREP = @GREP@
+HARFBUZZ_DEPEND = @HARFBUZZ_DEPEND@
+HARFBUZZ_INCLUDES = @HARFBUZZ_INCLUDES@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+ICU_CONFIG = @ICU_CONFIG@
+ICU_DEPEND = @ICU_DEPEND@
+ICU_INCLUDES = @ICU_INCLUDES@
+ICU_LIBS = @ICU_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
+KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
+KPATHSEA_LIBS = @KPATHSEA_LIBS@
+KPATHSEA_PATHS_H = @KPATHSEA_PATHS_H@
+KPSEWHICH = @KPSEWHICH@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBPNG_DEPEND = @LIBPNG_DEPEND@
+LIBPNG_INCLUDES = @LIBPNG_INCLUDES@
+LIBPNG_LIBS = @LIBPNG_LIBS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LUA52_DEFINES = @LUA52_DEFINES@
+LUA52_DEPEND = @LUA52_DEPEND@
+LUA52_INCLUDES = @LUA52_INCLUDES@
+LUA52_LIBS = @LUA52_LIBS@
+LUAJIT_DEFINES = @LUAJIT_DEFINES@
+LUAJIT_DEPEND = @LUAJIT_DEPEND@
+LUAJIT_INCLUDES = @LUAJIT_INCLUDES@
+LUAJIT_LDEXTRA = @LUAJIT_LDEXTRA@
+LUAJIT_LIBS = @LUAJIT_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MPFR_DEPEND = @MPFR_DEPEND@
+MPFR_INCLUDES = @MPFR_INCLUDES@
+MPFR_LIBS = @MPFR_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJCXX = @OBJCXX@
+OBJCXXDEPMODE = @OBJCXXDEPMODE@
+OBJCXXFLAGS = @OBJCXXFLAGS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTANGLE = @OTANGLE@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PIXMAN_DEPEND = @PIXMAN_DEPEND@
+PIXMAN_INCLUDES = @PIXMAN_INCLUDES@
+PIXMAN_LIBS = @PIXMAN_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+POPPLER_DEPEND = @POPPLER_DEPEND@
+POPPLER_INCLUDES = @POPPLER_INCLUDES@
+POPPLER_LIBS = @POPPLER_LIBS@
+PTEXENC_DEPEND = @PTEXENC_DEPEND@
+PTEXENC_INCLUDES = @PTEXENC_INCLUDES@
+PTEXENC_LIBS = @PTEXENC_LIBS@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+SYNCTEXVERSION = @SYNCTEXVERSION@
+SYNCTEX_LT_VERSINFO = @SYNCTEX_LT_VERSINFO@
+TANGLE = @TANGLE@
+TANGLEBOOT = @TANGLEBOOT@
+TECKIT_DEPEND = @TECKIT_DEPEND@
+TECKIT_INCLUDES = @TECKIT_INCLUDES@
+TECKIT_LIBS = @TECKIT_LIBS@
+TIE = @TIE@
+VERSION = @VERSION@
+WANTEDLIBS = @WANTEDLIBS@
+WARNING_CFLAGS = @WARNING_CFLAGS@
+WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
+WARNING_OBJCXXFLAGS = @WARNING_OBJCXXFLAGS@
+WEB2CVERSION = @WEB2CVERSION@
+XMKMF = @XMKMF@
+XPDF_DEPEND = @XPDF_DEPEND@
+XPDF_INCLUDES = @XPDF_INCLUDES@
+XPDF_LIBS = @XPDF_LIBS@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+ZLIB_DEPEND = @ZLIB_DEPEND@
+ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ZLIB_LIBS = @ZLIB_LIBS@
+ZZIPLIB_DEPEND = @ZZIPLIB_DEPEND@
+ZZIPLIB_INCLUDES = @ZZIPLIB_INCLUDES@
+ZZIPLIB_LIBS = @ZZIPLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_OBJCXX = @ac_ct_OBJCXX@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+ipc_socketlibs = @ipc_socketlibs@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lua_socketlibs = @lua_socketlibs@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+subdirs = @subdirs@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+wlibs = @wlibs@
+x_ext_lib = @x_ext_lib@
+x_tool_libs = @x_tool_libs@
+AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES)
+AM_CFLAGS = $(WARNING_CFLAGS)
+AM_YFLAGS = -d -v
+proglib = ../lib/lib.a
+otps_programs = otp2ocp outocp
+otps_scripts = mkocp mkofm
+noinst_HEADERS = otp.h routines.h yystype.h
+@OTANGLE_TRUE@@WIN32_TRUE@SUBDIRS = win32
+@OTANGLE_TRUE@@WIN32_FALSE@bin_SCRIPTS = $(otps_scripts)
+@OTANGLE_TRUE@dist_man1_MANS = $(otps_programs:=.man) $(otps_scripts:=.man)
+EXTRA_DIST = $(otps_scripts) otp2ocp.test outocp.test uni2lat.ocp \
+ uni2lat.otp uni2lat.out bugs.txt
+otp2ocp_SOURCES = \
+ otp-parser.y \
+ otp-lexer.l \
+ otp2ocp.c \
+ routines.c
+
+DISTCLEANFILES = otp-parser.output
+outocp_SOURCES = \
+ outocp.c
+
+LDADD = $(proglib) $(KPATHSEA_LIBS)
+otp2ocp_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND)
+outocp_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND)
+@OTANGLE_TRUE@TESTS = otp2ocp.test outocp.test
+CLEANFILES = xuni2lat.ocp xuni2lat.out
+all: all-recursive
+
+.SUFFIXES:
+.SUFFIXES: .c .l .lo .log .o .obj .test .test$(EXEEXT) .trs .y
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ 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*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p \
+ || test -f $$p1 \
+ ; then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' \
+ -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+uninstall-binPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' \
+ `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+ @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
+otp-parser.h: otp-parser.c
+ @if test ! -f $@; then rm -f otp-parser.c; else :; fi
+ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) otp-parser.c; else :; fi
+
+otp2ocp$(EXEEXT): $(otp2ocp_OBJECTS) $(otp2ocp_DEPENDENCIES) $(EXTRA_otp2ocp_DEPENDENCIES)
+ @rm -f otp2ocp$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(otp2ocp_OBJECTS) $(otp2ocp_LDADD) $(LIBS)
+
+outocp$(EXEEXT): $(outocp_OBJECTS) $(outocp_DEPENDENCIES) $(EXTRA_outocp_DEPENDENCIES)
+ @rm -f outocp$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(outocp_OBJECTS) $(outocp_LDADD) $(LIBS)
+install-binSCRIPTS: $(bin_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n' \
+ -e 'h;s|.*|.|' \
+ -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+ if (++n[d] == $(am__install_max)) { \
+ print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+ else { print "f", d "/" $$4, $$1 } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+uninstall-binSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 's,.*/,,;$(transform)'`; \
+ dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/otp-lexer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/otp-parser.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/otp2ocp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/outocp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/routines.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+.l.c:
+ $(AM_V_LEX)$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE)
+
+.y.c:
+ $(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h `echo $@ | $(am__yacc_c2h)` y.output $*.output -- $(YACCCOMPILE)
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+install-man1: $(dist_man1_MANS)
+ @$(NORMAL_INSTALL)
+ @list1='$(dist_man1_MANS)'; \
+ list2=''; \
+ test -n "$(man1dir)" \
+ && test -n "`echo $$list1$$list2`" \
+ || exit 0; \
+ echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+ { for i in $$list1; do echo "$$i"; done; \
+ if test -n "$$list2"; then \
+ for i in $$list2; do echo "$$i"; done \
+ | sed -n '/\.1[a-z]*$$/p'; \
+ fi; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+ done | \
+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+ sed 'N;N;s,\n, ,g' | { \
+ list=; while read file base inst; do \
+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+ fi; \
+ done; \
+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+ while read files; do \
+ test -z "$$files" || { \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+ done; }
+
+uninstall-man1:
+ @$(NORMAL_UNINSTALL)
+ @list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \
+ files=`{ for i in $$list; do echo "$$i"; done; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+# (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+ @fail=; \
+ if $(am__make_keepgoing); then \
+ failcom='fail=yes'; \
+ else \
+ failcom='exit 1'; \
+ fi; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ set x; \
+ here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ $(am__define_uniq_tagged_files); \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+ rm -f $< $@
+ $(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+ @:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+ @$(am__set_TESTS_bases); \
+ am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+ redo_bases=`for i in $$bases; do \
+ am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+ done`; \
+ if test -n "$$redo_bases"; then \
+ redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+ redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+ if $(am__make_dryrun); then :; else \
+ rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+ fi; \
+ fi; \
+ if test -n "$$am__remaking_logs"; then \
+ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+ "recursion detected" >&2; \
+ else \
+ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+ fi; \
+ if $(am__make_dryrun); then :; else \
+ st=0; \
+ errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+ for i in $$redo_bases; do \
+ test -f $$i.trs && test -r $$i.trs \
+ || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+ test -f $$i.log && test -r $$i.log \
+ || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+ done; \
+ test $$st -eq 0 || exit 1; \
+ fi
+ @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+ ws='[ ]'; \
+ results=`for b in $$bases; do echo $$b.trs; done`; \
+ test -n "$$results" || results=/dev/null; \
+ all=` grep "^$$ws*:test-result:" $$results | wc -l`; \
+ pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \
+ fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \
+ skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \
+ xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+ xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+ error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+ if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+ success=true; \
+ else \
+ success=false; \
+ fi; \
+ br='==================='; br=$$br$$br$$br$$br; \
+ result_count () \
+ { \
+ if test x"$$1" = x"--maybe-color"; then \
+ maybe_colorize=yes; \
+ elif test x"$$1" = x"--no-color"; then \
+ maybe_colorize=no; \
+ else \
+ echo "$@: invalid 'result_count' usage" >&2; exit 4; \
+ fi; \
+ shift; \
+ desc=$$1 count=$$2; \
+ if test $$maybe_colorize = yes && test $$count -gt 0; then \
+ color_start=$$3 color_end=$$std; \
+ else \
+ color_start= color_end=; \
+ fi; \
+ echo "$${color_start}# $$desc $$count$${color_end}"; \
+ }; \
+ create_testsuite_report () \
+ { \
+ result_count $$1 "TOTAL:" $$all "$$brg"; \
+ result_count $$1 "PASS: " $$pass "$$grn"; \
+ result_count $$1 "SKIP: " $$skip "$$blu"; \
+ result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+ result_count $$1 "FAIL: " $$fail "$$red"; \
+ result_count $$1 "XPASS:" $$xpass "$$red"; \
+ result_count $$1 "ERROR:" $$error "$$mgn"; \
+ }; \
+ { \
+ echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
+ $(am__rst_title); \
+ create_testsuite_report --no-color; \
+ echo; \
+ echo ".. contents:: :depth: 2"; \
+ echo; \
+ for b in $$bases; do echo $$b; done \
+ | $(am__create_global_log); \
+ } >$(TEST_SUITE_LOG).tmp || exit 1; \
+ mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \
+ if $$success; then \
+ col="$$grn"; \
+ else \
+ col="$$red"; \
+ test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \
+ fi; \
+ echo "$${col}$$br$${std}"; \
+ echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \
+ echo "$${col}$$br$${std}"; \
+ create_testsuite_report --maybe-color; \
+ echo "$$col$$br$$std"; \
+ if $$success; then :; else \
+ echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
+ if test -n "$(PACKAGE_BUGREPORT)"; then \
+ echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
+ fi; \
+ echo "$$col$$br$$std"; \
+ fi; \
+ $$success || exit 1
+
+check-TESTS:
+ @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
+ @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ @set +e; $(am__set_TESTS_bases); \
+ log_list=`for i in $$bases; do echo $$i.log; done`; \
+ trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+ log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+ exit $$?;
+recheck: all
+ @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ @set +e; $(am__set_TESTS_bases); \
+ bases=`for i in $$bases; do echo $$i; done \
+ | $(am__list_recheck_tests)` || exit 1; \
+ log_list=`for i in $$bases; do echo $$i.log; done`; \
+ log_list=`echo $$log_list`; \
+ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+ am__force_recheck=am--force-recheck \
+ TEST_LOGS="$$log_list"; \
+ exit $$?
+.test.log:
+ @p='$<'; \
+ $(am__set_b); \
+ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+ --log-file $$b.log --trs-file $$b.trs \
+ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@ @p='$<'; \
+@am__EXEEXT_TRUE@ $(am__set_b); \
+@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) check-TESTS
+check: check-recursive
+all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(HEADERS)
+installdirs: installdirs-recursive
+installdirs-am:
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+ -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+ -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+ -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+ -rm -f otp-lexer.c
+ -rm -f otp-parser.c
+ -rm -f otp-parser.h
+clean: clean-recursive
+
+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am: install-man
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS install-binSCRIPTS
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man: install-man1
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-man
+
+uninstall-man: uninstall-man1
+
+.MAKE: $(am__recursive_targets) check-am install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+ check-TESTS check-am clean clean-binPROGRAMS clean-generic \
+ clean-libtool cscopelist-am ctags ctags-am distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-binPROGRAMS install-binSCRIPTS \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-man1 \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \
+ uninstall uninstall-am uninstall-binPROGRAMS \
+ uninstall-binSCRIPTS uninstall-man uninstall-man1
+
+
+# Rebuild $(proglib)
+$(proglib): ${top_srcdir}/lib/*.c
+ cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
+
+@KPATHSEA_RULE@
+
+# 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.
+.NOEXPORT:
diff --git a/source/texk/web2c/otps/win32/Makefile.in b/source/texk/web2c/otps/win32/Makefile.in
index 1263948fb882b8c4fd639b01e17969c825e79619..95bbe1cf3b1a6d0e902859eb97e549a9949351c2 100644
--- a/source/texk/web2c/otps/win32/Makefile.in
+++ b/source/texk/web2c/otps/win32/Makefile.in
@@ -1 +1,786 @@
-all:
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+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 \
+ $(top_srcdir)/../../m4/kpse-cairo-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-common.m4 \
+ $(top_srcdir)/../../m4/kpse-cross.m4 \
+ $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
+ $(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-gmp-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-graphite2-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-icu-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-lex.m4 \
+ $(top_srcdir)/../../m4/kpse-lib-version.m4 \
+ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-lt-hack.m4 \
+ $(top_srcdir)/../../m4/kpse-lua52-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-luajit-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \
+ $(top_srcdir)/../../m4/kpse-mpfr-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-pixman-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-poppler-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-socket-libs.m4 \
+ $(top_srcdir)/../../m4/kpse-teckit-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-warnings.m4 \
+ $(top_srcdir)/../../m4/kpse-web2c.m4 \
+ $(top_srcdir)/../../m4/kpse-win32.m4 \
+ $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-zziplib-flags.m4 \
+ $(top_srcdir)/../../m4/libtool.m4 \
+ $(top_srcdir)/../../m4/ltoptions.m4 \
+ $(top_srcdir)/../../m4/ltsugar.m4 \
+ $(top_srcdir)/../../m4/ltversion.m4 \
+ $(top_srcdir)/../../m4/lt~obsolete.m4 \
+ $(top_srcdir)/../../version.ac $(top_srcdir)/ac/web2c.ac \
+ $(top_srcdir)/synctexdir/ac/synctex.ac \
+ $(top_srcdir)/synctexdir/synctex_parser_version.txt \
+ $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/w2c/c-auto.h \
+ $(top_builddir)/ff-config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+PROGRAMS = $(bin_PROGRAMS)
+mkocp_SOURCES = mkocp.c
+mkocp_OBJECTS = mkocp-mkocp.$(OBJEXT)
+am__DEPENDENCIES_1 =
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 =
+mkofm_SOURCES = mkofm.c
+mkofm_OBJECTS = mkofm.$(OBJEXT)
+mkofm_LDADD = $(LDADD)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/w2c -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
+SOURCES = mkocp.c mkofm.c
+DIST_SOURCES = mkocp.c mkofm.c
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CAIRO_DEPEND = @CAIRO_DEPEND@
+CAIRO_INCLUDES = @CAIRO_INCLUDES@
+CAIRO_LIBS = @CAIRO_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CTANGLE = @CTANGLE@
+CTANGLEBOOT = @CTANGLEBOOT@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FONTCONFIG_INCLUDES = @FONTCONFIG_INCLUDES@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
+FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
+FREETYPE2_LIBS = @FREETYPE2_LIBS@
+FT2_CONFIG = @FT2_CONFIG@
+GMP_DEPEND = @GMP_DEPEND@
+GMP_INCLUDES = @GMP_INCLUDES@
+GMP_LIBS = @GMP_LIBS@
+GRAPHITE2_DEPEND = @GRAPHITE2_DEPEND@
+GRAPHITE2_INCLUDES = @GRAPHITE2_INCLUDES@
+GRAPHITE2_LIBS = @GRAPHITE2_LIBS@
+GREP = @GREP@
+HARFBUZZ_DEPEND = @HARFBUZZ_DEPEND@
+HARFBUZZ_INCLUDES = @HARFBUZZ_INCLUDES@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+ICU_CONFIG = @ICU_CONFIG@
+ICU_DEPEND = @ICU_DEPEND@
+ICU_INCLUDES = @ICU_INCLUDES@
+ICU_LIBS = @ICU_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
+KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
+KPATHSEA_LIBS = @KPATHSEA_LIBS@
+KPATHSEA_PATHS_H = @KPATHSEA_PATHS_H@
+KPSEWHICH = @KPSEWHICH@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBPNG_DEPEND = @LIBPNG_DEPEND@
+LIBPNG_INCLUDES = @LIBPNG_INCLUDES@
+LIBPNG_LIBS = @LIBPNG_LIBS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LUA52_DEFINES = @LUA52_DEFINES@
+LUA52_DEPEND = @LUA52_DEPEND@
+LUA52_INCLUDES = @LUA52_INCLUDES@
+LUA52_LIBS = @LUA52_LIBS@
+LUAJIT_DEFINES = @LUAJIT_DEFINES@
+LUAJIT_DEPEND = @LUAJIT_DEPEND@
+LUAJIT_INCLUDES = @LUAJIT_INCLUDES@
+LUAJIT_LDEXTRA = @LUAJIT_LDEXTRA@
+LUAJIT_LIBS = @LUAJIT_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MPFR_DEPEND = @MPFR_DEPEND@
+MPFR_INCLUDES = @MPFR_INCLUDES@
+MPFR_LIBS = @MPFR_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJCXX = @OBJCXX@
+OBJCXXDEPMODE = @OBJCXXDEPMODE@
+OBJCXXFLAGS = @OBJCXXFLAGS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTANGLE = @OTANGLE@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PIXMAN_DEPEND = @PIXMAN_DEPEND@
+PIXMAN_INCLUDES = @PIXMAN_INCLUDES@
+PIXMAN_LIBS = @PIXMAN_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+POPPLER_DEPEND = @POPPLER_DEPEND@
+POPPLER_INCLUDES = @POPPLER_INCLUDES@
+POPPLER_LIBS = @POPPLER_LIBS@
+PTEXENC_DEPEND = @PTEXENC_DEPEND@
+PTEXENC_INCLUDES = @PTEXENC_INCLUDES@
+PTEXENC_LIBS = @PTEXENC_LIBS@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+SYNCTEXVERSION = @SYNCTEXVERSION@
+SYNCTEX_LT_VERSINFO = @SYNCTEX_LT_VERSINFO@
+TANGLE = @TANGLE@
+TANGLEBOOT = @TANGLEBOOT@
+TECKIT_DEPEND = @TECKIT_DEPEND@
+TECKIT_INCLUDES = @TECKIT_INCLUDES@
+TECKIT_LIBS = @TECKIT_LIBS@
+TIE = @TIE@
+VERSION = @VERSION@
+WANTEDLIBS = @WANTEDLIBS@
+WARNING_CFLAGS = @WARNING_CFLAGS@
+WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
+WARNING_OBJCXXFLAGS = @WARNING_OBJCXXFLAGS@
+WEB2CVERSION = @WEB2CVERSION@
+XMKMF = @XMKMF@
+XPDF_DEPEND = @XPDF_DEPEND@
+XPDF_INCLUDES = @XPDF_INCLUDES@
+XPDF_LIBS = @XPDF_LIBS@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+ZLIB_DEPEND = @ZLIB_DEPEND@
+ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ZLIB_LIBS = @ZLIB_LIBS@
+ZZIPLIB_DEPEND = @ZZIPLIB_DEPEND@
+ZZIPLIB_INCLUDES = @ZZIPLIB_INCLUDES@
+ZZIPLIB_LIBS = @ZZIPLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_OBJCXX = @ac_ct_OBJCXX@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+ipc_socketlibs = @ipc_socketlibs@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lua_socketlibs = @lua_socketlibs@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+subdirs = @subdirs@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+wlibs = @wlibs@
+x_ext_lib = @x_ext_lib@
+x_tool_libs = @x_tool_libs@
+AM_CFLAGS = $(WARNING_CFLAGS)
+mkocp_CPPFLAGS = $(KPATHSEA_INCLUDES)
+mkocp_LDADD = $(KPATHSEA_LIBS)
+mkocp_DEPENDENCIES = $(KPATHSEA_DEPEND)
+EXTRA_DIST = ChangeLog
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ 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*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+ while read p p1; do if test -f $$p \
+ || test -f $$p1 \
+ ; then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n;h' \
+ -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
+ else { print "f", $$3 "/" $$4, $$1; } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+uninstall-binPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+ -e 's/$$/$(EXEEXT)/' \
+ `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+ @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+ echo " rm -f" $$list; \
+ rm -f $$list || exit $$?; \
+ test -n "$(EXEEXT)" || exit 0; \
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
+
+mkocp$(EXEEXT): $(mkocp_OBJECTS) $(mkocp_DEPENDENCIES) $(EXTRA_mkocp_DEPENDENCIES)
+ @rm -f mkocp$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mkocp_OBJECTS) $(mkocp_LDADD) $(LIBS)
+
+mkofm$(EXEEXT): $(mkofm_OBJECTS) $(mkofm_DEPENDENCIES) $(EXTRA_mkofm_DEPENDENCIES)
+ @rm -f mkofm$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(mkofm_OBJECTS) $(mkofm_LDADD) $(LIBS)
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkocp-mkocp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkofm.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mkocp-mkocp.o: mkocp.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mkocp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mkocp-mkocp.o -MD -MP -MF $(DEPDIR)/mkocp-mkocp.Tpo -c -o mkocp-mkocp.o `test -f 'mkocp.c' || echo '$(srcdir)/'`mkocp.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mkocp-mkocp.Tpo $(DEPDIR)/mkocp-mkocp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mkocp.c' object='mkocp-mkocp.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mkocp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mkocp-mkocp.o `test -f 'mkocp.c' || echo '$(srcdir)/'`mkocp.c
+
+mkocp-mkocp.obj: mkocp.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mkocp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mkocp-mkocp.obj -MD -MP -MF $(DEPDIR)/mkocp-mkocp.Tpo -c -o mkocp-mkocp.obj `if test -f 'mkocp.c'; then $(CYGPATH_W) 'mkocp.c'; else $(CYGPATH_W) '$(srcdir)/mkocp.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mkocp-mkocp.Tpo $(DEPDIR)/mkocp-mkocp.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mkocp.c' object='mkocp-mkocp.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mkocp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mkocp-mkocp.obj `if test -f 'mkocp.c'; then $(CYGPATH_W) 'mkocp.c'; else $(CYGPATH_W) '$(srcdir)/mkocp.c'; fi`
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ set x; \
+ here=`pwd`; \
+ $(am__define_uniq_tagged_files); \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+installdirs:
+ for dir in "$(DESTDIR)$(bindir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+ clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
+ ctags ctags-am distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-binPROGRAMS \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
+
+
+@KPATHSEA_RULE@
+
+# 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.
+.NOEXPORT:
diff --git a/source/texk/web2c/pdftexdir/am/libpdftex.am b/source/texk/web2c/pdftexdir/am/libpdftex.am
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c7c5042585fe61deb2aa3536e6229b5425330cdb 100644
--- a/source/texk/web2c/pdftexdir/am/libpdftex.am
+++ b/source/texk/web2c/pdftexdir/am/libpdftex.am
@@ -0,0 +1,65 @@
+## texk/web2c/pdftexdir/am/libpdftex.am: Makefile fragment for libpdftex.
+##
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+
+## libpdftex
+##
+EXTRA_LIBRARIES += libpdftex.a
+
+libpdftex_a_CPPFLAGS = $(REGEX_INCLUDES) $(pdftex_cppflags)
+libpdftex_a_CXXFLAGS = # $(WARNING_CXXFLAGS)
+
+libpdftex_a_SOURCES = \
+ pdftexdir/avl.c \
+ pdftexdir/avl.h \
+ pdftexdir/avlstuff.c \
+ pdftexdir/avlstuff.h \
+ pdftexdir/epdf.c \
+ pdftexdir/image.h \
+ pdftexdir/mapfile.c \
+ pdftexdir/pdftex.h \
+ pdftexdir/pdftex-common.h \
+ pdftexdir/pdftoepdf.cc \
+ pdftexdir/pkin.c \
+ pdftexdir/ptexlib.h \
+ pdftexdir/ptexmac.h \
+ pdftexdir/subfont.c \
+ pdftexdir/tounicode.c \
+ pdftexdir/utils.c \
+ pdftexdir/vfpacket.c \
+ pdftexdir/writeenc.c \
+ pdftexdir/writefont.c \
+ pdftexdir/writeimg.c \
+ pdftexdir/writejbig2.c \
+ pdftexdir/writejpg.c \
+ pdftexdir/writepng.c \
+ pdftexdir/writet1.c \
+ pdftexdir/writet3.c \
+ pdftexdir/writettf.c \
+ pdftexdir/writettf.h \
+ pdftexdir/writezip.c
+
+if MINGW32
+REGEX_INCLUDES = -I$(srcdir)/pdftexdir/regex
+libpdftex_a_SOURCES += \
+ pdftexdir/regex/regex.c \
+ pdftexdir/regex/regex.h
+endif MINGW32
+
+# We must create pdftexd.h (and xpdf...) before building the libpdftex_a_OBJECTS.
+$(libpdftex_a_OBJECTS): pdftexd.h $(XPDF_DEPEND) $(ZLIB_DEPEND) $(LIBPNG_DEPEND)
+
+## included by pdftexdir/writettf.c
+EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c
+
+## included by pdftexdir/regex/regex.c
+EXTRA_libpdftex_a_SOURCES += \
+ pdftexdir/regex/regcomp.c \
+ pdftexdir/regex/regex_internal.c \
+ pdftexdir/regex/regex_internal.h \
+ pdftexdir/regex/regexec.c
+
+EXTRA_DIST += \
+ pdftexdir/regex/COPYING.LIB \
+ pdftexdir/regex/README
diff --git a/source/texk/web2c/pdftexdir/am/pdftex.am b/source/texk/web2c/pdftexdir/am/pdftex.am
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..19fb2f4f30c798259143119c8be87f6c9f76f46d 100644
--- a/source/texk/web2c/pdftexdir/am/pdftex.am
+++ b/source/texk/web2c/pdftexdir/am/pdftex.am
@@ -0,0 +1,105 @@
+## texk/web2c/pdftexdir/am/pdftex.am: Makefile fragment for pdfTeX.
+##
+## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+
+pdftex_cppflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES)
+pdftex_cppflags += -I$(srcdir)/libmd5 -I$(srcdir)/pdftexdir
+
+# used for both pdftex and pdftosrc.
+pdftex_ldadd = $(LIBPNG_LIBS) $(ZLIB_LIBS) $(XPDF_LIBS) libmd5.a
+
+pdftex_dependencies = $(proglib) $(KPATHSEA_DEPEND)
+pdftex_dependencies += $(LIBPNG_DEPEND) $(ZLIB_DEPEND) $(XPDF_DEPEND) libmd5.a
+
+## pdfTeX
+##
+if PDFTEX
+bin_PROGRAMS += pdftex
+endif PDFTEX
+EXTRA_PROGRAMS += pdftex
+
+# Force Automake to use CXXLD for linking
+nodist_EXTRA_pdftex_SOURCES = dummy.cxx
+
+pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(TANGLE)
+
+pdftex_CPPFLAGS = $(pdftex_cppflags)
+pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
+
+# With --enable-ipc, pdfTeX may need to link with -lsocket.
+pdftex_LDADD = libpdftex.a $(pdftex_ldadd) $(LDADD) $(ipc_socketlibs)
+
+pdftex_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a
+
+# We must create libpdftex.a etc before building the pdftex_OBJECTS.
+pdftex_prereq = libpdftex.a pdftexdir/etex_version.h pdftexdir/pdftex_version.h
+$(pdftex_OBJECTS): $(pdftex_prereq)
+
+pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h
+nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c
+dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
+ pdftexdir/pdftex_version.h pdftexdir/etex_version.h
+$(pdftex_c_h): pdftex-web2c
+ @$(web2c) pdftex
+pdftex-web2c: pdftex.p $(web2c_texmf) pdftexdir/pdftex.defines
+ @$(web2c) pdftex
+pdftex.p pdftex.pool: pdftex-tangle
+ @$(pdf_tangle) pdftex pdftex
+pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex.ch tangle-sh
+ @$(pdf_tangle) pdftex pdftex
+pdftex-pool.c: pdftex.pool pdftexd.h $(makecpool_stamp)
+ $(makecpool) pdftex >$@ || rm -f $@
+
+# Extract pdftex version
+$(srcdir)/pdftexdir/pdftex_version.h: @MAINTAINER_MODE_TRUE@ pdftexdir/pdftex.web
+ $(AM_V_GEN)grep '^@d pdftex_version_string==' $(srcdir)/pdftexdir/pdftex.web \
+ | sed "s/^.*'-/#define PDFTEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Extract etex version
+$(srcdir)/pdftexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ pdftexdir/pdftex.web
+ $(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/pdftexdir/pdftex.web \
+ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Generate pdftex.ch
+pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs)
+ $(tie) -c pdftex.ch $(pdftex_ch_srcs)
+pdftex_ch_srcs = \
+ pdftexdir/pdftex.web \
+ pdftexdir/tex.ch0 \
+ tex.ch \
+ enctex.ch \
+ $(pdftex_ch_synctex) \
+ pdftexdir/pdftex.ch \
+ tex-binpool.ch
+##
+EXTRA_DIST += $(pdftex_ch_srcs) pdftexdir/pdftex.defines
+
+DISTCLEANFILES += $(nodist_pdftex_SOURCES) pdftex.ch pdftex-web2c \
+ pdftex.p pdftex.pool pdftex-tangle
+
+EXTRA_DIST += \
+ pdftexdir/ChangeLog \
+ pdftexdir/NEWS \
+ pdftexdir/README \
+ pdftexdir/change-files.txt
+
+# pdfTeX Tests
+#
+pdftex_tests = pdftexdir/wprob.test pdftexdir/pdftex.test pdftexdir/pdfimage.test
+
+EXTRA_DIST += $(pdftex_tests)
+
+if PDFTEX
+TESTS += $(pdftex_tests)
+endif PDFTEX
+
+## wprob.test
+EXTRA_DIST += tests/wprob.tex
+DISTCLEANFILES += pwprob.log pwprob.tex
+
+## pdfimage.test
+EXTRA_DIST += pdftexdir/tests/pdfimage.tex \
+ tests/1-4.jpg tests/B.pdf tests/basic.tex tests/lily-ledger-broken.png
+DISTCLEANFILES += pdfimage.fmt pdfimage.log pdfimage.pdf
+
diff --git a/source/texk/web2c/pdftexdir/am/pdftosrc.am b/source/texk/web2c/pdftexdir/am/pdftosrc.am
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c78a62876107866625abf12c637c152e9d871928 100644
--- a/source/texk/web2c/pdftexdir/am/pdftosrc.am
+++ b/source/texk/web2c/pdftexdir/am/pdftosrc.am
@@ -0,0 +1,40 @@
+## texk/web2c/pdftexdir/am/pdftosrc.am: Makefile fragment for pdftosrc.
+##
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+
+## pdftosrc
+##
+if PDFTEX
+bin_PROGRAMS += pdftosrc
+endif PDFTEX
+EXTRA_PROGRAMS += pdftosrc
+
+# Force Automake to use CXXLD for linking
+nodist_EXTRA_pdftosrc_SOURCES = dummy.cxx
+
+pdftosrc_CPPFLAGS = $(pdftex_cppflags)
+pdftosrc_CXXFLAGS = # $(WARNING_CXXFLAGS)
+
+pdftosrc_SOURCES = pdftexdir/pdftosrc.cc
+
+pdftosrc_LDADD = $(pdftex_ldadd) $(LDADD)
+
+pdftosrc_DEPENDENCIES = $(pdftex_dependencies)
+
+$(pdftosrc_OBJECTS): $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(XPDF_DEPEND)
+
+## Tests
+##
+pdftosrc_tests = pdftexdir/pdftosrc.test
+EXTRA_DIST += $(pdftosrc_tests)
+
+## pdftexdir/pdftosrc.test
+EXTRA_DIST += pdftexdir/tests/test-13.pdf pdftexdir/tests/test-13.xref \
+ pdftexdir/tests/test-15.pdf pdftexdir/tests/test-15.xref
+DISTCLEANFILES += test-13.pdf test-13.xref test-15.pdf test-15.xref
+
+if PDFTEX
+TESTS += $(pdftosrc_tests)
+endif PDFTEX
+
diff --git a/source/texk/web2c/pdftexdir/am/ttf2afm.am b/source/texk/web2c/pdftexdir/am/ttf2afm.am
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..075b60888705b4f3ed124c38cda7f00c0d658205 100644
--- a/source/texk/web2c/pdftexdir/am/ttf2afm.am
+++ b/source/texk/web2c/pdftexdir/am/ttf2afm.am
@@ -0,0 +1,35 @@
+## texk/web2c/pdftexdir/am/ttf2afm.am: Makefile fragment for ttf2afm.
+##
+## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+
+## ttf2afm
+##
+if PDFTEX
+bin_PROGRAMS += ttf2afm
+endif PDFTEX
+EXTRA_PROGRAMS += ttf2afm
+
+ttf2afm_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/pdftexdir
+
+ttf2afm_SOURCES = pdftexdir/ttf2afm.c
+
+ttf2afm_DEPENDENCIES = $(default_dependencies)
+
+## included by pdftexdir/ttf2afm.c
+EXTRA_ttf2afm_SOURCES = pdftexdir/macnames.c
+
+## Tests
+##
+ttf2afm_tests = pdftexdir/ttf2afm.test
+EXTRA_DIST += $(ttf2afm_tests)
+
+## pdftexdir/ttf1afm.test
+EXTRA_DIST += pdftexdir/tests/postV3.afm pdftexdir/tests/postV3.ttf
+EXTRA_DIST += pdftexdir/tests/postV7.afm pdftexdir/tests/postV7.ttf
+DISTCLEANFILES += postV3.afm postV7.afm
+
+if PDFTEX
+TESTS += $(ttf2afm_tests)
+endif PDFTEX
+
diff --git a/source/texk/web2c/pmpostdir/am/pmpost.am b/source/texk/web2c/pmpostdir/am/pmpost.am
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e6e1d9f16547aefca07a60634c948a78d2249e79 100644
--- a/source/texk/web2c/pmpostdir/am/pmpost.am
+++ b/source/texk/web2c/pmpostdir/am/pmpost.am
@@ -0,0 +1,187 @@
+## texk/web2c/pmpostdir/am/pmpost.am: Makefile fragment for pMetaPost.
+##
+## Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+
+## pMetaPost and upMetaPost
+##
+if PMP
+bin_PROGRAMS += pmpost
+if WIN32
+noinst_PROGRAMS += call_pmpost
+install_exe_links += install-pmpost-links
+uninstall_exe_links += uninstall-pmpost-links
+else !WIN32
+bin_links += pmpost$(EXEEXT):pdvitomp
+endif !WIN32
+endif PMP
+if UPMP
+bin_PROGRAMS += upmpost
+if WIN32
+noinst_PROGRAMS += call_upmpost
+install_exe_links += install-upmpost-links
+uninstall_exe_links += uninstall-upmpost-links
+else !WIN32
+bin_links += upmpost$(EXEEXT):updvitomp
+endif !WIN32
+endif UPMP
+EXTRA_PROGRAMS += pmpost upmpost
+
+call_pmpost_CPPFLAGS = -DEXEPROG=\"pmpost.exe\"
+nodist_call_pmpost_SOURCES = callexe.c
+call_pmpost_LDADD =
+
+call_upmpost_CPPFLAGS = -DEXEPROG=\"upmpost.exe\"
+nodist_call_upmpost_SOURCES = callexe.c
+call_upmpost_LDADD =
+
+pmpost_CPPFLAGS = $(MPFR_INCLUDES) $(GMP_INCLUDES) $(CAIRO_INCLUDES) $(PIXMAN_INCLUDES) \
+ $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/mplibdir
+pmpost_LDADD = $(PTEXENC_LIBS) $(KPATHSEA_LIBS) $(MPFR_LIBS) $(GMP_LIBS) \
+ $(CAIRO_LIBS) $(PIXMAN_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) libmputil.a
+
+upmpost_CPPFLAGS = -DUPMP $(pmpost_CPPFLAGS)
+upmpost_LDADD = $(pmpost_LDADD)
+
+.PHONY: install-pmpost-links install-upmpost-links uninstall-pmpost-links uninstall-upmpost-links
+if WIN32
+install-pmpost-links: call_pmpost$(EXEEXT)
+ $(INSTALL_PROGRAM) call_pmpost$(EXEEXT) $(DESTDIR)$(bindir)/pdvitomp$(EXEEXT)
+install-upmpost-links: call_upmpost$(EXEEXT)
+ $(INSTALL_PROGRAM) call_upmpost$(EXEEXT) $(DESTDIR)$(bindir)/updvitomp$(EXEEXT)
+uninstall-pmpost-links:
+ rm -f $(DESTDIR)$(bindir)/pdvitomp$(EXEEXT)
+uninstall-upmpost-links:
+ rm -f $(DESTDIR)$(bindir)/updvitomp$(EXEEXT)
+endif WIN32
+
+# Creating one file: just one rule
+pmp_ctangle = $(ctangle_silent)CWEBINPUTS=.:$(srcdir)/pmpostdir $(ctangle)
+# Creating several files: need stamp file and two rules with identical recipes
+pmp_ctangle_sh = CWEBINPUTS=.:$(srcdir)/pmpostdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(CTANGLE)
+
+## pMetaPost C sources
+nodist_pmpost_SOURCES = $(pmp_c_h) $(pmpmath_c_h) $(pmpmathbinary_c_h) $(pmpmathdecimal_c_h) \
+ $(pmpmathdouble_c_h) pmpost.c $(pmpstrings_c_h) $(pmpxout_c_h) \
+ $(ppngout_c_h) $(ppsout_c_h) $(psvgout_c_h) ptfmin.c
+pmp_c_h = pmp.c pmplib.h pmpmp.h
+pmpmath_c_h = pmpmath.c pmpmath.h
+pmpmathbinary_c_h = pmpmathbinary.c pmpmathbinary.h
+pmpmathdecimal_c_h = pmpmathdecimal.c pmpmathdecimal.h
+pmpmathdouble_c_h = pmpmathdouble.c pmpmathdouble.h
+pmpstrings_c_h = pmpstrings.h pmpstrings.c
+pmpxout_c_h = pmpxout.c pmpxout.h
+ppngout_c_h = pmplibpng.h pmppngout.h ppngout.c
+ppsout_c_h = pmppsout.h ppsout.c pmplibps.h
+psvgout_c_h = pmplibsvg.h pmpsvgout.h psvgout.c
+
+## upMetaPost C sources
+nodist_upmpost_SOURCES = $(nodist_pmpost_SOURCES)
+
+# sed script
+pmp_sed_main = 's/mpxout\.h/pmpxout.h/;s/mpmp\.h/pmpmp.h/;s/mplib\.h/pmplib.h/;s/mpstrings\.h/pmpstrings.h/'
+pmp_sed_math = 's/mpmath\([a-z]*\)\.h/pmpmath\1.h/'
+pmp_sed_ps = 's/mplibps\.h/pmplibps.h/;s/mppsout\.h/pmppsout.h/'
+pmp_sed_svg = 's/mplibsvg\.h/pmplibsvg.h/;s/mpsvgout\.h/pmpsvgout.h/'
+pmp_sed_png = 's/mplibpng\.h/pmplibpng.h/;s/mppngout\.h/pmppngout.h/'
+pmp_sed = sed -e $(pmp_sed_main) -e $(pmp_sed_math) -e $(pmp_sed_ps) -e $(pmp_sed_svg) -e $(pmp_sed_png)
+
+pmp.w: mplibdir/mp.w
+ $(AM_V_GEN)$(pmp_sed) $(srcdir)/mplibdir/mp.w >$@
+pmpmath.c: mpmath.c
+ $(AM_V_GEN)$(pmp_sed) mpmath.c >$@
+pmpmath.h: mpmath.h
+ $(AM_V_GEN)$(pmp_sed) mpmath.h >$@
+pmpmathbinary.c: mpmathbinary.c
+ $(AM_V_GEN)$(pmp_sed) mpmathbinary.c >$@
+pmpmathbinary.h: mpmathbinary.h
+ $(AM_V_GEN)$(pmp_sed) mpmathbinary.h >$@
+pmpmathdecimal.c: mpmathdecimal.c
+ $(AM_V_GEN)$(pmp_sed) mpmathdecimal.c >$@
+pmpmathdecimal.h: mpmathdecimal.h
+ $(AM_V_GEN)$(pmp_sed) mpmathdecimal.h >$@
+pmpmathdouble.c: mpmathdouble.c
+ $(AM_V_GEN)$(pmp_sed) mpmathdouble.c >$@
+pmpmathdouble.h: mpmathdouble.h
+ $(AM_V_GEN)$(pmp_sed) mpmathdouble.h >$@
+pmpost.w: mplibdir/mpost.w
+ $(AM_V_GEN)$(pmp_sed) $(srcdir)/mplibdir/mpost.w >$@
+pmpstrings.c: mpstrings.c
+ $(AM_V_GEN)$(pmp_sed) mpstrings.c >$@
+pmpstrings.h: mpstrings.h
+ $(AM_V_GEN)$(pmp_sed) mpstrings.h >$@
+pmpxout.w: mplibdir/mpxout.w
+ $(AM_V_GEN)$(pmp_sed) $(srcdir)/mplibdir/mpxout.w >$@
+pmplibpng.h: mplibpng.h
+ $(AM_V_GEN)$(pmp_sed) mplibpng.h >$@
+pmppngout.h: mppngout.h
+ $(AM_V_GEN)$(pmp_sed) mppngout.h >$@
+ppngout.c: pngout.c
+ $(AM_V_GEN)$(pmp_sed) pngout.c >$@
+ppsout.w: mplibdir/psout.w
+ $(AM_V_GEN)$(pmp_sed) $(srcdir)/mplibdir/psout.w >$@
+psvgout.w: mplibdir/svgout.w
+ $(AM_V_GEN)$(pmp_sed) $(srcdir)/mplibdir/svgout.w >$@
+ptfmin.w: mplibdir/tfmin.w
+ $(AM_V_GEN)$(pmp_sed) $(srcdir)/mplibdir/tfmin.w >$@
+
+# Creating one file: just one rule
+pmpost.c: ctangle$(EXEEXT) pmpost.w pmpostdir/pmpost.ch
+ $(pmp_ctangle) pmpost pmpost
+ptfmin.c: ctangle$(EXEEXT) ptfmin.w pmpostdir/ptfmin.ch
+ $(pmp_ctangle) ptfmin ptfmin
+
+# Creating several files: need stamp file and two rules with identical recipes
+$(pmp_c_h): pmp-tangle
+ @$(pmp_ctangle_sh) pmp pmp
+pmp-tangle: ctangle$(EXEEXT) pmp.w pmpostdir/pmp.ch tangle-sh
+ @$(pmp_ctangle_sh) pmp pmp
+
+$(pmpxout_c_h): pmpxout-tangle
+ @$(pmp_ctangle_sh) pmpxout pmpxout
+pmpxout-tangle: ctangle$(EXEEXT) pmpxout.w pmpostdir/pmpxout.ch tangle-sh
+ @$(pmp_ctangle_sh) pmpxout pmpxout
+
+$(ppsout_c_h): ppsout-tangle
+ @$(pmp_ctangle_sh) ppsout ppsout
+ppsout-tangle: ctangle$(EXEEXT) ppsout.w pmpostdir/ppsout.ch tangle-sh
+ @$(pmp_ctangle_sh) ppsout ppsout
+
+$(psvgout_c_h): psvgout-tangle
+ @$(pmp_ctangle_sh) psvgout psvgout
+psvgout-tangle: ctangle$(EXEEXT) psvgout.w pmpostdir/psvgout.ch tangle-sh
+ @$(pmp_ctangle_sh) psvgout psvgout
+
+## pMetaPost CWeb sources
+pmpost_web = pmpostdir/pmp.ch pmpostdir/pmpost.ch pmpostdir/pmpxout.ch pmpostdir/ppsout.ch \
+ pmpostdir/psvgout.ch pmpostdir/ptfmin.ch
+
+$(pmpost_OBJECTS) $(upmpost_OBJECTS): $(nodist_pmpost_SOURCES) $(PTEXENC_DEPEND) \
+ $(LIBPNG_DEPEND) $(CAIRO_DEPEND) $(MPFR_DEPEND)
+
+EXTRA_DIST += pmpostdir/ChangeLog $(pmpost_web)
+
+DISTCLEANFILES += $(nodist_pmpost_SOURCES) \
+ pmp.w pmpost.w pmpxout.w ppsout.w psvgout.w ptfmin.w \
+ pmp-tangle pmpxout-tangle ppsout-tangle psvgout-tangle
+
+## (u)pMetaPost Tests
+##
+pmpost_tests = pmpostdir/pmpost.test pmpostdir/pmpsamp.test
+upmpost_tests = pmpostdir/upmpost.test pmpostdir/upmpsamp.test
+
+EXTRA_DIST += $(pmpost_tests) $(upmpost_tests)
+
+if PMP
+TESTS += $(pmpost_tests)
+endif PMP
+if UPMP
+TESTS += $(upmpost_tests)
+endif UPMP
+
+EXTRA_DIST += pmpostdir/tests/psample.mp
+## pmpostdir/pmpsamp.test
+DISTCLEANFILES += pmpsamp.*
+## pmpostdir/upmpsamp.test
+DISTCLEANFILES += upmpsamp.*
+
diff --git a/source/texk/web2c/ptexdir/am/ptex.am b/source/texk/web2c/ptexdir/am/ptex.am
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..46a31b1974069d9e8d4c66b015d46d8e11b9f3f5 100644
--- a/source/texk/web2c/ptexdir/am/ptex.am
+++ b/source/texk/web2c/ptexdir/am/ptex.am
@@ -0,0 +1,229 @@
+## texk/web2c/ptexdir/am/ptex.am: Makefile fragment for pTeX.
+##
+## Copyright (C) 2010-2014 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+
+ptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
+ptex_ldadd = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD)
+ptex_dependencies = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies)
+p_tangle = $(tangle_silent)WEBINPUTS=.:$(srcdir)/ptexdir:$(srcdir) $(buildenv) $(TANGLE)
+
+pweb_programs = pbibtex pdvitype ppltotf ptftopl
+
+# pTeX Tests
+#
+ptex_tests = ptexdir/ptriptest
+pweb_tests = \
+ ptexdir/pbibtex.test \
+ ptexdir/pdvitype.test \
+ ptexdir/ppltotf.test \
+ ptexdir/ptftopl.test
+
+EXTRA_DIST += $(ptex_tests) $(pweb_tests)
+DISTCLEANFILES += $(pweb_programs:=.c) $(pweb_programs:=.h) \
+ $(pweb_programs:=.p) $(pweb_programs:=-web2c) $(pweb_programs:=.web)
+
+## pTeX library
+##
+pproglib = lib/libp.a
+# Rebuild $(pproglib)
+$(pproglib): $(KPATHSEA_DEPEND) ${srcdir}/lib/*.c
+ cd lib && $(MAKE) $(AM_MAKEFLAGS) libp.a
+
+## libkanji.a for pTeX and e-pTeX
+##
+EXTRA_LIBRARIES += libkanji.a
+libkanji_a_SOURCES = ptexdir/kanji.c ptexdir/kanji.h
+libkanji_a_CPPFLAGS = $(ptex_cppflags)
+
+## pTeX
+##
+if PTEX
+bin_PROGRAMS += ptex
+endif PTEX
+if PWEB
+bin_PROGRAMS += $(pweb_programs)
+endif PWEB
+EXTRA_PROGRAMS += ptex $(pweb_programs)
+
+ptex_CPPFLAGS = $(ptex_cppflags)
+
+# With --enable-ipc, pTeX may need to link with -lsocket.
+ptex_LDADD = $(ptex_ldadd) $(ipc_socketlibs)
+ptex_DEPENDENCIES = $(ptex_dependencies)
+
+# pTeX C sources
+ptex_c_h = ptexini.c ptex0.c ptexcoerce.h ptexd.h
+nodist_ptex_SOURCES = $(ptex_c_h) ptex-pool.c
+dist_ptex_SOURCES = ptexdir/ptexextra.c ptexdir/ptexextra.h ptexdir/ptex_version.h
+
+# We must create ptexd.h and ptexdir/ptex_version.h before building the ptex_OBJECTS.
+ptex_prereq = ptexd.h ptexdir/ptex_version.h
+$(ptex_OBJECTS): $(ptex_prereq)
+
+$(ptex_c_h): ptex-web2c
+ @$(web2c) ptex
+ptex-web2c: ptex.p $(web2c_texmf) ptexdir/ptex.defines
+ @$(web2c) ptex
+
+ptex-pool.c: ptex.pool ptexd.h $(makecpool_stamp)
+ $(makecpool) ptex >$@ || rm -f $@
+
+# Tangling pTeX
+ptex.p ptex.pool: ptex-tangle
+ @$(texmf_tangle) ptex ptex
+ptex-tangle: tangle$(EXEEXT) ptex.web ptex.ch tangle-sh
+ @$(texmf_tangle) ptex ptex
+
+# Extract ptex version
+$(srcdir)/ptexdir/ptex_version.h: @MAINTAINER_MODE_TRUE@ ptexdir/ptex-base.ch
+ $(AM_V_GEN)grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex-base.ch \
+ | sed "s/^.*'-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Generate ptex.web
+ptex.web: tie$(EXEEXT) $(ptex_web_srcs)
+ $(tie) -m ptex.web $(ptex_web_srcs)
+ptex_web_srcs = \
+ tex.web \
+ tex.ch
+
+# Generate ptex.ch
+ptex.ch: tie$(EXEEXT) ptex.web $(ptex_ch_srcs)
+ $(tie) -c ptex.ch ptex.web $(ptex_ch_srcs)
+ptex_ch_srcs = \
+ ptexdir/ptex-base.ch \
+ $(ptex_ch_synctex) \
+ tex-binpool.ch
+
+EXTRA_DIST += $(ptex_web_srcs) $(ptex_ch_srcs) ptexdir/ptex.defines
+
+DISTCLEANFILES += $(nodist_ptex_SOURCES) ptex.web ptex.ch ptex-web2c \
+ ptex.p ptex.pool ptex-tangle
+
+## pBibTeX
+##
+nodist_pbibtex_SOURCES = pbibtex.c pbibtex.h
+pbibtex_SOURCES = ptexdir/kanji.h
+pbibtex_CPPFLAGS = $(ptex_cppflags)
+pbibtex_LDADD = $(ptex_ldadd)
+pbibtex_DEPENDENCIES = $(ptex_dependencies)
+pbibtex.c pbibtex.h: pbibtex-web2c
+ @$(web2c) pbibtex
+pbibtex-web2c: pbibtex.p $(web2c_depend) ptexdir/ptex.defines web2c/cvtbib.sed
+ @$(web2c) pbibtex
+pbibtex.p: tangle$(EXEEXT) pbibtex.web ptexdir/pbibtex.ch
+ $(p_tangle) pbibtex pbibtex
+pbibtex.web: tie$(EXEEXT) bibtex.web bibtex.ch
+ $(tie) -m pbibtex.web bibtex.web bibtex.ch
+EXTRA_DIST += ptexdir/pbibtex.ch web2c/cvtbib.sed
+
+pweb_tests += ptexdir/pbibtex-openout-test.pl ptexdir/pbibtex-longline-test.pl
+pweb_tests += ptexdir/pbibtex-mem.test ptexdir/nissya.test
+
+## pDVItype
+##
+nodist_pdvitype_SOURCES = pdvitype.c pdvitype.h
+pdvitype_SOURCES = ptexdir/kanji.h
+pdvitype_CPPFLAGS = $(ptex_cppflags) -DHEX_CHAR_CODE
+pdvitype_LDADD = $(ptex_ldadd)
+pdvitype_DEPENDENCIES = $(ptex_dependencies)
+pdvitype.c pdvitype.h: pdvitype-web2c
+ @$(web2c) pdvitype
+pdvitype-web2c: pdvitype.p $(web2c_depend) ptexdir/ptex.defines
+ @$(web2c) pdvitype
+pdvitype.p: tangle$(EXEEXT) pdvitype.web ptexdir/pdvitype.ch
+ $(p_tangle) pdvitype pdvitype
+pdvitype.web: tie$(EXEEXT) dvitype.web dvitype.ch
+ $(tie) -m pdvitype.web dvitype.web dvitype.ch
+EXTRA_DIST += ptexdir/pdvitype.ch
+
+pweb_tests += ptexdir/sample.test
+
+## pPLtoTF
+##
+nodist_ppltotf_SOURCES = ppltotf.c ppltotf.h
+ppltotf_SOURCES = ptexdir/kanji.h
+ppltotf_CPPFLAGS = $(ptex_cppflags) -DPRESERVE_PUTC
+ppltotf_LDADD = $(ptex_ldadd)
+ppltotf_DEPENDENCIES = $(ptex_dependencies)
+ppltotf.c ppltotf.h: ppltotf-web2c
+ @$(web2c) ppltotf
+ppltotf-web2c: ppltotf.p $(web2c_depend) ptexdir/ptex.defines
+ @$(web2c) ppltotf
+ppltotf.p: tangle$(EXEEXT) ppltotf.web ptexdir/ppltotf.ch
+ $(p_tangle) ppltotf ppltotf
+ppltotf.web: tie$(EXEEXT) pltotf.web pltotf.ch
+ $(tie) -m ppltotf.web pltotf.web pltotf.ch
+EXTRA_DIST += ptexdir/ppltotf.ch
+
+## pTFtoPL
+##
+nodist_ptftopl_SOURCES = ptftopl.c ptftopl.h
+ptftopl_SOURCES = ptexdir/kanji.h
+ptftopl_CPPFLAGS = $(ptex_cppflags)
+ptftopl_LDADD = $(ptex_ldadd)
+ptftopl_DEPENDENCIES = $(ptex_dependencies)
+ptftopl.c ptftopl.h: ptftopl-web2c
+ @$(web2c) ptftopl
+ptftopl-web2c: ptftopl.p $(web2c_depend) ptexdir/ptex.defines
+ @$(web2c) ptftopl
+ptftopl.p: tangle$(EXEEXT) ptftopl.web ptexdir/ptftopl.ch
+ $(p_tangle) ptftopl ptftopl
+ptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch
+ $(tie) -m ptftopl.web tftopl.web tftopl.ch
+EXTRA_DIST += ptexdir/ptftopl.ch
+
+pweb_tests += ptexdir/yokotate.test
+
+##
+EXTRA_DIST += \
+ ptexdir/COPYRIGHT \
+ ptexdir/COPYRIGHT.jis \
+ ptexdir/ChangeLog \
+ ptexdir/Changes.txt \
+ ptexdir/INSTALL.txt \
+ ptexdir/README.txt
+
+if PTEX
+TESTS += $(ptex_tests)
+check_PROGRAMS += dvitype pltotf tftopl
+TRIPTRAP += ptrip.diffs
+TRIPTRAP_CLEAN += ptrip-clean
+endif PTEX
+if PWEB
+TESTS += $(pweb_tests)
+endif PWEB
+
+## Test data and results
+##
+## ptexdir/nissya.test
+EXTRA_DIST += ptexdir/tests/nissya_bib.aux ptexdir/tests/nissya.bst ptexdir/tests/sample.bib
+DISTCLEANFILES += ptests/nissya_bib.*
+## ptexdir/pbibtex.test
+DISTCLEANFILES += ptests/xexampl.aux ptests/xexampl.bbl ptests/xexampl.blg
+## ptexdir/pbibtex-mem.test
+EXTRA_DIST += tests/memdata1.bst tests/memdata2.bst tests/memdata3.bst
+DISTCLEANFILES += ptests/memtest.bib ptests/memtest?.*
+## ptexdir/pdvitype.test
+DISTCLEANFILES += ptests/xstory.dvityp ptests/xpagenum.typ
+## ptexdir/ppltotf.test
+DISTCLEANFILES += ptests/xcmr10.tfm
+## ptexdir/ptftopl.test
+DISTCLEANFILES += ptests/xcmr10.pl
+## ptexdir/sample.test
+EXTRA_DIST += ptexdir/tests/goth10.tfm ptexdir/tests/sample.dvi
+DISTCLEANFILES += ptests/xsample.typ
+## ptexdir/yokotate.test
+EXTRA_DIST += ptexdir/tests/min10.pl ptexdir/tests/min10.tfm
+EXTRA_DIST += ptexdir/tests/tmin10.pl ptexdir/tests/tmin10.tfm
+DISTCLEANFILES += ptests/x*min10.*
+## ptexdir/ptriptest
+EXTRA_DIST += ptexdir/ptrip/ptrip.diffs ptexdir/ptrip/texmf.cnf
+ptrip.diffs: ptex$(EXEEXT)
+ $(triptrap_diffs) $@
+.PHONY: ptrip-clean
+ptrip-clean:
+ rm -rf ptripdir
+
+DISTCLEANFILES += ptrip.diffs
+
diff --git a/source/texk/web2c/synctexdir/ac/synctex.ac b/source/texk/web2c/synctexdir/ac/synctex.ac
new file mode 100644
index 0000000000000000000000000000000000000000..5ecc2fa085b9494f1abe377880042d022b5047bf
--- /dev/null
+++ b/source/texk/web2c/synctexdir/ac/synctex.ac
@@ -0,0 +1,20 @@
+## texk/web2c/synctexdir/ac/synctex.ac: configure.ac fragment for the TeX Live subdirectory texk/web2c/
+dnl
+dnl Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
+dnl Additional code for synctex
+dnl
+dnl Building libsynctex as shared library requires a system zlib
+AM_CONDITIONAL([SYSTEM_ZLIB], [test "x$with_system_zlib" = xyes])
+
+AM_CONDITIONAL([SYNCTEX], [test "x$enable_synctex" != xno])
+
+m4_define([synctex_version], m4_chomp(m4_include([synctexdir/synctex_parser_version.txt]))[.0])
+AC_SUBST([SYNCTEXVERSION], [synctex_version])
+KPSE_LT_VERSION([synctex])
+AS_IF([test "x$enable_synctex" != xno],
+ [AC_SUBST([WANTEDLIBS], [libsynctex.la])])
+
+AC_CONFIG_FILES([synctexdir/synctex.pc])
+
diff --git a/source/texk/web2c/synctexdir/am/synctex.am b/source/texk/web2c/synctexdir/am/synctex.am
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c4481ae1cadb17947b43a5d37fef37c4a8b98a06 100644
--- a/source/texk/web2c/synctexdir/am/synctex.am
+++ b/source/texk/web2c/synctexdir/am/synctex.am
@@ -0,0 +1,353 @@
+## texk/web2c/synctexdir/am/synctex.am: Makefile fragment for SyncTeX.
+##
+## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+
+## The SyncTeX tool
+
+if SYNCTEX
+bin_PROGRAMS += synctex
+endif SYNCTEX
+EXTRA_PROGRAMS += synctex
+
+synctex_SOURCES = \
+ synctexdir/synctex_main.c
+
+synctex_CPPFLAGS = -I$(srcdir)/synctexdir
+
+if SYSTEM_ZLIB
+libsynctex = libsynctex.la
+else !SYSTEM_ZLIB
+libsynctex = libsynctex.a
+endif !SYSTEM_ZLIB
+
+synctex_LDADD = $(libsynctex) $(ZLIB_LIBS)
+
+$(synctex_OBJECTS): $(libsynctex)
+
+## The (shared or nonshared) SyncTeX parser library
+
+EXTRA_LTLIBRARIES = libsynctex.la
+EXTRA_LIBRARIES += libsynctex.a
+
+if SYNCTEX
+if SYSTEM_ZLIB
+lib_LTLIBRARIES = $(WANTEDLIBS)
+else !SYSTEM_ZLIB
+lib_LIBRARIES = libsynctex.a
+endif !SYSTEM_ZLIB
+endif SYNCTEX
+
+libsynctex_la_CPPFLAGS = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -DSYNCTEX_USE_LOCAL_HEADER
+libsynctex_a_CPPFLAGS = $(libsynctex_la_CPPFLAGS)
+
+libsynctex_la_LDFLAGS = -rpath @libdir@ -bindir @bindir@ -no-undefined -version-info $(SYNCTEX_LT_VERSINFO)
+
+libsynctex_la_LIBADD = $(ZLIB_LIBS)
+
+libsynctex_la_SOURCES = \
+ synctexdir/synctex_parser.c \
+ synctexdir/synctex_parser_local.h \
+ synctexdir/synctex_parser_utils.c
+nodist_libsynctex_a_SOURCES = $(libsynctex_la_SOURCES)
+
+$(libsynctex_la_OBJECTS): $(ZLIB_DEPEND)
+$(libsynctex_a_OBJECTS): $(ZLIB_DEPEND)
+
+syncincludedir = ${includedir}/synctex
+
+pkgconfigdir = ${libdir}/pkgconfig
+
+if SYNCTEX
+syncinclude_HEADERS = \
+ synctexdir/synctex_parser.h \
+ synctexdir/synctex_parser_utils.h
+
+pkgconfig_DATA = synctexdir/synctex.pc
+endif SYNCTEX
+
+dist_man_MANS += synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
+
+EXTRA_DIST += \
+ synctexdir/ChangeLog \
+ synctexdir/README.txt \
+ synctexdir/synctex_parser_readme.txt \
+ synctexdir/synctex_parser_version.txt \
+ synctexdir/tests
+
+## SyncTeX infrastructure: common for all engines
+
+EXTRA_DIST += \
+ synctexdir/synctex-common.h \
+ synctexdir/synctex.c \
+ synctexdir/synctex.defines \
+ synctexdir/synctex.h
+
+## SyncTeX infrastructure: TeX
+
+if TEX_SYNCTEX
+
+tex_CPPFLAGS += -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)
+
+tex_LDADD += $(ZLIB_LIBS)
+tex_prereq += $(ZLIB_DEPEND)
+
+tex_ch_synctex = \
+ synctexdir/synctex-def.ch0 \
+ synctexdir/synctex-mem.ch0 \
+ synctexdir/synctex-mem.ch2 \
+ synctexdir/synctex-rec.ch0 \
+ synctexdir/synctex-rec.ch1 \
+ synctexdir/synctex-rec.ch2
+
+dist_tex_SOURCES += \
+ synctexdir/synctex.c \
+ synctexdir/synctex.h \
+ synctexdir/synctex-common.h \
+ synctexdir/synctex-tex.h
+
+tex_CPPFLAGS += -D__SyncTeX__ -DSYNCTEX_ENGINE_H=\"synctex-tex.h\"
+
+endif TEX_SYNCTEX
+
+EXTRA_DIST += \
+ synctexdir/synctex-def.ch0 \
+ synctexdir/synctex-mem.ch0 \
+ synctexdir/synctex-mem.ch2 \
+ synctexdir/synctex-rec.ch0 \
+ synctexdir/synctex-rec.ch1 \
+ synctexdir/synctex-rec.ch2
+
+## SyncTeX infrastructure: e-TeX
+
+if ETEX_SYNCTEX
+
+etex_CPPFLAGS += -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)
+
+etex_LDADD += $(ZLIB_LIBS)
+etex_prereq += $(ZLIB_DEPEND)
+
+etex_ch_synctex = \
+ synctexdir/synctex-def.ch0 \
+ synctexdir/synctex-mem.ch0 \
+ synctexdir/synctex-e-mem.ch0 \
+ synctexdir/synctex-e-mem.ch1 \
+ synctexdir/synctex-rec.ch0 \
+ synctexdir/synctex-rec.ch1 \
+ synctexdir/synctex-e-rec.ch0
+
+dist_etex_SOURCES += \
+ synctexdir/synctex.c \
+ synctexdir/synctex.h \
+ synctexdir/synctex-common.h \
+ synctexdir/synctex-etex.h
+
+etex_CPPFLAGS += -D__SyncTeX__ -DSYNCTEX_ENGINE_H=\"synctex-etex.h\"
+
+endif ETEX_SYNCTEX
+
+EXTRA_DIST += \
+ synctexdir/synctex-e-mem.ch0 \
+ synctexdir/synctex-e-mem.ch1 \
+ synctexdir/synctex-e-rec.ch0
+
+## SyncTeX infrastructure: pTeX
+
+if PTEX_SYNCTEX
+
+ptex_CPPFLAGS += -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)
+
+ptex_LDADD += $(ZLIB_LIBS)
+ptex_prereq += $(ZLIB_DEPEND)
+
+ptex_ch_synctex = \
+ synctexdir/synctex-def.ch0 \
+ synctexdir/synctex-p-mem.ch0 \
+ synctexdir/synctex-mem.ch0 \
+ synctexdir/synctex-p-mem.ch1 \
+ synctexdir/synctex-p-rec.ch0 \
+ synctexdir/synctex-rec.ch0 \
+ synctexdir/synctex-rec.ch1 \
+ synctexdir/synctex-rec.ch2 \
+ synctexdir/synctex-p-rec.ch1
+
+dist_ptex_SOURCES += \
+ synctexdir/synctex.c \
+ synctexdir/synctex.h \
+ synctexdir/synctex-common.h \
+ synctexdir/synctex-ptex.h
+
+ptex_CPPFLAGS += -D__SyncTeX__ -DSYNCTEX_ENGINE_H=\"synctex-ptex.h\"
+
+endif PTEX_SYNCTEX
+
+EXTRA_DIST += \
+ synctexdir/synctex-p-mem.ch0 \
+ synctexdir/synctex-p-mem.ch1 \
+ synctexdir/synctex-p-rec.ch0 \
+ synctexdir/synctex-p-rec.ch1
+
+## SyncTeX infrastructure: upTeX
+
+if UPTEX_SYNCTEX
+
+uptex_CPPFLAGS += -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)
+
+uptex_LDADD += $(ZLIB_LIBS)
+uptex_prereq += $(ZLIB_DEPEND)
+
+uptex_ch_synctex = \
+ synctexdir/synctex-def.ch0 \
+ synctexdir/synctex-p-mem.ch0 \
+ synctexdir/synctex-mem.ch0 \
+ synctexdir/synctex-p-mem.ch1 \
+ synctexdir/synctex-p-rec.ch0 \
+ synctexdir/synctex-rec.ch0 \
+ synctexdir/synctex-rec.ch1 \
+ synctexdir/synctex-rec.ch2 \
+ synctexdir/synctex-p-rec.ch1
+
+dist_uptex_SOURCES += \
+ synctexdir/synctex.c \
+ synctexdir/synctex.h \
+ synctexdir/synctex-common.h \
+ synctexdir/synctex-uptex.h
+
+uptex_CPPFLAGS += -D__SyncTeX__ -DSYNCTEX_ENGINE_H=\"synctex-uptex.h\"
+
+endif UPTEX_SYNCTEX
+
+## SyncTeX infrastructure: e-pTeX
+
+if EPTEX_SYNCTEX
+
+eptex_CPPFLAGS += -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)
+
+eptex_LDADD += $(ZLIB_LIBS)
+eptex_prereq += $(ZLIB_DEPEND)
+
+eptex_ch_synctex = \
+ synctexdir/synctex-def.ch0 \
+ synctexdir/synctex-ep-mem.ch0 \
+ synctexdir/synctex-mem.ch0 \
+ synctexdir/synctex-e-mem.ch0 \
+ synctexdir/synctex-ep-mem.ch1 \
+ synctexdir/synctex-p-rec.ch0 \
+ synctexdir/synctex-rec.ch0 \
+ synctexdir/synctex-rec.ch1 \
+ synctexdir/synctex-e-rec.ch0 \
+ synctexdir/synctex-p-rec.ch1
+
+dist_eptex_SOURCES += \
+ synctexdir/synctex.c \
+ synctexdir/synctex.h \
+ synctexdir/synctex-common.h \
+ synctexdir/synctex-eptex.h
+
+eptex_CPPFLAGS += -D__SyncTeX__ -DSYNCTEX_ENGINE_H=\"synctex-eptex.h\"
+
+endif EPTEX_SYNCTEX
+
+EXTRA_DIST += \
+ synctexdir/synctex-ep-mem.ch0 \
+ synctexdir/synctex-ep-mem.ch1
+
+## SyncTeX infrastructure: e-upTeX
+
+if EUPTEX_SYNCTEX
+
+euptex_CPPFLAGS += -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)
+
+euptex_LDADD += $(ZLIB_LIBS)
+euptex_prereq += $(ZLIB_DEPEND)
+
+euptex_ch_synctex = \
+ synctexdir/synctex-def.ch0 \
+ synctexdir/synctex-ep-mem.ch0 \
+ synctexdir/synctex-mem.ch0 \
+ synctexdir/synctex-e-mem.ch0 \
+ synctexdir/synctex-ep-mem.ch1 \
+ synctexdir/synctex-p-rec.ch0 \
+ synctexdir/synctex-rec.ch0 \
+ synctexdir/synctex-rec.ch1 \
+ synctexdir/synctex-e-rec.ch0 \
+ synctexdir/synctex-p-rec.ch1
+
+dist_euptex_SOURCES += \
+ synctexdir/synctex.c \
+ synctexdir/synctex.h \
+ synctexdir/synctex-common.h \
+ synctexdir/synctex-euptex.h
+
+euptex_CPPFLAGS += -D__SyncTeX__ -DSYNCTEX_ENGINE_H=\"synctex-euptex.h\"
+
+endif EUPTEX_SYNCTEX
+
+## SyncTeX infrastructure: pdfTeX
+
+if PDFTEX_SYNCTEX
+
+pdftex_CPPFLAGS += -I$(srcdir)/synctexdir
+
+pdftex_ch_synctex = \
+ synctexdir/synctex-def.ch0 \
+ synctexdir/synctex-mem.ch0 \
+ synctexdir/synctex-e-mem.ch0 \
+ synctexdir/synctex-e-mem.ch1 \
+ synctexdir/synctex-rec.ch0 \
+ synctexdir/synctex-rec.ch1 \
+ synctexdir/synctex-e-rec.ch0 \
+ synctexdir/synctex-pdf-rec.ch2
+
+dist_pdftex_SOURCES += \
+ synctexdir/synctex.c \
+ synctexdir/synctex.h \
+ synctexdir/synctex-common.h \
+ synctexdir/synctex-pdftex.h
+
+pdftex_CPPFLAGS += -D__SyncTeX__ -DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\"
+
+endif PDFTEX_SYNCTEX
+
+EXTRA_DIST += \
+ synctexdir/synctex-pdf-rec.ch2
+
+## SyncTeX infrastructure: XeTeX
+
+if XETEX_SYNCTEX
+
+xetex_CPPFLAGS += -I$(srcdir)/synctexdir
+
+xetex_ch_synctex = \
+ synctexdir/synctex-xe-def.ch0 \
+ synctexdir/synctex-mem.ch0 \
+ synctexdir/synctex-e-mem.ch1 \
+ synctexdir/synctex-rec.ch0 \
+ synctexdir/synctex-xe-rec.ch0
+
+xetex_post_ch_synctex = \
+ synctexdir/synctex-xe-rec.ch3
+
+dist_xetex_SOURCES += \
+ synctexdir/synctex.c \
+ synctexdir/synctex.h \
+ synctexdir/synctex-common.h \
+ synctexdir/synctex-xetex.h
+
+xetex_CPPFLAGS += -D__SyncTeX__ -DSYNCTEX_ENGINE_H=\"synctex-xetex.h\"
+
+endif XETEX_SYNCTEX
+
+EXTRA_DIST += \
+ synctexdir/synctex-xe-rec.ch3
+
+# SyncTeX Tests
+#
+synctex_tests = synctexdir/synctex.test
+
+EXTRA_DIST += $(synctex_tests)
+
+if SYNCTEX
+TESTS += $(synctex_tests)
+endif SYNCTEX
+
diff --git a/source/texk/web2c/synctexdir/synctex.pc.in b/source/texk/web2c/synctexdir/synctex.pc.in
new file mode 100644
index 0000000000000000000000000000000000000000..7da4eead61838cde59e1e047e4507da7e917813d
--- /dev/null
+++ b/source/texk/web2c/synctexdir/synctex.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: synctex
+Description: SyncTeX parser library
+Version: @SYNCTEXVERSION@
+Requires.private: zlib
+Libs: -L${libdir} -lsynctex
+Cflags: -I${includedir}/synctex
+
diff --git a/source/texk/web2c/synctexdir/synctex_parser_version.txt b/source/texk/web2c/synctexdir/synctex_parser_version.txt
new file mode 100644
index 0000000000000000000000000000000000000000..68209c0009fd711ede50ef74974ec712b797de90
--- /dev/null
+++ b/source/texk/web2c/synctexdir/synctex_parser_version.txt
@@ -0,0 +1 @@
+1.17
\ No newline at end of file
diff --git a/source/texk/web2c/uptexdir/am/uptex.am b/source/texk/web2c/uptexdir/am/uptex.am
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..9cc6b12a101748ab4decd0745b3266eff946cac5 100644
--- a/source/texk/web2c/uptexdir/am/uptex.am
+++ b/source/texk/web2c/uptexdir/am/uptex.am
@@ -0,0 +1,205 @@
+## texk/web2c/uptexdir/am/uptex.am: Makefile fragment for upTeX.
+##
+## Copyright (C) 2011-2014 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+
+uptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
+uptex_ldadd = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD)
+uptex_dependencies = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies)
+up_tangle = $(tangle_silent)WEBINPUTS=.:$(srcdir)/uptexdir:$(srcdir) $(buildenv) $(TANGLE)
+
+upweb_programs = upbibtex updvitype uppltotf uptftopl
+
+# upTeX Tests
+uptex_tests = uptexdir/uptriptest
+upweb_tests = \
+ uptexdir/upbibtex.test \
+ uptexdir/updvitype.test \
+ uptexdir/uppltotf.test \
+ uptexdir/uptftopl.test
+
+EXTRA_DIST += $(uptex_tests) $(upweb_tests)
+DISTCLEANFILES += $(upweb_programs:=.c) $(upweb_programs:=.h) \
+ $(upweb_programs:=.p) $(upweb_programs:=-web2c) $(upweb_programs:=.web)
+
+## libukanji.a for upTeX and e-upTeX
+##
+EXTRA_LIBRARIES += libukanji.a
+libukanji_a_SOURCES = uptexdir/kanji.c uptexdir/kanji.h uptexdir/kanji_dump.c
+libukanji_a_CPPFLAGS = $(uptex_cppflags)
+
+## upTeX
+##
+if UPTEX
+bin_PROGRAMS += uptex
+endif UPTEX
+if UPWEB
+bin_PROGRAMS += $(upweb_programs)
+endif UPWEB
+EXTRA_PROGRAMS += uptex $(upweb_programs)
+
+uptex_CPPFLAGS = $(uptex_cppflags)
+
+# With --enable-ipc, upTeX may need to link with -lsocket.
+uptex_LDADD = $(uptex_ldadd) $(ipc_socketlibs)
+uptex_DEPENDENCIES = $(uptex_dependencies)
+
+# upTeX C sources
+uptex_c_h = uptexini.c uptex0.c uptexcoerce.h uptexd.h
+nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c
+dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h uptexdir/uptex_version.h
+
+# We must create uptexd.h and uptexdir/uptex_version.h before building the uptex_OBJECTS.
+uptex_prereq = uptexd.h ptexdir/ptex_version.h uptexdir/uptex_version.h
+$(uptex_OBJECTS): $(uptex_prereq)
+
+$(uptex_c_h): uptex-web2c
+ @$(web2c) uptex
+uptex-web2c: uptex.p $(web2c_texmf) uptexdir/uptex.defines
+ @$(web2c) uptex
+
+uptex-pool.c: uptex.pool uptexd.h $(makecpool_stamp)
+ $(makecpool) uptex >$@ || rm -f $@
+
+# Tangling upTeX
+uptex.p uptex.pool: uptex-tangle
+ @$(texmf_tangle) uptex uptex
+uptex-tangle: tangle$(EXEEXT) uptex.web uptex.ch tangle-sh
+ @$(texmf_tangle) uptex uptex
+
+# Extract uptex version
+$(srcdir)/uptexdir/uptex_version.h: @MAINTAINER_MODE_TRUE@ uptexdir/uptex-m.ch
+ $(AM_V_GEN)grep '^@d upTeX_version_string==' $(srcdir)/uptexdir/uptex-m.ch \
+ | sed "s/^.*'-/#define UPTEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+# Generate uptex.web
+uptex.web: tie$(EXEEXT) $(uptex_web_srcs)
+ $(tie) -m uptex.web $(uptex_web_srcs)
+uptex_web_srcs = \
+ tex.web \
+ tex.ch
+
+# Generate uptex.ch
+uptex.ch: tie$(EXEEXT) uptex.web $(uptex_ch_srcs)
+ $(tie) -c uptex.ch uptex.web $(uptex_ch_srcs)
+uptex_ch_srcs = \
+ ptexdir/ptex-base.ch \
+ uptexdir/uptex-m.ch \
+ $(uptex_ch_synctex) \
+ tex-binpool.ch
+
+EXTRA_DIST += $(uptex_web_srcs) $(uptex_ch_srcs) uptexdir/uptex.defines
+
+DISTCLEANFILES += $(nodist_uptex_SOURCES) uptex.web uptex.ch uptex-web2c \
+ uptex.p uptex.pool uptex-tangle
+
+## upBibTeX
+##
+nodist_upbibtex_SOURCES = upbibtex.c upbibtex.h
+upbibtex_SOURCES = uptexdir/kanji.h
+upbibtex_CPPFLAGS = $(uptex_cppflags)
+upbibtex_LDADD = $(uptex_ldadd)
+upbibtex_DEPENDENCIES = $(uptex_dependencies)
+upbibtex.c upbibtex.h: upbibtex-web2c
+ @$(web2c) upbibtex
+upbibtex-web2c: upbibtex.p $(web2c_depend) uptexdir/uptex.defines web2c/cvtbib.sed
+ @$(web2c) upbibtex
+upbibtex.p: tangle$(EXEEXT) upbibtex.web uptexdir/upbibtex.ch
+ $(up_tangle) upbibtex upbibtex
+upbibtex.web: tie$(EXEEXT) bibtex.web bibtex.ch ptexdir/pbibtex.ch
+ $(tie) -m upbibtex.web bibtex.web bibtex.ch ptexdir/pbibtex.ch
+EXTRA_DIST += ptexdir/pbibtex.ch uptexdir/upbibtex.ch
+
+## upDVItype
+##
+nodist_updvitype_SOURCES = updvitype.c updvitype.h
+updvitype_SOURCES = uptexdir/kanji.h
+updvitype_CPPFLAGS = $(uptex_cppflags) -DHEX_CHAR_CODE
+updvitype_LDADD = $(uptex_ldadd)
+updvitype_DEPENDENCIES = $(uptex_dependencies)
+updvitype.c updvitype.h: updvitype-web2c
+ @$(web2c) updvitype
+updvitype-web2c: updvitype.p $(web2c_depend) uptexdir/uptex.defines
+ @$(web2c) updvitype
+updvitype.p: tangle$(EXEEXT) updvitype.web uptexdir/updvitype.ch
+ $(up_tangle) updvitype updvitype
+updvitype.web: tie$(EXEEXT) dvitype.web dvitype.ch ptexdir/pdvitype.ch
+ $(tie) -m updvitype.web dvitype.web dvitype.ch ptexdir/pdvitype.ch
+EXTRA_DIST += ptexdir/pdvitype.ch uptexdir/updvitype.ch
+
+## upPLtoTF
+##
+nodist_uppltotf_SOURCES = uppltotf.c uppltotf.h
+uppltotf_SOURCES = uptexdir/kanji.h
+uppltotf_CPPFLAGS = $(uptex_cppflags) -DPRESERVE_PUTC
+uppltotf_LDADD = $(uptex_ldadd)
+uppltotf_DEPENDENCIES = $(uptex_dependencies)
+uppltotf.c uppltotf.h: uppltotf-web2c
+ @$(web2c) uppltotf
+uppltotf-web2c: uppltotf.p $(web2c_depend) uptexdir/uptex.defines
+ @$(web2c) uppltotf
+uppltotf.p: tangle$(EXEEXT) uppltotf.web uptexdir/uppltotf.ch
+ $(up_tangle) uppltotf uppltotf
+uppltotf.web: tie$(EXEEXT) pltotf.web pltotf.ch ptexdir/ppltotf.ch
+ $(tie) -m uppltotf.web pltotf.web pltotf.ch ptexdir/ppltotf.ch
+EXTRA_DIST += ptexdir/ppltotf.ch uptexdir/uppltotf.ch
+
+## upTFtoPL
+##
+nodist_uptftopl_SOURCES = uptftopl.c uptftopl.h
+uptftopl_SOURCES = uptexdir/kanji.h
+uptftopl_CPPFLAGS = $(uptex_cppflags)
+uptftopl_LDADD = $(uptex_ldadd)
+uptftopl_DEPENDENCIES = $(uptex_dependencies)
+uptftopl.c uptftopl.h: uptftopl-web2c
+ @$(web2c) uptftopl
+uptftopl-web2c: uptftopl.p $(web2c_depend) uptexdir/uptex.defines
+ @$(web2c) uptftopl
+uptftopl.p: tangle$(EXEEXT) uptftopl.web uptexdir/uptftopl.ch
+ $(up_tangle) uptftopl uptftopl
+uptftopl.web: tie$(EXEEXT) tftopl.web tftopl.ch ptexdir/ptftopl.ch
+ $(tie) -m uptftopl.web tftopl.web tftopl.ch ptexdir/ptftopl.ch
+EXTRA_DIST += ptexdir/ptftopl.ch uptexdir/uptftopl.ch
+
+upweb_tests += uptexdir/yokotate.test
+
+##
+EXTRA_DIST += \
+ uptexdir/COPYRIGHT \
+ uptexdir/COPYRIGHT.jis \
+ uptexdir/ChangeLog
+
+if UPTEX
+TESTS += $(uptex_tests)
+check_PROGRAMS += dvitype pltotf tftopl
+TRIPTRAP += uptrip.diffs
+TRIPTRAP_CLEAN += uptrip-clean
+endif UPTEX
+if UPWEB
+TESTS += $(upweb_tests)
+endif UPWEB
+
+## Test data and results
+##
+## uptexdir/upbibtex.test
+DISTCLEANFILES += uptests/xexampl.aux uptests/xexampl.bbl uptests/xexampl.blg
+## uptexdir/updvitype.test
+DISTCLEANFILES += uptests/xstory.dvityp uptests/xpagenum.typ
+## uptexdir/uppltotf.test
+DISTCLEANFILES += uptests/xcmr10.tfm
+## uptexdir/uptftopl.test
+DISTCLEANFILES += uptests/xcmr10.pl
+## uptexdir/yokotate.test
+EXTRA_DIST += uptexdir/tests/min10.pl uptexdir/tests/min10.tfm
+EXTRA_DIST += uptexdir/tests/tmin10.pl uptexdir/tests/tmin10.tfm
+DISTCLEANFILES += uptests/x*min10.*
+## uptexdir/uptriptest
+EXTRA_DIST += uptexdir/uptrip/uptrip.diffs uptexdir/uptrip/texmf.cnf
+uptrip.diffs: uptex$(EXEEXT)
+ $(triptrap_diffs) $@
+.PHONY: uptrip-clean
+uptrip-clean:
+ rm -rf uptripdir
+
+DISTCLEANFILES += uptrip.diffs
+
diff --git a/source/texk/web2c/w2c/config.h b/source/texk/web2c/w2c/config.h
index d3f15e8f09a39be391c1660a41d0c59373ca7087..25ba9b7f559d6f2bea38efeab6592f5be075dbd9 100644
--- a/source/texk/web2c/w2c/config.h
+++ b/source/texk/web2c/w2c/config.h
@@ -99,6 +99,15 @@ typedef __int64 integer64;
#else
typedef int64_t integer64;
#endif
+
+/* And we need uintptr_t. */
+#ifndef HAVE_UINTPTR_T
+# if SIZEOF_VOID_P == SIZEOF_INT
+typedef unsigned int uintptr_t;
+# elif SIZEOF_VOID_P == SIZEOF_LONG
+typedef unsigned long uintptr_t;
+# endif
+#endif
/* I don't want to write a configure test for remove when all Unix
machines have unlink. But, for the sake of non-Unix machines that
diff --git a/source/texk/web2c/web2c/ChangeLog b/source/texk/web2c/web2c/ChangeLog
index 36b4304c111f98d036bb40e9471e543e1774889c..15c7b6ac10eb35452d929bdbb0cfc665823b60df 100644
--- a/source/texk/web2c/web2c/ChangeLog
+++ b/source/texk/web2c/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-06 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Add AC_CHECK_SIZEOF([long]),
+ AC_CHECK_SIZEOF([void *]) and AC_TYPE_UINTPTR_T.
+
2014-06-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am: Drop the obsolete ACLOCAL_AMFLAGS.
diff --git a/source/texk/web2c/web2c/c-auto.in b/source/texk/web2c/web2c/c-auto.in
index 602848dec8074666b59c4091cdd0e6f65ac72d6f..014d6241bf795dae9217d38a79e1929ff0ea819e 100644
--- a/source/texk/web2c/web2c/c-auto.in
+++ b/source/texk/web2c/web2c/c-auto.in
@@ -108,6 +108,9 @@
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
+/* Define to 1 if the system has the type `uintptr_t'. */
+#undef HAVE_UINTPTR_T
+
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
@@ -138,6 +141,12 @@
/* The size of `int', as computed by sizeof. */
#undef SIZEOF_INT
+/* The size of `long', as computed by sizeof. */
+#undef SIZEOF_LONG
+
+/* The size of `void *', as computed by sizeof. */
+#undef SIZEOF_VOID_P
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
@@ -186,3 +195,7 @@
/* Define to the type of an unsigned integer type of width exactly 64 bits if
such a type exists and the standard includes do not define it. */
#undef uint64_t
+
+/* Define to the type of an unsigned integer type wide enough to hold a
+ pointer, if such a type exists, and if the system does not define it. */
+#undef uintptr_t
diff --git a/source/texk/web2c/web2c/configure b/source/texk/web2c/web2c/configure
index 59946bc516e77366e14c05912163f7d564984664..6e1f42d1f7ce1e6ac632e97b4301c3a0f47c4994 100755
--- a/source/texk/web2c/web2c/configure
+++ b/source/texk/web2c/web2c/configure
@@ -769,6 +769,7 @@ enable_shared
enable_static
with_pic
enable_fast_install
+with_aix_soname
with_gnu_ld
with_sysroot
enable_libtool_lock
@@ -1427,6 +1428,9 @@ Optional Packages:
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
both]
+ --with-aix-soname=aix|svr4|both
+ shared library versioning (aka "SONAME") variant to
+ provide on AIX, [default=aix].
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-sysroot[=DIR] Search for dependent libraries within DIR (or the
compiler's sysroot if not specified).
@@ -4214,8 +4218,8 @@ esac
-macro_version='2.4.2.458.26-92994'
-macro_revision='2.4.3'
+macro_version='2.4.4'
+macro_revision='2.4.4'
@@ -5584,6 +5588,9 @@ sysv4 | sysv4.3*)
tpf*)
lt_cv_deplibs_check_method=pass_all
;;
+os2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
fi
@@ -8572,6 +8579,58 @@ fi
+ shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[5-9]*,yes)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
+$as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
+
+# Check whether --with-aix-soname was given.
+if test "${with_aix_soname+set}" = set; then :
+ withval=$with_aix_soname; case $withval in
+ aix|svr4|both)
+ ;;
+ *)
+ as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
+ ;;
+ esac
+ lt_cv_with_aix_soname=$with_aix_soname
+else
+ if ${lt_cv_with_aix_soname+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ lt_cv_with_aix_soname=aix
+fi
+
+ with_aix_soname=$lt_cv_with_aix_soname
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
+$as_echo "$with_aix_soname" >&6; }
+ if test aix != "$with_aix_soname"; then
+ # For the AIX way of multilib, we name the shared archive member
+ # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+ # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+ # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+ # the AIX toolchain works better with OBJECT_MODE set (default 32).
+ if test 64 = "${OBJECT_MODE-32}"; then
+ shared_archive_member_spec=shr_64
+ else
+ shared_archive_member_spec=shr
+ fi
+ fi
+ ;;
+*)
+ with_aix_soname=aix
+ ;;
+esac
+
+
+
+
+
+
+
@@ -9010,6 +9069,11 @@ lt_prog_compiler_static=
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
lt_prog_compiler_pic='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
@@ -9106,6 +9170,11 @@ lt_prog_compiler_static=
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
+ case $host_os in
+ os2*)
+ lt_prog_compiler_static='$wl-static'
+ ;;
+ esac
;;
hpux9* | hpux10* | hpux11*)
@@ -9746,6 +9815,34 @@ _LT_EOF
link_all_deplibs=yes
;;
+ os2*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ allow_undefined_flag=unsupported
+ shrext_cmds=.dll
+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes=yes
+ ;;
+
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
@@ -9819,6 +9916,9 @@ _LT_EOF
fi
case $cc_basename in
+ tcc*)
+ export_dynamic_flag_spec='-rdynamic'
+ ;;
xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
@@ -9948,19 +10048,35 @@ _LT_EOF
no_entry_flag=
else
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global
- # defined symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
for ld_flag in $LDFLAGS; do
if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
@@ -9968,6 +10084,13 @@ _LT_EOF
break
fi
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -9987,6 +10110,14 @@ _LT_EOF
hardcode_libdir_separator=':'
link_all_deplibs=yes
file_list_spec='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # traditional, no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ hardcode_direct=no
+ hardcode_direct_absolute=no
+ ;;
+ esac
if test yes = "$GCC"; then
case $host_os in aix4.[012]|aix4.[012].*)
@@ -10014,6 +10145,11 @@ _LT_EOF
if test yes = "$aix_use_runtimelinking"; then
shared_flag="$shared_flag "'$wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
if test ia64 = "$host_cpu"; then
@@ -10026,6 +10162,8 @@ _LT_EOF
else
shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
@@ -10033,7 +10171,7 @@ _LT_EOF
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to export.
always_export_symbols=yes
- if test yes = "$aix_use_runtimelinking"; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
allow_undefined_flag='-berok'
@@ -10148,8 +10286,20 @@ fi
whole_archive_flag_spec='$convenience'
fi
archive_cmds_need_lc=yes
- # This is similar to how AIX traditionally builds its shared libraries.
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $wl-bnoentry $compiler_flags $wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+ else
+ # used by -dlpreopen to get the symbols
+ archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -10468,6 +10618,16 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
link_all_deplibs=yes
;;
+ linux*)
+ case $cc_basename in
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ ld_shlibs=yes
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+
netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
@@ -10513,8 +10673,28 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ shrext_cmds=.dll
+ archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ enable_shared_with_static_runtimes=yes
;;
osf3*)
@@ -11073,20 +11253,70 @@ aix[4-9]*)
fi
;;
esac
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
# AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
# soname into executable. Probably we can add versioning support to
# collect2, so additional links can be useful in future.
- if test yes = "$aix_use_runtimelinking"; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
# instead of lib<name>.a to let people know that these are not
# typical AIX shared libraries.
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
- else
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a(lib.so.V)'
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
library_names_spec='$libname$release.a $libname.a'
soname_spec='$libname$release$shared_ext$major'
- fi
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
shlibpath_var=LIBPATH
fi
;;
@@ -11274,7 +11504,7 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
need_version=no
need_lib_prefix=no
;;
@@ -11558,11 +11788,32 @@ openbsd* | bitrig*)
os2*)
libname_spec='$name'
+ version_type=windows
shrext_cmds=.dll
+ need_version=no
need_lib_prefix=no
- library_names_spec='$libname$shared_ext $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
;;
osf3* | osf4* | osf5*)
@@ -11638,7 +11889,7 @@ sysv4*MP*)
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
need_lib_prefix=no
need_version=no
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
@@ -12167,7 +12418,7 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
@@ -12273,7 +12524,7 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
@@ -12422,8 +12673,12 @@ $as_echo_n "checking whether to build shared libraries... " >&6; }
;;
aix[4-9]*)
- if test ia64 != "$host_cpu" && test no = "$aix_use_runtimelinking"; then
- test yes = "$enable_shared" && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -13477,6 +13732,29 @@ case $LEX in
esac
+for ac_func in strerror
+do :
+ ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror"
+if test "x$ac_cv_func_strerror" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_STRERROR 1
+_ACEOF
+
+fi
+done
+
+for ac_header in errno.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default"
+if test "x$ac_cv_header_errno_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_ERRNO_H 1
+_ACEOF
+
+fi
+
+done
+
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -13510,28 +13788,108 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
-for ac_func in strerror
-do :
- ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror"
-if test "x$ac_cv_func_strerror" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_STRERROR 1
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if ${ac_cv_sizeof_long+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then :
+
+else
+ if test "$ac_cv_type_long" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (long)
+See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_long=0
+ fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
_ACEOF
+
+# The cast to long int works around a bug in the HP C Compiler
+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+# This bug is HP SR number 8606223364.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5
+$as_echo_n "checking size of void *... " >&6; }
+if ${ac_cv_sizeof_void_p+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then :
+
+else
+ if test "$ac_cv_type_void_p" = yes; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute sizeof (void *)
+See \`config.log' for more details" "$LINENO" 5; }
+ else
+ ac_cv_sizeof_void_p=0
+ fi
fi
-done
-for ac_header in errno.h
-do :
- ac_fn_c_check_header_mongrel "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default"
-if test "x$ac_cv_header_errno_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_ERRNO_H 1
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_void_p" >&5
+$as_echo "$ac_cv_sizeof_void_p" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
+_ACEOF
+
+
+
+ ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "$ac_includes_default"
+if test "x$ac_cv_type_uintptr_t" = xyes; then :
+
+$as_echo "#define HAVE_UINTPTR_T 1" >>confdefs.h
+
+else
+ for ac_type in 'unsigned int' 'unsigned long int' \
+ 'unsigned long long int'; do
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($ac_type))];
+test_array [0] = 0;
+return test_array [0];
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define uintptr_t $ac_type
_ACEOF
+ ac_type=
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ test -z "$ac_type" && break
+ done
fi
-done
ac_config_headers="$ac_config_headers kpathsea/c-auto.h:c-auto.in"
@@ -14278,6 +14636,7 @@ enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
@@ -15317,6 +15676,9 @@ pic_mode=$pic_mode
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
+# Shared archive member basename,for filename based shared library versioning on AIX.
+shared_archive_member_spec=$shared_archive_member_spec
+
# Shell to use when invoking shell scripts.
SHELL=$lt_SHELL
diff --git a/source/texk/web2c/web2c/configure.ac b/source/texk/web2c/web2c/configure.ac
index c70d78ec4e23178212a619b2a36ff737a40bc59a..56dc0e6d515682abec3c2f2f8d25498a565de08b 100644
--- a/source/texk/web2c/web2c/configure.ac
+++ b/source/texk/web2c/web2c/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with Autoconf to produce a configure script for Web2c.
dnl
-dnl Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009-2014 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,
@@ -28,9 +28,12 @@ KPSE_COMMON([web2c convert])
AC_PROG_YACC
KPSE_PROG_LEX
-AC_CHECK_SIZEOF([int])
AC_CHECK_FUNCS([strerror])
AC_CHECK_HEADERS([errno.h])
+AC_CHECK_SIZEOF([int])
+AC_CHECK_SIZEOF([long])
+AC_CHECK_SIZEOF([void *])
+AC_TYPE_UINTPTR_T
dnl Write output here, instead of putting a zillion -D's on the command line.
AC_CONFIG_HEADERS([kpathsea/c-auto.h:c-auto.in])
diff --git a/source/texk/web2c/window/Makefile.in b/source/texk/web2c/window/Makefile.in
index 1263948fb882b8c4fd639b01e17969c825e79619..2722189b2301a7b69aba32c649154668bd089f8c 100644
--- a/source/texk/web2c/window/Makefile.in
+++ b/source/texk/web2c/window/Makefile.in
@@ -1 +1,740 @@
-all:
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+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 \
+ $(top_srcdir)/../../m4/kpse-cairo-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-common.m4 \
+ $(top_srcdir)/../../m4/kpse-cross.m4 \
+ $(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
+ $(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-gmp-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-graphite2-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-icu-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-lex.m4 \
+ $(top_srcdir)/../../m4/kpse-lib-version.m4 \
+ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-lt-hack.m4 \
+ $(top_srcdir)/../../m4/kpse-lua52-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-luajit-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-macos-framework.m4 \
+ $(top_srcdir)/../../m4/kpse-mpfr-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-pixman-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-poppler-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-ptexenc-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-socket-libs.m4 \
+ $(top_srcdir)/../../m4/kpse-teckit-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-warnings.m4 \
+ $(top_srcdir)/../../m4/kpse-web2c.m4 \
+ $(top_srcdir)/../../m4/kpse-win32.m4 \
+ $(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-zziplib-flags.m4 \
+ $(top_srcdir)/../../m4/libtool.m4 \
+ $(top_srcdir)/../../m4/ltoptions.m4 \
+ $(top_srcdir)/../../m4/ltsugar.m4 \
+ $(top_srcdir)/../../m4/ltversion.m4 \
+ $(top_srcdir)/../../m4/lt~obsolete.m4 \
+ $(top_srcdir)/../../version.ac $(top_srcdir)/ac/web2c.ac \
+ $(top_srcdir)/synctexdir/ac/synctex.ac \
+ $(top_srcdir)/synctexdir/synctex_parser_version.txt \
+ $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/w2c/c-auto.h \
+ $(top_builddir)/ff-config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo " AR " $@;
+am__v_AR_1 =
+libwindow_a_AR = $(AR) $(ARFLAGS)
+libwindow_a_LIBADD =
+am__libwindow_a_SOURCES_DIST = amiga.c epsf.c hp2627.c mfdisplay.h \
+ mftalk.c next.c regis.c suntools.c tek.c trap.c uniterm.c \
+ win32.c x11-Xt.c x11-Xlib.c
+@MFXT_TRUE@am__objects_1 = x11-Xt.$(OBJEXT)
+@MFXT_FALSE@am__objects_2 = x11-Xlib.$(OBJEXT)
+am_libwindow_a_OBJECTS = amiga.$(OBJEXT) epsf.$(OBJEXT) \
+ hp2627.$(OBJEXT) mftalk.$(OBJEXT) next.$(OBJEXT) \
+ regis.$(OBJEXT) suntools.$(OBJEXT) tek.$(OBJEXT) \
+ trap.$(OBJEXT) uniterm.$(OBJEXT) win32.$(OBJEXT) \
+ $(am__objects_1) $(am__objects_2)
+libwindow_a_OBJECTS = $(am_libwindow_a_OBJECTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/w2c -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 =
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
+SOURCES = $(libwindow_a_SOURCES)
+DIST_SOURCES = $(am__libwindow_a_SOURCES_DIST)
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CAIRO_DEPEND = @CAIRO_DEPEND@
+CAIRO_INCLUDES = @CAIRO_INCLUDES@
+CAIRO_LIBS = @CAIRO_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CTANGLE = @CTANGLE@
+CTANGLEBOOT = @CTANGLEBOOT@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CXXLD = @CXXLD@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FONTCONFIG_INCLUDES = @FONTCONFIG_INCLUDES@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
+FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
+FREETYPE2_LIBS = @FREETYPE2_LIBS@
+FT2_CONFIG = @FT2_CONFIG@
+GMP_DEPEND = @GMP_DEPEND@
+GMP_INCLUDES = @GMP_INCLUDES@
+GMP_LIBS = @GMP_LIBS@
+GRAPHITE2_DEPEND = @GRAPHITE2_DEPEND@
+GRAPHITE2_INCLUDES = @GRAPHITE2_INCLUDES@
+GRAPHITE2_LIBS = @GRAPHITE2_LIBS@
+GREP = @GREP@
+HARFBUZZ_DEPEND = @HARFBUZZ_DEPEND@
+HARFBUZZ_INCLUDES = @HARFBUZZ_INCLUDES@
+HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
+ICU_CONFIG = @ICU_CONFIG@
+ICU_DEPEND = @ICU_DEPEND@
+ICU_INCLUDES = @ICU_INCLUDES@
+ICU_LIBS = @ICU_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
+KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
+KPATHSEA_LIBS = @KPATHSEA_LIBS@
+KPATHSEA_PATHS_H = @KPATHSEA_PATHS_H@
+KPSEWHICH = @KPSEWHICH@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBPNG_DEPEND = @LIBPNG_DEPEND@
+LIBPNG_INCLUDES = @LIBPNG_INCLUDES@
+LIBPNG_LIBS = @LIBPNG_LIBS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LUA52_DEFINES = @LUA52_DEFINES@
+LUA52_DEPEND = @LUA52_DEPEND@
+LUA52_INCLUDES = @LUA52_INCLUDES@
+LUA52_LIBS = @LUA52_LIBS@
+LUAJIT_DEFINES = @LUAJIT_DEFINES@
+LUAJIT_DEPEND = @LUAJIT_DEPEND@
+LUAJIT_INCLUDES = @LUAJIT_INCLUDES@
+LUAJIT_LDEXTRA = @LUAJIT_LDEXTRA@
+LUAJIT_LIBS = @LUAJIT_LIBS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MPFR_DEPEND = @MPFR_DEPEND@
+MPFR_INCLUDES = @MPFR_INCLUDES@
+MPFR_LIBS = @MPFR_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJCXX = @OBJCXX@
+OBJCXXDEPMODE = @OBJCXXDEPMODE@
+OBJCXXFLAGS = @OBJCXXFLAGS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTANGLE = @OTANGLE@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PIXMAN_DEPEND = @PIXMAN_DEPEND@
+PIXMAN_INCLUDES = @PIXMAN_INCLUDES@
+PIXMAN_LIBS = @PIXMAN_LIBS@
+PKG_CONFIG = @PKG_CONFIG@
+POPPLER_DEPEND = @POPPLER_DEPEND@
+POPPLER_INCLUDES = @POPPLER_INCLUDES@
+POPPLER_LIBS = @POPPLER_LIBS@
+PTEXENC_DEPEND = @PTEXENC_DEPEND@
+PTEXENC_INCLUDES = @PTEXENC_INCLUDES@
+PTEXENC_LIBS = @PTEXENC_LIBS@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+SYNCTEXVERSION = @SYNCTEXVERSION@
+SYNCTEX_LT_VERSINFO = @SYNCTEX_LT_VERSINFO@
+TANGLE = @TANGLE@
+TANGLEBOOT = @TANGLEBOOT@
+TECKIT_DEPEND = @TECKIT_DEPEND@
+TECKIT_INCLUDES = @TECKIT_INCLUDES@
+TECKIT_LIBS = @TECKIT_LIBS@
+TIE = @TIE@
+VERSION = @VERSION@
+WANTEDLIBS = @WANTEDLIBS@
+WARNING_CFLAGS = @WARNING_CFLAGS@
+WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
+WARNING_OBJCXXFLAGS = @WARNING_OBJCXXFLAGS@
+WEB2CVERSION = @WEB2CVERSION@
+XMKMF = @XMKMF@
+XPDF_DEPEND = @XPDF_DEPEND@
+XPDF_INCLUDES = @XPDF_INCLUDES@
+XPDF_LIBS = @XPDF_LIBS@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+ZLIB_DEPEND = @ZLIB_DEPEND@
+ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ZLIB_LIBS = @ZLIB_LIBS@
+ZZIPLIB_DEPEND = @ZZIPLIB_DEPEND@
+ZZIPLIB_INCLUDES = @ZZIPLIB_INCLUDES@
+ZZIPLIB_LIBS = @ZZIPLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ac_ct_OBJCXX = @ac_ct_OBJCXX@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+ipc_socketlibs = @ipc_socketlibs@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lua_socketlibs = @lua_socketlibs@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+subdirs = @subdirs@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+wlibs = @wlibs@
+x_ext_lib = @x_ext_lib@
+x_tool_libs = @x_tool_libs@
+AM_CPPFLAGS = -I$(top_srcdir) $(KPATHSEA_INCLUDES) $(X_CFLAGS)
+AM_CFLAGS = $(WARNING_CFLAGS)
+EXTRA_LIBRARIES = libwindow.a
+libwindow_a_SOURCES = amiga.c epsf.c hp2627.c mfdisplay.h mftalk.c \
+ next.c regis.c suntools.c tek.c trap.c uniterm.c win32.c \
+ $(am__append_1) $(am__append_2)
+DISTCLEANFILES = libwindow.a
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ 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*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+libwindow.a: $(libwindow_a_OBJECTS) $(libwindow_a_DEPENDENCIES) $(EXTRA_libwindow_a_DEPENDENCIES)
+ $(AM_V_at)-rm -f libwindow.a
+ $(AM_V_AR)$(libwindow_a_AR) libwindow.a $(libwindow_a_OBJECTS) $(libwindow_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libwindow.a
+
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+
+distclean-compile:
+ -rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amiga.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/epsf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hp2627.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mftalk.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/next.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regis.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/suntools.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tek.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trap.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uniterm.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/x11-Xlib.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/x11-Xt.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ set x; \
+ here=`pwd`; \
+ $(am__define_uniq_tagged_files); \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ if test $$# -gt 0; then \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ "$$@" $$unique; \
+ else \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$unique; \
+ fi; \
+ fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+ distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-libtool cscopelist-am ctags ctags-am distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am
+
+
+@KPATHSEA_RULE@
+
+# 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.
+.NOEXPORT:
diff --git a/source/texk/web2c/xetexdir/am/xetex.am b/source/texk/web2c/xetexdir/am/xetex.am
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..41855700566ee572cc3ec69caa5da81155f449d0 100644
--- a/source/texk/web2c/xetexdir/am/xetex.am
+++ b/source/texk/web2c/xetexdir/am/xetex.am
@@ -0,0 +1,210 @@
+## texk/web2c/xetexdir/am/xetex.am: Makefile fragment for XeTeX.
+##
+## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
+
+## XeTeX
+##
+if XETEX
+bin_PROGRAMS += xetex
+endif XETEX
+EXTRA_PROGRAMS += xetex
+
+# Force Automake to use CXXLD for linking
+nodist_EXTRA_xetex_SOURCES = dummy.cxx
+
+xe_tangle = WEBINPUTS=.:$(srcdir)/xetexdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(OTANGLE)
+
+libxetex = libxetex.a
+
+xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir
+## Must add icu first to avoid an installed version.
+xetex_cppflags += $(ICU_INCLUDES)
+## Must add freetype2 includes early to avoid
+## freetype1/freetype2 confusion -- what a mess.
+xetex_cppflags += $(FREETYPE2_INCLUDES)
+xetex_cppflags += $(TECKIT_INCLUDES)
+xetex_cppflags += $(HARFBUZZ_INCLUDES)
+xetex_cppflags += $(GRAPHITE2_INCLUDES)
+xetex_cppflags += $(POPPLER_INCLUDES)
+xetex_cppflags += $(LIBPNG_INCLUDES)
+xetex_cppflags += $(ZLIB_INCLUDES)
+xetex_ldadd = $(libxetex)
+xetex_ldadd += $(HARFBUZZ_LIBS)
+xetex_ldadd += $(GRAPHITE2_LIBS)
+xetex_ldadd += $(ICU_LIBS)
+xetex_ldadd += $(TECKIT_LIBS)
+xetex_ldadd += $(POPPLER_LIBS)
+xetex_ldadd += $(LIBPNG_LIBS)
+xetex_ldadd += $(FREETYPE2_LIBS)
+xetex_ldadd += $(ZLIB_LIBS)
+xetex_dependencies = $(proglib)
+xetex_dependencies += $(KPATHSEA_DEPEND)
+xetex_dependencies += $(ICU_DEPEND)
+xetex_dependencies += $(TECKIT_DEPEND)
+xetex_dependencies += $(HARFBUZZ_DEPEND)
+xetex_dependencies += $(GRAPHITE2_DEPEND)
+xetex_dependencies += $(POPPLER_DEPEND)
+xetex_dependencies += $(LIBPNG_DEPEND)
+xetex_dependencies += $(FREETYPE2_DEPEND)
+xetex_dependencies += $(ZLIB_DEPEND)
+
+if XETEX_MACOSX
+
+xetex_cppflags += -DXETEX_MAC
+xetex_LDFLAGS = -framework ApplicationServices -framework Cocoa
+
+else !XETEX_MACOSX
+
+xetex_cppflags += $(FONTCONFIG_INCLUDES)
+xetex_ldadd += $(FONTCONFIG_LIBS)
+
+endif !XETEX_MACOSX
+
+
+xetex_CPPFLAGS = $(xetex_cppflags)
+xetex_CFLAGS = # $(WARNING_CFLAGS)
+xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
+
+## With --enable-ipc, XeTeX may need to link with -lsocket.
+xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
+
+# We must create libxetex.a etc before building the xetex_OBJECTS
+xetex_prereq = $(libxetex) xetexdir/etex_version.h xetexdir/xetex_version.h
+$(xetex_OBJECTS): $(xetex_prereq)
+
+## XeTeX C sources
+xetex_c_h = xetexini.c xetex0.c xetexcoerce.h xetexd.h
+nodist_xetex_SOURCES = $(xetex_c_h) xetex-pool.c
+dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \
+ xetexdir/etex_version.h xetexdir/xetex_version.h
+
+$(xetex_c_h): xetex-web2c
+ @$(web2c) xetex
+xetex-web2c: xetex.p $(web2c_texmf) xetexdir/xetex.defines
+ @$(web2c) xetex
+
+xetex-pool.c: xetex.pool xetexd.h $(makecpool_stamp)
+ $(makecpool) xetex >$@ || rm -f $@
+
+## Tangling XeTeX
+xetex.p xetex.pool: xetex-tangle
+ @$(xe_tangle) xetex xetex
+xetex-tangle: otangle$(EXEEXT) xetexdir/xetex.web xetex.ch tangle-sh
+ @$(xe_tangle) xetex xetex
+
+# Extract etex version
+$(srcdir)/xetexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ xetexdir/xetex.web
+ $(AM_V_GEN)grep '^@d eTeX_version_string==' $(srcdir)/xetexdir/xetex.web \
+ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+## Extract xetex version
+$(srcdir)/xetexdir/xetex_version.h: @MAINTAINER_MODE_TRUE@ xetexdir/xetex.web
+ $(AM_V_GEN)grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.web \
+ | sed "s/^.*'-/#define XETEX_VERSION \"/;s/'.*$$/\"/" >$@
+
+## Generate xetex.ch
+xetex.ch: tie$(EXEEXT) $(xetex_ch_srcs)
+ $(tie) -c xetex.ch $(xetex_ch_srcs)
+xetex_ch_srcs = \
+ xetexdir/xetex.web \
+ xetexdir/tex.ch0 \
+ tex.ch \
+ $(xetex_ch_synctex) \
+ xetexdir/xetex.ch \
+ $(xetex_post_ch_synctex) \
+ tex-binpool.ch
+
+##
+EXTRA_DIST += $(xetex_web_srcs) $(xetex_ch_srcs) xetexdir/xetex.defines
+
+DISTCLEANFILES += $(nodist_xetex_SOURCES) xetex.web xetex.ch xetex-web2c \
+ xetex.p xetex.pool xetex-tangle
+
+
+## libxetex
+##
+EXTRA_LIBRARIES += libxetex.a
+
+libxetex_a_CPPFLAGS = $(xetex_cppflags)
+libxetex_a_CFLAGS = # $(WARNING_CFLAGS)
+libxetex_a_CXXFLAGS = # $(WARNING_CXXFLAGS)
+libxetex_a_OBJCXXFLAGS = # $(WARNING_OBJCXXFLAGS)
+
+libxetex_a_SOURCES = \
+ xetexdir/MathTable.h \
+ xetexdir/XeTeXFontInst.cpp \
+ xetexdir/XeTeXFontInst.h \
+ xetexdir/XeTeXFontMgr.cpp \
+ xetexdir/XeTeXFontMgr.h \
+ xetexdir/XeTeXLayoutInterface.cpp \
+ xetexdir/XeTeXLayoutInterface.h \
+ xetexdir/XeTeXOTMath.cpp \
+ xetexdir/XeTeXOTMath.h \
+ xetexdir/XeTeX_ext.c \
+ xetexdir/XeTeX_ext.h \
+ xetexdir/XeTeX_pic.c \
+ xetexdir/XeTeX_web.h \
+ xetexdir/XeTeXswap.h \
+ xetexdir/trans.c \
+ xetexdir/trans.h \
+ xetexdir/hz.cpp \
+ xetexdir/xetex.h \
+ xetexdir/pdfimage.cpp \
+ xetexdir/pdfimage.h \
+ xetexdir/image/bmpimage.c \
+ xetexdir/image/bmpimage.h \
+ xetexdir/image/jpegimage.c \
+ xetexdir/image/jpegimage.h \
+ xetexdir/image/mfileio.c \
+ xetexdir/image/mfileio.h \
+ xetexdir/image/numbers.c \
+ xetexdir/image/numbers.h \
+ xetexdir/image/pngimage.c \
+ xetexdir/image/pngimage.h
+
+if XETEX_MACOSX
+
+libxetex_a_SOURCES += \
+ xetexdir/XeTeXFontInst_Mac.cpp \
+ xetexdir/XeTeXFontInst_Mac.h \
+ xetexdir/XeTeXFontMgr_Mac.mm \
+ xetexdir/XeTeXFontMgr_Mac.h \
+ xetexdir/XeTeX_mac.c
+
+else !XETEX_MACOSX
+
+libxetex_a_SOURCES += \
+ xetexdir/XeTeXFontMgr_FC.cpp \
+ xetexdir/XeTeXFontMgr_FC.h
+
+endif !XETEX_MACOSX
+
+# We must create xetexd.h etc. before building the libxetex_a_OBJECTS.
+libxetex_prereq = xetexd.h $(xetex_dependencies)
+$(libxetex_a_OBJECTS): $(libxetex_prereq)
+
+EXTRA_DIST += \
+ xetexdir/ChangeLog \
+ xetexdir/COPYING \
+ xetexdir/NEWS \
+ xetexdir/image/README \
+ xetexdir/unicode-char-prep.pl \
+ xetexdir/xewebmac.tex
+
+# XeTeX Tests
+#
+xetex_tests = \
+ xetexdir/xetex-bug73.test \
+ xetexdir/xetex.test
+
+EXTRA_DIST += $(xetex_tests)
+
+if XETEX
+TESTS += $(xetex_tests)
+endif XETEX
+
+## xetex-bug73.test
+EXTRA_DIST += xetexdir/tests/bug73.log xetexdir/tests/bug73.tex
+DISTCLEANFILES += bug73.fmt bug73.log bug73.out bug73.tex
+
diff --git a/source/utils/README b/source/utils/README
index d50f8e0ce9451f2199a1733586ec90514cab1a78..38eb2f50726b4a493e85c9b17fc6fd0e5def6971 100644
--- a/source/utils/README
+++ b/source/utils/README
@@ -1,4 +1,4 @@
-$Id: README 35177 2014-09-15 10:16:13Z peter $
+$Id: README 35661 2014-11-25 08:47:42Z peter $
Public domain. Originally written 2005 by Karl Berry.
Extra utilities we (optionally) compile for TeX Live.
@@ -12,7 +12,7 @@ asymptote 2.31 - checked 17may14
m-tx 0.60d - checked 16apr12
http://mirror.ctan.org/support/m-tx/
-pmx 2.7.0 - checked 11apr13
+pmx 2.7.0 - checked 25nov14
http://mirror.ctan.org/support/pmx/
ps2eps 1.68 - checked 10may12
diff --git a/source/utils/configure b/source/utils/configure
index 40043f7f71c9e4dcd723193fd58b51a72d81f7b0..be3b5ba005e50e806dfe3275f73f95c4a4ce0a79 100755
--- a/source/utils/configure
+++ b/source/utils/configure
@@ -3068,11 +3068,11 @@ if test "${enable_multiplatform+set}" = set; then :
fi
if test "x$enable_multiplatform" = xyes; then
if test "x$bindir" = 'x${exec_prefix}/bin'; then
- bindir="$bindir/$host"
+ bindir="$bindir/${host_alias-$host}"
ac_configure_args="$ac_configure_args '--bindir=$bindir'"
fi
if test "x$libdir" = 'x${exec_prefix}/lib'; then
- libdir="$libdir/$host"
+ libdir="$libdir/${host_alias-$host}"
ac_configure_args="$ac_configure_args '--libdir=$libdir'"
fi
fi