PHP: rearranged feature checks in ./configure.

Now it prints version even if PHP was built without embed SAPI.

1 files changed, 48 insertions, 46 deletions

diff --git a/auto/modules/php b/auto/modules/php
index 51b068e7..014bb3e7 100644
--- a/auto/modules/php
+++ b/auto/modules/php
@@ -110,76 +110,78 @@ if /bin/sh -c "${NXT_PHP_CONFIG} --version" >> $NXT_AUTOCONF_ERR 2>&1; then
         fi
     fi
 
-    nxt_feature="PHP embed SAPI"
-    nxt_feature_name=""
-    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_module_startup(NULL, NULL, 0);
-            return 0;
-        }"
-
-    . auto/feature
-
-    if [ $nxt_found = no ]; then
-        $echo
-        $echo $0: error: no PHP embed SAPI found.
-        $echo
-        exit 1;
-    fi
+else
+    $echo
+    $echo $0: error: no PHP found.
+    $echo
+    exit 1;
+fi
 
-    # Bug #71041 (https://bugs.php.net/bug.php?id=71041).
 
-    nxt_feature="PHP zend_signal_startup()"
-    nxt_feature_name=""
-    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>
+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() {
-            zend_signal_startup();
-            return 0;
-        }"
+    int main() {
+        printf(\"%s\", PHP_VERSION);
+        return 0;
+    }"
 
-    . auto/feature
+. auto/feature
 
-    if [ $nxt_found = yes ]; then
-        NXT_ZEND_SIGNAL_STARTUP=1
-    else
-        NXT_ZEND_SIGNAL_STARTUP=0
-    fi
 
-else
+nxt_feature="PHP embed SAPI"
+nxt_feature_name=""
+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_module_startup(NULL, NULL, 0);
+        return 0;
+    }"
+
+. auto/feature
+
+if [ $nxt_found = no ]; then
     $echo
-    $echo $0: error: no PHP found.
+    $echo $0: error: no PHP embed SAPI found.
     $echo
     exit 1;
 fi
 
 
-nxt_feature="PHP version"
+# Bug #71041 (https://bugs.php.net/bug.php?id=71041).
+
+nxt_feature="PHP zend_signal_startup()"
 nxt_feature_name=""
-nxt_feature_run=value
+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() {
-        printf(\"%s\", PHP_VERSION);
+        zend_signal_startup();
         return 0;
     }"
 
 . auto/feature
 
+if [ $nxt_found = yes ]; then
+    NXT_ZEND_SIGNAL_STARTUP=1
+else
+    NXT_ZEND_SIGNAL_STARTUP=0
+fi
+
 
 if grep ^$NXT_PHP_MODULE: $NXT_MAKEFILE 2>&1 > /dev/null; then
     $echo