X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=b89a3b81ead78a02157a963b9e73d5fc90865afc;hb=55ec665a41de8e51d685e96000c4144f9aa5c6f2;hp=9279683bba03dcf1d25128ea41733615bf91bc17;hpb=2bda83b48d8a6807632312403561b11b79048443;p=chaz%2Ftar

diff --git a/configure.ac b/configure.ac
index 9279683..b89a3b8 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.14.1], [bug-tar@gnu.org])
 AC_CONFIG_SRCDIR([src/tar.c])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_HEADERS([config.h:config.hin])
@@ -29,17 +29,23 @@ 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)
 
+AC_CHECK_HEADERS([sys/buf.h], [], [],
+[#if HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif])
+
 AC_HEADER_SYS_WAIT
 AM_STDBOOL_H
 
@@ -95,58 +101,12 @@ 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
+tar_GNULIB
 
-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
 
 AC_CHECK_MEMBERS([struct stat.st_spare1, struct stat.st_atim.tv_nsec, struct stat.st_atimespec.tv_nsec, struct stat.st_atimensec], , ,
                  [
@@ -220,6 +180,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 +196,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,23 +231,63 @@ 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)
 
+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,
-                 [AC_CHECK_TYPE(iconv_t,:,
-                                AC_DEFINE(iconv_t, int,
-                                          [Conversion descriptor type]),
-                                [#include <iconv.h>])])
+AC_CHECK_HEADERS(iconv.h)
+AC_CHECK_TYPE(iconv_t,:,
+              AC_DEFINE(iconv_t, int,
+                        [Conversion descriptor type]),
+              [
+#ifdef HAVE_ICONV_H
+# include <iconv.h>
+#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])])
+
+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\