X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=4a5237ef558c5b99eb8068014ba957c3c30eee53;hb=ac6caa71bc6077d75ff5073f76f97d53225e78ae;hp=98908b3ad24d5bf258828de2b33a98a25823cc28;hpb=7d6865480e2ec457414b7368ec2fac01b37fb6b4;p=chaz%2Ftar diff --git a/configure.ac b/configure.ac index 98908b3..4a5237e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -# 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. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 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 -# the Free Software Foundation; either version 2, or (at your option) +# the Free Software Foundation; either version 3, or (at your option) # any later version. # This program is distributed in the hope that it will be useful, @@ -15,31 +15,32 @@ # 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. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. -AC_INIT([GNU tar], [1.14.90], [bug-tar@gnu.org]) +AC_INIT([GNU tar], [1.22], [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.60]) +AM_INIT_AUTOMAKE([1.9 gnits tar-ustar dist-bzip2 dist-shar std-options]) -gl_USE_SYSTEM_EXTENSIONS AC_PROG_CC AC_EXEEXT AC_PROG_RANLIB AC_PROG_YACC +gl_EARLY + AC_SYS_LARGEFILE AC_ISC_POSIX AC_C_INLINE -AC_CHECK_HEADERS(fcntl.h linux/fd.h memory.h net/errno.h \ - sgtty.h string.h \ - sys/param.h sys/device.h sys/gentape.h \ +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 \ 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 @@ -47,14 +48,12 @@ AC_CHECK_HEADERS([sys/buf.h], [], [], #endif]) AC_HEADER_SYS_WAIT -AM_STDBOOL_H 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 @@ -81,52 +80,17 @@ 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 ]) - -# 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. - -# 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 +gl_INIT +# paxutils modules +tar_PAXUTILS -AC_CHECK_FUNCS(fsync lstat mkfifo readlink strerror symlink setlocale utimes) +AC_CHECK_FUNCS(fsync getdtablesize lstat mkfifo readlink symlink setlocale utimes) AC_CHECK_DECLS([getgrgid],,, [#include ]) AC_CHECK_DECLS([getpwuid],,, [#include ]) 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_CACHE_CHECK(for remote shell, tar_cv_path_RSH, @@ -189,7 +153,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]]) @@ -218,16 +182,22 @@ AC_DEFINE_UNQUOTED(DEFAULT_BLOCKING, $DEFAULT_BLOCKING, [Define to a number giving the default blocking size for archives.]) AC_MSG_RESULT($DEFAULT_BLOCKING) -PU_RMT +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".]) -# Initialize the test suite. -AC_CONFIG_TESTDIR(tests) -AC_CONFIG_FILES([tests/Makefile tests/atlocal]) # FIXME: tests/preset? -AM_MISSING_PROG([AUTOM4TE], [autom4te]) +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 @@ -241,6 +211,15 @@ AC_CHECK_TYPE(iconv_t,:, #endif ]) +# 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) AC_ARG_ENABLE(backup-scripts, @@ -259,9 +238,9 @@ 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\