From 71081311b2b11ed923869ce5bd11ce7b0fd1da2c Mon Sep 17 00:00:00 2001 From: Paul Joseph Davis Date: Thu, 8 Sep 2011 05:00:10 +0000 Subject: Fix CouchJS compatibility with older SpiderMonkey. This is a backport of the work to make CouchJS build against all of the major versions of SpiderMonkey. Thanks to Randall Leeds and Chris Coulson for the original patches. Backport based on r1137464 and r1164346 Fixes COUCHDB-1078 Fixes COUCHDB-1260 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1166525 13f79535-47bb-0310-9956-ffa450edef68 --- src/couchdb/priv/Makefile.am | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/couchdb/priv/Makefile.am') diff --git a/src/couchdb/priv/Makefile.am b/src/couchdb/priv/Makefile.am index b36d828d..3d11e663 100644 --- a/src/couchdb/priv/Makefile.am +++ b/src/couchdb/priv/Makefile.am @@ -16,7 +16,10 @@ couchprivlibdir = $(couchlibdir)/priv/lib EXTRA_DIST = \ spawnkillable/couchspawnkillable.sh \ - stat_descriptions.cfg.in + stat_descriptions.cfg.in \ + couch_js/sm170.c \ + couch_js/sm180.c \ + couch_js/sm185.c CLEANFILES = stat_descriptions.cfg @@ -42,12 +45,14 @@ COUCHJS_SRCS = \ couch_js/http.h \ couch_js/main.c \ couch_js/utf8.c \ - couch_js/utf8.h + couch_js/utf8.h \ + couch_js/util.h \ + couch_js/util.c locallibbin_PROGRAMS = couchjs couchjs_SOURCES = $(COUCHJS_SRCS) couchjs_LDFLAGS = $(CURL_LDFLAGS) -couchjs_CFLAGS = -D_BSD_SOURCE $(CURL_CFLAGS) +couchjs_CFLAGS = -g -Wall -Werror -D_BSD_SOURCE $(CURL_CFLAGS) couchjs_LDADD = $(CURL_LDFLAGS) @JSLIB@ couchpriv_DATA = stat_descriptions.cfg -- cgit v1.2.3