X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=df27a1d4d831a33344b8d878b552421a8ac4a6c3;hb=7fb546943ef0bd07a1bc65164e6e752b9fa4126f;hp=b0c4431121900d489245c55a58217a5f5c7d49ac;hpb=cb090cfe82ab160dc85a1d46ddf16bda56158336;p=chaz%2Ftar

diff --git a/configure.ac b/configure.ac
index b0c4431..df27a1d 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 Free Software Foundation, Inc.
+# 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,12 +18,12 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-AC_INIT([GNU tar], [1.13.90], [bug-tar@gnu.org])
+AC_INIT([GNU tar], [1.13.93], [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])
 
 gl_USE_SYSTEM_EXTENSIONS
 AC_PROG_CC
@@ -134,6 +134,7 @@ gl_TIME_R
 gl_XALLOC
 gl_XGETCWD
 gl_XSTRTOL
+gl_FUNC_STPCPY
 
 jm_FUNC_FTRUNCATE
 jm_FUNC_GLIBC_UNLOCKED_IO
@@ -144,6 +145,11 @@ 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
 # library, inducing unnecessary run-time overhead.
@@ -152,13 +158,15 @@ 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])
@@ -169,9 +177,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
 
@@ -211,7 +220,7 @@ if test -z "$DEFAULT_ARCHIVE_FORMAT"; then
   DEFAULT_ARCHIVE_FORMAT="GNU"
 fi
 case $DEFAULT_ARCHIVE_FORMAT in
-  V7|OLDGNU|POSIX|GNU) ;;
+  V7|OLDGNU|USTAR|POSIX|GNU) ;;
   *) AC_MSG_ERROR(Invalid format name);;
 esac
 AC_DEFINE_UNQUOTED(DEFAULT_ARCHIVE_FORMAT, ${DEFAULT_ARCHIVE_FORMAT}_FORMAT,
@@ -263,6 +272,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])