Remove configure.ac.in and the 'distfile' target from

the FreeBSD makefile.  This is a step towards cleaning
out the non-FreeBSD bits from the FreeBSD source tree.

4 files changed, 6 insertions, 164 deletions

diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile
index 128f2c2..c854bd0 100644
--- a/usr.bin/tar/Makefile
+++ b/usr.bin/tar/Makefile
@@ -1,14 +1,8 @@
 # $FreeBSD$
 
-#
-# Use "make distfile" to build a tar.gz file suitable for distribution,
-# including an autoconf/automake-generated build system.
-#
-
 PROG=	bsdtar
-VERSION=	1.02.023
-DIST_SRCS=	bsdtar.c getdate.y matching.c read.c tree.c util.c write.c
-SRCS=	${DIST_SRCS}
+VERSION=	1.2.41
+SRCS=	bsdtar.c getdate.y matching.c read.c tree.c util.c write.c
 WARNS?=	5
 DPADD=	${LIBARCHIVE} ${LIBBZ2} ${LIBZ}
 LDADD=	-larchive -lbz2 -lz
@@ -17,32 +11,4 @@ CFLAGS+=	-I${.CURDIR}
 SYMLINKS=	bsdtar ${BINDIR}/tar
 MLINKS=	bsdtar.1 tar.1
 
-DIST_BUILD_DIR=	${.OBJDIR}/${PROG}-${VERSION}
-CLEANDIRS+=	${DIST_BUILD_DIR}
-DISTFILE=	${PROG}-${VERSION}.tar.gz
-# Files that just get copied to the distfile build directory
-DIST_FILES=	${DIST_SRCS}
-DIST_FILES+=	${MAN}
-DIST_FILES+=	bsdtar.h bsdtar_platform.h
-DIST_FILES+=	Makefile.am
-DIST_FILES+=	tree.h
-
-distfile:
-	rm -rf ${DIST_BUILD_DIR}
-	mkdir ${DIST_BUILD_DIR}
-	for f in ${DIST_FILES};					\
-	do							\
-		cat ${.CURDIR}/$$f >${DIST_BUILD_DIR}/$$f;	\
-	done
-	cat ${.CURDIR}/configure.ac.in |			\
-		sed 's/@VERSION@/${VERSION}/' |			\
-		cat > ${DIST_BUILD_DIR}/configure.ac
-	(cd ${DIST_BUILD_DIR} && aclocal && autoheader && autoconf )
-	(cd ${DIST_BUILD_DIR} && automake -a --foreign)
-	(cd ${DIST_BUILD_DIR} && ./configure && make distcheck && make dist)
-	mv ${DIST_BUILD_DIR}/${DISTFILE} ${.OBJDIR}
-	@echo ==================================================
-	@echo Created ${.OBJDIR}/${DISTFILE}
-	@echo ==================================================
-
 .include <bsd.prog.mk>
diff --git a/usr.bin/tar/Makefile.am b/usr.bin/tar/Makefile.am
index ce565c0..5f54812 100644
--- a/usr.bin/tar/Makefile.am
+++ b/usr.bin/tar/Makefile.am
@@ -14,8 +14,7 @@ bsdtar_SOURCES=				\
 		tree.h			\
 		util.c			\
 		write.c
-bsdtar_LDADD=	-larchive -lbz2 -lz
-
+bsdtar_LDADD= -L../libarchive -larchive -lbz2 -lz
+bsdtar_CPPFLAGS= -I../libarchive
 dist_man_MANS=	bsdtar.1
-
-DISTCLEANFILES=	getdate.c getdate.h
+EXTRA_DIST= test/test.sh
diff --git a/usr.bin/tar/bsdtar_platform.h b/usr.bin/tar/bsdtar_platform.h
index f3d283b..e74e25a 100644
--- a/usr.bin/tar/bsdtar_platform.h
+++ b/usr.bin/tar/bsdtar_platform.h
@@ -36,7 +36,7 @@
 #define	BSDTAR_PLATFORM_H_INCLUDED
 
 #if HAVE_CONFIG_H
-#include "config.h"
+#include "../config.h"
 #else
 
 #ifdef __FreeBSD__
diff --git a/usr.bin/tar/configure.ac.in b/usr.bin/tar/configure.ac.in
deleted file mode 100644
index fc5aae8..0000000
--- a/usr.bin/tar/configure.ac.in
+++ /dev/null
@@ -1,123 +0,0 @@
-# $FreeBSD$
-
-# Process this file with autoconf to produce a configure script.
-AC_INIT(bsdtar, @VERSION@, kientzle@freebsd.org)
-AM_INIT_AUTOMAKE(bsdtar, @VERSION@)
-AC_CONFIG_SRCDIR([bsdtar.c])
-AM_CONFIG_HEADER([config.h])
-
-# Checks for programs.
-AC_PROG_CC
-AC_PROG_YACC
-
-# Checks for header files.
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_CHECK_HEADERS([bzlib.h fcntl.h inttypes.h langinfo.h limits.h locale.h paths.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h unistd.h zlib.h])
-
-# Checks for libraries.
-AC_CHECK_LIB([z], [inflate])
-AC_CHECK_LIB([bz2], [BZ2_bzDecompressInit])
-AC_CHECK_LIB([archive], [archive_version])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_UID_T
-AC_TYPE_MODE_T
-AC_TYPE_OFF_T
-AC_TYPE_SIZE_T
-AC_CHECK_TYPE(id_t, [unsigned long])
-AC_CHECK_MEMBERS([struct stat.st_rdev, struct stat.st_mtimespec.tv_nsec, struct stat.st_mtim.tv_nsec])
-
-
-AC_CHECK_DECL([D_MD_ORDER],
-[AC_DEFINE(HAVE_D_MD_ORDER, 1, [Define to 1 if nl_langinfo supports D_MD_ORDER])],
-[],
-[#if HAVE_LANGINFO_H
-#include <langinfo.h>
-#endif
-])
-
-AC_FUNC_FNMATCH
-AC_CHECK_DECL([FNM_LEADING_DIR],
-[AC_DEFINE(HAVE_FNM_LEADING_DIR, 1, [Define to 1 if fnmatch(3) supports the FNM_LEADING_DIR flag])],
-[],
-[#if HAVE_FNMATCH
-#define _GNU_SOURCE /* Required on Linux to get GNU extensions */
-#include <fnmatch.h>
-#endif
-])
-
-# Check for dirent.d_namlen field explicitly
-AC_CHECK_MEMBER(struct dirent.d_namlen,,,
-[#if HAVE_DIRENT_H
-#include <dirent.h>
-#endif
-])
-
-# Check for ACL support
-AC_CHECK_HEADERS([sys/acl.h])
-AC_CHECK_LIB([acl],[acl_get_file])
-
-AC_CHECK_TYPES(acl_permset_t,,,
-[#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if HAVE_SYS_ACL_H
-#include <sys/acl.h>
-#endif
-])
-
-# The "acl_get_perm()" function was omitted from the POSIX draft.
-# (It's a pretty obvious oversight; otherwise, there's no way to
-# test for specific permissions in a permset.)  Linux uses the obvious
-# name, FreeBSD adds _np to mark it as "non-Posix extension."
-# Test for both as a double-check that we really have POSIX-style ACL support.
-AC_CHECK_FUNCS(acl_get_perm_np acl_get_perm,,,
-[#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if HAVE_SYS_ACL_H
-#include <sys/acl.h>
-#endif
-])
-
-# MacOS has an acl.h that isn't POSIX.  It can be detected by
-# checking for ACL_USER
-AC_CHECK_DECL([ACL_USER],
-		[AC_DEFINE(HAVE_ACL_USER, 1, [True for systems with POSIX ACL support])],
-		[],
-		[#include <sys/acl.h>])
-
-# Checks for library functions.
-AC_PROG_GCC_TRADITIONAL
-AC_FUNC_LSTAT
-AC_HEADER_MAJOR
-AC_FUNC_STAT
-AC_FUNC_STRFTIME
-AC_FUNC_VPRINTF
-AC_CHECK_TYPES([uintmax_t, unsigned long long])
-AC_CHECK_FUNCS([chflags fchdir ftruncate getopt_long memmove memset nl_langinfo reallocf setlocale strchr strdup strerror strrchr])
-
-#
-# If any of the common 64-bit types is defined, set "int64_t"
-#
-AC_CHECK_TYPE(__int64_t, [long long])
-AC_CHECK_TYPE(_int64_t, [__int64_t])
-AC_CHECK_TYPE(int64_t, [_int64_t])
-
-#
-# If any of the common 64-bit unsigned types is defined, set "uint64_t"
-#
-AC_CHECK_TYPE(__uint64_t, [unsigned long long])
-AC_CHECK_TYPE(_uint64_t, [__uint64_t])
-AC_CHECK_TYPE(u_int64_t, [_uint64_t])
-AC_CHECK_TYPE(uint64_t, [u_int64_t])
-
-#define	HAVE_CHFLAGS		1
-
-# Additional requirements
-AC_SYS_LARGEFILE
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT