summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/kpathsea/ChangeLog7
-rw-r--r--Build/source/texk/kpathsea/Makefile.am19
-rw-r--r--Build/source/texk/kpathsea/Makefile.in69
-rw-r--r--Build/source/texk/kpathsea/win32lib.h2
4 files changed, 62 insertions, 35 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 4b22baee055..ef737820cef 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,10 @@
+2012-07-13 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (libkpathsea_la_SOURCES): Skip compilation of
+ xfseeko.c and xftello.c for MSVC.
+ * win32lib.h: Drop xfseeko() and xftello() prototypes, they will
+ subsequently be defined in lib.h.
+
2012-07-09 Peter Breitenlohner <peb@mppmu.mpg.de>
* version.ac: Update version number 6.1.0 => 6.1.1dev.
diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am
index a80fc85b9b0..f667820aa95 100644
--- a/Build/source/texk/kpathsea/Makefile.am
+++ b/Build/source/texk/kpathsea/Makefile.am
@@ -76,9 +76,7 @@ libkpathsea_la_SOURCES = \
xdirname.c \
xfopen.c \
xfseek.c \
- xfseeko.c \
xftell.c \
- xftello.c \
xgetcwd.c \
xmalloc.c \
xopendir.c \
@@ -89,13 +87,22 @@ libkpathsea_la_SOURCES = \
if WIN32
if MINGW32
-libkpathsea_la_SOURCES += mingw32.c
+libkpathsea_la_SOURCES += \
+ mingw32.c \
+ xfseeko.c \
+ xftello.c
else !MINGW32
-libkpathsea_la_SOURCES += win32lib.c
+libkpathsea_la_SOURCES += \
+ win32lib.c
endif !MINGW32
-libkpathsea_la_SOURCES += knj.c
+libkpathsea_la_SOURCES += \
+ knj.c
SUBDIRS += win32
-endif WIN32
+else !WIN32
+libkpathsea_la_SOURCES += \
+ xfseeko.c \
+ xftello.c
+endif !WIN32
$(libkpathsea_la_OBJECTS): paths.h kpathsea.h
diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in
index 7745ab61045..1ba63940170 100644
--- a/Build/source/texk/kpathsea/Makefile.in
+++ b/Build/source/texk/kpathsea/Makefile.in
@@ -54,10 +54,22 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-@MINGW32_TRUE@@WIN32_TRUE@am__append_1 = mingw32.c
-@MINGW32_FALSE@@WIN32_TRUE@am__append_2 = win32lib.c
-@WIN32_TRUE@am__append_3 = knj.c
+@MINGW32_TRUE@@WIN32_TRUE@am__append_1 = \
+@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@ win32lib.c
+
+@WIN32_TRUE@am__append_3 = \
+@WIN32_TRUE@ knj.c
+
@WIN32_TRUE@am__append_4 = win32
+@WIN32_FALSE@am__append_5 = \
+@WIN32_FALSE@ xfseeko.c \
+@WIN32_FALSE@ xftello.c
+
bin_PROGRAMS = kpseaccess$(EXEEXT) kpsereadlink$(EXEEXT) \
kpsestat$(EXEEXT) kpsewhich$(EXEEXT)
EXTRA_PROGRAMS = progname-test$(EXEEXT) xdirtest$(EXEEXT)
@@ -138,12 +150,16 @@ am__libkpathsea_la_SOURCES_DIST = tex-file.c absolute.c atou.c cnf.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 win32lib.c knj.c
-@MINGW32_TRUE@@WIN32_TRUE@am__objects_1 = libkpathsea_la-mingw32.lo
+ 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 win32lib.c knj.c
+@MINGW32_TRUE@@WIN32_TRUE@am__objects_1 = 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 \
+@WIN32_FALSE@ libkpathsea_la-xftello.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 \
@@ -167,13 +183,12 @@ am_libkpathsea_la_OBJECTS = libkpathsea_la-tex-file.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-xfseek.lo libkpathsea_la-xftell.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) $(am__objects_2) \
- $(am__objects_3)
+ $(am__objects_3) $(am__objects_4)
libkpathsea_la_OBJECTS = $(am_libkpathsea_la_OBJECTS)
libkpathsea_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -426,9 +441,9 @@ libkpathsea_la_SOURCES = tex-file.c absolute.c atou.c cnf.c concat.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) $(am__append_2) $(am__append_3)
+ 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)
kpseincludedir = ${includedir}/kpathsea
nodist_kpseinclude_HEADERS = \
c-auto.h \
@@ -1124,13 +1139,6 @@ libkpathsea_la-xfseek.lo: xfseek.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-xfseek.lo `test -f 'xfseek.c' || echo '$(srcdir)/'`xfseek.c
-libkpathsea_la-xfseeko.lo: xfseeko.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-xfseeko.lo -MD -MP -MF $(DEPDIR)/libkpathsea_la-xfseeko.Tpo -c -o libkpathsea_la-xfseeko.lo `test -f 'xfseeko.c' || echo '$(srcdir)/'`xfseeko.c
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libkpathsea_la-xfseeko.Tpo $(DEPDIR)/libkpathsea_la-xfseeko.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfseeko.c' object='libkpathsea_la-xfseeko.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-xfseeko.lo `test -f 'xfseeko.c' || echo '$(srcdir)/'`xfseeko.c
-
libkpathsea_la-xftell.lo: xftell.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-xftell.lo -MD -MP -MF $(DEPDIR)/libkpathsea_la-xftell.Tpo -c -o libkpathsea_la-xftell.lo `test -f 'xftell.c' || echo '$(srcdir)/'`xftell.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libkpathsea_la-xftell.Tpo $(DEPDIR)/libkpathsea_la-xftell.Plo
@@ -1138,13 +1146,6 @@ libkpathsea_la-xftell.lo: xftell.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-xftell.lo `test -f 'xftell.c' || echo '$(srcdir)/'`xftell.c
-libkpathsea_la-xftello.lo: xftello.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-xftello.lo -MD -MP -MF $(DEPDIR)/libkpathsea_la-xftello.Tpo -c -o libkpathsea_la-xftello.lo `test -f 'xftello.c' || echo '$(srcdir)/'`xftello.c
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libkpathsea_la-xftello.Tpo $(DEPDIR)/libkpathsea_la-xftello.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xftello.c' object='libkpathsea_la-xftello.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-xftello.lo `test -f 'xftello.c' || echo '$(srcdir)/'`xftello.c
-
libkpathsea_la-xgetcwd.lo: xgetcwd.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-xgetcwd.lo -MD -MP -MF $(DEPDIR)/libkpathsea_la-xgetcwd.Tpo -c -o libkpathsea_la-xgetcwd.lo `test -f 'xgetcwd.c' || echo '$(srcdir)/'`xgetcwd.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libkpathsea_la-xgetcwd.Tpo $(DEPDIR)/libkpathsea_la-xgetcwd.Plo
@@ -1201,6 +1202,20 @@ libkpathsea_la-mingw32.lo: mingw32.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-mingw32.lo `test -f 'mingw32.c' || echo '$(srcdir)/'`mingw32.c
+libkpathsea_la-xfseeko.lo: xfseeko.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-xfseeko.lo -MD -MP -MF $(DEPDIR)/libkpathsea_la-xfseeko.Tpo -c -o libkpathsea_la-xfseeko.lo `test -f 'xfseeko.c' || echo '$(srcdir)/'`xfseeko.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libkpathsea_la-xfseeko.Tpo $(DEPDIR)/libkpathsea_la-xfseeko.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfseeko.c' object='libkpathsea_la-xfseeko.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-xfseeko.lo `test -f 'xfseeko.c' || echo '$(srcdir)/'`xfseeko.c
+
+libkpathsea_la-xftello.lo: xftello.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-xftello.lo -MD -MP -MF $(DEPDIR)/libkpathsea_la-xftello.Tpo -c -o libkpathsea_la-xftello.lo `test -f 'xftello.c' || echo '$(srcdir)/'`xftello.c
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libkpathsea_la-xftello.Tpo $(DEPDIR)/libkpathsea_la-xftello.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xftello.c' object='libkpathsea_la-xftello.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-xftello.lo `test -f 'xftello.c' || echo '$(srcdir)/'`xftello.c
+
libkpathsea_la-win32lib.lo: win32lib.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-win32lib.lo -MD -MP -MF $(DEPDIR)/libkpathsea_la-win32lib.Tpo -c -o libkpathsea_la-win32lib.lo `test -f 'win32lib.c' || echo '$(srcdir)/'`win32lib.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libkpathsea_la-win32lib.Tpo $(DEPDIR)/libkpathsea_la-win32lib.Plo
diff --git a/Build/source/texk/kpathsea/win32lib.h b/Build/source/texk/kpathsea/win32lib.h
index fc14d55895b..da662f9bf04 100644
--- a/Build/source/texk/kpathsea/win32lib.h
+++ b/Build/source/texk/kpathsea/win32lib.h
@@ -264,8 +264,6 @@ extern KPSEDLL int pclose(FILE * f);
extern KPSEDLL int system(const char * cmd);
#endif /* KPSE_COMPAT_API */
-extern KPSEDLL void xfseek64 (FILE *f, __int64 offset, int wherefrom, const char *fname);
-extern KPSEDLL __int64 xftell64 (FILE *f, const char *fname);
extern KPSEDLL void texlive_gs_init(void);
extern KPSEDLL int getlongpath (char *output, char *input, int len);
extern KPSEDLL char *get_home_directory (void);