From 5ccc2612d1e752c7d2ccc470ebc1947a9db92819 Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Sun, 8 Aug 2004 01:30:30 +0000 Subject: [PATCH] Minor portability fixes. bsdtar now compiles on Win32/cygwin, though it doesn't yet seem to work entirely correctly. --- usr.bin/tar/configure.ac.in | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/usr.bin/tar/configure.ac.in b/usr.bin/tar/configure.ac.in index d93c3acc7656..024e21ffffb9 100644 --- a/usr.bin/tar/configure.ac.in +++ b/usr.bin/tar/configure.ac.in @@ -1,8 +1,8 @@ # $FreeBSD$ # Process this file with autoconf to produce a configure script. -AC_INIT(bsdtar, 1.00, kientzle@freebsd.org) -AM_INIT_AUTOMAKE(bsdtar, 1.00) +AC_INIT(bsdtar, @VERSION@, kientzle@freebsd.org) +AM_INIT_AUTOMAKE(bsdtar, @VERSION@) AC_CONFIG_SRCDIR([bsdtar.c]) AM_CONFIG_HEADER([config.h]) @@ -25,6 +25,7 @@ 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, [D_MD_ORDER is a valid argument to nl_langinfo])], @@ -46,6 +47,21 @@ AC_CHECK_TYPE([uintmax_t]) AC_CHECK_TYPE([unsigned long long]) AC_CHECK_FUNCS([chflags fchdir ftruncate getopt_long memmove memset nl_langinfo setlocale strchr strdup strerror strrchr sys/acl.h]) +# +# 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