merge revision(s) b90e56e6243f4e6567991bfd2375e1f58b1414a0:

	mkmf: pkg_config accepts multiple options

	---
	 lib/mkmf.rb                  | 48 +++++++++++++++++++++++---------------------
	 test/mkmf/test_pkg_config.rb |  7 +++++++
	 2 files changed, 32 insertions(+), 23 deletions(-)

1 files changed, 7 insertions, 0 deletions

diff --git a/test/mkmf/test_pkg_config.rb b/test/mkmf/test_pkg_config.rb
index 42aad65cf3..1f4f48db12 100644
--- a/test/mkmf/test_pkg_config.rb
+++ b/test/mkmf/test_pkg_config.rb
@@ -57,5 +57,12 @@ class TestMkmf
       actual = pkg_config("test1", "cflags").shellsplit.sort
       assert_equal(expected, actual, MKMFLOG)
     end
+
+    def test_pkgconfig_with_multiple_options
+      pend("skipping because pkg-config is not installed") unless PKG_CONFIG
+      expected = ["-L#{@fixtures_lib_dir}", "-ltest1-public", "-ltest1-private"].sort
+      actual = pkg_config("test1", "libs", "static").shellsplit.sort
+      assert_equal(expected, actual, MKMFLOG)
+    end
   end
 end