Author: jan
Date: Sat Nov 27 13:43:44 2010
New Revision: 1039679
URL: http://svn.apache.org/viewvc?rev=1039679&view=rev
Log:
Merge branch 'optional-nm' into trunk
* optional-nm:
Make +native compilation of mochijson2.erl a ./configure option.
Modified:
couchdb/trunk/configure.ac
couchdb/trunk/src/mochiweb/Makefile.am
Modified: couchdb/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/couchdb/trunk/configure.ac?rev=1039679&r1=1039678&r2=1039679&view=diff
==============================================================================
--- couchdb/trunk/configure.ac (original)
+++ couchdb/trunk/configure.ac Sat Nov 27 13:43:44 2010
@@ -284,6 +284,7 @@ fi
use_init=yes
use_launchd=yes
+native_mochijson_enabled=no
AC_ARG_ENABLE([init], [AC_HELP_STRING([--disable-init],
[don't install init script where applicable])], [
@@ -295,6 +296,11 @@ AC_ARG_ENABLE([launchd], [AC_HELP_STRING
use_launchd=$enableval
], [])
+AC_ARG_ENABLE([native-mochijson], [AC_HELP_STRING([--enable-native-mochijson],
+ [compile mochijson to native code (EXPERIMENTAL)])], [
+ native_mochijson_enabled=$enableval
+], [])
+
init_enabled=false
launchd_enabled=false
@@ -344,6 +350,7 @@ fi
AM_CONDITIONAL([INIT], [test x${init_enabled} = xtrue])
AM_CONDITIONAL([LAUNCHD], [test x${launchd_enabled} = xtrue])
AM_CONDITIONAL([HELP2MAN], [test x${help2man_enabled} = xtrue])
+AM_CONDITIONAL([USE_NATIVE_MOCHIJSON], [test x${native_mochijson_enabled} =
xyes])
AC_SUBST([package_author_name], ["LOCAL_PACKAGE_AUTHOR_NAME"])
AC_SUBST([package_author_address], ["LOCAL_PACKAGE_AUTHOR_ADDRESS"])
Modified: couchdb/trunk/src/mochiweb/Makefile.am
URL:
http://svn.apache.org/viewvc/couchdb/trunk/src/mochiweb/Makefile.am?rev=1039679&r1=1039678&r2=1039679&view=diff
==============================================================================
--- couchdb/trunk/src/mochiweb/Makefile.am (original)
+++ couchdb/trunk/src/mochiweb/Makefile.am Sat Nov 27 13:43:44 2010
@@ -10,6 +10,10 @@
## License for the specific language governing permissions and limitations
under
## the License.
+if USE_NATIVE_MOCHIJSON
+MOCHIJSON_ERLC_FLAGS=+native
+endif
+
mochiwebebindir = $(localerlanglibdir)/mochiweb-7c2bc2/ebin
mochiweb_file_collection = \
@@ -98,7 +102,7 @@ CLEANFILES = \
cp $< $@
mochijson2.beam: mochijson2.erl
- $(ERLC) $(ERLC_FLAGS) +native $<
+ $(ERLC) $(ERLC_FLAGS) $(MOCHIJSON_ERLC_FLAGS) $<
%.beam: %.erl
$(ERLC) $(ERLC_FLAGS) $<
