auto/quickjs, nginx/config: Used pkg-config to find quickjs-ng

In QuickJS-NG since 8e671eb8e59f5f5d7eca111386fbe158fab09049 ("build:
initial support for meson build system")[1], Meson can be used as a
build system, generating .pc (pkg-config) modules. This commit adds
another method of QuickJS-NG discovery using pkg-config.

[1]: quickjs-ng/quickjs@8e671eb

Signed-off-by: Zurab Kvachadze <[email protected]>

Author: BalkanMadman

auto/quickjs

@@ -7,6 +7,10 @@ NJS_QUICKJS_LIB=
 NJS_HAVE_QUICKJS=NO
 NJS_QUICKJS_DEFAULT_INCS="src $NJS_BUILD_DIR"
 
+# Alternative pkg-config binary can be supplied by setting the PKG_CONFIG
+# environment variable.
+: "${PKG_CONFIG:=pkg-config}"
+
 if [ $NJS_TRY_QUICKJS = YES ]; then
     njs_found=no
 
@@ -57,6 +61,20 @@ if [ $NJS_TRY_QUICKJS = YES ]; then
         . auto/feature
     fi
 
+    if [ $ngx_found = no ]; then
+        ngx_feature="QuickJS-NG library via pkg-config"
+
+        flags="$("${PKG_CONFIG}" --cflags-only-I quickjs-ng)"
+        # Trim the -I prefix from includes.
+        pkg_config_includes="$(printf "%s\n" "$flags" | sed 's|-I||g')"
+        pkg_config_libs="$("${PKG_CONFIG}" --libs quickjs-ng)"
+
+        ngx_feature_incs="$NJS_QUICKJS_DEFAULT_INCS ${pkg_config_includes}"
+        ngx_feature_libs="-lm -ldl -lpthread ${pkg_config_libs}"
+
+        . auto/feature
+    fi
+
 
     if [ $njs_found = yes ]; then
 

nginx/config

@@ -26,6 +26,10 @@ NJS_QUICKJS_INC=
 NJS_QUICKJS_DEFAULT_INCS="$ngx_addon_dir/../src $ngx_addon_dir/../build"
 NJS_HAVE_QUICKJS=
 
+# Alternative pkg-config binary can be supplied by setting the PKG_CONFIG
+# environment variable.
+: "${PKG_CONFIG:=pkg-config}"
+
 if [ $NJS_QUICKJS != NO ]; then
 
     ngx_feature="QuickJS library -lquickjs.lto"
@@ -71,6 +75,21 @@ if [ $NJS_QUICKJS != NO ]; then
         . auto/feature
     fi
 
+    if [ $ngx_found = no ]; then
+        ngx_feature="QuickJS-NG library via pkg-config"
+
+        flags="$("${PKG_CONFIG}" --cflags-only-I quickjs-ng)"
+        # Trim the -I prefix from includes.
+        pkg_config_includes="$(printf "%s\n" "$flags" | sed 's|-I||g')"
+        pkg_config_libs="$("${PKG_CONFIG}" --libs quickjs-ng)"
+
+        ngx_feature_path="$NJS_QUICKJS_DEFAULT_INCS ${pkg_config_includes}"
+        ngx_feature_libs="-lm -ldl -lpthread ${pkg_config_libs}"
+
+        . auto/feature
+    fi
+
+
     if [ $ngx_found = yes ]; then
 
         ngx_feature="QuickJS JS_GetClassID()"