couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject svn commit: r811915 - in /couchdb/branches/0.10.x: ./ configure.ac etc/default/couchdb src/couchdb/Makefile.am
Date Sun, 06 Sep 2009 21:59:47 GMT
Author: davisp
Date: Sun Sep  6 21:59:47 2009
New Revision: 811915

URL: http://svn.apache.org/viewvc?rev=811915&view=rev
Log:
Backported fix for building on Snow Leapord.

See: https://issues.apache.org/jira/browse/COUCHDB-490


Modified:
    couchdb/branches/0.10.x/   (props changed)
    couchdb/branches/0.10.x/configure.ac
    couchdb/branches/0.10.x/etc/default/couchdb   (props changed)
    couchdb/branches/0.10.x/src/couchdb/Makefile.am

Propchange: couchdb/branches/0.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep  6 21:59:47 2009
@@ -3,4 +3,4 @@
 /couchdb/branches/form:729440-730015
 /couchdb/branches/list-iterator:782292-784593
 /couchdb/branches/tail_header:775760-778477
-/couchdb/trunk:806983,807208-807478,807771,808574,808632,808716,808876,809134,809977,810015,810028,810350,810358,810435
+/couchdb/trunk:806983,807208-807478,807771,808574,808632,808716,808876,809134,809977,810015,810028,810350,810358,810435,811910

Modified: couchdb/branches/0.10.x/configure.ac
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/configure.ac?rev=811915&r1=811914&r2=811915&view=diff
==============================================================================
--- couchdb/branches/0.10.x/configure.ac (original)
+++ couchdb/branches/0.10.x/configure.ac Sun Sep  6 21:59:47 2009
@@ -103,10 +103,10 @@
 
 AM_CONDITIONAL([WINDOWS], [test x$IS_WINDOWS = xTRUE])
 
-AC_CHECK_LIB([mozjs], [JS_NewContext], [], [
-    AC_CHECK_LIB([js], [JS_NewContext], [], [
-        AC_CHECK_LIB([js3250], [JS_NewContext], [], [
-            AC_CHECK_LIB([js32], [JS_NewContext], [], [
+AC_CHECK_LIB([mozjs], [JS_NewContext], [JSLIB=-lmozjs], [
+    AC_CHECK_LIB([js], [JS_NewContext], [JSLIB=-ljs], [
+        AC_CHECK_LIB([js3250], [JS_NewContext], [JSLIB=-ljs3250], [
+            AC_CHECK_LIB([js32], [JS_NewContext], [JSLIB=-ljs32], [
                 AC_MSG_ERROR([Could not find the js library.
 
 Is the Mozilla SpiderMonkey library installed?])])])])])
@@ -122,6 +122,8 @@
 Are the Mozilla SpiderMonkey headers installed?])
         ])])
 
+AC_SUBST(JSLIB)
+
 AC_LANG_PUSH(C)
 OLD_CFLAGS="$CFLAGS"
 CFLAGS="-Werror-implicit-function-declaration"

Propchange: couchdb/branches/0.10.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep  6 21:59:47 2009
@@ -3,5 +3,5 @@
 /couchdb/branches/form/etc/default/couchdb:729440-730015
 /couchdb/branches/list-iterator/etc/default/couchdb:782292-784593
 /couchdb/branches/tail_header/etc/default/couchdb:775760-778477
-/couchdb/trunk/etc/default/couchdb:806983,807208-807478,807771,808574,808632,808716,808876,809134,809977,810015,810028,810350,810358,810435
+/couchdb/trunk/etc/default/couchdb:806983,807208-807478,807771,808574,808632,808716,808876,809134,809977,810015,810028,810350,810358,810435,811910
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

Modified: couchdb/branches/0.10.x/src/couchdb/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/branches/0.10.x/src/couchdb/Makefile.am?rev=811915&r1=811914&r2=811915&view=diff
==============================================================================
--- couchdb/branches/0.10.x/src/couchdb/Makefile.am (original)
+++ couchdb/branches/0.10.x/src/couchdb/Makefile.am Sun Sep  6 21:59:47 2009
@@ -36,7 +36,7 @@
 couchjs_SOURCES = couch_js.c curlhelper.c curlhelper.h
 couchjs_LDFLAGS = $(CURL_LDFLAGS)
 couchjs_CFLAGS = $(CURL_CFLAGS)
-couchjs_LDADD = $(CURL_LDFLAGS)
+couchjs_LDADD = $(CURL_LDFLAGS) @JSLIB@
 
 if WINDOWS
 couch_erl_driver_la_LDFLAGS += -no-undefined



Mime
View raw message