diff options
Diffstat (limited to '')
| -rw-r--r-- | auto/modules/conf | 10 | ||||
| -rw-r--r-- | auto/modules/go | 18 | ||||
| -rw-r--r-- | auto/modules/php | 25 | ||||
| -rw-r--r-- | auto/modules/python | 22 |
4 files changed, 47 insertions, 28 deletions
diff --git a/auto/modules/conf b/auto/modules/conf index e7f21b9e..8c0b7c0c 100644 --- a/auto/modules/conf +++ b/auto/modules/conf @@ -3,16 +3,6 @@ # Copyright (C) NGINX, Inc. -if [ ! -f $NXT_AUTOCONF_DATA ]; then - echo - echo Please run common $0 before configuring module \"$nxt_module\". - echo - exit 1 -fi - -. $NXT_AUTOCONF_DATA - - case "$nxt_module" in python) diff --git a/auto/modules/go b/auto/modules/go index dbba443d..27670dca 100644 --- a/auto/modules/go +++ b/auto/modules/go @@ -10,7 +10,7 @@ NXT_GO=go for nxt_option; do case "$nxt_option" in - -*=*) value=`$echo "$nxt_option" | sed -e 's/[-_a-zA-Z0-9]*=//'` ;; + -*=*) value=`echo "$nxt_option" | sed -e 's/[-_a-zA-Z0-9]*=//'` ;; *) value="" ;; esac @@ -29,9 +29,9 @@ END ;; *) - $echo - $echo $0: error: invalid Go option \"$nxt_option\" - $echo + echo + echo $0: error: invalid Go option \"$nxt_option\" + echo exit 1 ;; @@ -40,6 +40,16 @@ END done +if [ ! -f $NXT_AUTOCONF_DATA ]; then + echo + echo Please run common $0 before configuring module \"$nxt_module\". + echo + exit 1 +fi + +. $NXT_AUTOCONF_DATA + + $echo "configuring Go package" $echo "configuring Go package ..." >> $NXT_AUTOCONF_ERR diff --git a/auto/modules/php b/auto/modules/php index c9fff12f..cf4f3837 100644 --- a/auto/modules/php +++ b/auto/modules/php @@ -9,7 +9,7 @@ shift for nxt_option; do case "$nxt_option" in - -*=*) value=`$echo "$nxt_option" | sed -e 's/[-_a-zA-Z0-9]*=//'` ;; + -*=*) value=`echo "$nxt_option" | sed -e 's/[-_a-zA-Z0-9]*=//'` ;; *) value="" ;; esac @@ -21,27 +21,36 @@ for nxt_option; do --help) cat << END - --config=NAME set php-config name - --module=NAME set php module name - --lib-path=PATH set path to libphp.so library + --config=FILE set php-config filename + --module=NAME set unit php module name + --lib-path=DIRECTORY set directory path to libphp.so library END exit 0 ;; *) - $echo - $echo $0: error: invalid PHP option \"$nxt_option\" - $echo + echo + echo $0: error: invalid PHP option \"$nxt_option\" + echo exit 1 ;; esac - done +if [ ! -f $NXT_AUTOCONF_DATA ]; then + echo + echo Please run common $0 before configuring module \"$nxt_module\". + echo + exit 1 +fi + +. $NXT_AUTOCONF_DATA + + NXT_PHP_CONFIG=${NXT_PHP_CONFIG=php-config} NXT_PHP=${NXT_PHP_CONFIG%-config*} NXT_PHP_MODULE=${NXT_PHP_MODULE=${NXT_PHP##*/}} diff --git a/auto/modules/python b/auto/modules/python index d34abca9..b07ed19f 100644 --- a/auto/modules/python +++ b/auto/modules/python @@ -9,7 +9,7 @@ shift for nxt_option; do case "$nxt_option" in - -*=*) value=`$echo "$nxt_option" | sed -e 's/[-_a-zA-Z0-9]*=//'` ;; + -*=*) value=`echo "$nxt_option" | sed -e 's/[-_a-zA-Z0-9]*=//'` ;; *) value="" ;; esac @@ -21,17 +21,17 @@ for nxt_option; do --help) cat << END - --config=NAME set python-config name - --module=NAME set python module name + --config=FILE set python-config filename + --module=NAME set unit python module name END exit 0 ;; *) - $echo - $echo $0: error: invalid Python option \"$nxt_option\" - $echo + echo + echo $0: error: invalid Python option \"$nxt_option\" + echo exit 1 ;; esac @@ -39,6 +39,16 @@ END done +if [ ! -f $NXT_AUTOCONF_DATA ]; then + echo + echo Please run common $0 before configuring module \"$nxt_module\". + echo + exit 1 +fi + +. $NXT_AUTOCONF_DATA + + NXT_PYTHON_CONFIG=${NXT_PYTHON_CONFIG=python-config} NXT_PYTHON=${NXT_PYTHON_CONFIG%-config*} NXT_PYTHON_MODULE=${NXT_PYTHON_MODULE=${NXT_PYTHON##*/}} |