icanhasaudio 0.0.2 → 0.0.3

data/History.txt

@@ -1,3 +1,7 @@
+== 0.0.3
+* 1 minor enhancement
+  * Fixed extconf to be a little more smart.
+
 == 0.0.2
 * 1 major enhancement
   * I can has ogg decoder!

data/Rakefile

@@ -2,7 +2,7 @@ require 'hoe'
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), "lib")
 
-Hoe.new('icanhasaudio', '0.0.2') do |p|
+Hoe.new('icanhasaudio', '0.0.3') do |p|
   p.rubyforge_name  = 'seattlerb'
   p.author          = 'Aaron Patterson'
   p.email           = 'aaronp@rubyforge.org'

data/ext/extconf.rb

@@ -1,10 +1,52 @@
 require 'mkmf'
 
-have_header("lame/lame.h")
-have_header("ogg/ogg.h")
-have_header("vorbis/vorbisfile.h")
-have_library("mp3lame")
-have_library("vorbis")
-have_library("vorbisfile")
+def exit_failure(msg)
+  Logging::message msg
+  message msg + "\n"
+  exit(1)
+end
+
+unless respond_to?(:find_header)
+  def find_header(header, *paths)
+    header = cpp_include(header)
+    checking_for header do
+      if try_cpp(header)
+        true
+      else
+        found = false
+        paths.each do |dir|
+          opt = "-I#{dir}".quote
+          if try_cpp(header, opt)
+            $CPPFLAGS << " " << opt
+            found = true
+            break
+          end
+        end
+        found
+      end
+    end
+  end
+end
+
+['lame/lame.h', 'ogg/ogg.h', 'vorbis/vorbisfile.h'].each do |hf|
+  unless find_header(hf,
+    '/opt/local/include',
+    '/usr/local/include',
+    '/usr/include'
+  )
+    exit_failure "Can't find #{hf}"
+  end
+end
+
+['mp3lame', 'vorbis', 'vorbisfile'].each do |library|
+  unless find_library(library, nil,
+    '/opt/local/lib',
+    '/usr/local/lib',
+    '/usr/lib'
+  )
+    exit_failure "Can't find #{library}"
+  end
+end
+
 dir_config('icanhasaudio')
 create_makefile('icanhasaudio')

data/ext/icanhasaudio.c

@@ -164,8 +164,8 @@ void Init_icanhasaudio() {
   rb_mOgg = rb_define_module_under(rb_mAudio, "OGG");
   rb_cOggDecoder = rb_define_class_under(rb_mOgg, "Decoder", rb_cObject);
 
-  /* VERSION = '0.0.2' */
-  rb_define_const(rb_cDecoder, "VERSION", rb_str_new2("0.0.2"));
+  /* VERSION = '0.0.3' */
+  rb_define_const(rb_cDecoder, "VERSION", rb_str_new2("0.0.3"));
   rb_define_singleton_method(
       rb_cDecoder,
       "lame_version",

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: icanhasaudio
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2007-07-28 00:00:00 -07:00
+  version: 0.0.3
+date: 2007-08-05 00:00:00 -07:00
 summary: icanhasaudio is a lame/vorbis wrapper for decoding ur mp3s and ur oggs.
 require_paths: 
   - lib