summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-04-16 09:43:14 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-04-16 09:43:14 +0000
commit3ba06bc5a98bfc651ab7ec896205727f7373045d (patch)
treea656831d5fc8b8fc2714314c2908b7bea55a72cc /Build/source
parent900bee30486216b7356a1f3756f00277318c18a7 (diff)
build system update
git-svn-id: svn://tug.org/texlive/trunk@17891 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/Makefile.in2
-rw-r--r--Build/source/aclocal.m41
-rwxr-xr-xBuild/source/configure164
-rw-r--r--Build/source/configure.ac5
-rw-r--r--Build/source/libs/Makefile.in1
-rw-r--r--Build/source/libs/aclocal.m41
-rwxr-xr-xBuild/source/libs/configure45
-rw-r--r--Build/source/m4/kpse-common.m424
-rw-r--r--Build/source/m4/kpse-kpathsea-flags.m48
-rw-r--r--Build/source/m4/kpse-pkgs.m45
-rw-r--r--Build/source/m4/kpse-ptexenc-flags.m414
-rw-r--r--Build/source/m4/kpse-setup.m470
-rw-r--r--Build/source/texk/Makefile.in1
-rw-r--r--Build/source/texk/aclocal.m41
-rwxr-xr-xBuild/source/texk/configure45
-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
-rw-r--r--Build/source/texk/ptexenc/Makefile.am2
-rw-r--r--Build/source/texk/ptexenc/Makefile.in4
-rw-r--r--Build/source/texk/ptexenc/ac/ptexenc.ac10
-rw-r--r--Build/source/texk/ptexenc/ac/withenable.ac2
-rwxr-xr-xBuild/source/texk/ptexenc/configure90
-rw-r--r--Build/source/texk/ptexenc/configure.ac43
-rwxr-xr-xBuild/source/texk/web2c/configure73
-rw-r--r--Build/source/utils/Makefile.in1
-rw-r--r--Build/source/utils/aclocal.m41
-rwxr-xr-xBuild/source/utils/configure45
32 files changed, 506 insertions, 195 deletions
diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in
index c4e6ea15350..5ca4d8a7f69 100644
--- a/Build/source/Makefile.in
+++ b/Build/source/Makefile.in
@@ -51,6 +51,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-common.m4 \
$(top_srcdir)/m4/kpse-libpng-flags.m4 \
$(top_srcdir)/m4/kpse-lt-hack.m4 \
$(top_srcdir)/m4/kpse-options.m4 $(top_srcdir)/m4/kpse-pkgs.m4 \
+ $(top_srcdir)/m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/m4/kpse-setup.m4 \
$(top_srcdir)/m4/kpse-t1lib-flags.m4 \
$(top_srcdir)/m4/kpse-teckit-flags.m4 \
@@ -129,6 +130,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-common.m4 \
$(top_srcdir)/texk/kpathsea/ac/withenable.ac \
$(top_srcdir)/texk/kpathsea/ac/web2c.ac \
$(top_srcdir)/texk/kpathsea/ac/kpathsea.ac \
+ $(top_srcdir)/texk/ptexenc/ac/ptexenc.ac \
$(top_srcdir)/libs/zlib/ac/zlib.ac \
$(top_srcdir)/libs/libpng/ac/libpng.ac \
$(top_srcdir)/libs/t1lib/ac/t1lib.ac \
diff --git a/Build/source/aclocal.m4 b/Build/source/aclocal.m4
index 84b0c0f53fe..112cb2731e0 100644
--- a/Build/source/aclocal.m4
+++ b/Build/source/aclocal.m4
@@ -1001,6 +1001,7 @@ m4_include([m4/kpse-libpng-flags.m4])
m4_include([m4/kpse-lt-hack.m4])
m4_include([m4/kpse-options.m4])
m4_include([m4/kpse-pkgs.m4])
+m4_include([m4/kpse-ptexenc-flags.m4])
m4_include([m4/kpse-setup.m4])
m4_include([m4/kpse-t1lib-flags.m4])
m4_include([m4/kpse-teckit-flags.m4])
diff --git a/Build/source/configure b/Build/source/configure
index 326986836f9..6f91b29c686 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -1004,6 +1004,9 @@ with_libpng_libdir
with_system_zlib
with_zlib_includes
with_zlib_libdir
+with_system_ptexenc
+with_ptexenc_includes
+with_ptexenc_libdir
with_system_kpathsea
with_kpathsea_includes
with_kpathsea_libdir
@@ -1844,6 +1847,11 @@ Optional Packages:
--with-zlib-includes=DIR
zlib headers installed in DIR
--with-zlib-libdir=DIR zlib library installed in DIR
+ --with-system-ptexenc use installed ptexenc headers and library
+ --with-ptexenc-includes=DIR
+ ptexenc headers installed in DIR
+ --with-ptexenc-libdir=DIR
+ ptexenc library installed in DIR
--with-system-kpathsea use installed kpathsea headers and library
--with-kpathsea-includes=DIR
kpathsea headers installed in DIR
@@ -4908,6 +4916,53 @@ fi
## texk/ptexenc/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ptexenc/
## configure options and TL libraries required for ptexenc
+# Check whether --with-system-ptexenc was given.
+if test "${with_system_ptexenc+set}" = set; then :
+ withval=$with_system_ptexenc;
+fi
+
+# Check whether --with-ptexenc-includes was given.
+if test "${with_ptexenc_includes+set}" = set; then :
+ withval=$with_ptexenc_includes;
+fi
+
+# Check whether --with-ptexenc-libdir was given.
+if test "${with_ptexenc_libdir+set}" = set; then :
+ withval=$with_ptexenc_libdir;
+fi
+if test "x$with_system_ptexenc" = x; then
+ if test -f $srcdir/texk/ptexenc/configure; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`ptexenc' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`ptexenc' headers and library from TL tree" >&6;}
+ with_system_ptexenc=no
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`ptexenc' headers and library" >&5
+$as_echo "$as_me: Assuming installed \`ptexenc' headers and library" >&6;}
+ with_system_ptexenc=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-ptexenc=$with_system_ptexenc'"
+elif test "x$with_system_ptexenc" = xyes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Using installed \`ptexenc' headers and library" >&5
+$as_echo "$as_me: Using installed \`ptexenc' headers and library" >&6;}
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Using \`ptexenc' headers and library from TL tree" >&5
+$as_echo "$as_me: Using \`ptexenc' headers and library from TL tree" >&6;}
+ if test "x$with_system_ptexenc" != xno; then
+ with_system_ptexenc=no
+ ac_configure_args="$ac_configure_args '--without-system-ptexenc'"
+ fi
+fi
+if test "x$with_system_ptexenc" = xyes; then
+ if test "x$with_system_kpathsea" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`kpathsea' headers and library" >&5
+$as_echo "$as_me: -> installed \`kpathsea' headers and library" >&6;}
+ with_system_kpathsea=yes
+ ac_configure_args="$ac_configure_args '--with-system-kpathsea'"
+ elif test "x$with_system_kpathsea" != xyes; then
+ as_fn_error "Sorry, \`--with-system-ptexenc' requires \`--with-system-kpathsea'" "$LINENO" 5
+ fi
+fi
+
test "x$need_ptexenc" = xyes && {
need_kpathsea=yes
}
@@ -7036,13 +7091,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:7039: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:7094: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:7042: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:7097: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:7045: output\"" >&5)
+ (eval echo "\"\$as_me:7100: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -8245,7 +8300,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 8248 "configure"' > conftest.$ac_ext
+ echo '#line 8303 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -10175,11 +10230,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:10178: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10233: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10182: \$? = $ac_status" >&5
+ echo "$as_me:10237: \$? = $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.
@@ -10514,11 +10569,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:10517: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10572: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10521: \$? = $ac_status" >&5
+ echo "$as_me:10576: \$? = $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.
@@ -10619,11 +10674,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:10622: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10677: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10626: \$? = $ac_status" >&5
+ echo "$as_me:10681: \$? = $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
@@ -10674,11 +10729,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:10677: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10732: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10681: \$? = $ac_status" >&5
+ echo "$as_me:10736: \$? = $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
@@ -13041,7 +13096,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13044 "configure"
+#line 13099 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13137,7 +13192,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13140 "configure"
+#line 13195 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -17624,11 +17679,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:17627: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17682: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17631: \$? = $ac_status" >&5
+ echo "$as_me:17686: \$? = $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.
@@ -17723,11 +17778,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:17726: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17781: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17730: \$? = $ac_status" >&5
+ echo "$as_me:17785: \$? = $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
@@ -17775,11 +17830,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:17778: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17833: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17782: \$? = $ac_status" >&5
+ echo "$as_me:17837: \$? = $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
@@ -18804,6 +18859,22 @@ kpse_save_LIBS=$LIBS
syslib_status=yes
syslib_used=no
+if test "x$with_kpathsea_includes" != x && test "x$with_kpathsea_includes" != xyes; then
+ KPATHSEA_INCLUDES="-I$with_kpathsea_includes"
+fi
+KPATHSEA_LIBS="-lkpathsea"
+if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; then
+ KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS"
+fi
+
+if test "x$with_ptexenc_includes" != x && test "x$with_ptexenc_includes" != xyes; then
+ PTEXENC_INCLUDES="-I$with_ptexenc_includes"
+fi
+PTEXENC_LIBS="-lptexenc"
+if test "x$with_ptexenc_libdir" != x && test "x$with_ptexenc_libdir" != xyes; then
+ PTEXENC_LIBS="-L$with_ptexenc_libdir $PTEXENC_LIBS"
+fi
+
if test "x$with_zlib_includes" != x && test "x$with_zlib_includes" != xyes; then
ZLIB_INCLUDES="-I$with_zlib_includes"
fi
@@ -19043,6 +19114,13 @@ elif test "x$need_xpdf:$with_system_xpdf" = xyes:yes; then
as_fn_error "did not find poppler-0.10 or better" "$LINENO" 5
fi
+if $PKG_CONFIG zziplib --atleast-version=0.12; then
+ ZZIPLIB_INCLUDES=`$PKG_CONFIG zziplib --cflags`
+ ZZIPLIB_LIBS=`$PKG_CONFIG zziplib --libs`
+elif test "x$need_zziplib:$with_system_zziplib" = xyes:yes; then
+ as_fn_error "did not find zziplib-0.12 or better" "$LINENO" 5
+fi
+
if $PKG_CONFIG silgraphite --atleast-version=2.3; then
GRAPHITE_INCLUDES="`$PKG_CONFIG silgraphite --cflags`"
GRAPHITE_LIBS=`$PKG_CONFIG silgraphite --libs`
@@ -19159,21 +19237,6 @@ elif test "x$need_icu:$with_system_icu" = xyes:yes; then
as_fn_error "did not find icu-config required for system icu libraries" "$LINENO" 5
fi
-if test "x$with_kpathsea_includes" != x && test "x$with_kpathsea_includes" != xyes; then
- KPATHSEA_INCLUDES="-I$with_kpathsea_includes"
-fi
-KPATHSEA_LIBS="-lkpathsea"
-if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; then
- KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS"
-fi
-
-if $PKG_CONFIG zziplib --atleast-version=0.12; then
- ZZIPLIB_INCLUDES=`$PKG_CONFIG zziplib --cflags`
- ZZIPLIB_LIBS=`$PKG_CONFIG zziplib --libs`
-elif test "x$need_zziplib:$with_system_zziplib" = xyes:yes; then
- as_fn_error "did not find zziplib-0.12 or better" "$LINENO" 5
-fi
-
## texk/kpathsea/ac/kpathsea.ac: configure.ac fragment for the TeX Live subdirectory texk/kpathsea/
## basic check of system kpathsea
@@ -19207,6 +19270,37 @@ $as_echo "$kpse_res" >&6; }
fi
+## texk/ptexenc/ac/ptexenc.ac: configure.ac fragment for the TeX Live subdirectory texk/ptexenc/
+## basic check of system ptexenc
+if test "x$need_ptexenc:$with_system_ptexenc" = xyes:yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking requested system \`ptexenc' library" >&5
+$as_echo_n "checking requested system \`ptexenc' library... " >&6; }
+ CPPFLAGS="$PTEXENC_INCLUDES $CPPFLAGS"
+ LIBS="$PTEXENC_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <ptexenc/ptexenc.h>
+int
+main ()
+{
+const char *version = ptexenc_version_string;
+set_enc_string("prog", "name");
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ syslib_used=yes kpse_res=ok
+else
+ syslib_status=no kpse_res=failed
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_res" >&5
+$as_echo "$kpse_res" >&6; }
+fi
+
+
## libs/zlib/ac/zlib.ac: configure.ac fragment for the TeX Live subdirectory libs/zlib/
## basic check of system zlib
if test "x$need_zlib:$with_system_zlib" = xyes:yes; then
diff --git a/Build/source/configure.ac b/Build/source/configure.ac
index ab3be1a1074..d20a6f6fa1e 100644
--- a/Build/source/configure.ac
+++ b/Build/source/configure.ac
@@ -123,9 +123,8 @@ KPSE_SAVE_FLAGS
syslib_status=yes
syslib_used=no
KPSE_ALL_SYSTEM_FLAGS
-KPSE_FOR_PKGS([syslib],
-[m4_sinclude(m4_if(Kpse_Pkg, [kpathsea], [texk/],
- [libs/])Kpse_Pkg[/ac/]Kpse_Pkg[.ac])])[]dnl
+KPSE_FOR_PKGS([sys_texk], [m4_sinclude([texk/]Kpse_Pkg[/ac/]Kpse_Pkg[.ac])])[]dnl
+KPSE_FOR_PKGS([sys_libs], [m4_sinclude([libs/]Kpse_Pkg[/ac/]Kpse_Pkg[.ac])])[]dnl
if test "x$syslib_status" = xno; then
AC_MSG_ERROR([some requested system libraries failed])
fi
diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in
index b3caa05dd15..27853eae0e6 100644
--- a/Build/source/libs/Makefile.in
+++ b/Build/source/libs/Makefile.in
@@ -57,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
$(top_srcdir)/../m4/kpse-lt-hack.m4 \
$(top_srcdir)/../m4/kpse-options.m4 \
$(top_srcdir)/../m4/kpse-pkgs.m4 \
+ $(top_srcdir)/../m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/../m4/kpse-setup.m4 \
$(top_srcdir)/../m4/kpse-t1lib-flags.m4 \
$(top_srcdir)/../m4/kpse-teckit-flags.m4 \
diff --git a/Build/source/libs/aclocal.m4 b/Build/source/libs/aclocal.m4
index 88c8fdc27e7..33e76229ca9 100644
--- a/Build/source/libs/aclocal.m4
+++ b/Build/source/libs/aclocal.m4
@@ -687,6 +687,7 @@ m4_include([../m4/kpse-libpng-flags.m4])
m4_include([../m4/kpse-lt-hack.m4])
m4_include([../m4/kpse-options.m4])
m4_include([../m4/kpse-pkgs.m4])
+m4_include([../m4/kpse-ptexenc-flags.m4])
m4_include([../m4/kpse-setup.m4])
m4_include([../m4/kpse-t1lib-flags.m4])
m4_include([../m4/kpse-teckit-flags.m4])
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 1a231557496..06c12a4c0fe 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -759,6 +759,9 @@ with_libpng_libdir
with_system_zlib
with_zlib_includes
with_zlib_libdir
+with_system_ptexenc
+with_ptexenc_includes
+with_ptexenc_libdir
with_system_kpathsea
with_kpathsea_includes
with_kpathsea_libdir
@@ -1571,6 +1574,11 @@ Optional Packages:
--with-zlib-includes=DIR
zlib headers installed in DIR
--with-zlib-libdir=DIR zlib library installed in DIR
+ --with-system-ptexenc use installed ptexenc headers and library
+ --with-ptexenc-includes=DIR
+ ptexenc headers installed in DIR
+ --with-ptexenc-libdir=DIR
+ ptexenc library installed in DIR
--with-system-kpathsea use installed kpathsea headers and library
--with-kpathsea-includes=DIR
kpathsea headers installed in DIR
@@ -3917,6 +3925,43 @@ fi
## texk/ptexenc/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ptexenc/
## configure options and TL libraries required for ptexenc
+# Check whether --with-system-ptexenc was given.
+if test "${with_system_ptexenc+set}" = set; then :
+ withval=$with_system_ptexenc;
+fi
+
+# Check whether --with-ptexenc-includes was given.
+if test "${with_ptexenc_includes+set}" = set; then :
+ withval=$with_ptexenc_includes;
+fi
+
+# Check whether --with-ptexenc-libdir was given.
+if test "${with_ptexenc_libdir+set}" = set; then :
+ withval=$with_ptexenc_libdir;
+fi
+if test "x$with_system_ptexenc" = x; then
+ if test -f $srcdir/../texk/ptexenc/configure; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`ptexenc' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`ptexenc' headers and library from TL tree" >&6;}
+ with_system_ptexenc=no
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`ptexenc' headers and library" >&5
+$as_echo "$as_me: Assuming installed \`ptexenc' headers and library" >&6;}
+ with_system_ptexenc=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-ptexenc=$with_system_ptexenc'"
+fi
+if test "x$with_system_ptexenc" = xyes; then
+ if test "x$with_system_kpathsea" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`kpathsea' headers and library" >&5
+$as_echo "$as_me: -> installed \`kpathsea' headers and library" >&6;}
+ with_system_kpathsea=yes
+ ac_configure_args="$ac_configure_args '--with-system-kpathsea'"
+ elif test "x$with_system_kpathsea" != xyes; then
+ as_fn_error "Sorry, \`--with-system-ptexenc' requires \`--with-system-kpathsea'" "$LINENO" 5
+ fi
+fi
+
test "x$need_ptexenc" = xyes && {
need_kpathsea=yes
}
diff --git a/Build/source/m4/kpse-common.m4 b/Build/source/m4/kpse-common.m4
index 977b522e7b4..1d9aab30aaf 100644
--- a/Build/source/m4/kpse-common.m4
+++ b/Build/source/m4/kpse-common.m4
@@ -55,6 +55,7 @@ AC_LANG(_AC_LANG)[]dnl
# [REBUILD-SRC-DEPENDENCIES],
# [REBUILD-BLD-DEPENDENCIES])
# -----------------------------------------------
+# For generic libraries in libs/LIBDIR.
# Provide the configure options '--with-system-LIBDIR' (if in the TL tree),
# '--with-LIBDIR-includes', and '--with-LIBDIR-libdir'.
# Options:
@@ -89,6 +90,15 @@ AC_SUBST(AS_TR_CPP($1)[_RULE])[]dnl
m4_provide_if([AM_INIT_AUTOMAKE], [_AM_SUBST_NOTMAKE(AS_TR_CPP($1)[_RULE])])[]dnl
]) # _KPSE_LIB_FLAGS
+# _KPSE_TEXLIB_FLAGS(LIBDIR, LIBNAME, OPTIONS,
+# TL-INCLUDES, TL-LIBS, TL-EXTRA,
+# [REBUILD-SRC-DEPENDENCIES],
+# [REBUILD-BLD-DEPENDENCIES])
+# -----------------------------------------------
+# As above, but for TeX specific libraries in texk/LIBDIR.
+AC_DEFUN([_KPSE_TEXLIB_FLAGS],
+[m4_pushdef([Kpse_TeX_Lib], [])_KPSE_LIB_FLAGS($@)m4_popdef([Kpse_TeX_Lib])])
+
# _KPSE_LIB_FLAGS_TL(LIBDIR, LIBNAME, OPTIONS,
# TL-INCLUDES, TL-LIBS, TL-EXTRA,
# [REBUILD-SRC-DEPENDENCIES],
@@ -110,23 +120,23 @@ else
AS_TR_CPP($1)[_LIBS=`echo '$5' | sed \
-e "s,BLD/,$kpse_BLD/,g"`
$6]
- m4_if(m4_index([ kpathsea ptexenc ], [ $1 ]), [-1],
+ m4_ifdef([Kpse_TeX_Lib],
[AS_TR_CPP($1)[_DEPEND=`echo '$5' | sed \
- -e 's,BLD/,${top_builddir}/../../,g'`]
+ -e 's,BLD/texk/,${top_builddir}/../,g'`]
AS_TR_CPP($1)[_RULE='# Rebuild lib$2
$(]AS_TR_CPP($1)[_DEPEND):]m4_ifval([$7],
[[ $7]])m4_ifval([$8], [[ $8
- cd ${top_builddir}/../../libs/$1 && $(MAKE) $(AM_MAKEFLAGS) rebuild
+ cd ${top_builddir}/../$1 && $(MAKE) $(AM_MAKEFLAGS) rebuild
$8:]])[
- cd ${top_builddir}/../../libs/$1 && $(MAKE) $(AM_MAKEFLAGS) rebuild']],
+ cd ${top_builddir}/../$1 && $(MAKE) $(AM_MAKEFLAGS) rebuild']],
[AS_TR_CPP($1)[_DEPEND=`echo '$5' | sed \
- -e 's,BLD/texk/,${top_builddir}/../,g'`]
+ -e 's,BLD/,${top_builddir}/../../,g'`]
AS_TR_CPP($1)[_RULE='# Rebuild lib$2
$(]AS_TR_CPP($1)[_DEPEND):]m4_ifval([$7],
[[ $7]])m4_ifval([$8], [[ $8
- cd ${top_builddir}/../$1 && $(MAKE) $(AM_MAKEFLAGS) rebuild
+ cd ${top_builddir}/../../libs/$1 && $(MAKE) $(AM_MAKEFLAGS) rebuild
$8:]])[
- cd ${top_builddir}/../$1 && $(MAKE) $(AM_MAKEFLAGS) rebuild']])
+ cd ${top_builddir}/../../libs/$1 && $(MAKE) $(AM_MAKEFLAGS) rebuild']])
m4_if(m4_index([ $3 ], [ tree ]), [-1],
[fi
])[]dnl m4_if
diff --git a/Build/source/m4/kpse-kpathsea-flags.m4 b/Build/source/m4/kpse-kpathsea-flags.m4
index a005cbfd2d5..7e5ed3273a5 100644
--- a/Build/source/m4/kpse-kpathsea-flags.m4
+++ b/Build/source/m4/kpse-kpathsea-flags.m4
@@ -18,10 +18,10 @@
# LIBS required for the `-lkpathsea' library in texk/kpathsea/ of the TL tree.
AC_DEFUN([KPSE_KPATHSEA_FLAGS],
[AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl
-_KPSE_LIB_FLAGS([kpathsea], [kpathsea], [lt],
- [-IBLD/texk -ISRC/texk], [BLD/texk/kpathsea/libkpathsea.la], [],
- [${top_srcdir}/../kpathsea/*.[ch]],
- [${top_builddir}/../kpathsea/paths.h])
+_KPSE_TEXLIB_FLAGS([kpathsea], [kpathsea], [lt],
+ [-IBLD/texk -ISRC/texk], [BLD/texk/kpathsea/libkpathsea.la], [],
+ [${top_srcdir}/../kpathsea/*.[ch]],
+ [${top_builddir}/../kpathsea/paths.h])
m4_if(m4_index([ $1 ], [ no-debug ]), [-1],
[_KPSE_CHECK_KPSE_DEBUG],
[KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG"])
diff --git a/Build/source/m4/kpse-pkgs.m4 b/Build/source/m4/kpse-pkgs.m4
index 2419c02c2f8..099d07cc549 100644
--- a/Build/source/m4/kpse-pkgs.m4
+++ b/Build/source/m4/kpse-pkgs.m4
@@ -51,6 +51,8 @@ kpathsea
# only used at top-level.
AC_DEFUN([KPSE_ALL_SYSTEM_FLAGS],
[AC_REQUIRE([KPSE_LIBS_PREPARE])[]dnl
+AC_REQUIRE([KPSE_KPATHSEA_SYSTEM_FLAGS])[]dnl
+AC_REQUIRE([KPSE_PTEXENC_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_ZLIB_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_LIBPNG_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_T1LIB_SYSTEM_FLAGS])[]dnl
@@ -58,11 +60,10 @@ AC_REQUIRE([KPSE_FREETYPE_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_FREETYPE2_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_GD_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_XPDF_SYSTEM_FLAGS])[]dnl
+AC_REQUIRE([KPSE_ZZIPLIB_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_GRAPHITE_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_TECKIT_SYSTEM_FLAGS])[]dnl
AC_REQUIRE([KPSE_ICU_SYSTEM_FLAGS])[]dnl
-AC_REQUIRE([KPSE_KPATHSEA_SYSTEM_FLAGS])[]dnl
-AC_REQUIRE([KPSE_ZZIPLIB_SYSTEM_FLAGS])[]dnl
]) # KPSE_ALL_SYSTEM_FLAGS
# KPSE_UTILS_PKGS()
diff --git a/Build/source/m4/kpse-ptexenc-flags.m4 b/Build/source/m4/kpse-ptexenc-flags.m4
index 32b467bdabe..1ecd0703451 100644
--- a/Build/source/m4/kpse-ptexenc-flags.m4
+++ b/Build/source/m4/kpse-ptexenc-flags.m4
@@ -8,23 +8,23 @@
# serial 0
# KPSE_PTEXENC_FLAGS
-# -------------------
+# ------------------
# Provide the configure options '--with-system-ptexenc' (if in the TL tree),
# '--with-ptexenc-includes', and '--with-ptexenc-libdir'.
#
# Set the make variables PTEXENC_INCLUDES and PTEXENC_LIBS to the CPPFLAGS and
# LIBS required for the `-lptexenc' library in texk/ptexenc/ of the TL tree.
AC_DEFUN([KPSE_PTEXENC_FLAGS],
-[_KPSE_LIB_FLAGS([ptexenc], [ptexenc], [tree],
- [-IBLD/texk -ISRC/texk], [BLD/texk/ptexenc/libptexenc.la], [],
- [${top_srcdir}/../ptexenc/*.[ch]],
- [${top_builddir}/../ptexenc/ptexenc.h])[]dnl
+[_KPSE_TEXLIB_FLAGS([ptexenc], [ptexenc], [lt],
+ [-IBLD/texk -ISRC/texk], [BLD/texk/ptexenc/libptexenc.la], [],
+ [${top_srcdir}/../ptexenc/*.[ch]],
+ [${top_builddir}/../ptexenc/ptexenc.h])[]dnl
]) # KPSE_PTEXENC_FLAGS
# KPSE_PTEXENC_OPTIONS([WITH-SYSTEM])
-# ------------------------------------
+# -----------------------------------
AC_DEFUN([KPSE_PTEXENC_OPTIONS], [_KPSE_LIB_OPTIONS([ptexenc], [$1])])
# KPSE_PTEXENC_SYSTEM_FLAGS
-# --------------------------
+# -------------------------
AC_DEFUN([KPSE_PTEXENC_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([ptexenc], [ptexenc])])
diff --git a/Build/source/m4/kpse-setup.m4 b/Build/source/m4/kpse-setup.m4
index 25ea1825288..38020cb2794 100644
--- a/Build/source/m4/kpse-setup.m4
+++ b/Build/source/m4/kpse-setup.m4
@@ -115,7 +115,8 @@ AC_FOREACH([Kpse_Lib], [$2], [ need_[]AS_TR_SH(Kpse_Lib)=yes
]) # KPSE_ENABLE_PROG
# KPSE_WITH_LIB(LIB, REQUIRED-LIBS, OPTIONS)
-# ---------------------------------------------------------
+# ------------------------------------------
+# For generic libraries in libs/LIB.
# Unless the option `tree' is specified, provide the configure options
# --with-system-LIB, --with-LIB-includes, and --with-LIB-libdir.
# Define the list of libraries required from the TL tree (if any).
@@ -123,53 +124,62 @@ AC_FOREACH([Kpse_Lib], [$2], [ need_[]AS_TR_SH(Kpse_Lib)=yes
# tree - only use library from the TL tree
#
# At the top-level we build a (reversed) list of potential system libraries.
-AC_DEFUN([KPSE_WITH_LIB],
-[m4_if(m4_index([ $3 ], [ tree ]), [-1],
-[KPSE_]AS_TR_CPP([$1])[_OPTIONS([with-system])[]dnl
-if test "x$with_system_[]AS_TR_SH($1)" = x; then
- if test -f $srcdir/kpse_TL[]m4_if([$1], [kpathsea], [texk], [libs])/$1/configure; then
- AC_MSG_NOTICE([Assuming `$1' headers and library from TL tree])
- with_system_[]AS_TR_SH($1)=no
+AC_DEFUN([KPSE_WITH_LIB], [_KPSE_WITH_LIB([libs], $@)])
+m4_define([kpse_sys_libs_pkgs], [])[]dnl initialize the list.
+
+# KPSE_WITH_TEXLIB(LIB, REQUIRED-LIBS, OPTIONS)
+# ---------------------------------------------
+# As above, but for TeX specific libraries in texk/LIB.
+AC_DEFUN([KPSE_WITH_TEXLIB], [_KPSE_WITH_LIB([texk], $@)])
+m4_define([kpse_sys_texk_pkgs], [])[]dnl initialize the list.
+
+# _KPSE_WITH_LIB(DIR, LIB, REQUIRED-LIBS, OPTIONS)
+# ------------------------------------------------
+# Internal subroutine for KPSE_WITH_LIB and KPSE_WITH_TEXLIB.
+m4_define([_KPSE_WITH_LIB],
+[m4_if(m4_index([ $4 ], [ tree ]), [-1],
+[KPSE_]AS_TR_CPP([$2])[_OPTIONS([with-system])[]dnl
+if test "x$with_system_[]AS_TR_SH($2)" = x; then
+ if test -f $srcdir/kpse_TL[]$1/$2/configure; then
+ AC_MSG_NOTICE([Assuming `$2' headers and library from TL tree])
+ with_system_[]AS_TR_SH($2)=no
else
- AC_MSG_NOTICE([Assuming installed `$1' headers and library])
- with_system_[]AS_TR_SH($1)=yes
+ AC_MSG_NOTICE([Assuming installed `$2' headers and library])
+ with_system_[]AS_TR_SH($2)=yes
fi
- ac_configure_args="$ac_configure_args '--with-system-$1=$with_system_[]AS_TR_SH($1)'"
+ ac_configure_args="$ac_configure_args '--with-system-$2=$with_system_[]AS_TR_SH($2)'"
m4_ifset([kpse_TL], [], dnl top level only
-[elif test "x$with_system_[]AS_TR_SH($1)" = xyes; then
- AC_MSG_NOTICE([Using installed `$1' headers and library])
+[elif test "x$with_system_[]AS_TR_SH($2)" = xyes; then
+ AC_MSG_NOTICE([Using installed `$2' headers and library])
else
- AC_MSG_NOTICE([Using `$1' headers and library from TL tree])
- if test "x$with_system_[]AS_TR_SH($1)" != xno; then
- with_system_[]AS_TR_SH($1)=no
- ac_configure_args="$ac_configure_args '--without-system-$1'"
+ AC_MSG_NOTICE([Using `$2' headers and library from TL tree])
+ if test "x$with_system_[]AS_TR_SH($2)" != xno; then
+ with_system_[]AS_TR_SH($2)=no
+ ac_configure_args="$ac_configure_args '--without-system-$2'"
fi
-m4_define([kpse_syslib_pkgs], [$1]m4_ifval([kpse_syslib_pkgs],
- [ _m4_defn([kpse_syslib_pkgs])]))[]dnl
+m4_define([kpse_sys_$1_pkgs],
+ [$2]m4_ifval([kpse_sys_$1_pkgs], [ _m4_defn([kpse_sys_$1_pkgs])]))[]dnl
])[]dnl m4_ifset
fi
-m4_ifval([$2],
-[if test "x$with_system_[]AS_TR_SH($1)" = xyes; then
-AC_FOREACH([Kpse_Lib], [$2],
+m4_ifval([$3],
+[if test "x$with_system_[]AS_TR_SH($2)" = xyes; then
+AC_FOREACH([Kpse_Lib], [$3],
[ if test "x$with_system_[]AS_TR_SH(Kpse_Lib)" = x; then
AC_MSG_NOTICE([ -> installed `AS_TR_SH(Kpse_Lib)' headers and library])
with_system_[]AS_TR_SH(Kpse_Lib)=yes
ac_configure_args="$ac_configure_args '--with-system-Kpse_Lib'"
elif test "x$with_system_[]AS_TR_SH(Kpse_Lib)" != xyes; then
- AC_MSG_ERROR([Sorry, `--with-system-$1' requires `--with-system-Kpse_Lib'])
+ AC_MSG_ERROR([Sorry, `--with-system-$2' requires `--with-system-Kpse_Lib'])
fi
])fi
])[]dnl m4_ifval
])[]dnl m4_if
-m4_ifval([$2], [
-test "x$need_[]AS_TR_SH($1)" = xyes && {
-AC_FOREACH([Kpse_Lib], [$2], [ need_[]AS_TR_SH(Kpse_Lib)=yes
+m4_ifval([$3], [
+test "x$need_[]AS_TR_SH($2)" = xyes && {
+AC_FOREACH([Kpse_Lib], [$3], [ need_[]AS_TR_SH(Kpse_Lib)=yes
])}
])[]dnl m4_ifval
-]) # KPSE_WITH_LIB
-
-# Initialize the list of potential system libraries.
-m4_define([kpse_syslib_pkgs], [])
+]) # _KPSE_WITH_LIB
# KPSE_TRY_LIB(LIB, PROLOGUE, BODY)
# ---------------------------------
diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in
index 82a4109c532..7d28d1cb469 100644
--- a/Build/source/texk/Makefile.in
+++ b/Build/source/texk/Makefile.in
@@ -57,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
$(top_srcdir)/../m4/kpse-lt-hack.m4 \
$(top_srcdir)/../m4/kpse-options.m4 \
$(top_srcdir)/../m4/kpse-pkgs.m4 \
+ $(top_srcdir)/../m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/../m4/kpse-setup.m4 \
$(top_srcdir)/../m4/kpse-t1lib-flags.m4 \
$(top_srcdir)/../m4/kpse-teckit-flags.m4 \
diff --git a/Build/source/texk/aclocal.m4 b/Build/source/texk/aclocal.m4
index 88c8fdc27e7..33e76229ca9 100644
--- a/Build/source/texk/aclocal.m4
+++ b/Build/source/texk/aclocal.m4
@@ -687,6 +687,7 @@ m4_include([../m4/kpse-libpng-flags.m4])
m4_include([../m4/kpse-lt-hack.m4])
m4_include([../m4/kpse-options.m4])
m4_include([../m4/kpse-pkgs.m4])
+m4_include([../m4/kpse-ptexenc-flags.m4])
m4_include([../m4/kpse-setup.m4])
m4_include([../m4/kpse-t1lib-flags.m4])
m4_include([../m4/kpse-teckit-flags.m4])
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 4d379a26944..5f319afe915 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -759,6 +759,9 @@ with_libpng_libdir
with_system_zlib
with_zlib_includes
with_zlib_libdir
+with_system_ptexenc
+with_ptexenc_includes
+with_ptexenc_libdir
with_system_kpathsea
with_kpathsea_includes
with_kpathsea_libdir
@@ -1592,6 +1595,11 @@ Optional Packages:
--with-zlib-includes=DIR
zlib headers installed in DIR
--with-zlib-libdir=DIR zlib library installed in DIR
+ --with-system-ptexenc use installed ptexenc headers and library
+ --with-ptexenc-includes=DIR
+ ptexenc headers installed in DIR
+ --with-ptexenc-libdir=DIR
+ ptexenc library installed in DIR
--with-system-kpathsea use installed kpathsea headers and library
--with-kpathsea-includes=DIR
kpathsea headers installed in DIR
@@ -3938,6 +3946,43 @@ fi
## texk/ptexenc/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ptexenc/
## configure options and TL libraries required for ptexenc
+# Check whether --with-system-ptexenc was given.
+if test "${with_system_ptexenc+set}" = set; then :
+ withval=$with_system_ptexenc;
+fi
+
+# Check whether --with-ptexenc-includes was given.
+if test "${with_ptexenc_includes+set}" = set; then :
+ withval=$with_ptexenc_includes;
+fi
+
+# Check whether --with-ptexenc-libdir was given.
+if test "${with_ptexenc_libdir+set}" = set; then :
+ withval=$with_ptexenc_libdir;
+fi
+if test "x$with_system_ptexenc" = x; then
+ if test -f $srcdir/../texk/ptexenc/configure; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`ptexenc' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`ptexenc' headers and library from TL tree" >&6;}
+ with_system_ptexenc=no
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`ptexenc' headers and library" >&5
+$as_echo "$as_me: Assuming installed \`ptexenc' headers and library" >&6;}
+ with_system_ptexenc=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-ptexenc=$with_system_ptexenc'"
+fi
+if test "x$with_system_ptexenc" = xyes; then
+ if test "x$with_system_kpathsea" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`kpathsea' headers and library" >&5
+$as_echo "$as_me: -> installed \`kpathsea' headers and library" >&6;}
+ with_system_kpathsea=yes
+ ac_configure_args="$ac_configure_args '--with-system-kpathsea'"
+ elif test "x$with_system_kpathsea" != xyes; then
+ as_fn_error "Sorry, \`--with-system-ptexenc' requires \`--with-system-kpathsea'" "$LINENO" 5
+ fi
+fi
+
test "x$need_ptexenc" = xyes && {
need_kpathsea=yes
}
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@
diff --git a/Build/source/texk/ptexenc/Makefile.am b/Build/source/texk/ptexenc/Makefile.am
index 5d1848e2dcd..e29e2c65ddf 100644
--- a/Build/source/texk/ptexenc/Makefile.am
+++ b/Build/source/texk/ptexenc/Makefile.am
@@ -16,7 +16,7 @@ lib_LTLIBRARIES = libptexenc.la
libptexenc_la_CPPFLAGS = -DMAKE_KPSE_DLL
-libptexenc_la_LDFLAGS = -version-number $(PTEXENC_LT_VERSNUM)
+libptexenc_la_LDFLAGS = -version-info $(PTEXENC_LT_VERSINFO)
libptexenc_la_SOURCES = kanjicnv.c ptexenc.c unicode-jp.c unicode.c
diff --git a/Build/source/texk/ptexenc/Makefile.in b/Build/source/texk/ptexenc/Makefile.in
index 314fb6fe942..1ce3d42a3cd 100644
--- a/Build/source/texk/ptexenc/Makefile.in
+++ b/Build/source/texk/ptexenc/Makefile.in
@@ -189,7 +189,7 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PTEXENCVERSION = @PTEXENCVERSION@
-PTEXENC_LT_VERSNUM = @PTEXENC_LT_VERSNUM@
+PTEXENC_LT_VERSINFO = @PTEXENC_LT_VERSINFO@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
@@ -254,7 +254,7 @@ INCLUDES = $(KPATHSEA_INCLUDES) -I$(top_builddir)/.. -I$(top_srcdir)/..
AM_CFLAGS = $(WARNING_CFLAGS)
lib_LTLIBRARIES = libptexenc.la
libptexenc_la_CPPFLAGS = -DMAKE_KPSE_DLL
-libptexenc_la_LDFLAGS = -version-number $(PTEXENC_LT_VERSNUM)
+libptexenc_la_LDFLAGS = -version-info $(PTEXENC_LT_VERSINFO)
libptexenc_la_SOURCES = kanjicnv.c ptexenc.c unicode-jp.c unicode.c
ptexencincludedir = ${includedir}/ptexenc
nodist_ptexencinclude_HEADERS = c-auto.h
diff --git a/Build/source/texk/ptexenc/ac/ptexenc.ac b/Build/source/texk/ptexenc/ac/ptexenc.ac
new file mode 100644
index 00000000000..9a1b0c9d7fc
--- /dev/null
+++ b/Build/source/texk/ptexenc/ac/ptexenc.ac
@@ -0,0 +1,10 @@
+## texk/ptexenc/ac/ptexenc.ac: configure.ac fragment for the TeX Live subdirectory texk/ptexenc/
+dnl
+dnl Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
+## basic check of system ptexenc
+KPSE_TRY_LIB([ptexenc],
+ [#include <ptexenc/ptexenc.h>],
+ [const char *version = ptexenc_version_string;
+set_enc_string("prog", "name");])
diff --git a/Build/source/texk/ptexenc/ac/withenable.ac b/Build/source/texk/ptexenc/ac/withenable.ac
index 38d9a4152bd..1649eaf65be 100644
--- a/Build/source/texk/ptexenc/ac/withenable.ac
+++ b/Build/source/texk/ptexenc/ac/withenable.ac
@@ -4,4 +4,4 @@ dnl Copyright (C) 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 ptexenc
-KPSE_WITH_LIB([ptexenc], [kpathsea], [tree])
+KPSE_WITH_TEXLIB([ptexenc], [kpathsea])
diff --git a/Build/source/texk/ptexenc/configure b/Build/source/texk/ptexenc/configure
index 3a7c810e193..d4182d3075f 100755
--- a/Build/source/texk/ptexenc/configure
+++ b/Build/source/texk/ptexenc/configure
@@ -1,6 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for ptexenc 1.1.0.
+# Generated by GNU Autoconf 2.65 for ptexenc 1.1.1dev.
+#
+# Report bugs to <tex-k@tug.org>.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -228,10 +230,11 @@ fi
$as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
- $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
-$0: including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
+ $as_echo "$0: Please tell bug-autoconf@gnu.org and tex-k@tug.org
+$0: about your system, including any error possibly output
+$0: before this message. Then install a modern shell, or
+$0: manually run the script under such a shell if you do
+$0: have one."
fi
exit 1
fi
@@ -698,9 +701,9 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ptexenc'
PACKAGE_TARNAME='ptexenc'
-PACKAGE_VERSION='1.1.0'
-PACKAGE_STRING='ptexenc 1.1.0'
-PACKAGE_BUGREPORT=''
+PACKAGE_VERSION='1.1.1dev'
+PACKAGE_STRING='ptexenc 1.1.1dev'
+PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
ac_unique_file="ptexenc.c"
@@ -821,7 +824,7 @@ am__isrc
INSTALL_DATA
INSTALL_SCRIPT
INSTALL_PROGRAM
-PTEXENC_LT_VERSNUM
+PTEXENC_LT_VERSINFO
PTEXENCVERSION
target_alias
host_alias
@@ -1430,7 +1433,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 ptexenc 1.1.0 to adapt to many kinds of systems.
+\`configure' configures ptexenc 1.1.1dev to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1500,7 +1503,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ptexenc 1.1.0:";;
+ short | recursive ) echo "Configuration of ptexenc 1.1.1dev:";;
esac
cat <<\_ACEOF
@@ -1534,7 +1537,7 @@ Optional Packages:
kpathsea headers installed in DIR
--with-kpathsea-libdir=DIR
kpathsea library installed in DIR
- --with-ptexenc-enc=ENC Default pTeX character encode
+ --with-ptexenc-enc=ENC Default pTeX character encoding
(ENC=JIS/EUC/SJIS/UTF8, default UTF8)
Some influential environment variables:
@@ -1550,7 +1553,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to the package provider.
+Report bugs to <tex-k@tug.org>.
_ACEOF
ac_status=$?
fi
@@ -1613,7 +1616,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ptexenc configure 1.1.0
+ptexenc configure 1.1.1dev
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1958,6 +1961,12 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( cat <<\_ASBOX
+## ---------------------------- ##
+## Report this to tex-k@tug.org ##
+## ---------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
@@ -2089,7 +2098,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 ptexenc $as_me 1.1.0, which was
+It was created by ptexenc $as_me 1.1.1dev, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2463,11 +2472,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-PTEXENCVERSION=2.0.2
+PTEXENCVERSION=1.1.1dev
-$as_echo "#define PTEXENCVERSION \"ptexenc version 2.0.2\"" >>confdefs.h
+$as_echo "#define PTEXENCVERSION \"ptexenc version 1.1.1dev\"" >>confdefs.h
-PTEXENC_LT_VERSNUM=2:0:2
+PTEXENC_LT_VERSINFO=2:1:1
am__api_version='1.11'
@@ -4546,13 +4555,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:4549: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4558: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4552: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4561: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4555: output\"" >&5)
+ (eval echo "\"\$as_me:4564: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5755,7 +5764,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5758 "configure"' > conftest.$ac_ext
+ echo '#line 5767 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6821,7 +6830,7 @@ fi
# Define the identity of the package.
PACKAGE='ptexenc'
- VERSION='1.1.0'
+ VERSION='1.1.1dev'
cat >>confdefs.h <<_ACEOF
@@ -7685,11 +7694,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:7688: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7697: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7692: \$? = $ac_status" >&5
+ echo "$as_me:7701: \$? = $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.
@@ -8024,11 +8033,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:8027: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8036: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8031: \$? = $ac_status" >&5
+ echo "$as_me:8040: \$? = $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.
@@ -8129,11 +8138,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:8132: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8141: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8136: \$? = $ac_status" >&5
+ echo "$as_me:8145: \$? = $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
@@ -8184,11 +8193,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:8187: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8196: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8191: \$? = $ac_status" >&5
+ echo "$as_me:8200: \$? = $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
@@ -10551,7 +10560,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10554 "configure"
+#line 10563 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10647,7 +10656,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10650 "configure"
+#line 10659 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11751,9 +11760,6 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
-#AC_CHECK_DECLS([putenv, strstr])
-#AC_REPLACE_FUNCS([putenv strcasecmp strtol strstr])
-
kpse_save_CPPFLAGS=$CPPFLAGS
kpse_save_LIBS=$LIBS
@@ -12174,7 +12180,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-ptexenc config.lt 1.1.0
+ptexenc config.lt 1.1.1dev
configured by $0, generated by GNU Autoconf 2.65.
Copyright (C) 2008 Free Software Foundation, Inc.
@@ -13212,8 +13218,8 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default pTeX character encode" >&5
-$as_echo_n "checking default pTeX character encode... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default pTeX character encoding" >&5
+$as_echo_n "checking default pTeX character encoding... " >&6; }
# Check whether --with-ptexenc-enc was given.
if test "${with_ptexenc_enc+set}" = set; then :
@@ -13919,7 +13925,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 ptexenc $as_me 1.1.0, which was
+This file was extended by ptexenc $as_me 1.1.1dev, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13979,13 +13985,13 @@ $config_headers
Configuration commands:
$config_commands
-Report bugs to the package provider."
+Report bugs to <tex-k@tug.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ptexenc config.status 1.1.0
+ptexenc config.status 1.1.1dev
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/texk/ptexenc/configure.ac b/Build/source/texk/ptexenc/configure.ac
index 6c744bfbe38..8d2acff383a 100644
--- a/Build/source/texk/ptexenc/configure.ac
+++ b/Build/source/texk/ptexenc/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
@@ -20,13 +20,13 @@ dnl
dnl After a release, set ptexenc_lib_dev to "dev", to distinguish
dnl binaries built between releases.
-m4_define([ptexenc_lib_major], [2])[]dnl
-m4_define([ptexenc_lib_minor], [0])[]dnl
-m4_define([ptexenc_lib_micro], [2])[]dnl
-m4_define([ptexenc_lib_devel], [])[]dnl or "dev"
+m4_define([ptexenc_lib_major], [1])[]dnl
+m4_define([ptexenc_lib_minor], [1])[]dnl
+m4_define([ptexenc_lib_micro], [1])[]dnl
+m4_define([ptexenc_lib_devel], [dev])[]dnl or "dev"
m4_define([ptexenc_version], [ptexenc_lib_major.ptexenc_lib_minor.ptexenc_lib_micro[]ptexenc_lib_devel])[]dnl
-AC_INIT([ptexenc], [1.1.0])
+AC_INIT([ptexenc], [ptexenc_version], [tex-k@tug.org])
AC_PREREQ([2.63])
AC_CONFIG_SRCDIR([ptexenc.c])
AC_CONFIG_AUX_DIR([../../build-aux])
@@ -34,21 +34,18 @@ AC_CONFIG_MACRO_DIR([../../m4])
AC_SUBST([PTEXENCVERSION], [ptexenc_version])
AC_DEFINE([PTEXENCVERSION], ["ptexenc version ptexenc_version"])
-AC_SUBST([PTEXENC_LT_VERSNUM], [ptexenc_lib_major:ptexenc_lib_minor:ptexenc_lib_micro])
+AC_SUBST([PTEXENC_LT_VERSINFO],
+ [m4_eval(ptexenc_lib_major+ptexenc_lib_minor):ptexenc_lib_micro:ptexenc_lib_minor])
dnl Common code for all programs using libptexenc.
KPSE_COMMON([ptexenc])
-dnl Replacement functions that may be required on ancient broken system.
-#AC_CHECK_DECLS([putenv, strstr])
-#AC_REPLACE_FUNCS([putenv strcasecmp strtol strstr])
-
KPSE_KPATHSEA_FLAGS
dnl withenable.ac: --with and --enable options.
-AC_MSG_CHECKING(default pTeX character encode)
-AC_ARG_WITH(ptexenc-enc,
-[ --with-ptexenc-enc=ENC Default pTeX character encode
+AC_MSG_CHECKING([default pTeX character encoding])
+AC_ARG_WITH([ptexenc-enc],
+[ --with-ptexenc-enc=ENC Default pTeX character encoding
(ENC=JIS/EUC/SJIS/UTF8, default UTF8)],
[case $withval in
jis|JIS) PTEXENC=ENC_JIS;;
@@ -56,23 +53,23 @@ AC_ARG_WITH(ptexenc-enc,
sjis|SJIS) PTEXENC=ENC_SJIS;;
utf8|UTF8) PTEXENC=ENC_UTF8;;
*) PTEXENC=ENC_UTF8;
- AC_MSG_WARN(Unknown --with-ptexenc-enc argument \`$withval';);;
- esac; AC_MSG_RESULT($PTEXENC)
+ AC_MSG_WARN([Unknown --with-ptexenc-enc argument \`$withval';]);;
+ esac; AC_MSG_RESULT([$PTEXENC])
AC_DEFINE_UNQUOTED([DEFAULT_KANJI_ENC],[$PTEXENC],[Default kanji encode])],
- [AC_MSG_RESULT(ENC_UTF8)
+ [AC_MSG_RESULT([ENC_UTF8])
AC_DEFINE_UNQUOTED([DEFAULT_KANJI_ENC],[ENC_UTF8],[Default kanji encode])])
-AC_ARG_ENABLE(kanji-iconv,
+AC_ARG_ENABLE([kanji-iconv],
[ --enable-kanji-iconv use iconv for kanji <=> unicode conversion],
- , enable_kanji_iconv=no)
+ , [enable_kanji_iconv=no])
if test "x$enable_kanji_iconv" = "xyes"; then
AC_DEFINE([KANJI_ICONV], 1,
[Define 1 if you use iconv for kanji <=> unicode conversion])
-AC_CHECK_LIB(iconv, iconv_open,,AC_CHECK_LIB(iconv, libiconv_open))
-AC_CHECK_HEADERS(iconv.h)
-AC_CHECK_FUNCS(iconv)
-AC_CHECK_FUNCS(atexit on_exit, break)
+AC_CHECK_LIB([iconv], [iconv_open], ,[AC_CHECK_LIB([iconv], [libiconv_open])])
+AC_CHECK_HEADERS([iconv.h])
+AC_CHECK_FUNCS([iconv])
+AC_CHECK_FUNCS([atexit on_exit], [break])
fi
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 8813cc632e3..eb0831a7d5d 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -1043,6 +1043,9 @@ with_x
with_system_kpathsea
with_kpathsea_includes
with_kpathsea_libdir
+with_system_ptexenc
+with_ptexenc_includes
+with_ptexenc_libdir
with_system_zlib
with_zlib_includes
with_zlib_libdir
@@ -1760,6 +1763,11 @@ Optional Packages:
kpathsea headers installed in DIR
--with-kpathsea-libdir=DIR
kpathsea library installed in DIR
+ --with-system-ptexenc use installed ptexenc headers and library
+ --with-ptexenc-includes=DIR
+ ptexenc headers installed in DIR
+ --with-ptexenc-libdir=DIR
+ ptexenc library installed in DIR
--with-system-zlib use installed zlib headers and library
--with-zlib-includes=DIR
zlib headers installed in DIR
@@ -5235,13 +5243,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:5238: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:5246: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:5241: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:5249: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:5244: output\"" >&5)
+ (eval echo "\"\$as_me:5252: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -6444,7 +6452,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6447 "configure"' > conftest.$ac_ext
+ echo '#line 6455 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8374,11 +8382,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:8377: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8385: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8381: \$? = $ac_status" >&5
+ echo "$as_me:8389: \$? = $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.
@@ -8713,11 +8721,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:8716: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8724: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8720: \$? = $ac_status" >&5
+ echo "$as_me:8728: \$? = $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.
@@ -8818,11 +8826,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:8821: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8829: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8825: \$? = $ac_status" >&5
+ echo "$as_me:8833: \$? = $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
@@ -8873,11 +8881,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:8876: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8884: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8880: \$? = $ac_status" >&5
+ echo "$as_me:8888: \$? = $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
@@ -11240,7 +11248,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11243 "configure"
+#line 11251 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11336,7 +11344,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11339 "configure"
+#line 11347 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -15137,11 +15145,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:15140: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15148: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15144: \$? = $ac_status" >&5
+ echo "$as_me:15152: \$? = $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.
@@ -15236,11 +15244,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:15239: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15247: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15243: \$? = $ac_status" >&5
+ echo "$as_me:15251: \$? = $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
@@ -15288,11 +15296,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:15291: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15299: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15295: \$? = $ac_status" >&5
+ echo "$as_me:15303: \$? = $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
@@ -21194,6 +21202,30 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
fi
## _KPSE_LIB_FLAGS: Setup ptexenc (-lptexenc) flags
+
+# Check whether --with-system-ptexenc was given.
+if test "${with_system_ptexenc+set}" = set; then :
+ withval=$with_system_ptexenc;
+fi
+
+# Check whether --with-ptexenc-includes was given.
+if test "${with_ptexenc_includes+set}" = set; then :
+ withval=$with_ptexenc_includes;
+fi
+
+# Check whether --with-ptexenc-libdir was given.
+if test "${with_ptexenc_libdir+set}" = set; then :
+ withval=$with_ptexenc_libdir;
+fi
+if test "x$with_system_ptexenc" = xyes; then
+ if test "x$with_ptexenc_includes" != x && test "x$with_ptexenc_includes" != xyes; then
+ PTEXENC_INCLUDES="-I$with_ptexenc_includes"
+fi
+PTEXENC_LIBS="-lptexenc"
+if test "x$with_ptexenc_libdir" != x && test "x$with_ptexenc_libdir" != xyes; then
+ PTEXENC_LIBS="-L$with_ptexenc_libdir $PTEXENC_LIBS"
+fi
+else
PTEXENC_INCLUDES=`echo '-IBLD/texk -ISRC/texk' | sed \
-e "s,SRC/,$kpse_SRC/,g" \
-e "s,BLD/,$kpse_BLD/,g"`
@@ -21207,6 +21239,7 @@ $(PTEXENC_DEPEND): ${top_srcdir}/../ptexenc/*.[ch] ${top_builddir}/../ptexenc/pt
cd ${top_builddir}/../ptexenc && $(MAKE) $(AM_MAKEFLAGS) rebuild
${top_builddir}/../ptexenc/ptexenc.h:
cd ${top_builddir}/../ptexenc && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+fi
## _KPSE_LIB_FLAGS: Setup zlib (-lz) flags
diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in
index eaff694834e..84cb4329f62 100644
--- a/Build/source/utils/Makefile.in
+++ b/Build/source/utils/Makefile.in
@@ -57,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
$(top_srcdir)/../m4/kpse-lt-hack.m4 \
$(top_srcdir)/../m4/kpse-options.m4 \
$(top_srcdir)/../m4/kpse-pkgs.m4 \
+ $(top_srcdir)/../m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/../m4/kpse-setup.m4 \
$(top_srcdir)/../m4/kpse-t1lib-flags.m4 \
$(top_srcdir)/../m4/kpse-teckit-flags.m4 \
diff --git a/Build/source/utils/aclocal.m4 b/Build/source/utils/aclocal.m4
index 88c8fdc27e7..33e76229ca9 100644
--- a/Build/source/utils/aclocal.m4
+++ b/Build/source/utils/aclocal.m4
@@ -687,6 +687,7 @@ m4_include([../m4/kpse-libpng-flags.m4])
m4_include([../m4/kpse-lt-hack.m4])
m4_include([../m4/kpse-options.m4])
m4_include([../m4/kpse-pkgs.m4])
+m4_include([../m4/kpse-ptexenc-flags.m4])
m4_include([../m4/kpse-setup.m4])
m4_include([../m4/kpse-t1lib-flags.m4])
m4_include([../m4/kpse-teckit-flags.m4])
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index 28cb4919415..ddd9422233c 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -759,6 +759,9 @@ with_libpng_libdir
with_system_zlib
with_zlib_includes
with_zlib_libdir
+with_system_ptexenc
+with_ptexenc_includes
+with_ptexenc_libdir
with_system_kpathsea
with_kpathsea_includes
with_kpathsea_libdir
@@ -1568,6 +1571,11 @@ Optional Packages:
--with-zlib-includes=DIR
zlib headers installed in DIR
--with-zlib-libdir=DIR zlib library installed in DIR
+ --with-system-ptexenc use installed ptexenc headers and library
+ --with-ptexenc-includes=DIR
+ ptexenc headers installed in DIR
+ --with-ptexenc-libdir=DIR
+ ptexenc library installed in DIR
--with-system-kpathsea use installed kpathsea headers and library
--with-kpathsea-includes=DIR
kpathsea headers installed in DIR
@@ -3914,6 +3922,43 @@ fi
## texk/ptexenc/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ptexenc/
## configure options and TL libraries required for ptexenc
+# Check whether --with-system-ptexenc was given.
+if test "${with_system_ptexenc+set}" = set; then :
+ withval=$with_system_ptexenc;
+fi
+
+# Check whether --with-ptexenc-includes was given.
+if test "${with_ptexenc_includes+set}" = set; then :
+ withval=$with_ptexenc_includes;
+fi
+
+# Check whether --with-ptexenc-libdir was given.
+if test "${with_ptexenc_libdir+set}" = set; then :
+ withval=$with_ptexenc_libdir;
+fi
+if test "x$with_system_ptexenc" = x; then
+ if test -f $srcdir/../texk/ptexenc/configure; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`ptexenc' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`ptexenc' headers and library from TL tree" >&6;}
+ with_system_ptexenc=no
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`ptexenc' headers and library" >&5
+$as_echo "$as_me: Assuming installed \`ptexenc' headers and library" >&6;}
+ with_system_ptexenc=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-ptexenc=$with_system_ptexenc'"
+fi
+if test "x$with_system_ptexenc" = xyes; then
+ if test "x$with_system_kpathsea" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`kpathsea' headers and library" >&5
+$as_echo "$as_me: -> installed \`kpathsea' headers and library" >&6;}
+ with_system_kpathsea=yes
+ ac_configure_args="$ac_configure_args '--with-system-kpathsea'"
+ elif test "x$with_system_kpathsea" != xyes; then
+ as_fn_error "Sorry, \`--with-system-ptexenc' requires \`--with-system-kpathsea'" "$LINENO" 5
+ fi
+fi
+
test "x$need_ptexenc" = xyes && {
need_kpathsea=yes
}