diff options
Diffstat (limited to 'Build/source/texk')
-rw-r--r-- | Build/source/texk/Makefile.in | 2 | ||||
-rw-r--r-- | Build/source/texk/aclocal.m4 | 1 | ||||
-rwxr-xr-x | Build/source/texk/configure | 37 |
3 files changed, 40 insertions, 0 deletions
diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in index 64c03895c68..07db6140666 100644 --- a/Build/source/texk/Makefile.in +++ b/Build/source/texk/Makefile.in @@ -104,6 +104,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \ $(top_srcdir)/../m4/kpse-lt-hack.m4 \ $(top_srcdir)/../m4/kpse-mktex.m4 \ $(top_srcdir)/../m4/kpse-options.m4 \ + $(top_srcdir)/../m4/kpse-paper-flags.m4 \ $(top_srcdir)/../m4/kpse-pixman-flags.m4 \ $(top_srcdir)/../m4/kpse-pkgs.m4 \ $(top_srcdir)/../m4/kpse-poppler-flags.m4 \ @@ -183,6 +184,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \ $(top_srcdir)/../libs/gd/ac/withenable.ac \ $(top_srcdir)/../libs/freetype2/ac/withenable.ac \ $(top_srcdir)/../libs/libpng/ac/withenable.ac \ + $(top_srcdir)/../libs/paper/ac/withenable.ac \ $(top_srcdir)/../libs/lua52/ac/withenable.ac \ $(top_srcdir)/../libs/zlib/ac/withenable.ac \ $(top_srcdir)/../texk/ptexenc/ac/withenable.ac \ diff --git a/Build/source/texk/aclocal.m4 b/Build/source/texk/aclocal.m4 index 2977c206db3..5ec9df5bb47 100644 --- a/Build/source/texk/aclocal.m4 +++ b/Build/source/texk/aclocal.m4 @@ -1196,6 +1196,7 @@ m4_include([../m4/kpse-libpng-flags.m4]) m4_include([../m4/kpse-lt-hack.m4]) m4_include([../m4/kpse-mktex.m4]) m4_include([../m4/kpse-options.m4]) +m4_include([../m4/kpse-paper-flags.m4]) m4_include([../m4/kpse-pixman-flags.m4]) m4_include([../m4/kpse-pkgs.m4]) m4_include([../m4/kpse-poppler-flags.m4]) diff --git a/Build/source/texk/configure b/Build/source/texk/configure index 0ff97ea4ff8..af91b2504f4 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -822,6 +822,9 @@ with_gd_includes with_gd_libdir with_system_freetype2 with_system_libpng +with_system_paper +with_paper_includes +with_paper_libdir with_system_zlib with_zlib_includes with_zlib_libdir @@ -1688,6 +1691,10 @@ Optional Packages: (requires freetype-config) --with-system-libpng use installed libpng headers and library (requires pkg-config) + --with-system-paper use installed paper headers and library + --with-paper-includes=DIR + paper headers installed in DIR + --with-paper-libdir=DIR paper library installed in DIR --with-system-zlib use installed zlib headers and library --with-zlib-includes=DIR zlib headers installed in DIR @@ -5181,6 +5188,36 @@ test "x$need_libpng" = xyes && { need_zlib=yes } +## libs/paper/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/paper/ +## configure options and TL libraries required for paper + +# Check whether --with-system-paper was given. +if test "${with_system_paper+set}" = set; then : + withval=$with_system_paper; +fi + +# Check whether --with-paper-includes was given. +if test "${with_paper_includes+set}" = set; then : + withval=$with_paper_includes; +fi + +# Check whether --with-paper-libdir was given. +if test "${with_paper_libdir+set}" = set; then : + withval=$with_paper_libdir; +fi +if test "x$with_system_paper" = x; then + if test -f $srcdir/../libs/paper/configure; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`paper' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`paper' headers and library from TL tree" >&6;} + with_system_paper=no + else + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`paper' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`paper' headers and library" >&6;} + with_system_paper=yes + fi + ac_configure_args="$ac_configure_args '--with-system-paper=$with_system_paper'" +fi + ## libs/lua52/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/lua52/ ## configure options and TL libraries required for lua52 |