Added pkg-config discovery for QuickJS-NG.

diff --git a/auto/quickjs b/auto/quickjs
index 00fcbc0b837b0a6e2c1990cc09146a9ecb0d9cf8..f14617d5f9d8cdd9dd66e0d195dc3e51cbaaf632 100644 (file)
--- a/auto/quickjs
+++ b/auto/quickjs
@@ -49,6 +49,21 @@ if [ $NJS_TRY_QUICKJS = YES ]; then
         . auto/feature
     fi
 
+    if [ $njs_found = no ]; then
+        if command -v pkg-config >/dev/null 2>&1 && pkg-config --exists quickjs-ng; then
+
+            # pkg-config
+
+            njs_feature="QuickJS-NG library via pkg-config"
+
+            njs_feature_incs="$NJS_QUICKJS_DEFAULT_INCS"
+            njs_feature_incs="$njs_feature_incs $(pkg-config quickjs-ng --cflags-only-I | sed -e 's/-I//g')"
+            njs_feature_libs=$(pkg-config quickjs-ng --libs)
+
+            . auto/feature
+        fi
+    fi
+
     if [ $njs_found = no ]; then
         njs_feature="QuickJS-NG library -lqjs"
         njs_feature_incs="$NJS_QUICKJS_DEFAULT_INCS"

diff --git a/nginx/config b/nginx/config
index 9d16ddd4711b67686a85edaa148ce116c99461c2..5e2d9277f53d3e7c9f26c6c91828eb55b8a7212c 100644 (file)
--- a/nginx/config
+++ b/nginx/config
@@ -63,6 +63,21 @@ if [ $NJS_QUICKJS != NO ]; then
         . auto/feature
     fi
 
+    if [ $ngx_found = no ]; then
+        if command -v pkg-config >/dev/null 2>&1 && pkg-config --exists quickjs-ng; then
+
+            # pkg-config
+
+            ngx_feature="QuickJS-NG library via pkg-config"
+
+            ngx_feature_path="$NJS_QUICKJS_DEFAULT_INCS"
+            ngx_feature_path="$ngx_feature_path $(pkg-config quickjs-ng --cflags-only-I | sed -e 's/-I//g')"
+            ngx_feature_libs=$(pkg-config quickjs-ng --libs)
+
+            . auto/feature
+        fi
+    fi
+
     if [ $ngx_found = no ]; then
         ngx_feature="QuickJS-NG library -lqjs"
         ngx_feature_path="$NJS_QUICKJS_DEFAULT_INCS"