blob: 067b73ff358c752148c241d5472e2ef75aff2055 [file] [log] [blame]
Brad Bishopd7bf8c12018-02-25 22:55:05 -05001From 1355457092b02a15c646fc1c72e68b694a86dd99 Mon Sep 17 00:00:00 2001
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05002From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 22 Feb 2016 06:02:38 +0000
Brad Bishopd7bf8c12018-02-25 22:55:05 -05004Subject: [PATCH 12/14] check for uchar.h in configure
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05005
6Use ifdef to include uchar.h
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
Brad Bishopd7bf8c12018-02-25 22:55:05 -05009Upstream-Status: Pending
10
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050011---
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050012 configure.ac | 1 +
13 src/basic/missing.h | 2 ++
14 2 files changed, 3 insertions(+)
15
16diff --git a/configure.ac b/configure.ac
Brad Bishopd7bf8c12018-02-25 22:55:05 -050017index 1150ca50e..60e7df5ee 100644
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050018--- a/configure.ac
19+++ b/configure.ac
Brad Bishopd7bf8c12018-02-25 22:55:05 -050020@@ -304,6 +304,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" = "xyes"])
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050021
22 # ------------------------------------------------------------------------------
23
24+AC_CHECK_HEADERS([uchar.h], [], [])
25 AC_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([*** POSIX caps headers not found])])
26 AC_CHECK_HEADERS([linux/btrfs.h], [], [])
27 AC_CHECK_HEADERS([linux/memfd.h], [], [])
28diff --git a/src/basic/missing.h b/src/basic/missing.h
Brad Bishopd7bf8c12018-02-25 22:55:05 -050029index 25a11f351..d631b7e3e 100644
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050030--- a/src/basic/missing.h
31+++ b/src/basic/missing.h
Brad Bishopd7bf8c12018-02-25 22:55:05 -050032@@ -37,7 +37,9 @@
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050033 #include <sys/resource.h>
Brad Bishopd7bf8c12018-02-25 22:55:05 -050034 #include <sys/socket.h>
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050035 #include <sys/syscall.h>
36+#ifdef HAVE_UCHAR_H
37 #include <uchar.h>
38+#endif
39 #include <unistd.h>
40
41 #ifdef HAVE_AUDIT
42--
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500432.13.2
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050044