From de44c8885d897157b1a3f51eb3fc701df2a1dde0 Mon Sep 17 00:00:00 2001
From: Arnaud Rebillout <arnaud.rebillout@collabora.com>
Date: Mon, 22 Oct 2018 11:39:56 +0700
Subject: [PATCH] meson: Fix HAVE_AF_UNIX, add check for mkfifo function

Signed-off-by: Arnaud Rebillout <arnaud.rebillout@collabora.com>
---
 meson.build            | 7 ++++++-
 src/daemon/meson.build | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index 4cc77efb4..7e3245556 100644
--- a/meson.build
+++ b/meson.build
@@ -110,7 +110,6 @@ check_headers = [
   'sys/resource.h',
   'sys/select.h',
   'sys/socket.h',
-  'sys/un.h',
   'sys/wait.h',
   'valgrind/memcheck.h',
   'xlocale.h',
@@ -128,6 +127,11 @@ if cc.has_header('pthread.h')
   cdata.set('HAVE_PTHREAD', 1)
 endif
 
+# FIXME: move this to the above set
+if cc.has_header('sys/un.h')
+  cdata.set('HAVE_AF_UNIX', 1)
+endif
+
 # Functions
 
 check_functions = [
@@ -144,6 +148,7 @@ check_functions = [
   'getuid',
   'lstat',
   'memfd_create',
+  'mkfifo',
   'mlock',
   'nanosleep',
   'paccept',
diff --git a/src/daemon/meson.build b/src/daemon/meson.build
index 40527e9c0..fa9e24ccd 100644
--- a/src/daemon/meson.build
+++ b/src/daemon/meson.build
@@ -73,7 +73,7 @@ default_conf = configuration_data()
 default_conf.merge_from(cdata)
 default_conf.set('PA_BINARY', cdata.get_unquoted('PA_BINARY'))
 default_conf.set('PA_SOEXT', cdata.get_unquoted('PA_SOEXT'))
-# TODO: OS_IS_WIN32, HAVE_MKFIFO, HAVE_AF_UNIX
+# TODO: OS_IS_WIN32
 
 default_template_file = configure_file(
   input : 'default.pa.in',