svn commit: r206464 - head/usr.bin/tar

[Tim Kientzle]

Author: kientzle
Date: Sun Apr 11 01:31:50 2010
New Revision: 206464
URL: http://svn.freebsd.org/changeset/base/206464

Log:
  Remove an unnecessary include and conditionalize some code.

Modified:
  head/usr.bin/tar/bsdtar.c
  head/usr.bin/tar/bsdtar_platform.h

Modified: head/usr.bin/tar/bsdtar.c
==============================================================================
--- head/usr.bin/tar/bsdtar.c	Sun Apr 11 01:30:15 2010	(r206463)
+++ head/usr.bin/tar/bsdtar.c	Sun Apr 11 01:31:50 2010	(r206464)
@@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$");
 
 #include "bsdtar.h"
 #include "err.h"
-#include "matching.h"
 
 /*
  * Per POSIX.1-1988, tar defaults to reading/writing archives to/from
@@ -180,8 +179,10 @@ main(int argc, char **argv)
 
 	time(&now);
 
+#if HAVE_SETLOCALE
 	if (setlocale(LC_ALL, "") == NULL)
 		bsdtar_warnc(0, "Failed to set default locale");
+#endif
 #if defined(HAVE_NL_LANGINFO) && defined(HAVE_D_MD_ORDER)
 	bsdtar->day_first = (*nl_langinfo(D_MD_ORDER) == 'd');
 #endif

Modified: head/usr.bin/tar/bsdtar_platform.h
==============================================================================
--- head/usr.bin/tar/bsdtar_platform.h	Sun Apr 11 01:30:15 2010	(r206463)
+++ head/usr.bin/tar/bsdtar_platform.h	Sun Apr 11 01:31:50 2010	(r206464)
@@ -62,6 +62,10 @@
 #include "archive_entry.h"
 #endif
 
+#ifdef HAVE_LIBACL
+#include <acl/libacl.h>
+#endif
+
 /*
  * Include "dirent.h" (or it's equivalent on several different platforms).
  *