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 6a0263d9a..777ffc0de 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])
 
@@ -755,12 +754,6 @@ 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/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/couchdb/run])
 AC_CONFIG_FILES([test/couchdb/Makefile])
diff --git a/src/Makefile.am b/src/Makefile.am
index 29b11ae0c..5701a6ece 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,11 +17,6 @@ SUBDIRS = \
     couch_plugins \
     couch_replicator \
     couchdb \
-    ejson \
-    erlang-oauth \
-    ibrowse \
-    mochiweb \
-    snappy \
     couchjs-node
 
 EXTRA_DIST = \