diff options
| author | Karl Berry <karl@freefriends.org> | 2018-03-02 03:40:00 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2018-03-02 03:40:00 +0000 |
| commit | b3cc7572f083686619117ddce21714007f1cc779 (patch) | |
| tree | a03baea571388045cc8b51c786a4181d263749b5 | |
| parent | 50c38b39dc3527d9de3e94558a5038ad151e1ffc (diff) | |
ensure numeric values for numeric tests
git-svn-id: svn://tug.org/texlive/trunk@46783 c570f23f-e606-0410-a88d-b1316a301751
| -rw-r--r-- | Build/source/texk/dvisvgm/ChangeLog | 5 | ||||
| -rwxr-xr-x | Build/source/texk/dvisvgm/configure | 6 | ||||
| -rw-r--r-- | Build/source/texk/dvisvgm/configure.ac | 5 |
3 files changed, 12 insertions, 4 deletions
diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog index 0b08631751a..7ef053dc171 100644 --- a/Build/source/texk/dvisvgm/ChangeLog +++ b/Build/source/texk/dvisvgm/ChangeLog @@ -1,3 +1,8 @@ +2018-03-01 Karl Berry <karl@freefriends.org> + + * configure.ac (HAVE_LIBGS, gsversion): don't assume numeric values. + Report from Mojca, tlbuild 1 Mar 2018 00:51:37. + 2018-02-21 Akira Kakuto <kakuto@fuk.kindai.ac.jp> * Import 2.3.3. diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure index b8591a6429d..c4da780b1ae 100755 --- a/Build/source/texk/dvisvgm/configure +++ b/Build/source/texk/dvisvgm/configure @@ -21924,7 +21924,9 @@ fi fi fi -if test "$HAVE_LIBGS" -eq 0; then +if test -z "$HAVE_LIBGS" || test "$HAVE_LIBGS" -eq 0; then + { $as_echo "$as_me:${as_lineno-$LINENO}: not linking to libgs, trying to arrange for dynamic loading" >&5 +$as_echo "$as_me: not linking to libgs, trying to arrange for dynamic loading" >&6;} # 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. @@ -22043,7 +22045,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$gsversion\"" >&5 $as_echo "\"$gsversion\"" >&6; } rm -f gsversion - if test "$gsversion" -lt 831; then + if test -z "$gsversion" || "$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 ae3bd9b1ce8..835da7b8362 100644 --- a/Build/source/texk/dvisvgm/configure.ac +++ b/Build/source/texk/dvisvgm/configure.ac @@ -70,7 +70,8 @@ AS_IF([test "x$have_libgs" = "xno"], [AC_MSG_WARN(PostScript support disabled)])]) fi -if test "$HAVE_LIBGS" -eq 0; then +if test -z "$HAVE_LIBGS" || test "$HAVE_LIBGS" -eq 0; then + AC_MSG_NOTICE([not linking to libgs, trying to arrange for dynamic loading]) # 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. @@ -105,7 +106,7 @@ else [gsversion=`cat gsversion`], [gsversion=], [gsversion=unknown]) AC_MSG_RESULT("$gsversion") rm -f gsversion - if test "$gsversion" -lt 831; then + if test -z "$gsversion" || "$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]) |