Drop texk/ttf2pk and libs/freetype (Version 1.5)

git-svn-id: svn://tug.org/texlive/trunk@31618 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 0 insertions, 72 deletions

diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index c1a3298c364..0ff97ea4ff8 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -798,7 +798,6 @@ enable_mendexk
 enable_ps2pkm
 enable_seetexk
 enable_tex4htk
-enable_ttf2pk
 enable_ttf2pk2
 enable_ttfdump
 enable_xdvik
@@ -822,9 +821,6 @@ with_system_gd
 with_gd_includes
 with_gd_libdir
 with_system_freetype2
-with_system_freetype
-with_freetype_includes
-with_freetype_libdir
 with_system_libpng
 with_system_zlib
 with_zlib_includes
@@ -881,7 +877,6 @@ mendexk
 ps2pkm
 seetexk
 tex4htk
-ttf2pk
 ttf2pk2
 ttfdump
 xdvik
@@ -1614,7 +1609,6 @@ Optional Features:
   --disable-ps2pkm        do not build the ps2pkm package
   --disable-seetexk       do not build the seetexk package
   --disable-tex4htk       do not build the tex4htk package
-  --enable-ttf2pk         build the ttf2pk package
   --disable-ttf2pk2       do not build the ttf2pk2 package
   --disable-ttfdump       do not build the ttfdump package
   --disable-xdvik         do not build the xdvik package
@@ -1692,11 +1686,6 @@ Optional Packages:
   --with-gd-libdir=DIR    gd library installed in DIR
   --with-system-freetype2 use installed freetype2 headers and library
                           (requires freetype-config)
-  --with-system-freetype  use installed freetype headers and library
-  --with-freetype-includes=DIR
-                          freetype headers installed in DIR
-  --with-freetype-libdir=DIR
-                          freetype library installed in DIR
   --with-system-libpng    use installed libpng headers and library (requires
                           pkg-config)
   --with-system-zlib      use installed zlib headers and library
@@ -4667,29 +4656,6 @@ test "x$enable_tex4htk" = xno || {
   need_kpathsea=yes
 }
 
-## texk/ttf2pk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttf2pk/
-## configure options and TL libraries required for ttf2pk
-# Check whether --enable-ttf2pk was given.
-if test "${enable_ttf2pk+set}" = set; then :
-  enableval=$enable_ttf2pk;
-fi
-case $enable_ttf2pk in #(
-  yes|no) :
-     ;; #(
-  *) :
-
-   enable_ttf2pk=no
-     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttf2pk=$enable_ttf2pk'" >&5
-$as_echo "$as_me: Assuming \`--enable-ttf2pk=$enable_ttf2pk'" >&6;}
-     ac_configure_args="$ac_configure_args '--enable-ttf2pk=$enable_ttf2pk'"
-    ;;
-esac
-
-test "x$enable_ttf2pk" = xno || {
-  need_kpathsea=yes
-  need_freetype=yes
-}
-
 ## 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.
@@ -5181,36 +5147,6 @@ test "x$need_freetype2" = xyes && {
   need_zlib=yes
 }
 
-## libs/freetype/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype/
-## configure options and TL libraries required for freetype
-
-# Check whether --with-system-freetype was given.
-if test "${with_system_freetype+set}" = set; then :
-  withval=$with_system_freetype;
-fi
-
-# Check whether --with-freetype-includes was given.
-if test "${with_freetype_includes+set}" = set; then :
-  withval=$with_freetype_includes;
-fi
-
-# Check whether --with-freetype-libdir was given.
-if test "${with_freetype_libdir+set}" = set; then :
-  withval=$with_freetype_libdir;
-fi
-if test "x$with_system_freetype" = x; then
-  if test -f $srcdir/../libs/freetype/configure; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`freetype' headers and library from TL tree" >&5
-$as_echo "$as_me: Assuming \`freetype' headers and library from TL tree" >&6;}
-    with_system_freetype=no
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`freetype' headers and library" >&5
-$as_echo "$as_me: Assuming installed \`freetype' headers and library" >&6;}
-    with_system_freetype=yes
-  fi
-  ac_configure_args="$ac_configure_args '--with-system-freetype=$with_system_freetype'"
-fi
-
 ## libs/libpng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/
 ## configure options and TL libraries required for libpng
 
@@ -6494,14 +6430,6 @@ if test -x $srcdir/tex4htk/configure; then
 
   fi
 fi
-if test -x $srcdir/ttf2pk/configure; then
-  test "x$enable_ttf2pk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ttf2pk"
-  CONF_SUBDIRS="$CONF_SUBDIRS ttf2pk"
-  if false; then
-    subdirs="$subdirs ttf2pk"
-
-  fi
-fi
 if test -x $srcdir/ttf2pk2/configure; then
   test "x$enable_ttf2pk2" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ttf2pk2"
   CONF_SUBDIRS="$CONF_SUBDIRS ttf2pk2"