Check for _getopt_long_only_r and force using included version of getopt if the funct...

[chaz/tar] / configure.ac

diff --git a/configure.ac b/configure.ac
index 92f3670a9e4ea90a22a02b9424aa1bf7a52d6ff5..b89a3b81ead78a02157a963b9e73d5fc90865afc 100644 (file)
--- 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])
@@ -36,11 +36,16 @@ 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
 
@@ -96,9 +101,9 @@ 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
 
@@ -175,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
@@ -188,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
@@ -221,12 +231,21 @@ 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)
@@ -243,6 +262,25 @@ 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])])
+
+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'