diff options
Diffstat (limited to 'Build/source/libs/configure')
-rwxr-xr-x | Build/source/libs/configure | 91 |
1 files changed, 36 insertions, 55 deletions
diff --git a/Build/source/libs/configure b/Build/source/libs/configure index 86a0d4bf886..1967482d9ff 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -700,7 +700,6 @@ enable_biber enable_m_tx enable_pmx enable_ps2eps -enable_songs enable_t1utils enable_texdoctk enable_tpic2pdftex @@ -825,9 +824,9 @@ with_gd_includes with_gd_libdir with_system_freetype2 with_system_libpng -with_system_paper -with_paper_includes -with_paper_libdir +with_system_libpaper +with_libpaper_includes +with_libpaper_libdir with_system_zlib with_zlib_includes with_zlib_libdir @@ -870,7 +869,7 @@ potrace gd freetype2 libpng -paper +libpaper lua52 zlib' @@ -1503,7 +1502,6 @@ Optional Features: --disable-m-tx do not build the m-tx package --disable-pmx do not build the pmx package --disable-ps2eps do not build the ps2eps package - --disable-songs do not build the songs package --disable-t1utils do not build the t1utils package --disable-texdoctk do not build the texdoctk package --disable-tpic2pdftex do not build the tpic2pdftex package @@ -1683,10 +1681,11 @@ 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-libpaper use installed libpaper headers and library + --with-libpaper-includes=DIR + libpaper headers installed in DIR + --with-libpaper-libdir=DIR + libpaper library installed in DIR --with-system-zlib use installed zlib headers and library --with-zlib-includes=DIR zlib headers installed in DIR @@ -3428,24 +3427,6 @@ $as_echo "$as_me: Assuming \`--enable-ps2eps=$enable_ps2eps'" >&6;} ;; esac -## utils/songs/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/songs/ -## configure options and TL libraries required for songs -# Check whether --enable-songs was given. -if test "${enable_songs+set}" = set; then : - enableval=$enable_songs; -fi -case $enable_songs in #( - yes|no) : - ;; #( - *) : - - enable_songs=$enable_all_pkgs - { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-songs=$enable_songs'" >&5 -$as_echo "$as_me: Assuming \`--enable-songs=$enable_songs'" >&6;} - ac_configure_args="$ac_configure_args '--enable-songs=$enable_songs'" - ;; -esac - ## utils/t1utils/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/t1utils/ ## configure options and TL libraries required for t1utils # Check whether --enable-t1utils was given. @@ -4181,7 +4162,7 @@ esac test "x$enable_dvipdf_x" = xno || { need_kpathsea=yes need_libpng=yes - need_paper=yes + need_libpaper=yes } ## Define configure options for dvipdf-x. @@ -4231,7 +4212,7 @@ esac test "x$enable_dvipdfm_x" = xno || { need_kpathsea=yes need_libpng=yes - need_paper=yes + need_libpaper=yes } ## Define configure options for dvipdfm-x. @@ -4639,7 +4620,7 @@ esac test "x$enable_psutils" = xno || { need_kpathsea=yes - need_paper=yes + need_libpaper=yes } ## texk/seetexk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/seetexk/ @@ -5218,34 +5199,34 @@ 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 +## libs/libpaper/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpaper/ +## configure options and TL libraries required for libpaper -# Check whether --with-system-paper was given. -if test "${with_system_paper+set}" = set; then : - withval=$with_system_paper; +# Check whether --with-system-libpaper was given. +if test "${with_system_libpaper+set}" = set; then : + withval=$with_system_libpaper; fi -# Check whether --with-paper-includes was given. -if test "${with_paper_includes+set}" = set; then : - withval=$with_paper_includes; +# Check whether --with-libpaper-includes was given. +if test "${with_libpaper_includes+set}" = set; then : + withval=$with_libpaper_includes; fi -# Check whether --with-paper-libdir was given. -if test "${with_paper_libdir+set}" = set; then : - withval=$with_paper_libdir; +# Check whether --with-libpaper-libdir was given. +if test "${with_libpaper_libdir+set}" = set; then : + withval=$with_libpaper_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 +if test "x$with_system_libpaper" = x; then + if test -f $srcdir/../libs/libpaper/configure; then + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`libpaper' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`libpaper' headers and library from TL tree" >&6;} + with_system_libpaper=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 + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`libpaper' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`libpaper' headers and library" >&6;} + with_system_libpaper=yes fi - ac_configure_args="$ac_configure_args '--with-system-paper=$with_system_paper'" + ac_configure_args="$ac_configure_args '--with-system-libpaper=$with_system_libpaper'" fi ## libs/lua52/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/lua52/ @@ -6393,11 +6374,11 @@ if test -x $srcdir/libpng/configure; then fi fi -if test -x $srcdir/paper/configure; then - test "x$with_system_paper" != xyes && test "x$need_paper" = xyes && MAKE_SUBDIRS="paper $MAKE_SUBDIRS" - CONF_SUBDIRS="paper $CONF_SUBDIRS" +if test -x $srcdir/libpaper/configure; then + test "x$with_system_libpaper" != xyes && test "x$need_libpaper" = xyes && MAKE_SUBDIRS="libpaper $MAKE_SUBDIRS" + CONF_SUBDIRS="libpaper $CONF_SUBDIRS" if false; then - subdirs="$subdirs paper" + subdirs="$subdirs libpaper" fi fi |