From 949548da293fa30ef200d07c3e4ff108174404b7 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Thu, 17 Aug 2017 21:47:19 +0300 Subject: The new module configuration interface. Configuration and building example: ./configure ./configure python ./configure php ./configure go make all or ./configure make nginext ./configure python make python ./configure php make php ./configure go make go Modules configuration options and building examples: ./configure python --module=python2 --config=python2.7-config make python2 ./configure php --module=php7 --config=php7.0-config --lib-path=/usr/local/php7.0 make php7 ./configure go --go=go1.6 --go-path=${HOME}/go1.6 make go1.6 --- configure | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 16b19820..5a9e140c 100755 --- a/configure +++ b/configure @@ -20,15 +20,36 @@ NXT_TEST_CFLAGS=${NXT_TEST_CFLAGS=} NXT_TEST_LIBS=${NXT_TEST_LIBS=} NXT_UNIT_TEST_TARGETS=${NXT_UNIT_TEST_TARGETS=} -. auto/os/test -. auto/options - -test -d $NXT_BUILD_DIR || mkdir $NXT_BUILD_DIR +# STUB +NXT_BUILD_DIR=build NXT_AUTOTEST=$NXT_BUILD_DIR/autotest NXT_AUTOCONF_ERR=$NXT_BUILD_DIR/autoconf.err +NXT_AUTOCONF_DATA=$NXT_BUILD_DIR/autoconf.data NXT_AUTO_CONFIG_H=$NXT_BUILD_DIR/nxt_auto_config.h NXT_MAKEFILE=$NXT_BUILD_DIR/Makefile +NXT_BIN=nginext + +nxt_module=${1:-no} + +case $nxt_module in + no|--*) + ;; + + unit) + shift + ;; + + *) + . auto/modules/conf + exit 0 + ;; +esac + +. auto/os/test +. auto/options + +test -d $NXT_BUILD_DIR || mkdir $NXT_BUILD_DIR > $NXT_AUTOCONF_ERR > $NXT_AUTO_CONFIG_H @@ -102,6 +123,7 @@ fi . auto/test_build . auto/sources +. auto/save # LOOK @@ -113,5 +135,4 @@ NXT_LIB_AUX_LIBS="$NXT_OPENSSL_LIBS $NXT_GNUTLS_LIBS \\ $NXT_CYASSL_LIBS $NXT_POLARSSL_LIBS \\ $NXT_PCRE_LIB" -. auto/modules/conf . auto/make -- cgit