PHP: rearranged feature checks in ./configure.
Now it prints version even if PHP was built without embed SAPI.
@@ -110,6 +110,30 @@ if /bin/sh -c "${NXT_PHP_CONFIG} --version" >> $NXT_AUTOCONF_ERR 2>&1; then
fi
fi
+else
+ $echo
+ $echo $0: error: no PHP found.
+ $echo
+ exit 1;
+fi
+
+
+nxt_feature="PHP version"
+nxt_feature_name=""
+nxt_feature_run=value
+nxt_feature_incs="${NXT_PHP_INCLUDE}"
+nxt_feature_libs="${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS}"
+nxt_feature_test="
+ #include <php.h>
+
+ int main() {
+ printf(\"%s\", PHP_VERSION);
+ return 0;
+ }"
+
+. auto/feature
+
+
nxt_feature="PHP embed SAPI"
nxt_feature_name=""
nxt_feature_run=no
@@ -133,6 +157,7 @@ if /bin/sh -c "${NXT_PHP_CONFIG} --version" >> $NXT_AUTOCONF_ERR 2>&1; then
exit 1;
fi
+
# Bug #71041 (https://bugs.php.net/bug.php?id=71041).
nxt_feature="PHP zend_signal_startup()"
@@ -157,29 +182,6 @@ if /bin/sh -c "${NXT_PHP_CONFIG} --version" >> $NXT_AUTOCONF_ERR 2>&1; then
NXT_ZEND_SIGNAL_STARTUP=0
fi
-else
- $echo
- $echo $0: error: no PHP found.
- $echo
- exit 1;
-fi
-
-
-nxt_feature="PHP version"
-nxt_feature_name=""
-nxt_feature_run=value
-nxt_feature_incs="${NXT_PHP_INCLUDE}"
-nxt_feature_libs="${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS}"
-nxt_feature_test="
- #include <php.h>
-
- int main() {
- printf(\"%s\", PHP_VERSION);
- return 0;
- }"
-
-. auto/feature
-
if grep ^$NXT_PHP_MODULE: $NXT_MAKEFILE 2>&1 > /dev/null; then
$echo
