X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=6d2a9be3be0bd874d5981e2c7762fb135a1b15e3;hb=7347b4f5d51c15bb19637ea52e9bf7dff832cc52;hp=afed24d0ac8573da72d4532d355505dc2eeb92aa;hpb=a0404319e20b56767825aebb3a7efa1dccbdfe91;p=chaz%2Ftar diff --git a/configure.ac b/configure.ac index afed24d..6d2a9be 100644 --- a/configure.ac +++ b/configure.ac @@ -49,28 +49,6 @@ AC_CHECK_HEADERS([sys/buf.h], [], [], AC_HEADER_SYS_WAIT AM_STDBOOL_H -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 -#endif -#include ], - 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, - [AC_EGREP_HEADER(mt_model, sys/mtio.h, - tar_cv_header_mtio_check_field=mt_model, - tar_cv_header_mtio_check_field=mt_type)]) -AC_DEFINE_UNQUOTED(MTIO_CHECK_FIELD, $tar_cv_header_mtio_check_field, - [Define to mt_model (v.g., for DG/UX), else to mt_type.]) - AC_HEADER_DIRENT AC_HEADER_MAJOR AC_HEADER_STAT @@ -240,36 +218,7 @@ 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_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 file name of rmt program.]) -fi - +PU_RMT # Gettext. AM_GNU_GETTEXT([external], [need-ngettext]) @@ -311,6 +260,7 @@ AC_OUTPUT([Makefile\ lib/Makefile\ po/Makefile.in\ scripts/Makefile\ + rmt/Makefile\ src/Makefile\ tests/Makefile\ tests/preset])