Merge recent gnulib changes, and remove some lint.

[chaz/tar] / configure.ac

diff --git a/configure.ac b/configure.ac
index 28bef09c2cda97c470f23de1a3400f50e207312e..9279683bba03dcf1d25128ea41733615bf91bc17 100644 (file)
--- 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
-# Free Software Foundation, Inc.
+# Copyright (C) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004 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
@@ -18,17 +18,15 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-AC_INIT([GNU tar], [1.13.26], [bug-tar@gnu.org])
+AC_INIT([GNU tar], [1.13.94], [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.57])
-AM_INIT_AUTOMAKE([1.7.5 gnits dist-bzip2 dist-shar])
+AC_PREREQ([2.59])
+AM_INIT_AUTOMAKE([1.8 gnits dist-bzip2 dist-shar std-options])
 
-AC_GNU_SOURCE
+gl_USE_SYSTEM_EXTENSIONS
 AC_PROG_CC
-AC_AIX
-AC_MINIX
 AC_EXEEXT
 AC_PROG_RANLIB
 AC_SYS_LARGEFILE
@@ -39,7 +37,7 @@ 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/inet.h sys/io/trioctl.h \
-  sys/mtio.h sys/tprintf.h sys/tape.h \
+  sys/mtio.h sys/time.h sys/tprintf.h sys/tape.h \
   unistd.h)
 
 AC_HEADER_SYS_WAIT
@@ -93,6 +91,9 @@ AC_CHECK_TYPE(major_t, , AC_DEFINE(major_t, int,
                                   [Type of major device numbers.]))
 AC_CHECK_TYPE(minor_t, , AC_DEFINE(minor_t, int,
                                   [Type of minor device numbers.]))
+AC_CHECK_TYPE(dev_t, unsigned)
+AC_CHECK_TYPE(ino_t, unsigned)
+
 gt_TYPE_SSIZE_T
 jm_AC_TYPE_UINTMAX_T
 
@@ -113,8 +114,12 @@ 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
@@ -127,18 +132,26 @@ 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
 
+AC_CHECK_MEMBERS([struct stat.st_spare1, struct stat.st_atim.tv_nsec, struct stat.st_atimespec.tv_nsec, struct stat.st_atimensec], , ,
+                 [
+#include <sys/types.h>
+#include <sys/stat.h>])
 
 # 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
@@ -148,16 +161,19 @@ jm_XSTRTOUMAX
 # 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],
-                [LIB_CLOCK_GETTIME=$ac_cv_search_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(fsync lstat mkfifo readlink strerror symlink)
+AC_CHECK_FUNCS(fsync lstat mkfifo readlink strerror symlink setlocale utimes)
 AC_CHECK_DECLS([getgrgid],,, [#include <grp.h>])
 AC_CHECK_DECLS([getpwuid],,, [#include <pwd.h>])
 AC_CHECK_DECLS([valloc])
+AC_CHECK_DECLS([time],,, [#include <time.h>])
 
 # Set LIB_SETSOCKOPT to -lnsl -lsocket if necessary.
 tar_save_LIBS=$LIBS
@@ -165,9 +181,10 @@ tar_save_LIBS=$LIBS
   AC_SEARCH_LIBS(setsockopt, [socket], ,
     [AC_SEARCH_LIBS(setsockopt, [socket], , , [-lnsl])])
   AC_SEARCH_LIBS(setsockopt, [nsl])
-  if test " $LIBS" != " $tar_save_LIBS"; then
-    LIB_SETSOCKOPT=$ac_cv_search_setsockopt
-  fi
+
+  case "$ac_cv_search_setsockopt" in
+    -l*) LIB_SETSOCKOPT=$ac_cv_search_setsockopt
+  esac
   AC_SUBST(LIB_SETSOCKOPT)
 LIBS=$tar_save_LIBS
 
@@ -201,6 +218,19 @@ else
     [Define to the full path of your rsh, if any.])
 fi
 
+AC_MSG_CHECKING(for default archive format)
+
+if test -z "$DEFAULT_ARCHIVE_FORMAT"; then
+  DEFAULT_ARCHIVE_FORMAT="GNU"
+fi
+case $DEFAULT_ARCHIVE_FORMAT in
+  V7|OLDGNU|USTAR|POSIX|GNU) ;;
+  *) AC_MSG_ERROR(Invalid format name);;
+esac
+AC_DEFINE_UNQUOTED(DEFAULT_ARCHIVE_FORMAT, ${DEFAULT_ARCHIVE_FORMAT}_FORMAT,
+  [By default produce archives of this format])
+AC_MSG_RESULT($DEFAULT_ARCHIVE_FORMAT)
+
 AC_MSG_CHECKING(for default archive)
 
 if test -z "$DEFAULT_ARCHIVE"; then
@@ -246,6 +276,19 @@ AC_MSG_RESULT($DEFAULT_BLOCKING)
 AM_GNU_GETTEXT([external], [need-ngettext])
 AM_GNU_GETTEXT_VERSION(0.12.1)
 
-AC_OUTPUT([Makefile doc/Makefile lib/Makefile \
-m4/Makefile po/Makefile.in \
-scripts/Makefile src/Makefile tests/Makefile tests/preset])
+# Iconv
+AM_ICONV
+AC_CHECK_HEADERS(iconv.h,
+                 [AC_CHECK_TYPE(iconv_t,:,
+                                AC_DEFINE(iconv_t, int,
+                                          [Conversion descriptor type]),
+                                [#include <iconv.h>])])
+
+AC_OUTPUT([Makefile\
+           doc/Makefile\
+           lib/Makefile\
+           po/Makefile.in\
+           scripts/Makefile\
+           src/Makefile\
+           tests/Makefile\
+           tests/preset])