commit 274b63ec34190dc0a68b6e2dbc37980173a46c2c
author Igor Sysoev <igor@sysoev.ru> Wed Sep 19 12:14:05 2007 +0000
committer Igor Sysoev <igor@sysoev.ru> Wed Sep 19 12:14:05 2007 +0000
tree a5c3294b862b91468fac6b609c194fa0f009b93e
parent 4b96baa417874ce7c152f40787d1d41a4f070690

add rpath for Solaris

auto/lib/pcre/conf

diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf
index 3789ad1..555143c 100644
--- a/auto/lib/pcre/conf
+++ b/auto/lib/pcre/conf
@@ -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

auto/options

diff --git a/auto/options b/auto/options
index 1006e85..4fe4ddd 100644
--- a/auto/options
+++ b/auto/options
@@ -23,6 +23,8 @@
 NGX_LD_OPT=
 CPU=NO
 
+NGX_RPATH=NO
+
 NGX_TEST_BUILD_DEVPOLL=NO
 NGX_TEST_BUILD_EVENTPORT=NO
 NGX_TEST_BUILD_EPOLL=NO

auto/os/solaris

diff --git a/auto/os/solaris b/auto/os/solaris
index 5a46ee6..f98c851 100644
--- a/auto/os/solaris
+++ b/auto/os/solaris
@@ -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=