summaryrefslogtreecommitdiff
path: root/Build/source/libs
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/libs
parent900bee30486216b7356a1f3756f00277318c18a7 (diff)
build system update
git-svn-id: svn://tug.org/texlive/trunk@17891 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs')
-rw-r--r--Build/source/libs/Makefile.in1
-rw-r--r--Build/source/libs/aclocal.m41
-rwxr-xr-xBuild/source/libs/configure45
3 files changed, 47 insertions, 0 deletions
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
}