summaryrefslogtreecommitdiff
path: root/Build/source/utils
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-12-26 12:32:29 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-12-26 12:32:29 +0000
commitc00c8298eb6913b74270a36c1f1018f1e9946f7b (patch)
tree0626d89e0bf74a988ddca1422070ecc5d529f75a /Build/source/utils
parent4b8ae4eaaafdf1d834cafb73275b51b1578f6f47 (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/utils')
-rw-r--r--Build/source/utils/ChangeLog4
-rw-r--r--Build/source/utils/Makefile.am3
-rw-r--r--Build/source/utils/Makefile.in2
-rwxr-xr-xBuild/source/utils/configure8
4 files changed, 16 insertions, 1 deletions
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;