From 7f54a1adc14f46ae0cffb899d88df7a35ef89eb6 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Sun, 16 Mar 2014 11:26:47 +0100 Subject: [PATCH] ruby: add detection of Ruby 2.1 --- ChangeLog.asciidoc | 1 + cmake/FindRuby.cmake | 2 +- configure.ac | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc index 75a90952f..e2227873a 100644 --- a/ChangeLog.asciidoc +++ b/ChangeLog.asciidoc @@ -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 diff --git a/cmake/FindRuby.cmake b/cmake/FindRuby.cmake index 7f79bfed4..6672468f3 100644 --- a/cmake/FindRuby.cmake +++ b/cmake/FindRuby.cmake @@ -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) diff --git a/configure.ac b/configure.ac index 414e82052..e94f7332a 100644 --- a/configure.ac +++ b/configure.ac @@ -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`