X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=configure.ac;h=2b24518a2f1c9c3204e54b7294080f47312f25c5;hb=5f1e6a6a3b65f3a981147a4f19c86ed621379ecf;hp=986b079660d98a884754f221b096a7d9ca8fc033;hpb=93becc4f527500fc9d544de2f88a6dad43e2e408;p=chaz%2Ftar diff --git a/configure.ac b/configure.ac index 986b079..2b24518 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.14.1], [bug-tar@gnu.org]) +AC_INIT([GNU tar], [1.15], [bug-tar@gnu.org]) AC_CONFIG_SRCDIR([src/tar.c]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_HEADERS([config.h:config.hin]) @@ -49,26 +49,6 @@ 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([ -#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$(EXEEXT)' - 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 @@ -238,16 +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_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) +PU_RMT # Iconv AM_ICONV @@ -261,6 +232,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, @@ -285,6 +265,5 @@ AC_OUTPUT([Makefile\ lib/Makefile\ po/Makefile.in\ scripts/Makefile\ - src/Makefile\ - tests/Makefile\ - tests/preset]) + rmt/Makefile\ + src/Makefile])