Merge

lib/linux/iptables.rb

@@ -1,6 +1,12 @@
 require 'socket'
 require 'linux/constants'
-require 'ffi'
+
+begin
+  require 'ffi'
+rescue LoadError
+  require('rubygems') ? retry : raise
+end
+
 
 # Good things about FFI::Struct:
 # - robust pre-existing code

lib/linux/sendmsg.rb

@@ -1,8 +1,13 @@
 # Patchup to add Socket#sendmsg and Socket#recvmsg for ruby 1.8
 
 if BasicSocket.instance_methods.grep(/^sendmsg$/).empty?
-  require 'ffi'
+  begin
+    require 'ffi'
+  rescue LoadError
+    require('rubygems') ? retry : raise
+  end
 
+    
   class BasicSocket
     module FFIExt
       extend FFI::Library