diff options
| author | Paul Joseph Davis <davisp@apache.org> | 2012-01-22 14:43:26 -0600 |
|---|---|---|
| committer | Paul Joseph Davis <davisp@apache.org> | 2012-01-22 14:56:26 -0600 |
| commit | 9d2c0e44f51cb3b31608523089616914b6d15532 (patch) | |
| tree | b91decad27c49d1b8bef795b04964d7933adfb56 | |
| parent | 12a593c61dc0f154f3ade65a50706a019103d680 (diff) | |
| download | couchdb-9d2c0e44f51cb3b31608523089616914b6d15532.tar.gz | |
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.
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 28da50207..30a1d652e 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], [ |