← Back to branch summary

~ubuntu-branches/ubuntu/lucid/couchdb/lucid

« back to all changes in this revision

Viewing changes to src/couchdb/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Elliot Murphy
  • Date: 2009-09-10 11:35:54 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20090910113554-dnk88gci7ap66iyp
Tags: 0.10.0~svn813472-0ubuntu1
https://launchpad.net/bugs/424330
https://launchpad.net/bugs/422178
* New snapshot of couchdb 0.10.x stable prerelease branch
  - pass config reset option to recursed background startup (LP: #424330)
    closes COUCHDB-498
  - Fix for building on snow leopard COUCHDB-490
  - Fix SSL replication (LP: #422178) COUCHDB-491
  - Fix continuous-after-normal replication
  - Use the same password hash calculation for user creation via ini
    file and user db, closes COUCHDB-492
  - Fix for WebKit XHR, closes COUCHDB-483
  - Don't check for response code text, closes COUCHDB-482
  - Remove a debugging leftover

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/couchdb/Makefile.in
195
195
INSTALL_PROGRAM = @INSTALL_PROGRAM@
196
196
INSTALL_SCRIPT = @INSTALL_SCRIPT@
197
197
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 
198
JSLIB = @JSLIB@
198
199
LD = @LD@
199
200
LDFLAGS = @LDFLAGS@
200
201
LIBOBJS = @LIBOBJS@
320
321
couchjs_SOURCES = couch_js.c curlhelper.c curlhelper.h
321
322
couchjs_LDFLAGS = $(CURL_LDFLAGS)
322
323
couchjs_CFLAGS = $(CURL_CFLAGS)
323
 
couchjs_LDADD = $(CURL_LDFLAGS)
 
324
couchjs_LDADD = $(CURL_LDFLAGS) @JSLIB@
324
325
# copy ICU dlls for the erlang driver
325
326
#dist_couch_erl_driver_la_DATA=$(ICU_LOCAL_BIN)/icuuc42.dll $(ICU_LOCAL_BIN)/icudt42.dll $(ICU_LOCAL_BIN)/icuin42.dll
326
327
@WINDOWS_TRUE@couch_erl_driver_ladir = $(bindir)