nginx - really use system PCRE library

This commit is contained in:
Adam Vandenberg 2010-06-25 10:06:33 -07:00
parent a32da79716
commit 9ef3f1fc21

View file

@ -15,7 +15,6 @@ class Nginx < Formula
def patches
# Changes default port to 8080
# Adds code to detect PCRE installed in a non-standard HOMEBREW_PREFIX
DATA
end
@ -39,14 +38,10 @@ class Nginx < Formula
end
def install
configure_args = [
"--prefix=#{prefix}",
"--with-http_ssl_module"
]
args = ["--prefix=#{prefix}", "--with-http_ssl_module"]
args << passenger_config_args if ARGV.include? '--with-passenger'
configure_args << passenger_config_args if ARGV.include? '--with-passenger'
system "./configure", *configure_args
system "./configure", *args
system "make install"
end
@ -63,31 +58,6 @@ any other web servers running port 80, of course.
end
__END__
--- a/auto/lib/pcre/conf
+++ b/auto/lib/pcre/conf
@@ -155,6 +155,22 @@ else
. auto/feature
fi
+ if [ $ngx_found = no ]; then
+
+ # Homebrew
+ HOMEBREW_PREFIX=${NGX_PREFIX%Cellar*}
+ ngx_feature="PCRE library in ${HOMEBREW_PREFIX}"
+ ngx_feature_path="${HOMEBREW_PREFIX}/include"
+
+ if [ $NGX_RPATH = YES ]; then
+ ngx_feature_libs="-R#{HOMEBREW_PREFIX}/lib -L#{HOMEBREW_PREFIX}/lib -lpcre"
+ else
+ ngx_feature_libs="-L#{HOMEBREW_PREFIX}/lib -lpcre"
+ fi
+
+ . auto/feature
+ fi
+
if [ $ngx_found = yes ]; then
CORE_DEPS="$CORE_DEPS $REGEX_DEPS"
CORE_SRCS="$CORE_SRCS $REGEX_SRCS"
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -33,7 +33,7 @@