Deleted
Added
php (1376:2ecb15904ba5) | php (1382:6c8b10bbb4e8) |
---|---|
1 2# Copyright (C) Max Romanov 3# Copyright (C) Igor Sysoev 4# Copyright (C) NGINX, Inc. 5 6 7shift 8 --- 96 unchanged lines hidden (view full) --- 105 if [ "$NXT_PHP_LIB_PATH" != "" ]; then 106 # "php-config --ldflags" does not contain path to libphp, but 107 # contains usually path to libraries required by extensions. 108 NXT_PHP_LDFLAGS="-L${NXT_PHP_LIB_PATH} \ 109 -Wl,-rpath ${NXT_PHP_LIB_PATH}" 110 fi 111 fi 112 | 1 2# Copyright (C) Max Romanov 3# Copyright (C) Igor Sysoev 4# Copyright (C) NGINX, Inc. 5 6 7shift 8 --- 96 unchanged lines hidden (view full) --- 105 if [ "$NXT_PHP_LIB_PATH" != "" ]; then 106 # "php-config --ldflags" does not contain path to libphp, but 107 # contains usually path to libraries required by extensions. 108 NXT_PHP_LDFLAGS="-L${NXT_PHP_LIB_PATH} \ 109 -Wl,-rpath ${NXT_PHP_LIB_PATH}" 110 fi 111 fi 112 |
113 nxt_feature="PHP embed SAPI" 114 nxt_feature_name="" 115 nxt_feature_run=no 116 nxt_feature_incs="${NXT_PHP_INCLUDE}" 117 nxt_feature_libs="${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS}" 118 nxt_feature_test=" 119 #include <php.h> 120 #include <php_main.h> | 113else 114 $echo 115 $echo $0: error: no PHP found. 116 $echo 117 exit 1; 118fi |
121 | 119 |
122 int main() { 123 php_module_startup(NULL, NULL, 0); 124 return 0; 125 }" | |
126 | 120 |
127 . auto/feature | 121nxt_feature="PHP version" 122nxt_feature_name="" 123nxt_feature_run=value 124nxt_feature_incs="${NXT_PHP_INCLUDE}" 125nxt_feature_libs="${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS}" 126nxt_feature_test=" 127 #include <php.h> |
128 | 128 |
129 if [ $nxt_found = no ]; then 130 $echo 131 $echo $0: error: no PHP embed SAPI found. 132 $echo 133 exit 1; 134 fi | 129 int main() { 130 printf(\"%s\", PHP_VERSION); 131 return 0; 132 }" |
135 | 133 |
136 # Bug #71041 (https://bugs.php.net/bug.php?id=71041). | 134. auto/feature |
137 | 135 |
138 nxt_feature="PHP zend_signal_startup()" 139 nxt_feature_name="" 140 nxt_feature_run=no 141 nxt_feature_incs="${NXT_PHP_INCLUDE}" 142 nxt_feature_libs="${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS}" 143 nxt_feature_test=" 144 #include <php.h> 145 #include <php_main.h> | |
146 | 136 |
147 int main() { 148 zend_signal_startup(); 149 return 0; 150 }" | 137nxt_feature="PHP embed SAPI" 138nxt_feature_name="" 139nxt_feature_run=no 140nxt_feature_incs="${NXT_PHP_INCLUDE}" 141nxt_feature_libs="${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS}" 142nxt_feature_test=" 143 #include <php.h> 144 #include <php_main.h> |
151 | 145 |
152 . auto/feature | 146 int main() { 147 php_module_startup(NULL, NULL, 0); 148 return 0; 149 }" |
153 | 150 |
154 if [ $nxt_found = yes ]; then 155 NXT_ZEND_SIGNAL_STARTUP=1 156 else 157 NXT_ZEND_SIGNAL_STARTUP=0 158 fi | 151. auto/feature |
159 | 152 |
160else | 153if [ $nxt_found = no ]; then |
161 $echo | 154 $echo |
162 $echo $0: error: no PHP found. | 155 $echo $0: error: no PHP embed SAPI found. |
163 $echo 164 exit 1; 165fi 166 167 | 156 $echo 157 exit 1; 158fi 159 160 |
168nxt_feature="PHP version" | 161# Bug #71041 (https://bugs.php.net/bug.php?id=71041). 162 163nxt_feature="PHP zend_signal_startup()" |
169nxt_feature_name="" | 164nxt_feature_name="" |
170nxt_feature_run=value | 165nxt_feature_run=no |
171nxt_feature_incs="${NXT_PHP_INCLUDE}" 172nxt_feature_libs="${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS}" 173nxt_feature_test=" 174 #include <php.h> | 166nxt_feature_incs="${NXT_PHP_INCLUDE}" 167nxt_feature_libs="${NXT_PHP_LIB} ${NXT_PHP_LDFLAGS}" 168nxt_feature_test=" 169 #include <php.h> |
170 #include <php_main.h> |
|
175 176 int main() { | 171 172 int main() { |
177 printf(\"%s\", PHP_VERSION); | 173 zend_signal_startup(); |
178 return 0; 179 }" 180 181. auto/feature 182 | 174 return 0; 175 }" 176 177. auto/feature 178 |
179if [ $nxt_found = yes ]; then 180 NXT_ZEND_SIGNAL_STARTUP=1 181else 182 NXT_ZEND_SIGNAL_STARTUP=0 183fi |
|
183 | 184 |
185 |
|
184if grep ^$NXT_PHP_MODULE: $NXT_MAKEFILE 2>&1 > /dev/null; then 185 $echo 186 $echo $0: error: duplicate \"$NXT_PHP_MODULE\" module configured. 187 $echo 188 exit 1; 189fi 190 191$echo " + PHP module: ${NXT_PHP_MODULE}.unit.so" --- 67 unchanged lines hidden --- | 186if grep ^$NXT_PHP_MODULE: $NXT_MAKEFILE 2>&1 > /dev/null; then 187 $echo 188 $echo $0: error: duplicate \"$NXT_PHP_MODULE\" module configured. 189 $echo 190 exit 1; 191fi 192 193$echo " + PHP module: ${NXT_PHP_MODULE}.unit.so" --- 67 unchanged lines hidden --- |