Invoke AM_ICONV, to define ICONV_CONST if needed.

[chaz/tar] / configure.ac

diff --git a/configure.ac b/configure.ac
index 40173d49910c38c5fb3f4bbc3e65a345ab02a739..2e7d86147270f4303ceabb2fd69b3a85f0362133 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Configure template for GNU tar.
 
 # Copyright (C) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-# 2002, 2003 Free Software Foundation, Inc.
+# 2002, 2003, 2004 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,12 +18,12 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-AC_INIT([GNU tar], [1.13.92], [bug-tar@gnu.org])
+AC_INIT([GNU tar], [1.13.93], [bug-tar@gnu.org])
 AC_CONFIG_SRCDIR([src/tar.c])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_HEADERS([config.h:config.hin])
-AC_PREREQ([2.57])
-AM_INIT_AUTOMAKE([1.7.5 gnits dist-bzip2 dist-shar])
+AC_PREREQ([2.59])
+AM_INIT_AUTOMAKE([1.8 gnits dist-bzip2 dist-shar std-options])
 
 gl_USE_SYSTEM_EXTENSIONS
 AC_PROG_CC
@@ -134,6 +134,7 @@ gl_TIME_R
 gl_XALLOC
 gl_XGETCWD
 gl_XSTRTOL
+gl_FUNC_STPCPY
 
 jm_FUNC_FTRUNCATE
 jm_FUNC_GLIBC_UNLOCKED_IO
@@ -219,7 +220,7 @@ if test -z "$DEFAULT_ARCHIVE_FORMAT"; then
   DEFAULT_ARCHIVE_FORMAT="GNU"
 fi
 case $DEFAULT_ARCHIVE_FORMAT in
-  V7|OLDGNU|POSIX|GNU) ;;
+  V7|OLDGNU|USTAR|POSIX|GNU) ;;
   *) AC_MSG_ERROR(Invalid format name);;
 esac
 AC_DEFINE_UNQUOTED(DEFAULT_ARCHIVE_FORMAT, ${DEFAULT_ARCHIVE_FORMAT}_FORMAT,
@@ -271,6 +272,22 @@ AC_MSG_RESULT($DEFAULT_BLOCKING)
 AM_GNU_GETTEXT([external], [need-ngettext])
 AM_GNU_GETTEXT_VERSION(0.12.1)
 
-AC_OUTPUT([Makefile doc/Makefile lib/Makefile \
-m4/Makefile po/Makefile.in \
-scripts/Makefile src/Makefile tests/Makefile tests/preset])
+# Iconv
+AM_ICONV
+AC_CHECK_HEADERS(iconv.h,
+                 [AC_CHECK_TYPE(iconv_t,:,
+                                AC_DEFINE(iconv_t, int,
+                                          [Conversion descriptor type]),
+                                [#include <iconv.h>])])
+
+AC_CHECK_LIB(iconv, iconv)
+
+
+AC_OUTPUT([Makefile\
+           doc/Makefile\
+           lib/Makefile\
+           po/Makefile.in\
+           scripts/Makefile\
+           src/Makefile\
+           tests/Makefile\
+           tests/preset])