Updated Branches: refs/heads/master d59cdd71b -> 572b561ad
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/572b561a Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/572b561a Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/572b561a Branch: refs/heads/master Commit: 572b561adbf852e08c7397519070f299d0b401e4 Parents: d59cdd7 Author: Paul Joseph Davis <dav...@apache.org> Authored: Sun Jan 22 14:43:26 2012 -0600 Committer: Paul Joseph Davis <dav...@apache.org> Committed: Sun Jan 22 14:44:26 2012 -0600 ---------------------------------------------------------------------- configure.ac | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/572b561a/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index adfd740..7ce4842 100644 --- a/configure.ac +++ b/configure.ac @@ -206,6 +206,11 @@ AS_CASE([$(uname -s)], 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], [ @@ -217,10 +222,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], [