update LFS - part 1 of 4

git-svn-id: svn://tug.org/texlive/trunk@6870 c570f23f-e606-0410-a88d-b1316a301751

10 files changed, 124 insertions, 15 deletions

diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index b6a52a6ade2..e5eefdb38ed 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,4 +1,19 @@
-2008-03-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
+2008-03-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* access.c, readlink.c: removed `#include <stdio.h>' preceeding
+	`#include <kpathsea/config.h>' (which in turn includes stdio.h).
+
+	* xfseek.c, xftell.c: reverted to state before 2008-02-21.
+	* xfseeko.c, xftello.c (both new): new functions using off_t
+	instead of long, and fseeko instead of fseek.
+	* lib.h: prototypes for xfseek, xfseeko, xftell, and xftello.
+	* Makefile.in (objects): added xfseeko.lo and xftello.lo.
+
+	* configure.in: construct package and (shared) library version
+	from m4_define'd parts, subtitute KPSE_LT_VERS ...
+	* Makefile.in ($(kpathsea)): ... here.
+
+2008-03-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* common.ac: add AC_SYS_LARGEFILE and AC_FUNC_FSEEKO.
 
diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in
index c872af0d819..5452419a744 100644
--- a/Build/source/texk/kpathsea/Makefile.in
+++ b/Build/source/texk/kpathsea/Makefile.in
@@ -28,7 +28,7 @@ kdefault.lo line.lo magstep.lo make-suffix.lo path-elt.lo \
 pathsearch.lo proginit.lo progname.lo readable.lo rm-suffix.lo \
 str-list.lo str-llist.lo tex-glyph.lo tex-hush.lo tex-make.lo \
 tilde.lo truncate.lo uppercasify.lo variable.lo version.lo xbasename.lo \
-xcalloc.lo xdirname.lo xfopen.lo xfseek.lo xftell.lo xgetcwd.lo xmalloc.lo \
+xcalloc.lo xdirname.lo xfopen.lo xfseek.lo xfseeko.lo xftell.lo xftello.lo xgetcwd.lo xmalloc.lo \
 xopendir.lo xputenv.lo xrealloc.lo xstat.lo xstrdup.lo $(liblobjs) $(malloc)
 liblobjs = @LTLIBOBJS@
 
@@ -55,7 +55,7 @@ kpsereadlink: readlink.o
 	$(link_command) readlink.o
 
 $(kpathsea): $(objects)
-	$(kpathsea_link) -rpath $(libdir) -version-info 4:0:0 $(objects)
+	$(kpathsea_link) -rpath $(libdir) -version-info @KPSE_LT_VERS@ $(objects)
 
 # Make variable substitutions for paths.h.
 texmf.cnf: texmf.in texmf.sed
diff --git a/Build/source/texk/kpathsea/access.c b/Build/source/texk/kpathsea/access.c
index 5608c84fcd8..19bbdc49d54 100644
--- a/Build/source/texk/kpathsea/access.c
+++ b/Build/source/texk/kpathsea/access.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this software; if not, see <http://www.gnu.org/licenses/>.  */
 
-#include <stdio.h>
 #include <kpathsea/config.h>
 #include <kpathsea/c-unistd.h>
 #include <kpathsea/c-memstr.h>
diff --git a/Build/source/texk/kpathsea/configure.in b/Build/source/texk/kpathsea/configure.in
index 424748cb73f..2b79ffb6bad 100644
--- a/Build/source/texk/kpathsea/configure.in
+++ b/Build/source/texk/kpathsea/configure.in
@@ -1,9 +1,40 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(pathsearch.c)
+dnl
+dnl Kpathsea package version:
+dnl   Starting development:
+dnl     kpse_devel_version = dev;
+dnl   Making releases:
+dnl     kpse_micro_version += 1;
+dnl     kpse_devel_version = ;
+dnl
+dnl Kpathsea shared library version:
+dnl   Only bug fixes:
+dnl     kpse_lib_micro += 1;
+dnl   Adding new interfaces (backwards compatible)
+dnl     kpse_lib_minor += 1;
+dnl     kpse_lib_micro = 0;
+dnl   Modifying or revoking interfaces (not backwards compatible)
+dnl     kpse_lib_major += 1;
+dnl     kpse_lib_minor = 0;
+dnl     kpse_lib_micro = 0;
+dnl
+m4_define([kpse_major_version], [3])[]dnl
+m4_define([kpse_minor_version], [5])[]dnl
+m4_define([kpse_micro_version], [6])[]dnl
+m4_define([kpse_devel_version], [dev])[]dnl
+m4_define([kpse_version], [kpse_major_version.kpse_minor_version.kpse_micro_version[]kpse_devel_version])[]dnl
 
-KPSEVERSION=3.5.6dev
-AC_SUBST(KPSEVERSION)
-AC_DEFINE_UNQUOTED(KPSEVERSION, "kpathsea version $KPSEVERSION")
+m4_define([kpse_lib_major], [4])[]dnl
+m4_define([kpse_lib_minor], [1])[]dnl
+m4_define([kpse_lib_micro], [0])[]dnl
+m4_define([kpse_lt_version],[m4_eval(kpse_lib_major + kpse_lib_minor):kpse_lib_micro:kpse_lib_minor])[]dnl
+
+AC_INIT([kpathsea], [kpse_version], [tex-k@mail.tug.org])
+AC_CONFIG_SRCDIR([pathsearch.c])
+
+AC_SUBST([KPSEVERSION], [kpse_version])
+AC_DEFINE([KPSEVERSION], ["kpathsea version kpse_version"])
+AC_SUBST([KPSE_LT_VERS], [kpse_lt_version])
 
 dnl Write output here, instead of putting a zillion -D's on the command line.
 AC_CONFIG_HEADERS([c-auto.h:c-auto.in],
diff --git a/Build/source/texk/kpathsea/lib.h b/Build/source/texk/kpathsea/lib.h
index 2a246b19584..3b7a84f69db 100644
--- a/Build/source/texk/kpathsea/lib.h
+++ b/Build/source/texk/kpathsea/lib.h
@@ -164,8 +164,10 @@ extern KPSEDLL int dir_links P2H(const_string fn, long nlinks);
    perror(3) with FILENAME as its argument.  */
 extern KPSEDLL FILE *xfopen P2H(const_string filename, const_string mode);
 extern KPSEDLL void xfclose P2H(FILE *, const_string filename);
-extern KPSEDLL void xfseek P4H(FILE *, off_t, int, string filename);
-extern KPSEDLL off_t xftell P2H(FILE *, string filename);
+extern KPSEDLL void xfseek P4H(FILE *, long, int, string filename);
+extern KPSEDLL void xfseeko P4H(FILE *, off_t, int, string filename);
+extern KPSEDLL unsigned long xftell P2H(FILE *, string filename);
+extern KPSEDLL off_t xftello P2H(FILE *, string filename);
 
 /* These call the corresponding function in the standard library, and
    abort if those routines fail.  Also, `xrealloc' calls `xmalloc' if
diff --git a/Build/source/texk/kpathsea/readlink.c b/Build/source/texk/kpathsea/readlink.c
index 18a88ec201d..e06ec61c76b 100644
--- a/Build/source/texk/kpathsea/readlink.c
+++ b/Build/source/texk/kpathsea/readlink.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this library; if not, see <http://www.gnu.org/licenses/>.  */
 
-#include <stdio.h>
 #include <kpathsea/config.h>
 #include <kpathsea/c-pathmx.h>
 #include <kpathsea/c-unistd.h>
diff --git a/Build/source/texk/kpathsea/xfseek.c b/Build/source/texk/kpathsea/xfseek.c
index 3e4d0b93b34..22ba8978c4a 100644
--- a/Build/source/texk/kpathsea/xfseek.c
+++ b/Build/source/texk/kpathsea/xfseek.c
@@ -23,8 +23,8 @@
 
 
 void
-xfseek P4C(FILE *, f,  off_t, offset,  int, wherefrom,  string, filename)
+xfseek P4C(FILE *, f,  long, offset,  int, wherefrom,  string, filename)
 {
-    if (fseeko(f, offset, wherefrom) < 0)
+    if (fseek(f, offset, wherefrom) < 0)
         FATAL_PERROR(filename);
 }
diff --git a/Build/source/texk/kpathsea/xfseeko.c b/Build/source/texk/kpathsea/xfseeko.c
new file mode 100644
index 00000000000..60569c77363
--- /dev/null
+++ b/Build/source/texk/kpathsea/xfseeko.c
@@ -0,0 +1,30 @@
+/* xfseeko.c: fseeko with error checking.
+
+    Copyright 2005     Olaf Weber
+    Copyright 1992, 95 Karl Berry
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+#include <kpathsea/config.h>
+
+
+void
+xfseeko P4C(FILE *, f,  off_t, offset,  int, wherefrom,  string, filename)
+{
+    if (fseeko(f, offset, wherefrom) < 0)
+        FATAL_PERROR(filename);
+}
diff --git a/Build/source/texk/kpathsea/xftell.c b/Build/source/texk/kpathsea/xftell.c
index 541a3ec1171..ba1e00d369b 100644
--- a/Build/source/texk/kpathsea/xftell.c
+++ b/Build/source/texk/kpathsea/xftell.c
@@ -21,10 +21,10 @@
 #include <kpathsea/config.h>
 
 
-off_t
+unsigned long
 xftell P2C(FILE *, f,  string, filename)
 {
-    off_t where = ftello (f);
+    long where = ftello (f);
     
     if (where < 0)
         FATAL_PERROR(filename);
diff --git a/Build/source/texk/kpathsea/xftello.c b/Build/source/texk/kpathsea/xftello.c
new file mode 100644
index 00000000000..5a0009ab8eb
--- /dev/null
+++ b/Build/source/texk/kpathsea/xftello.c
@@ -0,0 +1,33 @@
+/* xftello.c: ftello with error checking.
+
+    Copyright 2005         Olaf Weber
+    Copyright 1992, 93, 95 Karl Berry
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include <kpathsea/config.h>
+
+
+off_t
+xftello P2C(FILE *, f,  string, filename)
+{
+    off_t where = ftello (f);
+    
+    if (where < 0)
+        FATAL_PERROR(filename);
+    
+    return where;
+}