Rename config/ to build-aux/.

[chaz/tar] / configure.ac

diff --git a/configure.ac b/configure.ac
index afed24d0ac8573da72d4532d355505dc2eeb92aa..41561b6760ae5b0993a347333e2674f5f65a7cd3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,9 +18,9 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-AC_INIT([GNU tar], [1.14.90], [bug-tar@gnu.org])
+AC_INIT([GNU tar], [1.15.2], [bug-tar@gnu.org])
 AC_CONFIG_SRCDIR([src/tar.c])
-AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h:config.hin])
 AC_PREREQ([2.59])
 AM_INIT_AUTOMAKE([1.8 gnits dist-bzip2 dist-shar std-options])
@@ -39,7 +39,7 @@ AC_CHECK_HEADERS(fcntl.h linux/fd.h memory.h net/errno.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)
+  unistd.h locale.h)
 
 AC_CHECK_HEADERS([sys/buf.h], [], [],
 [#if HAVE_SYS_PARAM_H
@@ -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 <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'
-    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
@@ -108,7 +86,8 @@ jm_AC_TYPE_UINTMAX_T
 
 # gnulib modules
 tar_GNULIB
-
+# paxutils modules
+tar_PAXUTILS
 
 AC_CHECK_MEMBERS([struct stat.st_spare1, struct stat.st_atim.tv_nsec, struct stat.st_atimespec.tv_nsec, struct stat.st_atimensec], , ,
                  [
@@ -240,41 +219,6 @@ 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
-
-
-# Gettext.
-AM_GNU_GETTEXT([external], [need-ngettext])
-AM_GNU_GETTEXT_VERSION(0.12.1)
-
 # Iconv
 AM_ICONV
 AC_CHECK_HEADERS(iconv.h)
@@ -287,6 +231,15 @@ AC_CHECK_TYPE(iconv_t,:,
 #endif
 ])
 
+# Gettext.
+AM_GNU_GETTEXT([external], [need-ngettext])
+AM_GNU_GETTEXT_VERSION(0.12.1)
+
+# Initialize the test suite.
+AC_CONFIG_TESTDIR(tests)
+AC_CONFIG_FILES([tests/Makefile tests/atlocal]) # FIXME: tests/preset?
+AM_MISSING_PROG([AUTOM4TE], [autom4te])
+
 AC_SUBST(BACKUP_LIBEXEC_SCRIPTS)
 AC_SUBST(BACKUP_SBIN_SCRIPTS)
 AC_ARG_ENABLE(backup-scripts,
@@ -311,6 +264,5 @@ AC_OUTPUT([Makefile\
            lib/Makefile\
            po/Makefile.in\
            scripts/Makefile\
-           src/Makefile\
-           tests/Makefile\
-           tests/preset])
+           rmt/Makefile\
+           src/Makefile])