[libsoup/wip/meson] Partially fix Apache based tests - at least they start now
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsoup/wip/meson] Partially fix Apache based tests - at least they start now
- Date: Mon, 13 Nov 2017 15:02:06 +0000 (UTC)
commit eee8217e0f42ef8d095572374a6ce7f6194ac0bd
Author: Tomas Popela <tpopela redhat com>
Date: Mon Nov 13 16:01:01 2017 +0100
Partially fix Apache based tests - at least they start now
get_apache_module_dirs.py | 2 +-
meson.build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/get_apache_module_dirs.py b/get_apache_module_dirs.py
index c745030..30dea6c 100755
--- a/get_apache_module_dirs.py
+++ b/get_apache_module_dirs.py
@@ -69,7 +69,7 @@ def main():
if os.path.isfile(modules_path + 'libphp7.so'):
apache_php_module_dir = modules_path
- print(apache_module_dir + ":" + apache_ssl_module_dir + ":" + apache_php_module_dir, end='')
+ print(apache_module_dir.rstrip('/') + ":" + apache_ssl_module_dir.rstrip('/') + ":" +
apache_php_module_dir.rstrip('/'), end='')
if __name__ == "__main__":
main()
diff --git a/meson.build b/meson.build
index b3eb14b..cb7251e 100644
--- a/meson.build
+++ b/meson.build
@@ -102,7 +102,7 @@ if have_apache
endif
endif
cdata.set('IF_HAVE_PHP', have_php ? '' : '#')
- apache_mod_unixd = run_command('test', '-d', cdata.get('APACHE_MODULE_DIR') + 'mod_unixd.so')
+ apache_mod_unixd = run_command('test', '-f', cdata.get('APACHE_MODULE_DIR') + '/mod_unixd.so')
cdata.set('IF_HAVE_MOD_UNIXD', apache_mod_unixd.returncode() == 0 ? '' : '#')
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]