Commit 23f21cda authored by Tomas Popela's avatar Tomas Popela

meson: Don't check for mod_unixd presence in Meson file

Unify the Apache configuration check to the get_apache_module_dirs.py
script.
parent b2d74885
......@@ -68,6 +68,7 @@ def main():
apache_module_dir = ''
apache_ssl_module_dir = ''
apache_php_module_file = ''
apache_mod_unixd_module_file = ''
for lib_dir in ['lib', 'lib64']:
for httpd_dir in ['apache', 'apache2', 'http', 'http2', 'httpd']:
......@@ -81,12 +82,17 @@ def main():
php_module = check_php_module(modules_path)
if (php_module):
apache_php_module_file = php_module
if check_module(modules_path, 'mod_unixd.so'):
apache_mod_unixd_module_file = modules_path
# These two are mandatory for having properly configured Apache
if apache_module_dir == '' or apache_ssl_module_dir == '':
sys.exit(1)
print(apache_module_dir + ":" + apache_ssl_module_dir + ":" + apache_php_module_file, end='')
print(apache_module_dir + ":" +
apache_ssl_module_dir + ":" +
apache_php_module_file + ":" +
apache_mod_unixd_module_file, end='')
if __name__ == "__main__":
main()
......@@ -133,8 +133,7 @@ if have_apache
cdata.set('APACHE_MODULE_DIR', apache_module_dirs[0])
cdata.set('APACHE_SSL_MODULE_DIR', apache_module_dirs[1])
cdata.set('APACHE_PHP_MODULE_FILE', apache_module_dirs[2])
apache_mod_unixd = run_command('test', '-f', join_paths(apache_module_dirs[0], 'mod_unixd.so'))
cdata.set('IF_HAVE_MOD_UNIXD', apache_mod_unixd.returncode() == 0 ? '' : '#')
cdata.set('IF_HAVE_MOD_UNIXD', apache_module_dirs[3] != '' ? '' : '#')
cdata.set('HAVE_APACHE', have_apache)
endif
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