]> granicus.if.org Git - graphviz/commitdiff
Merge https://gitlab.com/graphviz/graphviz/merge_requests/1313
authorStephen C North <scnorth@gmail.com>
Fri, 24 May 2019 03:30:48 +0000 (23:30 -0400)
committerStephen C North <scnorth@gmail.com>
Fri, 24 May 2019 03:30:48 +0000 (23:30 -0400)
Replaced hardcoded ruby-1.9 version with RUBY_VER variable
by Christian Vögl1
For some reason the gitlab pipeline failed and I don't know how
to re-try it.

configure.ac

index 6f743e9d23e072301bd94f58b3fb865fee804f0e..7732f87de4ba5eb46304b056ed842cf35cffbaab 100644 (file)
@@ -116,6 +116,7 @@ AC_SUBST([GRAPHVIZ_VERSION_REVISION])
 
 AC_ARG_VAR(LIBPOSTFIX, [subscript to lib, e.g. "/64" for "/usr/lib/64" on Solaris])
 AC_ARG_VAR(INTGOSIZE, [integer size for go, 32 or 64])
+AC_ARG_VAR(RUBY_VER, [version number of the ruby package])
 
 INTGOSIZE=32
 if test -z "$LIBPOSTFIX"; then
@@ -1397,7 +1398,7 @@ else
           RUBY_INSTALL_DIR="`$RUBY $srcdir/config/config_ruby.rb vendorarchdir`"
        fi
       ],[
-        PKG_CHECK_MODULES([RUBY], [ruby-1.9],[
+        PKG_CHECK_MODULES([RUBY], [ruby-${RUBY_VER}],[
          AC_CHECK_PROG(RUBY,ruby,ruby)
           if test "x$RUBY" = "x"; then
             use_ruby="No (ruby not available)"