Permalink
Browse files

support for SM built from sources to /opt

  • Loading branch information...
1 parent 2c2b573 commit 309e9e7d0dfaf5f623a7690c3b9f78ed61fd0af4 @peter-leonov committed Jun 16, 2010
Showing with 24 additions and 1 deletion.
  1. +23 −0 config
  2. +1 −1 run-tests
View
23 config
@@ -38,6 +38,19 @@ if [ $ngx_found = no ]; then
. auto/feature
fi
+# /opt
+if [ $ngx_found = no ]; then
+ ngx_feature_incs="
+ #define XP_UNIX
+ #include <js/jsapi.h>
+ "
+ ngx_feature_test=
+ ngx_feature="js/jsapi.h in /opt/include"
+ ngx_feature_path="/opt/include"
+ ngx_feature_libs=
+ . auto/feature
+fi
+
# look for headers in mozjs/*
@@ -140,6 +153,16 @@ if [ $ngx_found = no ]; then
. auto/feature
fi
+# /opt
+if [ $ngx_found = no ]; then
+ ngx_feature_incs=
+ ngx_feature_test=
+ ngx_feature="libmozjs in /opt/lib"
+ ngx_feature_path=
+ ngx_feature_libs="-L/opt/lib -lmozjs"
+ . auto/feature
+fi
+
# look for js library
View
@@ -6,7 +6,7 @@ NGINX="$NGX_OBJS/nginx"
PIDFILE="/tmp/nginx-js.pid"
TIME=$(date +%s)
PADDING="$MODULE_ROOT/padding.txt"
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib/"
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib/:/opt/lib/"
if [ "$WITH_MASTER" = "yes" ]; then
NGINX_OPTS=""

0 comments on commit 309e9e7

Please sign in to comment.