Permalink
Browse files

look for mozjs first

  • Loading branch information...
1 parent dc80a34 commit b2a20210c9117d891e664a326aa3d7e6105c344a @peter-leonov committed Jun 14, 2010
Showing with 17 additions and 15 deletions.
  1. +17 −15 config
View
@@ -118,55 +118,57 @@ CORE_INCS="$CORE_INCS $ngx_feature_path"
ngx_found=no
-# look for js library
+
+# look for mozjs library
if [ $ngx_found = no ]; then
ngx_feature_incs=
ngx_feature_test=
- ngx_feature="libjs"
+ ngx_feature="libmozjs"
ngx_feature_path=
- ngx_feature_libs="-ljs"
+ ngx_feature_libs="-lmozjs"
. auto/feature
fi
# FreeBSD
if [ $ngx_found = no ]; then
ngx_feature_incs=
ngx_feature_test=
- ngx_feature="libjs in /usr/local/lib"
+ ngx_feature="libmozjs in /usr/local/lib"
ngx_feature_path=
- ngx_feature_libs="-L/usr/local/lib -ljs"
+ ngx_feature_libs="-L/usr/local/lib -lmozjs"
. auto/feature
fi
-# FreeBSD port
+
+# look for js library
+
if [ $ngx_found = no ]; then
ngx_feature_incs=
ngx_feature_test=
- ngx_feature="libjs (with libm) in /usr/local/lib"
+ ngx_feature="libjs"
ngx_feature_path=
- ngx_feature_libs="-L/usr/local/lib -lm -ljs"
+ ngx_feature_libs="-ljs"
. auto/feature
fi
-# look for mozjs library
-
+# FreeBSD
if [ $ngx_found = no ]; then
ngx_feature_incs=
ngx_feature_test=
- ngx_feature="libmozjs"
+ ngx_feature="libjs in /usr/local/lib"
ngx_feature_path=
- ngx_feature_libs="-lmozjs"
+ ngx_feature_libs="-L/usr/local/lib -ljs"
. auto/feature
fi
-# FreeBSD
+# FreeBSD port
if [ $ngx_found = no ]; then
ngx_feature_incs=
ngx_feature_test=
- ngx_feature="libmozjs in /usr/local/lib"
+ ngx_feature="libjs (with libm) in /usr/local/lib"
ngx_feature_path=
- ngx_feature_libs="-L/usr/local/lib -lmozjs"
+ ngx_feature_libs="-L/usr/local/lib -lm -ljs"
. auto/feature
fi

0 comments on commit b2a2021

Please sign in to comment.