X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=35edb08afc81d30a26fac4631921c41f9e376e23;hb=cbc51277aa4de1f41434ba073f2e4546ead63005;hp=fd4b2fad849713a47864bc13844e12f002755dd2;hpb=7efe3850f6e058d33a46ef17cdc95df0469ed887;p=chaz%2Ftar diff --git a/configure.ac b/configure.ac index fd4b2fa..35edb08 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,8 @@ -# Configure template for GNU tar. +# Configure template for GNU tar. -*- autoconf -*- # Copyright (C) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +# Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,12 +19,15 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -AC_INIT([GNU tar], [1.19.90], [bug-tar@gnu.org]) +AC_INIT([GNU tar], [1.26.90], [bug-tar@gnu.org]) AC_CONFIG_SRCDIR([src/tar.c]) AC_CONFIG_AUX_DIR([build-aux]) -AC_CONFIG_HEADERS([config.h:config.hin]) -AC_PREREQ([2.60]) -AM_INIT_AUTOMAKE([1.9 gnits tar-ustar dist-bzip2 dist-shar std-options]) +AC_CONFIG_HEADERS([config.h]) +AC_PREREQ([2.63]) +AM_INIT_AUTOMAKE([1.11 gnits tar-ustar dist-bzip2 dist-xz dist-shar std-options silent-rules]) + +# Enable silent rules by default: +AM_SILENT_RULES([yes]) AC_PROG_CC AC_EXEEXT @@ -36,8 +40,8 @@ AC_ISC_POSIX AC_C_INLINE AC_CHECK_HEADERS_ONCE(fcntl.h linux/fd.h memory.h net/errno.h \ - sgtty.h string.h stropts.h \ - sys/param.h sys/device.h sys/filio.h sys/gentape.h \ + sgtty.h string.h \ + sys/param.h sys/device.h sys/gentape.h \ sys/inet.h sys/io/trioctl.h \ sys/mtio.h sys/time.h sys/tprintf.h sys/tape.h \ unistd.h locale.h) @@ -48,7 +52,6 @@ AC_CHECK_HEADERS([sys/buf.h], [], [], #endif]) AC_HEADER_SYS_WAIT -AM_STDBOOL_H AC_HEADER_DIRENT AC_HEADER_MAJOR @@ -67,6 +70,29 @@ if test $diff_cv_st_fstype_string = yes; then [Define if struct stat has a char st_fstype[] member.]) fi +# even if we use gnulib's acl.h with integrated m4 file later on (used because +# of very useful file_has_acl() function) we need following checks that restrict +# tar to use POSIX.1e ACLs only. +AC_ARG_WITH([posix-acls], + AS_HELP_STRING([--without-posix-acls], + [do not use POSIX.1e access control lists]), + [with_posix_acls=no]) +if test "x$with_posix_acls" != "xno"; then + AC_CHECK_HEADERS(sys/acl.h,, [with_posix_acl=no]) + AC_SEARCH_LIBS([acl_get_file], [acl pacl],, [with_posix_acl=no]) + AC_SEARCH_LIBS([acl_get_fd], [acl pacl],, [with_posix_acl=no]) + AC_SEARCH_LIBS([acl_set_file], [acl pacl],, [with_posix_acl=no]) + AC_SEARCH_LIBS([acl_set_fd], [acl pacl],, [with_posix_acl=no]) + AC_SEARCH_LIBS([acl_to_text], [acl pacl],, [with_posix_acl=no]) + AC_SEARCH_LIBS([acl_from_text], [acl pacl],, [with_posix_acl=no]) + if test "x$with_posix_acls" != xno; then + AC_DEFINE(HAVE_POSIX_ACLS,,[Define when we have working POSIX acls]) + fi +else + # disable acls in gnulib's checks + export enable_acl=no +fi + AC_TYPE_SIGNAL AC_TYPE_MODE_T AC_TYPE_PID_T @@ -87,7 +113,90 @@ gl_INIT # paxutils modules tar_PAXUTILS -AC_CHECK_FUNCS(fsync getdtablesize lstat mkfifo readlink symlink setlocale utimes) +AC_ARG_ENABLE([gcc-warnings], + [AS_HELP_STRING([--enable-gcc-warnings], + [turn on many GCC warnings (for developers; best with GNU make)])], + [case $enableval in + yes|no) ;; + *) AC_MSG_ERROR([bad value $enableval for gcc-warnings option]) ;; + esac + gl_gcc_warnings=$enableval], + [if test -d "$srcdir"/.git; then + gl_gcc_warnings=yes + else + gl_gcc_warnings=no + fi] +) + +if test "$gl_gcc_warnings" = yes; then + gl_WARN_ADD([-Werror], [WERROR_CFLAGS]) + AC_SUBST([WERROR_CFLAGS]) + + nw= + # This, $nw, is the list of warnings we disable. + nw="$nw -Wformat-nonliteral" # warnings in Fedora 17 stdio.h + nw="$nw -Wvla" # warnings in gettext.h + nw="$nw -Wswitch-default" # Too many warnings for now + nw="$nw -Wunsafe-loop-optimizations" # It's OK to omit unsafe optimizations. + nw="$nw -Winline" # It's OK to not inline. + nw="$nw -Wstrict-overflow" # It's OK to optimize strictly. + nw="$nw -Wsuggest-attribute=pure" # Too many warnings for now. + + gl_MANYWARN_ALL_GCC([ws]) + gl_MANYWARN_COMPLEMENT([ws], [$ws], [$nw]) + for w in $ws; do + gl_WARN_ADD([$w]) + done + gl_WARN_ADD([-Wno-sign-compare]) # Too many warnings for now + gl_WARN_ADD([-Wno-type-limits]) # It's OK to optimize based on types. + gl_WARN_ADD([-Wno-unused-parameter]) # Too many warnings for now + gl_WARN_ADD([-Wno-format-nonliteral]) + + gl_WARN_ADD([-fdiagnostics-show-option]) + gl_WARN_ADD([-funit-at-a-time]) + + AC_SUBST([WARN_CFLAGS]) + + AC_DEFINE([lint], [1], [Define to 1 if the compiler is checking for lint.]) + AH_VERBATIM([FORTIFY_SOURCE], + [/* Enable compile-time and run-time bounds-checking, and some warnings, + without upsetting glibc 2.15+. */ + #if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__ + # define _FORTIFY_SOURCE 2 + #endif + ]) + AC_DEFINE([GNULIB_PORTCHECK], [1], [enable some gnulib portability checks]) + + # Use a slightly smaller set of warning options for lib/. + # Remove the following and save the result in GNULIB_WARN_CFLAGS. + nw= + nw="$nw -Wmissing-prototypes" + nw="$nw -Wunused-macros" + # + # These are for argp. + nw="$nw -Wmissing-field-initializers" + nw="$nw -Wshadow" + # + gl_MANYWARN_COMPLEMENT([GNULIB_WARN_CFLAGS], [$WARN_CFLAGS], [$nw]) + + # This is also for argp. + gl_WARN_ADD([-Wno-missing-field-initializers], [GNULIB_WARN_CFLAGS]) + + AC_SUBST([GNULIB_WARN_CFLAGS]) + + # For gnulib-tests, the set is slightly smaller still. + nw= + # It's not worth being this picky about test programs. + nw="$nw -Wsuggest-attribute=const" + gl_MANYWARN_COMPLEMENT([GNULIB_TEST_WARN_CFLAGS], + [$GNULIB_WARN_CFLAGS], [$nw]) + AC_SUBST([GNULIB_TEST_WARN_CFLAGS]) +fi + +TAR_HEADERS_ATTR_XATTR_H + +AC_CHECK_FUNCS_ONCE([fchmod fchown fsync lstat mkfifo readlink symlink]) + AC_CHECK_DECLS([getgrgid],,, [#include ]) AC_CHECK_DECLS([getpwuid],,, [#include ]) AC_CHECK_DECLS([time],,, [#include ]) @@ -122,6 +231,14 @@ else [Define to the full path of your rsh, if any.]) fi +TAR_COMPR_PROGRAM(compress) +TAR_COMPR_PROGRAM(gzip) +TAR_COMPR_PROGRAM(bzip2) +TAR_COMPR_PROGRAM(lzip) +TAR_COMPR_PROGRAM(lzma) +TAR_COMPR_PROGRAM(lzop) +TAR_COMPR_PROGRAM(xz) + AC_MSG_CHECKING(for default archive format) AC_ARG_VAR([DEFAULT_ARCHIVE_FORMAT], @@ -146,7 +263,7 @@ if test -z "$DEFAULT_ARCHIVE"; then DEFAULT_ARCHIVE=- else if test -z "`ls $DEFAULT_ARCHIVE 2>/dev/null`"; then - AC_MSG_WARN(DEFAULT_ARCHIVE \`$DEFAULT_ARCHIVE' not found on this system) + AC_MSG_WARN(DEFAULT_ARCHIVE '$DEFAULT_ARCHIVE' not found on this system) fi # FIXME: Look for DEFTAPE in . # FIXME: Let DEVICE_PREFIX be configured from the environment. @@ -241,6 +358,7 @@ fi AC_OUTPUT([Makefile\ doc/Makefile\ + gnu/Makefile\ lib/Makefile\ po/Makefile.in\ scripts/Makefile\