From: Dmitry Volyntsev <xeioex@nginx.com>
Date: Thu, 4 Apr 2024 23:07:46 +0000 (-0700)
Subject: Configure: improved QuickJS discovery.
X-Git-Tag: 0.8.4~4
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=860cabccca022830cdd31d88a5bd45cd824ce946;p=njs.git

Configure: improved QuickJS discovery.

At the first try do not assume the exact library and includes location.
---

diff --git a/auto/quickjs b/auto/quickjs
index aba86886..c60739b0 100644
--- a/auto/quickjs
+++ b/auto/quickjs
@@ -9,11 +9,11 @@ NJS_HAVE_QUICKJS=NO
 if [ $NJS_QUICKJS = YES ]; then
     njs_found=no
 
-    njs_feature="QuickJS library"
+    njs_feature="QuickJS library -lquickjs.lto"
     njs_feature_name=NJS_HAVE_QUICKJS
     njs_feature_run=yes
     njs_feature_incs=
-    njs_feature_libs=""
+    njs_feature_libs="-lquickjs.lto -lm -ldl -lpthread"
     njs_feature_test="#if defined(__GNUC__) && (__GNUC__ >= 8)
                       #pragma GCC diagnostic push
                       #pragma GCC diagnostic ignored \"-Wcast-function-type\"
@@ -31,7 +31,14 @@ if [ $NJS_QUICKJS = YES ]; then
     . auto/feature
 
     if [ $njs_found = no ]; then
-        njs_feature="QuickJS library -lquickjs.lto"
+        njs_feature="QuickJS library -lquickjs"
+        njs_feature_libs="-lquickjs -lm -ldl -lpthread"
+
+        . auto/feature
+    fi
+
+    if [ $njs_found = no ]; then
+        njs_feature="QuickJS library -I/usr/include/quickjs/ -L/usr/lib/quickjs/ -lquickjs.lto"
         njs_feature_incs="/usr/include/quickjs/"
         njs_feature_libs="-L/usr/lib/quickjs/ -lquickjs.lto -lm -ldl -lpthread"
 
@@ -39,7 +46,8 @@ if [ $NJS_QUICKJS = YES ]; then
     fi
 
     if [ $njs_found = no ]; then
-        njs_feature="QuickJS library -lquickjs"
+        njs_feature="QuickJS library -I/usr/include/quickjs/ -L/usr/lib/quickjs/ -lquickjs"
+        njs_feature_incs="/usr/include/quickjs/"
         njs_feature_libs="-L/usr/lib/quickjs/ -lquickjs -lm -ldl -lpthread"
 
         . auto/feature