From 15c3f6ef22d5c7e84000448b07428446894499b8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 11 Mar 2018 22:12:17 +0000 Subject: have_libgs for non-native-tl builds git-svn-id: svn://tug.org/texlive/trunk@46927 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvisvgm/ChangeLog | 5 +++++ Build/source/texk/dvisvgm/configure | 5 ++++- Build/source/texk/dvisvgm/configure.ac | 5 ++++- 3 files changed, 13 insertions(+), 2 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog index 7ef053dc171..6d8d759b6ce 100644 --- a/Build/source/texk/dvisvgm/ChangeLog +++ b/Build/source/texk/dvisvgm/ChangeLog @@ -1,3 +1,8 @@ +2018-03-11 Karl Berry + + * configure.ac (HAVE_LIBGS): find libgs for non-native-tl builds. + From Ken Moffat, tlbuild 10 Mar 2018 01:19:23. + 2018-03-01 Karl Berry * configure.ac (HAVE_LIBGS, gsversion): don't assume numeric values. diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure index c4da780b1ae..f09f39c0d54 100755 --- a/Build/source/texk/dvisvgm/configure +++ b/Build/source/texk/dvisvgm/configure @@ -21868,6 +21868,9 @@ else fi +if test "x$have_libgs" = xyes; then + HAVE_LIBGS=1 +fi if test "x$have_libgs" = "xno"; then : # Ghostscript not found, check for dlopen { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 @@ -22045,7 +22048,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$gsversion\"" >&5 $as_echo "\"$gsversion\"" >&6; } rm -f gsversion - if test -z "$gsversion" || "$gsversion" -lt 831; then + if test -z "$gsversion" || test "$gsversion" -lt 831; then # current Ghostscript API was introduced in version 8.31 # older versions are not supported diff --git a/Build/source/texk/dvisvgm/configure.ac b/Build/source/texk/dvisvgm/configure.ac index 835da7b8362..1f73c8c77f4 100644 --- a/Build/source/texk/dvisvgm/configure.ac +++ b/Build/source/texk/dvisvgm/configure.ac @@ -63,6 +63,9 @@ have_libgs=yes AC_CHECK_HEADER([ghostscript/iapi.h], [AC_CHECK_LIB(gs, gsapi_revision,, [have_libgs=no])], [have_libgs=no]) +if test "x$have_libgs" = xyes; then + HAVE_LIBGS=1 +fi AS_IF([test "x$have_libgs" = "xno"], # Ghostscript not found, check for dlopen [AC_CHECK_LIB(dl, dlopen,, @@ -106,7 +109,7 @@ else [gsversion=`cat gsversion`], [gsversion=], [gsversion=unknown]) AC_MSG_RESULT("$gsversion") rm -f gsversion - if test -z "$gsversion" || "$gsversion" -lt 831; then + if test -z "$gsversion" || test "$gsversion" -lt 831; then # current Ghostscript API was introduced in version 8.31 # older versions are not supported AC_DEFINE(DISABLE_GS, 1, [Set to 1 if PostScript support should be disabled]) -- cgit v1.2.3