summaryrefslogtreecommitdiff
path: root/Build/source/texk
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/texk
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/texk')
-rw-r--r--Build/source/texk/ChangeLog4
-rw-r--r--Build/source/texk/Makefile.am3
-rw-r--r--Build/source/texk/Makefile.in2
-rwxr-xr-xBuild/source/texk/configure8
-rw-r--r--Build/source/texk/dvisvgm/ChangeLog4
-rw-r--r--Build/source/texk/dvisvgm/ac/dvisvgm.ac5
-rwxr-xr-xBuild/source/texk/dvisvgm/configure22
-rw-r--r--Build/source/texk/dvisvgm/configure.ac8
8 files changed, 48 insertions, 8 deletions
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])