diff options
| -rw-r--r-- | Build/source/texk/dvisvgm/ChangeLog | 5 | ||||
| -rwxr-xr-x | Build/source/texk/dvisvgm/configure | 11 | ||||
| -rw-r--r-- | Build/source/texk/dvisvgm/configure.ac | 11 |
3 files changed, 17 insertions, 10 deletions
diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog index f761ec91859..e3ed4086e21 100644 --- a/Build/source/texk/dvisvgm/ChangeLog +++ b/Build/source/texk/dvisvgm/ChangeLog @@ -1,3 +1,8 @@ +2017-03-17 Paul Vojta <vojta@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@freefriends.org> * ac/withenable.ac: just KPSE_ENABLE_PROG. diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure index 420443cbee9..713d99dfa32 100755 --- a/Build/source/texk/dvisvgm/configure +++ b/Build/source/texk/dvisvgm/configure @@ -21807,6 +21807,8 @@ kpse_save_LIBS=$LIBS # 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 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 @@ $as_echo "#define DISABLE_GS 1" >>confdefs.h LIBGS_LIBS= fi fi - - else # query Ghostscript version { $as_echo "$as_me:${as_lineno-$LINENO}: checking Ghostscript version" >&5 @@ -21994,15 +21992,18 @@ $as_echo "\"$gsversion\"" >&6; } 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. diff --git a/Build/source/texk/dvisvgm/configure.ac b/Build/source/texk/dvisvgm/configure.ac index a45c8358973..1d3d786d021 100644 --- a/Build/source/texk/dvisvgm/configure.ac +++ b/Build/source/texk/dvisvgm/configure.ac @@ -53,6 +53,8 @@ KPSE_ZLIB_FLAGS 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 @@ AC_CHECK_HEADER([ghostscript/iapi.h], 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 @@ if test "$HAVE_LIBGS" -eq 0; then 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 @@ else 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 |