ruby-changes:23554
From: nobu <ko1@a...>
Date: Wed, 9 May 2012 16:36:14 +0900 (JST)
Subject: [ruby-changes:23554] nobu:r35605 (trunk): lib/mkmf.rb: check pkg-config result
nobu 2012-05-09 16:36:03 +0900 (Wed, 09 May 2012) New Revision: 35605 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35605 Log: lib/mkmf.rb: check pkg-config result * lib/mkmf.rb (MakeMakefile#pkg_config): check if libs resulted from pkg-config works actually. Modified files: trunk/ChangeLog trunk/lib/mkmf.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 35604) +++ ChangeLog (revision 35605) @@ -1,3 +1,8 @@ +Wed May 9 16:36:01 2012 Nobuyoshi Nakada <nobu@r...> + + * lib/mkmf.rb (MakeMakefile#pkg_config): check if libs resulted from + pkg-config works actually. + Wed May 9 16:01:38 2012 Shugo Maeda <shugo@r...> * lib/net/imap.rb (decode_utf7, encode_utf7): refactored by Index: lib/mkmf.rb =================================================================== --- lib/mkmf.rb (revision 35604) +++ lib/mkmf.rb (revision 35605) @@ -1655,9 +1655,8 @@ # default to package specific config command, as a last resort. get = proc {|opt| `#{pkgconfig} --#{opt}`.chomp} end - if get + if get and try_ldflags(ldflags = get['libs']) cflags = get['cflags'] - ldflags = get['libs'] libs = get['libs-only-l'] ldflags = (Shellwords.shellwords(ldflags) - Shellwords.shellwords(libs)).quote.join(" ") $CFLAGS += " " << cflags -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/