From 59a666a25f9c03320a5fcc5b576b86c3a87a9317 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 11 Nov 2010 12:32:15 +0000
Subject: * lib/mkmf.rb (try_func): accept variable address. *
 ext/win32ole/extconf.rb: libuuid is needed on cygwin.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29746 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/win32ole/extconf.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'ext/win32ole')

diff --git a/ext/win32ole/extconf.rb b/ext/win32ole/extconf.rb
index 893793382b..95f229b041 100644
--- a/ext/win32ole/extconf.rb
+++ b/ext/win32ole/extconf.rb
@@ -4,7 +4,13 @@
 #----------------------------------
 require 'mkmf'
 
-dir_config("win32")
+case RUBY_PLATFORM
+when /cygwin/
+  inc = nil
+  lib = '/usr/lib/w32api'
+end
+
+dir_config("win32", inc, lib)
 
 SRCFILES=<<SRC
 win32ole.c
@@ -19,7 +25,7 @@ end
 def create_win32ole_makefile
   if have_library("ole32") and
      have_library("oleaut32") and
-     have_library("uuid") and
+     have_library("uuid", "&CLSID_CMultiLanguage", "mlang.h") and
      have_library("user32") and
      have_library("kernel32") and
      have_library("advapi32") and
-- 
cgit v1.2.3