X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=6f07adb12e2439e6262ea2e27e4a9410d9f6f6e3;hb=941d7586dbce2d898edaa4835b5cc0a023bc5061;hp=cdeb3bf473217d6f21c52faa710c8ccad1b6706e;hpb=3087f4c1c9928b666dda1f1a84bb3c9708ea3e7c;p=chaz%2Ftar diff --git a/configure.ac b/configure.ac index cdeb3bf..6f07adb 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. -AC_INIT([GNU tar], [1.13.94], [bug-tar@gnu.org]) +AC_INIT([GNU tar], [1.15.1], [bug-tar@gnu.org]) AC_CONFIG_SRCDIR([src/tar.c]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_HEADERS([config.h:config.hin]) @@ -29,40 +29,26 @@ gl_USE_SYSTEM_EXTENSIONS AC_PROG_CC AC_EXEEXT AC_PROG_RANLIB +AC_PROG_YACC 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/buf.h sys/device.h sys/gentape.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 @@ -95,58 +81,13 @@ 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 - -AM_FUNC_GETLINE - -gl_BACKUPFILE -gl_DIRNAME -gl_ERROR -gl_EXCLUDE -gl_FILEBLOCKS -gl_FUNC_ALLOCA -gl_FUNC_FNMATCH_GNU -gl_FUNC_MEMSET -gl_FUNC_MKTIME -gl_FUNC_RMDIR -gl_FUNC_STRTOL -gl_FUNC_STRTOUL -gl_FUNC_STRTOULL -gl_FUNC_STRTOIMAX -gl_FUNC_STRTOUMAX -gl_GETDATE -gl_GETOPT -gl_GETTIME -gl_HASH -gl_HUMAN -gl_MODECHANGE -gl_OBSTACK -gl_PATHMAX -gl_QUOTE -gl_QUOTEARG -gl_SAFE_READ -gl_SAFE_WRITE -gl_SAVE_CWD -gl_SAVEDIR -gl_STRCASE -gl_TIME_R -gl_TIMESPEC -gl_XALLOC -gl_XGETCWD -gl_XSTRTOL -gl_FUNC_STPCPY - -jm_FUNC_FTRUNCATE -jm_FUNC_GLIBC_UNLOCKED_IO -jm_FUNC_CHOWN -jm_FUNC_LCHOWN -jm_FUNC_MALLOC -jm_FUNC_REALLOC -jm_FUNC_UTIME -jm_XSTRTOUMAX +tar_GNULIB +# paxutils modules +tar_PAXUTILS AC_CHECK_MEMBERS([struct stat.st_spare1, struct stat.st_atim.tv_nsec, struct stat.st_atimespec.tv_nsec, struct stat.st_atimensec], , , [ @@ -172,7 +113,6 @@ LIBS=$tar_save_LIBS 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. @@ -220,6 +160,9 @@ fi AC_MSG_CHECKING(for default archive format) +AC_ARG_VAR([DEFAULT_ARCHIVE_FORMAT], + [Set the default archive format. Allowed values are: V7, OLDGNU, USTAR, POSIX, GNU. Default is GNU]) + if test -z "$DEFAULT_ARCHIVE_FORMAT"; then DEFAULT_ARCHIVE_FORMAT="GNU" fi @@ -233,6 +176,8 @@ AC_MSG_RESULT($DEFAULT_ARCHIVE_FORMAT) AC_MSG_CHECKING(for default archive) +AC_ARG_VAR([DEFAULT_ARCHIVE], + [Set the name of the default archive (default: -)]) if test -z "$DEFAULT_ARCHIVE"; then DEFAULT_ARCHIVE=- else @@ -266,16 +211,14 @@ AC_DEFINE_UNQUOTED(DEFAULT_ARCHIVE, "$DEFAULT_ARCHIVE", [Define to a string giving the full name of the default archive file.]) AC_MSG_RESULT($DEFAULT_ARCHIVE) +AC_ARG_VAR([DEFAULT_BLOCKING], + [Define default blocking factor (default: 20)]) AC_MSG_CHECKING(for default blocking) DEFAULT_BLOCKING=${DEFAULT_BLOCKING-20} AC_DEFINE_UNQUOTED(DEFAULT_BLOCKING, $DEFAULT_BLOCKING, [Define to a number giving the default blocking size for archives.]) AC_MSG_RESULT($DEFAULT_BLOCKING) -# Gettext. -AM_GNU_GETTEXT([external], [need-ngettext]) -AM_GNU_GETTEXT_VERSION(0.12.1) - # Iconv AM_ICONV AC_CHECK_HEADERS(iconv.h) @@ -288,11 +231,38 @@ AC_CHECK_TYPE(iconv_t,:, #endif ]) +# Gettext. +AM_GNU_GETTEXT([external], [need-ngettext]) +AM_GNU_GETTEXT_VERSION(0.12.1) + +# 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, + AC_HELP_STRING([--enable-backup-scripts], + [Create and install backup and restore scripts]), + [case $enableval in + yes) BACKUP_LIBEXEC_SCRIPTS='$(BACKUP_LIBEXEC_SCRIPTS_LIST)' + BACKUP_SBIN_SCRIPTS='$(BACKUP_SBIN_SCRIPTS_LIST)' + ;; + esac]) + +AC_SUBST(BACKUP_SED_COND) +if date +%Y-%m-%d 2>/dev/null >&2; then + BACKUP_SED_COND='/^\#ELSE_DATE_FORMAT_OK/,/^\#ENDIF_DATE_FORMAT_OK/d;/^\#IF_DATE_FORMAT_OK/d' +else + BACKUP_SED_COND='/^\#IF_DATE_FORMAT_OK/,/^\#ELSE_DATE_FORMAT_OK/d;/^\#ENDIF_DATE_FORMAT_OK/d' +fi + + AC_OUTPUT([Makefile\ doc/Makefile\ lib/Makefile\ po/Makefile.in\ scripts/Makefile\ - src/Makefile\ - tests/Makefile\ - tests/preset]) + rmt/Makefile\ + src/Makefile])