Fail on configure when '--with-xattr' is passed and xattr.h cannot be found.

This commit is contained in:
Erich E. Hoover 2014-02-15 18:21:54 -07:00
parent 30f3d023d5
commit 7e5038e76c

View File

@ -1,16 +1,16 @@
From 3e44f846dd1ff9487ba6085e11f74f10027a6f2c Mon Sep 17 00:00:00 2001
From 96470b6ee4c0e91700ac197e77784feb42d9a961 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Thu, 13 Feb 2014 15:54:02 -0700
Date: Sat, 15 Feb 2014 18:20:49 -0700
Subject: server: Store file security attributes with extended file
attributes.
---
configure.ac | 6 ++++++
configure.ac | 12 +++++++++++
server/file.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 73 insertions(+)
2 files changed, 79 insertions(+)
diff --git a/configure.ac b/configure.ac
index 32730f3..bdcc5f8 100644
index 32730f3..96d796a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,7 @@ AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthrea
@ -21,13 +21,19 @@ index 32730f3..bdcc5f8 100644
AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),
[if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi])
AC_ARG_WITH(xcursor, AS_HELP_STRING([--without-xcursor],[do not use the Xcursor extension]),
@@ -661,6 +662,11 @@ AC_CHECK_HEADERS([libprocstat.h],,,
@@ -661,6 +662,17 @@ AC_CHECK_HEADERS([libprocstat.h],,,
#include <sys/socket.h>
#endif])
+if test "x$with_xattr" != "xno"
+then
+ AC_CHECK_HEADERS(attr/xattr.h)
+ AC_CHECK_HEADER(attr/xattr.h,HAVE_XATTR=1)
+fi
+if test "x$with_xattr" == "xyes"
+then
+ WINE_ERROR_WITH(xattr,[test "x$HAVE_XATTR" = "x"],[xattr ${notice_platform}development files not \
+found. Wine will be built without extended attribute support, which probably isn't what you want. \
+You will need to install ${notice_platform}development packages of libacl at the very least.])
+fi
+
dnl **** Check for working dll ****