ruby: add detection of Ruby 2.1
This commit is contained in:
parent
6981a17bbb
commit
7f54a1adc1
@ -84,6 +84,7 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
|
||||
* relay: fix freeze after /upgrade when many disconnected clients still exist
|
||||
* relay: fix NULL pointer when reading buffer lines for irc backlog
|
||||
* rmodifier: remove plugin (replaced by trigger)
|
||||
* ruby: add detection of Ruby 2.1
|
||||
* script: fix scroll on script buffer in the detailed view of script
|
||||
(closes #6)
|
||||
* scripts: fix crash when a signal is received with type "int" and NULL pointer
|
||||
|
@ -33,7 +33,7 @@ ENDIF(RUBY_FOUND)
|
||||
|
||||
FIND_PACKAGE(PkgConfig)
|
||||
IF(PKG_CONFIG_FOUND)
|
||||
pkg_search_module(RUBY ruby-2.0 ruby-1.9 ruby-1.8)
|
||||
pkg_search_module(RUBY ruby-2.1 ruby-2.0 ruby-1.9 ruby-1.8)
|
||||
ENDIF(PKG_CONFIG_FOUND)
|
||||
|
||||
IF(RUBY_FOUND)
|
||||
|
@ -561,7 +561,7 @@ RUBY_VERSION=
|
||||
if test "x$enable_ruby" = "xyes" ; then
|
||||
RUBY_CFLAGS=""
|
||||
RUBY_LFLAGS=""
|
||||
for v in "2.0" "1.9" "1.8" ; do
|
||||
for v in "2.1" "2.0" "1.9" "1.8" ; do
|
||||
pkgconfig_ruby_found=`$PKGCONFIG --exists ruby-$v 2>/dev/null`
|
||||
if test "x$?" = "x0" ; then
|
||||
RUBY_VERSION=`$PKGCONFIG --modversion ruby-$v`
|
||||
|
Loading…
x
Reference in New Issue
Block a user