Updated Branches: refs/heads/1.1.x 5e503bb34 -> b4cf77b9d
Fix SpiderMonkey header detection My last commit broke because the header detection wasn't using the JS_CPPFLAGS that includes the search paths. Fix is simply to move that variable assignment to before the header check. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/b4cf77b9 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/b4cf77b9 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/b4cf77b9 Branch: refs/heads/1.1.x Commit: b4cf77b9d1b9a1ad4942c52b1fb70e39f07ffc96 Parents: 5e503bb Author: Paul Joseph Davis <[email protected]> Authored: Sun Jan 22 14:43:26 2012 -0600 Committer: Paul Joseph Davis <[email protected]> Committed: Sun Jan 22 14:56:53 2012 -0600 ---------------------------------------------------------------------- configure.ac | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/b4cf77b9/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 0c70588..e3c8ba5 100644 --- a/configure.ac +++ b/configure.ac @@ -115,6 +115,11 @@ esac AM_CONDITIONAL([WINDOWS], [test x$IS_WINDOWS = xTRUE]) +OLD_LIBS="$LIBS" +LIBS="$JS_LIBS $LIBS" +OLD_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$JS_CFLAGS $CPPFLAGS" + AC_CHECK_HEADER([jsapi.h], [], [ AC_CHECK_HEADER([js/jsapi.h], [ @@ -126,10 +131,6 @@ AC_CHECK_HEADER([jsapi.h], [], [ Are the Mozilla SpiderMonkey headers installed?]) ])]) -OLD_LIBS="$LIBS" -LIBS="$JS_LIBS $LIBS" -OLD_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$JS_CFLAGS $CPPFLAGS" AC_CHECK_LIB([mozjs185], [JS_NewContext], [JS_LIB_BASE=mozjs185], [ AC_CHECK_LIB([mozjs185-1.0], [JS_NewContext], [JS_LIB_BASE=mozjs185-1.0], [ AC_CHECK_LIB([mozjs], [JS_NewContext], [JS_LIB_BASE=mozjs], [
