From 9b5f1f3915e6c11001ef9c48efd372e93cbf7ab3 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 2 May 2011 13:04:59 +0000 Subject: update git-svn-id: svn://tug.org/texlive/trunk@22281 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/configure | 49 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 12 deletions(-) (limited to 'Build/source/texk/configure') diff --git a/Build/source/texk/configure b/Build/source/texk/configure index e3035fd03a4..725f2a3a755 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -755,6 +755,7 @@ enable_ps2pkm enable_seetexk enable_tex4htk enable_ttf2pk +enable_ttf2pk2 enable_ttfdump enable_xdv2pdf enable_xdvik @@ -831,11 +832,11 @@ lcdf-typetools makeindexk makejvf mendexk -musixflx ps2pkm seetexk tex4htk ttf2pk +ttf2pk2 ttfdump xdv2pdf xdvik @@ -1555,6 +1556,7 @@ Optional Features: --disable-seetexk do not build the seetexk package --disable-tex4htk do not build the tex4htk package --disable-ttf2pk do not build the ttf2pk package + --enable-ttf2pk2 build the ttf2pk2 package --disable-ttfdump do not build the ttfdump package --disable-xdv2pdf do not build the xdv2pdf package --disable-xdvik do not build the xdvik package @@ -4245,7 +4247,6 @@ test "x$enable_mendexk" = xno || { } - ## texk/ps2pkm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ps2pkm/ ## configure options and TL libraries required for ps2pkm # Check whether --enable-ps2pkm was given. @@ -4339,6 +4340,30 @@ test "x$enable_ttf2pk" = xno || { } +## texk/ttf2pk2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttf2pk2/ +## configure options and TL libraries required for ttf2pk +# Check whether --enable-ttf2pk2 was given. +if test "${enable_ttf2pk2+set}" = set; then : + enableval=$enable_ttf2pk2; +fi +case $enable_ttf2pk2 in #( + yes|no) : + ;; #( + *) : + + enable_ttf2pk2=no + { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttf2pk2=$enable_ttf2pk2'" >&5 +$as_echo "$as_me: Assuming \`--enable-ttf2pk2=$enable_ttf2pk2'" >&6;} + ac_configure_args="$ac_configure_args '--enable-ttf2pk2=$enable_ttf2pk2'" + ;; +esac + +test "x$enable_ttf2pk2" = xno || { + need_kpathsea=yes + need_freetype2=yes +} + + ## texk/ttfdump/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttfdump/ ## configure options and TL libraries required for ttfdump # Check whether --enable-ttfdump was given. @@ -5972,16 +5997,6 @@ if test -x $srcdir/mendexk/configure; then fi -if test -x $srcdir/musixflx/configure; then - test "x$enable_musixflx" = xno || SUBTEXK="$SUBTEXK musixflx" - DIST_SUBTEXK="$DIST_SUBTEXK musixflx" - if false; then - subdirs="$subdirs musixflx" - - fi -fi - - if test -x $srcdir/ps2pkm/configure; then test "x$enable_ps2pkm" = xno || SUBTEXK="$SUBTEXK ps2pkm" DIST_SUBTEXK="$DIST_SUBTEXK ps2pkm" @@ -6022,6 +6037,16 @@ if test -x $srcdir/ttf2pk/configure; then fi +if test -x $srcdir/ttf2pk2/configure; then + test "x$enable_ttf2pk2" = xno || SUBTEXK="$SUBTEXK ttf2pk2" + DIST_SUBTEXK="$DIST_SUBTEXK ttf2pk2" + if false; then + subdirs="$subdirs ttf2pk2" + + fi +fi + + if test -x $srcdir/ttfdump/configure; then test "x$enable_ttfdump" = xno || SUBTEXK="$SUBTEXK ttfdump" DIST_SUBTEXK="$DIST_SUBTEXK ttfdump" -- cgit v1.2.3