diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | etc/couchdb/default.ini.tpl.in | 2 | ||||
| -rw-r--r-- | license.skip | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 1 |
4 files changed, 7 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index bfed4562c..ca1f4c532 100644 --- a/configure.ac +++ b/configure.ac @@ -503,6 +503,7 @@ AC_CONFIG_FILES([etc/windows/Makefile]) AC_CONFIG_FILES([etc/Makefile]) AC_CONFIG_FILES([share/Makefile]) AC_CONFIG_FILES([src/Makefile]) +AC_CONFIG_FILES([src/couch_index/Makefile]) AC_CONFIG_FILES([src/couchdb/couch.app.tpl]) AC_CONFIG_FILES([src/couchdb/Makefile]) AC_CONFIG_FILES([src/couchdb/priv/Makefile]) diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in index da2883266..fd5131ef8 100644 --- a/etc/couchdb/default.ini.tpl.in +++ b/etc/couchdb/default.ini.tpl.in @@ -5,6 +5,7 @@ [couchdb] database_dir = %localstatelibdir% view_index_dir = %localstatelibdir% +index_dir = %localstatelibdir% util_driver_dir = %couchprivlibdir% max_document_size = 4294967296 ; 4 GB os_process_timeout = 5000 ; 5 seconds. for view and external servers. @@ -72,6 +73,7 @@ os_process_limit = 25 [daemons] view_manager={couch_view, start_link, []} +index_server={couch_index_server, start_link, []} external_manager={couch_external_manager, start_link, []} query_servers={couch_query_servers, start_link, []} vhosts={couch_httpd_vhost, start_link, []} diff --git a/license.skip b/license.skip index 8b401fdfe..6e90843cb 100644 --- a/license.skip +++ b/license.skip @@ -70,6 +70,9 @@ ^share/www/style/jquery-ui-1.8.11.custom.css ^src/Makefile ^src/Makefile.in +^src/couch_index/Makefile +^src/couch_index/Makefile.in +^src/couch_index/ebin/.*beam ^src/couchdb/.*beam ^src/couchdb/.deps/* ^src/couchdb/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index a6fbb910a..f2eec4298 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,6 +11,7 @@ ## the License. SUBDIRS = \ + couch_index \ couchdb \ ejson \ erlang-oauth \ |