blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core: add detection of Ruby 2.5 in autotools (issue #1122)

Browse Source
This commit is contained in:
Sébastien Helleu 2017-12-26 21:55:53 +01:00
parent e1e549b37e
commit 4a44244422
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -611,7 +611,7 @@ RUBY_VERSION=
if test "x$enable_ruby" = "xyes" ; then if test "x$enable_ruby" = "xyes" ; then
RUBY_CFLAGS="" RUBY_CFLAGS=""
RUBY_LFLAGS="" RUBY_LFLAGS=""
for v in "2.3" "2.2" "2.1" "2.0" "1.9" "1.8" ; do for v in "2.5" "2.4" "2.3" "2.2" "2.1" "2.0" "1.9" "1.8" ; do
pkgconfig_ruby_found=`$PKGCONFIG --exists ruby-$v 2>/dev/null` pkgconfig_ruby_found=`$PKGCONFIG --exists ruby-$v 2>/dev/null`
if test "x$?" = "x0" ; then if test "x$?" = "x0" ; then
RUBY_VERSION=`$PKGCONFIG --modversion ruby-$v` RUBY_VERSION=`$PKGCONFIG --modversion ruby-$v`
@ -621,6 +621,7 @@ if test "x$enable_ruby" = "xyes" ; then
fi fi
done done
# detect old Ruby versions
if test "x$RUBY_CFLAGS" = "x" -o "x$RUBY_LFLAGS" = "x" ; then if test "x$RUBY_CFLAGS" = "x" -o "x$RUBY_LFLAGS" = "x" ; then
AC_PATH_PROGS(RUBY, ruby1.9.3 ruby1.9.2 ruby1.9.1 ruby1.9 ruby1.8 ruby) AC_PATH_PROGS(RUBY, ruby1.9.3 ruby1.9.2 ruby1.9.1 ruby1.9 ruby1.8 ruby)
if test -z $RUBY ; then if test -z $RUBY ; then