aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Sikora <piotr@aviatrix.com>2024-02-26 20:00:43 +0000
committerPiotr Sikora <piotr@aviatrix.com>2024-02-26 20:00:43 +0000
commit2deded362ee052564e7359d53c81973c16b18e72 (patch)
treefa183de106df991e189659fefc04ff872e0e4014
parent6b1bb998c96278a56d767bc23520c385ab9f3038 (diff)
downloadnginx-2deded362ee052564e7359d53c81973c16b18e72.tar.gz
nginx-2deded362ee052564e7359d53c81973c16b18e72.zip
Configure: added support for Homebrew on Apple Silicon.
Signed-off-by: Piotr Sikora <piotr@aviatrix.com>
-rw-r--r--auto/lib/geoip/conf17
-rw-r--r--auto/lib/google-perftools/conf16
-rw-r--r--auto/lib/libgd/conf17
-rw-r--r--auto/lib/openssl/conf18
-rw-r--r--auto/lib/pcre/conf16
5 files changed, 84 insertions, 0 deletions
diff --git a/auto/lib/geoip/conf b/auto/lib/geoip/conf
index 8302aae17..47165b15b 100644
--- a/auto/lib/geoip/conf
+++ b/auto/lib/geoip/conf
@@ -64,6 +64,23 @@ if [ $ngx_found = no ]; then
fi
+if [ $ngx_found = no ]; then
+
+ # Homebrew on Apple Silicon
+
+ ngx_feature="GeoIP library in /opt/homebrew/"
+ ngx_feature_path="/opt/homebrew/include"
+
+ if [ $NGX_RPATH = YES ]; then
+ ngx_feature_libs="-R/opt/homebrew/lib -L/opt/homebrew/lib -lGeoIP"
+ else
+ ngx_feature_libs="-L/opt/homebrew/lib -lGeoIP"
+ fi
+
+ . auto/feature
+fi
+
+
if [ $ngx_found = yes ]; then
CORE_INCS="$CORE_INCS $ngx_feature_path"
diff --git a/auto/lib/google-perftools/conf b/auto/lib/google-perftools/conf
index 7f1a91139..94dadac62 100644
--- a/auto/lib/google-perftools/conf
+++ b/auto/lib/google-perftools/conf
@@ -46,6 +46,22 @@ if [ $ngx_found = no ]; then
fi
+if [ $ngx_found = no ]; then
+
+ # Homebrew on Apple Silicon
+
+ ngx_feature="Google perftools in /opt/homebrew/"
+
+ if [ $NGX_RPATH = YES ]; then
+ ngx_feature_libs="-R/opt/homebrew/lib -L/opt/homebrew/lib -lprofiler"
+ else
+ ngx_feature_libs="-L/opt/homebrew/lib -lprofiler"
+ fi
+
+ . auto/feature
+fi
+
+
if [ $ngx_found = yes ]; then
CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
diff --git a/auto/lib/libgd/conf b/auto/lib/libgd/conf
index 678639767..07f565677 100644
--- a/auto/lib/libgd/conf
+++ b/auto/lib/libgd/conf
@@ -65,6 +65,23 @@ if [ $ngx_found = no ]; then
fi
+if [ $ngx_found = no ]; then
+
+ # Homebrew on Apple Silicon
+
+ ngx_feature="GD library in /opt/homebrew/"
+ ngx_feature_path="/opt/homebrew/include"
+
+ if [ $NGX_RPATH = YES ]; then
+ ngx_feature_libs="-R/opt/homebrew/lib -L/opt/homebrew/lib -lgd"
+ else
+ ngx_feature_libs="-L/opt/homebrew/lib -lgd"
+ fi
+
+ . auto/feature
+fi
+
+
if [ $ngx_found = yes ]; then
CORE_INCS="$CORE_INCS $ngx_feature_path"
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
index eda1c0f4a..fdf430dff 100644
--- a/auto/lib/openssl/conf
+++ b/auto/lib/openssl/conf
@@ -122,6 +122,24 @@ else
. auto/feature
fi
+ if [ $ngx_found = no ]; then
+
+ # Homebrew on Apple Silicon
+
+ ngx_feature="OpenSSL library in /opt/homebrew/"
+ ngx_feature_path="/opt/homebrew/include"
+
+ if [ $NGX_RPATH = YES ]; then
+ ngx_feature_libs="-R/opt/homebrew/lib -L/opt/homebrew/lib -lssl -lcrypto"
+ else
+ ngx_feature_libs="-L/opt/homebrew/lib -lssl -lcrypto"
+ fi
+
+ ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD"
+
+ . auto/feature
+ fi
+
if [ $ngx_found = yes ]; then
have=NGX_SSL . auto/have
CORE_INCS="$CORE_INCS $ngx_feature_path"
diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf
index 20c1cafbe..cdf1809f5 100644
--- a/auto/lib/pcre/conf
+++ b/auto/lib/pcre/conf
@@ -182,6 +182,22 @@ else
. auto/feature
fi
+ if [ $ngx_found = no ]; then
+
+ # Homebrew on Apple Silicon
+
+ ngx_feature="PCRE library in /opt/homebrew/"
+ ngx_feature_path="/opt/homebrew/include"
+
+ if [ $NGX_RPATH = YES ]; then
+ ngx_feature_libs="-R/opt/homebrew/lib -L/opt/homebrew/lib -lpcre"
+ else
+ ngx_feature_libs="-L/opt/homebrew/lib -lpcre"
+ fi
+
+ . auto/feature
+ fi
+
if [ $ngx_found = yes ]; then
CORE_INCS="$CORE_INCS $ngx_feature_path"
CORE_LIBS="$CORE_LIBS $ngx_feature_libs"