[libsoup] Make http.conf deal with built-in mod_unixd
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup] Make http.conf deal with built-in mod_unixd
- Date: Mon, 1 May 2017 18:06:58 +0000 (UTC)
commit 390a9a2cc6bf4bc9151b0daafa90782b46576286
Author: Dan Winship <danw gnome org>
Date: Mon May 1 14:06:27 2017 -0400
Make http.conf deal with built-in mod_unixd
https://bugzilla.gnome.org/show_bug.cgi?id=776478
configure.ac | 7 +++++++
tests/httpd.conf.in | 2 +-
2 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 87a53b9..3df131e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -280,6 +280,13 @@ if test "$have_apache" = 1; then
fi
AC_MSG_RESULT($have_php_xmlrpc)
fi
+
+ if test -f "$APACHE_MODULE_DIR/mod_unixd.so"; then
+ IF_HAVE_MOD_UNIXD=""
+ else
+ IF_HAVE_MOD_UNIXD="#"
+ fi
+ AC_SUBST(IF_HAVE_MOD_UNIXD)
fi
AC_PATH_PROG(CURL, curl, no)
diff --git a/tests/httpd.conf.in b/tests/httpd.conf.in
index d07913a..b818c12 100644
--- a/tests/httpd.conf.in
+++ b/tests/httpd.conf.in
@@ -29,7 +29,7 @@ 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
LoadModule ssl_module @APACHE_SSL_MODULE_DIR@/mod_ssl.so
-LoadModule unixd_module @APACHE_SSL_MODULE_DIR@/mod_unixd.so
+@IF_HAVE_MOD_UNIXD@LoadModule unixd_module @APACHE_SSL_MODULE_DIR@/mod_unixd.so
DirectoryIndex index.txt
TypesConfig /dev/null
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]