Browse files

Iconv is needed in the FREETDS_LIBRARIES so we can search from the pa…

…ths for cross compile.
  • Loading branch information...
1 parent 5ff7311 commit df41ff564b2ba4ef379e7d81bf09674912d31058 @metaskills metaskills committed Nov 13, 2011
Showing with 2 additions and 7 deletions.
  1. +1 −3 ext/tiny_tds/extconf.rb
  2. +1 −4 tasks/ports.rake
View
4 ext/tiny_tds/extconf.rb
@@ -1,6 +1,6 @@
require 'mkmf'
-FREETDS_LIBRARIES = ['sybdb']
+FREETDS_LIBRARIES = ['iconv','sybdb']
FREETDS_HEADERS = ['sybfront.h', 'sybdb.h']
dir_config('iconv')
@@ -69,8 +69,6 @@ def have_freetds?
find_freetds_libraries_path && find_freetds_include_path
end
-have_library("iconv")
-
if enable_config("lookup", true)
unless have_freetds?
abort "-----\nCan not find FreeTDS's db-lib or include directory.\n-----"
View
5 tasks/ports.rake
@@ -12,8 +12,6 @@ namespace :ports do
# "0.82" => {:files => "http://ibiblio.org/pub/Linux/ALPHA/freetds/old/0.82/freetds-patched.tgz"},
"0.91" => {:files => "http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/freetds-0.91.tar.gz"} }
- ORIGINAL_HOST = RbConfig::CONFIG["arch"]
-
directory "ports"
$recipes = {}
@@ -40,8 +38,7 @@ namespace :ports do
recipe = $recipes[:freetds]
checkpoint = "ports/.#{recipe.name}.#{recipe.version}.#{recipe.host}.timestamp"
unless File.exist?(checkpoint)
- # recipe.configure_options << "--disable-debug"
- recipe.configure_options << '--sysconfdir="C:/Sites"' if recipe.host != ORIGINAL_HOST
+ recipe.configure_options << '--sysconfdir="C:/Sites"' if recipe.host =~ /mswin|mingw/i
recipe.configure_options << "--disable-odbc"
if ENV['TINYTDS_FREETDS_082']
recipe.configure_options << "--with-tdsver=8.0"

0 comments on commit df41ff5

Please sign in to comment.