summaryrefslogtreecommitdiff
path: root/Build/source/texk/kpathsea
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/kpathsea')
-rw-r--r--Build/source/texk/kpathsea/Makefile.am2
-rw-r--r--Build/source/texk/kpathsea/Makefile.in3
-rw-r--r--Build/source/texk/kpathsea/ac/withenable.ac4
-rwxr-xr-xBuild/source/texk/kpathsea/configure31
-rw-r--r--Build/source/texk/kpathsea/configure.ac1
-rw-r--r--Build/source/texk/kpathsea/doc/Makefile.in1
-rw-r--r--Build/source/texk/kpathsea/man/Makefile.in1
7 files changed, 25 insertions, 18 deletions
diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am
index 3db6693b10a..7c950ffe169 100644
--- a/Build/source/texk/kpathsea/Makefile.am
+++ b/Build/source/texk/kpathsea/Makefile.am
@@ -20,7 +20,7 @@ lib_LTLIBRARIES = libkpathsea.la
libkpathsea_la_CPPFLAGS = -DMAKE_KPSE_DLL
-libkpathsea_la_LDFLAGS = -version-number $(KPSE_LT_VERSNUM)
+libkpathsea_la_LDFLAGS = -version-info $(KPSE_LT_VERSINFO)
libkpathsea_la_LIBADD = $(LTLIBOBJS)
diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in
index 8eee832ace1..8fbc0ca3a0f 100644
--- a/Build/source/texk/kpathsea/Makefile.in
+++ b/Build/source/texk/kpathsea/Makefile.in
@@ -265,6 +265,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KPSEVERSION = @KPSEVERSION@
+KPSE_LT_VERSINFO = @KPSE_LT_VERSINFO@
KPSE_LT_VERSNUM = @KPSE_LT_VERSNUM@
LD = @LD@
LDFLAGS = @LDFLAGS@
@@ -359,7 +360,7 @@ 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_LDFLAGS = -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 \
diff --git a/Build/source/texk/kpathsea/ac/withenable.ac b/Build/source/texk/kpathsea/ac/withenable.ac
index 12c4072287a..a3a2a40c87e 100644
--- a/Build/source/texk/kpathsea/ac/withenable.ac
+++ b/Build/source/texk/kpathsea/ac/withenable.ac
@@ -1,8 +1,8 @@
## texk/kpathsea/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
dnl
-dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
dnl You may freely use, modify and/or distribute this file.
dnl
## configure options and TL libraries required for kpathsea
-KPSE_WITH_LIB([kpathsea])
+KPSE_WITH_TEXLIB([kpathsea])
m4_include(kpse_TL[texk/kpathsea/ac/web2c.ac])
diff --git a/Build/source/texk/kpathsea/configure b/Build/source/texk/kpathsea/configure
index d4a89f9a8c5..52c08a50282 100755
--- a/Build/source/texk/kpathsea/configure
+++ b/Build/source/texk/kpathsea/configure
@@ -824,6 +824,7 @@ am__isrc
INSTALL_DATA
INSTALL_SCRIPT
INSTALL_PROGRAM
+KPSE_LT_VERSINFO
KPSE_LT_VERSNUM
KPSEVERSION
target_alias
@@ -2520,6 +2521,8 @@ $as_echo "#define KPSEVERSION \"kpathsea version 6.0.0dev\"" >>confdefs.h
KPSE_LT_VERSNUM=6:0:0
+KPSE_LT_VERSINFO=6:0:0
+
am__api_version='1.11'
@@ -4597,13 +4600,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:4600: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4603: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4603: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4606: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4606: output\"" >&5)
+ (eval echo "\"\$as_me:4609: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5806,7 +5809,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5809 "configure"' > conftest.$ac_ext
+ echo '#line 5812 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7736,11 +7739,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:7739: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7742: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7743: \$? = $ac_status" >&5
+ echo "$as_me:7746: \$? = $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.
@@ -8075,11 +8078,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:8078: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8081: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8082: \$? = $ac_status" >&5
+ echo "$as_me:8085: \$? = $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.
@@ -8180,11 +8183,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:8183: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8186: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8187: \$? = $ac_status" >&5
+ echo "$as_me:8190: \$? = $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
@@ -8235,11 +8238,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:8238: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8241: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8242: \$? = $ac_status" >&5
+ echo "$as_me:8245: \$? = $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
@@ -10602,7 +10605,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10605 "configure"
+#line 10608 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10698,7 +10701,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10701 "configure"
+#line 10704 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/Build/source/texk/kpathsea/configure.ac b/Build/source/texk/kpathsea/configure.ac
index 973cd58b4a9..5412bc623ff 100644
--- a/Build/source/texk/kpathsea/configure.ac
+++ b/Build/source/texk/kpathsea/configure.ac
@@ -35,6 +35,7 @@ AC_CONFIG_MACRO_DIR([../../m4])
AC_SUBST([KPSEVERSION], [kpse_version])
AC_DEFINE([KPSEVERSION], ["kpathsea version kpse_version"])
AC_SUBST([KPSE_LT_VERSNUM], [kpse_lib_major:kpse_lib_minor:kpse_lib_micro])
+AC_SUBST([KPSE_LT_VERSINFO], [m4_eval(kpse_lib_major+kpse_lib_minor):kpse_lib_micro:kpse_lib_minor])
dnl Common code for all programs using libkpathsea.
KPSE_COMMON([kpathsea])
diff --git a/Build/source/texk/kpathsea/doc/Makefile.in b/Build/source/texk/kpathsea/doc/Makefile.in
index 830243cd6f5..3510bb663ea 100644
--- a/Build/source/texk/kpathsea/doc/Makefile.in
+++ b/Build/source/texk/kpathsea/doc/Makefile.in
@@ -123,6 +123,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KPSEVERSION = @KPSEVERSION@
+KPSE_LT_VERSINFO = @KPSE_LT_VERSINFO@
KPSE_LT_VERSNUM = @KPSE_LT_VERSNUM@
LD = @LD@
LDFLAGS = @LDFLAGS@
diff --git a/Build/source/texk/kpathsea/man/Makefile.in b/Build/source/texk/kpathsea/man/Makefile.in
index 8b3117d8c00..870d4e8f29c 100644
--- a/Build/source/texk/kpathsea/man/Makefile.in
+++ b/Build/source/texk/kpathsea/man/Makefile.in
@@ -113,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
KPSEVERSION = @KPSEVERSION@
+KPSE_LT_VERSINFO = @KPSE_LT_VERSINFO@
KPSE_LT_VERSNUM = @KPSE_LT_VERSNUM@
LD = @LD@
LDFLAGS = @LDFLAGS@