Commit 4f4110d5 authored by Tomas Popela's avatar Tomas Popela

Partially fix Apache based tests - at least they start now

parent 2437bdfd
......@@ -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()
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment