diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2017-08-17 21:47:19 +0300 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2017-08-17 21:47:19 +0300 |
| commit | 5ef8e0ee8933e914b1847168255b53f07c3727b3 (patch) | |
| tree | f4e4b512d86a8a92eeb48c44e54db510660ea4fe /auto/modules/php | |
| parent | 1ba2f44ad9b95670452f31a0923b8a118a08d867 (diff) | |
| download | unit-5ef8e0ee8933e914b1847168255b53f07c3727b3.tar.gz unit-5ef8e0ee8933e914b1847168255b53f07c3727b3.tar.bz2 | |
Removing auto/modules directory before commiting the new module
configuration infrastructure.
Diffstat (limited to '')
| -rw-r--r-- | auto/modules/php/conf | 56 | ||||
| -rw-r--r-- | auto/modules/php/make | 24 |
2 files changed, 0 insertions, 80 deletions
diff --git a/auto/modules/php/conf b/auto/modules/php/conf deleted file mode 100644 index 445baa29..00000000 --- a/auto/modules/php/conf +++ /dev/null @@ -1,56 +0,0 @@ - -# Copyright (C) Max Romanov -# Copyright (C) NGINX, Inc. - - -$echo -n "checking for PHP ..." -$echo "checking for PHP ..." >> $NXT_AUTOCONF_ERR - -nxt_found=no - -NXT_PHP_CONFIG="${NXT_PHP}-config" - -if /bin/sh -c "${NXT_PHP_CONFIG} --version" >> $NXT_AUTOCONF_ERR 2>&1; then - - $echo " found" - - NXT_PHP_VERSION="`${NXT_PHP_CONFIG} --version`" - $echo " + PHP version: ${NXT_PHP_VERSION}" - $echo " + PHP SAPI: [`${NXT_PHP_CONFIG} --php-sapis`]" - - NXT_PHP_INCLUDE="`${NXT_PHP_CONFIG} --includes`" - NXT_PHP_LIB="-lphp${NXT_PHP_VERSION%%.*}" - # "php-config --ldflags" does not contain path to libphp. - - nxt_feature="PHP embed SAPI" - nxt_feature_name=NXT_HAVE_PHP - nxt_feature_run=no - nxt_feature_incs="${NXT_PHP_INCLUDE}" - nxt_feature_libs="${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS}" - nxt_feature_test=" - #include <php.h> - #include <php_main.h> - - int main() { - php_request_startup(); - return 0; - }" - - . auto/feature -fi - -if [ $nxt_found = no ]; then - $echo - $echo $0: error: no PHP embed SAPI found. - $echo - exit 1; -fi - -NXT_PHP_MODULE_SRCS=" \ - src/nxt_php_sapi.c \ -" - -NXT_MODULES_INIT="$NXT_MODULES_INIT nxt_php_sapi_init" -NXT_MODULES_SRCS="$NXT_MODULES_SRCS $NXT_PHP_MODULE_SRCS" - -NXT_LIB_AUX_LIBS="$NXT_LIB_AUX_LIBS $NXT_PHP_LIB $NXT_PHP_LDFLAGS" diff --git a/auto/modules/php/make b/auto/modules/php/make deleted file mode 100644 index f4bd7f97..00000000 --- a/auto/modules/php/make +++ /dev/null @@ -1,24 +0,0 @@ - -# Copyright (C) Max Romanov -# Copyright (C) NGINX, Inc. - - -$echo >> $NXT_MAKEFILE -$echo >> $NXT_MAKEFILE - - -# The php module object files. - -for nxt_src in $NXT_PHP_MODULE_SRCS -do - nxt_obj=`$echo $nxt_src | sed -e "s/\.c$/\.o/"` - cat << END >> $NXT_MAKEFILE - -$NXT_BUILD_DIR/$nxt_obj: $nxt_src - \$(CC) -c \$(CFLAGS) \$(NXT_INCS) $NXT_PHP_INCLUDE \\ - $NXT_LIB_AUX_CFLAGS \\ - -o $NXT_BUILD_DIR/$nxt_obj \\ - $nxt_src -END - -done |