diff options
25 files changed, 119 insertions, 29 deletions
diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog index 86630dd4cda..d3086c5d2b9 100644 --- a/Build/source/ChangeLog +++ b/Build/source/ChangeLog @@ -1,3 +1,7 @@ +2013-12-26 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (ACLOCAL): Ensure aclocal.m4 is up to date. + 2013-12-14 Peter Breitenlohner <peb@mppmu.mpg.de> * doc/build.texi: Fixed some typos. diff --git a/Build/source/Makefile.am b/Build/source/Makefile.am index f0b94dd77e8..bb0db4acad1 100644 --- a/Build/source/Makefile.am +++ b/Build/source/Makefile.am @@ -3,6 +3,8 @@ ## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## +## Ensure aclocal.m4 is up to date +ACLOCAL = @ACLOCAL@ --force ## speed up distcheck AM_DISTCHECK_CONFIGURE_FLAGS = -C diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in index b0d77137964..ee24628d0b8 100644 --- a/Build/source/Makefile.in +++ b/Build/source/Makefile.in @@ -314,7 +314,7 @@ DIST_ARCHIVES = $(distdir).tar.xz DIST_TARGETS = dist-xz am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' -ACLOCAL = @ACLOCAL@ +ACLOCAL = @ACLOCAL@ --force AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ diff --git a/Build/source/README.hacking b/Build/source/README.hacking index 85ec2ba906d..00b3847abae 100644 --- a/Build/source/README.hacking +++ b/Build/source/README.hacking @@ -14,7 +14,7 @@ them with configure --prefix=/usr/local/gnu and having autoconf (GNU Autoconf) 2.69 -automake (GNU automake) 1.14 +automake (GNU automake) 1.14.1 ltmain.sh (GNU libtool) 2.4.2 diff --git a/Build/source/configure b/Build/source/configure index 6b54ba05224..e255bb2433a 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -862,6 +862,7 @@ with_gs enable_dvipos enable_dvipsk enable_dvisvgm +with_libgs with_system_libgs with_libgs_includes with_libgs_libdir @@ -1741,6 +1742,7 @@ Optional Packages: [texworks --position=%d "%s"] --without-mf-x-toolkit do not 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 @@ -5123,6 +5125,12 @@ test "x$enable_dvisvgm" = xno || { ## 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; diff --git a/Build/source/doc/build-tools b/Build/source/doc/build-tools index 56be97bdceb..f9bb30a7d03 100644 --- a/Build/source/doc/build-tools +++ b/Build/source/doc/build-tools @@ -6,7 +6,7 @@ are @example autoconf (GNU Autoconf) 2.69 -automake (GNU automake) 1.14 +automake (GNU automake) 1.14.1 ltmain.sh (GNU libtool) 2.4.2 bison (GNU Bison) 3.0 flex 2.5.37 diff --git a/Build/source/doc/build.texi b/Build/source/doc/build.texi index 5116ad7ff46..18398c33884 100644 --- a/Build/source/doc/build.texi +++ b/Build/source/doc/build.texi @@ -1015,6 +1015,9 @@ program (building @file{xdvipdfmx} requires the @code{freetype} library). @subsubsection Configure Options for @file{texk/dvisvgm} +@noindent @code{--without-libgs} @* Build @file{dvisvgm} without PostScript +support. + @noindent @code{--with-system-libgs} @* Build @file{dvisvgm} using installed Ghostscript (@code{gs}) headers and library (not allowed for a native @TL{} build). The default is to load the @code{gs} library at runtime if diff --git a/Build/source/doc/texlive.info b/Build/source/doc/texlive.info index 7fb02be402d..36836bc016b 100644 --- a/Build/source/doc/texlive.info +++ b/Build/source/doc/texlive.info @@ -352,7 +352,7 @@ GNU releases (e.g., by building them with and having 'PATH' start with '/usr/local/gnu/bin'). Currently these are autoconf (GNU Autoconf) 2.69 - automake (GNU automake) 1.14 + automake (GNU automake) 1.14.1 ltmain.sh (GNU libtool) 2.4.2 bison (GNU Bison) 3.0 flex 2.5.37 @@ -1094,6 +1094,9 @@ Do not build the 'xdvipdfmx' program (building 'xdvipdfmx' requires the 2.4.2.6 Configure Options for 'texk/dvisvgm' ............................................ +'--without-libgs' +Build 'dvisvgm' without PostScript support. + '--with-system-libgs' Build 'dvisvgm' using installed Ghostscript ('gs') headers and library (not allowed for a native TeX Live build). The default is to load the @@ -1509,20 +1512,20 @@ Node: Build System2704 Node: Prerequisites4916 Node: Building and Installing6304 Node: Source Tree13505 -Node: Top Levels15513 -Node: Autoconf Macros17108 -Node: Library Modules23420 -Node: Program Modules27678 -Node: Extending30745 -Node: Configure Options34703 -Node: Global Options36207 -Node: Program Specific Options40507 -Node: Library Specific Options46020 -Node: Variable Assignments47933 -Node: Cross Compilation50459 -Node: Configuring51498 -Node: Problems53166 -Node: Coding Rules54831 -Node: Index59237 +Node: Top Levels15515 +Node: Autoconf Macros17110 +Node: Library Modules23422 +Node: Program Modules27680 +Node: Extending30747 +Node: Configure Options34705 +Node: Global Options36209 +Node: Program Specific Options40509 +Node: Library Specific Options46085 +Node: Variable Assignments47998 +Node: Cross Compilation50524 +Node: Configuring51563 +Node: Problems53231 +Node: Coding Rules54896 +Node: Index59302 End Tag Table diff --git a/Build/source/doc/texlive.pdf b/Build/source/doc/texlive.pdf Binary files differindex 25ab8cb64a9..98c321d55d1 100644 --- a/Build/source/doc/texlive.pdf +++ b/Build/source/doc/texlive.pdf diff --git a/Build/source/libs/ChangeLog b/Build/source/libs/ChangeLog index 810f5b4c77d..f1b847d5eff 100644 --- a/Build/source/libs/ChangeLog +++ b/Build/source/libs/ChangeLog @@ -1,3 +1,7 @@ +2013-12-26 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (ACLOCAL): Ensure aclocal.m4 is up to date. + 2013-09-03 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Drop ACLOCAL_AMFLAGS. diff --git a/Build/source/libs/Makefile.am b/Build/source/libs/Makefile.am index e650eeb48fc..121854667b7 100644 --- a/Build/source/libs/Makefile.am +++ b/Build/source/libs/Makefile.am @@ -3,6 +3,9 @@ ## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## +## Ensure aclocal.m4 is up to date +ACLOCAL = @ACLOCAL@ --force + SUBDIRS = . $(MAKE_SUBDIRS) DIST_SUBDIRS = $(CONF_SUBDIRS) diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in index a579ff899dc..677c12542d0 100644 --- a/Build/source/libs/Makefile.in +++ b/Build/source/libs/Makefile.in @@ -297,7 +297,7 @@ distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ +ACLOCAL = @ACLOCAL@ --force AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ diff --git a/Build/source/libs/configure b/Build/source/libs/configure index 2bf899a5ca0..7ffa33d1947 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -774,6 +774,7 @@ with_gs enable_dvipos enable_dvipsk enable_dvisvgm +with_libgs with_system_libgs with_libgs_includes with_libgs_libdir @@ -1640,6 +1641,7 @@ Optional Packages: [texworks --position=%d "%s"] --without-mf-x-toolkit do not 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 @@ -4372,6 +4374,12 @@ test "x$enable_dvisvgm" = xno || { ## 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; diff --git a/Build/source/texk/ChangeLog b/Build/source/texk/ChangeLog index d4cb93e24ee..c18a87bfb64 100644 --- a/Build/source/texk/ChangeLog +++ b/Build/source/texk/ChangeLog @@ -1,3 +1,7 @@ +2013-12-26 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (ACLOCAL): Ensure aclocal.m4 is up to date. + 2013-09-03 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Drop ACLOCAL_AMFLAGS. diff --git a/Build/source/texk/Makefile.am b/Build/source/texk/Makefile.am index 6b691bc607d..257d95c370f 100644 --- a/Build/source/texk/Makefile.am +++ b/Build/source/texk/Makefile.am @@ -3,6 +3,9 @@ ## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## +## Ensure aclocal.m4 is up to date +ACLOCAL = @ACLOCAL@ --force + SUBDIRS = . $(MAKE_SUBDIRS) DIST_SUBDIRS = $(CONF_SUBDIRS) diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in index ecdc2fab9a1..7f03306ea70 100644 --- a/Build/source/texk/Makefile.in +++ b/Build/source/texk/Makefile.in @@ -297,7 +297,7 @@ distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ +ACLOCAL = @ACLOCAL@ --force AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ diff --git a/Build/source/texk/configure b/Build/source/texk/configure index e24598c8bea..e51f73d5f92 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -774,6 +774,7 @@ with_gs enable_dvipos enable_dvipsk enable_dvisvgm +with_libgs with_system_libgs with_libgs_includes with_libgs_libdir @@ -1655,6 +1656,7 @@ Optional Packages: [texworks --position=%d "%s"] --without-mf-x-toolkit do not 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 @@ -4387,6 +4389,12 @@ test "x$enable_dvisvgm" = xno || { ## 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; diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog index 42cab1f1520..b8d989858ee 100644 --- a/Build/source/texk/dvisvgm/ChangeLog +++ b/Build/source/texk/dvisvgm/ChangeLog @@ -1,3 +1,7 @@ +2013-12-26 Peter Breitenlohner <peb@mppmu.mpg.de> + + * ac/dvisvgm.ac, configure.ac: Add '--without-libgs'. + 2013-10-30 Peter Breitenlohner <peb@mppmu.mpg.de> * Imported release 1.5.1. diff --git a/Build/source/texk/dvisvgm/ac/dvisvgm.ac b/Build/source/texk/dvisvgm/ac/dvisvgm.ac index 3a8f958b649..2ddca5a1db7 100644 --- a/Build/source/texk/dvisvgm/ac/dvisvgm.ac +++ b/Build/source/texk/dvisvgm/ac/dvisvgm.ac @@ -1,9 +1,12 @@ ## texk/dvisvgm/ac/dvisvgm.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/ dnl -dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> dnl You may freely use, modify and/or distribute this file. dnl ## configure options for dvisvgm +AC_ARG_WITH([libgs], + AS_HELP_STRING([--without-libgs], + [build dvisvgm without PostScript support])) AC_ARG_WITH([system-libgs], AS_HELP_STRING([--with-system-libgs], [build dvisvgm with installed gs headers and library diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure index 479c1b31145..4b0ab3c4da6 100755 --- a/Build/source/texk/dvisvgm/configure +++ b/Build/source/texk/dvisvgm/configure @@ -803,6 +803,7 @@ with_gnu_ld with_sysroot enable_libtool_lock enable_largefile +with_libgs with_system_libgs with_libgs_includes with_libgs_libdir @@ -1478,6 +1479,7 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR (or the compiler's sysroot if not specified). + --without-libgs build dvisvgm without PostScript support --with-system-libgs build dvisvgm with installed gs headers and library [default: no] --with-libgs-includes=DIR @@ -13195,6 +13197,12 @@ fi ## 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; @@ -19287,7 +19295,10 @@ kpse_save_CPPFLAGS=$CPPFLAGS kpse_save_LIBS=$LIBS -if test "x$with_system_libgs" = xyes; then +if test "x$with-libgs" = xno; then : + libgs_mode=no +else + if test "x$with_system_libgs" = xyes; then libgs_mode=link case $with_libgs_includes in #( "" | yes | no) : @@ -19434,13 +19445,16 @@ fi CPPFLAGS=$kpse_save_CPPFLAGS LIBS=$kpse_save_LIBS - -$as_echo "#define DISABLE_GS 1" >>confdefs.h - LIBGS_LIBS= fi fi fi +fi +if test "x$libgs_mode" = xno; then + +$as_echo "#define DISABLE_GS 1" >>confdefs.h + +fi if test "x$libgs_mode" = xload; then diff --git a/Build/source/texk/dvisvgm/configure.ac b/Build/source/texk/dvisvgm/configure.ac index f61b91ce82e..9bb07ed41c3 100644 --- a/Build/source/texk/dvisvgm/configure.ac +++ b/Build/source/texk/dvisvgm/configure.ac @@ -51,6 +51,8 @@ KPSE_POTRACE_FLAGS KPSE_SAVE_FLAGS +AS_IF([test "x$with-libgs" = xno], [libgs_mode=no], + [dnl if test "x$with_system_libgs" = xyes; then libgs_mode=link AS_CASE([$with_libgs_includes], @@ -92,11 +94,13 @@ else if test "x$ac_cv_header_dlfcn_h:$ac_cv_func_dlopen" != xyes:yes; then libgs_mode=no KPSE_RESTORE_FLAGS - AC_DEFINE([DISABLE_GS], 1, - [Set to 1 if PostScript support should be disabled.]) LIBGS_LIBS= fi fi +fi]) +if test "x$libgs_mode" = xno; then + AC_DEFINE([DISABLE_GS], 1, + [Set to 1 if PostScript support should be disabled.]) fi AC_SUBST([LIBGS_INCLUDES]) AC_SUBST([LIBGS_LIBS]) diff --git a/Build/source/utils/ChangeLog b/Build/source/utils/ChangeLog index 21fe6dd7268..2d7b5ac2aa3 100644 --- a/Build/source/utils/ChangeLog +++ b/Build/source/utils/ChangeLog @@ -1,3 +1,7 @@ +2013-12-26 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (ACLOCAL): Ensure aclocal.m4 is up to date. + 2013-09-03 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Drop ACLOCAL_AMFLAGS. diff --git a/Build/source/utils/Makefile.am b/Build/source/utils/Makefile.am index 3f3107b14cc..fec2625c83d 100644 --- a/Build/source/utils/Makefile.am +++ b/Build/source/utils/Makefile.am @@ -3,6 +3,9 @@ ## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## +## Ensure aclocal.m4 is up to date +ACLOCAL = @ACLOCAL@ --force + SUBDIRS = . $(MAKE_SUBDIRS) DIST_SUBDIRS = $(CONF_SUBDIRS) diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in index 7c849488be2..b9667f71aee 100644 --- a/Build/source/utils/Makefile.in +++ b/Build/source/utils/Makefile.in @@ -297,7 +297,7 @@ distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print -ACLOCAL = @ACLOCAL@ +ACLOCAL = @ACLOCAL@ --force AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ diff --git a/Build/source/utils/configure b/Build/source/utils/configure index 1b23e6ae991..5c981cf046b 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -774,6 +774,7 @@ with_gs enable_dvipos enable_dvipsk enable_dvisvgm +with_libgs with_system_libgs with_libgs_includes with_libgs_libdir @@ -1635,6 +1636,7 @@ Optional Packages: [texworks --position=%d "%s"] --without-mf-x-toolkit do not 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 @@ -4367,6 +4369,12 @@ test "x$enable_dvisvgm" = xno || { ## 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; |