From 09ac678943e253dfea65f84cd84963d863580efe Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Tue, 29 Nov 2022 18:10:38 +0400 Subject: Used pkg-config to detect njs where available. --- auto/njs | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/auto/njs b/auto/njs index 72304793..c0c43f19 100644 --- a/auto/njs +++ b/auto/njs @@ -5,10 +5,18 @@ nxt_found=no NXT_HAVE_NJS=NO -NXT_NJS_CFLAGS= -NXT_NJS_AUX_CFLAGS= -NXT_NJS_LIBS="-lnjs" -NXT_NJS_AUX_LIBS="$NXT_LIBM $NXT_LIB_AUX_LIBS" +if /bin/sh -c "(pkg-config njs --exists)" >> $NXT_AUTOCONF_ERR 2>&1; +then + NXT_NJS_AUX_CFLAGS= + NXT_NJS_AUX_LIBS= + NXT_NJS_CFLAGS=`pkg-config njs --cflags` + NXT_NJS_LIBS=`pkg-config njs --libs` +else + NXT_NJS_AUX_CFLAGS= + NXT_NJS_AUX_LIBS="$NXT_LIBM $NXT_LIB_AUX_LIBS" + NXT_NJS_CFLAGS= + NXT_NJS_LIBS="-lnjs" +fi nxt_feature="NJS" nxt_feature_name=NXT_HAVE_NJS -- cgit