X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=d6849fce12d69b6d67019fd6362bb61af57d6108;hb=2f800ce3fb9c38360e1b6dac70ee0d8ceae72c6a;hp=d461b88b2f7e04949fb424ffddad014d59a59592;hpb=0500b1ba3e8a8e61149a314e67093696f5472f88;p=chaz%2Ftar diff --git a/configure.ac b/configure.ac index d461b88..d6849fc 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Configure template for GNU tar. # Copyright (C) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005 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 @@ -15,12 +15,12 @@ # 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], [bug-tar@gnu.org]) +AC_INIT([GNU tar], [1.15.2], [bug-tar@gnu.org]) AC_CONFIG_SRCDIR([src/tar.c]) -AC_CONFIG_AUX_DIR([config]) +AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h:config.hin]) AC_PREREQ([2.59]) AM_INIT_AUTOMAKE([1.8 gnits dist-bzip2 dist-shar std-options]) @@ -39,7 +39,7 @@ AC_CHECK_HEADERS(fcntl.h linux/fd.h memory.h net/errno.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 @@ -49,32 +49,11 @@ AC_CHECK_HEADERS([sys/buf.h], [], [], 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 @@ -106,48 +85,14 @@ 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 +# paxutils modules +tar_PAXUTILS 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_CACHE_CHECK(for remote shell, tar_cv_path_RSH, @@ -239,17 +184,6 @@ 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 - -# Gettext. -AM_GNU_GETTEXT([external], [need-ngettext]) -AM_GNU_GETTEXT_VERSION(0.12.1) - # Iconv AM_ICONV AC_CHECK_HEADERS(iconv.h) @@ -262,6 +196,15 @@ 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, @@ -286,6 +229,5 @@ AC_OUTPUT([Makefile\ lib/Makefile\ po/Makefile.in\ scripts/Makefile\ - src/Makefile\ - tests/Makefile\ - tests/preset]) + rmt/Makefile\ + src/Makefile])