diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-06-24 09:37:07 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-06-24 09:37:07 +0000 |
| commit | d8ee324e03e46ef3361a8ade3062034bc45795af (patch) | |
| tree | 16db0d512972def0afb897cf289ac8ff65a6b389 /Build/source | |
| parent | 151106e752f349fac3ef91258cdf305c1cd6dc79 (diff) | |
kpathsea 6.2.0dev
git-svn-id: svn://tug.org/texlive/trunk@30892 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
40 files changed, 909 insertions, 225 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index 28760a47d5d..9bd7511929c 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,35 @@ +2013-06-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: New conditional have_EXEEXT. + * Makefile.am (libkpathsea_la_CPPFLAGS): Define EXEEXT for + systems with a non-vanishing executable extension. + * progname.[ch]: New function kpse_program_basename(). + * version.ac: Update version number 6.1.1 => 6.2.0dev. + + Adapt kpathsea headers to C++. + * absolute.h, cnf.h, concatn.h, config.h, debug.h, expand.h, + hash.h, knj.h, lib.h, line.h, magstep.h, mingw32.h, + pathsearch.h, proginit.h, progname.h, readable.h, str-list.h, + str-llist.h, tex-file.h, tex-glyph.h, tex-hush.h, tex-make.h, + types.h, variable.h, version.h, win32lib.h: When compiling C++ + surround all declarations by 'extern "C" {' ... '}'. + +2013-06-15 Peter Breitenlohner <peb@mppmu.mpg.de> + + * cnf.c, kpsewhich.c: Drop redundant <kpathsea/progname.h> + (in <kpathsea/config.h>). + +2013-06-11 Peter Breitenlohner <peb@mppmu.mpg.de> + + * xrealloc.c: Drop redundant extern (in <kpathsea/config.h>). + +2013-06-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (*_la_LDFLAGS): Add -bindir for MinGW DLL. + + * win32lib.h.mugica (removed): Unused and unmaintained. + * Makefile.am: Adapt. + 2013-04-15 Karl Berry <karl@tug.org> * texmf.cnf (TEXINPUTS.lamed): there is no lamed directory and diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am index ed8e5aef617..1c9cc009304 100644 --- a/Build/source/texk/kpathsea/Makefile.am +++ b/Build/source/texk/kpathsea/Makefile.am @@ -20,8 +20,11 @@ AM_CFLAGS = $(WARNING_CFLAGS) lib_LTLIBRARIES = libkpathsea.la libkpathsea_la_CPPFLAGS = $(AM_CPPFLAGS) -DMAKE_KPSE_DLL +if have_EXEEXT +libkpathsea_la_CPPFLAGS += -DEXEEXT=\"$(EXEEXT)\" +endif have_EXEEXT -libkpathsea_la_LDFLAGS = -no-undefined -version-info $(KPSE_LT_VERSINFO) +libkpathsea_la_LDFLAGS = -bindir @bindir@ -no-undefined -version-info $(KPSE_LT_VERSINFO) libkpathsea_la_LIBADD = $(LTLIBOBJS) @@ -47,8 +50,6 @@ libkpathsea_la_SOURCES = \ find-suffix.c \ fn.c \ fontmap.c \ - getopt.c \ - getopt1.c \ hash.c \ kdefault.c \ kpathsea.c \ @@ -84,6 +85,12 @@ libkpathsea_la_SOURCES = \ xstat.c \ xstrdup.c +if !MINGW32 +libkpathsea_la_SOURCES += \ + getopt.c \ + getopt1.c +endif !MINGW32 + if WIN32 if MINGW32 libkpathsea_la_SOURCES += \ @@ -295,5 +302,5 @@ EXTRA_DIST += $(TESTS) ## Not used ## -EXTRA_DIST += mktex.cnf win32lib.h.mugica +EXTRA_DIST += mktex.cnf diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in index 1100ac7d0b0..8bb4c6d33ed 100644 --- a/Build/source/texk/kpathsea/Makefile.in +++ b/Build/source/texk/kpathsea/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.1 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# 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, @@ -19,23 +19,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +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 \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + 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@ @@ -54,19 +82,24 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@MINGW32_TRUE@@WIN32_TRUE@am__append_1 = \ +@have_EXEEXT_TRUE@am__append_1 = -DEXEEXT=\"$(EXEEXT)\" +@MINGW32_FALSE@am__append_2 = \ +@MINGW32_FALSE@ getopt.c \ +@MINGW32_FALSE@ getopt1.c + +@MINGW32_TRUE@@WIN32_TRUE@am__append_3 = \ @MINGW32_TRUE@@WIN32_TRUE@ mingw32.c \ @MINGW32_TRUE@@WIN32_TRUE@ xfseeko.c \ @MINGW32_TRUE@@WIN32_TRUE@ xftello.c -@MINGW32_FALSE@@WIN32_TRUE@am__append_2 = \ +@MINGW32_FALSE@@WIN32_TRUE@am__append_4 = \ @MINGW32_FALSE@@WIN32_TRUE@ win32lib.c -@WIN32_TRUE@am__append_3 = \ +@WIN32_TRUE@am__append_5 = \ @WIN32_TRUE@ knj.c -@WIN32_TRUE@am__append_4 = win32 -@WIN32_FALSE@am__append_5 = \ +@WIN32_TRUE@am__append_6 = win32 +@WIN32_FALSE@am__append_7 = \ @WIN32_FALSE@ xfseeko.c \ @WIN32_FALSE@ xftello.c @@ -80,11 +113,12 @@ DIST_COMMON = $(top_srcdir)/../am/bin_links.am $(srcdir)/Makefile.in \ $(dist_web2c_SCRIPTS) $(top_srcdir)/../../build-aux/depcomp \ $(dist_noinst_DATA) $(dist_web2c_DATA) $(kpseinclude_HEADERS) \ $(noinst_HEADERS) $(top_srcdir)/../../build-aux/test-driver \ - AUTHORS ChangeLog NEWS README ../../build-aux/config.guess \ - ../../build-aux/config.sub ../../build-aux/depcomp \ - ../../build-aux/install-sh ../../build-aux/missing \ - ../../build-aux/texinfo.tex ../../build-aux/ylwrap \ - ../../build-aux/ltmain.sh \ + AUTHORS ChangeLog NEWS README ../../build-aux/compile \ + ../../build-aux/config.guess ../../build-aux/config.sub \ + ../../build-aux/depcomp ../../build-aux/install-sh \ + ../../build-aux/missing ../../build-aux/texinfo.tex \ + ../../build-aux/ylwrap ../../build-aux/ltmain.sh \ + $(top_srcdir)/../../build-aux/compile \ $(top_srcdir)/../../build-aux/config.guess \ $(top_srcdir)/../../build-aux/config.sub \ $(top_srcdir)/../../build-aux/install-sh \ @@ -147,20 +181,22 @@ libkpathsea_la_DEPENDENCIES = $(LTLIBOBJS) am__libkpathsea_la_SOURCES_DIST = tex-file.c absolute.c atou.c cnf.c \ concat.c concat3.c concatn.c db.c debug.c dir.c elt-dirs.c \ expand.c extend-fname.c file-p.c find-suffix.c fn.c fontmap.c \ - getopt.c getopt1.c hash.c kdefault.c kpathsea.c line.c \ - magstep.c make-suffix.c path-elt.c pathsearch.c proginit.c \ - progname.c readable.c rm-suffix.c str-list.c str-llist.c \ - tex-glyph.c tex-hush.c tex-make.c tilde.c uppercasify.c \ - variable.c version.c xbasename.c xcalloc.c xdirname.c xfopen.c \ - xfseek.c xftell.c xgetcwd.c xmalloc.c xopendir.c xputenv.c \ - xrealloc.c xstat.c xstrdup.c mingw32.c xfseeko.c xftello.c \ + hash.c kdefault.c kpathsea.c line.c magstep.c make-suffix.c \ + path-elt.c pathsearch.c proginit.c progname.c readable.c \ + rm-suffix.c str-list.c str-llist.c tex-glyph.c tex-hush.c \ + tex-make.c tilde.c uppercasify.c variable.c version.c \ + xbasename.c xcalloc.c xdirname.c xfopen.c xfseek.c xftell.c \ + xgetcwd.c xmalloc.c xopendir.c xputenv.c xrealloc.c xstat.c \ + xstrdup.c getopt.c getopt1.c mingw32.c xfseeko.c xftello.c \ win32lib.c knj.c -@MINGW32_TRUE@@WIN32_TRUE@am__objects_1 = libkpathsea_la-mingw32.lo \ +@MINGW32_FALSE@am__objects_1 = libkpathsea_la-getopt.lo \ +@MINGW32_FALSE@ libkpathsea_la-getopt1.lo +@MINGW32_TRUE@@WIN32_TRUE@am__objects_2 = libkpathsea_la-mingw32.lo \ @MINGW32_TRUE@@WIN32_TRUE@ libkpathsea_la-xfseeko.lo \ @MINGW32_TRUE@@WIN32_TRUE@ libkpathsea_la-xftello.lo -@MINGW32_FALSE@@WIN32_TRUE@am__objects_2 = libkpathsea_la-win32lib.lo -@WIN32_TRUE@am__objects_3 = libkpathsea_la-knj.lo -@WIN32_FALSE@am__objects_4 = libkpathsea_la-xfseeko.lo \ +@MINGW32_FALSE@@WIN32_TRUE@am__objects_3 = libkpathsea_la-win32lib.lo +@WIN32_TRUE@am__objects_4 = libkpathsea_la-knj.lo +@WIN32_FALSE@am__objects_5 = libkpathsea_la-xfseeko.lo \ @WIN32_FALSE@ libkpathsea_la-xftello.lo am_libkpathsea_la_OBJECTS = libkpathsea_la-tex-file.lo \ libkpathsea_la-absolute.lo libkpathsea_la-atou.lo \ @@ -171,7 +207,6 @@ am_libkpathsea_la_OBJECTS = libkpathsea_la-tex-file.lo \ libkpathsea_la-expand.lo libkpathsea_la-extend-fname.lo \ libkpathsea_la-file-p.lo libkpathsea_la-find-suffix.lo \ libkpathsea_la-fn.lo libkpathsea_la-fontmap.lo \ - libkpathsea_la-getopt.lo libkpathsea_la-getopt1.lo \ libkpathsea_la-hash.lo libkpathsea_la-kdefault.lo \ libkpathsea_la-kpathsea.lo libkpathsea_la-line.lo \ libkpathsea_la-magstep.lo libkpathsea_la-make-suffix.lo \ @@ -190,7 +225,7 @@ am_libkpathsea_la_OBJECTS = libkpathsea_la-tex-file.lo \ libkpathsea_la-xputenv.lo libkpathsea_la-xrealloc.lo \ libkpathsea_la-xstat.lo libkpathsea_la-xstrdup.lo \ $(am__objects_1) $(am__objects_2) $(am__objects_3) \ - $(am__objects_4) + $(am__objects_4) $(am__objects_5) libkpathsea_la_OBJECTS = $(am_libkpathsea_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -644,27 +679,28 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../../m4 -SUBDIRS = . doc man $(am__append_4) +SUBDIRS = . doc man $(am__append_6) EXTRA_DIST = BUGS PROJECTS putenv.c strcasecmp.c strtol.c strstr.c \ - bsnl.awk cnf-to-paths.awk $(TESTS) mktex.cnf win32lib.h.mugica + bsnl.awk cnf-to-paths.awk $(TESTS) mktex.cnf AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir)/.. AM_CFLAGS = $(WARNING_CFLAGS) lib_LTLIBRARIES = libkpathsea.la -libkpathsea_la_CPPFLAGS = $(AM_CPPFLAGS) -DMAKE_KPSE_DLL -libkpathsea_la_LDFLAGS = -no-undefined -version-info $(KPSE_LT_VERSINFO) +libkpathsea_la_CPPFLAGS = $(AM_CPPFLAGS) -DMAKE_KPSE_DLL \ + $(am__append_1) +libkpathsea_la_LDFLAGS = -bindir @bindir@ -no-undefined -version-info $(KPSE_LT_VERSINFO) libkpathsea_la_LIBADD = $(LTLIBOBJS) BUILT_SOURCES = paths.h libkpathsea_la_SOURCES = tex-file.c absolute.c atou.c cnf.c concat.c \ concat3.c concatn.c db.c debug.c dir.c elt-dirs.c expand.c \ - extend-fname.c file-p.c find-suffix.c fn.c fontmap.c getopt.c \ - getopt1.c hash.c kdefault.c kpathsea.c line.c magstep.c \ - make-suffix.c path-elt.c pathsearch.c proginit.c progname.c \ - readable.c rm-suffix.c str-list.c str-llist.c tex-glyph.c \ - tex-hush.c tex-make.c tilde.c uppercasify.c variable.c \ - version.c xbasename.c xcalloc.c xdirname.c xfopen.c xfseek.c \ - xftell.c xgetcwd.c xmalloc.c xopendir.c xputenv.c xrealloc.c \ - xstat.c xstrdup.c $(am__append_1) $(am__append_2) \ - $(am__append_3) $(am__append_5) + extend-fname.c file-p.c find-suffix.c fn.c fontmap.c hash.c \ + kdefault.c kpathsea.c line.c magstep.c make-suffix.c \ + path-elt.c pathsearch.c proginit.c progname.c readable.c \ + rm-suffix.c str-list.c str-llist.c tex-glyph.c tex-hush.c \ + tex-make.c tilde.c uppercasify.c variable.c version.c \ + xbasename.c xcalloc.c xdirname.c xfopen.c xfseek.c xftell.c \ + xgetcwd.c xmalloc.c xopendir.c xputenv.c xrealloc.c xstat.c \ + xstrdup.c $(am__append_2) $(am__append_3) $(am__append_4) \ + $(am__append_5) $(am__append_7) kpseincludedir = ${includedir}/kpathsea nodist_kpseinclude_HEADERS = \ c-auto.h \ @@ -788,8 +824,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): c-auto.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -836,6 +872,7 @@ clean-libLTLIBRARIES: echo rm -f $${locs}; \ rm -f $${locs}; \ } + libkpathsea.la: $(libkpathsea_la_OBJECTS) $(libkpathsea_la_DEPENDENCIES) $(EXTRA_libkpathsea_la_DEPENDENCIES) $(AM_V_CCLD)$(libkpathsea_la_LINK) -rpath $(libdir) $(libkpathsea_la_OBJECTS) $(libkpathsea_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @@ -887,21 +924,27 @@ clean-binPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + kpseaccess$(EXEEXT): $(kpseaccess_OBJECTS) $(kpseaccess_DEPENDENCIES) $(EXTRA_kpseaccess_DEPENDENCIES) @rm -f kpseaccess$(EXEEXT) $(AM_V_CCLD)$(LINK) $(kpseaccess_OBJECTS) $(kpseaccess_LDADD) $(LIBS) + kpsereadlink$(EXEEXT): $(kpsereadlink_OBJECTS) $(kpsereadlink_DEPENDENCIES) $(EXTRA_kpsereadlink_DEPENDENCIES) @rm -f kpsereadlink$(EXEEXT) $(AM_V_CCLD)$(LINK) $(kpsereadlink_OBJECTS) $(kpsereadlink_LDADD) $(LIBS) + kpsestat$(EXEEXT): $(kpsestat_OBJECTS) $(kpsestat_DEPENDENCIES) $(EXTRA_kpsestat_DEPENDENCIES) @rm -f kpsestat$(EXEEXT) $(AM_V_CCLD)$(LINK) $(kpsestat_OBJECTS) $(kpsestat_LDADD) $(LIBS) + kpsewhich$(EXEEXT): $(kpsewhich_OBJECTS) $(kpsewhich_DEPENDENCIES) $(EXTRA_kpsewhich_DEPENDENCIES) @rm -f kpsewhich$(EXEEXT) $(AM_V_CCLD)$(LINK) $(kpsewhich_OBJECTS) $(kpsewhich_LDADD) $(LIBS) + progname-test$(EXEEXT): $(progname_test_OBJECTS) $(progname_test_DEPENDENCIES) $(EXTRA_progname_test_DEPENDENCIES) @rm -f progname-test$(EXEEXT) $(AM_V_CCLD)$(LINK) $(progname_test_OBJECTS) $(progname_test_LDADD) $(LIBS) + xdirtest$(EXEEXT): $(xdirtest_OBJECTS) $(xdirtest_DEPENDENCIES) $(EXTRA_xdirtest_DEPENDENCIES) @rm -f xdirtest$(EXEEXT) $(AM_V_CCLD)$(LINK) $(xdirtest_OBJECTS) $(xdirtest_LDADD) $(LIBS) @@ -1159,20 +1202,6 @@ libkpathsea_la-fontmap.lo: fontmap.c @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) $(libkpathsea_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkpathsea_la-fontmap.lo `test -f 'fontmap.c' || echo '$(srcdir)/'`fontmap.c -libkpathsea_la-getopt.lo: getopt.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkpathsea_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkpathsea_la-getopt.lo -MD -MP -MF $(DEPDIR)/libkpathsea_la-getopt.Tpo -c -o libkpathsea_la-getopt.lo `test -f 'getopt.c' || echo '$(srcdir)/'`getopt.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkpathsea_la-getopt.Tpo $(DEPDIR)/libkpathsea_la-getopt.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='getopt.c' object='libkpathsea_la-getopt.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) $(libkpathsea_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkpathsea_la-getopt.lo `test -f 'getopt.c' || echo '$(srcdir)/'`getopt.c - -libkpathsea_la-getopt1.lo: getopt1.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkpathsea_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkpathsea_la-getopt1.lo -MD -MP -MF $(DEPDIR)/libkpathsea_la-getopt1.Tpo -c -o libkpathsea_la-getopt1.lo `test -f 'getopt1.c' || echo '$(srcdir)/'`getopt1.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkpathsea_la-getopt1.Tpo $(DEPDIR)/libkpathsea_la-getopt1.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='getopt1.c' object='libkpathsea_la-getopt1.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) $(libkpathsea_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkpathsea_la-getopt1.lo `test -f 'getopt1.c' || echo '$(srcdir)/'`getopt1.c - libkpathsea_la-hash.lo: hash.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkpathsea_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkpathsea_la-hash.lo -MD -MP -MF $(DEPDIR)/libkpathsea_la-hash.Tpo -c -o libkpathsea_la-hash.lo `test -f 'hash.c' || echo '$(srcdir)/'`hash.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkpathsea_la-hash.Tpo $(DEPDIR)/libkpathsea_la-hash.Plo @@ -1411,6 +1440,20 @@ libkpathsea_la-xstrdup.lo: xstrdup.c @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) $(libkpathsea_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkpathsea_la-xstrdup.lo `test -f 'xstrdup.c' || echo '$(srcdir)/'`xstrdup.c +libkpathsea_la-getopt.lo: getopt.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkpathsea_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkpathsea_la-getopt.lo -MD -MP -MF $(DEPDIR)/libkpathsea_la-getopt.Tpo -c -o libkpathsea_la-getopt.lo `test -f 'getopt.c' || echo '$(srcdir)/'`getopt.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkpathsea_la-getopt.Tpo $(DEPDIR)/libkpathsea_la-getopt.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='getopt.c' object='libkpathsea_la-getopt.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) $(libkpathsea_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkpathsea_la-getopt.lo `test -f 'getopt.c' || echo '$(srcdir)/'`getopt.c + +libkpathsea_la-getopt1.lo: getopt1.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkpathsea_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkpathsea_la-getopt1.lo -MD -MP -MF $(DEPDIR)/libkpathsea_la-getopt1.Tpo -c -o libkpathsea_la-getopt1.lo `test -f 'getopt1.c' || echo '$(srcdir)/'`getopt1.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkpathsea_la-getopt1.Tpo $(DEPDIR)/libkpathsea_la-getopt1.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='getopt1.c' object='libkpathsea_la-getopt1.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) $(libkpathsea_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkpathsea_la-getopt1.lo `test -f 'getopt1.c' || echo '$(srcdir)/'`getopt1.c + libkpathsea_la-mingw32.lo: mingw32.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkpathsea_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkpathsea_la-mingw32.lo -MD -MP -MF $(DEPDIR)/libkpathsea_la-mingw32.Tpo -c -o libkpathsea_la-mingw32.lo `test -f 'mingw32.c' || echo '$(srcdir)/'`mingw32.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkpathsea_la-mingw32.Tpo $(DEPDIR)/libkpathsea_la-mingw32.Plo @@ -1539,13 +1582,12 @@ uninstall-nodist_kpseincludeHEADERS: # (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= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -1648,7 +1690,7 @@ distclean-tags: $(MAKE) $(AM_MAKEFLAGS) $< # Leading 'am--fnord' is there to ensure the list of targets does not -# exand to empty, as could happen e.g. with make check TESTS=''. +# 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: @: @@ -1876,10 +1918,16 @@ dist-xz: distdir $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) diff --git a/Build/source/texk/kpathsea/absolute.h b/Build/source/texk/kpathsea/absolute.h index cce71dc6e20..a75b3b43ae6 100644 --- a/Build/source/texk/kpathsea/absolute.h +++ b/Build/source/texk/kpathsea/absolute.h @@ -22,6 +22,9 @@ #include <kpathsea/types.h> #include <kpathsea/c-proto.h> +#ifdef __cplusplus +extern "C" { +#endif /* True if FILENAME is absolute (/foo) or, if RELATIVE_OK is true, explicitly relative (./foo, ../foo), else false (foo). */ @@ -34,4 +37,8 @@ extern KPSEDLL boolean kpse_absolute_p (const_string filename, boolean relative_ok); #endif +#ifdef __cplusplus +} +#endif + #endif /* not KPATHSEA_ABSOLUTE_H */ diff --git a/Build/source/texk/kpathsea/aclocal.m4 b/Build/source/texk/kpathsea/aclocal.m4 index 8ce56c8edaf..9ec8ff524e0 100644 --- a/Build/source/texk/kpathsea/aclocal.m4 +++ b/Build/source/texk/kpathsea/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.13.1 -*- Autoconf -*- +# generated automatically by aclocal 1.14 -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.13' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.1], [], +m4_if([$1], [1.14], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.1])dnl +[AM_AUTOMAKE_VERSION([1.14])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -373,7 +373,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the @@ -418,6 +418,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -526,7 +532,48 @@ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: <http://www.gnu.org/software/coreutils/>. + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -534,7 +581,6 @@ dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -752,6 +798,70 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file 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. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file 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. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + # Check to make sure that the build environment is sane. -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -961,76 +1071,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of '-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar <conftest.tar]) + AM_RUN_LOG([cat conftest.dir/file]) + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar <conftest.tar]) - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR diff --git a/Build/source/texk/kpathsea/cnf.c b/Build/source/texk/kpathsea/cnf.c index fe0f49df2c2..578e42a5a39 100644 --- a/Build/source/texk/kpathsea/cnf.c +++ b/Build/source/texk/kpathsea/cnf.c @@ -26,7 +26,6 @@ #include <kpathsea/line.h> #include <kpathsea/paths.h> #include <kpathsea/pathsearch.h> -#include <kpathsea/progname.h> #include <kpathsea/tex-file.h> #include <kpathsea/variable.h> diff --git a/Build/source/texk/kpathsea/cnf.h b/Build/source/texk/kpathsea/cnf.h index dce41e2787b..44c966841be 100644 --- a/Build/source/texk/kpathsea/cnf.h +++ b/Build/source/texk/kpathsea/cnf.h @@ -22,6 +22,10 @@ #include <kpathsea/c-proto.h> #include <kpathsea/types.h> +#ifdef __cplusplus +extern "C" { +#endif + /* Return the value in the last-read cnf file for VAR, or NULL if none. On the first call, also read all the `texmf.cnf' files in the path for kpse_cnf_format (and initialize the path). */ @@ -32,4 +36,8 @@ extern KPSEDLL const_string kpathsea_cnf_get (kpathsea kpse, const_string name); extern KPSEDLL const_string kpse_cnf_get (const_string var); #endif +#ifdef __cplusplus +} +#endif + #endif /* not KPATHSEA_CNF_H */ diff --git a/Build/source/texk/kpathsea/concatn.h b/Build/source/texk/kpathsea/concatn.h index 6785cdb492f..76140275026 100644 --- a/Build/source/texk/kpathsea/concatn.h +++ b/Build/source/texk/kpathsea/concatn.h @@ -26,8 +26,16 @@ #include <stdarg.h> #include <kpathsea/types.h> +#ifdef __cplusplus +extern "C" { +#endif + /* Concatenate a null-terminated list of strings and return the result in malloc-allocated memory. */ extern KPSEDLL string concatn(const_string str1, ...); +#ifdef __cplusplus +} +#endif + #endif /* not KPATHSEA_CONCATN_H */ diff --git a/Build/source/texk/kpathsea/config.h b/Build/source/texk/kpathsea/config.h index 49f1b41b443..067777ab584 100644 --- a/Build/source/texk/kpathsea/config.h +++ b/Build/source/texk/kpathsea/config.h @@ -142,6 +142,10 @@ #undef snprintf #undef vsnprintf +#ifdef __cplusplus +extern "C" { +#endif + static inline int kpse_vsnprintf (char *str, size_t size, const char *format, va_list ap) { @@ -167,6 +171,10 @@ kpse_snprintf (char *str, size_t size, const char *format, ...) return ret; } +#ifdef __cplusplus +} +#endif + #define snprintf kpse_snprintf #define vsnprintf kpse_vsnprintf diff --git a/Build/source/texk/kpathsea/configure b/Build/source/texk/kpathsea/configure index 1d48a5fd519..69556e7fdac 100755 --- a/Build/source/texk/kpathsea/configure +++ b/Build/source/texk/kpathsea/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Kpathsea 6.1.1. +# Generated by GNU Autoconf 2.69 for Kpathsea 6.2.0dev. # # Report bugs to <tex-k@tug.org>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Kpathsea' PACKAGE_TARNAME='kpathsea' -PACKAGE_VERSION='6.1.1' -PACKAGE_STRING='Kpathsea 6.1.1' +PACKAGE_VERSION='6.2.0dev' +PACKAGE_STRING='Kpathsea 6.2.0dev' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -635,6 +635,8 @@ ac_includes_default="\ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS +have_EXEEXT_FALSE +have_EXEEXT_TRUE LT_OBJDIR MINGW32_FALSE MINGW32_TRUE @@ -1334,7 +1336,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 Kpathsea 6.1.1 to adapt to many kinds of systems. +\`configure' configures Kpathsea 6.2.0dev to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1404,7 +1406,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Kpathsea 6.1.1:";; + short | recursive ) echo "Configuration of Kpathsea 6.2.0dev:";; esac cat <<\_ACEOF @@ -1527,7 +1529,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Kpathsea configure 6.1.1 +Kpathsea configure 6.2.0dev generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2366,7 +2368,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 Kpathsea $as_me 6.1.1, which was +It was created by Kpathsea $as_me 6.2.0dev, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2747,19 +2749,19 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -KPSEVERSION=6.1.1 +KPSEVERSION=6.2.0dev -$as_echo "#define KPSEVERSION \"kpathsea version 6.1.1\"" >>confdefs.h +$as_echo "#define KPSEVERSION \"kpathsea version 6.2.0dev\"" >>confdefs.h -KPSE_LT_VERSINFO=7:1:1 +KPSE_LT_VERSINFO=8:0:2 WEB2CVERSION=2013 -am__api_version='1.13' +am__api_version='1.14' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -4075,6 +4077,65 @@ 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 +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 whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +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 + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -7809,7 +7870,7 @@ fi # Define the identity of the package. PACKAGE='kpathsea' - VERSION='6.1.1' + VERSION='6.2.0dev' cat >>confdefs.h <<_ACEOF @@ -7849,6 +7910,10 @@ mkdir_p='$(MKDIR_P)' # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -7856,6 +7921,48 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: <http://www.gnu.org/software/coreutils/>. + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -13568,6 +13675,15 @@ $as_echo "#define WRAP_SNPRINTF 1" >>confdefs.h fi + if test -n "$EXEEXT"; then + have_EXEEXT_TRUE= + have_EXEEXT_FALSE='#' +else + have_EXEEXT_TRUE='#' + have_EXEEXT_FALSE= +fi + + ac_config_headers="$ac_config_headers c-auto.h:c-auto.in" @@ -13722,6 +13838,10 @@ if test -z "${MINGW32_TRUE}" && test -z "${MINGW32_FALSE}"; then as_fn_error $? "conditional \"MINGW32\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${have_EXEEXT_TRUE}" && test -z "${have_EXEEXT_FALSE}"; then + as_fn_error $? "conditional \"have_EXEEXT\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -14119,7 +14239,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 Kpathsea $as_me 6.1.1, which was +This file was extended by Kpathsea $as_me 6.2.0dev, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14185,7 +14305,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="\\ -Kpathsea config.status 6.1.1 +Kpathsea config.status 6.2.0dev configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -15247,7 +15367,7 @@ $as_echo X"$mf" | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the diff --git a/Build/source/texk/kpathsea/configure.ac b/Build/source/texk/kpathsea/configure.ac index 5722087b9de..6497629baa6 100644 --- a/Build/source/texk/kpathsea/configure.ac +++ b/Build/source/texk/kpathsea/configure.ac @@ -109,6 +109,8 @@ if test "x$kpse_cv_wrap_snprintf" = xyes; then [Define to 1 if we need (v)snprintf wrapper functions.]) fi +AM_CONDITIONAL([have_EXEEXT], [test -n "$EXEEXT"]) + dnl Write output here, instead of putting a zillion -D's on the command line. AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [sed -e 's/^#define PACKAGE/#define KPSE_PACKAGE/' \ diff --git a/Build/source/texk/kpathsea/debug.h b/Build/source/texk/kpathsea/debug.h index bb0ab7fbc1c..38c54e4b270 100644 --- a/Build/source/texk/kpathsea/debug.h +++ b/Build/source/texk/kpathsea/debug.h @@ -89,6 +89,10 @@ #define DEBUGF4(str, e1, e2, e3, e4) \ DEBUGF_START (); fprintf (stderr, str, e1, e2, e3, e4); DEBUGF_END () +#ifdef __cplusplus +extern "C" { +#endif + #undef fopen #define fopen kpse_fopen_trace extern KPSEDLL FILE *fopen (const char *filename, const char *mode); @@ -96,6 +100,10 @@ extern KPSEDLL FILE *fopen (const char *filename, const char *mode); #define fclose kpse_fclose_trace extern KPSEDLL int fclose (FILE *); +#ifdef __cplusplus +} +#endif + #endif /* not NO_DEBUG */ #endif /* not KPATHSEA_DEBUG_H */ diff --git a/Build/source/texk/kpathsea/doc/Makefile.in b/Build/source/texk/kpathsea/doc/Makefile.in index aa3c4ae334e..8afd2e18ca2 100644 --- a/Build/source/texk/kpathsea/doc/Makefile.in +++ b/Build/source/texk/kpathsea/doc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.1 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# 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, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +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 \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + 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@ @@ -365,13 +393,9 @@ clean-libtool: $(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ -o $(@:.html=.htp) $<; \ then \ - rm -rf $@; \ - if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ - mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \ + rm -rf $@ && mv $(@:.html=.htp) $@; \ else \ - if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ - rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \ - exit 1; \ + rm -rf $(@:.html=.htp); exit 1; \ fi $(srcdir)/kpathsea.info: kpathsea.texi $(kpathsea_TEXINFOS) kpathsea.dvi: kpathsea.texi $(kpathsea_TEXINFOS) diff --git a/Build/source/texk/kpathsea/expand.h b/Build/source/texk/kpathsea/expand.h index 2b2caeb06e7..cebeb747b5c 100644 --- a/Build/source/texk/kpathsea/expand.h +++ b/Build/source/texk/kpathsea/expand.h @@ -22,6 +22,10 @@ #include <kpathsea/c-proto.h> #include <kpathsea/types.h> +#ifdef __cplusplus +extern "C" { +#endif + #ifdef MAKE_KPSE_DLL /* libkpathsea internal only */ /* Call kpse_var_expand and kpse_tilde_expand (in that order). Result @@ -48,5 +52,8 @@ extern KPSEDLL string kpse_brace_expand (const_string path); extern KPSEDLL string kpse_path_expand (const_string path); #endif +#ifdef __cplusplus +} +#endif #endif /* not KPATHSEA_EXPAND_H */ diff --git a/Build/source/texk/kpathsea/hash.h b/Build/source/texk/kpathsea/hash.h index d382201d2a4..f54cd0fd646 100644 --- a/Build/source/texk/kpathsea/hash.h +++ b/Build/source/texk/kpathsea/hash.h @@ -29,6 +29,10 @@ /* At the moment can not free */ #define KPATHSEA_CAN_FREE 0 +#ifdef __cplusplus +extern "C" { +#endif + /* A single (key,value) pair. */ typedef struct hash_element_struct { @@ -85,4 +89,8 @@ extern void hash_free (hash_table_type table); #endif /* MAKE_KPSE_DLL */ +#ifdef __cplusplus +} +#endif + #endif /* not HASH_H */ diff --git a/Build/source/texk/kpathsea/knj.h b/Build/source/texk/kpathsea/knj.h index 8faf391fb29..8f1cd919687 100644 --- a/Build/source/texk/kpathsea/knj.h +++ b/Build/source/texk/kpathsea/knj.h @@ -18,11 +18,19 @@ #ifndef KPATHSEA_KNJ_H #define KPATHSEA_KNJ_H +#ifdef __cplusplus +extern "C" { +#endif + extern KPSEDLL int is_cp932_system; extern KPSEDLL int isknj(int c); extern KPSEDLL int isknj2(int c); +#ifdef __cplusplus +} +#endif + /* True if P points to a 2-Byte Kanji (CP 932, SJIS) code. */ #define IS_KANJI(p) is_cp932_system && isknj(*(p)) && isknj2(*(p+1)) diff --git a/Build/source/texk/kpathsea/kpsewhich.c b/Build/source/texk/kpathsea/kpsewhich.c index f5fd6dd87e9..4bcb77ac48b 100644 --- a/Build/source/texk/kpathsea/kpsewhich.c +++ b/Build/source/texk/kpathsea/kpsewhich.c @@ -28,7 +28,6 @@ #include <kpathsea/tex-file.h> #include <kpathsea/tex-glyph.h> #include <kpathsea/variable.h> -#include <kpathsea/progname.h> #include <kpathsea/version.h> diff --git a/Build/source/texk/kpathsea/lib.h b/Build/source/texk/kpathsea/lib.h index 3fa3d72f804..2aac2519b3d 100644 --- a/Build/source/texk/kpathsea/lib.h +++ b/Build/source/texk/kpathsea/lib.h @@ -24,6 +24,10 @@ #include <kpathsea/systypes.h> #include <kpathsea/types.h> +#ifdef __cplusplus +extern "C" { +#endif + /* Define common sorts of messages. */ /* This should be called only after a system call fails. Don't exit @@ -221,4 +225,8 @@ extern KPSEDLL address xcalloc (size_t nelem, size_t elsize); #define XTALLOC1(t) XTALLOC (1, t) #define XRETALLOC(addr, n, t) ((addr) = (t *) xrealloc (addr, (n) * sizeof(t))) +#ifdef __cplusplus +} +#endif + #endif /* not KPATHSEA_LIB_H */ diff --git a/Build/source/texk/kpathsea/line.h b/Build/source/texk/kpathsea/line.h index f2a8d89b946..9c98ce95753 100644 --- a/Build/source/texk/kpathsea/line.h +++ b/Build/source/texk/kpathsea/line.h @@ -23,9 +23,17 @@ #include <kpathsea/types.h> +#ifdef __cplusplus +extern "C" { +#endif + /* Return NULL if we are at EOF, else the next line of F. The newline character at the end of string is removed. The string is allocated with malloc. */ extern KPSEDLL string read_line (FILE *f); +#ifdef __cplusplus +} +#endif + #endif /* not LINE_H */ diff --git a/Build/source/texk/kpathsea/magstep.h b/Build/source/texk/kpathsea/magstep.h index d7ccc70e3bf..eae08f6a35d 100644 --- a/Build/source/texk/kpathsea/magstep.h +++ b/Build/source/texk/kpathsea/magstep.h @@ -22,6 +22,10 @@ #include <kpathsea/c-proto.h> #include <kpathsea/types.h> +#ifdef __cplusplus +extern "C" { +#endif + /* If DPI is close enough to some magstep of BDPI, return the true dpi value, and the magstep found (or zero) in M_RET (if non-null). ``Close enough'' means within one pixel. @@ -48,4 +52,8 @@ extern KPSEDLL unsigned kpse_magstep_fix (unsigned dpi, unsigned bdpi, int *m_ret); #endif +#ifdef __cplusplus +} +#endif + #endif /* not KPATHSEA_MAGSTEP_H */ diff --git a/Build/source/texk/kpathsea/man/Makefile.in b/Build/source/texk/kpathsea/man/Makefile.in index 3746529d449..9c2031969c6 100644 --- a/Build/source/texk/kpathsea/man/Makefile.in +++ b/Build/source/texk/kpathsea/man/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.1 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# 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, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +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 \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + 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@ diff --git a/Build/source/texk/kpathsea/mingw32.h b/Build/source/texk/kpathsea/mingw32.h index c9853dd1d76..358ae604c5b 100644 --- a/Build/source/texk/kpathsea/mingw32.h +++ b/Build/source/texk/kpathsea/mingw32.h @@ -49,6 +49,10 @@ #define MAX_PIPES 128 #endif +#ifdef __cplusplus +extern "C" { +#endif + #ifdef MAKE_KPSE_DLL /* libkpathsea internal only */ extern void init_user_info (void); @@ -74,4 +78,8 @@ win32_popen (const char *command, const char *fmode) } #define popen(cmd, mode) win32_popen(cmd, mode) +#ifdef __cplusplus +} +#endif + #endif diff --git a/Build/source/texk/kpathsea/pathsearch.h b/Build/source/texk/kpathsea/pathsearch.h index d54d019e262..66227bdfd1d 100644 --- a/Build/source/texk/kpathsea/pathsearch.h +++ b/Build/source/texk/kpathsea/pathsearch.h @@ -23,6 +23,10 @@ #include <kpathsea/str-llist.h> #include <kpathsea/types.h> +#ifdef __cplusplus +extern "C" { +#endif + /* The naming of all these functions is rather scattered and inconsistent, but they grew over time, and we don't want to change the meaning of existing names. */ @@ -105,4 +109,8 @@ extern KPSEDLL string *kpse_all_path_search #endif +#ifdef __cplusplus +} +#endif + #endif /* not KPATHSEA_PATHSEARCH_H */ diff --git a/Build/source/texk/kpathsea/proginit.h b/Build/source/texk/kpathsea/proginit.h index 27d8c4f4421..a917c6482f3 100644 --- a/Build/source/texk/kpathsea/proginit.h +++ b/Build/source/texk/kpathsea/proginit.h @@ -23,6 +23,10 @@ #include <kpathsea/types.h> +#ifdef __cplusplus +extern "C" { +#endif + /* Common initializations for DVI drivers -- check for `PREFIX'SIZES and `PREFIX'FONTS environment variables, setenv MAKETEX_MODE to MODE, etc., etc. See the source. */ @@ -37,4 +41,8 @@ kpse_init_prog (const_string prefix, unsigned dpi, const_string mode, const_string fallback); #endif +#ifdef __cplusplus +} +#endif + #endif /* not KPATHSEA_PROGINIT_H */ diff --git a/Build/source/texk/kpathsea/progname.c b/Build/source/texk/kpathsea/progname.c index f73cf07d391..01f2710c7aa 100644 --- a/Build/source/texk/kpathsea/progname.c +++ b/Build/source/texk/kpathsea/progname.c @@ -724,6 +724,23 @@ kpse_set_program_name (const_string argv0, const_string progname) } #endif +/* Returns ARGV0 with any leading path and on some systems the suffix + for executables stripped off. This returns a new string. + For example, `kpse_program_basename ("/foo/bar.EXE")' returns "bar" + on WIndows or Cygwin and "bar.EXE" otherwise. */ + +string +kpse_program_basename (const_string argv0) +{ + string base = xstrdup (xbasename (argv0)); +#ifdef EXEEXT + string dot = strrchr (base, '.'); + if (dot && FILESTRCASEEQ (dot, EXEEXT)) + *dot = 0; +#endif + return base; +} + #ifdef TEST static const char *tab[] = { diff --git a/Build/source/texk/kpathsea/progname.h b/Build/source/texk/kpathsea/progname.h index 3d012b35152..596424b466d 100644 --- a/Build/source/texk/kpathsea/progname.h +++ b/Build/source/texk/kpathsea/progname.h @@ -1,6 +1,6 @@ /* progname.h: Declarations for argv[0] equivalents. - Copyright 1994, 1996, 2008, 2010, 2011 Karl Berry. + Copyright 1994, 1996, 2008, 2010-2013 Karl Berry. Copyright 1999, 2005 Olaf Weber. This library is free software; you can redistribute it and/or @@ -22,6 +22,10 @@ #include <kpathsea/c-proto.h> #include <kpathsea/types.h> +#ifdef __cplusplus +extern "C" { +#endif + /* Return directory ARGV0 comes from. Check PATH if ARGV0 is not absolute. */ @@ -54,4 +58,13 @@ extern KPSEDLL void kpse_set_program_name (const_string argv0, const_string progname); #endif /* KPSE_COMPAT_API */ +/* Returns ARGV0 with any leading path and on some systems the suffix + for executables stripped off. This returns a new string. */ + +extern KPSEDLL string kpse_program_basename (const_string argv0); + +#ifdef __cplusplus +} +#endif + #endif /* not KPATHSEA_PROGNAME_H */ diff --git a/Build/source/texk/kpathsea/readable.h b/Build/source/texk/kpathsea/readable.h index ca766c0141d..123e299b132 100644 --- a/Build/source/texk/kpathsea/readable.h +++ b/Build/source/texk/kpathsea/readable.h @@ -22,6 +22,10 @@ #include <kpathsea/c-proto.h> #include <kpathsea/types.h> +#ifdef __cplusplus +extern "C" { +#endif + /* If NAME is readable and is a regular file, return it. If the error is ENAMETOOLONG, truncate any too-long path components, and if the result is a readable file, return that. Otherwise return NULL. */ @@ -32,4 +36,8 @@ extern KPSEDLL string kpathsea_readable_file (kpathsea kpse, string name); extern KPSEDLL string kpse_readable_file (string name); #endif +#ifdef __cplusplus +} +#endif + #endif /* not KPATHSEA_READABLE_H */ diff --git a/Build/source/texk/kpathsea/str-list.h b/Build/source/texk/kpathsea/str-list.h index 6be7b39ee45..770abbdd3d0 100644 --- a/Build/source/texk/kpathsea/str-list.h +++ b/Build/source/texk/kpathsea/str-list.h @@ -23,6 +23,10 @@ #include <kpathsea/types.h> +#ifdef __cplusplus +extern "C" { +#endif + /* Lists of strings; used for, e.g., directory lists. */ typedef struct { @@ -92,4 +96,8 @@ extern void str_list_uniqify (str_list_type *l); #endif /* MAKE_KPSE_DLL */ +#ifdef __cplusplus +} +#endif + #endif /* not KPATHSEA_STR_LIST_H */ diff --git a/Build/source/texk/kpathsea/str-llist.h b/Build/source/texk/kpathsea/str-llist.h index 894544b2d42..bcc9b6dffaa 100644 --- a/Build/source/texk/kpathsea/str-llist.h +++ b/Build/source/texk/kpathsea/str-llist.h @@ -26,6 +26,10 @@ #include <kpathsea/types.h> +#ifdef __cplusplus +extern "C" { +#endif + /* It's a little bizarre to be using the same type for the list and the elements of the list, but no reason not to in this case, I think -- we never need a NULL string in the middle of the list, and an extra @@ -55,4 +59,8 @@ extern void str_llist_float (str_llist_type *l, str_llist_elt_type *e); #endif /* MAKE_KPSE_DLL */ +#ifdef __cplusplus +} +#endif + #endif /* not STR_LLIST_H */ diff --git a/Build/source/texk/kpathsea/tex-file.h b/Build/source/texk/kpathsea/tex-file.h index 076edcc57b6..1310b51a8e7 100644 --- a/Build/source/texk/kpathsea/tex-file.h +++ b/Build/source/texk/kpathsea/tex-file.h @@ -23,6 +23,10 @@ #include <stdarg.h> #include <kpathsea/types.h> +#ifdef __cplusplus +extern "C" { +#endif + #ifdef MAKE_KPSE_DLL /* libkpathsea internal only */ /* This initializes the fallback resolution list. If ENVVAR @@ -130,4 +134,8 @@ extern KPSEDLL FILE *kpse_open_file (const_string, kpse_file_format_type); extern KPSEDLL void kpse_reset_program_name (const_string progname); #endif +#ifdef __cplusplus +} +#endif + #endif /* not KPATHSEA_TEX_FILE_H */ diff --git a/Build/source/texk/kpathsea/tex-glyph.h b/Build/source/texk/kpathsea/tex-glyph.h index f2a8c67f7f4..0864bb35423 100644 --- a/Build/source/texk/kpathsea/tex-glyph.h +++ b/Build/source/texk/kpathsea/tex-glyph.h @@ -22,6 +22,10 @@ #include <kpathsea/tex-file.h> +#ifdef __cplusplus +extern "C" { +#endif + /* This type describes the origination of a glyph font. */ typedef enum @@ -87,4 +91,8 @@ extern KPSEDLL string kpse_find_glyph (const_string font_name, unsigned dpi, extern KPSEDLL boolean kpse_bitmap_tolerance (double dpi1, double dpi2); #endif +#ifdef __cplusplus +} +#endif + #endif /* not KPATHSEA_TEX_GLYPH_H */ diff --git a/Build/source/texk/kpathsea/tex-hush.h b/Build/source/texk/kpathsea/tex-hush.h index 3c322f4fa89..3eb7ba16a99 100644 --- a/Build/source/texk/kpathsea/tex-hush.h +++ b/Build/source/texk/kpathsea/tex-hush.h @@ -21,6 +21,10 @@ #include <kpathsea/c-proto.h> #include <kpathsea/types.h> +#ifdef __cplusplus +extern "C" { +#endif + /* Return true if WHAT is included in the TEX_HUSH environment variable/config value. */ extern KPSEDLL boolean kpathsea_tex_hush (kpathsea kpse, const_string what); @@ -29,4 +33,8 @@ extern KPSEDLL boolean kpathsea_tex_hush (kpathsea kpse, const_string what); extern KPSEDLL boolean kpse_tex_hush (const_string what); #endif +#ifdef __cplusplus +} +#endif + #endif /* not KPATHSEA_TEX_HUSH_H */ diff --git a/Build/source/texk/kpathsea/tex-make.h b/Build/source/texk/kpathsea/tex-make.h index c435c3beb92..00902f7f101 100644 --- a/Build/source/texk/kpathsea/tex-make.h +++ b/Build/source/texk/kpathsea/tex-make.h @@ -23,6 +23,10 @@ #include <kpathsea/tex-file.h> #include <kpathsea/types.h> +#ifdef __cplusplus +extern "C" { +#endif + /* Run a program to create a file named by BASE_FILE in format FORMAT. Return the full filename to it, or NULL. Any other information about the file is passed through environment variables. See the mktexpk @@ -37,4 +41,8 @@ extern KPSEDLL string kpse_make_tex (kpse_file_format_type format, const_string base_file); #endif +#ifdef __cplusplus +} +#endif + #endif /* not KPATHSEA_TEX_MAKE_H */ diff --git a/Build/source/texk/kpathsea/types.h b/Build/source/texk/kpathsea/types.h index fafa5acd200..a2b0a00ba44 100644 --- a/Build/source/texk/kpathsea/types.h +++ b/Build/source/texk/kpathsea/types.h @@ -65,6 +65,10 @@ typedef int boolean; # define PRIX64 __PRI64_PREFIX "X" #endif +#ifdef __cplusplus +extern "C" { +#endif + /* The usual null-terminated string. */ typedef char *string; @@ -79,9 +83,17 @@ typedef void *address; typedef void (*p_record_input) (const_string); typedef void (*p_record_output) (const_string); +#ifdef __cplusplus +} +#endif + /* the cache structure from elt-dirs.c */ #include <kpathsea/str-llist.h> +#ifdef __cplusplus +extern "C" { +#endif + typedef struct { const_string key; @@ -94,10 +106,18 @@ typedef struct { boolean expanding; } expansion_type; +#ifdef __cplusplus +} +#endif + #include <kpathsea/hash.h> #include <kpathsea/str-list.h> +#ifdef __cplusplus +extern "C" { +#endif + /* from old tex-file.h */ /* We put the glyphs first so we don't waste space in an array in @@ -331,4 +351,8 @@ extern KPSEDLL kpathsea kpse_def; #endif /* KPSE_COMPAT_API */ +#ifdef __cplusplus +} +#endif + #endif /* not KPATHSEA_TYPES_H */ diff --git a/Build/source/texk/kpathsea/variable.h b/Build/source/texk/kpathsea/variable.h index 992b9b36191..ab4a22a6924 100644 --- a/Build/source/texk/kpathsea/variable.h +++ b/Build/source/texk/kpathsea/variable.h @@ -22,6 +22,10 @@ #include <kpathsea/types.h> +#ifdef __cplusplus +extern "C" { +#endif + /* Return the (variable-expanded) environment variable value or config file value, or NULL. */ extern KPSEDLL string kpathsea_var_value (kpathsea kpse, const_string var); @@ -43,4 +47,8 @@ extern KPSEDLL string kpse_var_value (const_string var); extern KPSEDLL string kpse_var_expand (const_string src); #endif +#ifdef __cplusplus +} +#endif + #endif /* not KPATHSEA_VARIABLE_H */ diff --git a/Build/source/texk/kpathsea/version.ac b/Build/source/texk/kpathsea/version.ac index e5f42e64c54..840e2ace3b0 100644 --- a/Build/source/texk/kpathsea/version.ac +++ b/Build/source/texk/kpathsea/version.ac @@ -19,4 +19,4 @@ dnl append "dev", to distinguish binaries built between releases. dnl -------------------------------------------------------- dnl dnl m4-include this file to define the current kpathsea version -m4_define([kpse_version], [6.1.1]) +m4_define([kpse_version], [6.2.0dev]) diff --git a/Build/source/texk/kpathsea/version.h b/Build/source/texk/kpathsea/version.h index 03f255abf77..ef94be6434b 100644 --- a/Build/source/texk/kpathsea/version.h +++ b/Build/source/texk/kpathsea/version.h @@ -21,8 +21,16 @@ #include <kpathsea/c-proto.h> #include <kpathsea/types.h> +#ifdef __cplusplus +extern "C" { +#endif + extern KPSEDLL const char *kpathsea_version_string; extern KPSEDLL const char *kpathsea_bug_address; +#ifdef __cplusplus +} +#endif + #endif /* not KPATHSEA_VERSION_H */ diff --git a/Build/source/texk/kpathsea/win32/Makefile.in b/Build/source/texk/kpathsea/win32/Makefile.in index 525041f45e4..52c8ab90101 100644 --- a/Build/source/texk/kpathsea/win32/Makefile.in +++ b/Build/source/texk/kpathsea/win32/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.1 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# 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, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +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 \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + 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; \ - test $$am__dry = yes; \ - } + 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@ @@ -435,24 +463,31 @@ clean-binPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + fmtutil$(EXEEXT): $(fmtutil_OBJECTS) $(fmtutil_DEPENDENCIES) $(EXTRA_fmtutil_DEPENDENCIES) @rm -f fmtutil$(EXEEXT) $(AM_V_CCLD)$(LINK) $(fmtutil_OBJECTS) $(fmtutil_LDADD) $(LIBS) + mktexfmt$(EXEEXT): $(mktexfmt_OBJECTS) $(mktexfmt_DEPENDENCIES) $(EXTRA_mktexfmt_DEPENDENCIES) @rm -f mktexfmt$(EXEEXT) $(AM_V_CCLD)$(LINK) $(mktexfmt_OBJECTS) $(mktexfmt_LDADD) $(LIBS) + mktexlsr$(EXEEXT): $(mktexlsr_OBJECTS) $(mktexlsr_DEPENDENCIES) $(EXTRA_mktexlsr_DEPENDENCIES) @rm -f mktexlsr$(EXEEXT) $(AM_V_CCLD)$(LINK) $(mktexlsr_OBJECTS) $(mktexlsr_LDADD) $(LIBS) + mktexmf$(EXEEXT): $(mktexmf_OBJECTS) $(mktexmf_DEPENDENCIES) $(EXTRA_mktexmf_DEPENDENCIES) @rm -f mktexmf$(EXEEXT) $(AM_V_CCLD)$(LINK) $(mktexmf_OBJECTS) $(mktexmf_LDADD) $(LIBS) + mktexpk$(EXEEXT): $(mktexpk_OBJECTS) $(mktexpk_DEPENDENCIES) $(EXTRA_mktexpk_DEPENDENCIES) @rm -f mktexpk$(EXEEXT) $(AM_V_CCLD)$(LINK) $(mktexpk_OBJECTS) $(mktexpk_LDADD) $(LIBS) + mktextfm$(EXEEXT): $(mktextfm_OBJECTS) $(mktextfm_DEPENDENCIES) $(EXTRA_mktextfm_DEPENDENCIES) @rm -f mktextfm$(EXEEXT) $(AM_V_CCLD)$(LINK) $(mktextfm_OBJECTS) $(mktextfm_LDADD) $(LIBS) + mktexupd$(EXEEXT): $(mktexupd_OBJECTS) $(mktexupd_DEPENDENCIES) $(EXTRA_mktexupd_DEPENDENCIES) @rm -f mktexupd$(EXEEXT) $(AM_V_CCLD)$(LINK) $(mktexupd_OBJECTS) $(mktexupd_LDADD) $(LIBS) diff --git a/Build/source/texk/kpathsea/win32lib.h b/Build/source/texk/kpathsea/win32lib.h index 168d99a12c5..d7e51f054a7 100644 --- a/Build/source/texk/kpathsea/win32lib.h +++ b/Build/source/texk/kpathsea/win32lib.h @@ -245,6 +245,10 @@ #undef min #endif +#ifdef __cplusplus +extern "C" { +#endif + extern KPSEDLL FILE *win32_popen (const char *cmd, const char *mode); extern KPSEDLL int win32_pclose (FILE *f); extern KPSEDLL struct passwd *kpathsea_getpwnam (kpathsea kpse, char *name); @@ -270,4 +274,8 @@ extern KPSEDLL char *get_home_directory (void); #define xfseeko xfseek64 #define xftello xftell64 +#ifdef __cplusplus +} +#endif + #endif /* not KPATHSEA_WIN32LIB_H */ diff --git a/Build/source/texk/kpathsea/xrealloc.c b/Build/source/texk/kpathsea/xrealloc.c index 7561d72791d..e56668368b4 100644 --- a/Build/source/texk/kpathsea/xrealloc.c +++ b/Build/source/texk/kpathsea/xrealloc.c @@ -1,6 +1,6 @@ /* xrealloc.c: realloc with error checking. - Copyright 1992, 1993, 2008, 2010 Karl Berry. + Copyright 1992, 1993, 2008, 2010, 2013 Karl Berry. Copyright 2005 Olaf Weber. This library is free software; you can redistribute it and/or @@ -18,8 +18,6 @@ #include <kpathsea/config.h> -extern void *xmalloc (size_t); - void * xrealloc (void *old_ptr, size_t size) { |