diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-12-26 12:32:29 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-12-26 12:32:29 +0000 |
commit | c00c8298eb6913b74270a36c1f1018f1e9946f7b (patch) | |
tree | 0626d89e0bf74a988ddca1422070ecc5d529f75a /Build/source/libs | |
parent | 4b8ae4eaaafdf1d834cafb73275b51b1578f6f47 (diff) |
dvisvgm: Add configure option '--without-libgs'
git-svn-id: svn://tug.org/texlive/trunk@32488 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs')
-rw-r--r-- | Build/source/libs/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/libs/Makefile.am | 3 | ||||
-rw-r--r-- | Build/source/libs/Makefile.in | 2 | ||||
-rwxr-xr-x | Build/source/libs/configure | 8 |
4 files changed, 16 insertions, 1 deletions
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; |