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

[Claudio Saavedra <csaavedra src gnome org>]

commit 23f21cdaff7da6674174dbcfa48df12f1a1c1fc3
Author: Tomas Popela <tpopela redhat com>
Date:   Fri Aug 31 10:15:57 2018 +0200

    meson: Don't check for mod_unixd presence in Meson file
    
    Unify the Apache configuration check to the get_apache_module_dirs.py
    script.

 get_apache_module_dirs.py | 8 +++++++-
 meson.build               | 3 +--
 2 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/get_apache_module_dirs.py b/get_apache_module_dirs.py
index 8333fd36..b58f6961 100755
--- a/get_apache_module_dirs.py
+++ b/get_apache_module_dirs.py
@@ -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()
diff --git a/meson.build b/meson.build
index 0af59869..949fa306 100644
--- a/meson.build
+++ b/meson.build
@@ -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