Packages: added njs support.

pkg/deb/Makefile

@@ -115,7 +115,7 @@ include Makefile.jsc-common
 include Makefile.jsc11
 endif
 
-CONFIGURE_ARGS=\
+CONFIGURE_ARGS_COMMON=\
 	--prefix=/usr \
 	--state=/var/lib/unit \
 	--control="unix:/var/run/control.unit.sock" \
@@ -127,6 +127,10 @@ CONFIGURE_ARGS=\
 	--tests \
 	--openssl
 
+CONFIGURE_ARGS=\
+	$(CONFIGURE_ARGS_COMMON) \
+	--njs
+
 export CR=\\n
 
 default:
@@ -195,7 +199,7 @@ endif
 debuild/unit_$(VERSION).orig.tar.gz: | debuild/$(SRCDIR)/debian
 	cd ../.. && tar -czf pkg/deb/debuild/$(SRCDIR).tar.gz \
 		--transform "s#^#$(SRCDIR)/#" \
-		LICENSE NOTICE CHANGES README.md CONTRIBUTING.md configure auto src test version go docs/man/unitd.8.in
+		LICENSE NOTICE CHANGES README.md CONTRIBUTING.md configure auto src test version go pkg/contrib docs/man/unitd.8.in
 	mv debuild/$(SRCDIR).tar.gz debuild/unit_$(VERSION).orig.tar.gz
 	cd debuild && tar zxf unit_$(VERSION).orig.tar.gz
 
@@ -257,7 +261,7 @@ endif
                 -e "s#%%CODENAME%%#$(CODENAME)#g" \
                 -e "s#%%UNIT_VERSION%%#$(VERSION)#g" \
                 -e "s#%%UNIT_RELEASE%%#$(RELEASE)#g" \
-                -e "s#%%CONFIGURE_ARGS%%#$(CONFIGURE_ARGS)#g" \
+                -e "s#%%CONFIGURE_ARGS%%#$(CONFIGURE_ARGS_COMMON)#g" \
                 -e "s#%%MODULE_CONFARGS%%#$(MODULE_CONFARGS_$*)#g" \
                 -e "s#%%MODULE_MAKEARGS%%#$(MODULE_MAKEARGS_$*)#g" \
                 -e "s#%%MODULE_INSTARGS%%#$(MODULE_INSTARGS_$*)#g" \

pkg/deb/debian/control.in

@@ -5,7 +5,8 @@ Maintainer: %%PACKAGE_VENDOR%%
 Build-Depends: debhelper (>= 11),
                linux-libc-dev,
                libssl-dev,
-               libpcre2-dev
+               libpcre2-dev,
+               pkg-config
 Standards-Version: 4.1.4
 Homepage: https://unit.nginx.org
 

pkg/deb/debian/rules.in

@@ -20,7 +20,12 @@ BASEDIR = $(CURDIR)
 
 DOTESTS = 0
 
-config.env.%:
+njs:
+	dh_testdir
+	cd pkg/contrib && make .njs
+	touch $@
+
+config.env.%: njs
 	dh_testdir
 	mkdir -p $(BUILDDIR_$*)
 	cp -Pa $(CURDIR)/auto $(BUILDDIR_$*)/
@@ -40,6 +45,7 @@ config.env.%:
 
 configure.unit: config.env.unit
 	cd $(BUILDDIR_unit) && \
+	PKG_CONFIG_PATH=$(CURDIR)/pkg/contrib/njs/build \
 	CFLAGS= ./configure \
 		%%CONFIGURE_ARGS%% \
 		--modules=/usr/lib/unit/modules \
@@ -50,6 +56,7 @@ configure.unit: config.env.unit
 
 configure.unit_debug: config.env.unit_debug
 	cd $(BUILDDIR_unit_debug) && \
+	PKG_CONFIG_PATH=$(CURDIR)/pkg/contrib/njs/build \
 	CFLAGS= ./configure \
 		%%CONFIGURE_ARGS%% \
 		--modules=/usr/lib/unit/debug-modules \