diff options
| author | Dan Winship <danw@gnome.org> | 2017-05-01 12:53:06 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2017-05-01 12:53:06 -0400 |
| commit | a1019d5267f9dc4920eff68ec8967eb6adec2f72 (patch) | |
| tree | 324a8f96caa28741ea76d30390f8bfb9a9be99b3 | |
| parent | 5e5657c929c1a6146944c17c48c24af6ad90804d (diff) | |
| download | libsoup-a1019d5267f9dc4920eff68ec8967eb6adec2f72.tar.gz | |
Switch test PHP support from PHP 5 to 7
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | tests/httpd.conf.in | 2 |
2 files changed, 6 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 73744ec3..87a53b9b 100644 --- a/configure.ac +++ b/configure.ac @@ -238,20 +238,14 @@ if test "$APACHE_HTTPD" != "no"; then APACHE_SSL_MODULE_DIR="$dir" IF_HAVE_APACHE_SSL="" fi - if test -f $dir/mod_php5.so; then + if test -f $dir/libphp7.so; then APACHE_PHP_MODULE_DIR="$dir" - APACHE_PHP_MODULE=mod_php5.so - fi - if test -f $dir/libphp5.so; then - APACHE_PHP_MODULE_DIR="$dir" - APACHE_PHP_MODULE=libphp5.so fi done AC_MSG_RESULT($APACHE_MODULE_DIR) AC_SUBST(APACHE_MODULE_DIR) AC_SUBST(APACHE_SSL_MODULE_DIR) AC_SUBST(APACHE_PHP_MODULE_DIR) - AC_SUBST(APACHE_PHP_MODULE) fi if test "$APACHE_HTTPD" != "no" -a -n "$APACHE_MODULE_DIR" -a -n "$APACHE_SSL_MODULE_DIR"; then @@ -263,14 +257,14 @@ fi AM_CONDITIONAL(HAVE_APACHE, test "$have_apache" = 1) if test "$have_apache" = 1; then - AC_CHECK_PROGS(PHP, php php5) + AC_CHECK_PROGS(PHP, php) AC_MSG_CHECKING([for Apache PHP module]) - if test -f $APACHE_PHP_MODULE_DIR/$APACHE_PHP_MODULE; then - have_php=yes + if test -d "$APACHE_PHP_MODULE_DIR"; then + have_php="yes" IF_HAVE_PHP="" else - have_php=no + have_php="no" IF_HAVE_PHP="#" fi AC_MSG_RESULT($have_php) diff --git a/tests/httpd.conf.in b/tests/httpd.conf.in index 9d36d588..d07913ad 100644 --- a/tests/httpd.conf.in +++ b/tests/httpd.conf.in @@ -24,7 +24,7 @@ LoadModule authz_host_module @APACHE_MODULE_DIR@/mod_authz_host.so LoadModule authz_user_module @APACHE_MODULE_DIR@/mod_authz_user.so LoadModule dir_module @APACHE_MODULE_DIR@/mod_dir.so LoadModule mime_module @APACHE_MODULE_DIR@/mod_mime.so -@IF_HAVE_PHP@LoadModule php5_module @APACHE_PHP_MODULE_DIR@/@APACHE_PHP_MODULE@ +@IF_HAVE_PHP@LoadModule php7_module @APACHE_PHP_MODULE_DIR@/libphp7.so LoadModule proxy_module @APACHE_MODULE_DIR@/mod_proxy.so LoadModule proxy_http_module @APACHE_MODULE_DIR@/mod_proxy_http.so LoadModule proxy_connect_module @APACHE_MODULE_DIR@/mod_proxy_connect.so |