ew option --with-rmt. New configuration variable DEFAULT_RMT_DIR. Removed DEFAULT_RMT...

[chaz/tar] / configure.ac

diff --git a/configure.ac b/configure.ac
index a02494e223fe0eef8d5f24ec2b4149aff972a108..afed24d0ac8573da72d4532d355505dc2eeb92aa 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.14.1], [bug-tar@gnu.org])
+AC_INIT([GNU tar], [1.14.90], [bug-tar@gnu.org])
 AC_CONFIG_SRCDIR([src/tar.c])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_HEADERS([config.h:config.hin])
@@ -49,17 +49,19 @@ 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([
+enable_rmt() {
+  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
+      tar_cv_header_rmt=yes, tar_cv_header_rmt=no)])
+    test $tar_cv_header_rmt = yes && RMT='rmt'
+    AC_SUBST(RMT)
+  fi
+}
 
 AC_CACHE_CHECK(which ioctl field to test for reversed bytes,
   tar_cv_header_mtio_check_field,
@@ -238,13 +240,37 @@ 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.])
+AC_ARG_VAR([DEFAULT_RMT_DIR],
+           [Define full file name of the directory where to install `rmt'. (default: $(libexecdir))])
+if test "x$DEFAULT_RMT_DIR" != x; then
+       DEFAULT_RMT_COMMAND=$DEFAULT_RMT_DIR/rmt
+else
+       DEFAULT_RMT_DIR='$(libexecdir)'
+fi
+
+AC_MSG_CHECKING([whether to build rmt])
+AC_ARG_WITH([rmt],
+            AC_HELP_STRING([--with-rmt=FILE],
+                           [Use FILE as the default `rmt' program. Do not build included copy of `rmt'.]),
+            [case $withval in
+            yes|no) AC_MSG_ERROR([Invalid argument to --with-rmt]);;
+            /*)     DEFAULT_RMT_COMMAND=$withval
+                    AC_MSG_RESULT([no, use $withval instead]);;
+            *)      AC_MSG_ERROR([Argument to --with-rmt must be an absolute file name]);;
+             esac],
+             [AC_MSG_RESULT([yes])
+              enable_rmt
+              if test "$RMT" = ""; then
+                 AC_MSG_WARN([not building rmt, required header files are missing])
+              fi])
+
+AC_SUBST(DEFAULT_RMT_COMMAND)
 if test "x$DEFAULT_RMT_COMMAND" != x; then
   AC_DEFINE_UNQUOTED(DEFAULT_RMT_COMMAND, "$DEFAULT_RMT_COMMAND",
-                     [Define full pathname of rmt program.])
+                     [Define full file name of rmt program.])
 fi
 
+
 # Gettext.
 AM_GNU_GETTEXT([external], [need-ngettext])
 AM_GNU_GETTEXT_VERSION(0.12.1)
@@ -261,14 +287,6 @@ 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,