Mercurial > hg > nginx
changeset 1609:7bdf156fc852 stable-0.5
r1491 merge:
add rpath for Solaris
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 29 Oct 2007 14:32:18 +0000 |
parents | 49b477b84a26 |
children | f5e9d597a751 |
files | auto/lib/pcre/conf auto/options auto/os/solaris |
diffstat | 3 files changed, 25 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/auto/lib/pcre/conf Mon Sep 24 04:19:28 2007 +0000 +++ b/auto/lib/pcre/conf Mon Oct 29 14:32:18 2007 +0000 @@ -77,7 +77,6 @@ CORE_DEPS="$CORE_DEPS $PCRE/pcre.h" LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a" CORE_LIBS="$CORE_LIBS $PCRE/.libs/libpcre.a" - #CORE_LIBS="$CORE_LIBS -L $PCRE/.libs -lpcre" ;; esac @@ -111,7 +110,13 @@ ngx_feature_run=no ngx_feature_incs="#include <pcre.h>" ngx_feature_path="/usr/local/include" - ngx_feature_libs="-L /usr/local/lib -lpcre" + + if [ $NGX_RPATH = YES ]; then + ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lpcre" + else + ngx_feature_libs="-L/usr/local/lib -lpcre" + fi + ngx_feature_test="pcre *re; re = pcre_compile(NULL, 0, NULL, 0, NULL)" . auto/feature @@ -160,7 +165,13 @@ ngx_feature_run=no ngx_feature_incs="#include <pcre.h>" ngx_feature_path="/usr/pkg/include" - ngx_feature_libs="-L /usr/pkg/lib -lpcre" + + if [ $NGX_RPATH = YES ]; then + ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lpcre" + else + ngx_feature_libs="-L/usr/pkg/lib -lpcre" + fi + ngx_feature_test="pcre *re; re = pcre_compile(NULL, 0, NULL, 0, NULL)" . auto/feature @@ -185,7 +196,13 @@ ngx_feature_run=no ngx_feature_incs="#include <pcre.h>" ngx_feature_path="/opt/local/include" - ngx_feature_libs="-L/opt/local/lib -lpcre" + + if [ $NGX_RPATH = YES ]; then + ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lpcre" + else + ngx_feature_libs="-L/opt/local/lib -lpcre" + fi + ngx_feature_test="pcre *re; re = pcre_compile(NULL, 0, NULL, 0, NULL)" . auto/feature
--- a/auto/options Mon Sep 24 04:19:28 2007 +0000 +++ b/auto/options Mon Oct 29 14:32:18 2007 +0000 @@ -22,6 +22,8 @@ NGX_LD_OPT= CPU=NO +NGX_RPATH=NO + NGX_TEST_BUILD_DEVPOLL=NO NGX_TEST_BUILD_EVENTPORT=NO NGX_TEST_BUILD_EPOLL=NO
--- a/auto/os/solaris Mon Sep 24 04:19:28 2007 +0000 +++ b/auto/os/solaris Mon Oct 29 14:32:18 2007 +0000 @@ -9,6 +9,8 @@ CORE_SRCS="$UNIX_SRCS $SOLARIS_SRCS " CORE_LIBS="$CORE_LIBS -lsocket -lnsl -lrt" +NGX_RPATH=YES + # Solaris's make does not support a blank line between target and rules ngx_spacer=