Manifest; clean; extconf.rb.

Manifest

@@ -1,155 +1,8 @@
 BENCHMARKS
 CHANGELOG
 COMPATIBILITY
-ext/build-libmemcached.sh
 ext/extconf.rb
-ext/libmemcached-src
-ext/libmemcached-src/AUTHORS
-ext/libmemcached-src/ChangeLog
-ext/libmemcached-src/clients
-ext/libmemcached-src/clients/client_options.h
-ext/libmemcached-src/clients/execute.c
-ext/libmemcached-src/clients/execute.h
-ext/libmemcached-src/clients/generator.c
-ext/libmemcached-src/clients/generator.h
-ext/libmemcached-src/clients/Makefile.am
-ext/libmemcached-src/clients/memcat.c
-ext/libmemcached-src/clients/memcp.c
-ext/libmemcached-src/clients/memerror.c
-ext/libmemcached-src/clients/memflush.c
-ext/libmemcached-src/clients/memrm.c
-ext/libmemcached-src/clients/memslap.c
-ext/libmemcached-src/clients/memstat.c
-ext/libmemcached-src/clients/utilities.c
-ext/libmemcached-src/clients/utilities.h
-ext/libmemcached-src/config
-ext/libmemcached-src/config/64bit.m4
-ext/libmemcached-src/config/bootstrap
-ext/libmemcached-src/config/byteorder.m4
-ext/libmemcached-src/config/debug.m4
-ext/libmemcached-src/config/dtrace.m4
-ext/libmemcached-src/config/pod2man.m4
-ext/libmemcached-src/config/protocol_binary.m4
-ext/libmemcached-src/configure.ac
-ext/libmemcached-src/COPYING
-ext/libmemcached-src/docs
-ext/libmemcached-src/docs/libmemcached.pod
-ext/libmemcached-src/docs/libmemcached_examples.pod
-ext/libmemcached-src/docs/Makefile.am
-ext/libmemcached-src/docs/memcached_auto.pod
-ext/libmemcached-src/docs/memcached_behavior.pod
-ext/libmemcached-src/docs/memcached_callback.pod
-ext/libmemcached-src/docs/memcached_create.pod
-ext/libmemcached-src/docs/memcached_delete.pod
-ext/libmemcached-src/docs/memcached_flush.pod
-ext/libmemcached-src/docs/memcached_get.pod
-ext/libmemcached-src/docs/memcached_quit.pod
-ext/libmemcached-src/docs/memcached_result_st.pod
-ext/libmemcached-src/docs/memcached_server_st.pod
-ext/libmemcached-src/docs/memcached_servers.pod
-ext/libmemcached-src/docs/memcached_set.pod
-ext/libmemcached-src/docs/memcached_stats.pod
-ext/libmemcached-src/docs/memcached_strerror.pod
-ext/libmemcached-src/docs/memcached_verbosity.pod
-ext/libmemcached-src/docs/memcached_version.pod
-ext/libmemcached-src/docs/memcat.pod
-ext/libmemcached-src/docs/memcp.pod
-ext/libmemcached-src/docs/memerror.pod
-ext/libmemcached-src/docs/memflush.pod
-ext/libmemcached-src/docs/memrm.pod
-ext/libmemcached-src/docs/memslap.pod
-ext/libmemcached-src/docs/memstat.pod
-ext/libmemcached-src/libmemcached
-ext/libmemcached-src/libmemcached/byteorder.c
-ext/libmemcached-src/libmemcached/common.h
-ext/libmemcached-src/libmemcached/crc.c
-ext/libmemcached-src/libmemcached/hsieh_hash.c
-ext/libmemcached-src/libmemcached/jenkins_hash.c
-ext/libmemcached-src/libmemcached/libmemcached_probes.d
-ext/libmemcached-src/libmemcached/libmemcached_probes.h
-ext/libmemcached-src/libmemcached/Makefile.am
-ext/libmemcached-src/libmemcached/md5.c
-ext/libmemcached-src/libmemcached/memcached
-ext/libmemcached-src/libmemcached/memcached/protocol_binary.h
-ext/libmemcached-src/libmemcached/memcached/README.txt
-ext/libmemcached-src/libmemcached/memcached.c
-ext/libmemcached-src/libmemcached/memcached.h
-ext/libmemcached-src/libmemcached/memcached.hh
-ext/libmemcached-src/libmemcached/memcached_auto.c
-ext/libmemcached-src/libmemcached/memcached_behavior.c
-ext/libmemcached-src/libmemcached/memcached_callback.c
-ext/libmemcached-src/libmemcached/memcached_connect.c
-ext/libmemcached-src/libmemcached/memcached_constants.h
-ext/libmemcached-src/libmemcached/memcached_delete.c
-ext/libmemcached-src/libmemcached/memcached_do.c
-ext/libmemcached-src/libmemcached/memcached_fetch.c
-ext/libmemcached-src/libmemcached/memcached_fetch_execute.c
-ext/libmemcached-src/libmemcached/memcached_flush.c
-ext/libmemcached-src/libmemcached/memcached_get.c
-ext/libmemcached-src/libmemcached/memcached_get.h
-ext/libmemcached-src/libmemcached/memcached_hash.c
-ext/libmemcached-src/libmemcached/memcached_hosts.c
-ext/libmemcached-src/libmemcached/memcached_io.c
-ext/libmemcached-src/libmemcached/memcached_io.h
-ext/libmemcached-src/libmemcached/memcached_key.c
-ext/libmemcached-src/libmemcached/memcached_parse.c
-ext/libmemcached-src/libmemcached/memcached_purge.c
-ext/libmemcached-src/libmemcached/memcached_quit.c
-ext/libmemcached-src/libmemcached/memcached_response.c
-ext/libmemcached-src/libmemcached/memcached_result.c
-ext/libmemcached-src/libmemcached/memcached_result.h
-ext/libmemcached-src/libmemcached/memcached_server.c
-ext/libmemcached-src/libmemcached/memcached_server.h
-ext/libmemcached-src/libmemcached/memcached_stats.c
-ext/libmemcached-src/libmemcached/memcached_storage.c
-ext/libmemcached-src/libmemcached/memcached_storage.h
-ext/libmemcached-src/libmemcached/memcached_strerror.c
-ext/libmemcached-src/libmemcached/memcached_string.c
-ext/libmemcached-src/libmemcached/memcached_string.h
-ext/libmemcached-src/libmemcached/memcached_types.h
-ext/libmemcached-src/libmemcached/memcached_verbosity.c
-ext/libmemcached-src/libmemcached/memcached_version.c
-ext/libmemcached-src/libmemcached/memcached_watchpoint.h
-ext/libmemcached-src/libmemcached/murmur_hash.c
-ext/libmemcached-src/Makefile.am
-ext/libmemcached-src/NEWS
-ext/libmemcached-src/README
-ext/libmemcached-src/README.FIRST
-ext/libmemcached-src/support
-ext/libmemcached-src/support/libmemcached.pc.in
-ext/libmemcached-src/support/libmemcached.spec.in
-ext/libmemcached-src/support/Makefile.am
-ext/libmemcached-src/support/set_benchmark.sh
-ext/libmemcached-src/tests
-ext/libmemcached-src/tests/atomsmasher.c
-ext/libmemcached-src/tests/function.c
-ext/libmemcached-src/tests/ketama_test_cases.h
-ext/libmemcached-src/tests/Makefile.am
-ext/libmemcached-src/tests/output.res
-ext/libmemcached-src/tests/output2.res
-ext/libmemcached-src/tests/plus.cpp
-ext/libmemcached-src/tests/r
-ext/libmemcached-src/tests/r/memcat.res
-ext/libmemcached-src/tests/r/memcp.res
-ext/libmemcached-src/tests/r/memrm.res
-ext/libmemcached-src/tests/r/memslap.res
-ext/libmemcached-src/tests/r/memstat.res
-ext/libmemcached-src/tests/server.c
-ext/libmemcached-src/tests/server.h
-ext/libmemcached-src/tests/start.c
-ext/libmemcached-src/tests/t
-ext/libmemcached-src/tests/t/memcat.test
-ext/libmemcached-src/tests/t/memcp.test
-ext/libmemcached-src/tests/t/memrm.test
-ext/libmemcached-src/tests/t/memslap.test
-ext/libmemcached-src/tests/t/memstat.test
-ext/libmemcached-src/tests/test.c
-ext/libmemcached-src/tests/test.h
-ext/libmemcached-src/tests/udp.c
-ext/libmemcached-src/THANKS
-ext/libmemcached-src/TODO
-ext/pkgconfig
-ext/pkgconfig/libmemcached.pc
+ext/libmemcached-0.31.tar.gz
 ext/rlibmemcached.i
 ext/rlibmemcached_wrap.c
 lib/memcached/behaviors.rb
@@ -160,6 +13,7 @@ lib/memcached/rails.rb
 lib/memcached.rb
 LICENSE
 Manifest
+memcached.gemspec
 Rakefile
 README
 test/profile/benchmark.rb

README

@@ -22,16 +22,9 @@ The <b>memcached</b> library wraps the pure-C libmemcached client via SWIG.
 
 == Installation
 
-You need Ruby 1.8.6, and {libmemcached 0.32}[http://tangent.org/552/libmemcached.html]. Other versions are not guaranteed to work. You also need {memcached itself}[http://www.danga.com/memcached/] if you want to test against a local server.
+You need Ruby 1.8.6. Other versions are not guaranteed to work. You also need {memcached itself}[http://www.danga.com/memcached/] if you want to test against a local server.
 
-For Linux, download and extract the {libmemcached tarball}[http://download.tangent.org/libmemcached-0.32.tar.gz]. Then run:
-  ./configure
-  make && sudo make install
-  
-For OS X, you may be able to install it from MacPorts:
-  sudo port install libmemcached @0.32
-  
-Now install the gem:
+Install the gem:
   sudo gem install memcached --no-rdoc --no-ri
   
 Note that on OS X 10.5 you may need to set the architecture explicitly: 

ext/extconf.rb

@@ -11,20 +11,19 @@ if !ENV["EXTERNAL_LIB"]
   $includes = " -I#{HERE}/include" + $includes
   $libraries = " -L#{HERE}/lib"
 
-  if !ENV["NO_REBUILD"]
-    puts "Building libmemcached."
-    Dir.chdir(HERE) do
-      puts(cmd = "tar xzf #{BUNDLE}")
-      $stdout.write `#{cmd}`    
-      Dir.chdir(BUNDLE_PATH) do
-        puts(cmd = "./configure --prefix=#{HERE}") 
-        $stdout.write `#{cmd}`      
-        puts(cmd = "make 2>&1")
-        $stdout.write `#{cmd}`
-        puts(cmd = "make install 2>&1")
-        $stdout.write `#{cmd}`
-      end
+  puts "Building libmemcached."
+  Dir.chdir(HERE) do
+    puts(cmd = "tar xzf #{BUNDLE}")
+    $stdout.write `#{cmd}`    
+    Dir.chdir(BUNDLE_PATH) do
+      puts(cmd = "./configure --prefix=#{HERE}") 
+      $stdout.write `#{cmd}`      
+      puts(cmd = "make 2>&1")
+      $stdout.write `#{cmd}`
+      puts(cmd = "make install 2>&1")
+      $stdout.write `#{cmd}`
     end
+    
     system("rm -rf #{BUNDLE_PATH}")
   end
 end
@@ -38,6 +37,7 @@ if ENV['SWIG']
 end
 
 $CFLAGS << $includes.to_s << $libraries.to_s
+$LDFLAGS << $libraries.to_s
 
 if `uname -sp` == "Darwin i386\n"
   $CFLAGS.gsub! /-arch \S+/, ''