From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Sun, 22 Mar 2009 10:39:08 +0000 (-0400)
Subject: Catch up with r829.
X-Git-Tag: v2.7.0~101
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=63985961e681fec264a8d3c12ed736ad7ca3eaed;p=thirdparty%2Flibarchive.git

Catch up with r829.

SVN-Revision: 833
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c3a7f66c..d1be60e65 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -271,8 +271,6 @@ CHECK_FUNCTION_EXISTS(SHA512_Init HAVE_SHA512)
 # Check functions
 #
 CHECK_FUNCS(chflags chown chroot)
-CHECK_FUNCS(extattr_get_file extattr_list_file)
-CHECK_FUNCS(extattr_set_fd extattr_set_file)
 CHECK_FUNCS(fchdir fchflags fchmod fchown fcntl fork)
 CHECK_FUNCS(fstat ftruncate futimes geteuid getpid)
 CHECK_FUNCS(lchflags lchmod lchown)
@@ -280,7 +278,7 @@ CHECK_FUNCS(lutimes memmove memset mkdir mkfifo mknod)
 CHECK_FUNCS(nl_langinfo pipe poll readlink select setenv setlocale)
 CHECK_FUNCS(strchr strdup strerror strrchr timegm)
 CHECK_FUNCS(tzset unsetenv utime utimes vfork)
-CHECK_FUNCS(wcscpy wcslen wctomb wmemcmp wmemcpy)
+CHECK_FUNCS(wcrtomb wcscpy wcslen wctomb wmemcmp wmemcpy)
 
 
 SET(CMAKE_REQUIRED_LIBRARIES "")
@@ -489,7 +487,10 @@ IF(ENABLE_XATTR)
   IF(HAVE_ATTR_LIB)
     SET(CMAKE_REQUIRED_LIBRARIES "attr")
   ENDIF(HAVE_ATTR_LIB)
-  CHECK_FUNCS(getxattr lgetxattr listxattr llistxattr fsetxattr lsetxattr)
+  CHECK_FUNCS(extattr_get_file extattr_list_file)
+  CHECK_FUNCS(extattr_set_fd extattr_set_file)
+  CHECK_FUNCS(fsetxattr getxattr)
+  CHECK_FUNCS(lgetxattr listxattr llistxattr lsetxattr)
 ENDIF(ENABLE_XATTR)
 
 #
diff --git a/build/cmake/config.h.in b/build/cmake/config.h.in
index 9048f9df3..3ab657563 100644
--- a/build/cmake/config.h.in
+++ b/build/cmake/config.h.in
@@ -518,6 +518,9 @@
 /* Define to 1 if the system has the type `wchar_t'. */
 #cmakedefine HAVE_WCHAR_T 1
 
+/* Define to 1 if you have the `wcrtomb' function. */
+#cmakedefine HAVE_WCRTOMB 1
+
 /* Define to 1 if you have the `wcscpy' function. */
 #cmakedefine HAVE_WCSCPY 1