summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/kpathsea/ChangeLog9
-rw-r--r--Build/source/texk/kpathsea/Makefile.am6
-rw-r--r--Build/source/texk/kpathsea/Makefile.in136
-rw-r--r--Build/source/texk/kpathsea/aclocal.m41
-rwxr-xr-xBuild/source/texk/kpathsea/configure159
-rw-r--r--Build/source/texk/kpathsea/configure.ac4
-rw-r--r--Build/source/texk/kpathsea/doc/Makefile.in1
-rw-r--r--Build/source/texk/kpathsea/kpathsea.c22
-rw-r--r--Build/source/texk/kpathsea/man/Makefile.in1
-rw-r--r--Build/source/texk/kpathsea/mingw32.c6
-rw-r--r--Build/source/texk/kpathsea/tex-glyph.c12
11 files changed, 241 insertions, 116 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 3da62f00833..bdf4b723279 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,12 @@
+2009-06-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: enable compiler warnings.
+ * kpathsea.c (KPATHSEA_CAN_FREE): disable not yet used code.
+ (str_llist_free, cache_free): declare as static, not yet used.
+ (kpathsea_finish): avoid warning about not yet used variables.
+ * tex-glyph.c (try_size): avoid uninitialized warning.
+ * mingw32.c: avoid unused static variable.
+
2009-06-15 Karl Berry <karl@tug.org>
* texmf.cnf (TEXINPUTS.jadetex,pdfjadetex): search latex, not plain.
diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am
index 8d2960289fc..890ce706742 100644
--- a/Build/source/texk/kpathsea/Makefile.am
+++ b/Build/source/texk/kpathsea/Makefile.am
@@ -10,6 +10,7 @@ SUBDIRS = . doc man
EXTRA_DIST = BUGS HIER PROJECTS README.CONFIGURE
INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir)/..
+AM_CFLAGS = $(WARNING_CFLAGS)
lib_LTLIBRARIES = libkpathsea.la
@@ -49,7 +50,6 @@ libkpathsea_la_SOURCES = \
line.c \
magstep.c \
make-suffix.c \
- mingw32.c \
path-elt.c \
pathsearch.c \
proginit.c \
@@ -82,6 +82,10 @@ libkpathsea_la_SOURCES = \
xstat.c \
xstrdup.c
+if MINGW32
+libkpathsea_la_SOURCES += mingw32.c
+endif MINGW32
+
$(libkpathsea_la_SOURCES): paths.h
EXTRA_DIST += \
diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in
index 0a7aecce087..e54a4579a00 100644
--- a/Build/source/texk/kpathsea/Makefile.in
+++ b/Build/source/texk/kpathsea/Makefile.in
@@ -38,6 +38,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+@MINGW32_TRUE@am__append_1 = mingw32.c
bin_PROGRAMS = kpseaccess$(EXEEXT) kpsereadlink$(EXEEXT) \
kpsestat$(EXEEXT) kpsewhich$(EXEEXT)
subdir = .
@@ -62,6 +63,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/../../m4/kpse-web2c.m4 \
+ $(top_srcdir)/../../m4/kpse-win32.m4 \
$(top_srcdir)/../../m4/libtool.m4 \
$(top_srcdir)/../../m4/ltoptions.m4 \
$(top_srcdir)/../../m4/ltsugar.m4 \
@@ -102,6 +104,18 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(kpseincludedir)" "$(DESTDIR)$(kpseincludedir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
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 truncate.c \
+ uppercasify.c variable.c version.c xbasename.c xcalloc.c \
+ xdirname.c xfopen.c xfseek.c xfseeko.c xftell.c xftello.c \
+ xgetcwd.c xmalloc.c xopendir.c xputenv.c xrealloc.c xstat.c \
+ xstrdup.c mingw32.c
+@MINGW32_TRUE@am__objects_1 = libkpathsea_la-mingw32.lo
am_libkpathsea_la_OBJECTS = libkpathsea_la-tex-file.lo \
libkpathsea_la-absolute.lo libkpathsea_la-atou.lo \
libkpathsea_la-cnf.lo libkpathsea_la-concat.lo \
@@ -115,22 +129,22 @@ am_libkpathsea_la_OBJECTS = libkpathsea_la-tex-file.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 \
- libkpathsea_la-mingw32.lo libkpathsea_la-path-elt.lo \
- libkpathsea_la-pathsearch.lo libkpathsea_la-proginit.lo \
- libkpathsea_la-progname.lo libkpathsea_la-readable.lo \
- libkpathsea_la-rm-suffix.lo libkpathsea_la-str-list.lo \
- libkpathsea_la-str-llist.lo libkpathsea_la-tex-glyph.lo \
- libkpathsea_la-tex-hush.lo libkpathsea_la-tex-make.lo \
- libkpathsea_la-tilde.lo libkpathsea_la-truncate.lo \
- libkpathsea_la-uppercasify.lo libkpathsea_la-variable.lo \
- libkpathsea_la-version.lo libkpathsea_la-xbasename.lo \
- libkpathsea_la-xcalloc.lo libkpathsea_la-xdirname.lo \
- libkpathsea_la-xfopen.lo libkpathsea_la-xfseek.lo \
- libkpathsea_la-xfseeko.lo libkpathsea_la-xftell.lo \
- libkpathsea_la-xftello.lo libkpathsea_la-xgetcwd.lo \
- libkpathsea_la-xmalloc.lo libkpathsea_la-xopendir.lo \
- libkpathsea_la-xputenv.lo libkpathsea_la-xrealloc.lo \
- libkpathsea_la-xstat.lo libkpathsea_la-xstrdup.lo
+ libkpathsea_la-path-elt.lo libkpathsea_la-pathsearch.lo \
+ libkpathsea_la-proginit.lo libkpathsea_la-progname.lo \
+ libkpathsea_la-readable.lo libkpathsea_la-rm-suffix.lo \
+ libkpathsea_la-str-list.lo libkpathsea_la-str-llist.lo \
+ libkpathsea_la-tex-glyph.lo libkpathsea_la-tex-hush.lo \
+ libkpathsea_la-tex-make.lo libkpathsea_la-tilde.lo \
+ libkpathsea_la-truncate.lo libkpathsea_la-uppercasify.lo \
+ libkpathsea_la-variable.lo libkpathsea_la-version.lo \
+ libkpathsea_la-xbasename.lo libkpathsea_la-xcalloc.lo \
+ libkpathsea_la-xdirname.lo libkpathsea_la-xfopen.lo \
+ libkpathsea_la-xfseek.lo libkpathsea_la-xfseeko.lo \
+ libkpathsea_la-xftell.lo libkpathsea_la-xftello.lo \
+ libkpathsea_la-xgetcwd.lo libkpathsea_la-xmalloc.lo \
+ libkpathsea_la-xopendir.lo libkpathsea_la-xputenv.lo \
+ libkpathsea_la-xrealloc.lo libkpathsea_la-xstat.lo \
+ libkpathsea_la-xstrdup.lo $(am__objects_1)
libkpathsea_la_OBJECTS = $(am_libkpathsea_la_OBJECTS)
libkpathsea_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -164,8 +178,9 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(libkpathsea_la_SOURCES) $(kpseaccess_SOURCES) \
$(kpsereadlink_SOURCES) kpsestat.c kpsewhich.c
-DIST_SOURCES = $(libkpathsea_la_SOURCES) $(kpseaccess_SOURCES) \
- $(kpsereadlink_SOURCES) kpsestat.c kpsewhich.c
+DIST_SOURCES = $(am__libkpathsea_la_SOURCES_DIST) \
+ $(kpseaccess_SOURCES) $(kpsereadlink_SOURCES) kpsestat.c \
+ kpsewhich.c
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
install-dvi-recursive install-exec-recursive \
@@ -339,70 +354,23 @@ EXTRA_DIST = BUGS HIER PROJECTS README.CONFIGURE putenv.c strcasecmp.c \
strtol.c strstr.c mktex.cnf Makefile.in.orig common.ac.orig \
withenable.ac
INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir)/..
+AM_CFLAGS = $(WARNING_CFLAGS)
lib_LTLIBRARIES = libkpathsea.la
libkpathsea_la_CPPFLAGS = -DMAKE_KPSE_DLL
libkpathsea_la_LDFLAGS = -version-number $(KPSE_LT_VERSNUM)
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 \
- mingw32.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 \
- truncate.c \
- uppercasify.c \
- variable.c \
- version.c \
- xbasename.c \
- xcalloc.c \
- xdirname.c \
- xfopen.c \
- xfseek.c \
- xfseeko.c \
- xftell.c \
- xftello.c \
- xgetcwd.c \
- xmalloc.c \
- xopendir.c \
- xputenv.c \
- xrealloc.c \
- xstat.c \
- xstrdup.c
-
+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 truncate.c uppercasify.c \
+ variable.c version.c xbasename.c xcalloc.c xdirname.c xfopen.c \
+ xfseek.c xfseeko.c xftell.c xftello.c xgetcwd.c xmalloc.c \
+ xopendir.c xputenv.c xrealloc.c xstat.c xstrdup.c \
+ $(am__append_1)
kpseincludedir = ${includedir}/kpathsea
nodist_kpseinclude_HEADERS = \
c-auto.h \
@@ -916,13 +884,6 @@ libkpathsea_la-make-suffix.lo: make-suffix.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkpathsea_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkpathsea_la-make-suffix.lo `test -f 'make-suffix.c' || echo '$(srcdir)/'`make-suffix.c
-libkpathsea_la-mingw32.lo: mingw32.c
-@am__fastdepCC_TRUE@ $(LIBTOOL) --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__mv) $(DEPDIR)/libkpathsea_la-mingw32.Tpo $(DEPDIR)/libkpathsea_la-mingw32.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mingw32.c' object='libkpathsea_la-mingw32.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkpathsea_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkpathsea_la-mingw32.lo `test -f 'mingw32.c' || echo '$(srcdir)/'`mingw32.c
-
libkpathsea_la-path-elt.lo: path-elt.c
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkpathsea_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libkpathsea_la-path-elt.lo -MD -MP -MF $(DEPDIR)/libkpathsea_la-path-elt.Tpo -c -o libkpathsea_la-path-elt.lo `test -f 'path-elt.c' || echo '$(srcdir)/'`path-elt.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libkpathsea_la-path-elt.Tpo $(DEPDIR)/libkpathsea_la-path-elt.Plo
@@ -1140,6 +1101,13 @@ libkpathsea_la-xstrdup.lo: xstrdup.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --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-mingw32.lo: mingw32.c
+@am__fastdepCC_TRUE@ $(LIBTOOL) --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__mv) $(DEPDIR)/libkpathsea_la-mingw32.Tpo $(DEPDIR)/libkpathsea_la-mingw32.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mingw32.c' object='libkpathsea_la-mingw32.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkpathsea_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libkpathsea_la-mingw32.lo `test -f 'mingw32.c' || echo '$(srcdir)/'`mingw32.c
+
mostlyclean-libtool:
-rm -f *.lo
diff --git a/Build/source/texk/kpathsea/aclocal.m4 b/Build/source/texk/kpathsea/aclocal.m4
index 2640c700435..66f4a74692e 100644
--- a/Build/source/texk/kpathsea/aclocal.m4
+++ b/Build/source/texk/kpathsea/aclocal.m4
@@ -992,6 +992,7 @@ AC_SUBST([am__untar])
m4_include([../../m4/kpse-common.m4])
m4_include([../../m4/kpse-warnings.m4])
m4_include([../../m4/kpse-web2c.m4])
+m4_include([../../m4/kpse-win32.m4])
m4_include([../../m4/libtool.m4])
m4_include([../../m4/ltoptions.m4])
m4_include([../../m4/ltsugar.m4])
diff --git a/Build/source/texk/kpathsea/configure b/Build/source/texk/kpathsea/configure
index d17494ce346..7ef8638442f 100755
--- a/Build/source/texk/kpathsea/configure
+++ b/Build/source/texk/kpathsea/configure
@@ -789,6 +789,10 @@ ac_includes_default="\
ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
+MINGW32_FALSE
+MINGW32_TRUE
+WIN32_FALSE
+WIN32_TRUE
LIBOBJS
WARNING_CFLAGS
CPP
@@ -4345,13 +4349,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4348: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4352: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4351: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4355: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4354: output\"" >&5)
+ (eval echo "\"\$as_me:4358: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5557,7 +5561,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5560 "configure"' > conftest.$ac_ext
+ echo '#line 5564 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7518,11 +7522,11 @@ else
-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:7521: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7525: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7525: \$? = $ac_status" >&5
+ echo "$as_me:7529: \$? = $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.
@@ -7857,11 +7861,11 @@ else
-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:7860: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7864: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7864: \$? = $ac_status" >&5
+ echo "$as_me:7868: \$? = $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.
@@ -7962,11 +7966,11 @@ else
-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:7965: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7969: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7969: \$? = $ac_status" >&5
+ echo "$as_me:7973: \$? = $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
@@ -8017,11 +8021,11 @@ else
-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:8020: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8024: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8024: \$? = $ac_status" >&5
+ echo "$as_me:8028: \$? = $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
@@ -10817,7 +10821,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10820 "configure"
+#line 10824 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10913,7 +10917,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10916 "configure"
+#line 10920 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13429,6 +13433,119 @@ _ACEOF
fi
fi
+{ $as_echo "$as_me:$LINENO: checking for native WIN32 or MINGW32" >&5
+$as_echo_n "checking for native WIN32 or MINGW32... " >&6; }
+if test "${kpse_cv_have_win32+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#ifndef WIN32
+ choke me
+#endif
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#ifndef __MINGW32__
+ choke me
+#endif
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ kpse_cv_have_win32=mingw32
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ kpse_cv_have_win32=native
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ kpse_cv_have_win32=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $kpse_cv_have_win32" >&5
+$as_echo "$kpse_cv_have_win32" >&6; }
+
+ if test "x$kpse_cv_have_win32" != xno; then
+ WIN32_TRUE=
+ WIN32_FALSE='#'
+else
+ WIN32_TRUE='#'
+ WIN32_FALSE=
+fi
+
+ if test "x$kpse_cv_have_win32" = xmingw32; then
+ MINGW32_TRUE=
+ MINGW32_FALSE='#'
+else
+ MINGW32_TRUE='#'
+ MINGW32_FALSE=
+fi
+
+
ac_config_headers="$ac_config_headers c-auto.h:c-auto.in"
@@ -13566,6 +13683,20 @@ $as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"WIN32\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"WIN32\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${MINGW32_TRUE}" && test -z "${MINGW32_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"MINGW32\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"MINGW32\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_write_fail=0
diff --git a/Build/source/texk/kpathsea/configure.ac b/Build/source/texk/kpathsea/configure.ac
index 9d3276d946a..d0f59a693a9 100644
--- a/Build/source/texk/kpathsea/configure.ac
+++ b/Build/source/texk/kpathsea/configure.ac
@@ -71,6 +71,10 @@ if test $kb_cv_func_getcwd_forks = yes; then
fi
fi
+KPSE_CHECK_WIN32
+AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno])
+AM_CONDITIONAL([MINGW32], [test "x$kpse_cv_have_win32" = xmingw32])
+
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/doc/Makefile.in b/Build/source/texk/kpathsea/doc/Makefile.in
index ffcbff51fc3..e6e09736f95 100644
--- a/Build/source/texk/kpathsea/doc/Makefile.in
+++ b/Build/source/texk/kpathsea/doc/Makefile.in
@@ -40,6 +40,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/../../m4/kpse-web2c.m4 \
+ $(top_srcdir)/../../m4/kpse-win32.m4 \
$(top_srcdir)/../../m4/libtool.m4 \
$(top_srcdir)/../../m4/ltoptions.m4 \
$(top_srcdir)/../../m4/ltsugar.m4 \
diff --git a/Build/source/texk/kpathsea/kpathsea.c b/Build/source/texk/kpathsea/kpathsea.c
index e0a13a4488b..fe5a439e205 100644
--- a/Build/source/texk/kpathsea/kpathsea.c
+++ b/Build/source/texk/kpathsea/kpathsea.c
@@ -17,6 +17,13 @@
/* One big global struct, and a variable that points to it */
+/*
+ * The code freeing the strings used in this struct is enabled/disabled
+ * by KPATHSEA_CAN_FREE.
+ */
+/* At the moment can not free */
+#define KPATHSEA_CAN_FREE 0
+
#include <kpathsea/config.h>
kpathsea
@@ -27,9 +34,11 @@ kpathsea_new (void)
return ret;
}
+#if KPATHSEA_CAN_FREE
+
#define string_free(a) if((a)!=NULL) free((char *)(a))
-void
+static void
str_llist_free (str_llist_type p)
{
str_llist_type q;
@@ -41,7 +50,7 @@ str_llist_free (str_llist_type p)
}
}
-void
+static void
cache_free (cache_entry *the_cache, int cache_size)
{
int f ;
@@ -51,17 +60,20 @@ cache_free (cache_entry *the_cache, int cache_size)
}
free (the_cache);
}
+#endif /* KPATHSEA_CAN_FREE */
/* Sadly, quite a lot of the freeing is not safe:
it seems there are literals used all over. */
void
kpathsea_finish (kpathsea kpse)
{
+#if KPATHSEA_CAN_FREE
int i;
kpse_format_info_type f;
+#endif /* KPATHSEA_CAN_FREE */
if (kpse==NULL)
return;
-#if 0
+#if KPATHSEA_CAN_FREE
/* free internal stuff */
hash_free (kpse->cnf_hash);
hash_free (kpse->db);
@@ -102,7 +114,7 @@ kpathsea_finish (kpathsea kpse)
string_free (kpse->saved_env[i]);
free (kpse->saved_env);
}
-#endif /* zero */
+#endif /* KPATHSEA_CAN_FREE */
#if defined (KPSE_COMPAT_API)
if (kpse==kpse_def)
return;
@@ -237,4 +249,4 @@ kpathsea_instance kpse_def_inst;
kpathsea kpse_def = &kpse_def_inst;
-#endif
+#endif /* KPSE_COMPAT_API */
diff --git a/Build/source/texk/kpathsea/man/Makefile.in b/Build/source/texk/kpathsea/man/Makefile.in
index 11e945d46d7..b746a3dbd9b 100644
--- a/Build/source/texk/kpathsea/man/Makefile.in
+++ b/Build/source/texk/kpathsea/man/Makefile.in
@@ -40,6 +40,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
$(top_srcdir)/../../m4/kpse-warnings.m4 \
$(top_srcdir)/../../m4/kpse-web2c.m4 \
+ $(top_srcdir)/../../m4/kpse-win32.m4 \
$(top_srcdir)/../../m4/libtool.m4 \
$(top_srcdir)/../../m4/ltoptions.m4 \
$(top_srcdir)/../../m4/ltsugar.m4 \
diff --git a/Build/source/texk/kpathsea/mingw32.c b/Build/source/texk/kpathsea/mingw32.c
index 69de2af2e1b..3fd649fb658 100644
--- a/Build/source/texk/kpathsea/mingw32.c
+++ b/Build/source/texk/kpathsea/mingw32.c
@@ -23,9 +23,7 @@
<taco@luatex.org>.
*/
-#ifndef __MINGW32__
-static int static_variable_mingw32_c = 0;
-#else
+#ifdef __MINGW32__
#include <kpathsea/config.h>
#include <kpathsea/c-proto.h>
@@ -1028,4 +1026,4 @@ int win32_system(const char *cmd, int async)
return ret;
}
-#endif
+#endif /* __MINGW32__ */
diff --git a/Build/source/texk/kpathsea/tex-glyph.c b/Build/source/texk/kpathsea/tex-glyph.c
index 270d960fa70..728f95ea134 100644
--- a/Build/source/texk/kpathsea/tex-glyph.c
+++ b/Build/source/texk/kpathsea/tex-glyph.c
@@ -95,16 +95,12 @@ try_size (kpathsea kpse, const_string fontname, unsigned dpi,
/* Look for PK first (since it's more likely to be found), then GF. */
ret = try_pk ? try_format (kpse, fontname, dpi, kpse_pk_format) : NULL;
+ format_found = kpse_pk_format;
- if (ret != NULL)
- format_found = kpse_pk_format;
- else
+ if (ret == NULL && try_gf)
{
- if (try_gf)
- {
- ret = try_format (kpse, fontname, dpi, kpse_gf_format);
- format_found = kpse_gf_format;
- }
+ ret = try_format (kpse, fontname, dpi, kpse_gf_format);
+ format_found = kpse_gf_format;
}
if (ret != NULL && glyph_file)