[libsoup] meson: partially fix the apache detection code
- From: Claudio Saavedra <csaavedra src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup] meson: partially fix the apache detection code
- Date: Thu, 16 Aug 2018 16:33:19 +0000 (UTC)
commit f9b5f1ea7b7433b11a7c3018e4bc17a590dd125e
Author: Claudio Saavedra <csaavedra igalia com>
Date: Thu Aug 16 19:30:43 2018 +0300
meson: partially fix the apache detection code
Check in more places for the apache binary. The fix is not optimal but
Meson needs to be fixed, see
https://github.com/mesonbuild/meson/issues/1576
There are still issues in how apache is detected by Meson, see
https://gitlab.gnome.org/GNOME/libsoup/issues/7
meson.build | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index abbc3c08..d5c8adab 100644
--- a/meson.build
+++ b/meson.build
@@ -103,7 +103,11 @@ endif
#################################
# Regression tests dependencies #
#################################
-apache_httpd2 = find_program('httpd2', 'httpd', 'apache2', 'apache', required : false)
+# This abomination is a result of https://github.com/mesonbuild/meson/issues/1576
+apache_httpd2 = find_program('httpd2', 'httpd', 'apache2', 'apache',
+ '/sbin/httpd2', '/sbin/httpd', '/sbin/apache2', '/sbin/apache',
+ '/usr/sbin/httpd2', '/usr/sbin/httpd', '/usr/sbin/apache2', '/usr/sbin/apache',
+ required : false)
have_apache=false
apache_httpd2_version = ''
if apache_httpd2.found()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]