texlive[43533] Build/source/texk/dvisvgm: always AC_SUBST
commits+karl at tug.org
commits+karl at tug.org
Fri Mar 17 23:41:17 CET 2017
Revision: 43533
http://tug.org/svn/texlive?view=revision&revision=43533
Author: karl
Date: 2017-03-17 23:41:17 +0100 (Fri, 17 Mar 2017)
Log Message:
-----------
always AC_SUBST LIBGS_INCLUDES and LIBGS_LIBS
Modified Paths:
--------------
trunk/Build/source/texk/dvisvgm/ChangeLog
trunk/Build/source/texk/dvisvgm/configure
trunk/Build/source/texk/dvisvgm/configure.ac
Modified: trunk/Build/source/texk/dvisvgm/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvisvgm/ChangeLog 2017-03-17 22:33:15 UTC (rev 43532)
+++ trunk/Build/source/texk/dvisvgm/ChangeLog 2017-03-17 22:41:17 UTC (rev 43533)
@@ -1,3 +1,8 @@
+2017-03-17 Paul Vojta <vojta at math.berkeley.edu>
+
+ * configure.ac (LIBGS_INCLUDES, LIBGS_LIBS): always AC_SUBST.
+ tlbuild mail 10 Mar 2017 19:22:07.
+
2017-02-16 Karl Berry <karl at freefriends.org>
* ac/withenable.ac: just KPSE_ENABLE_PROG.
Modified: trunk/Build/source/texk/dvisvgm/configure
===================================================================
--- trunk/Build/source/texk/dvisvgm/configure 2017-03-17 22:33:15 UTC (rev 43532)
+++ trunk/Build/source/texk/dvisvgm/configure 2017-03-17 22:41:17 UTC (rev 43533)
@@ -21807,6 +21807,8 @@
# emacs-page
+LIBGS_INCLUDES=
+LIBGS_LIBS=
if test "x$enable_native_texlive_build" = xyes; then
# TL: always dlload libgs, must avoid shared lib ref in binary.
HAVE_LIBGS=0
@@ -21869,8 +21871,6 @@
fi
if test "$HAVE_LIBGS" -eq 0; then
- LIBGS_INCLUDES=
- LIBGS_LIBS=
# Windows (native or MinGW32) has neither <dlfcn.h> nor dlopen().
if test "x$kpse_cv_have_win32" = xno; then
# FreeBSD neither has nor requires libdl.
@@ -21954,8 +21954,6 @@
LIBGS_LIBS=
fi
fi
-
-
else
# query Ghostscript version
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Ghostscript version" >&5
@@ -21994,15 +21992,18 @@
if test "$gsversion" -lt 831; then
# current Ghostscript API was introduced in version 8.31
# older versions are not supported
- LIBS=`echo $LIBS | sed "s/-lgs //" $LIBS`
$as_echo "#define DISABLE_GS 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ghostscript version < 8.31 found; PostScript support disabled" >&5
$as_echo "$as_me: WARNING: Ghostscript version < 8.31 found; PostScript support disabled" >&2;}
+ else
+ LIBGS_LIBS=-lgs
fi
fi
+
+
if test "x$enable_build" != xno || test -f config.force; then
# Checks for more libraries.
Modified: trunk/Build/source/texk/dvisvgm/configure.ac
===================================================================
--- trunk/Build/source/texk/dvisvgm/configure.ac 2017-03-17 22:33:15 UTC (rev 43532)
+++ trunk/Build/source/texk/dvisvgm/configure.ac 2017-03-17 22:41:17 UTC (rev 43533)
@@ -53,6 +53,8 @@
KPSE_SAVE_FLAGS
# emacs-page
+LIBGS_INCLUDES=
+LIBGS_LIBS=
if test "x$enable_native_texlive_build" = xyes; then
# TL: always dlload libgs, must avoid shared lib ref in binary.
HAVE_LIBGS=0
@@ -63,8 +65,6 @@
fi
if test "$HAVE_LIBGS" -eq 0; then
- LIBGS_INCLUDES=
- LIBGS_LIBS=
# Windows (native or MinGW32) has neither <dlfcn.h> nor dlopen().
if test "x$kpse_cv_have_win32" = xno; then
# FreeBSD neither has nor requires libdl.
@@ -80,8 +80,6 @@
LIBGS_LIBS=
fi
fi
- AC_SUBST([LIBGS_INCLUDES])
- AC_SUBST([LIBGS_LIBS])
else
# query Ghostscript version
AC_MSG_CHECKING([Ghostscript version])
@@ -104,11 +102,14 @@
if test "$gsversion" -lt 831; then
# current Ghostscript API was introduced in version 8.31
# older versions are not supported
- LIBS=`echo $LIBS | sed "s/-lgs //" $LIBS`
AC_DEFINE(DISABLE_GS, 1, [Set to 1 if PostScript support should be disabled])
AC_MSG_WARN([Ghostscript version < 8.31 found; PostScript support disabled])
+ else
+ LIBGS_LIBS=-lgs
fi
fi
+AC_SUBST([LIBGS_INCLUDES])
+AC_SUBST([LIBGS_LIBS])
if test "x$enable_build" != xno || test -f config.force; then
More information about the tex-live-commits
mailing list