From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sun, 15 May 2011 18:47:41 +0400
Subject: [PATCH] Don't use bundled libraries

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

diff --git a/configure.ac b/configure.ac
index 967e3b1..7a84f4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,6 @@ AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_HEADERS([src/snappy/google-snappy/config.h])
 
 AM_INIT_AUTOMAKE([1.6.3 foreign tar-ustar])
 
@@ -750,12 +749,7 @@ AC_CONFIG_FILES([src/couchjs-node/Makefile])
 AC_CONFIG_FILES([src/couchdb/couch.app.tpl])
 AC_CONFIG_FILES([src/couchdb/Makefile])
 AC_CONFIG_FILES([src/couchdb/priv/Makefile])
-AC_CONFIG_FILES([src/erlang-oauth/Makefile])
 AC_CONFIG_FILES([src/etap/Makefile])
-AC_CONFIG_FILES([src/ibrowse/Makefile])
-AC_CONFIG_FILES([src/mochiweb/Makefile])
-AC_CONFIG_FILES([src/snappy/Makefile])
-AC_CONFIG_FILES([src/snappy/google-snappy/snappy-stubs-public.h])
 AC_CONFIG_FILES([src/ejson/Makefile])
 AC_CONFIG_FILES([test/Makefile])
 AC_CONFIG_FILES([test/bench/Makefile])
diff --git a/src/Makefile.am b/src/Makefile.am
index a17674c..dde8b52 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,11 +18,7 @@ SUBDIRS = \
     couch_replicator \
     couchdb \
     ejson \
-    erlang-oauth \
     etap \
-    ibrowse \
-    mochiweb \
-    snappy \
     couchjs-node
 
 EXTRA_DIST = \
diff --git a/src/ejson/Makefile.am b/src/ejson/Makefile.am
index 60dacc2..2d4e539 100644
--- a/src/ejson/Makefile.am
+++ b/src/ejson/Makefile.am
@@ -46,15 +46,11 @@ EJSON_C_HDRS = \
 
 ejson_file_collection = \
     ejson.app.in \
-    ejson.erl \
-    mochijson2.erl \
-    mochinum.erl
+    ejson.erl
 
 ejsonebin_make_generated_file_list = \
     ejson.app \
-    ejson.beam \
-    mochijson2.beam \
-    mochinum.beam
+    ejson.beam
 
 EXTRA_DIST = \
 	$(EJSON_C_HDRS) \
diff --git a/test/etap/test_util.erl.in b/test/etap/test_util.erl.in
index 352714e..c0292a7 100644
--- a/test/etap/test_util.erl.in
+++ b/test/etap/test_util.erl.in
@@ -25,13 +25,9 @@ builddir() ->
 
 init_code_path() ->
     Paths = [
-        "etap",
+	"etap",
         "couchdb",
-        "ejson",
-        "erlang-oauth",
-        "ibrowse",
-        "mochiweb",
-        "snappy"
+        "ejson"
     ],
     lists:foreach(fun(Name) ->
         code:add_patha(filename:join([builddir(), "src", Name]))