uses the extconf.rb from curb, that uses curl-config to know the righ…

…t curl installation that should be used

ext/typhoeus/extconf.rb

@@ -1,65 +1,176 @@
-ENV['RC_ARCHS'] = '' if RUBY_PLATFORM =~ /darwin/
+require 'mkmf'
 
-# :stopdoc:
+dir_config('curl')
 
-require 'mkmf'
+if find_executable('curl-config')
+  $CFLAGS << " #{`curl-config --cflags`.strip} -g"
+  if ENV['STATIC_BUILD']
+    $LIBS << " #{`curl-config --static-libs`.strip}"
+  else
+    $LIBS << " #{`curl-config --libs`.strip}"
+  end
+  ca_bundle_path=`curl-config --ca`.strip
+  if !ca_bundle_path.nil? and ca_bundle_path != ''
+    $defs.push( %{-D HAVE_CURL_CONFIG_CA} )
+    $defs.push( %{-D CURL_CONFIG_CA='#{ca_bundle_path.inspect}'} )
+  end
+elsif !have_library('curl') or !have_header('curl/curl.h')
+  fail <<-EOM
+  Can't find libcurl or curl/curl.h
 
-ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
-specified_curl = ARGV[0] =~ /^--with-curl/ ? ARGV[0].split("=")[1] : nil
-LIBDIR = specified_curl ? "#{specified_curl}/lib": Config::CONFIG['libdir']
-INCLUDEDIR = specified_curl ? "#{specified_curl}/include" : Config::CONFIG['includedir']
+  Try passing --with-curl-dir or --with-curl-lib and --with-curl-include
+  options to extconf.
+  EOM
+end
 
-if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'macruby'
-  $LIBRUBYARG_STATIC.gsub!(/-static/, '')
+# Check arch flags
+# TODO: detect mismatched arch types when libcurl mac ports is mixed with native mac ruby or vice versa
+#archs = $CFLAGS.scan(/-arch\s(.*?)\s/).first # get the first arch flag
+#if archs and archs.size >= 1
+#  # need to reduce the number of archs...
+#  # guess the first one is correct... at least the first one is probably the ruby installed arch...
+#  # this could lead to compiled binaries that crash at runtime...
+#  $CFLAGS.gsub!(/-arch\s(.*?)\s/,' ')
+#  $CFLAGS << " -arch #{archs.first}"
+#  puts "Selected arch: #{archs.first}"
+#end
+
+def define(s)
+  $defs.push( format("-D HAVE_%s", s.to_s.upcase) )
 end
 
-$CFLAGS << " #{ENV["CFLAGS"]}"
-if Config::CONFIG['target_os'] == 'mingw32'
-  $CFLAGS << " -DXP_WIN -DXP_WIN32 -DUSE_INCLUDED_VASPRINTF"
-elsif Config::CONFIG['target_os'] == 'solaris2'
-  $CFLAGS << " -DUSE_INCLUDED_VASPRINTF"
-else
-  $CFLAGS << " -g -DXP_UNIX"
+def have_constant(name)
+  checking_for name do
+    src = %{
+      #include <curl/curl.h>
+      int main() {
+        int test = (int)#{name.upcase};
+        return 0;
+      }
+    }
+    if try_compile(src,"#{$CFLAGS} #{$LIBS}")
+      define name
+      true
+    else
+      false
+    end
+  end
 end
 
-use_macports = !(defined?(RUBY_ENGINE) && RUBY_ENGINE != 'ruby')
-$LIBPATH << "/opt/local/lib" if use_macports
+have_constant "curlinfo_redirect_time"
+have_constant "curlinfo_response_code"
+have_constant "curlinfo_filetime"
+have_constant "curlinfo_redirect_count"
+have_constant "curlinfo_os_errno"
+have_constant "curlinfo_num_connects"
+have_constant "curlinfo_ftp_entry_path"
+have_constant "curl_version_ssl"
+have_constant "curl_version_libz"
+have_constant "curl_version_ntlm"
+have_constant "curl_version_gssnegotiate"
+have_constant "curl_version_debug"
+have_constant "curl_version_asynchdns"
+have_constant "curl_version_spnego"
+have_constant "curl_version_largefile"
+have_constant "curl_version_idn"
+have_constant "curl_version_sspi"
+have_constant "curl_version_conv"
+have_constant "curlproxy_http"
+have_constant "curlproxy_socks4"
+have_constant "curlproxy_socks5"
+have_constant "curlauth_basic"
+have_constant "curlauth_digest"
+have_constant "curlauth_gssnegotiate"
+have_constant "curlauth_ntlm"
+have_constant "curlauth_anysafe"
+have_constant "curlauth_any"
+have_constant "curle_tftp_notfound"
+have_constant "curle_tftp_perm"
+have_constant "curle_tftp_diskfull"
+have_constant "curle_tftp_illegal"
+have_constant "curle_tftp_unknownid"
+have_constant "curle_tftp_exists"
+have_constant "curle_tftp_nosuchuser"
+# older versions of libcurl 7.12
+have_constant "curle_send_fail_rewind"
+have_constant "curle_ssl_engine_initfailed"
+have_constant "curle_login_denied"
 
-$CFLAGS << " -O3 -Wall -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline"
+# older than 7.16.3
+have_constant "curlmopt_maxconnects"
 
-if Config::CONFIG['target_os'] == 'mingw32'
-  header = File.join(ROOT, 'cross', 'curl-7.19.4.win32', 'include')
-  unless find_header('curl/curl.h', header)
-    abort "need libcurl"
-  end
-else
-  HEADER_DIRS = [
-    File.join(INCLUDEDIR, "curl"),
-    INCLUDEDIR,
-    '/usr/include/curl',
-    '/usr/local/include/curl'
-  ]
-
-  [
-    '/opt/local/include/curl',
-    '/opt/local/include',
-  ].each { |x| HEADER_DIRS.unshift(x) } if use_macports
-
-  unless find_header('curl/curl.h', *HEADER_DIRS)
-    abort "need libcurl"
-  end
+# additional consts
+have_constant "curle_conv_failed"
+have_constant "curle_conv_reqd"
+have_constant "curle_ssl_cacert_badfile"
+have_constant "curle_remote_file_not_found"
+have_constant "curle_ssh"
+have_constant "curle_ssl_shutdown_failed"
+have_constant "curle_again"
+have_constant "curle_ssl_crl_badfile"
+have_constant "curle_ssl_issuer_error"
+
+# username/password added in 7.19.1
+have_constant "curlopt_username"
+have_constant "curlopt_password"
+have_constant "curlinfo_primary_ip"
+
+# ie quirk added in 7.19.3
+have_constant "curlauth_digest_ie"
+
+# added in 7.15.1
+have_constant "curlftpmethod_multicwd"
+have_constant "curlftpmethod_nocwd"
+have_constant "curlftpmethod_singlecwd"
+
+# centos 4.5 build of libcurl
+have_constant "curlm_bad_socket"
+have_constant "curlm_unknown_option"
+have_func("curl_multi_timeout")
+have_func("curl_multi_fdset")
+have_func("curl_multi_perform")
+
+if try_compile('int main() { return 0; }','-Wall')
+  $CFLAGS << ' -Wall'
 end
 
-if Config::CONFIG['target_os'] == 'mingw32'
-  find_library('curl', 'curl_easy_init',
-               File.join(ROOT, 'cross', 'curl-7.19.4.win32', 'bin'))
-else
-  find_library('curl', 'curl_easy_init',
-               LIBDIR,
-               '/opt/local/lib',
-               '/usr/local/lib',
-               '/usr/lib'
-    )
+# do some checking to detect ruby 1.8 hash.c vs ruby 1.9 hash.c
+def test_for(name, const, src)
+  checking_for name do
+    if try_compile(src,"#{$CFLAGS} #{$LIBS}")
+      define const
+      true
+    else
+      false
+    end
+  end
 end
+test_for("Ruby 1.9 Hash", "RUBY19_HASH", %{
+  #include <ruby.h>
+  int main() {
+    VALUE hash = rb_hash_new();
+    if( RHASH(hash)->ntbl->num_entries ) {
+      return 0;
+    }
+    return 1;
+  }
+})
+test_for("Ruby 1.9 st.h", "RUBY19_ST_H", %{
+  #include <ruby.h>
+  #include <ruby/st.h>
+  int main() {
+    return 0;
+  }
+})
+
+test_for("curl_easy_escape", "CURL_EASY_ESCAPE", %{
+  #include <curl/curl.h>
+  int main() {
+    CURL *easy = curl_easy_init();
+    curl_easy_escape(easy,"hello",5);
+    return 0;
+  }
+})
+
+create_makefile("typhoeus/native")
 
-create_makefile("typhoeus/native")