From 6c0bd2fb0dfa05fbf7235dbc3ed72f7f853f2569 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 16 Feb 2017 18:45:03 +0000 Subject: eliminate extra dvisvgm.ac and libgs.ac from configure; peb email -> tex-live@tug.org git-svn-id: svn://tug.org/texlive/trunk@43246 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/Makefile.in | 9 +++-- Build/source/configure | 46 ++---------------------- Build/source/doc/Makefile.in | 2 -- Build/source/libs/Makefile.in | 13 ++++--- Build/source/libs/configure | 46 ++---------------------- Build/source/texk/ChangeLog | 6 ++++ Build/source/texk/Makefile.in | 13 ++++--- Build/source/texk/configure | 56 ++++-------------------------- Build/source/texk/configure.ac | 6 ++-- Build/source/texk/dvisvgm/ChangeLog | 4 +++ Build/source/texk/dvisvgm/ac/withenable.ac | 8 ++--- Build/source/utils/Makefile.in | 13 ++++--- Build/source/utils/configure | 46 ++---------------------- 13 files changed, 53 insertions(+), 215 deletions(-) (limited to 'Build') diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in index b82409dbb29..9572f1e512d 100644 --- a/Build/source/Makefile.in +++ b/Build/source/Makefile.in @@ -153,8 +153,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-cairo-flags.m4 \ $(top_srcdir)/texk/dvipos/ac/withenable.ac \ $(top_srcdir)/texk/dvipsk/ac/withenable.ac \ $(top_srcdir)/texk/dvisvgm/ac/withenable.ac \ - $(top_srcdir)/texk/dvisvgm/ac/dvisvgm.ac \ - $(top_srcdir)/texk/dvisvgm/ac/libgs.ac \ $(top_srcdir)/texk/gregorio/ac/withenable.ac \ $(top_srcdir)/texk/gsftopk/ac/withenable.ac \ $(top_srcdir)/texk/lcdf-typetools/ac/withenable.ac \ @@ -287,9 +285,10 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/am/dist_hook.am \ $(top_srcdir)/build-aux/install-sh \ $(top_srcdir)/build-aux/ltmain.sh \ $(top_srcdir)/build-aux/missing ChangeLog README \ - build-aux/compile build-aux/config.guess build-aux/config.sub \ - build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \ - build-aux/missing build-aux/texinfo.tex build-aux/ylwrap + build-aux/ar-lib build-aux/compile build-aux/config.guess \ + build-aux/config.sub build-aux/depcomp build-aux/install-sh \ + build-aux/ltmain.sh build-aux/missing build-aux/texinfo.tex \ + build-aux/ylwrap DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) diff --git a/Build/source/configure b/Build/source/configure index 488cfd4fe14..9115056dbb6 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -864,10 +864,6 @@ with_gs enable_dvipos enable_dvipsk enable_dvisvgm -with_libgs -with_system_libgs -with_libgs_includes -with_libgs_libdir enable_gregorio enable_gsftopk enable_lcdf_typetools @@ -1749,12 +1745,6 @@ Optional Packages: [texworks --position=%d "%s"] --with-mf-x-toolkit use X toolkit for METAFONT --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript - --without-libgs build dvisvgm without PostScript support - --with-system-libgs build dvisvgm with installed gs headers and library - [default: no] - --with-libgs-includes=DIR - libgs headers installed in DIR - --with-libgs-libdir=DIR libgs library installed in DIR --with-xdvi-x-toolkit=KIT Use toolkit KIT (motif/xaw/xaw3d/neXtaw) for xdvi [default: Motif if available, else Xaw] @@ -5221,7 +5211,8 @@ test "x$enable_dvipsk" = xno || { need_kpathsea=yes } -## texk/dvisvgm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/ +# $Id$ +# texk/dvisvgm/ac/withenable.ac: configure.ac fragment ## configure options and TL libraries required for dvisvgm # Check whether --enable-dvisvgm was given. if test "${enable_dvisvgm+set}" = set; then : @@ -5246,39 +5237,6 @@ test "x$enable_dvisvgm" = xno || { need_zlib=yes } -## texk/dvisvgm/ac/dvisvgm.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/ -## configure options for dvisvgm - -# Check whether --with-libgs was given. -if test "${with_libgs+set}" = set; then : - withval=$with_libgs; -fi - - -# Check whether --with-system-libgs was given. -if test "${with_system_libgs+set}" = set; then : - withval=$with_system_libgs; -fi - - -# Check whether --with-libgs-includes was given. -if test "${with_libgs_includes+set}" = set; then : - withval=$with_libgs_includes; -fi - - -# Check whether --with-libgs-libdir was given. -if test "${with_libgs_libdir+set}" = set; then : - withval=$with_libgs_libdir; -fi - - -## texk/dvisvgm/ac/libgs.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/ -## configure checks for dvisvgm and libgs -if test "x$enable_native_texlive_build:$with_system_libgs" = xyes:yes; then - as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5 -fi - ## texk/gregorio/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gregorio/ ## configure options and TL libraries required for gregorio # Check whether --enable-gregorio was given. diff --git a/Build/source/doc/Makefile.in b/Build/source/doc/Makefile.in index 8dbc43fa0dd..99ba55bbeb8 100644 --- a/Build/source/doc/Makefile.in +++ b/Build/source/doc/Makefile.in @@ -153,8 +153,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-cairo-flags.m4 \ $(top_srcdir)/texk/dvipos/ac/withenable.ac \ $(top_srcdir)/texk/dvipsk/ac/withenable.ac \ $(top_srcdir)/texk/dvisvgm/ac/withenable.ac \ - $(top_srcdir)/texk/dvisvgm/ac/dvisvgm.ac \ - $(top_srcdir)/texk/dvisvgm/ac/libgs.ac \ $(top_srcdir)/texk/gregorio/ac/withenable.ac \ $(top_srcdir)/texk/gsftopk/ac/withenable.ac \ $(top_srcdir)/texk/lcdf-typetools/ac/withenable.ac \ diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in index 3f80df8e96c..0892249d220 100644 --- a/Build/source/libs/Makefile.in +++ b/Build/source/libs/Makefile.in @@ -151,8 +151,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \ $(top_srcdir)/../texk/dvipos/ac/withenable.ac \ $(top_srcdir)/../texk/dvipsk/ac/withenable.ac \ $(top_srcdir)/../texk/dvisvgm/ac/withenable.ac \ - $(top_srcdir)/../texk/dvisvgm/ac/dvisvgm.ac \ - $(top_srcdir)/../texk/dvisvgm/ac/libgs.ac \ $(top_srcdir)/../texk/gregorio/ac/withenable.ac \ $(top_srcdir)/../texk/gsftopk/ac/withenable.ac \ $(top_srcdir)/../texk/lcdf-typetools/ac/withenable.ac \ @@ -265,11 +263,12 @@ am__DIST_COMMON = $(srcdir)/../am/dist_hook.am \ $(top_srcdir)/../build-aux/config.guess \ $(top_srcdir)/../build-aux/config.sub \ $(top_srcdir)/../build-aux/install-sh \ - $(top_srcdir)/../build-aux/missing ../build-aux/compile \ - ../build-aux/config.guess ../build-aux/config.sub \ - ../build-aux/depcomp ../build-aux/install-sh \ - ../build-aux/ltmain.sh ../build-aux/missing \ - ../build-aux/texinfo.tex ../build-aux/ylwrap ChangeLog README + $(top_srcdir)/../build-aux/missing ../build-aux/ar-lib \ + ../build-aux/compile ../build-aux/config.guess \ + ../build-aux/config.sub ../build-aux/depcomp \ + ../build-aux/install-sh ../build-aux/ltmain.sh \ + ../build-aux/missing ../build-aux/texinfo.tex \ + ../build-aux/ylwrap ChangeLog README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) diff --git a/Build/source/libs/configure b/Build/source/libs/configure index 1abade3c7d1..85bfda1cce9 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -775,10 +775,6 @@ with_gs enable_dvipos enable_dvipsk enable_dvisvgm -with_libgs -with_system_libgs -with_libgs_includes -with_libgs_libdir enable_gregorio enable_gsftopk enable_lcdf_typetools @@ -1648,12 +1644,6 @@ Optional Packages: [texworks --position=%d "%s"] --with-mf-x-toolkit use X toolkit for METAFONT --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript - --without-libgs build dvisvgm without PostScript support - --with-system-libgs build dvisvgm with installed gs headers and library - [default: no] - --with-libgs-includes=DIR - libgs headers installed in DIR - --with-libgs-libdir=DIR libgs library installed in DIR --with-xdvi-x-toolkit=KIT Use toolkit KIT (motif/xaw/xaw3d/neXtaw) for xdvi [default: Motif if available, else Xaw] @@ -4419,7 +4409,8 @@ test "x$enable_dvipsk" = xno || { need_kpathsea=yes } -## texk/dvisvgm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/ +# $Id$ +# texk/dvisvgm/ac/withenable.ac: configure.ac fragment ## configure options and TL libraries required for dvisvgm # Check whether --enable-dvisvgm was given. if test "${enable_dvisvgm+set}" = set; then : @@ -4444,39 +4435,6 @@ test "x$enable_dvisvgm" = xno || { need_zlib=yes } -## texk/dvisvgm/ac/dvisvgm.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/ -## configure options for dvisvgm - -# Check whether --with-libgs was given. -if test "${with_libgs+set}" = set; then : - withval=$with_libgs; -fi - - -# Check whether --with-system-libgs was given. -if test "${with_system_libgs+set}" = set; then : - withval=$with_system_libgs; -fi - - -# Check whether --with-libgs-includes was given. -if test "${with_libgs_includes+set}" = set; then : - withval=$with_libgs_includes; -fi - - -# Check whether --with-libgs-libdir was given. -if test "${with_libgs_libdir+set}" = set; then : - withval=$with_libgs_libdir; -fi - - -## texk/dvisvgm/ac/libgs.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/ -## configure checks for dvisvgm and libgs -if test "x$enable_native_texlive_build:$with_system_libgs" = xyes:yes; then - as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5 -fi - ## texk/gregorio/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gregorio/ ## configure options and TL libraries required for gregorio # Check whether --enable-gregorio was given. diff --git a/Build/source/texk/ChangeLog b/Build/source/texk/ChangeLog index b2ba4a4ed49..c1a388747d5 100644 --- a/Build/source/texk/ChangeLog +++ b/Build/source/texk/ChangeLog @@ -1,3 +1,7 @@ +2017-02-16 Karl Berry + + * configure.ac (AC_INIT): tex-live@tug.org instead of peb. + 2016-01-16 Karl Berry (web2c/Makefile): do not try to make the nonexistent subtexk target. @@ -1097,3 +1101,5 @@ Thu Sep 30 14:27:17 1993 Karl Berry (karl@cs.umb.edu) * Makefile.in (*install*): Only do program directories. (most targets): Add `else true' for stupid sh's. * README: Update appropriately. + +(This ChangeLog file public domain.) diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in index 0c73a1f28a0..6d39ef87d8c 100644 --- a/Build/source/texk/Makefile.in +++ b/Build/source/texk/Makefile.in @@ -151,8 +151,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \ $(top_srcdir)/../texk/dvipos/ac/withenable.ac \ $(top_srcdir)/../texk/dvipsk/ac/withenable.ac \ $(top_srcdir)/../texk/dvisvgm/ac/withenable.ac \ - $(top_srcdir)/../texk/dvisvgm/ac/dvisvgm.ac \ - $(top_srcdir)/../texk/dvisvgm/ac/libgs.ac \ $(top_srcdir)/../texk/gregorio/ac/withenable.ac \ $(top_srcdir)/../texk/gsftopk/ac/withenable.ac \ $(top_srcdir)/../texk/lcdf-typetools/ac/withenable.ac \ @@ -265,11 +263,12 @@ am__DIST_COMMON = $(srcdir)/../am/dist_hook.am \ $(top_srcdir)/../build-aux/config.guess \ $(top_srcdir)/../build-aux/config.sub \ $(top_srcdir)/../build-aux/install-sh \ - $(top_srcdir)/../build-aux/missing ../build-aux/compile \ - ../build-aux/config.guess ../build-aux/config.sub \ - ../build-aux/depcomp ../build-aux/install-sh \ - ../build-aux/ltmain.sh ../build-aux/missing \ - ../build-aux/texinfo.tex ../build-aux/ylwrap ChangeLog README + $(top_srcdir)/../build-aux/missing ../build-aux/ar-lib \ + ../build-aux/compile ../build-aux/config.guess \ + ../build-aux/config.sub ../build-aux/depcomp \ + ../build-aux/install-sh ../build-aux/ltmain.sh \ + ../build-aux/missing ../build-aux/texinfo.tex \ + ../build-aux/ylwrap ChangeLog README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) diff --git a/Build/source/texk/configure b/Build/source/texk/configure index d272cac2539..b83ab2865bb 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -2,7 +2,7 @@ # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for TeX Live texk 2017/dev. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -265,7 +265,7 @@ fi $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" $as_echo "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org and peb@mppmu.mpg.de + $as_echo "$0: Please tell bug-autoconf@gnu.org and tex-live@tug.org $0: about your system, including any error possibly output $0: before this message. Then install a modern shell, or $0: manually run the script under such a shell if you do @@ -581,7 +581,7 @@ PACKAGE_NAME='TeX Live texk' PACKAGE_TARNAME='tex-live-texk' PACKAGE_VERSION='2017/dev' PACKAGE_STRING='TeX Live texk 2017/dev' -PACKAGE_BUGREPORT='peb@mppmu.mpg.de' +PACKAGE_BUGREPORT='tex-live@tug.org' PACKAGE_URL='' ac_unique_file="../build-aux/missing" @@ -775,10 +775,6 @@ with_gs enable_dvipos enable_dvipsk enable_dvisvgm -with_libgs -with_system_libgs -with_libgs_includes -with_libgs_libdir enable_gregorio enable_gsftopk enable_lcdf_typetools @@ -1660,12 +1656,6 @@ Optional Packages: [texworks --position=%d "%s"] --with-mf-x-toolkit use X toolkit for METAFONT --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript - --without-libgs build dvisvgm without PostScript support - --with-system-libgs build dvisvgm with installed gs headers and library - [default: no] - --with-libgs-includes=DIR - libgs headers installed in DIR - --with-libgs-libdir=DIR libgs library installed in DIR --with-xdvi-x-toolkit=KIT Use toolkit KIT (motif/xaw/xaw3d/neXtaw) for xdvi [default: Motif if available, else Xaw] @@ -1732,7 +1722,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . +Report bugs to . _ACEOF ac_status=$? fi @@ -4431,7 +4421,8 @@ test "x$enable_dvipsk" = xno || { need_kpathsea=yes } -## texk/dvisvgm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/ +# $Id$ +# texk/dvisvgm/ac/withenable.ac: configure.ac fragment ## configure options and TL libraries required for dvisvgm # Check whether --enable-dvisvgm was given. if test "${enable_dvisvgm+set}" = set; then : @@ -4456,39 +4447,6 @@ test "x$enable_dvisvgm" = xno || { need_zlib=yes } -## texk/dvisvgm/ac/dvisvgm.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/ -## configure options for dvisvgm - -# Check whether --with-libgs was given. -if test "${with_libgs+set}" = set; then : - withval=$with_libgs; -fi - - -# Check whether --with-system-libgs was given. -if test "${with_system_libgs+set}" = set; then : - withval=$with_system_libgs; -fi - - -# Check whether --with-libgs-includes was given. -if test "${with_libgs_includes+set}" = set; then : - withval=$with_libgs_includes; -fi - - -# Check whether --with-libgs-libdir was given. -if test "${with_libgs_libdir+set}" = set; then : - withval=$with_libgs_libdir; -fi - - -## texk/dvisvgm/ac/libgs.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/ -## configure checks for dvisvgm and libgs -if test "x$enable_native_texlive_build:$with_system_libgs" = xyes:yes; then - as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5 -fi - ## texk/gregorio/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gregorio/ ## configure options and TL libraries required for gregorio # Check whether --enable-gregorio was given. @@ -7351,7 +7309,7 @@ $config_files Configuration commands: $config_commands -Report bugs to ." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 diff --git a/Build/source/texk/configure.ac b/Build/source/texk/configure.ac index d2d02a940c1..f996e092b1b 100644 --- a/Build/source/texk/configure.ac +++ b/Build/source/texk/configure.ac @@ -1,13 +1,15 @@ +# $Id$ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2009-2013 Peter Breitenlohner +dnl Copyright 2017 Karl Berry +dnl Copyright 2009-2013 Peter Breitenlohner dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl m4_include([../version.ac])[] dnl define tex_live_version -AC_INIT([TeX Live texk], tex_live_version(), [peb@mppmu.mpg.de]) +AC_INIT([TeX Live texk], tex_live_version(), [tex-live@tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([../build-aux/missing]) AC_CONFIG_AUX_DIR([../build-aux]) diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog index 8584fb82ff9..f761ec91859 100644 --- a/Build/source/texk/dvisvgm/ChangeLog +++ b/Build/source/texk/dvisvgm/ChangeLog @@ -1,3 +1,7 @@ +2017-02-16 Karl Berry + + * ac/withenable.ac: just KPSE_ENABLE_PROG. + 2017-02-13 Karl Berry * Import 2.1.2 with follow-up patches from Martin. diff --git a/Build/source/texk/dvisvgm/ac/withenable.ac b/Build/source/texk/dvisvgm/ac/withenable.ac index 83b1cb0f397..1b6e80f06b6 100644 --- a/Build/source/texk/dvisvgm/ac/withenable.ac +++ b/Build/source/texk/dvisvgm/ac/withenable.ac @@ -1,9 +1,9 @@ -## texk/dvisvgm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/ +# $Id$ +# texk/dvisvgm/ac/withenable.ac: configure.ac fragment dnl -dnl Copyright (C) 2009-2013 Peter Breitenlohner +dnl Copyright 2017 Karl Berry +dnl Copyright 2009-2013 Peter Breitenlohner dnl You may freely use, modify and/or distribute this file. dnl ## configure options and TL libraries required for dvisvgm KPSE_ENABLE_PROG([dvisvgm], [kpathsea potrace freetype2 zlib]) -m4_include(kpse_TL[texk/dvisvgm/ac/dvisvgm.ac]) -m4_include(kpse_TL[texk/dvisvgm/ac/libgs.ac]) diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in index 2806a397426..aa8cc57c84e 100644 --- a/Build/source/utils/Makefile.in +++ b/Build/source/utils/Makefile.in @@ -151,8 +151,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \ $(top_srcdir)/../texk/dvipos/ac/withenable.ac \ $(top_srcdir)/../texk/dvipsk/ac/withenable.ac \ $(top_srcdir)/../texk/dvisvgm/ac/withenable.ac \ - $(top_srcdir)/../texk/dvisvgm/ac/dvisvgm.ac \ - $(top_srcdir)/../texk/dvisvgm/ac/libgs.ac \ $(top_srcdir)/../texk/gregorio/ac/withenable.ac \ $(top_srcdir)/../texk/gsftopk/ac/withenable.ac \ $(top_srcdir)/../texk/lcdf-typetools/ac/withenable.ac \ @@ -265,11 +263,12 @@ am__DIST_COMMON = $(srcdir)/../am/dist_hook.am \ $(top_srcdir)/../build-aux/config.guess \ $(top_srcdir)/../build-aux/config.sub \ $(top_srcdir)/../build-aux/install-sh \ - $(top_srcdir)/../build-aux/missing ../build-aux/compile \ - ../build-aux/config.guess ../build-aux/config.sub \ - ../build-aux/depcomp ../build-aux/install-sh \ - ../build-aux/ltmain.sh ../build-aux/missing \ - ../build-aux/texinfo.tex ../build-aux/ylwrap ChangeLog README + $(top_srcdir)/../build-aux/missing ../build-aux/ar-lib \ + ../build-aux/compile ../build-aux/config.guess \ + ../build-aux/config.sub ../build-aux/depcomp \ + ../build-aux/install-sh ../build-aux/ltmain.sh \ + ../build-aux/missing ../build-aux/texinfo.tex \ + ../build-aux/ylwrap ChangeLog README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) diff --git a/Build/source/utils/configure b/Build/source/utils/configure index e71bc876f39..e58b2ce5900 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -775,10 +775,6 @@ with_gs enable_dvipos enable_dvipsk enable_dvisvgm -with_libgs -with_system_libgs -with_libgs_includes -with_libgs_libdir enable_gregorio enable_gsftopk enable_lcdf_typetools @@ -1641,12 +1637,6 @@ Optional Packages: [texworks --position=%d "%s"] --with-mf-x-toolkit use X toolkit for METAFONT --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript - --without-libgs build dvisvgm without PostScript support - --with-system-libgs build dvisvgm with installed gs headers and library - [default: no] - --with-libgs-includes=DIR - libgs headers installed in DIR - --with-libgs-libdir=DIR libgs library installed in DIR --with-xdvi-x-toolkit=KIT Use toolkit KIT (motif/xaw/xaw3d/neXtaw) for xdvi [default: Motif if available, else Xaw] @@ -4412,7 +4402,8 @@ test "x$enable_dvipsk" = xno || { need_kpathsea=yes } -## texk/dvisvgm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/ +# $Id$ +# texk/dvisvgm/ac/withenable.ac: configure.ac fragment ## configure options and TL libraries required for dvisvgm # Check whether --enable-dvisvgm was given. if test "${enable_dvisvgm+set}" = set; then : @@ -4437,39 +4428,6 @@ test "x$enable_dvisvgm" = xno || { need_zlib=yes } -## texk/dvisvgm/ac/dvisvgm.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/ -## configure options for dvisvgm - -# Check whether --with-libgs was given. -if test "${with_libgs+set}" = set; then : - withval=$with_libgs; -fi - - -# Check whether --with-system-libgs was given. -if test "${with_system_libgs+set}" = set; then : - withval=$with_system_libgs; -fi - - -# Check whether --with-libgs-includes was given. -if test "${with_libgs_includes+set}" = set; then : - withval=$with_libgs_includes; -fi - - -# Check whether --with-libgs-libdir was given. -if test "${with_libgs_libdir+set}" = set; then : - withval=$with_libgs_libdir; -fi - - -## texk/dvisvgm/ac/libgs.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/ -## configure checks for dvisvgm and libgs -if test "x$enable_native_texlive_build:$with_system_libgs" = xyes:yes; then - as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5 -fi - ## texk/gregorio/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gregorio/ ## configure options and TL libraries required for gregorio # Check whether --enable-gregorio was given. -- cgit v1.2.3