diff options
| -rw-r--r-- | auto/feature | 2 | ||||
| -rw-r--r-- | auto/modules/php | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/auto/feature b/auto/feature index 55df46bc..dc58054c 100644 --- a/auto/feature +++ b/auto/feature @@ -37,7 +37,7 @@ END nxt_test="$CC $CFLAGS $NXT_CFLAGS $NXT_CC_OPT $NXT_TEST_CFLAGS \ $nxt_feature_inc_path -o $NXT_AUTOTEST $NXT_AUTOTEST.c \ - $NXT_LD_OPT $NXT_TEST_LIBS $nxt_feature_libs" + $nxt_feature_libs $NXT_LD_OPT $NXT_TEST_LIBS" # /bin/sh -c "(...)" is to intercept "Killed", "Abort trap", # "Segmentation fault", or other shell messages. diff --git a/auto/modules/php b/auto/modules/php index 4d29fb27..bfb45264 100644 --- a/auto/modules/php +++ b/auto/modules/php @@ -87,13 +87,15 @@ if /bin/sh -c "${NXT_PHP_CONFIG} --version" >> $NXT_AUTOCONF_ERR 2>&1; then fi NXT_PHP_LIB="$NXT_PHP_LIB_PATH/libphp${NXT_PHP_VERSION%%.*}.a" - NXT_PHP_LDFLAGS="`${NXT_PHP_CONFIG} --libs`" + NXT_PHP_LDFLAGS="`${NXT_PHP_CONFIG} --ldflags` \ + `${NXT_PHP_CONFIG} --libs`" else NXT_PHP_LIB="-lphp${NXT_PHP_VERSION%%.*}" if [ "$NXT_PHP_LIB_PATH" != "" ]; then - # "php-config --ldflags" does not contain path to libphp. + # "php-config --ldflags" does not contain path to libphp, but + # contains usually path to libraries required by extensions. NXT_PHP_LDFLAGS="-L${NXT_PHP_LIB_PATH} \ -Wl,-rpath ${NXT_PHP_LIB_PATH}" fi |