Vendor libmysql.dll by default on Windows. Use rpath only on Unix platforms.

Author: sodabrew

ext/mysql2/extconf.rb

@@ -94,43 +94,14 @@ def asplode lib
   $CFLAGS << gcc_flags
 end
 
-case explicit_rpath = with_config('mysql-rpath')
-when true
-  abort "-----\nOption --with-mysql-rpath must have an argument\n-----"
-when false
-  warn "-----\nOption --with-mysql-rpath has been disabled at your request\n-----"
-when String
-  # The user gave us a value so use it
-  rpath_flags = " -Wl,-rpath,#{explicit_rpath}"
-  warn "-----\nSetting mysql rpath to #{explicit_rpath}\n-----"
-  $LDFLAGS << rpath_flags
-else
-  if libdir = rpath_dir[%r{(-L)?(/[^ ]+)}, 2]
-    rpath_flags = " -Wl,-rpath,#{libdir}"
-    if RbConfig::CONFIG["RPATHFLAG"].to_s.empty? && try_link('int main() {return 0;}', rpath_flags)
-      # Usually Ruby sets RPATHFLAG the right way for each system, but not on OS X.
-      warn "-----\nSetting rpath to #{libdir}\n-----"
-      $LDFLAGS << rpath_flags
-    else
-      if RbConfig::CONFIG["RPATHFLAG"].to_s.empty?
-        # If we got here because try_link failed, warn the user
-        warn "-----\nDon't know how to set rpath on your system, if MySQL libraries are not in path mysql2 may not load\n-----"
-      end
-      # Make sure that LIBPATH gets set if we didn't explicitly set the rpath.
-      warn "-----\nSetting libpath to #{libdir}\n-----"
-      $LIBPATH << libdir unless $LIBPATH.include?(libdir)
-    end
-  end
-end
-
 if RUBY_PLATFORM =~ /mswin|mingw/
   # Build libmysql.a interface link library
   require 'rake'
 
   # Build libmysql.a interface link library
   # Use rake to rebuild only if these files change
   deffile = File.expand_path('../../../support/libmysql.def', __FILE__)
-  libfile = File.expand_path(File.join(libdir, 'libmysql.lib'))
+  libfile = File.expand_path(File.join(rpath_dir, 'libmysql.lib'))
   file 'libmysql.a' => [deffile, libfile] do |t|
     when_writing 'building libmysql.a' do
       sh 'dlltool', '--kill-at',
@@ -149,7 +120,7 @@ def asplode lib
 
   # Vendor libmysql.dll
   vendordll = File.expand_path('../../../vendor/libmysql.dll', __FILE__)
-  dllfile = File.expand_path(File.join(libdir, 'libmysql.dll'))
+  dllfile = File.expand_path(File.join(rpath_dir, 'libmysql.dll'))
   file vendordll => dllfile do |t|
     when_writing 'copying libmysql.dll' do
       cp dllfile, vendordll
@@ -164,6 +135,35 @@ def asplode lib
     # Let's do it!
     Rake::Task[vendordll].invoke
   end
+else
+  case explicit_rpath = with_config('mysql-rpath')
+  when true
+    abort "-----\nOption --with-mysql-rpath must have an argument\n-----"
+  when false
+    warn "-----\nOption --with-mysql-rpath has been disabled at your request\n-----"
+  when String
+    # The user gave us a value so use it
+    rpath_flags = " -Wl,-rpath,#{explicit_rpath}"
+    warn "-----\nSetting mysql rpath to #{explicit_rpath}\n-----"
+    $LDFLAGS << rpath_flags
+  else
+    if libdir = rpath_dir[%r{(-L)?(/[^ ]+)}, 2]
+      rpath_flags = " -Wl,-rpath,#{libdir}"
+      if RbConfig::CONFIG["RPATHFLAG"].to_s.empty? && try_link('int main() {return 0;}', rpath_flags)
+        # Usually Ruby sets RPATHFLAG the right way for each system, but not on OS X.
+        warn "-----\nSetting rpath to #{libdir}\n-----"
+        $LDFLAGS << rpath_flags
+      else
+        if RbConfig::CONFIG["RPATHFLAG"].to_s.empty?
+          # If we got here because try_link failed, warn the user
+          warn "-----\nDon't know how to set rpath on your system, if MySQL libraries are not in path mysql2 may not load\n-----"
+        end
+        # Make sure that LIBPATH gets set if we didn't explicitly set the rpath.
+        warn "-----\nSetting libpath to #{libdir}\n-----"
+        $LIBPATH << libdir unless $LIBPATH.include?(libdir)
+      end
+    end
+  end
 end
 
 create_makefile('mysql2/mysql2')