X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=0985f74c01143310c0c99dea5641269c6d70c462;hb=eb70fd51cba14433241ce5acc6ca36a6b5a3afa3;hp=a02494e223fe0eef8d5f24ec2b4149aff972a108;hpb=08cba4e4e51faa27eddbf320cda328ef12034a53;p=chaz%2Ftar

diff --git a/configure.ac b/configure.ac
index a02494e..0985f74 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.1], [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 <sgtty.h>
-#endif
-#include <sys/socket.h>],
-    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 <sys/types.h>
@@ -106,7 +85,8 @@ jm_AC_TYPE_UINTMAX_T
 
 # gnulib modules
 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], , ,
                  [
@@ -134,19 +114,6 @@ AC_CHECK_DECLS([getgrgid],,, [#include <grp.h>])
 AC_CHECK_DECLS([getpwuid],,, [#include <pwd.h>])
 AC_CHECK_DECLS([time],,, [#include <time.h>])
 
-# 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,
@@ -238,17 +205,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)
@@ -261,13 +217,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-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)
@@ -293,6 +250,5 @@ AC_OUTPUT([Makefile\
            lib/Makefile\
            po/Makefile.in\
            scripts/Makefile\
-           src/Makefile\
-           tests/Makefile\
-           tests/preset])
+           rmt/Makefile\
+           src/Makefile])