X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Ftar;a=blobdiff_plain;f=configure.ac;h=a93c6c072f84c1d101a29428c032eb8a615caa61;hp=b89a3b81ead78a02157a963b9e73d5fc90865afc;hb=ec94fbdf458adb2af803eefdd1a9c9bbb432bb21;hpb=792965270bf44a8753f10b2e51a201721b12c2d3 diff --git a/configure.ac b/configure.ac index b89a3b8..a93c6c0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,80 +1,56 @@ -# 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 Free Software Foundation, Inc. +# Copyright 1991, 1994-2010, 2013-2014 Free Software Foundation, Inc. -# This program is free software; you can redistribute it and/or modify +# This file is part of GNU tar. + +# GNU tar is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. -# This program is distributed in the hope that it will be useful, +# GNU tar is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# along with this program. If not, see . -AC_INIT([GNU tar], [1.14.1], [bug-tar@gnu.org]) +AC_INIT([GNU tar], [1.28], [bug-tar@gnu.org]) AC_CONFIG_SRCDIR([src/tar.c]) -AC_CONFIG_AUX_DIR([config]) -AC_CONFIG_HEADERS([config.h:config.hin]) -AC_PREREQ([2.59]) -AM_INIT_AUTOMAKE([1.8 gnits dist-bzip2 dist-shar std-options]) +AC_CONFIG_AUX_DIR([build-aux]) +AC_CONFIG_HEADERS([config.h]) +AC_PREREQ([2.63]) +AM_INIT_AUTOMAKE([1.11 gnits tar-ustar dist-bzip2 dist-xz std-options silent-rules]) + +# Enable silent rules by default: +AM_SILENT_RULES([yes]) -gl_USE_SYSTEM_EXTENSIONS -AC_PROG_CC +AC_PROG_CC_STDC AC_EXEEXT AC_PROG_RANLIB AC_PROG_YACC +gl_EARLY +AC_CHECK_TOOLS([AR], [ar]) + AC_SYS_LARGEFILE -AC_ISC_POSIX AC_C_INLINE -AC_CHECK_HEADERS(fcntl.h linux/fd.h memory.h net/errno.h \ +AC_CHECK_HEADERS_ONCE(fcntl.h linux/fd.h memory.h net/errno.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) + unistd.h locale.h) AC_CHECK_HEADERS([sys/buf.h], [], [], [#if HAVE_SYS_PARAM_H #include #endif]) -AC_HEADER_SYS_WAIT -AM_STDBOOL_H - -if test $ac_cv_header_sys_mtio_h = yes; then - AC_CACHE_CHECK(for remote tape header files, tar_cv_header_rmt, - [AC_TRY_CPP([ -#if HAVE_SGTTY_H -# include -#endif -#include ], - tar_cv_header_rmt=yes, tar_cv_header_rmt=no)]) - test $tar_cv_header_rmt = yes && RMT='rmt$(EXEEXT)' - AC_SUBST(RMT) -fi - -AC_CACHE_CHECK(which ioctl field to test for reversed bytes, - tar_cv_header_mtio_check_field, - [AC_EGREP_HEADER(mt_model, sys/mtio.h, - tar_cv_header_mtio_check_field=mt_model, - tar_cv_header_mtio_check_field=mt_type)]) -AC_DEFINE_UNQUOTED(MTIO_CHECK_FIELD, $tar_cv_header_mtio_check_field, - [Define to mt_model (v.g., for DG/UX), else to mt_type.]) - -AC_HEADER_DIRENT AC_HEADER_MAJOR -AC_HEADER_STAT -AC_HEADER_STDC -AC_STRUCT_ST_BLKSIZE -AC_STRUCT_ST_BLOCKS + AC_MSG_CHECKING([for st_fstype string in struct stat]) AC_CACHE_VAL(diff_cv_st_fstype_string, [AC_TRY_COMPILE([#include @@ -87,11 +63,33 @@ if test $diff_cv_st_fstype_string = yes; then [Define if struct stat has a char st_fstype[] member.]) fi -AC_TYPE_SIGNAL +# 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=yes]) +if test "x$with_posix_acls" != "xno"; then + AC_CHECK_HEADERS(sys/acl.h,, [with_posix_acls=no]) + for tar_acl_func in acl_get_file acl_get_fd acl_set_file acl_set_fd \ + acl_to_text acl_from_text acl_delete_def_file \ + acl_free; do \ + test "x$with_posix_acls" = xno && break + AC_SEARCH_LIBS([$tar_acl_func], [acl pacl], [], [with_posix_acls=no]) + done + 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_MODE_T AC_TYPE_PID_T AC_TYPE_OFF_T -AC_TYPE_SIZE_T AC_TYPE_UID_T AC_CHECK_TYPE(major_t, , AC_DEFINE(major_t, int, [Type of major device numbers.])) @@ -101,55 +99,121 @@ AC_CHECK_TYPE(dev_t, unsigned) AC_CHECK_TYPE(ino_t, unsigned) gt_TYPE_SSIZE_T -gl_AC_TYPE_INTMAX_T -jm_AC_TYPE_UINTMAX_T # gnulib modules -tar_GNULIB - - -AC_CHECK_MEMBERS([struct stat.st_spare1, struct stat.st_atim.tv_nsec, struct stat.st_atimespec.tv_nsec, struct stat.st_atimensec], , , - [ -#include -#include ]) +gl_INIT +# paxutils modules +tar_PAXUTILS + +# gl_GCC_VERSION_IFELSE([major], [minor], [run-if-found], [run-if-not-found]) +# ------------------------------------------------ +# If $CPP is gcc-MAJOR.MINOR or newer, then run RUN-IF-FOUND. +# Otherwise, run RUN-IF-NOT-FOUND. +AC_DEFUN([gl_GCC_VERSION_IFELSE], + [AC_PREPROC_IFELSE( + [AC_LANG_PROGRAM( + [[ +#if ($1) < __GNUC__ || (($1) == __GNUC__ && ($2) <= __GNUC_MINOR__) +/* ok */ +#else +# error "your version of gcc is older than $1.$2" +#endif + ]]), + ], [$3], [$4]) + ] +) + +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], + [gl_gcc_warnings=no + if test -d "$srcdir"/.git; then + gl_GCC_VERSION_IFELSE([4], [6], [gl_gcc_warnings=yes]) + 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 -# Save and restore LIBS so e.g., -lrt, isn't added to it. Otherwise, *all* -# programs in the package would end up linked with that potentially-shared -# library, inducing unnecessary run-time overhead. +TAR_HEADERS_ATTR_XATTR_H -# Solaris 2.5.1 needs -lposix4 to get the clock_gettime function. -# Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4. -tar_save_LIBS=$LIBS - LIB_CLOCK_GETTIME= - AC_SEARCH_LIBS(clock_gettime, [rt posix4]) - case "$ac_cv_search_clock_gettime" in - -l*) LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime;; - esac - AC_SUBST(LIB_CLOCK_GETTIME) - AC_CHECK_FUNCS(clock_gettime) -LIBS=$tar_save_LIBS +AC_CHECK_FUNCS_ONCE([fchmod fchown fsync lstat mkfifo readlink symlink grantpt]) +AM_CONDITIONAL([TAR_COND_GRANTPT], [test $ac_cv_func_grantpt = yes]) -AC_CHECK_FUNCS(fsync lstat mkfifo readlink strerror symlink setlocale utimes) AC_CHECK_DECLS([getgrgid],,, [#include ]) AC_CHECK_DECLS([getpwuid],,, [#include ]) -AC_CHECK_DECLS([valloc]) AC_CHECK_DECLS([time],,, [#include ]) -# Set LIB_SETSOCKOPT to -lnsl -lsocket if necessary. -tar_save_LIBS=$LIBS - LIB_SETSOCKOPT= - AC_SEARCH_LIBS(setsockopt, [socket], , - [AC_SEARCH_LIBS(setsockopt, [socket], , , [-lnsl])]) - AC_SEARCH_LIBS(setsockopt, [nsl]) - - case "$ac_cv_search_setsockopt" in - -l*) LIB_SETSOCKOPT=$ac_cv_search_setsockopt - esac - AC_SUBST(LIB_SETSOCKOPT) -LIBS=$tar_save_LIBS - AC_REPLACE_FUNCS(waitpid) +AC_ARG_VAR([RSH], [Configure absolute path to default remote shell binary]) AC_CACHE_CHECK(for remote shell, tar_cv_path_RSH, [if test -n "$RSH"; then tar_cv_path_RSH=$RSH @@ -178,6 +242,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], @@ -202,7 +274,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. @@ -210,7 +282,7 @@ else case $DEFAULT_ARCHIVE in *[[0-7][lmh]]) AC_DEFINE(DENSITY_LETTER, 1, - [[Define to 1 if density may be indicated by [lmh] at end of device.]]) + [Define to 1 if density may be indicated by [lmh] at end of device.]) device_prefix=`echo $DEFAULT_ARCHIVE | sed 's/[0-7][lmh]$//'` ;; *[[0-7]]) @@ -239,16 +311,22 @@ AC_DEFINE_UNQUOTED(DEFAULT_BLOCKING, $DEFAULT_BLOCKING, [Define to a number giving the default blocking size for archives.]) AC_MSG_RESULT($DEFAULT_BLOCKING) -AC_ARG_VAR([DEFAULT_RMT_COMMAND], - [Define full pathname of rmt program.]) -if test "x$DEFAULT_RMT_COMMAND" != x; then - AC_DEFINE_UNQUOTED(DEFAULT_RMT_COMMAND, "$DEFAULT_RMT_COMMAND", - [Define full pathname of rmt program.]) -fi +AC_MSG_CHECKING(for default quoting style) -# Gettext. -AM_GNU_GETTEXT([external], [need-ngettext]) -AM_GNU_GETTEXT_VERSION(0.12.1) +m4_define([QUOTING_STYLES],dnl + [literal|shell|shell-always|c|escape|locale|clocale]) +DEFAULT_QUOTING_STYLE="escape" +AC_ARG_VAR([DEFAULT_QUOTING_STYLE], + [Set the default quoting style. Allowed values are: ] m4_bpatsubst(QUOTING_STYLES,[|], [[, ]]) [. Default is "escape".]) + +case $DEFAULT_QUOTING_STYLE in +QUOTING_STYLES) ;; +*) AC_MSG_ERROR(Invalid quoting style);; +esac +AC_MSG_RESULT($DEFAULT_QUOTING_STYLE) +DEFAULT_QUOTING_STYLE=`echo ${DEFAULT_QUOTING_STYLE}|sed 's/-/_/g'`_quoting_style +AC_DEFINE_UNQUOTED(DEFAULT_QUOTING_STYLE, $DEFAULT_QUOTING_STYLE, + [Define to a default quoting style (see lib/quoteargs.c for the list)]) # Iconv AM_ICONV @@ -262,13 +340,14 @@ AC_CHECK_TYPE(iconv_t,:, #endif ]) -# Check if we have reentrant versions of getopt. Argp needs them, -# but many versions of Glibc lack them, though they define the -# same getopt interface version as lib/getopt.c. -AC_CHECK_FUNC(_getopt_long_only_r, - :, - [AC_DEFINE(WANT_INCLUDED_GETOPT,1, - [Define if the included version of getopt has to be used])]) +# Gettext. +AM_GNU_GETTEXT([external], [need-formatstring-macros]) +AM_GNU_GETTEXT_VERSION([0.16]) + +# Initialize the test suite. +AC_CONFIG_TESTDIR(tests) +AC_CONFIG_FILES([tests/Makefile tests/atlocal]) # FIXME: tests/preset? +AM_MISSING_PROG([AUTOM4TE], [autom4te]) AC_SUBST(BACKUP_LIBEXEC_SCRIPTS) AC_SUBST(BACKUP_SBIN_SCRIPTS) @@ -288,12 +367,11 @@ else BACKUP_SED_COND='/^\#IF_DATE_FORMAT_OK/,/^\#ELSE_DATE_FORMAT_OK/d;/^\#ENDIF_DATE_FORMAT_OK/d' fi - AC_OUTPUT([Makefile\ doc/Makefile\ + gnu/Makefile\ lib/Makefile\ po/Makefile.in\ scripts/Makefile\ - src/Makefile\ - tests/Makefile\ - tests/preset]) + rmt/Makefile\ + src/Makefile])