aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--aclocal.m41220
-rw-r--r--config/config.guess (renamed from config.guess)0
-rw-r--r--config/config.rpath (renamed from config.rpath)0
-rw-r--r--config/config.sub (renamed from config.sub)0
-rw-r--r--config/install-sh (renamed from install-sh)0
-rw-r--r--config/mkinstalldirs (renamed from mkinstalldirs)0
-rw-r--r--configure15519
-rw-r--r--configure.in6
-rw-r--r--intl/Makefile.in10
-rw-r--r--intl/VERSION2
-rw-r--r--intl/bindtextdom.c44
-rw-r--r--intl/config.charset286
-rw-r--r--intl/dcgettext.c7
-rw-r--r--intl/dcigettext.c173
-rw-r--r--intl/dcngettext.c12
-rw-r--r--intl/dgettext.c9
-rw-r--r--intl/dngettext.c14
-rw-r--r--intl/eval-plural.h10
-rw-r--r--intl/explodename.c21
-rw-r--r--intl/finddomain.c14
-rw-r--r--intl/gettext.c5
-rw-r--r--intl/gettextP.h119
-rw-r--r--intl/gmo.h5
-rw-r--r--intl/hash-string.h17
-rw-r--r--intl/intl-compat.c72
-rw-r--r--intl/l10nflist.c62
-rw-r--r--intl/libgnuintl.h.in383
-rw-r--r--intl/loadinfo.h47
-rw-r--r--intl/loadmsgcat.c404
-rw-r--r--intl/localcharset.c49
-rw-r--r--intl/localcharset.h42
-rw-r--r--intl/locale.alias12
-rw-r--r--intl/localealias.c103
-rw-r--r--intl/localename.c478
-rw-r--r--intl/log.c98
-rw-r--r--intl/ngettext.c9
-rw-r--r--intl/plural-exp.c8
-rw-r--r--intl/plural-exp.h24
-rw-r--r--intl/plural.c1322
-rw-r--r--intl/plural.y52
-rw-r--r--intl/printf-args.c119
-rw-r--r--intl/printf-args.h137
-rw-r--r--intl/printf-parse.c537
-rw-r--r--intl/printf-parse.h75
-rw-r--r--intl/printf.c371
-rw-r--r--intl/relocatable.c449
-rw-r--r--intl/relocatable.h77
-rw-r--r--intl/textdomain.c5
-rw-r--r--intl/vasnprintf.c887
-rw-r--r--intl/vasnprintf.h61
-rw-r--r--intl/vasnwprintf.h46
-rw-r--r--intl/wprintf-parse.h75
-rw-r--r--intl/xsize.h109
-rw-r--r--po/Makefile.in.in100
-rw-r--r--po/Makevars16
-rw-r--r--po/Rules-quot5
-rw-r--r--po/cs.gmobin0 -> 77323 bytes
-rw-r--r--po/cs.po764
-rw-r--r--po/de.gmobin0 -> 77431 bytes
-rw-r--r--po/de.po782
-rw-r--r--po/e2fsprogs.pot679
-rw-r--r--po/es.gmobin0 -> 82942 bytes
-rw-r--r--po/es.po779
-rw-r--r--po/fr.gmobin0 -> 81674 bytes
-rw-r--r--po/fr.po1073
-rw-r--r--po/it.gmobin0 -> 63247 bytes
-rw-r--r--po/it.po964
-rw-r--r--po/pl.gmobin0 -> 78572 bytes
-rw-r--r--po/pl.po895
-rw-r--r--po/sv.gmobin0 -> 78076 bytes
-rw-r--r--po/sv.po882
-rw-r--r--po/tr.gmobin0 -> 95973 bytes
-rw-r--r--po/tr.po986
73 files changed, 22710 insertions, 8821 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index c5f6e7f3..3a4c2f30 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -21,8 +21,8 @@ AC_DEFUN([AM_LANGINFO_CODESET],
[Define if you have <langinfo.h> and nl_langinfo(CODESET).])
fi
])
-# gettext.m4 serial 17 (gettext-0.11.5)
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
+# gettext.m4 serial 28 (gettext-0.13)
+dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
@@ -40,7 +40,7 @@ dnl They are *not* in the public domain.
dnl Authors:
dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2002.
+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
dnl Macro to add for using GNU gettext.
@@ -115,13 +115,8 @@ AC_DEFUN([AM_GNU_GETTEXT],
AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
])
- AC_MSG_CHECKING([whether NLS is requested])
- dnl Default is enabled NLS
- AC_ARG_ENABLE(nls,
- [ --disable-nls do not use Native Language Support],
- USE_NLS=$enableval, USE_NLS=yes)
- AC_MSG_RESULT($USE_NLS)
- AC_SUBST(USE_NLS)
+ dnl Set USE_NLS.
+ AM_NLS
ifelse(gt_included_intl, yes, [
BUILD_INCLUDED_LIBINTL=no
@@ -239,7 +234,8 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
dnl libintl. (Cf. the install rule in intl/Makefile.in.)
if test "$gt_cv_func_gnugettext_libc" = "yes" \
|| { test "$gt_cv_func_gnugettext_libintl" = "yes" \
- && test "$PACKAGE" != gettext; }; then
+ && test "$PACKAGE" != gettext-runtime \
+ && test "$PACKAGE" != gettext-tools; }; then
gt_use_preinstalled_gnugettext=yes
else
dnl Reset the values set by searching for libintl.
@@ -258,7 +254,6 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
if test "$nls_cv_use_gnu_gettext" = "yes"; then
dnl Mark actions used to generate GNU NLS library.
- INTLOBJS="\$(GETTOBJS)"
BUILD_INCLUDED_LIBINTL=yes
USE_INCLUDED_LIBINTL=yes
LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
@@ -283,6 +278,22 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
fi
fi
+ AC_MSG_CHECKING([whether to use NLS])
+ AC_MSG_RESULT([$USE_NLS])
+ if test "$USE_NLS" = "yes"; then
+ AC_MSG_CHECKING([where the gettext function comes from])
+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+ if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+ gt_source="external libintl"
+ else
+ gt_source="libc"
+ fi
+ else
+ gt_source="included intl directory"
+ fi
+ AC_MSG_RESULT([$gt_source])
+ fi
+
if test "$USE_NLS" = "yes"; then
if test "$gt_use_preinstalled_gnugettext" = "yes"; then
@@ -306,7 +317,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
ifelse(gt_included_intl, yes, [
dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
dnl to 'yes' because some of the testsuite requires it.
- if test "$PACKAGE" = gettext; then
+ if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
BUILD_INCLUDED_LIBINTL=yes
fi
@@ -314,7 +325,6 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
AC_SUBST(BUILD_INCLUDED_LIBINTL)
AC_SUBST(USE_INCLUDED_LIBINTL)
AC_SUBST(CATOBJEXT)
- AC_SUBST(INTLOBJS)
dnl For backward compatibility. Some configure.ins may be using this.
nls_cv_header_intl=
@@ -332,6 +342,12 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
GENCAT=gencat
AC_SUBST(GENCAT)
+ dnl For backward compatibility. Some Makefiles may be using this.
+ if test "$USE_INCLUDED_LIBINTL" = yes; then
+ INTLOBJS="\$(GETTOBJS)"
+ fi
+ AC_SUBST(INTLOBJS)
+
dnl Enable libtool support if the surrounding package wishes it.
INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
@@ -348,179 +364,6 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
])
-dnl Checks for all prerequisites of the po subdirectory,
-dnl except for USE_NLS.
-AC_DEFUN([AM_PO_SUBDIRS],
-[
- AC_REQUIRE([AC_PROG_MAKE_SET])dnl
- AC_REQUIRE([AC_PROG_INSTALL])dnl
- AC_REQUIRE([AM_MKINSTALLDIRS])dnl
-
- dnl Perform the following tests also if --disable-nls has been given,
- dnl because they are needed for "make dist" to work.
-
- dnl Search for GNU msgfmt in the PATH.
- dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
- dnl The second test excludes FreeBSD msgfmt.
- AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
- [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
- (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
- :)
- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-
- dnl Search for GNU xgettext 0.11 or newer in the PATH.
- dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
- dnl The second test excludes FreeBSD xgettext.
- AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
- [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
- (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
- :)
- dnl Remove leftover from FreeBSD xgettext call.
- rm -f messages.po
-
- dnl Search for GNU msgmerge 0.11 or newer in the PATH.
- AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
- [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
-
- dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
- dnl Test whether we really found GNU msgfmt.
- if test "$GMSGFMT" != ":"; then
- dnl If it is no GNU msgfmt we define it as : so that the
- dnl Makefiles still can work.
- if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
- (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
- : ;
- else
- GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
- AC_MSG_RESULT(
- [found $GMSGFMT program is not GNU msgfmt; ignore it])
- GMSGFMT=":"
- fi
- fi
-
- dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
- dnl Test whether we really found GNU xgettext.
- if test "$XGETTEXT" != ":"; then
- dnl If it is no GNU xgettext we define it as : so that the
- dnl Makefiles still can work.
- if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
- (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
- : ;
- else
- AC_MSG_RESULT(
- [found xgettext program is not GNU xgettext; ignore it])
- XGETTEXT=":"
- fi
- dnl Remove leftover from FreeBSD xgettext call.
- rm -f messages.po
- fi
-
- AC_OUTPUT_COMMANDS([
- for ac_file in $CONFIG_FILES; do
- # Support "outfile[:infile[:infile...]]"
- case "$ac_file" in
- *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
- esac
- # PO directories have a Makefile.in generated from Makefile.in.in.
- case "$ac_file" in */Makefile.in)
- # Adjust a relative srcdir.
- ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
- ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
- ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
- # In autoconf-2.13 it is called $ac_given_srcdir.
- # In autoconf-2.50 it is called $srcdir.
- test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
- case "$ac_given_srcdir" in
- .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
- /*) top_srcdir="$ac_given_srcdir" ;;
- *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
- esac
- if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
- rm -f "$ac_dir/POTFILES"
- test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
- cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
- # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
- # on $ac_dir but don't depend on user-specified configuration
- # parameters.
- if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
- # The LINGUAS file contains the set of available languages.
- if test -n "$ALL_LINGUAS"; then
- test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
- fi
- ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
- # Hide the ALL_LINGUAS assigment from automake.
- eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
- fi
- case "$ac_given_srcdir" in
- .) srcdirpre= ;;
- *) srcdirpre='$(srcdir)/' ;;
- esac
- POFILES=
- GMOFILES=
- UPDATEPOFILES=
- DUMMYPOFILES=
- for lang in $ALL_LINGUAS; do
- POFILES="$POFILES $srcdirpre$lang.po"
- GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
- UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
- DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
- done
- # CATALOGS depends on both $ac_dir and the user's LINGUAS
- # environment variable.
- INST_LINGUAS=
- if test -n "$ALL_LINGUAS"; then
- for presentlang in $ALL_LINGUAS; do
- useit=no
- if test "%UNSET%" != "$LINGUAS"; then
- desiredlanguages="$LINGUAS"
- else
- desiredlanguages="$ALL_LINGUAS"
- fi
- for desiredlang in $desiredlanguages; do
- # Use the presentlang catalog if desiredlang is
- # a. equal to presentlang, or
- # b. a variant of presentlang (because in this case,
- # presentlang can be used as a fallback for messages
- # which are not translated in the desiredlang catalog).
- case "$desiredlang" in
- "$presentlang"*) useit=yes;;
- esac
- done
- if test $useit = yes; then
- INST_LINGUAS="$INST_LINGUAS $presentlang"
- fi
- done
- fi
- CATALOGS=
- if test -n "$INST_LINGUAS"; then
- for lang in $INST_LINGUAS; do
- CATALOGS="$CATALOGS $lang.gmo"
- done
- fi
- test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
- sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
- for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
- if test -f "$f"; then
- case "$f" in
- *.orig | *.bak | *~) ;;
- *) cat "$f" >> "$ac_dir/Makefile" ;;
- esac
- fi
- done
- fi
- ;;
- esac
- done],
- [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
- # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
- # from automake.
- eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
- # Capture the value of LINGUAS because we need it to compute CATALOGS.
- LINGUAS="${LINGUAS-%UNSET%}"
- ])
-])
-
-
dnl Checks for all prerequisites of the intl subdirectory,
dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
@@ -534,9 +377,18 @@ AC_DEFUN([AM_INTL_SUBDIR],
AC_REQUIRE([AC_ISC_POSIX])dnl
AC_REQUIRE([AC_HEADER_STDC])dnl
AC_REQUIRE([AC_C_CONST])dnl
+ AC_REQUIRE([bh_C_SIGNED])dnl
AC_REQUIRE([AC_C_INLINE])dnl
AC_REQUIRE([AC_TYPE_OFF_T])dnl
AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+ AC_REQUIRE([jm_AC_TYPE_LONG_LONG])dnl
+ AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
+ AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
+ AC_REQUIRE([gt_TYPE_WINT_T])dnl
+ AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
+ AC_REQUIRE([jm_AC_HEADER_STDINT_H])
+ AC_REQUIRE([gt_TYPE_INTMAX_T])
+ AC_REQUIRE([gt_PRINTF_POSIX])
AC_REQUIRE([AC_FUNC_ALLOCA])dnl
AC_REQUIRE([AC_FUNC_MMAP])dnl
AC_REQUIRE([jm_GLIBC21])dnl
@@ -544,12 +396,56 @@ AC_DEFUN([AM_INTL_SUBDIR],
AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
AC_REQUIRE([gt_INTTYPES_PRI])dnl
+ AC_REQUIRE([gl_XSIZE])dnl
+ AC_CHECK_TYPE([ptrdiff_t], ,
+ [AC_DEFINE([ptrdiff_t], [long],
+ [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
+ ])
AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
stdlib.h string.h unistd.h sys/param.h])
- AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
-geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
-strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
+ AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \
+mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
+strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
+__fsetlocking])
+
+ dnl Use the _snprintf function only if it is declared (because on NetBSD it
+ dnl is defined as a weak alias of snprintf; we prefer to use the latter).
+ gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
+ gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
+
+ dnl Use the *_unlocked functions only if they are declared.
+ dnl (because some of them were defined without being declared in Solaris
+ dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
+ dnl on Solaris 2.5.1 to run on Solaris 2.6).
+ dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
+ gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
+ gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
+ gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
+
+ case $gt_cv_func_printf_posix in
+ *yes) HAVE_POSIX_PRINTF=1 ;;
+ *) HAVE_POSIX_PRINTF=0 ;;
+ esac
+ AC_SUBST([HAVE_POSIX_PRINTF])
+ if test "$ac_cv_func_asprintf" = yes; then
+ HAVE_ASPRINTF=1
+ else
+ HAVE_ASPRINTF=0
+ fi
+ AC_SUBST([HAVE_ASPRINTF])
+ if test "$ac_cv_func_snprintf" = yes; then
+ HAVE_SNPRINTF=1
+ else
+ HAVE_SNPRINTF=0
+ fi
+ AC_SUBST([HAVE_SNPRINTF])
+ if test "$ac_cv_func_wprintf" = yes; then
+ HAVE_WPRINTF=1
+ else
+ HAVE_WPRINTF=0
+ fi
+ AC_SUBST([HAVE_WPRINTF])
AM_ICONV
AM_LANGINFO_CODESET
@@ -590,19 +486,23 @@ changequote([,])dnl
])
-AC_DEFUN([AM_MKINSTALLDIRS],
+dnl gt_CHECK_DECL(FUNC, INCLUDES)
+dnl Check whether a function is declared.
+AC_DEFUN([gt_CHECK_DECL],
[
- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
- dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
- dnl Try to locate is.
- MKINSTALLDIRS=
- if test -n "$ac_aux_dir"; then
- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
- fi
- if test -z "$MKINSTALLDIRS"; then
- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+ AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,
+ [AC_TRY_COMPILE([$2], [
+#ifndef $1
+ char *p = (char *) $1;
+#endif
+], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
+ if test $ac_cv_have_decl_$1 = yes; then
+ gt_value=1
+ else
+ gt_value=0
fi
- AC_SUBST(MKINSTALLDIRS)
+ AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
+ [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
])
@@ -815,6 +715,38 @@ int main ()
AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
[Define if integer division by zero raises signal SIGFPE.])
])
+# intmax.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+dnl Test whether the system has the 'intmax_t' type, but don't attempt to
+dnl find a replacement if it is lacking.
+
+AC_DEFUN([gt_TYPE_INTMAX_T],
+[
+ AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
+ AC_REQUIRE([jm_AC_HEADER_STDINT_H])
+ AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
+ [AC_TRY_COMPILE([
+#include <stddef.h>
+#include <stdlib.h>
+#if HAVE_STDINT_H_WITH_UINTMAX
+#include <stdint.h>
+#endif
+#if HAVE_INTTYPES_H_WITH_UINTMAX
+#include <inttypes.h>
+#endif
+], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
+ if test $gt_cv_c_intmax_t = yes; then
+ AC_DEFINE(HAVE_INTMAX_T, 1,
+ [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
+ fi
+])
# inttypes.m4 serial 1 (gettext-0.11.4)
dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
@@ -842,8 +774,8 @@ AC_DEFUN([gt_HEADER_INTTYPES_H],
[Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
fi
])
-# inttypes_h.m4 serial 4 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
+# inttypes_h.m4 serial 5 (gettext-0.12)
+dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
@@ -866,8 +798,8 @@ AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
jm_ac_cv_header_inttypes_h=no)])
if test $jm_ac_cv_header_inttypes_h = yes; then
AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
-[Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
- and declares uintmax_t. ])
+ [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
+ and declares uintmax_t. ])
fi
])
# inttypes-pri.m4 serial 1 (gettext-0.11.4)
@@ -960,8 +892,8 @@ AC_DEFUN([AM_LC_MESSAGES],
[Define if your <locale.h> file defines LC_MESSAGES.])
fi
])
-# lib-ld.m4 serial 1 (gettext-0.11)
-dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
+# lib-ld.m4 serial 3 (gettext-0.13)
+dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
@@ -976,11 +908,12 @@ dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
AC_DEFUN([AC_LIB_PROG_LD_GNU],
[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
- acl_cv_prog_gnu_ld=yes
-else
- acl_cv_prog_gnu_ld=no
-fi])
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+ acl_cv_prog_gnu_ld=yes ;;
+*)
+ acl_cv_prog_gnu_ld=no ;;
+esac])
with_gnu_ld=$acl_cv_prog_gnu_ld
])
@@ -991,6 +924,19 @@ AC_DEFUN([AC_LIB_PROG_LD],
test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
+fi
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -1037,11 +983,12 @@ AC_CACHE_VAL(acl_cv_path_LD,
# Check to see if the program is GNU ld. I'd rather use --version,
# but apparently some GNU ld's only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
- if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
- test "$with_gnu_ld" != no && break
- else
- test "$with_gnu_ld" != yes && break
- fi
+ case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+ *GNU* | *'with BFD'*)
+ test "$with_gnu_ld" != no && break ;;
+ *)
+ test "$with_gnu_ld" != yes && break ;;
+ esac
fi
done
IFS="$ac_save_ifs"
@@ -1057,8 +1004,8 @@ fi
test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
AC_LIB_PROG_LD_GNU
])
-# lib-link.m4 serial 3 (gettext-0.11.3)
-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+# lib-link.m4 serial 4 (gettext-0.12)
+dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
@@ -1151,8 +1098,7 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
dnl Determine the platform dependent parameters needed to use rpath:
dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
-dnl hardcode_direct, hardcode_minus_L,
-dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec.
+dnl hardcode_direct, hardcode_minus_L.
AC_DEFUN([AC_LIB_RPATH],
[
AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
@@ -1173,8 +1119,6 @@ AC_DEFUN([AC_LIB_RPATH],
hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
hardcode_direct="$acl_cv_hardcode_direct"
hardcode_minus_L="$acl_cv_hardcode_minus_L"
- sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
- sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
dnl Determine whether the user wants rpath handling at all.
AC_ARG_ENABLE(rpath,
[ --disable-rpath do not hardcode runtime library paths],
@@ -1194,7 +1138,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
eval additional_includedir=\"$includedir\"
eval additional_libdir=\"$libdir\"
])
- AC_ARG_WITH([lib$1-prefix],
+ AC_LIB_ARG_WITH([lib$1-prefix],
[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
--without-lib$1-prefix don't search for lib$1 in includedir and libdir],
[
@@ -1611,8 +1555,8 @@ AC_DEFUN([AC_LIB_APPENDTOVAR],
fi
done
])
-# lib-prefix.m4 serial 1 (gettext-0.11)
-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+# lib-prefix.m4 serial 3 (gettext-0.13)
+dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
@@ -1621,6 +1565,13 @@ dnl the same distribution terms as the rest of that program.
dnl From Bruno Haible.
+dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
+dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
+dnl require excessive bracketing.
+ifdef([AC_HELP_STRING],
+[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
+[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+
dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
dnl to access previously installed libraries. The basic assumption is that
dnl a user will want packages to use other packages he previously installed
@@ -1639,7 +1590,7 @@ AC_DEFUN([AC_LIB_PREFIX],
eval additional_includedir=\"$includedir\"
eval additional_libdir=\"$libdir\"
])
- AC_ARG_WITH([lib-prefix],
+ AC_LIB_ARG_WITH([lib-prefix],
[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
--without-lib-prefix don't search for libraries in includedir and libdir],
[
@@ -1759,8 +1710,584 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
exec_prefix="$acl_save_exec_prefix"
prefix="$acl_save_prefix"
])
-# progtest.m4 serial 2 (gettext-0.10.40)
-dnl Copyright (C) 1996-2002 Free Software Foundation, Inc.
+# longdouble.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+dnl Test whether the compiler supports the 'long double' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_LONGDOUBLE],
+[
+ AC_CACHE_CHECK([for long double], gt_cv_c_long_double,
+ [if test "$GCC" = yes; then
+ gt_cv_c_long_double=yes
+ else
+ AC_TRY_COMPILE([
+ /* The Stardent Vistra knows sizeof(long double), but does not support it. */
+ long double foo = 0.0;
+ /* On Ultrix 4.3 cc, long double is 4 and double is 8. */
+ int array [2*(sizeof(long double) >= sizeof(double)) - 1];
+ ], ,
+ gt_cv_c_long_double=yes, gt_cv_c_long_double=no)
+ fi])
+ if test $gt_cv_c_long_double = yes; then
+ AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.])
+ fi
+])
+# longlong.m4 serial 4
+dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Paul Eggert.
+
+# Define HAVE_LONG_LONG if 'long long' works.
+
+AC_DEFUN([jm_AC_TYPE_LONG_LONG],
+[
+ AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
+ [AC_TRY_LINK([long long ll = 1LL; int i = 63;],
+ [long long llmax = (long long) -1;
+ return ll << i | ll >> i | llmax / ll | llmax % ll;],
+ ac_cv_type_long_long=yes,
+ ac_cv_type_long_long=no)])
+ if test $ac_cv_type_long_long = yes; then
+ AC_DEFINE(HAVE_LONG_LONG, 1,
+ [Define if you have the 'long long' type.])
+ fi
+])
+# nls.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_DEFUN([AM_NLS],
+[
+ AC_MSG_CHECKING([whether NLS is requested])
+ dnl Default is enabled NLS
+ AC_ARG_ENABLE(nls,
+ [ --disable-nls do not use Native Language Support],
+ USE_NLS=$enableval, USE_NLS=yes)
+ AC_MSG_RESULT($USE_NLS)
+ AC_SUBST(USE_NLS)
+])
+
+AC_DEFUN([AM_MKINSTALLDIRS],
+[
+ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+ dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
+ dnl Try to locate it.
+ MKINSTALLDIRS=
+ if test -n "$ac_aux_dir"; then
+ case "$ac_aux_dir" in
+ /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
+ *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
+ esac
+ fi
+ if test -z "$MKINSTALLDIRS"; then
+ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+ fi
+ AC_SUBST(MKINSTALLDIRS)
+])
+# po.m4 serial 3 (gettext-0.14)
+dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+dnl Checks for all prerequisites of the po subdirectory.
+AC_DEFUN([AM_PO_SUBDIRS],
+[
+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+ AC_REQUIRE([AM_MKINSTALLDIRS])dnl
+ AC_REQUIRE([AM_NLS])dnl
+
+ dnl Perform the following tests also if --disable-nls has been given,
+ dnl because they are needed for "make dist" to work.
+
+ dnl Search for GNU msgfmt in the PATH.
+ dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
+ dnl The second test excludes FreeBSD msgfmt.
+ AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+ [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+ :)
+ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+
+ dnl Search for GNU xgettext 0.12 or newer in the PATH.
+ dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
+ dnl The second test excludes FreeBSD xgettext.
+ AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+ [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
+ (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+ :)
+ dnl Remove leftover from FreeBSD xgettext call.
+ rm -f messages.po
+
+ dnl Search for GNU msgmerge 0.11 or newer in the PATH.
+ AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
+ [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
+
+ dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
+ dnl Test whether we really found GNU msgfmt.
+ if test "$GMSGFMT" != ":"; then
+ dnl If it is no GNU msgfmt we define it as : so that the
+ dnl Makefiles still can work.
+ if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
+ (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+ : ;
+ else
+ GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
+ AC_MSG_RESULT(
+ [found $GMSGFMT program is not GNU msgfmt; ignore it])
+ GMSGFMT=":"
+ fi
+ fi
+
+ dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
+ dnl Test whether we really found GNU xgettext.
+ if test "$XGETTEXT" != ":"; then
+ dnl If it is no GNU xgettext we define it as : so that the
+ dnl Makefiles still can work.
+ if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
+ (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+ : ;
+ else
+ AC_MSG_RESULT(
+ [found xgettext program is not GNU xgettext; ignore it])
+ XGETTEXT=":"
+ fi
+ dnl Remove leftover from FreeBSD xgettext call.
+ rm -f messages.po
+ fi
+
+ AC_OUTPUT_COMMANDS([
+ for ac_file in $CONFIG_FILES; do
+ # Support "outfile[:infile[:infile...]]"
+ case "$ac_file" in
+ *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+ esac
+ # PO directories have a Makefile.in generated from Makefile.in.in.
+ case "$ac_file" in */Makefile.in)
+ # Adjust a relative srcdir.
+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+ # In autoconf-2.13 it is called $ac_given_srcdir.
+ # In autoconf-2.50 it is called $srcdir.
+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+ case "$ac_given_srcdir" in
+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+ /*) top_srcdir="$ac_given_srcdir" ;;
+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
+ esac
+ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+ rm -f "$ac_dir/POTFILES"
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+ POMAKEFILEDEPS="POTFILES.in"
+ # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
+ # on $ac_dir but don't depend on user-specified configuration
+ # parameters.
+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+ # The LINGUAS file contains the set of available languages.
+ if test -n "$OBSOLETE_ALL_LINGUAS"; then
+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+ fi
+ ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+ # Hide the ALL_LINGUAS assigment from automake.
+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+ else
+ # The set of available languages was given in configure.in.
+ eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+ fi
+ # Compute POFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+ # Compute UPDATEPOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+ # Compute DUMMYPOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+ # Compute GMOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+ case "$ac_given_srcdir" in
+ .) srcdirpre= ;;
+ *) srcdirpre='$(srcdir)/' ;;
+ esac
+ POFILES=
+ UPDATEPOFILES=
+ DUMMYPOFILES=
+ GMOFILES=
+ for lang in $ALL_LINGUAS; do
+ POFILES="$POFILES $srcdirpre$lang.po"
+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+ done
+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
+ # environment variable.
+ INST_LINGUAS=
+ if test -n "$ALL_LINGUAS"; then
+ for presentlang in $ALL_LINGUAS; do
+ useit=no
+ if test "%UNSET%" != "$LINGUAS"; then
+ desiredlanguages="$LINGUAS"
+ else
+ desiredlanguages="$ALL_LINGUAS"
+ fi
+ for desiredlang in $desiredlanguages; do
+ # Use the presentlang catalog if desiredlang is
+ # a. equal to presentlang, or
+ # b. a variant of presentlang (because in this case,
+ # presentlang can be used as a fallback for messages
+ # which are not translated in the desiredlang catalog).
+ case "$desiredlang" in
+ "$presentlang"*) useit=yes;;
+ esac
+ done
+ if test $useit = yes; then
+ INST_LINGUAS="$INST_LINGUAS $presentlang"
+ fi
+ done
+ fi
+ CATALOGS=
+ if test -n "$INST_LINGUAS"; then
+ for lang in $INST_LINGUAS; do
+ CATALOGS="$CATALOGS $lang.gmo"
+ done
+ fi
+ test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+ for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+ if test -f "$f"; then
+ case "$f" in
+ *.orig | *.bak | *~) ;;
+ *) cat "$f" >> "$ac_dir/Makefile" ;;
+ esac
+ fi
+ done
+ fi
+ ;;
+ esac
+ done],
+ [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+ # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+ # from automake.
+ eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+ # Capture the value of LINGUAS because we need it to compute CATALOGS.
+ LINGUAS="${LINGUAS-%UNSET%}"
+ ])
+])
+
+dnl Postprocesses a Makefile in a directory containing PO files.
+AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
+[
+ # When this code is run, in config.status, two variables have already been
+ # set:
+ # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
+ # - LINGUAS is the value of the environment variable LINGUAS at configure
+ # time.
+
+changequote(,)dnl
+ # Adjust a relative srcdir.
+ ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+ ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+ # In autoconf-2.13 it is called $ac_given_srcdir.
+ # In autoconf-2.50 it is called $srcdir.
+ test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+ case "$ac_given_srcdir" in
+ .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+ /*) top_srcdir="$ac_given_srcdir" ;;
+ *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
+ esac
+
+ # Find a way to echo strings without interpreting backslash.
+ if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
+ gt_echo='echo'
+ else
+ if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
+ gt_echo='printf %s\n'
+ else
+ echo_func () {
+ cat <<EOT
+$*
+EOT
+ }
+ gt_echo='echo_func'
+ fi
+ fi
+
+ # A sed script that extracts the value of VARIABLE from a Makefile.
+ sed_x_variable='
+# Test if the hold space is empty.
+x
+s/P/P/
+x
+ta
+# Yes it was empty. Look if we have the expected variable definition.
+/^[ ]*VARIABLE[ ]*=/{
+ # Seen the first line of the variable definition.
+ s/^[ ]*VARIABLE[ ]*=//
+ ba
+}
+bd
+:a
+# Here we are processing a line from the variable definition.
+# Remove comment, more precisely replace it with a space.
+s/#.*$/ /
+# See if the line ends in a backslash.
+tb
+:b
+s/\\$//
+# Print the line, without the trailing backslash.
+p
+tc
+# There was no trailing backslash. The end of the variable definition is
+# reached. Clear the hold space.
+s/^.*$//
+x
+bd
+:c
+# A trailing backslash means that the variable definition continues in the
+# next line. Put a nonempty string into the hold space to indicate this.
+s/^.*$/P/
+x
+:d
+'
+changequote([,])dnl
+
+ # Set POTFILES to the value of the Makefile variable POTFILES.
+ sed_x_POTFILES="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`"
+ POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
+ # Compute POTFILES_DEPS as
+ # $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
+ POTFILES_DEPS=
+ for file in $POTFILES; do
+ POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
+ done
+ POMAKEFILEDEPS=""
+
+ if test -n "$OBSOLETE_ALL_LINGUAS"; then
+ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+ fi
+ if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+ # The LINGUAS file contains the set of available languages.
+ ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+ else
+ # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
+ sed_x_LINGUAS="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`"
+ ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
+ fi
+ # Hide the ALL_LINGUAS assigment from automake.
+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+ # Compute POFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+ # Compute UPDATEPOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+ # Compute DUMMYPOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+ # Compute GMOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+ # Compute PROPERTIESFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
+ # Compute CLASSFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
+ # Compute QMFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
+ # Compute MSGFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
+ # Compute RESOURCESDLLFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
+ case "$ac_given_srcdir" in
+ .) srcdirpre= ;;
+ *) srcdirpre='$(srcdir)/' ;;
+ esac
+ POFILES=
+ UPDATEPOFILES=
+ DUMMYPOFILES=
+ GMOFILES=
+ PROPERTIESFILES=
+ CLASSFILES=
+ QMFILES=
+ MSGFILES=
+ RESOURCESDLLFILES=
+ for lang in $ALL_LINGUAS; do
+ POFILES="$POFILES $srcdirpre$lang.po"
+ UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+ DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+ PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
+ CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
+ QMFILES="$QMFILES $srcdirpre$lang.qm"
+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+ MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
+ frobbedlang=`echo $lang | sed -e 's/_/-/g'`
+ RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
+ done
+ # CATALOGS depends on both $ac_dir and the user's LINGUAS
+ # environment variable.
+ INST_LINGUAS=
+ if test -n "$ALL_LINGUAS"; then
+ for presentlang in $ALL_LINGUAS; do
+ useit=no
+ if test "%UNSET%" != "$LINGUAS"; then
+ desiredlanguages="$LINGUAS"
+ else
+ desiredlanguages="$ALL_LINGUAS"
+ fi
+ for desiredlang in $desiredlanguages; do
+ # Use the presentlang catalog if desiredlang is
+ # a. equal to presentlang, or
+ # b. a variant of presentlang (because in this case,
+ # presentlang can be used as a fallback for messages
+ # which are not translated in the desiredlang catalog).
+ case "$desiredlang" in
+ "$presentlang"*) useit=yes;;
+ esac
+ done
+ if test $useit = yes; then
+ INST_LINGUAS="$INST_LINGUAS $presentlang"
+ fi
+ done
+ fi
+ CATALOGS=
+ JAVACATALOGS=
+ QTCATALOGS=
+ TCLCATALOGS=
+ CSHARPCATALOGS=
+ if test -n "$INST_LINGUAS"; then
+ for lang in $INST_LINGUAS; do
+ CATALOGS="$CATALOGS $lang.gmo"
+ JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
+ QTCATALOGS="$QTCATALOGS $lang.qm"
+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+ TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
+ frobbedlang=`echo $lang | sed -e 's/_/-/g'`
+ CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
+ done
+ fi
+
+ sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
+ if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
+ # Add dependencies that cannot be formulated as a simple suffix rule.
+ for lang in $ALL_LINGUAS; do
+ frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+ cat >> "$ac_file.tmp" <<EOF
+$frobbedlang.msg: $lang.po
+ @echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
+ \$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+ done
+ fi
+ if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
+ # Add dependencies that cannot be formulated as a simple suffix rule.
+ for lang in $ALL_LINGUAS; do
+ frobbedlang=`echo $lang | sed -e 's/_/-/g'`
+ cat >> "$ac_file.tmp" <<EOF
+$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
+ @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
+ \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+ done
+ fi
+ if test -n "$POMAKEFILEDEPS"; then
+ cat >> "$ac_file.tmp" <<EOF
+Makefile: $POMAKEFILEDEPS
+EOF
+ fi
+ mv "$ac_file.tmp" "$ac_file"
+])
+# printf-posix.m4 serial 2 (gettext-0.13.1)
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+dnl Test whether the printf() function supports POSIX/XSI format strings with
+dnl positions.
+
+AC_DEFUN([gt_PRINTF_POSIX],
+[
+ AC_REQUIRE([AC_PROG_CC])
+ AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings],
+ gt_cv_func_printf_posix,
+ [
+ AC_TRY_RUN([
+#include <stdio.h>
+#include <string.h>
+/* The string "%2$d %1$d", with dollar characters protected from the shell's
+ dollar expansion (possibly an autoconf bug). */
+static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
+static char buf[100];
+int main ()
+{
+ sprintf (buf, format, 33, 55);
+ return (strcmp (buf, "55 33") != 0);
+}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no,
+ [
+ AC_EGREP_CPP(notposix, [
+#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
+ notposix
+#endif
+ ], gt_cv_func_printf_posix="guessing no",
+ gt_cv_func_printf_posix="guessing yes")
+ ])
+ ])
+ case $gt_cv_func_printf_posix in
+ *yes)
+ AC_DEFINE(HAVE_POSIX_PRINTF, 1,
+ [Define if your printf() function supports format strings with positions.])
+ ;;
+ esac
+])
+# progtest.m4 serial 3 (gettext-0.12)
+dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
@@ -1784,31 +2311,63 @@ dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
AC_DEFUN([AM_PATH_PROG_WITH_TEST],
-[# Extract the first word of "$2", so it can be a program name with args.
+[
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+ ac_executable_p="test -x"
+else
+ ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "$2", so it can be a program name with args.
set dummy $2; ac_word=[$]2
AC_MSG_CHECKING([for $ac_word])
AC_CACHE_VAL(ac_cv_path_$1,
[case "[$]$1" in
- /*)
- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
- ;;
+ [[\\/]]* | ?:[[\\/]]*)
+ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+ ;;
*)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in ifelse([$5], , $PATH, [$5]); do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if [$3]; then
- ac_cv_path_$1="$ac_dir/$ac_word"
- break
- fi
- fi
- done
- IFS="$ac_save_ifs"
+ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in ifelse([$5], , $PATH, [$5]); do
+ IFS="$ac_save_IFS"
+ test -z "$ac_dir" && ac_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+ if [$3]; then
+ ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
+ break 2
+ fi
+ fi
+ done
+ done
+ IFS="$ac_save_IFS"
dnl If no 4th arg is given, leave the cache variable unset,
dnl so AC_PATH_PROGS will keep looking.
ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
])dnl
- ;;
+ ;;
esac])dnl
$1="$ac_cv_path_$1"
if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
@@ -1818,8 +2377,88 @@ else
fi
AC_SUBST($1)dnl
])
-# stdint_h.m4 serial 2 (gettext-0.11.4)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
+# signed.m4 serial 1 (gettext-0.10.40)
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([bh_C_SIGNED],
+[
+ AC_CACHE_CHECK([for signed], bh_cv_c_signed,
+ [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)])
+ if test $bh_cv_c_signed = no; then
+ AC_DEFINE(signed, ,
+ [Define to empty if the C compiler doesn't support this keyword.])
+ fi
+])
+# size_max.m4 serial 2
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([gl_SIZE_MAX],
+[
+ AC_CHECK_HEADERS(stdint.h)
+ dnl First test whether the system already has SIZE_MAX.
+ AC_MSG_CHECKING([for SIZE_MAX])
+ result=
+ AC_EGREP_CPP([Found it], [
+#include <limits.h>
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#ifdef SIZE_MAX
+Found it
+#endif
+], result=yes)
+ if test -z "$result"; then
+ dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
+ dnl than the type 'unsigned long'.
+ dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
+ dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
+ _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
+ [#include <stddef.h>], result=?)
+ _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
+ [#include <stddef.h>], result=?)
+ _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
+ [#include <stddef.h>], result=?)
+ if test "$fits_in_uint" = 1; then
+ dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
+ dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
+ AC_TRY_COMPILE([#include <stddef.h>
+ extern size_t foo;
+ extern unsigned long foo;
+ ], [], fits_in_uint=0)
+ fi
+ if test -z "$result"; then
+ if test "$fits_in_uint" = 1; then
+ result="$res_hi$res_lo"U
+ else
+ result="$res_hi$res_lo"UL
+ fi
+ else
+ dnl Shouldn't happen, but who knows...
+ result='~(size_t)0'
+ fi
+ fi
+ AC_MSG_RESULT([$result])
+ if test "$result" != yes; then
+ AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
+ [Define as the maximum value of type 'size_t', if the system doesn't define it.])
+ fi
+])
+# stdint_h.m4 serial 3 (gettext-0.12)
+dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
@@ -1842,12 +2481,12 @@ AC_DEFUN([jm_AC_HEADER_STDINT_H],
jm_ac_cv_header_stdint_h=no)])
if test $jm_ac_cv_header_stdint_h = yes; then
AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
-[Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
- and declares uintmax_t. ])
+ [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
+ and declares uintmax_t. ])
fi
])
-# uintmax_t.m4 serial 6 (gettext-0.11)
-dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
+# uintmax_t.m4 serial 7 (gettext-0.12)
+dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
@@ -1858,8 +2497,8 @@ dnl From Paul Eggert.
AC_PREREQ(2.13)
-# Define uintmax_t to `unsigned long' or `unsigned long long'
-# if <inttypes.h> does not exist.
+# Define uintmax_t to 'unsigned long' or 'unsigned long long'
+# if it is not already defined in <stdint.h> or <inttypes.h>.
AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
[
@@ -1871,12 +2510,15 @@ AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
&& ac_type='unsigned long long' \
|| ac_type='unsigned long'
AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
- [Define to unsigned long or unsigned long long
- if <inttypes.h> and <stdint.h> don't define.])
+ [Define to unsigned long or unsigned long long
+ if <stdint.h> and <inttypes.h> don't define.])
+ else
+ AC_DEFINE(HAVE_UINTMAX_T, 1,
+ [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.])
fi
])
-# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40)
-dnl Copyright (C) 1999-2002 Free Software Foundation, Inc.
+# ulonglong.m4 serial 3
+dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
@@ -1885,16 +2527,76 @@ dnl the same distribution terms as the rest of that program.
dnl From Paul Eggert.
+# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
+
AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
[
AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
- [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;],
+ [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],
[unsigned long long ullmax = (unsigned long long) -1;
return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
ac_cv_type_unsigned_long_long=yes,
ac_cv_type_unsigned_long_long=no)])
if test $ac_cv_type_unsigned_long_long = yes; then
AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
- [Define if you have the unsigned long long type.])
+ [Define if you have the 'unsigned long long' type.])
+ fi
+])
+# wchar_t.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+dnl Test whether <stddef.h> has the 'wchar_t' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_WCHAR_T],
+[
+ AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t,
+ [AC_TRY_COMPILE([#include <stddef.h>
+ wchar_t foo = (wchar_t)'\0';], ,
+ gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)])
+ if test $gt_cv_c_wchar_t = yes; then
+ AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.])
fi
])
+# wint_t.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl From Bruno Haible.
+dnl Test whether <wchar.h> has the 'wint_t' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_WINT_T],
+[
+ AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t,
+ [AC_TRY_COMPILE([#include <wchar.h>
+ wint_t foo = (wchar_t)'\0';], ,
+ gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)])
+ if test $gt_cv_c_wint_t = yes; then
+ AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.])
+ fi
+])
+# xsize.m4 serial 2
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+AC_DEFUN([gl_XSIZE],
+[
+ dnl Prerequisites of lib/xsize.h.
+ AC_REQUIRE([gl_SIZE_MAX])
+ AC_CHECK_HEADERS(stdint.h)
+])
diff --git a/config.guess b/config/config.guess
index dd1688b7..dd1688b7 100644
--- a/config.guess
+++ b/config/config.guess
diff --git a/config.rpath b/config/config.rpath
index 5ead7586..5ead7586 100644
--- a/config.rpath
+++ b/config/config.rpath
diff --git a/config.sub b/config/config.sub
index ba331039..ba331039 100644
--- a/config.sub
+++ b/config/config.sub
diff --git a/install-sh b/config/install-sh
index 89fc9b09..89fc9b09 100644
--- a/install-sh
+++ b/config/install-sh
diff --git a/mkinstalldirs b/config/mkinstalldirs
index 4f58503e..4f58503e 100644
--- a/mkinstalldirs
+++ b/config/mkinstalldirs
diff --git a/configure b/configure
index 80a69b20..73ae6f7b 100644
--- a/configure
+++ b/configure
@@ -1,88 +1,325 @@
#! /bin/sh
-
# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+# Generated by GNU Autoconf 2.59.
#
+# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
+## --------------------- ##
+## M4sh Initialization. ##
+## --------------------- ##
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+ set -o posix
+fi
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ as_unset=unset
+else
+ as_unset=false
+fi
+
+
+# Work around bugs in pre-3.0 UWIN ksh.
+$as_unset ENV MAIL MAILPATH
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+for as_var in \
+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+ LC_TELEPHONE LC_TIME
+do
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ eval $as_var=C; export $as_var
+ else
+ $as_unset $as_var
+ fi
+done
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1; then
+ as_expr=expr
+else
+ as_expr=false
+fi
+
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+ as_basename=basename
+else
+ as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)$' \| \
+ . : '\(.\)' 2>/dev/null ||
+echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+ /^X\/\(\/\/\)$/{ s//\1/; q; }
+ /^X\/\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
+
+
+# PATH needs CR, and LINENO needs CR and PATH.
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
+fi
+
+
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+ test "x$as_lineno_3" = "x$as_lineno_2" || {
+ # Find who we are. Look in the path if we contain no path at all
+ # relative or not.
+ case $0 in
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
-# Defaults:
-ac_help=
+ ;;
+ esac
+ # We did not find ourselves, most probably we were run as `sh COMMAND'
+ # in which case we are not to be found in the path.
+ if test "x$as_myself" = x; then
+ as_myself=$0
+ fi
+ if test ! -f "$as_myself"; then
+ { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+ { (exit 1); exit 1; }; }
+ fi
+ case $CONFIG_SHELL in
+ '')
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for as_base in sh bash ksh sh5; do
+ case $as_dir in
+ /*)
+ if ("$as_dir/$as_base" -c '
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+ CONFIG_SHELL=$as_dir/$as_base
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+ fi;;
+ esac
+ done
+done
+;;
+ esac
+
+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+ # uniformly replaced by the line number. The first 'sed' inserts a
+ # line-number line before each line; the second 'sed' does the real
+ # work. The second script uses 'N' to pair each line-number line
+ # with the numbered line, and appends trailing '-' during
+ # substitution so that $LINENO is not a special case at line end.
+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
+ sed '=' <$as_myself |
+ sed '
+ N
+ s,$,-,
+ : loop
+ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+ t loop
+ s,-$,,
+ s,^['$as_cr_digits']*\n,,
+ ' >$as_me.lineno &&
+ chmod +x $as_me.lineno ||
+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { (exit 1); exit 1; }; }
+
+ # Don't try to exec as it changes $[0], causing all sort of problems
+ # (the dirname of $[0] is not the place where we might find the
+ # original and so on. Autoconf is especially sensible to this).
+ . ./$as_me.lineno
+ # Exit status is that of the last command.
+ exit
+}
+
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+ *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T=' ' ;;
+ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+ *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+ as_expr=expr
+else
+ as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+ # We could just check for DJGPP; but this test a) works b) is more generic
+ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+ if test -f conf$$.exe; then
+ # Don't use ln at all; we don't have any links
+ as_ln_s='cp -p'
+ else
+ as_ln_s='ln -s'
+ fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+else
+ as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+if mkdir -p . 2>/dev/null; then
+ as_mkdir_p=:
+else
+ test -d ./-p && rmdir ./-p
+ as_mkdir_p=false
+fi
+
+as_executable_p="test -f"
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" $as_nl"
+
+# CDPATH.
+$as_unset CDPATH
+
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+exec 6>&1
+
+#
+# Initializations.
+#
ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
- --with-diet-libc Use diet libc"
-ac_help="$ac_help
- --with-cc=COMPILER select compiler to use"
-ac_help="$ac_help
- --with-linker=LINKER select linker to use"
-ac_help="$ac_help
- --with-ccopts=CCOPTS select compiler command line options"
-ac_help="$ac_help
- --with-ldopts=LDOPTS select linker command line options"
-ac_help="$ac_help
- --with-root-prefix=PREFIX override prefix variable for files to be placed in the root"
-ac_help="$ac_help
- --enable-compression enable EXPERIMENTAL compression support"
-ac_help="$ac_help
- --enable-htree enable EXPERIMENTAL htree directory support"
-ac_help="$ac_help
- --enable-htree-clear clear htree because we don't trust e2fsck"
-ac_help="$ac_help
- --enable-elf-shlibs select ELF shared libraries"
-ac_help="$ac_help
- --enable-bsd-shlibs select BSD shared libraries"
-ac_help="$ac_help
- --enable-profile build profiling libraries"
-ac_help="$ac_help
- --enable-checker build checker libraries"
-ac_help="$ac_help
- --enable-jbd-debug enable journal debugging"
-ac_help="$ac_help
- --enable-blkid-debug enable blkid debugging"
-ac_help="$ac_help
- --enable-testio-debug enable the use of the test I/O manager for debugging"
-ac_help="$ac_help
- --disable-swapfs disable support of legacy byte-swapped filesystems"
-ac_help="$ac_help
- --disable-debugfs disable support of debugfs program"
-ac_help="$ac_help
- --disable-imager disable support of e2image program"
-ac_help="$ac_help
- --disable-resizer disable support of e2resize program"
-ac_help="$ac_help
- --enable-dynamic-e2fsck build e2fsck dynamically"
-ac_help="$ac_help
- --enable-fsck build fsck wrapper program"
-ac_help="$ac_help
- --enable-e2initrd-helper build e2initrd-helper program"
-ac_help="$ac_help
- --enable-old-bitops Use old (non-standard but native) bitmask operations"
-ac_help="$ac_help
- --with-gnu-ld assume the C compiler uses GNU ld [default=no]"
-ac_help="$ac_help
- --disable-rpath do not hardcode runtime library paths"
-ac_help="$ac_help
- --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
- --without-libiconv-prefix don't search for libiconv in includedir and libdir"
-ac_help="$ac_help
- --disable-nls do not use Native Language Support"
-ac_help="$ac_help
- --with-included-gettext use the GNU gettext library included here"
-ac_help="$ac_help
- --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
- --without-libintl-prefix don't search for libintl in includedir and libdir"
+ac_config_libobj_dir=.
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# Maximum number of lines to put in a shell here document.
+# This variable seems obsolete. It should probably be removed, and
+# only ac_max_sed_lines should be used.
+: ${ac_max_here_lines=38}
+
+# Identity of this package.
+PACKAGE_NAME=
+PACKAGE_TARNAME=
+PACKAGE_VERSION=
+PACKAGE_STRING=
+PACKAGE_BUGREPORT=
+
+ac_unique_file="version.h"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# if HAVE_STDLIB_H
+# include <stdlib.h>
+# endif
+#endif
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+# include <memory.h>
+# endif
+# include <string.h>
+#endif
+#if HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+# include <stdint.h>
+# endif
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS E2FSPROGS_YEAR E2FSPROGS_MONTH E2FSPROGS_DAY E2FSPROGS_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LD CPP EGREP LINUX_INCLUDE HTREE_CMT HTREE_CLR_CMT ELF_CMT BSDLIB_CMT PROFILE_CMT CHECKER_CMT LIB_EXT STATIC_LIB_EXT PROFILED_LIB_EXT SWAPFS_CMT DEBUGFS_CMT IMAGER_CMT RESIZER_CMT E2FSCK_TYPE FSCK_PROG FSCK_MAN E2INITRD_PROG E2INITRD_MAN GETTEXT_PACKAGE PACKAGE VERSION SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE RANLIB ac_ct_RANLIB ALLOCA GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB BINARY_TYPE LN LN_S MV CP RM CHMOD AWK SED PERL LDCONFIG AR ac_ct_AR STRIP ac_ct_STRIP BUILD_CC SIZEOF_SHORT SIZEOF_INT SIZEOF_LONG SIZEOF_LONG_LONG SOCKET_LIB DLOPEN_LIB LINUX_CMT CYGWIN_CMT UNIX_CMT root_prefix root_bindir root_sbindir root_libdir root_sysconfdir LDFLAG_STATIC SS_DIR ET_DIR DO_TEST_SUITE INTL_FLAGS LIBOBJS LTLIBOBJS'
+ac_subst_files='MCONFIG MAKEFILE_ELF MAKEFILE_BSDLIB MAKEFILE_PROFILE MAKEFILE_CHECKER MAKEFILE_LIBRARY'
# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
# The variables have the same names as the options, with
# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
+cache_file=/dev/null
exec_prefix=NONE
-host=NONE
no_create=
-nonopt=NONE
no_recursion=
prefix=NONE
program_prefix=NONE
@@ -91,10 +328,15 @@ program_transform_name=s,x,x,
silent=
site=
srcdir=
-target=NONE
verbose=
x_includes=NONE
x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
bindir='${exec_prefix}/bin'
sbindir='${exec_prefix}/sbin'
libexecdir='${exec_prefix}/libexec'
@@ -108,17 +350,9 @@ oldincludedir='/usr/include'
infodir='${prefix}/info'
mandir='${prefix}/man'
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
ac_prev=
for ac_option
do
-
# If the previous option needs an argument, assign it.
if test -n "$ac_prev"; then
eval "$ac_prev=\$ac_option"
@@ -126,59 +360,59 @@ do
continue
fi
- case "$ac_option" in
- -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
- *) ac_optarg= ;;
- esac
+ ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
# Accept the important Cygnus configure options, so we can diagnose typos.
- case "$ac_option" in
+ case $ac_option in
-bindir | --bindir | --bindi | --bind | --bin | --bi)
ac_prev=bindir ;;
-bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
- bindir="$ac_optarg" ;;
+ bindir=$ac_optarg ;;
-build | --build | --buil | --bui | --bu)
- ac_prev=build ;;
+ ac_prev=build_alias ;;
-build=* | --build=* | --buil=* | --bui=* | --bu=*)
- build="$ac_optarg" ;;
+ build_alias=$ac_optarg ;;
-cache-file | --cache-file | --cache-fil | --cache-fi \
| --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
ac_prev=cache_file ;;
-cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
| --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
- cache_file="$ac_optarg" ;;
+ cache_file=$ac_optarg ;;
+
+ --config-cache | -C)
+ cache_file=config.cache ;;
-datadir | --datadir | --datadi | --datad | --data | --dat | --da)
ac_prev=datadir ;;
-datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
| --da=*)
- datadir="$ac_optarg" ;;
+ datadir=$ac_optarg ;;
-disable-* | --disable-*)
- ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
+ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
- fi
- ac_feature=`echo $ac_feature| sed 's/-/_/g'`
- eval "enable_${ac_feature}=no" ;;
+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ { (exit 1); exit 1; }; }
+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+ eval "enable_$ac_feature=no" ;;
-enable-* | --enable-*)
- ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
+ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
- fi
- ac_feature=`echo $ac_feature| sed 's/-/_/g'`
- case "$ac_option" in
- *=*) ;;
+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ { (exit 1); exit 1; }; }
+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+ case $ac_option in
+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
*) ac_optarg=yes ;;
esac
- eval "enable_${ac_feature}='$ac_optarg'" ;;
+ eval "enable_$ac_feature='$ac_optarg'" ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -187,95 +421,47 @@ do
-exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
| --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
| --exec=* | --exe=* | --ex=*)
- exec_prefix="$ac_optarg" ;;
+ exec_prefix=$ac_optarg ;;
-gas | --gas | --ga | --g)
# Obsolete; use --with-gas.
with_gas=yes ;;
- -help | --help | --hel | --he)
- # Omit some internal or obsolete options to make the list less imposing.
- # This message is too long to be a string in the A/UX 3.1 sh.
- cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
- --cache-file=FILE cache test results in FILE
- --help print this message
- --no-create do not create output files
- --quiet, --silent do not print \`checking...' messages
- --version print the version of autoconf that created configure
-Directory and file names:
- --prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [same as prefix]
- --bindir=DIR user executables in DIR [EPREFIX/bin]
- --sbindir=DIR system admin executables in DIR [EPREFIX/sbin]
- --libexecdir=DIR program executables in DIR [EPREFIX/libexec]
- --datadir=DIR read-only architecture-independent data in DIR
- [PREFIX/share]
- --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data in DIR
- [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var]
- --libdir=DIR object code libraries in DIR [EPREFIX/lib]
- --includedir=DIR C header files in DIR [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include]
- --infodir=DIR info documentation in DIR [PREFIX/info]
- --mandir=DIR man documentation in DIR [PREFIX/man]
- --srcdir=DIR find the sources in DIR [configure dir or ..]
- --program-prefix=PREFIX prepend PREFIX to installed program names
- --program-suffix=SUFFIX append SUFFIX to installed program names
- --program-transform-name=PROGRAM
- run sed PROGRAM on installed program names
-EOF
- cat << EOF
-Host type:
- --build=BUILD configure for building on BUILD [BUILD=HOST]
- --host=HOST configure for HOST [guessed]
- --target=TARGET configure for TARGET [TARGET=HOST]
-Features and packages:
- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --x-includes=DIR X include files are in DIR
- --x-libraries=DIR X library files are in DIR
-EOF
- if test -n "$ac_help"; then
- echo "--enable and --with options recognized:$ac_help"
- fi
- exit 0 ;;
+ -help | --help | --hel | --he | -h)
+ ac_init_help=long ;;
+ -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+ ac_init_help=recursive ;;
+ -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+ ac_init_help=short ;;
-host | --host | --hos | --ho)
- ac_prev=host ;;
+ ac_prev=host_alias ;;
-host=* | --host=* | --hos=* | --ho=*)
- host="$ac_optarg" ;;
+ host_alias=$ac_optarg ;;
-includedir | --includedir | --includedi | --included | --include \
| --includ | --inclu | --incl | --inc)
ac_prev=includedir ;;
-includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
| --includ=* | --inclu=* | --incl=* | --inc=*)
- includedir="$ac_optarg" ;;
+ includedir=$ac_optarg ;;
-infodir | --infodir | --infodi | --infod | --info | --inf)
ac_prev=infodir ;;
-infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
- infodir="$ac_optarg" ;;
+ infodir=$ac_optarg ;;
-libdir | --libdir | --libdi | --libd)
ac_prev=libdir ;;
-libdir=* | --libdir=* | --libdi=* | --libd=*)
- libdir="$ac_optarg" ;;
+ libdir=$ac_optarg ;;
-libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
| --libexe | --libex | --libe)
ac_prev=libexecdir ;;
-libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
| --libexe=* | --libex=* | --libe=*)
- libexecdir="$ac_optarg" ;;
+ libexecdir=$ac_optarg ;;
-localstatedir | --localstatedir | --localstatedi | --localstated \
| --localstate | --localstat | --localsta | --localst \
@@ -284,19 +470,19 @@ EOF
-localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
| --localstate=* | --localstat=* | --localsta=* | --localst=* \
| --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
- localstatedir="$ac_optarg" ;;
+ localstatedir=$ac_optarg ;;
-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
ac_prev=mandir ;;
-mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
- mandir="$ac_optarg" ;;
+ mandir=$ac_optarg ;;
-nfp | --nfp | --nf)
# Obsolete; use --without-fp.
with_fp=no ;;
-no-create | --no-create | --no-creat | --no-crea | --no-cre \
- | --no-cr | --no-c)
+ | --no-cr | --no-c | -n)
no_create=yes ;;
-no-recursion | --no-recursion | --no-recursio | --no-recursi \
@@ -310,26 +496,26 @@ EOF
-oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
| --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
| --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
- oldincludedir="$ac_optarg" ;;
+ oldincludedir=$ac_optarg ;;
-prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
ac_prev=prefix ;;
-prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
- prefix="$ac_optarg" ;;
+ prefix=$ac_optarg ;;
-program-prefix | --program-prefix | --program-prefi | --program-pref \
| --program-pre | --program-pr | --program-p)
ac_prev=program_prefix ;;
-program-prefix=* | --program-prefix=* | --program-prefi=* \
| --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
- program_prefix="$ac_optarg" ;;
+ program_prefix=$ac_optarg ;;
-program-suffix | --program-suffix | --program-suffi | --program-suff \
| --program-suf | --program-su | --program-s)
ac_prev=program_suffix ;;
-program-suffix=* | --program-suffix=* | --program-suffi=* \
| --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
- program_suffix="$ac_optarg" ;;
+ program_suffix=$ac_optarg ;;
-program-transform-name | --program-transform-name \
| --program-transform-nam | --program-transform-na \
@@ -346,7 +532,7 @@ EOF
| --program-transfo=* | --program-transf=* \
| --program-trans=* | --program-tran=* \
| --progr-tra=* | --program-tr=* | --program-t=*)
- program_transform_name="$ac_optarg" ;;
+ program_transform_name=$ac_optarg ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
@@ -356,7 +542,7 @@ EOF
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
| --sbi=* | --sb=*)
- sbindir="$ac_optarg" ;;
+ sbindir=$ac_optarg ;;
-sharedstatedir | --sharedstatedir | --sharedstatedi \
| --sharedstated | --sharedstate | --sharedstat | --sharedsta \
@@ -367,58 +553,57 @@ EOF
| --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
| --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
| --sha=* | --sh=*)
- sharedstatedir="$ac_optarg" ;;
+ sharedstatedir=$ac_optarg ;;
-site | --site | --sit)
ac_prev=site ;;
-site=* | --site=* | --sit=*)
- site="$ac_optarg" ;;
+ site=$ac_optarg ;;
-srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
ac_prev=srcdir ;;
-srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
- srcdir="$ac_optarg" ;;
+ srcdir=$ac_optarg ;;
-sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
| --syscon | --sysco | --sysc | --sys | --sy)
ac_prev=sysconfdir ;;
-sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
| --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
- sysconfdir="$ac_optarg" ;;
+ sysconfdir=$ac_optarg ;;
-target | --target | --targe | --targ | --tar | --ta | --t)
- ac_prev=target ;;
+ ac_prev=target_alias ;;
-target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
- target="$ac_optarg" ;;
+ target_alias=$ac_optarg ;;
-v | -verbose | --verbose | --verbos | --verbo | --verb)
verbose=yes ;;
- -version | --version | --versio | --versi | --vers)
- echo "configure generated by autoconf version 2.13"
- exit 0 ;;
+ -version | --version | --versio | --versi | --vers | -V)
+ ac_init_version=: ;;
-with-* | --with-*)
- ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
+ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
- fi
+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid package name: $ac_package" >&2
+ { (exit 1); exit 1; }; }
ac_package=`echo $ac_package| sed 's/-/_/g'`
- case "$ac_option" in
- *=*) ;;
+ case $ac_option in
+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
*) ac_optarg=yes ;;
esac
- eval "with_${ac_package}='$ac_optarg'" ;;
+ eval "with_$ac_package='$ac_optarg'" ;;
-without-* | --without-*)
- ac_package=`echo $ac_option|sed -e 's/-*without-//'`
+ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
- fi
- ac_package=`echo $ac_package| sed 's/-/_/g'`
- eval "with_${ac_package}=no" ;;
+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid package name: $ac_package" >&2
+ { (exit 1); exit 1; }; }
+ ac_package=`echo $ac_package | sed 's/-/_/g'`
+ eval "with_$ac_package=no" ;;
--x)
# Obsolete; use --with-x.
@@ -429,99 +614,110 @@ EOF
ac_prev=x_includes ;;
-x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
| --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
- x_includes="$ac_optarg" ;;
+ x_includes=$ac_optarg ;;
-x-libraries | --x-libraries | --x-librarie | --x-librari \
| --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
ac_prev=x_libraries ;;
-x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
- x_libraries="$ac_optarg" ;;
+ x_libraries=$ac_optarg ;;
- -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+ -*) { echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; }
;;
+ *=*)
+ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+ { (exit 1); exit 1; }; }
+ ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+ eval "$ac_envvar='$ac_optarg'"
+ export $ac_envvar ;;
+
*)
- if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
- echo "configure: warning: $ac_option: invalid host type" 1>&2
- fi
- if test "x$nonopt" != xNONE; then
- { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
- fi
- nonopt="$ac_option"
+ # FIXME: should be removed in autoconf 3.0.
+ echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
;;
esac
done
if test -n "$ac_prev"; then
- { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
+ ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+ { echo "$as_me: error: missing argument to $ac_option" >&2
+ { (exit 1); exit 1; }; }
fi
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
- exec 6>/dev/null
-else
- exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
+# Be sure to have absolute paths.
+for ac_var in exec_prefix prefix
+do
+ eval ac_val=$`echo $ac_var`
+ case $ac_val in
+ [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+ { (exit 1); exit 1; }; };;
+ esac
+done
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+ localstatedir libdir includedir oldincludedir infodir mandir
do
- case "$ac_arg" in
- -no-create | --no-create | --no-creat | --no-crea | --no-cre \
- | --no-cr | --no-c) ;;
- -no-recursion | --no-recursion | --no-recursio | --no-recursi \
- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
- ac_configure_args="$ac_configure_args '$ac_arg'" ;;
- *) ac_configure_args="$ac_configure_args $ac_arg" ;;
+ eval ac_val=$`echo $ac_var`
+ case $ac_val in
+ [\\/$]* | ?:[\\/]* ) ;;
+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+ { (exit 1); exit 1; }; };;
esac
done
-# NLS nuisances.
-# Only set these to C if already set. These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}" = set; then LANG=C; export LANG; fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+ if test "x$build_alias" = x; then
+ cross_compiling=maybe
+ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+ If a cross compiler is detected then cross compile mode will be used." >&2
+ elif test "x$build_alias" != "x$host_alias"; then
+ cross_compiling=yes
+ fi
+fi
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=version.h
# Find the source files, if location was not specified.
if test -z "$srcdir"; then
ac_srcdir_defaulted=yes
# Try the directory containing this script, then its parent.
- ac_prog=$0
- ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
- test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
+ ac_confdir=`(dirname "$0") 2>/dev/null ||
+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$0" : 'X\(//\)[^/]' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
+echo X"$0" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+ /^X\(\/\/\)$/{ s//\1/; q; }
+ /^X\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
srcdir=$ac_confdir
if test ! -r $srcdir/$ac_unique_file; then
srcdir=..
@@ -531,13 +727,498 @@ else
fi
if test ! -r $srcdir/$ac_unique_file; then
if test "$ac_srcdir_defaulted" = yes; then
- { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+ { (exit 1); exit 1; }; }
else
- { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+ { (exit 1); exit 1; }; }
fi
fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+ { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+ { (exit 1); exit 1; }; }
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=${build_alias+set}
+ac_env_build_alias_value=$build_alias
+ac_cv_env_build_alias_set=${build_alias+set}
+ac_cv_env_build_alias_value=$build_alias
+ac_env_host_alias_set=${host_alias+set}
+ac_env_host_alias_value=$host_alias
+ac_cv_env_host_alias_set=${host_alias+set}
+ac_cv_env_host_alias_value=$host_alias
+ac_env_target_alias_set=${target_alias+set}
+ac_env_target_alias_value=$target_alias
+ac_cv_env_target_alias_set=${target_alias+set}
+ac_cv_env_target_alias_value=$target_alias
+ac_env_CC_set=${CC+set}
+ac_env_CC_value=$CC
+ac_cv_env_CC_set=${CC+set}
+ac_cv_env_CC_value=$CC
+ac_env_CFLAGS_set=${CFLAGS+set}
+ac_env_CFLAGS_value=$CFLAGS
+ac_cv_env_CFLAGS_set=${CFLAGS+set}
+ac_cv_env_CFLAGS_value=$CFLAGS
+ac_env_LDFLAGS_set=${LDFLAGS+set}
+ac_env_LDFLAGS_value=$LDFLAGS
+ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+ac_cv_env_LDFLAGS_value=$LDFLAGS
+ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_env_CPPFLAGS_value=$CPPFLAGS
+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+ac_env_CPP_set=${CPP+set}
+ac_env_CPP_value=$CPP
+ac_cv_env_CPP_set=${CPP+set}
+ac_cv_env_CPP_value=$CPP
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+ # Omit some internal or obsolete options to make the list less imposing.
+ # This message is too long to be a string in the A/UX 3.1 sh.
+ cat <<_ACEOF
+\`configure' configures this package to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE. See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+ -h, --help display this help and exit
+ --help=short display options specific to this package
+ --help=recursive display the short help of all the included packages
+ -V, --version display version information and exit
+ -q, --quiet, --silent do not print \`checking...' messages
+ --cache-file=FILE cache test results in FILE [disabled]
+ -C, --config-cache alias for \`--cache-file=config.cache'
+ -n, --no-create do not create output files
+ --srcdir=DIR find the sources in DIR [configure dir or \`..']
+
+_ACEOF
+
+ cat <<_ACEOF
+Installation directories:
+ --prefix=PREFIX install architecture-independent files in PREFIX
+ [$ac_default_prefix]
+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
+ [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+ --bindir=DIR user executables [EPREFIX/bin]
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
+ --libexecdir=DIR program executables [EPREFIX/libexec]
+ --datadir=DIR read-only architecture-independent data [PREFIX/share]
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --libdir=DIR object code libraries [EPREFIX/lib]
+ --includedir=DIR C header files [PREFIX/include]
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
+ --infodir=DIR info documentation [PREFIX/info]
+ --mandir=DIR man documentation [PREFIX/man]
+_ACEOF
+
+ cat <<\_ACEOF
+
+System types:
+ --build=BUILD configure for building on BUILD [guessed]
+ --host=HOST cross-compile to build programs to run on HOST [BUILD]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+
+ cat <<\_ACEOF
+
+Optional Features:
+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-compression enable EXPERIMENTAL compression support
+ --enable-htree enable EXPERIMENTAL htree directory support
+ --enable-htree-clear clear htree because we don't trust e2fsck
+ --enable-elf-shlibs select ELF shared libraries
+ --enable-bsd-shlibs select BSD shared libraries
+ --enable-profile build profiling libraries
+ --enable-checker build checker libraries
+ --enable-jbd-debug enable journal debugging
+ --enable-blkid-debug enable blkid debugging
+ --enable-testio-debug enable the use of the test I/O manager for debugging
+ --disable-swapfs disable support of legacy byte-swapped filesystems
+ --disable-debugfs disable support of debugfs program
+ --disable-imager disable support of e2image program
+ --disable-resizer disable support of e2resize program
+ --enable-dynamic-e2fsck build e2fsck dynamically
+ --enable-fsck build fsck wrapper program
+ --enable-e2initrd-helper build e2initrd-helper program
+ --enable-old-bitops Use old (non-standard but native) bitmask operations
+ --disable-nls do not use Native Language Support
+ --disable-rpath do not hardcode runtime library paths
+
+Optional Packages:
+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-diet-libc Use diet libc
+ --with-cc=COMPILER select compiler to use
+ --with-linker=LINKER select linker to use
+ --with-ccopts=CCOPTS select compiler command line options
+ --with-ldopts=LDOPTS select linker command line options
+ --with-root-prefix=PREFIX override prefix variable for files to be placed in the root
+ --with-gnu-ld assume the C compiler uses GNU ld default=no
+ --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
+ --without-libiconv-prefix don't search for libiconv in includedir and libdir
+ --with-included-gettext use the GNU gettext library included here
+ --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
+ --without-libintl-prefix don't search for libintl in includedir and libdir
+
+Some influential environment variables:
+ CC C compiler command
+ CFLAGS C compiler flags
+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
+ nonstandard directory <lib dir>
+ CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
+ headers in a nonstandard directory <include dir>
+ CPP C preprocessor
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+_ACEOF
+fi
+
+if test "$ac_init_help" = "recursive"; then
+ # If there are subdirs, report their specific --help.
+ ac_popdir=`pwd`
+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+ test -d $ac_dir || continue
+ ac_builddir=.
+
+if test "$ac_dir" != .; then
+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ # A "../" for each directory in $ac_dir_suffix.
+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+ ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+ .) # No --srcdir option. We are building in place.
+ ac_srcdir=.
+ if test -z "$ac_top_builddir"; then
+ ac_top_srcdir=.
+ else
+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+ fi ;;
+ [\\/]* | ?:[\\/]* ) # Absolute path.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+ ac_top_srcdir=$srcdir ;;
+ *) # Relative path.
+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+ case "$ac_dir" in
+ .) ac_abs_builddir=`pwd`;;
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+ case ${ac_top_builddir}. in
+ .) ac_abs_top_builddir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+ case $ac_srcdir in
+ .) ac_abs_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+ case $ac_top_srcdir in
+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+ esac;;
+esac
+
+ cd $ac_dir
+ # Check for guested configure; otherwise get Cygnus style configure.
+ if test -f $ac_srcdir/configure.gnu; then
+ echo
+ $SHELL $ac_srcdir/configure.gnu --help=recursive
+ elif test -f $ac_srcdir/configure; then
+ echo
+ $SHELL $ac_srcdir/configure --help=recursive
+ elif test -f $ac_srcdir/configure.ac ||
+ test -f $ac_srcdir/configure.in; then
+ echo
+ $ac_configure --help
+ else
+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ fi
+ cd "$ac_popdir"
+ done
+fi
+
+test -n "$ac_init_help" && exit 0
+if $ac_init_version; then
+ cat <<\_ACEOF
+
+Copyright (C) 2003 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+ exit 0
+fi
+exec 5>config.log
+cat >&5 <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by $as_me, which was
+generated by GNU Autoconf 2.59. Invocation command line was
+
+ $ $0 $@
+
+_ACEOF
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
+
+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ echo "PATH: $as_dir"
+done
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_sep=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+ for ac_arg
+ do
+ case $ac_arg in
+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil)
+ continue ;;
+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ case $ac_pass in
+ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+ 2)
+ ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+ if test $ac_must_keep_next = true; then
+ ac_must_keep_next=false # Got value, back to normal.
+ else
+ case $ac_arg in
+ *=* | --config-cache | -C | -disable-* | --disable-* \
+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+ | -with-* | --with-* | -without-* | --without-* | --x)
+ case "$ac_configure_args0 " in
+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+ esac
+ ;;
+ -* ) ac_must_keep_next=true ;;
+ esac
+ fi
+ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+ # Get rid of the leading space.
+ ac_sep=" "
+ ;;
+ esac
+ done
+done
+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log. We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Be sure not to use single quotes in there, as some shells,
+# such as our DU 5.0 friend, will then `close' the trap.
+trap 'exit_status=$?
+ # Save into config.log some information that might help in debugging.
+ {
+ echo
+
+ cat <<\_ASBOX
+## ---------------- ##
+## Cache variables. ##
+## ---------------- ##
+_ASBOX
+ echo
+ # The following way of writing the cache mishandles newlines in values,
+{
+ (set) 2>&1 |
+ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+ *ac_space=\ *)
+ sed -n \
+ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+ ;;
+ *)
+ sed -n \
+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ ;;
+ esac;
+}
+ echo
+
+ cat <<\_ASBOX
+## ----------------- ##
+## Output variables. ##
+## ----------------- ##
+_ASBOX
+ echo
+ for ac_var in $ac_subst_vars
+ do
+ eval ac_val=$`echo $ac_var`
+ echo "$ac_var='"'"'$ac_val'"'"'"
+ done | sort
+ echo
+
+ if test -n "$ac_subst_files"; then
+ cat <<\_ASBOX
+## ------------- ##
+## Output files. ##
+## ------------- ##
+_ASBOX
+ echo
+ for ac_var in $ac_subst_files
+ do
+ eval ac_val=$`echo $ac_var`
+ echo "$ac_var='"'"'$ac_val'"'"'"
+ done | sort
+ echo
+ fi
+
+ if test -s confdefs.h; then
+ cat <<\_ASBOX
+## ----------- ##
+## confdefs.h. ##
+## ----------- ##
+_ASBOX
+ echo
+ sed "/^$/d" confdefs.h | sort
+ echo
+ fi
+ test "$ac_signal" != 0 &&
+ echo "$as_me: caught signal $ac_signal"
+ echo "$as_me: exit $exit_status"
+ } >&5
+ rm -f core *.core &&
+ rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+ exit $exit_status
+ ' 0
+for ac_signal in 1 2 13 15; do
+ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo >confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
# Prefer explicitly selected file to automatically selected ones.
if test -z "$CONFIG_SITE"; then
if test "x$prefix" != xNONE; then
@@ -548,138 +1229,131 @@ if test -z "$CONFIG_SITE"; then
fi
for ac_site_file in $CONFIG_SITE; do
if test -r "$ac_site_file"; then
- echo "loading site script $ac_site_file"
+ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+echo "$as_me: loading site script $ac_site_file" >&6;}
+ sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
fi
done
if test -r "$cache_file"; then
- echo "loading cache $cache_file"
- . $cache_file
+ # Some versions of bash will fail to source /dev/null (special
+ # files actually), so we avoid doing that.
+ if test -f "$cache_file"; then
+ { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
+ case $cache_file in
+ [\\/]* | ?:[\\/]* ) . $cache_file;;
+ *) . ./$cache_file;;
+ esac
+ fi
else
- echo "creating cache $cache_file"
- > $cache_file
+ { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+echo "$as_me: creating cache $cache_file" >&6;}
+ >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in `(set) 2>&1 |
+ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+ eval ac_old_set=\$ac_cv_env_${ac_var}_set
+ eval ac_new_set=\$ac_env_${ac_var}_set
+ eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+ eval ac_new_val="\$ac_env_${ac_var}_value"
+ case $ac_old_set,$ac_new_set in
+ set,)
+ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ ac_cache_corrupted=: ;;
+ ,set)
+ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ ac_cache_corrupted=: ;;
+ ,);;
+ *)
+ if test "x$ac_old_val" != "x$ac_new_val"; then
+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
+echo "$as_me: former value: $ac_old_val" >&2;}
+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
+echo "$as_me: current value: $ac_new_val" >&2;}
+ ac_cache_corrupted=:
+ fi;;
+ esac
+ # Pass precious variables to config.status.
+ if test "$ac_new_set" = set; then
+ case $ac_new_val in
+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+ ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *) ac_arg=$ac_var=$ac_new_val ;;
+ esac
+ case " $ac_configure_args " in
+ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
+ *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+ esac
+ fi
+done
+if $ac_cache_corrupted; then
+ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+ { (exit 1); exit 1; }; }
fi
ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
- # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
- if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
- ac_n= ac_c='
-' ac_t=' '
- else
- ac_n=-n ac_c= ac_t=
- fi
-else
- ac_n= ac_c='\c' ac_t=
-fi
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+
+
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
- withval="$with_gnu_ld"
- test "$withval" = no || with_gnu_ld=yes
-else
- with_gnu_ld=no
-fi
-ac_prog=ld
-if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
- echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:598: checking for ld used by GCC" >&5
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
- *)
- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
- esac
- case $ac_prog in
- # Accept absolute paths.
- [\\/]* | [A-Za-z]:[\\/]*)
- re_direlt='/[^/][^/]*/\.\./'
- # Canonicalize the path of ld
- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
- done
- test -z "$LD" && LD="$ac_prog"
- ;;
- "")
- # If it fails, then pretend we aren't using GCC.
- ac_prog=ld
- ;;
- *)
- # If it is relative, then search for the first ld in PATH.
- with_gnu_ld=unknown
- ;;
- esac
-elif test "$with_gnu_ld" = yes; then
- echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:628: checking for GNU ld" >&5
-else
- echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:631: checking for non-GNU ld" >&5
-fi
-if eval "test \"`echo '$''{'acl_cv_path_LD'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test -z "$LD"; then
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- acl_cv_path_LD="$ac_dir/$ac_prog"
- # Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some GNU ld's only accept -v.
- # Break only if it was the GNU/non-GNU ld that we prefer.
- if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
- test "$with_gnu_ld" != no && break
- else
- test "$with_gnu_ld" != yes && break
- fi
- fi
- done
- IFS="$ac_save_ifs"
-else
- acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
- echo "$ac_t""$LD" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:666: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'acl_cv_prog_gnu_ld'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
- acl_cv_prog_gnu_ld=yes
-else
- acl_cv_prog_gnu_ld=no
-fi
-fi
-echo "$ac_t""$acl_cv_prog_gnu_ld" 1>&6
-with_gnu_ld=$acl_cv_prog_gnu_ld
+
+
+
+
+
+
+ac_aux_dir=
+for ac_dir in config $srcdir/config; do
+ if test -f $ac_dir/install-sh; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install-sh -c"
+ break
+ elif test -f $ac_dir/install.sh; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install.sh -c"
+ break
+ elif test -f $ac_dir/shtool; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/shtool install -c"
+ break
+ fi
+done
+if test -z "$ac_aux_dir"; then
+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config $srcdir/config" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in config $srcdir/config" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
+
MCONFIG=./MCONFIG
BINARY_TYPE=bin
@@ -722,277 +1396,731 @@ echo "Release date is ${E2FSPROGS_MONTH}, ${E2FSPROGS_YEAR}"
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
- if test -f $ac_dir/install-sh; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f $ac_dir/install.sh; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- fi
-done
-if test -z "$ac_aux_dir"; then
- { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
+$ac_config_sub sun4 >/dev/null 2>&1 ||
+ { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
+echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+ { (exit 1); exit 1; }; }
+
+echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6
+if test "${ac_cv_build+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_build_alias=$build_alias
+test -z "$ac_cv_build_alias" &&
+ ac_cv_build_alias=`$ac_config_guess`
+test -z "$ac_cv_build_alias" &&
+ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+ { (exit 1); exit 1; }; }
+ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
+ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6
+build=$ac_cv_build
+build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+
+echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6
+if test "${ac_cv_host+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_host_alias=$host_alias
+test -z "$ac_cv_host_alias" &&
+ ac_cv_host_alias=$ac_cv_build_alias
+ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
+ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+ { (exit 1); exit 1; }; }
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6
+host=$ac_cv_host
+host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:752: checking host system type" >&5
-host_alias=$host
-case "$host_alias" in
-NONE)
- case $nonopt in
- NONE)
- if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
- else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
- fi ;;
- *) host_alias=$nonopt ;;
- esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
# Check whether --with-diet-libc or --without-diet-libc was given.
if test "${with_diet_libc+set}" = set; then
withval="$with_diet_libc"
CC="diet cc -nostdinc"
-echo "$ac_t""CC=$CC" 1>&6
-fi
+echo "$as_me:$LINENO: result: CC=$CC" >&5
+echo "${ECHO_T}CC=$CC" >&6
+fi;
# Check whether --with-cc or --without-cc was given.
if test "${with_cc+set}" = set; then
withval="$with_cc"
- echo "$ac_t""CC=$withval" 1>&6
+ echo "$as_me:$LINENO: result: CC=$withval" >&5
+echo "${ECHO_T}CC=$withval" >&6
CC=$withval
else
if test -z "$CC" ; then CC=cc; fi
-echo "$ac_t""CC defaults to $CC" 1>&6
+echo "$as_me:$LINENO: result: CC defaults to $CC" >&5
+echo "${ECHO_T}CC defaults to $CC" >&6
+fi; export CC
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
-export CC
-# Extract the first word of "gcc", so it can be a program name with args.
+fi
+if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:792: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_CC="gcc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ CC=$ac_ct_CC
+else
+ CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_CC="gcc"
- break
- fi
- done
- IFS="$ac_save_ifs"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
fi
fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$ac_t""$CC" 1>&6
+ echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_CC="cc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ CC=$ac_ct_CC
else
- echo "$ac_t""no" 1>&6
+ CC="$ac_cv_prog_CC"
fi
+fi
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:822: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
ac_prog_rejected=no
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
- fi
- ac_cv_prog_CC="cc"
- break
- fi
- done
- IFS="$ac_save_ifs"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
set dummy $ac_cv_prog_CC
shift
- if test $# -gt 0; then
+ if test $# != 0; then
# We chose a different compiler from the bogus one.
# However, it has the same basename, so the bogon will be chosen
# first if we set CC to just the basename; use the full file name.
shift
- set dummy "$ac_dir/$ac_word" "$@"
- shift
- ac_cv_prog_CC="$@"
+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
fi
fi
fi
fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$ac_t""$CC" 1>&6
+ echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
- if test -z "$CC"; then
- case "`uname -s`" in
- *win32* | *WIN32*)
- # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:873: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+fi
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in cl
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_CC="cl"
- break
- fi
- done
- IFS="$ac_save_ifs"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
fi
fi
-CC="$ac_cv_prog_CC"
+CC=$ac_cv_prog_CC
if test -n "$CC"; then
- echo "$ac_t""$CC" 1>&6
+ echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
- ;;
- esac
+
+ test -n "$CC" && break
+ done
+fi
+if test -z "$CC"; then
+ ac_ct_CC=$CC
+ for ac_prog in cl
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_CC="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
fi
- test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+done
+done
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:905: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+ test -n "$ac_ct_CC" && break
+done
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext << EOF
-
-#line 916 "configure"
-#include "confdefs.h"
-
-main(){return(0);}
-EOF
-if { (eval echo configure:921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- ac_cv_prog_cc_works=yes
- # If we can't run a trivial program, we are probably using a cross compiler.
- if (./conftest; exit) 2>/dev/null; then
- ac_cv_prog_cc_cross=no
+ CC=$ac_ct_CC
+fi
+
+fi
+
+
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&5
+echo "$as_me: error: no acceptable C compiler found in \$PATH
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+
+# Provide some information about the compiler.
+echo "$as_me:$LINENO:" \
+ "checking for C compiler version" >&5
+ac_compiler=`set X $ac_compile; echo $2`
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+ (eval $ac_compiler --version </dev/null >&5) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+ (eval $ac_compiler -v </dev/null >&5) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+ (eval $ac_compiler -V </dev/null >&5) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
+ (eval $ac_link_default) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ # Find the output, starting from the most likely. This scheme is
+# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+# resort.
+
+# Be careful to initialize this variable, since it used to be cached.
+# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+ac_cv_exeext=
+# b.out is created by i960 compilers.
+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+do
+ test -f "$ac_file" || continue
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
+ ;;
+ conftest.$ac_ext )
+ # This is the source file.
+ ;;
+ [ab].out )
+ # We found the default executable, but exeext='' is most
+ # certainly right.
+ break;;
+ *.* )
+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ # FIXME: I believe we export ac_cv_exeext for Libtool,
+ # but it would be cool to find out if it's true. Does anybody
+ # maintain Libtool? --akim.
+ export ac_cv_exeext
+ break;;
+ * )
+ break;;
+ esac
+done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+See \`config.log' for more details." >&5
+echo "$as_me: error: C compiler cannot create executables
+See \`config.log' for more details." >&2;}
+ { (exit 77); exit 77; }; }
+fi
+
+ac_exeext=$ac_cv_exeext
+echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6
+
+# Check the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+# If not cross compiling, check that we can run a simple program.
+if test "$cross_compiling" != yes; then
+ if { ac_try='./$ac_file'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cross_compiling=no
else
- ac_cv_prog_cc_cross=yes
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+ { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
fi
+fi
+echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+rm -f a.out a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+# Check the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+echo "$as_me:$LINENO: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6
+
+echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+ test -f "$ac_file" || continue
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ export ac_cv_exeext
+ break;;
+ * ) break;;
+ esac
+done
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- ac_cv_prog_cc_works=no
+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
- { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:947: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
+rm -f conftest$ac_cv_exeext
+echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:952: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.c <<EOF
-#ifdef __GNUC__
- yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:961: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
- ac_cv_prog_gcc=yes
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
+if test "${ac_cv_objext+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_prog_gcc=no
-fi
-fi
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+int
+main ()
+{
-if test $ac_cv_prog_gcc = yes; then
- GCC=yes
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+ break;;
+ esac
+done
else
- GCC=
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
fi
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:980: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+#ifndef __GNUC__
+ choke me
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_compiler_gnu=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_compiler_gnu=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+GCC=`test $ac_compiler_gnu = yes && echo yes`
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+CFLAGS="-g"
+echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_g+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_prog_cc_g=yes
else
- ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ac_cv_prog_cc_g=no
fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
if test "$ac_test_CFLAGS" = set; then
- CFLAGS="$ac_save_CFLAGS"
+ CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
if test "$GCC" = yes; then
CFLAGS="-g -O2"
@@ -1006,144 +2134,922 @@ else
CFLAGS=
fi
fi
+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+if test "${ac_cv_prog_cc_stdc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_prog_cc_stdc=no
+ac_save_CC=$CC
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+ char **p;
+ int i;
+{
+ return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+ char *s;
+ va_list v;
+ va_start (v,p);
+ s = g (p, va_arg (v,int));
+ va_end (v);
+ return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
+ as 'x'. The following induces an error, until -std1 is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
+ that's true only with -std1. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+ ;
+ return 0;
+}
+_ACEOF
+# Don't try gcc -ansi; that turns off useful extensions and
+# breaks some systems' header files.
+# AIX -qlanglvl=ansi
+# Ultrix and OSF/1 -std1
+# HP-UX 10.20 and later -Ae
+# HP-UX older versions -Aa -D_HPUX_SOURCE
+# SVR4 -Xc -D__EXTENSIONS__
+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+ CC="$ac_save_CC $ac_arg"
+ rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_prog_cc_stdc=$ac_arg
+break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext
+done
+rm -f conftest.$ac_ext conftest.$ac_objext
+CC=$ac_save_CC
+
+fi
+
+case "x$ac_cv_prog_cc_stdc" in
+ x|xno)
+ echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6 ;;
+ *)
+ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+ CC="$CC $ac_cv_prog_cc_stdc" ;;
+esac
+
+# Some people use a C++ compiler to compile C. Since we use `exit',
+# in C++ we need to declare it. In case someone uses the same compiler
+# for both compiling C and C++ we need to have the C++ compiler decide
+# the declaration of exit, since it's the most demanding environment.
+cat >conftest.$ac_ext <<_ACEOF
+#ifndef __cplusplus
+ choke me
+#endif
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ for ac_declaration in \
+ '' \
+ 'extern "C" void std::exit (int) throw (); using std::exit;' \
+ 'extern "C" void std::exit (int); using std::exit;' \
+ 'extern "C" void exit (int) throw ();' \
+ 'extern "C" void exit (int);' \
+ 'void exit (int);'
+do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_declaration
+#include <stdlib.h>
+int
+main ()
+{
+exit (42);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+continue
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_declaration
+int
+main ()
+{
+exit (42);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+rm -f conftest*
+if test -n "$ac_declaration"; then
+ echo '#ifdef __cplusplus' >>confdefs.h
+ echo $ac_declaration >>confdefs.h
+ echo '#endif' >>confdefs.h
+fi
+
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
# Check whether --with-linker or --without-linker was given.
if test "${with_linker+set}" = set; then
withval="$with_linker"
- echo "$ac_t""LD=$withval" 1>&6
+ echo "$as_me:$LINENO: result: LD=$withval" >&5
+echo "${ECHO_T}LD=$withval" >&6
LD=$withval
else
if test -z "$LD" ; then LD=$CC; fi
-echo "$ac_t""LD defaults to $LD" 1>&6
-fi
-export LD
+echo "$as_me:$LINENO: result: LD defaults to $LD" >&5
+echo "${ECHO_T}LD defaults to $LD" >&6
+fi; export LD
+
# Check whether --with-ccopts or --without-ccopts was given.
if test "${with_ccopts+set}" = set; then
withval="$with_ccopts"
- echo "$ac_t""CCOPTS is $withval" 1>&6
+ echo "$as_me:$LINENO: result: CCOPTS is $withval" >&5
+echo "${ECHO_T}CCOPTS is $withval" >&6
CFLAGS=$withval
-fi
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1029: checking how to run the C preprocessor" >&5
+fi;
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+ if test "${ac_cv_prog_CPP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ # Double quotes because CPP needs to be expanded
+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ :
else
- # This must be in double quotes, not single quotes, because CPP may get
- # substituted into the Makefile and "${CC-cc}" will confuse make.
- CPP="${CC-cc} -E"
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ # Broken: success on invalid input.
+continue
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ break
+fi
+
+ done
+ ac_cv_prog_CPP=$CPP
+
+fi
+ CPP=$ac_cv_prog_CPP
+else
+ ac_cv_prog_CPP=$CPP
+fi
+echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp.
- cat > conftest.$ac_ext <<EOF
-#line 1044 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
:
else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- CPP="${CC-cc} -E -traditional-cpp"
- cat > conftest.$ac_ext <<EOF
-#line 1061 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1067: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ # Broken: success on invalid input.
+continue
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
:
else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- CPP="${CC-cc} -nologo -E"
- cat > conftest.$ac_ext <<EOF
-#line 1078 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1084: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
+ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+echo "$as_me:$LINENO: checking for egrep" >&5
+echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+if test "${ac_cv_prog_egrep+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+ then ac_cv_prog_egrep='grep -E'
+ else ac_cv_prog_egrep='egrep'
+ fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+ EGREP=$ac_cv_prog_egrep
+
+
+echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+if test "${ac_cv_header_stdc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_header_stdc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_header_stdc=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "memchr" >/dev/null 2>&1; then
:
else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- CPP=/lib/cpp
+ ac_cv_header_stdc=no
fi
rm -f conftest*
+
fi
-rm -f conftest*
+
+if test $ac_cv_header_stdc = yes; then
+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "free" >/dev/null 2>&1; then
+ :
+else
+ ac_cv_header_stdc=no
fi
rm -f conftest*
- ac_cv_prog_CPP="$CPP"
+
fi
- CPP="$ac_cv_prog_CPP"
+
+if test $ac_cv_header_stdc = yes; then
+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ if test "$cross_compiling" = yes; then
+ :
else
- ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ctype.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+ (('a' <= (c) && (c) <= 'i') \
+ || ('j' <= (c) && (c) <= 'r') \
+ || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
-ac_safe=`echo "linux/fs.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for linux/fs.h""... $ac_c" 1>&6
-echo "configure:1110: checking for linux/fs.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+ int i;
+ for (i = 0; i < 256; i++)
+ if (XOR (islower (i), ISLOWER (i))
+ || toupper (i) != TOUPPER (i))
+ exit(2);
+ exit (0);
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
else
- cat > conftest.$ac_ext <<EOF
-#line 1115 "configure"
-#include "confdefs.h"
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_header_stdc=no
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+echo "${ECHO_T}$ac_cv_header_stdc" >&6
+if test $ac_cv_header_stdc = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define STDC_HEADERS 1
+_ACEOF
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+
+
+
+
+
+
+
+
+
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ inttypes.h stdint.h unistd.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+if test "${ac_cv_header_linux_fs_h+set}" = set; then
+ echo "$as_me:$LINENO: checking for linux/fs.h" >&5
+echo $ECHO_N "checking for linux/fs.h... $ECHO_C" >&6
+if test "${ac_cv_header_linux_fs_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_linux_fs_h" >&5
+echo "${ECHO_T}$ac_cv_header_linux_fs_h" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking linux/fs.h usability" >&5
+echo $ECHO_N "checking linux/fs.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <linux/fs.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking linux/fs.h presence" >&5
+echo $ECHO_N "checking linux/fs.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#include <linux/fs.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1120: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
fi
-rm -f conftest*
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: linux/fs.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: linux/fs.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: linux/fs.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: linux/fs.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: linux/fs.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: linux/fs.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: linux/fs.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: linux/fs.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: linux/fs.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: linux/fs.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: linux/fs.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: linux/fs.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: linux/fs.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: linux/fs.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: linux/fs.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: linux/fs.h: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists. ##
+## ------------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for linux/fs.h" >&5
+echo $ECHO_N "checking for linux/fs.h... $ECHO_C" >&6
+if test "${ac_cv_header_linux_fs_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_linux_fs_h=$ac_header_preproc
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
+echo "$as_me:$LINENO: result: $ac_cv_header_linux_fs_h" >&5
+echo "${ECHO_T}$ac_cv_header_linux_fs_h" >&6
+
+fi
+if test $ac_cv_header_linux_fs_h = yes; then
linux_headers=yes
else
- echo "$ac_t""no" 1>&6
-linux_headers=no
+ linux_headers=no
fi
+
if test "$linux_headers" != yes; then
LINUX_INCLUDE='-I$(top_builddir)/include'
fi
-echo $ac_n "checking for additional special compiler flags""... $ac_c" 1>&6
-echo "configure:1147: checking for additional special compiler flags" >&5
+echo "$as_me:$LINENO: checking for additional special compiler flags" >&5
+echo $ECHO_N "checking for additional special compiler flags... $ECHO_C" >&6
if test "$GCC" = yes
then
case "$host_cpu" in
@@ -1152,22 +3058,26 @@ then
fi
if test "x$addcflags" != x
then
- echo "$ac_t""$addcflags" 1>&6
+ echo "$as_me:$LINENO: result: $addcflags" >&5
+echo "${ECHO_T}$addcflags" >&6
CFLAGS="$addcflags $CFLAGS"
else
- echo "$ac_t""(none)" 1>&6
+ echo "$as_me:$LINENO: result: (none)" >&5
+echo "${ECHO_T}(none)" >&6
fi
LIB_EXT=.a
STATIC_LIB_EXT=.a
PROFILE_LIB_EXT=.a
+
# Check whether --with-ldopts or --without-ldopts was given.
if test "${with_ldopts+set}" = set; then
withval="$with_ldopts"
- echo "$ac_t""LDFLAGS is $withval" 1>&6
+ echo "$as_me:$LINENO: result: LDFLAGS is $withval" >&5
+echo "${ECHO_T}LDFLAGS is $withval" >&6
LDFLAGS=$withval
else
LDFLAGS=
-fi
+fi;
# Check whether --with-root-prefix or --without-root-prefix was given.
if test "${with_root_prefix+set}" = set; then
@@ -1175,17 +3085,16 @@ if test "${with_root_prefix+set}" = set; then
root_prefix=$withval
else
root_prefix=NONE
-fi
-# Check whether --enable-compression or --disable-compression was given.
+fi; # Check whether --enable-compression or --disable-compression was given.
if test "${enable_compression+set}" = set; then
enableval="$enable_compression"
if test "$enableval" = "no"
then
echo "Disabling compression support"
else
- cat >> confdefs.h <<\EOF
+ cat >>confdefs.h <<\_ACEOF
#define ENABLE_COMPRESSION 1
-EOF
+_ACEOF
echo "Enabling compression support"
echo "WARNING: Compression support is experimental"
@@ -1194,8 +3103,7 @@ fi
else
echo "Disabling compression support by default"
-fi
-
+fi;
# Check whether --enable-htree or --disable-htree was given.
if test "${enable_htree+set}" = set; then
enableval="$enable_htree"
@@ -1205,23 +3113,22 @@ then
echo "Disabling htree directory support"
else
HTREE_CMT=
- cat >> confdefs.h <<\EOF
+ cat >>confdefs.h <<\_ACEOF
#define ENABLE_HTREE 1
-EOF
+_ACEOF
echo "Enabling htree directory support"
fi
else
HTREE_CMT=
-cat >> confdefs.h <<\EOF
+cat >>confdefs.h <<\_ACEOF
#define ENABLE_HTREE 1
-EOF
+_ACEOF
echo "Enabling htree directory support by default"
-fi
-
+fi;
# Check whether --enable-htree-clear or --disable-htree-clear was given.
if test "${enable_htree_clear+set}" = set; then
@@ -1232,9 +3139,9 @@ then
echo "Disabling htree clearing"
else
HTREE_CLR_CMT=
- cat >> confdefs.h <<\EOF
+ cat >>confdefs.h <<\_ACEOF
#define ENABLE_HTREE_CLEAR 1
-EOF
+_ACEOF
echo "Enabling htree clearing"
fi
@@ -1243,8 +3150,7 @@ else
HTREE_CLR_CMT=#
echo "Disabling htree clearing by default"
-fi
-
+fi;
# Check whether --enable-elf-shlibs or --disable-elf-shlibs was given.
if test "${enable_elf_shlibs+set}" = set; then
@@ -1272,8 +3178,7 @@ else
ELF_CMT=#
echo "Disabling ELF shared libraries by default"
-fi
-
+fi;
# Check whether --enable-bsd-shlibs or --disable-bsd-shlibs was given.
@@ -1302,8 +3207,7 @@ else
BSDLIB_CMT=#
echo "Disabling BSD shared libraries by default"
-fi
-
+fi;
# Check whether --enable-profile or --disable-profile was given.
@@ -1326,8 +3230,7 @@ else
MAKEFILE_PROFILE=/dev/null
echo "Disabling profiling libraries by default"
-fi
-
+fi;
# Check whether --enable-checker or --disable-checker was given.
@@ -1349,8 +3252,7 @@ else
MAKEFILE_CHECKER=/dev/null
echo "Disabling checker libraries by default"
-fi
-
+fi;
@@ -1363,9 +3265,9 @@ if test "${enable_jbd_debug+set}" = set; then
then
echo "Disabling journal debugging"
else
- cat >> confdefs.h <<\EOF
+ cat >>confdefs.h <<\_ACEOF
#define CONFIG_JBD_DEBUG 1
-EOF
+_ACEOF
echo "Enabling journal debugging"
fi
@@ -1373,8 +3275,7 @@ fi
else
echo "Disabling journal debugging by default"
-fi
-
+fi;
# Check whether --enable-blkid-debug or --disable-blkid-debug was given.
if test "${enable_blkid_debug+set}" = set; then
enableval="$enable_blkid_debug"
@@ -1382,9 +3283,9 @@ if test "${enable_blkid_debug+set}" = set; then
then
echo "Disabling blkid debugging"
else
- cat >> confdefs.h <<\EOF
+ cat >>confdefs.h <<\_ACEOF
#define CONFIG_BLKID_DEBUG 1
-EOF
+_ACEOF
echo "Enabling blkid debugging"
fi
@@ -1392,8 +3293,7 @@ fi
else
echo "Disabling blkid debugging by default"
-fi
-
+fi;
# Check whether --enable-testio-debug or --disable-testio-debug was given.
if test "${enable_testio_debug+set}" = set; then
enableval="$enable_testio_debug"
@@ -1401,9 +3301,9 @@ if test "${enable_testio_debug+set}" = set; then
then
echo "Disabling testio debugging"
else
- cat >> confdefs.h <<\EOF
+ cat >>confdefs.h <<\_ACEOF
#define CONFIG_TESTIO_DEBUG 1
-EOF
+_ACEOF
echo "Enabling testio debugging"
fi
@@ -1411,8 +3311,7 @@ fi
else
echo "Disabling testio debugging by default"
-fi
-
+fi;
# Check whether --enable-swapfs or --disable-swapfs was given.
if test "${enable_swapfs+set}" = set; then
enableval="$enable_swapfs"
@@ -1422,9 +3321,9 @@ then
echo "Disabling swapfs support"
else
SWAPFS_CMT=
- cat >> confdefs.h <<\EOF
+ cat >>confdefs.h <<\_ACEOF
#define ENABLE_SWAPFS 1
-EOF
+_ACEOF
echo "Enabling swapfs support"
fi
@@ -1432,13 +3331,12 @@ fi
else
SWAPFS_CMT=
echo "Enabling swapfs support by default"
-cat >> confdefs.h <<\EOF
+cat >>confdefs.h <<\_ACEOF
#define ENABLE_SWAPFS 1
-EOF
-
+_ACEOF
-fi
+fi;
# Check whether --enable-debugfs or --disable-debugfs was given.
if test "${enable_debugfs+set}" = set; then
@@ -1456,8 +3354,7 @@ else
echo "Enabling debugfs support by default"
DEBUGFS_CMT=
-fi
-
+fi;
# Check whether --enable-imager or --disable-imager was given.
if test "${enable_imager+set}" = set; then
@@ -1475,8 +3372,7 @@ else
echo "Enabling e2image support by default"
IMAGER_CMT=
-fi
-
+fi;
# Check whether --enable-resizer or --disable-resizer was given.
if test "${enable_resizer+set}" = set; then
@@ -1494,8 +3390,7 @@ else
echo "Enabling e2resize support by default"
RESIZER_CMT=
-fi
-
+fi;
# Check whether --enable-dynamic-e2fsck or --disable-dynamic-e2fsck was given.
if test "${enable_dynamic_e2fsck+set}" = set; then
@@ -1513,8 +3408,7 @@ else
E2FSCK_TYPE=static
echo "Building e2fsck statically by default"
-fi
-
+fi;
# Check whether --enable-fsck or --disable-fsck was given.
if test "${enable_fsck+set}" = set; then
@@ -1539,8 +3433,7 @@ else
echo "Building fsck wrapper by default"
esac
-fi
-
+fi;
# Check whether --enable-e2initrd-helper or --disable-e2initrd-helper was given.
@@ -1559,8 +3452,7 @@ else
E2INITRD_PROG=e2initrd_helper E2INITRD_MAN=e2initrd_helper.8
echo "Building e2initrd helper by default"
-fi
-
+fi;
MAKEFILE_LIBRARY=$srcdir/lib/Makefile.library
@@ -1572,9 +3464,9 @@ if test "${enable_old_bitops+set}" = set; then
then
echo "Using new (standard) bitmask operations"
else
- cat >> confdefs.h <<\EOF
+ cat >>confdefs.h <<\_ACEOF
#define EXT2_OLD_BITOPS 1
-EOF
+_ACEOF
echo "Using old (native) bitmask operations"
@@ -1583,200 +3475,49 @@ fi
else
echo "Using standard bitmask operations by default"
-fi
-
+fi;
+GETTEXT_PACKAGE=e2fsprogs
PACKAGE=e2fsprogs
VERSION="$E2FSPROGS_VERSION"
-cat >> confdefs.h <<EOF
+VERSION=0.14.1
+cat >>confdefs.h <<_ACEOF
#define PACKAGE "$PACKAGE"
-EOF
+_ACEOF
-cat >> confdefs.h <<EOF
+cat >>confdefs.h <<_ACEOF
#define VERSION "$VERSION"
-EOF
-
-
-
-
-
- echo $ac_n "checking for inttypes.h""... $ac_c" 1>&6
-echo "configure:1604: checking for inttypes.h" >&5
-if eval "test \"`echo '$''{'jm_ac_cv_header_inttypes_h'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 1609 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <inttypes.h>
-int main() {
-uintmax_t i = (uintmax_t) -1;
-; return 0; }
-EOF
-if { (eval echo configure:1617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- jm_ac_cv_header_inttypes_h=yes
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- jm_ac_cv_header_inttypes_h=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$jm_ac_cv_header_inttypes_h" 1>&6
- if test $jm_ac_cv_header_inttypes_h = yes; then
- cat >> confdefs.h <<EOF
-#define HAVE_INTTYPES_H_WITH_UINTMAX 1
-EOF
-
- fi
-
-
- echo $ac_n "checking for stdint.h""... $ac_c" 1>&6
-echo "configure:1639: checking for stdint.h" >&5
-if eval "test \"`echo '$''{'jm_ac_cv_header_stdint_h'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 1644 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <stdint.h>
-int main() {
-uintmax_t i = (uintmax_t) -1;
-; return 0; }
-EOF
-if { (eval echo configure:1652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- jm_ac_cv_header_stdint_h=yes
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- jm_ac_cv_header_stdint_h=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$jm_ac_cv_header_stdint_h" 1>&6
- if test $jm_ac_cv_header_stdint_h = yes; then
- cat >> confdefs.h <<EOF
-#define HAVE_STDINT_H_WITH_UINTMAX 1
-EOF
-
- fi
-
+_ACEOF
- echo $ac_n "checking for unsigned long long""... $ac_c" 1>&6
-echo "configure:1674: checking for unsigned long long" >&5
-if eval "test \"`echo '$''{'ac_cv_type_unsigned_long_long'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 1679 "configure"
-#include "confdefs.h"
-unsigned long long ull = 1; int i = 63;
-int main() {
-unsigned long long ullmax = (unsigned long long) -1;
- return ull << i | ull >> i | ullmax / ull | ullmax % ull;
-; return 0; }
-EOF
-if { (eval echo configure:1687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- ac_cv_type_unsigned_long_long=yes
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- ac_cv_type_unsigned_long_long=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_type_unsigned_long_long" 1>&6
- if test $ac_cv_type_unsigned_long_long = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_UNSIGNED_LONG_LONG 1
-EOF
- fi
-
-
- if test "X$prefix" = "XNONE"; then
- acl_final_prefix="$ac_default_prefix"
- else
- acl_final_prefix="$prefix"
- fi
- if test "X$exec_prefix" = "XNONE"; then
- acl_final_exec_prefix='${prefix}'
- else
- acl_final_exec_prefix="$exec_prefix"
- fi
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
- prefix="$acl_save_prefix"
- echo $ac_n "checking for shared library run path origin""... $ac_c" 1>&6
-echo "configure:1725: checking for shared library run path origin" >&5
-if eval "test \"`echo '$''{'acl_cv_rpath'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
-
- CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
- ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
- . ./conftest.sh
- rm -f ./conftest.sh
- acl_cv_rpath=done
-
-fi
-echo "$ac_t""$acl_cv_rpath" 1>&6
- wl="$acl_cv_wl"
- libext="$acl_cv_libext"
- shlibext="$acl_cv_shlibext"
- hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
- hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
- hardcode_direct="$acl_cv_hardcode_direct"
- hardcode_minus_L="$acl_cv_hardcode_minus_L"
- sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
- sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
- # Check whether --enable-rpath or --disable-rpath was given.
-if test "${enable_rpath+set}" = set; then
- enableval="$enable_rpath"
- :
+echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- enable_rpath=yes
-fi
-
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1758: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftestmake <<\EOF
+ cat >conftest.make <<\_ACEOF
all:
- @echo 'ac_maketemp="${MAKE}"'
-EOF
+ @echo 'ac_maketemp="$(MAKE)"'
+_ACEOF
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
if test -n "$ac_maketemp"; then
eval ac_cv_prog_make_${ac_make}_set=yes
else
eval ac_cv_prog_make_${ac_make}_set=no
fi
-rm -f conftestmake
+rm -f conftest.make
fi
if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
- echo "$ac_t""yes" 1>&6
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
SET_MAKE=
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
SET_MAKE="MAKE=${MAKE-make}"
fi
@@ -1787,475 +3528,1516 @@ fi
# SunOS /usr/etc/install
# IRIX /sbin/install
# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1796: checking for a BSD compatible install" >&5
+echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+if test "${ac_cv_path_install+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
- for ac_dir in $PATH; do
- # Account for people who put trailing slashes in PATH elements.
- case "$ac_dir/" in
- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- # Don't use installbsd from OSF since it installs stuff as root
- # by default.
- for ac_prog in ginstall scoinst install; do
- if test -f $ac_dir/$ac_prog; then
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+ ./ | .// | /cC/* | \
+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+ /usr/ucb/* ) ;;
+ *)
+ # OSF1 and SCO ODT 3.0 have their own names for install.
+ # Don't use installbsd from OSF since it installs stuff as root
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
if test $ac_prog = install &&
- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
:
+ elif test $ac_prog = install &&
+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # program-specific install script used by HP pwplus--don't use.
+ :
else
- ac_cv_path_install="$ac_dir/$ac_prog -c"
- break 2
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
fi
fi
done
- ;;
- esac
- done
- IFS="$ac_save_IFS"
+ done
+ ;;
+esac
+done
+
fi
if test "${ac_cv_path_install+set}" = set; then
- INSTALL="$ac_cv_path_install"
+ INSTALL=$ac_cv_path_install
else
# As a last resort, use the slow shell script. We don't cache a
# path for INSTALL within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the path is relative.
- INSTALL="$ac_install_sh"
+ INSTALL=$ac_install_sh
fi
fi
-echo "$ac_t""$INSTALL" 1>&6
+echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
MKINSTALLDIRS=
if test -n "$ac_aux_dir"; then
- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+ case "$ac_aux_dir" in
+ /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
+ *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
+ esac
fi
if test -z "$MKINSTALLDIRS"; then
MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
fi
-
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1861: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+
+
+ echo "$as_me:$LINENO: checking whether NLS is requested" >&5
+echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
+ # Check whether --enable-nls or --disable-nls was given.
+if test "${enable_nls+set}" = set; then
+ enableval="$enable_nls"
+ USE_NLS=$enableval
else
- if test -n "$RANLIB"; then
- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+ USE_NLS=yes
+fi;
+ echo "$as_me:$LINENO: result: $USE_NLS" >&5
+echo "${ECHO_T}$USE_NLS" >&6
+
+
+
+
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+ ac_executable_p="test -x"
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_RANLIB="ranlib"
- break
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+ ac_executable_p="test -f"
fi
+rm -f conf$$.file
+
+# Extract the first word of "msgfmt", so it can be a program name with args.
+set dummy msgfmt; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_MSGFMT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case "$MSGFMT" in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+ ;;
+ *)
+ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
+ IFS="$ac_save_IFS"
+ test -z "$ac_dir" && ac_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+ if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
+ (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+ ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext"
+ break 2
+ fi
+ fi
+ done
+ done
+ IFS="$ac_save_IFS"
+ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
+ ;;
+esac
fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
- echo "$ac_t""$RANLIB" 1>&6
+MSGFMT="$ac_cv_path_MSGFMT"
+if test "$MSGFMT" != ":"; then
+ echo "$as_me:$LINENO: result: $MSGFMT" >&5
+echo "${ECHO_T}$MSGFMT" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
-
- echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
-echo "configure:1890: checking for strerror in -lcposix" >&5
-ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
+set dummy gmsgfmt; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_GMSGFMT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_save_LIBS="$LIBS"
-LIBS="-lcposix $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1898 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char strerror();
-
-int main() {
-strerror()
-; return 0; }
-EOF
-if { (eval echo configure:1909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
+ case $GMSGFMT in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+ ;;
+esac
fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- LIBS="$LIBS -lcposix"
+GMSGFMT=$ac_cv_path_GMSGFMT
+
+if test -n "$GMSGFMT"; then
+ echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+echo "${ECHO_T}$GMSGFMT" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
-
-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1932: checking for ANSI C header files" >&5
-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 1937 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- ac_cv_header_stdc=yes
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+ ac_executable_p="test -x"
else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- ac_cv_header_stdc=no
+ ac_executable_p="test -f"
fi
-rm -f conftest*
+rm -f conf$$.file
-if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 1962 "configure"
-#include "confdefs.h"
-#include <string.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "memchr" >/dev/null 2>&1; then
- :
+# Extract the first word of "xgettext", so it can be a program name with args.
+set dummy xgettext; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_XGETTEXT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- rm -rf conftest*
- ac_cv_header_stdc=no
+ case "$XGETTEXT" in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+ ;;
+ *)
+ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
+ IFS="$ac_save_IFS"
+ test -z "$ac_dir" && ac_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+ if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
+ (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+ ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext"
+ break 2
+ fi
+ fi
+ done
+ done
+ IFS="$ac_save_IFS"
+ test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+ ;;
+esac
+fi
+XGETTEXT="$ac_cv_path_XGETTEXT"
+if test "$XGETTEXT" != ":"; then
+ echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+echo "${ECHO_T}$XGETTEXT" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
-rm -f conftest*
+ rm -f messages.po
+
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
fi
-if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 1980 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "free" >/dev/null 2>&1; then
- :
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+ ac_executable_p="test -x"
else
- rm -rf conftest*
- ac_cv_header_stdc=no
+ ac_executable_p="test -f"
fi
-rm -f conftest*
+rm -f conf$$.file
+# Extract the first word of "msgmerge", so it can be a program name with args.
+set dummy msgmerge; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_MSGMERGE+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case "$MSGMERGE" in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
+ ;;
+ *)
+ ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
+ IFS="$ac_save_IFS"
+ test -z "$ac_dir" && ac_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+ if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then
+ ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext"
+ break 2
+ fi
+ fi
+ done
+ done
+ IFS="$ac_save_IFS"
+ test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
+ ;;
+esac
+fi
+MSGMERGE="$ac_cv_path_MSGMERGE"
+if test "$MSGMERGE" != ":"; then
+ echo "$as_me:$LINENO: result: $MSGMERGE" >&5
+echo "${ECHO_T}$MSGMERGE" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-if test "$cross_compiling" = yes; then
- :
+
+ if test "$GMSGFMT" != ":"; then
+ if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
+ (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+ : ;
+ else
+ GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
+ echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
+echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6
+ GMSGFMT=":"
+ fi
+ fi
+
+ if test "$XGETTEXT" != ":"; then
+ if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
+ (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+ : ;
+ else
+ echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
+echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
+ XGETTEXT=":"
+ fi
+ rm -f messages.po
+ fi
+
+ ac_config_commands="$ac_config_commands default-1"
+
+
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_RANLIB+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat > conftest.$ac_ext <<EOF
-#line 2001 "configure"
-#include "confdefs.h"
-#include <ctype.h>
-#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int main () { int i; for (i = 0; i < 256; i++)
-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
-exit (0); }
+ if test -n "$RANLIB"; then
+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
-EOF
-if { (eval echo configure:2012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
- :
+fi
+fi
+RANLIB=$ac_cv_prog_RANLIB
+if test -n "$RANLIB"; then
+ echo "$as_me:$LINENO: result: $RANLIB" >&5
+echo "${ECHO_T}$RANLIB" >&6
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
- ac_cv_header_stdc=no
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
-rm -fr conftest*
+
fi
+if test -z "$ac_cv_prog_RANLIB"; then
+ ac_ct_RANLIB=$RANLIB
+ # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_RANLIB"; then
+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_RANLIB="ranlib"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+ test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
fi
fi
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+ echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+echo "${ECHO_T}$ac_ct_RANLIB" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
-echo "$ac_t""$ac_cv_header_stdc" 1>&6
-if test $ac_cv_header_stdc = yes; then
- cat >> confdefs.h <<\EOF
-#define STDC_HEADERS 1
-EOF
-
-fi
-
-echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2036: checking for working const" >&5
-if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2041 "configure"
-#include "confdefs.h"
-
-int main() {
-
-/* Ultrix mips cc rejects this. */
-typedef int charset[2]; const charset x;
-/* SunOS 4.1.1 cc rejects this. */
-char const *const *ccp;
-char **p;
-/* NEC SVR4.0.2 mips cc rejects this. */
-struct point {int x, y;};
-static struct point const zero = {0,0};
-/* AIX XL C 1.02.0.0 rejects this.
- It does not let you subtract one const X* pointer from another in an arm
- of an if-expression whose if-part is not a constant expression */
-const char *g = "string";
-ccp = &g + (g ? g-g : 0);
-/* HPUX 7.0 cc rejects these. */
-++ccp;
-p = (char**) ccp;
-ccp = (char const *const *) p;
-{ /* SCO 3.2v4 cc rejects this. */
- char *t;
- char const *s = 0 ? (char *) 0 : (char const *) 0;
-
- *t++ = 0;
-}
-{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
- int x[] = {25, 17};
- const int *foo = &x[0];
- ++foo;
-}
-{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
- typedef const int *iptr;
- iptr p = 0;
- ++p;
-}
-{ /* AIX XL C 1.02.0.0 rejects this saying
- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
- struct s { int j; const int *ap[3]; };
- struct s *b; b->j = 5;
-}
-{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
- const int foo = 10;
+ RANLIB=$ac_ct_RANLIB
+else
+ RANLIB="$ac_cv_prog_RANLIB"
+fi
+
+
+ echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
+echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6
+if test "${ac_cv_lib_cposix_strerror+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcposix $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char strerror ();
+int
+main ()
+{
+strerror ();
+ ;
+ return 0;
}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_cposix_strerror=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_cposix_strerror=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
+echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6
+if test $ac_cv_lib_cposix_strerror = yes; then
+ LIBS="$LIBS -lcposix"
+fi
+
+
+
+echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+if test "${ac_cv_c_const+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+/* FIXME: Include the comments suggested by Paul. */
+#ifndef __cplusplus
+ /* Ultrix mips cc rejects this. */
+ typedef int charset[2];
+ const charset x;
+ /* SunOS 4.1.1 cc rejects this. */
+ char const *const *ccp;
+ char **p;
+ /* NEC SVR4.0.2 mips cc rejects this. */
+ struct point {int x, y;};
+ static struct point const zero = {0,0};
+ /* AIX XL C 1.02.0.0 rejects this.
+ It does not let you subtract one const X* pointer from another in
+ an arm of an if-expression whose if-part is not a constant
+ expression */
+ const char *g = "string";
+ ccp = &g + (g ? g-g : 0);
+ /* HPUX 7.0 cc rejects these. */
+ ++ccp;
+ p = (char**) ccp;
+ ccp = (char const *const *) p;
+ { /* SCO 3.2v4 cc rejects this. */
+ char *t;
+ char const *s = 0 ? (char *) 0 : (char const *) 0;
+
+ *t++ = 0;
+ }
+ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
+ int x[] = {25, 17};
+ const int *foo = &x[0];
+ ++foo;
+ }
+ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+ typedef const int *iptr;
+ iptr p = 0;
+ ++p;
+ }
+ { /* AIX XL C 1.02.0.0 rejects this saying
+ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+ struct s { int j; const int *ap[3]; };
+ struct s *b; b->j = 5;
+ }
+ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+ const int foo = 10;
+ }
+#endif
-; return 0; }
-EOF
-if { (eval echo configure:2090: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_c_const=yes
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- ac_cv_c_const=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_c_const=no
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-
-echo "$ac_t""$ac_cv_c_const" 1>&6
+echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+echo "${ECHO_T}$ac_cv_c_const" >&6
if test $ac_cv_c_const = no; then
- cat >> confdefs.h <<\EOF
-#define const
-EOF
+
+cat >>confdefs.h <<\_ACEOF
+#define const
+_ACEOF
fi
-echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2111: checking for inline" >&5
-if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+
+ echo "$as_me:$LINENO: checking for signed" >&5
+echo $ECHO_N "checking for signed... $ECHO_C" >&6
+if test "${bh_cv_c_signed+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+signed char x;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ bh_cv_c_signed=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+bh_cv_c_signed=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $bh_cv_c_signed" >&5
+echo "${ECHO_T}$bh_cv_c_signed" >&6
+ if test $bh_cv_c_signed = no; then
+
+cat >>confdefs.h <<\_ACEOF
+#define signed
+_ACEOF
+
+ fi
+
+echo "$as_me:$LINENO: checking for inline" >&5
+echo $ECHO_N "checking for inline... $ECHO_C" >&6
+if test "${ac_cv_c_inline+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
- cat > conftest.$ac_ext <<EOF
-#line 2118 "configure"
-#include "confdefs.h"
-
-int main() {
-} $ac_kw foo() {
-; return 0; }
-EOF
-if { (eval echo configure:2125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#ifndef __cplusplus
+typedef int foo_t;
+static $ac_kw foo_t static_foo () {return 0; }
+$ac_kw foo_t foo () {return 0; }
+#endif
+
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_c_inline=$ac_kw; break
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
done
fi
+echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+echo "${ECHO_T}$ac_cv_c_inline" >&6
+
-echo "$ac_t""$ac_cv_c_inline" 1>&6
-case "$ac_cv_c_inline" in
+case $ac_cv_c_inline in
inline | yes) ;;
- no) cat >> confdefs.h <<\EOF
-#define inline
-EOF
- ;;
- *) cat >> confdefs.h <<EOF
-#define inline $ac_cv_c_inline
-EOF
- ;;
+ *)
+ case $ac_cv_c_inline in
+ no) ac_val=;;
+ *) ac_val=$ac_cv_c_inline;;
+ esac
+ cat >>confdefs.h <<_ACEOF
+#ifndef __cplusplus
+#define inline $ac_val
+#endif
+_ACEOF
+ ;;
esac
-echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:2151: checking for off_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2156 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
- rm -rf conftest*
+echo "$as_me:$LINENO: checking for off_t" >&5
+echo $ECHO_N "checking for off_t... $ECHO_C" >&6
+if test "${ac_cv_type_off_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if ((off_t *) 0)
+ return 0;
+if (sizeof (off_t))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_type_off_t=yes
else
- rm -rf conftest*
- ac_cv_type_off_t=no
-fi
-rm -f conftest*
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ac_cv_type_off_t=no
fi
-echo "$ac_t""$ac_cv_type_off_t" 1>&6
-if test $ac_cv_type_off_t = no; then
- cat >> confdefs.h <<\EOF
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
+echo "${ECHO_T}$ac_cv_type_off_t" >&6
+if test $ac_cv_type_off_t = yes; then
+ :
+else
+
+cat >>confdefs.h <<_ACEOF
#define off_t long
-EOF
+_ACEOF
fi
-echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2184: checking for size_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for size_t" >&5
+echo $ECHO_N "checking for size_t... $ECHO_C" >&6
+if test "${ac_cv_type_size_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat > conftest.$ac_ext <<EOF
-#line 2189 "configure"
-#include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if ((size_t *) 0)
+ return 0;
+if (sizeof (size_t))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_type_size_t=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_size_t=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+echo "${ECHO_T}$ac_cv_type_size_t" >&6
+if test $ac_cv_type_size_t = yes; then
+ :
+else
+
+cat >>confdefs.h <<_ACEOF
+#define size_t unsigned
+_ACEOF
+
+fi
+
+
+ echo "$as_me:$LINENO: checking for long long" >&5
+echo $ECHO_N "checking for long long... $ECHO_C" >&6
+if test "${ac_cv_type_long_long+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+long long ll = 1LL; int i = 63;
+int
+main ()
+{
+long long llmax = (long long) -1;
+ return ll << i | ll >> i | llmax / ll | llmax % ll;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_type_long_long=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_long_long=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
+echo "${ECHO_T}$ac_cv_type_long_long" >&6
+ if test $ac_cv_type_long_long = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LONG_LONG 1
+_ACEOF
+
+ fi
+
+
+ echo "$as_me:$LINENO: checking for long double" >&5
+echo $ECHO_N "checking for long double... $ECHO_C" >&6
+if test "${gt_cv_c_long_double+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test "$GCC" = yes; then
+ gt_cv_c_long_double=yes
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+ /* The Stardent Vistra knows sizeof(long double), but does not support it. */
+ long double foo = 0.0;
+ /* On Ultrix 4.3 cc, long double is 4 and double is 8. */
+ int array [2*(sizeof(long double) >= sizeof(double)) - 1];
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ gt_cv_c_long_double=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+gt_cv_c_long_double=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+fi
+echo "$as_me:$LINENO: result: $gt_cv_c_long_double" >&5
+echo "${ECHO_T}$gt_cv_c_long_double" >&6
+ if test $gt_cv_c_long_double = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LONG_DOUBLE 1
+_ACEOF
+
+ fi
+
+
+ echo "$as_me:$LINENO: checking for wchar_t" >&5
+echo $ECHO_N "checking for wchar_t... $ECHO_C" >&6
+if test "${gt_cv_c_wchar_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stddef.h>
+ wchar_t foo = (wchar_t)'\0';
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ gt_cv_c_wchar_t=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+gt_cv_c_wchar_t=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $gt_cv_c_wchar_t" >&5
+echo "${ECHO_T}$gt_cv_c_wchar_t" >&6
+ if test $gt_cv_c_wchar_t = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_WCHAR_T 1
+_ACEOF
+
+ fi
+
+
+ echo "$as_me:$LINENO: checking for wint_t" >&5
+echo $ECHO_N "checking for wint_t... $ECHO_C" >&6
+if test "${gt_cv_c_wint_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <wchar.h>
+ wint_t foo = (wchar_t)'\0';
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ gt_cv_c_wint_t=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+gt_cv_c_wint_t=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $gt_cv_c_wint_t" >&5
+echo "${ECHO_T}$gt_cv_c_wint_t" >&6
+ if test $gt_cv_c_wint_t = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_WINT_T 1
+_ACEOF
+
+ fi
+
+
+ echo "$as_me:$LINENO: checking for inttypes.h" >&5
+echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
+if test "${jm_ac_cv_header_inttypes_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
+#include <inttypes.h>
+int
+main ()
+{
+uintmax_t i = (uintmax_t) -1;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ jm_ac_cv_header_inttypes_h=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+jm_ac_cv_header_inttypes_h=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $jm_ac_cv_header_inttypes_h" >&5
+echo "${ECHO_T}$jm_ac_cv_header_inttypes_h" >&6
+ if test $jm_ac_cv_header_inttypes_h = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_INTTYPES_H_WITH_UINTMAX 1
+_ACEOF
+
+ fi
+
+
+ echo "$as_me:$LINENO: checking for stdint.h" >&5
+echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6
+if test "${jm_ac_cv_header_stdint_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/types.h>
+#include <stdint.h>
+int
+main ()
+{
+uintmax_t i = (uintmax_t) -1;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ jm_ac_cv_header_stdint_h=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+jm_ac_cv_header_stdint_h=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $jm_ac_cv_header_stdint_h" >&5
+echo "${ECHO_T}$jm_ac_cv_header_stdint_h" >&6
+ if test $jm_ac_cv_header_stdint_h = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STDINT_H_WITH_UINTMAX 1
+_ACEOF
+
+ fi
+
+
+
+
+ echo "$as_me:$LINENO: checking for intmax_t" >&5
+echo $ECHO_N "checking for intmax_t... $ECHO_C" >&6
+if test "${gt_cv_c_intmax_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
#include <stddef.h>
+#include <stdlib.h>
+#if HAVE_STDINT_H_WITH_UINTMAX
+#include <stdint.h>
+#endif
+#if HAVE_INTTYPES_H_WITH_UINTMAX
+#include <inttypes.h>
#endif
-EOF
+
+int
+main ()
+{
+intmax_t x = -1;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ gt_cv_c_intmax_t=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+gt_cv_c_intmax_t=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $gt_cv_c_intmax_t" >&5
+echo "${ECHO_T}$gt_cv_c_intmax_t" >&6
+ if test $gt_cv_c_intmax_t = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_INTMAX_T 1
+_ACEOF
+
+ fi
+
+
+
+ echo "$as_me:$LINENO: checking whether printf() supports POSIX/XSI format strings" >&5
+echo $ECHO_N "checking whether printf() supports POSIX/XSI format strings... $ECHO_C" >&6
+if test "${gt_cv_func_printf_posix+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ if test "$cross_compiling" = yes; then
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
+ notposix
+#endif
+
+_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
- rm -rf conftest*
- ac_cv_type_size_t=yes
+ $EGREP "notposix" >/dev/null 2>&1; then
+ gt_cv_func_printf_posix="guessing no"
else
- rm -rf conftest*
- ac_cv_type_size_t=no
+ gt_cv_func_printf_posix="guessing yes"
fi
rm -f conftest*
+
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#include <stdio.h>
+#include <string.h>
+/* The string "%2$d %1$d", with dollar characters protected from the shell's
+ dollar expansion (possibly an autoconf bug). */
+static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
+static char buf[100];
+int main ()
+{
+ sprintf (buf, format, 33, 55);
+ return (strcmp (buf, "55 33") != 0);
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ gt_cv_func_printf_posix=yes
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+gt_cv_func_printf_posix=no
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-echo "$ac_t""$ac_cv_type_size_t" 1>&6
-if test $ac_cv_type_size_t = no; then
- cat >> confdefs.h <<\EOF
-#define size_t unsigned
-EOF
fi
+echo "$as_me:$LINENO: result: $gt_cv_func_printf_posix" >&5
+echo "${ECHO_T}$gt_cv_func_printf_posix" >&6
+ case $gt_cv_func_printf_posix in
+ *yes)
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_POSIX_PRINTF 1
+_ACEOF
+
+ ;;
+ esac
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
-echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:2219: checking for working alloca.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2224 "configure"
-#include "confdefs.h"
+echo "$as_me:$LINENO: checking for working alloca.h" >&5
+echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
+if test "${ac_cv_working_alloca_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#include <alloca.h>
-int main() {
-char *p = alloca(2 * sizeof(int));
-; return 0; }
-EOF
-if { (eval echo configure:2231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- ac_cv_header_alloca_h=yes
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- ac_cv_header_alloca_h=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
-if test $ac_cv_header_alloca_h = yes; then
- cat >> confdefs.h <<\EOF
+int
+main ()
+{
+char *p = (char *) alloca (2 * sizeof (int));
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_working_alloca_h=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_working_alloca_h=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
+echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
+if test $ac_cv_working_alloca_h = yes; then
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_ALLOCA_H 1
-EOF
+_ACEOF
fi
-echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:2252: checking for alloca" >&5
-if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for alloca" >&5
+echo $ECHO_N "checking for alloca... $ECHO_C" >&6
+if test "${ac_cv_func_alloca_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat > conftest.$ac_ext <<EOF
-#line 2257 "configure"
-#include "confdefs.h"
-
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#ifdef __GNUC__
# define alloca __builtin_alloca
#else
@@ -2277,137 +5059,215 @@ char *alloca ();
# endif
#endif
-int main() {
-char *p = (char *) alloca(1);
-; return 0; }
-EOF
-if { (eval echo configure:2285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
+int
+main ()
+{
+char *p = (char *) alloca (1);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_func_alloca_works=yes
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- ac_cv_func_alloca_works=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_alloca_works=no
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
+echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
+echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
-echo "$ac_t""$ac_cv_func_alloca_works" 1>&6
if test $ac_cv_func_alloca_works = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_ALLOCA 1
-EOF
-fi
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ALLOCA 1
+_ACEOF
-if test $ac_cv_func_alloca_works = no; then
+else
# The SVR3 libPW and SVR4 libucb both contain incompatible functions
- # that cause trouble. Some versions do not even contain alloca or
- # contain a buggy version. If you still want to use their alloca,
- # use ar to extract alloca.o from them instead of compiling alloca.c.
- ALLOCA=alloca.${ac_objext}
- cat >> confdefs.h <<\EOF
+# that cause trouble. Some versions do not even contain alloca or
+# contain a buggy version. If you still want to use their alloca,
+# use ar to extract alloca.o from them instead of compiling alloca.c.
+
+ALLOCA=alloca.$ac_objext
+
+cat >>confdefs.h <<\_ACEOF
#define C_ALLOCA 1
-EOF
+_ACEOF
-echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:2317: checking whether alloca needs Cray hooks" >&5
-if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
+echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
+if test "${ac_cv_os_cray+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat > conftest.$ac_ext <<EOF
-#line 2322 "configure"
-#include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#if defined(CRAY) && ! defined(CRAY2)
webecray
#else
wenotbecray
#endif
-EOF
+_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "webecray" >/dev/null 2>&1; then
- rm -rf conftest*
+ $EGREP "webecray" >/dev/null 2>&1; then
ac_cv_os_cray=yes
else
- rm -rf conftest*
ac_cv_os_cray=no
fi
rm -f conftest*
fi
-
-echo "$ac_t""$ac_cv_os_cray" 1>&6
+echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
+echo "${ECHO_T}$ac_cv_os_cray" >&6
if test $ac_cv_os_cray = yes; then
-for ac_func in _getb67 GETB67 getb67; do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2347: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2352 "configure"
-#include "confdefs.h"
+ for ac_func in _getb67 GETB67 getb67; do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func();
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
-int main() {
+#undef $ac_func
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
#endif
-; return 0; }
-EOF
-if { (eval echo configure:2375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<EOF
+int
+main ()
+{
+return f != $ac_func;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_var=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+
+cat >>confdefs.h <<_ACEOF
#define CRAY_STACKSEG_END $ac_func
-EOF
+_ACEOF
- break
-else
- echo "$ac_t""no" 1>&6
+ break
fi
-done
+ done
fi
-echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:2402: checking stack direction for C alloca" >&5
-if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
+echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
+if test "${ac_cv_c_stack_direction+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test "$cross_compiling" = yes; then
ac_cv_c_stack_direction=0
else
- cat > conftest.$ac_ext <<EOF
-#line 2410 "configure"
-#include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+int
find_stack_direction ()
{
static char *addr = 0;
@@ -2420,138 +5280,314 @@ find_stack_direction ()
else
return (&dummy > addr) ? 1 : -1;
}
+
+int
main ()
{
- exit (find_stack_direction() < 0);
+ exit (find_stack_direction () < 0);
}
-EOF
-if { (eval echo configure:2429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_c_stack_direction=1
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
- ac_cv_c_stack_direction=-1
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_c_stack_direction=-1
fi
-rm -fr conftest*
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-
fi
+echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
+echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
-echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
-cat >> confdefs.h <<EOF
+cat >>confdefs.h <<_ACEOF
#define STACK_DIRECTION $ac_cv_c_stack_direction
-EOF
+_ACEOF
+
fi
-for ac_hdr in unistd.h
+
+
+for ac_header in stdlib.h unistd.h
do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2454: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2459 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2464: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
fi
-rm -f conftest*
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
-
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists. ##
+## ------------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- echo "$ac_t""no" 1>&6
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
done
+
for ac_func in getpagesize
do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2493: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2498 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func();
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
-int main() {
+#undef $ac_func
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
#endif
-; return 0; }
-EOF
-if { (eval echo configure:2521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
+int
+main ()
+{
+return f != $ac_func;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_var=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
fi
done
-echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:2546: checking for working mmap" >&5
-if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for working mmap" >&5
+echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
+if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test "$cross_compiling" = yes; then
ac_cv_func_mmap_fixed_mapped=no
else
- cat > conftest.$ac_ext <<EOF
-#line 2554 "configure"
-#include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+/* malloc might have been renamed as rpl_malloc. */
+#undef malloc
/* Thanks to Mike Haertel and Jim Avera for this test.
Here is a matrix of mmap possibilities:
@@ -2565,34 +5601,34 @@ else
back from the file, nor mmap's back from the file at a different
address. (There have been systems where private was not correctly
implemented like the infamous i386 svr4.0, and systems where the
- VM page cache was not coherent with the filesystem buffer cache
+ VM page cache was not coherent with the file system buffer cache
like early versions of FreeBSD and possibly contemporary NetBSD.)
For shared mappings, we should conversely verify that changes get
- propogated back to all the places they're supposed to be.
+ propagated back to all the places they're supposed to be.
Grep wants private fixed already mapped.
The main things grep needs to know about mmap are:
* does it exist and is it safe to write into the mmap'd area
* how to use it (BSD variants) */
-#include <sys/types.h>
+
#include <fcntl.h>
#include <sys/mman.h>
-/* This mess was copied from the GNU getpagesize.h. */
-#ifndef HAVE_GETPAGESIZE
-# ifdef HAVE_UNISTD_H
-# include <unistd.h>
-# endif
+#if !STDC_HEADERS && !HAVE_STDLIB_H
+char *malloc ();
+#endif
+/* This mess was copied from the GNU getpagesize.h. */
+#if !HAVE_GETPAGESIZE
/* Assume that all systems that can run configure have sys/param.h. */
-# ifndef HAVE_SYS_PARAM_H
+# if !HAVE_SYS_PARAM_H
# define HAVE_SYS_PARAM_H 1
# endif
# ifdef _SC_PAGESIZE
# define getpagesize() sysconf(_SC_PAGESIZE)
# else /* no _SC_PAGESIZE */
-# ifdef HAVE_SYS_PARAM_H
+# if HAVE_SYS_PARAM_H
# include <sys/param.h>
# ifdef EXEC_PAGESIZE
# define getpagesize() EXEC_PAGESIZE
@@ -2619,108 +5655,109 @@ else
#endif /* no HAVE_GETPAGESIZE */
-#ifdef __cplusplus
-extern "C" { void *malloc(unsigned); }
-#else
-char *malloc();
-#endif
-
int
-main()
-{
- char *data, *data2, *data3;
- int i, pagesize;
- int fd;
-
- pagesize = getpagesize();
-
- /*
- * First, make a file with some known garbage in it.
- */
- data = malloc(pagesize);
- if (!data)
- exit(1);
- for (i = 0; i < pagesize; ++i)
- *(data + i) = rand();
- umask(0);
- fd = creat("conftestmmap", 0600);
- if (fd < 0)
- exit(1);
- if (write(fd, data, pagesize) != pagesize)
- exit(1);
- close(fd);
-
- /*
- * Next, try to mmap the file at a fixed address which
- * already has something else allocated at it. If we can,
- * also make sure that we see the same garbage.
- */
- fd = open("conftestmmap", O_RDWR);
- if (fd < 0)
- exit(1);
- data2 = malloc(2 * pagesize);
- if (!data2)
- exit(1);
- data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1);
- if (data2 != mmap(data2, pagesize, PROT_READ | PROT_WRITE,
- MAP_PRIVATE | MAP_FIXED, fd, 0L))
- exit(1);
- for (i = 0; i < pagesize; ++i)
- if (*(data + i) != *(data2 + i))
- exit(1);
-
- /*
- * Finally, make sure that changes to the mapped area
- * do not percolate back to the file as seen by read().
- * (This is a bug on some variants of i386 svr4.0.)
- */
- for (i = 0; i < pagesize; ++i)
- *(data2 + i) = *(data2 + i) + 1;
- data3 = malloc(pagesize);
- if (!data3)
- exit(1);
- if (read(fd, data3, pagesize) != pagesize)
- exit(1);
- for (i = 0; i < pagesize; ++i)
- if (*(data + i) != *(data3 + i))
- exit(1);
- close(fd);
- unlink("conftestmmap");
- exit(0);
+main ()
+{
+ char *data, *data2, *data3;
+ int i, pagesize;
+ int fd;
+
+ pagesize = getpagesize ();
+
+ /* First, make a file with some known garbage in it. */
+ data = (char *) malloc (pagesize);
+ if (!data)
+ exit (1);
+ for (i = 0; i < pagesize; ++i)
+ *(data + i) = rand ();
+ umask (0);
+ fd = creat ("conftest.mmap", 0600);
+ if (fd < 0)
+ exit (1);
+ if (write (fd, data, pagesize) != pagesize)
+ exit (1);
+ close (fd);
+
+ /* Next, try to mmap the file at a fixed address which already has
+ something else allocated at it. If we can, also make sure that
+ we see the same garbage. */
+ fd = open ("conftest.mmap", O_RDWR);
+ if (fd < 0)
+ exit (1);
+ data2 = (char *) malloc (2 * pagesize);
+ if (!data2)
+ exit (1);
+ data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1);
+ if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_FIXED, fd, 0L))
+ exit (1);
+ for (i = 0; i < pagesize; ++i)
+ if (*(data + i) != *(data2 + i))
+ exit (1);
+
+ /* Finally, make sure that changes to the mapped area do not
+ percolate back to the file as seen by read(). (This is a bug on
+ some variants of i386 svr4.0.) */
+ for (i = 0; i < pagesize; ++i)
+ *(data2 + i) = *(data2 + i) + 1;
+ data3 = (char *) malloc (pagesize);
+ if (!data3)
+ exit (1);
+ if (read (fd, data3, pagesize) != pagesize)
+ exit (1);
+ for (i = 0; i < pagesize; ++i)
+ if (*(data + i) != *(data3 + i))
+ exit (1);
+ close (fd);
+ exit (0);
}
-
-EOF
-if { (eval echo configure:2694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_func_mmap_fixed_mapped=yes
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
- ac_cv_func_mmap_fixed_mapped=no
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_func_mmap_fixed_mapped=no
fi
-rm -fr conftest*
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-
fi
-
-echo "$ac_t""$ac_cv_func_mmap_fixed_mapped" 1>&6
+echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
+echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
if test $ac_cv_func_mmap_fixed_mapped = yes; then
- cat >> confdefs.h <<\EOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_MMAP 1
-EOF
+_ACEOF
fi
+rm -f conftest.mmap
- echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6
-echo "configure:2718: checking whether we are using the GNU C Library 2.1 or newer" >&5
-if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+ echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5
+echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6
+if test "${ac_cv_gnu_library_2_1+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat > conftest.$ac_ext <<EOF
-#line 2723 "configure"
-#include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#include <features.h>
#ifdef __GNU_LIBRARY__
@@ -2728,37 +5765,35 @@ else
Lucky GNU user
#endif
#endif
-
-EOF
+
+_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "Lucky GNU user" >/dev/null 2>&1; then
- rm -rf conftest*
+ $EGREP "Lucky GNU user" >/dev/null 2>&1; then
ac_cv_gnu_library_2_1=yes
else
- rm -rf conftest*
ac_cv_gnu_library_2_1=no
fi
rm -f conftest*
-
-
+
+
fi
+echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5
+echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6
-echo "$ac_t""$ac_cv_gnu_library_2_1" 1>&6
-
GLIBC21="$ac_cv_gnu_library_2_1"
-
-
- echo $ac_n "checking whether integer division by zero raises SIGFPE""... $ac_c" 1>&6
-echo "configure:2756: checking whether integer division by zero raises SIGFPE" >&5
-if eval "test \"`echo '$''{'gt_cv_int_divbyzero_sigfpe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+
+
+ echo "$as_me:$LINENO: checking whether integer division by zero raises SIGFPE" >&5
+echo $ECHO_N "checking whether integer division by zero raises SIGFPE... $ECHO_C" >&6
+if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-
+
if test "$cross_compiling" = yes; then
-
+
# Guess based on the CPU.
case "$host_cpu" in
alpha* | i3456786 | m68k | s390*)
@@ -2766,11 +5801,14 @@ else
*)
gt_cv_int_divbyzero_sigfpe="guessing no";;
esac
-
+
else
- cat > conftest.$ac_ext <<EOF
-#line 2773 "configure"
-#include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#include <stdlib.h>
#include <signal.h>
@@ -2808,162 +5846,1819 @@ int main ()
exit (1);
}
-EOF
-if { (eval echo configure:2813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
gt_cv_int_divbyzero_sigfpe=yes
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
- gt_cv_int_divbyzero_sigfpe=no
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+gt_cv_int_divbyzero_sigfpe=no
fi
-rm -fr conftest*
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-
fi
-
-echo "$ac_t""$gt_cv_int_divbyzero_sigfpe" 1>&6
+echo "$as_me:$LINENO: result: $gt_cv_int_divbyzero_sigfpe" >&5
+echo "${ECHO_T}$gt_cv_int_divbyzero_sigfpe" >&6
case "$gt_cv_int_divbyzero_sigfpe" in
*yes) value=1;;
*) value=0;;
esac
- cat >> confdefs.h <<EOF
+
+cat >>confdefs.h <<_ACEOF
#define INTDIV0_RAISES_SIGFPE $value
-EOF
+_ACEOF
+
+
+
+ echo "$as_me:$LINENO: checking for unsigned long long" >&5
+echo $ECHO_N "checking for unsigned long long... $ECHO_C" >&6
+if test "${ac_cv_type_unsigned_long_long+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+unsigned long long ull = 1ULL; int i = 63;
+int
+main ()
+{
+unsigned long long ullmax = (unsigned long long) -1;
+ return ull << i | ull >> i | ullmax / ull | ullmax % ull;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_type_unsigned_long_long=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_unsigned_long_long=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long" >&5
+echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&6
+ if test $ac_cv_type_unsigned_long_long = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_UNSIGNED_LONG_LONG 1
+_ACEOF
+
+ fi
+
-
-
if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then
-
+
test $ac_cv_type_unsigned_long_long = yes \
&& ac_type='unsigned long long' \
|| ac_type='unsigned long'
- cat >> confdefs.h <<EOF
+
+cat >>confdefs.h <<_ACEOF
#define uintmax_t $ac_type
-EOF
+_ACEOF
+
+ else
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_UINTMAX_T 1
+_ACEOF
fi
- echo $ac_n "checking for inttypes.h""... $ac_c" 1>&6
-echo "configure:2854: checking for inttypes.h" >&5
-if eval "test \"`echo '$''{'gt_cv_header_inttypes_h'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+ echo "$as_me:$LINENO: checking for inttypes.h" >&5
+echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
+if test "${gt_cv_header_inttypes_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-
- cat > conftest.$ac_ext <<EOF
-#line 2860 "configure"
-#include "confdefs.h"
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#include <sys/types.h>
#include <inttypes.h>
-int main() {
+int
+main ()
+{
-; return 0; }
-EOF
-if { (eval echo configure:2868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
gt_cv_header_inttypes_h=yes
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- gt_cv_header_inttypes_h=no
-fi
-rm -f conftest*
-
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+gt_cv_header_inttypes_h=no
fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$ac_t""$gt_cv_header_inttypes_h" 1>&6
+fi
+echo "$as_me:$LINENO: result: $gt_cv_header_inttypes_h" >&5
+echo "${ECHO_T}$gt_cv_header_inttypes_h" >&6
if test $gt_cv_header_inttypes_h = yes; then
- cat >> confdefs.h <<EOF
+
+cat >>confdefs.h <<_ACEOF
#define HAVE_INTTYPES_H 1
-EOF
+_ACEOF
fi
-
+
if test $gt_cv_header_inttypes_h = yes; then
- echo $ac_n "checking whether the inttypes.h PRIxNN macros are broken""... $ac_c" 1>&6
-echo "configure:2893: checking whether the inttypes.h PRIxNN macros are broken" >&5
-if eval "test \"`echo '$''{'gt_cv_inttypes_pri_broken'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
-
- cat > conftest.$ac_ext <<EOF
-#line 2899 "configure"
-#include "confdefs.h"
+ echo "$as_me:$LINENO: checking whether the inttypes.h PRIxNN macros are broken" >&5
+echo $ECHO_N "checking whether the inttypes.h PRIxNN macros are broken... $ECHO_C" >&6
+if test "${gt_cv_inttypes_pri_broken+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#include <inttypes.h>
#ifdef PRId32
char *p = PRId32;
#endif
-int main() {
+int
+main ()
+{
-; return 0; }
-EOF
-if { (eval echo configure:2910: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
gt_cv_inttypes_pri_broken=no
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- gt_cv_inttypes_pri_broken=yes
-fi
-rm -f conftest*
-
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+gt_cv_inttypes_pri_broken=yes
fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$ac_t""$gt_cv_inttypes_pri_broken" 1>&6
+fi
+echo "$as_me:$LINENO: result: $gt_cv_inttypes_pri_broken" >&5
+echo "${ECHO_T}$gt_cv_inttypes_pri_broken" >&6
fi
if test "$gt_cv_inttypes_pri_broken" = yes; then
- cat >> confdefs.h <<EOF
+
+cat >>confdefs.h <<_ACEOF
#define PRI_MACROS_BROKEN 1
-EOF
+_ACEOF
+
+ fi
+
+
+
+for ac_header in stdint.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists. ##
+## ------------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+ echo "$as_me:$LINENO: checking for SIZE_MAX" >&5
+echo $ECHO_N "checking for SIZE_MAX... $ECHO_C" >&6
+ result=
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#include <limits.h>
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#ifdef SIZE_MAX
+Found it
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP "Found it" >/dev/null 2>&1; then
+ result=yes
+fi
+rm -f conftest*
+
+ if test -z "$result"; then
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stddef.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((~(size_t)0 / 10) >= 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stddef.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((~(size_t)0 / 10) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stddef.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((~(size_t)0 / 10) < 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stddef.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((~(size_t)0 / 10) >= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_lo=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo= ac_hi=
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stddef.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((~(size_t)0 / 10) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=$ac_mid
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) res_hi=$ac_lo;;
+'') result=? ;;
+esac
+else
+ if test "$cross_compiling" = yes; then
+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+ { (exit 1); exit 1; }; }
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stddef.h>
+long longval () { return ~(size_t)0 / 10; }
+unsigned long ulongval () { return ~(size_t)0 / 10; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ exit (1);
+ if ((~(size_t)0 / 10) < 0)
+ {
+ long i = longval ();
+ if (i != (~(size_t)0 / 10))
+ exit (1);
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+ unsigned long i = ulongval ();
+ if (i != (~(size_t)0 / 10))
+ exit (1);
+ fprintf (f, "%lu\n", i);
+ }
+ exit (ferror (f) || fclose (f) != 0);
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ res_hi=`cat conftest.val`
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+result=?
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+rm -f conftest.val
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stddef.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((~(size_t)0 % 10) >= 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stddef.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((~(size_t)0 % 10) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stddef.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((~(size_t)0 % 10) < 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stddef.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((~(size_t)0 % 10) >= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_lo=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo= ac_hi=
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stddef.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((~(size_t)0 % 10) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=$ac_mid
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) res_lo=$ac_lo;;
+'') result=? ;;
+esac
+else
+ if test "$cross_compiling" = yes; then
+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+ { (exit 1); exit 1; }; }
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stddef.h>
+long longval () { return ~(size_t)0 % 10; }
+unsigned long ulongval () { return ~(size_t)0 % 10; }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ exit (1);
+ if ((~(size_t)0 % 10) < 0)
+ {
+ long i = longval ();
+ if (i != (~(size_t)0 % 10))
+ exit (1);
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+ unsigned long i = ulongval ();
+ if (i != (~(size_t)0 % 10))
+ exit (1);
+ fprintf (f, "%lu\n", i);
+ }
+ exit (ferror (f) || fclose (f) != 0);
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ res_lo=`cat conftest.val`
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+result=?
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+rm -f conftest.val
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stddef.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stddef.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stddef.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) < 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stddef.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) >= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_lo=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo= ac_hi=
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stddef.h>
+int
+main ()
+{
+static int test_array [1 - 2 * !((sizeof (size_t) <= sizeof (unsigned int)) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=$ac_mid
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) fits_in_uint=$ac_lo;;
+'') result=? ;;
+esac
+else
+ if test "$cross_compiling" = yes; then
+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+ { (exit 1); exit 1; }; }
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stddef.h>
+long longval () { return sizeof (size_t) <= sizeof (unsigned int); }
+unsigned long ulongval () { return sizeof (size_t) <= sizeof (unsigned int); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ exit (1);
+ if ((sizeof (size_t) <= sizeof (unsigned int)) < 0)
+ {
+ long i = longval ();
+ if (i != (sizeof (size_t) <= sizeof (unsigned int)))
+ exit (1);
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+ unsigned long i = ulongval ();
+ if (i != (sizeof (size_t) <= sizeof (unsigned int)))
+ exit (1);
+ fprintf (f, "%lu\n", i);
+ }
+ exit (ferror (f) || fclose (f) != 0);
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ fits_in_uint=`cat conftest.val`
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+result=?
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+rm -f conftest.val
+ if test "$fits_in_uint" = 1; then
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stddef.h>
+ extern size_t foo;
+ extern unsigned long foo;
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ fits_in_uint=0
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ if test -z "$result"; then
+ if test "$fits_in_uint" = 1; then
+ result="$res_hi$res_lo"U
+ else
+ result="$res_hi$res_lo"UL
+ fi
+ else
+ result='~(size_t)0'
+ fi
+ fi
+ echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6
+ if test "$result" != yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define SIZE_MAX $result
+_ACEOF
+
+ fi
+
+
+
+
+for ac_header in stdint.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists. ##
+## ------------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+ if test "X$prefix" = "XNONE"; then
+ acl_final_prefix="$ac_default_prefix"
+ else
+ acl_final_prefix="$prefix"
+ fi
+ if test "X$exec_prefix" = "XNONE"; then
+ acl_final_exec_prefix='${prefix}'
+ else
+ acl_final_exec_prefix="$exec_prefix"
+ fi
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+ prefix="$acl_save_prefix"
+
+# Check whether --with-gnu-ld or --without-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then
+ withval="$with_gnu_ld"
+ test "$withval" = no || with_gnu_ld=yes
+else
+ with_gnu_ld=no
+fi;
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
fi
+ rm -f conf$$.sh
+fi
+ac_prog=ld
+if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ echo "$as_me:$LINENO: checking for ld used by GCC" >&5
+echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+ esac
+ case $ac_prog in
+ # Accept absolute paths.
+ [\\/]* | [A-Za-z]:[\\/]*)
+ re_direlt='/[^/][^/]*/\.\./'
+ # Canonicalize the path of ld
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
+ ;;
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
+ ;;
+ esac
+elif test "$with_gnu_ld" = yes; then
+ echo "$as_me:$LINENO: checking for GNU ld" >&5
+echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+else
+ echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+fi
+if test "${acl_cv_path_LD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -z "$LD"; then
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ acl_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some GNU ld's only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+ *GNU* | *'with BFD'*)
+ test "$with_gnu_ld" != no && break ;;
+ *)
+ test "$with_gnu_ld" != yes && break ;;
+ esac
+ fi
+ done
+ IFS="$ac_save_ifs"
+else
+ acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+ echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+ { (exit 1); exit 1; }; }
+echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
+if test "${acl_cv_prog_gnu_ld+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+ acl_cv_prog_gnu_ld=yes ;;
+*)
+ acl_cv_prog_gnu_ld=no ;;
+esac
+fi
+echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
+echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6
+with_gnu_ld=$acl_cv_prog_gnu_ld
+
+
+
+ echo "$as_me:$LINENO: checking for shared library run path origin" >&5
+echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
+if test "${acl_cv_rpath+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+ . ./conftest.sh
+ rm -f ./conftest.sh
+ acl_cv_rpath=done
+
+fi
+echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
+echo "${ECHO_T}$acl_cv_rpath" >&6
+ wl="$acl_cv_wl"
+ libext="$acl_cv_libext"
+ shlibext="$acl_cv_shlibext"
+ hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+ hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+ hardcode_direct="$acl_cv_hardcode_direct"
+ hardcode_minus_L="$acl_cv_hardcode_minus_L"
+ # Check whether --enable-rpath or --disable-rpath was given.
+if test "${enable_rpath+set}" = set; then
+ enableval="$enable_rpath"
+ :
+else
+ enable_rpath=yes
+fi;
+
+
+
+
-
-
-
-
use_additional=yes
-
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
exec_prefix="$acl_final_exec_prefix"
-
+
eval additional_includedir=\"$includedir\"
eval additional_libdir=\"$libdir\"
-
+
exec_prefix="$acl_save_exec_prefix"
prefix="$acl_save_prefix"
- # Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
+
+# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
if test "${with_libiconv_prefix+set}" = set; then
withval="$with_libiconv_prefix"
-
+
if test "X$withval" = "Xno"; then
use_additional=no
else
if test "X$withval" = "X"; then
-
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
exec_prefix="$acl_final_exec_prefix"
-
+
eval additional_includedir=\"$includedir\"
eval additional_libdir=\"$libdir\"
-
+
exec_prefix="$acl_save_exec_prefix"
prefix="$acl_save_prefix"
@@ -2973,8 +7668,7 @@ if test "${with_libiconv_prefix+set}" = set; then
fi
fi
-fi
-
+fi;
LIBICONV=
LTLIBICONV=
INCICONV=
@@ -3030,7 +7724,7 @@ fi
fi
if test "X$found_dir" = "X"; then
for x in $LDFLAGS $LTLIBICONV; do
-
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
@@ -3098,7 +7792,7 @@ fi
else
haveit=
for x in $LDFLAGS $LIBICONV; do
-
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
@@ -3149,7 +7843,7 @@ fi
fi
if test -z "$haveit"; then
for x in $CPPFLAGS $INCICONV; do
-
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
@@ -3194,7 +7888,7 @@ fi
if test -z "$haveit"; then
haveit=
for x in $LDFLAGS $LIBICONV; do
-
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
@@ -3215,7 +7909,7 @@ fi
fi
haveit=
for x in $LDFLAGS $LTLIBICONV; do
-
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
@@ -3312,288 +8006,740 @@ fi
-
-
- # Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3321: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- case "$MSGFMT" in
- /*)
- ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
- (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
- ac_cv_path_MSGFMT="$ac_dir/$ac_word"
- break
- fi
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
- ;;
-esac
-fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test "$MSGFMT" != ":"; then
- echo "$ac_t""$MSGFMT" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3356: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- case "$GMSGFMT" in
- /*)
- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
- ;;
- ?:/*)
- ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
- ;;
-esac
-fi
-GMSGFMT="$ac_cv_path_GMSGFMT"
-if test -n "$GMSGFMT"; then
- echo "$ac_t""$GMSGFMT" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
- # Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3393: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- case "$XGETTEXT" in
- /*)
- ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
- (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
- ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
- break
- fi
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
- ;;
-esac
-fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test "$XGETTEXT" != ":"; then
- echo "$ac_t""$XGETTEXT" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
- rm -f messages.po
- # Extract the first word of "msgmerge", so it can be a program name with args.
-set dummy msgmerge; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3430: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_MSGMERGE'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+ echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
+echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6
+if test "${ac_cv_type_ptrdiff_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case "$MSGMERGE" in
- /*)
- ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- if $ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1; then
- ac_cv_path_MSGMERGE="$ac_dir/$ac_word"
- break
- fi
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
- ;;
-esac
-fi
-MSGMERGE="$ac_cv_path_MSGMERGE"
-if test "$MSGMERGE" != ":"; then
- echo "$ac_t""$MSGMERGE" 1>&6
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if ((ptrdiff_t *) 0)
+ return 0;
+if (sizeof (ptrdiff_t))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_type_ptrdiff_t=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_ptrdiff_t=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
+echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6
+if test $ac_cv_type_ptrdiff_t = yes; then
+ :
else
- echo "$ac_t""no" 1>&6
+
+cat >>confdefs.h <<\_ACEOF
+#define ptrdiff_t long
+_ACEOF
+
+
fi
- if test "$GMSGFMT" != ":"; then
- if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
- (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
- : ;
- else
- GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
- echo "$ac_t""found $GMSGFMT program is not GNU msgfmt; ignore it" 1>&6
- GMSGFMT=":"
- fi
- fi
- if test "$XGETTEXT" != ":"; then
- if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
- (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
- : ;
- else
- echo "$ac_t""found xgettext program is not GNU xgettext; ignore it" 1>&6
- XGETTEXT=":"
- fi
- rm -f messages.po
- fi
-
-
- for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
+
+
+
+
+
+for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
stdlib.h string.h unistd.h sys/param.h
do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3493: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3498 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3503: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
fi
-rm -f conftest*
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
-
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists. ##
+## ------------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- echo "$ac_t""no" 1>&6
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
fi
+
done
- for ac_func in feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
-geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
-strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+for ac_func in asprintf fwprintf getcwd getegid geteuid getgid getuid \
+mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
+strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
+__fsetlocking
do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3534: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3539 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func();
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
-int main() {
+#undef $ac_func
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
#endif
-; return 0; }
-EOF
-if { (eval echo configure:3562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
+int
+main ()
+{
+return f != $ac_func;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_var=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
fi
done
-
-
-
-
+
+ echo "$as_me:$LINENO: checking whether _snprintf is declared" >&5
+echo $ECHO_N "checking whether _snprintf is declared... $ECHO_C" >&6
+if test "${ac_cv_have_decl__snprintf+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdio.h>
+int
+main ()
+{
+
+#ifndef _snprintf
+ char *p = (char *) _snprintf;
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_have_decl__snprintf=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_have_decl__snprintf=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_have_decl__snprintf" >&5
+echo "${ECHO_T}$ac_cv_have_decl__snprintf" >&6
+ if test $ac_cv_have_decl__snprintf = yes; then
+ gt_value=1
+ else
+ gt_value=0
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL__SNPRINTF $gt_value
+_ACEOF
+
+
+
+ echo "$as_me:$LINENO: checking whether _snwprintf is declared" >&5
+echo $ECHO_N "checking whether _snwprintf is declared... $ECHO_C" >&6
+if test "${ac_cv_have_decl__snwprintf+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdio.h>
+int
+main ()
+{
+
+#ifndef _snwprintf
+ char *p = (char *) _snwprintf;
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_have_decl__snwprintf=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_have_decl__snwprintf=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_have_decl__snwprintf" >&5
+echo "${ECHO_T}$ac_cv_have_decl__snwprintf" >&6
+ if test $ac_cv_have_decl__snwprintf = yes; then
+ gt_value=1
+ else
+ gt_value=0
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL__SNWPRINTF $gt_value
+_ACEOF
+
+
+
+
+ echo "$as_me:$LINENO: checking whether feof_unlocked is declared" >&5
+echo $ECHO_N "checking whether feof_unlocked is declared... $ECHO_C" >&6
+if test "${ac_cv_have_decl_feof_unlocked+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdio.h>
+int
+main ()
+{
+
+#ifndef feof_unlocked
+ char *p = (char *) feof_unlocked;
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_have_decl_feof_unlocked=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_have_decl_feof_unlocked=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_have_decl_feof_unlocked" >&5
+echo "${ECHO_T}$ac_cv_have_decl_feof_unlocked" >&6
+ if test $ac_cv_have_decl_feof_unlocked = yes; then
+ gt_value=1
+ else
+ gt_value=0
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_FEOF_UNLOCKED $gt_value
+_ACEOF
+
+
+
+ echo "$as_me:$LINENO: checking whether fgets_unlocked is declared" >&5
+echo $ECHO_N "checking whether fgets_unlocked is declared... $ECHO_C" >&6
+if test "${ac_cv_have_decl_fgets_unlocked+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdio.h>
+int
+main ()
+{
+
+#ifndef fgets_unlocked
+ char *p = (char *) fgets_unlocked;
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_have_decl_fgets_unlocked=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_have_decl_fgets_unlocked=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_have_decl_fgets_unlocked" >&5
+echo "${ECHO_T}$ac_cv_have_decl_fgets_unlocked" >&6
+ if test $ac_cv_have_decl_fgets_unlocked = yes; then
+ gt_value=1
+ else
+ gt_value=0
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_FGETS_UNLOCKED $gt_value
+_ACEOF
+
+
+
+ echo "$as_me:$LINENO: checking whether getc_unlocked is declared" >&5
+echo $ECHO_N "checking whether getc_unlocked is declared... $ECHO_C" >&6
+if test "${ac_cv_have_decl_getc_unlocked+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <stdio.h>
+int
+main ()
+{
+
+#ifndef getc_unlocked
+ char *p = (char *) getc_unlocked;
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_have_decl_getc_unlocked=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_have_decl_getc_unlocked=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_have_decl_getc_unlocked" >&5
+echo "${ECHO_T}$ac_cv_have_decl_getc_unlocked" >&6
+ if test $ac_cv_have_decl_getc_unlocked = yes; then
+ gt_value=1
+ else
+ gt_value=0
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GETC_UNLOCKED $gt_value
+_ACEOF
+
+
+
+ case $gt_cv_func_printf_posix in
+ *yes) HAVE_POSIX_PRINTF=1 ;;
+ *) HAVE_POSIX_PRINTF=0 ;;
+ esac
+
+ if test "$ac_cv_func_asprintf" = yes; then
+ HAVE_ASPRINTF=1
+ else
+ HAVE_ASPRINTF=0
+ fi
+
+ if test "$ac_cv_func_snprintf" = yes; then
+ HAVE_SNPRINTF=1
+ else
+ HAVE_SNPRINTF=0
+ fi
+
+ if test "$ac_cv_func_wprintf" = yes; then
+ HAVE_WPRINTF=1
+ else
+ HAVE_WPRINTF=0
+ fi
+
+
+
+
+
+
am_save_CPPFLAGS="$CPPFLAGS"
-
+
for element in $INCICONV; do
haveit=
for x in $CPPFLAGS; do
-
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
@@ -3613,90 +8759,151 @@ done
done
- echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:3618: checking for iconv" >&5
-if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+ echo "$as_me:$LINENO: checking for iconv" >&5
+echo $ECHO_N "checking for iconv... $ECHO_C" >&6
+if test "${am_cv_func_iconv+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-
+
am_cv_func_iconv="no, consider installing GNU libiconv"
am_cv_lib_iconv=no
- cat > conftest.$ac_ext <<EOF
-#line 3626 "configure"
-#include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-int main() {
+int
+main ()
+{
iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
iconv_close(cd);
-; return 0; }
-EOF
-if { (eval echo configure:3636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
am_cv_func_iconv=yes
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test "$am_cv_func_iconv" != yes; then
am_save_LIBS="$LIBS"
LIBS="$LIBS $LIBICONV"
- cat > conftest.$ac_ext <<EOF
-#line 3648 "configure"
-#include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-int main() {
+int
+main ()
+{
iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
iconv_close(cd);
-; return 0; }
-EOF
-if { (eval echo configure:3658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
am_cv_lib_iconv=yes
am_cv_func_iconv=yes
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS="$am_save_LIBS"
fi
-
-fi
-echo "$ac_t""$am_cv_func_iconv" 1>&6
+fi
+echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
+echo "${ECHO_T}$am_cv_func_iconv" >&6
if test "$am_cv_func_iconv" = yes; then
- cat >> confdefs.h <<\EOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_ICONV 1
-EOF
+_ACEOF
fi
if test "$am_cv_lib_iconv" = yes; then
- echo $ac_n "checking how to link with libiconv""... $ac_c" 1>&6
-echo "configure:3681: checking how to link with libiconv" >&5
- echo "$ac_t""$LIBICONV" 1>&6
+ echo "$as_me:$LINENO: checking how to link with libiconv" >&5
+echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6
+ echo "$as_me:$LINENO: result: $LIBICONV" >&5
+echo "${ECHO_T}$LIBICONV" >&6
else
CPPFLAGS="$am_save_CPPFLAGS"
LIBICONV=
LTLIBICONV=
fi
-
-
+
+
if test "$am_cv_func_iconv" = yes; then
- echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
-echo "configure:3693: checking for iconv declaration" >&5
- if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+ echo "$as_me:$LINENO: checking for iconv declaration" >&5
+echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6
+ if test "${am_cv_proto_iconv+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
-
- cat > conftest.$ac_ext <<EOF
-#line 3699 "configure"
-#include "confdefs.h"
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
@@ -3710,99 +8917,181 @@ size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, si
size_t iconv();
#endif
-int main() {
+int
+main ()
+{
-; return 0; }
-EOF
-if { (eval echo configure:3718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
am_cv_proto_iconv_arg1=""
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- am_cv_proto_iconv_arg1="const"
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+am_cv_proto_iconv_arg1="const"
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
fi
am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
- echo "$ac_t""${ac_t:-
- }$am_cv_proto_iconv" 1>&6
- cat >> confdefs.h <<EOF
+ echo "$as_me:$LINENO: result: ${ac_t:-
+ }$am_cv_proto_iconv" >&5
+echo "${ECHO_T}${ac_t:-
+ }$am_cv_proto_iconv" >&6
+
+cat >>confdefs.h <<_ACEOF
#define ICONV_CONST $am_cv_proto_iconv_arg1
-EOF
+_ACEOF
fi
-
- echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
-echo "configure:3742: checking for nl_langinfo and CODESET" >&5
-if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+
+ echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
+echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
+if test "${am_cv_langinfo_codeset+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat > conftest.$ac_ext <<EOF
-#line 3747 "configure"
-#include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#include <langinfo.h>
-int main() {
+int
+main ()
+{
char* cs = nl_langinfo(CODESET);
-; return 0; }
-EOF
-if { (eval echo configure:3754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
am_cv_langinfo_codeset=yes
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- am_cv_langinfo_codeset=no
-fi
-rm -f conftest*
-
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+am_cv_langinfo_codeset=no
fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-echo "$ac_t""$am_cv_langinfo_codeset" 1>&6
+fi
+echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
+echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
if test $am_cv_langinfo_codeset = yes; then
- cat >> confdefs.h <<\EOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_LANGINFO_CODESET 1
-EOF
+_ACEOF
fi
if test $ac_cv_header_locale_h = yes; then
-
- echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:3778: checking for LC_MESSAGES" >&5
-if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3783 "configure"
-#include "confdefs.h"
+
+ echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
+echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
+if test "${am_cv_val_LC_MESSAGES+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#include <locale.h>
-int main() {
+int
+main ()
+{
return LC_MESSAGES
-; return 0; }
-EOF
-if { (eval echo configure:3790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
am_cv_val_LC_MESSAGES=yes
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- am_cv_val_LC_MESSAGES=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+am_cv_val_LC_MESSAGES=no
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-
-echo "$ac_t""$am_cv_val_LC_MESSAGES" 1>&6
+echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
+echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
if test $am_cv_val_LC_MESSAGES = yes; then
- cat >> confdefs.h <<\EOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_LC_MESSAGES 1
-EOF
+_ACEOF
fi
@@ -3810,43 +9099,49 @@ EOF
for ac_prog in bison
do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3817: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_INTLBISON+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$INTLBISON"; then
ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_INTLBISON="$ac_prog"
- break
- fi
- done
- IFS="$ac_save_ifs"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_INTLBISON="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
fi
fi
-INTLBISON="$ac_cv_prog_INTLBISON"
+INTLBISON=$ac_cv_prog_INTLBISON
if test -n "$INTLBISON"; then
- echo "$ac_t""$INTLBISON" 1>&6
+ echo "$as_me:$LINENO: result: $INTLBISON" >&5
+echo "${ECHO_T}$INTLBISON" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
-test -n "$INTLBISON" && break
+ test -n "$INTLBISON" && break
done
if test -z "$INTLBISON"; then
ac_verc_fail=yes
else
- echo $ac_n "checking version of bison""... $ac_c" 1>&6
-echo "configure:3850: checking version of bison" >&5
+ echo "$as_me:$LINENO: checking version of bison" >&5
+echo $ECHO_N "checking version of bison... $ECHO_C" >&6
ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
case $ac_prog_version in
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -3854,134 +9149,166 @@ echo "configure:3850: checking version of bison" >&5
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
esac
- echo "$ac_t""$ac_prog_version" 1>&6
+ echo "$as_me:$LINENO: result: $ac_prog_version" >&5
+echo "${ECHO_T}$ac_prog_version" >&6
fi
if test $ac_verc_fail = yes; then
INTLBISON=:
fi
-
-
-
-
-
-
-
-
-
- echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:3879: checking whether NLS is requested" >&5
+
+
+
+
+
+
+
+
+
+
+ echo "$as_me:$LINENO: checking whether NLS is requested" >&5
+echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
# Check whether --enable-nls or --disable-nls was given.
if test "${enable_nls+set}" = set; then
enableval="$enable_nls"
USE_NLS=$enableval
else
USE_NLS=yes
-fi
+fi;
+ echo "$as_me:$LINENO: result: $USE_NLS" >&5
+echo "${ECHO_T}$USE_NLS" >&6
+
+
- echo "$ac_t""$USE_NLS" 1>&6
-
-
BUILD_INCLUDED_LIBINTL=no
USE_INCLUDED_LIBINTL=no
-
+
LIBINTL=
LTLIBINTL=
POSUB=
if test "$USE_NLS" = "yes"; then
gt_use_preinstalled_gnugettext=no
-
- echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:3903: checking whether included gettext is requested" >&5
- # Check whether --with-included-gettext or --without-included-gettext was given.
+
+ echo "$as_me:$LINENO: checking whether included gettext is requested" >&5
+echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6
+
+# Check whether --with-included-gettext or --without-included-gettext was given.
if test "${with_included_gettext+set}" = set; then
withval="$with_included_gettext"
nls_cv_force_use_gnu_gettext=$withval
else
nls_cv_force_use_gnu_gettext=no
-fi
-
- echo "$ac_t""$nls_cv_force_use_gnu_gettext" 1>&6
+fi;
+ echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5
+echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-
-
-
-
-
-
- echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6
-echo "configure:3923: checking for GNU gettext in libc" >&5
-if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3928 "configure"
-#include "confdefs.h"
+
+
+
+
+
+
+ echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
+echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6
+if test "${gt_cv_func_gnugettext1_libc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#include <libintl.h>
extern int _nl_msg_cat_cntr;
extern int *_nl_domain_bindings;
-int main() {
+int
+main ()
+{
bindtextdomain ("", "");
return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
-; return 0; }
-EOF
-if { (eval echo configure:3938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
gt_cv_func_gnugettext1_libc=yes
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- gt_cv_func_gnugettext1_libc=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+gt_cv_func_gnugettext1_libc=no
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-
-echo "$ac_t""$gt_cv_func_gnugettext1_libc" 1>&6
+echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
+echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6
if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
-
-
-
+
+
+
use_additional=yes
-
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
exec_prefix="$acl_final_exec_prefix"
-
+
eval additional_includedir=\"$includedir\"
eval additional_libdir=\"$libdir\"
-
+
exec_prefix="$acl_save_exec_prefix"
prefix="$acl_save_prefix"
- # Check whether --with-libintl-prefix or --without-libintl-prefix was given.
+
+# Check whether --with-libintl-prefix or --without-libintl-prefix was given.
if test "${with_libintl_prefix+set}" = set; then
withval="$with_libintl_prefix"
-
+
if test "X$withval" = "Xno"; then
use_additional=no
else
if test "X$withval" = "X"; then
-
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
exec_prefix="$acl_final_exec_prefix"
-
+
eval additional_includedir=\"$includedir\"
eval additional_libdir=\"$libdir\"
-
+
exec_prefix="$acl_save_exec_prefix"
prefix="$acl_save_prefix"
@@ -3991,8 +9318,7 @@ if test "${with_libintl_prefix+set}" = set; then
fi
fi
-fi
-
+fi;
LIBINTL=
LTLIBINTL=
INCINTL=
@@ -4048,7 +9374,7 @@ fi
fi
if test "X$found_dir" = "X"; then
for x in $LDFLAGS $LTLIBINTL; do
-
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
@@ -4116,7 +9442,7 @@ fi
else
haveit=
for x in $LDFLAGS $LIBINTL; do
-
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
@@ -4167,7 +9493,7 @@ fi
fi
if test -z "$haveit"; then
for x in $CPPFLAGS $INCINTL; do
-
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
@@ -4212,7 +9538,7 @@ fi
if test -z "$haveit"; then
haveit=
for x in $LDFLAGS $LIBINTL; do
-
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
@@ -4233,7 +9559,7 @@ fi
fi
haveit=
for x in $LDFLAGS $LTLIBINTL; do
-
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
@@ -4328,18 +9654,21 @@ fi
done
fi
- echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6
-echo "configure:4333: checking for GNU gettext in libintl" >&5
-if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+ echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
+echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6
+if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
gt_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $INCINTL"
gt_save_LIBS="$LIBS"
LIBS="$LIBS $LIBINTL"
- cat > conftest.$ac_ext <<EOF
-#line 4342 "configure"
-#include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#include <libintl.h>
extern int _nl_msg_cat_cntr;
extern
@@ -4347,26 +9676,53 @@ extern
"C"
#endif
const char *_nl_expand_alias ();
-int main() {
+int
+main ()
+{
bindtextdomain ("", "");
return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
-; return 0; }
-EOF
-if { (eval echo configure:4356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
gt_cv_func_gnugettext1_libintl=yes
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- gt_cv_func_gnugettext1_libintl=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+gt_cv_func_gnugettext1_libintl=no
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
LIBS="$LIBS $LIBICONV"
- cat > conftest.$ac_ext <<EOF
-#line 4369 "configure"
-#include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#include <libintl.h>
extern int _nl_msg_cat_cntr;
extern
@@ -4374,33 +9730,59 @@ extern
"C"
#endif
const char *_nl_expand_alias ();
-int main() {
+int
+main ()
+{
bindtextdomain ("", "");
return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
-; return 0; }
-EOF
-if { (eval echo configure:4383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
LIBINTL="$LIBINTL $LIBICONV"
LTLIBINTL="$LTLIBINTL $LTLIBICONV"
gt_cv_func_gnugettext1_libintl=yes
-
+
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
CPPFLAGS="$gt_save_CPPFLAGS"
LIBS="$gt_save_LIBS"
fi
-
-echo "$ac_t""$gt_cv_func_gnugettext1_libintl" 1>&6
+echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5
+echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6
fi
if test "$gt_cv_func_gnugettext1_libc" = "yes" \
|| { test "$gt_cv_func_gnugettext1_libintl" = "yes" \
- && test "$PACKAGE" != gettext; }; then
+ && test "$PACKAGE" != gettext-runtime \
+ && test "$PACKAGE" != gettext-tools; }; then
gt_use_preinstalled_gnugettext=yes
else
LIBINTL=
@@ -4408,15 +9790,14 @@ echo "$ac_t""$gt_cv_func_gnugettext1_libintl" 1>&6
INCINTL=
fi
-
+
if test "$gt_use_preinstalled_gnugettext" != "yes"; then
nls_cv_use_gnu_gettext=yes
fi
fi
if test "$nls_cv_use_gnu_gettext" = "yes"; then
- INTLOBJS="\$(GETTOBJS)"
- BUILD_INCLUDED_LIBINTL=yes
+ BUILD_INCLUDED_LIBINTL=yes
USE_INCLUDED_LIBINTL=yes
LIBINTL="\${top_builddir}/intl/libintl.a $LIBICONV"
LTLIBINTL="\${top_builddir}/intl/libintl.a $LTLIBICONV"
@@ -4427,31 +9808,53 @@ echo "$ac_t""$gt_cv_func_gnugettext1_libintl" 1>&6
|| test "$nls_cv_use_gnu_gettext" = "yes"; then
CATOBJEXT=.gmo
fi
-
+
if test "$gt_use_preinstalled_gnugettext" = "yes" \
|| test "$nls_cv_use_gnu_gettext" = "yes"; then
- cat >> confdefs.h <<\EOF
+
+cat >>confdefs.h <<\_ACEOF
#define ENABLE_NLS 1
-EOF
+_ACEOF
else
USE_NLS=no
fi
fi
+ echo "$as_me:$LINENO: checking whether to use NLS" >&5
+echo $ECHO_N "checking whether to use NLS... $ECHO_C" >&6
+ echo "$as_me:$LINENO: result: $USE_NLS" >&5
+echo "${ECHO_T}$USE_NLS" >&6
+ if test "$USE_NLS" = "yes"; then
+ echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
+echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6
+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+ if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
+ gt_source="external libintl"
+ else
+ gt_source="libc"
+ fi
+ else
+ gt_source="included intl directory"
+ fi
+ echo "$as_me:$LINENO: result: $gt_source" >&5
+echo "${ECHO_T}$gt_source" >&6
+ fi
+
if test "$USE_NLS" = "yes"; then
if test "$gt_use_preinstalled_gnugettext" = "yes"; then
if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
- echo $ac_n "checking how to link with libintl""... $ac_c" 1>&6
-echo "configure:4449: checking how to link with libintl" >&5
- echo "$ac_t""$LIBINTL" 1>&6
-
+ echo "$as_me:$LINENO: checking how to link with libintl" >&5
+echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6
+ echo "$as_me:$LINENO: result: $LIBINTL" >&5
+echo "${ECHO_T}$LIBINTL" >&6
+
for element in $INCINTL; do
haveit=
for x in $CPPFLAGS; do
-
+
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
acl_save_exec_prefix="$exec_prefix"
@@ -4472,648 +9875,697 @@ echo "configure:4449: checking how to link with libintl" >&5
fi
- cat >> confdefs.h <<\EOF
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_GETTEXT 1
-EOF
+_ACEOF
+
- cat >> confdefs.h <<\EOF
+cat >>confdefs.h <<\_ACEOF
#define HAVE_DCGETTEXT 1
-EOF
+_ACEOF
fi
POSUB=po
fi
-
- if test "$PACKAGE" = gettext; then
+
+ if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
BUILD_INCLUDED_LIBINTL=yes
fi
-
-
-
-
+
+
+
nls_cv_header_intl=
nls_cv_header_libgt=
DATADIRNAME=share
-
+
INSTOBJEXT=.mo
-
+
GENCAT=gencat
-
+
+
+ if test "$USE_INCLUDED_LIBINTL" = yes; then
+ INTLOBJS="\$(GETTOBJS)"
+ fi
+
INTL_LIBTOOL_SUFFIX_PREFIX=
-
-
+
+
INTLLIBS="$LIBINTL"
-
-
-
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:4524: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+
+
+
+
+echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat > conftestmake <<\EOF
+ cat >conftest.make <<\_ACEOF
all:
- @echo 'ac_maketemp="${MAKE}"'
-EOF
+ @echo 'ac_maketemp="$(MAKE)"'
+_ACEOF
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
if test -n "$ac_maketemp"; then
eval ac_cv_prog_make_${ac_make}_set=yes
else
eval ac_cv_prog_make_${ac_make}_set=no
fi
-rm -f conftestmake
+rm -f conftest.make
fi
if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
- echo "$ac_t""yes" 1>&6
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
SET_MAKE=
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
SET_MAKE="MAKE=${MAKE-make}"
fi
# Extract the first word of "ln", so it can be a program name with args.
set dummy ln; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4553: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_LN'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_LN+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case "$LN" in
- /*)
+ case $LN in
+ [\\/]* | ?:[\\/]*)
ac_cv_path_LN="$LN" # Let the user override the test with a path.
;;
- ?:/*)
- ac_cv_path_LN="$LN" # Let the user override the test with a dos path.
- ;;
*)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_LN="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
test -z "$ac_cv_path_LN" && ac_cv_path_LN="ln"
;;
esac
fi
-LN="$ac_cv_path_LN"
+LN=$ac_cv_path_LN
+
if test -n "$LN"; then
- echo "$ac_t""$LN" 1>&6
+ echo "$as_me:$LINENO: result: $LN" >&5
+echo "${ECHO_T}$LN" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:4587: checking whether ln -s works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
- rm -f conftestdata
- ac_cv_prog_LN_S="ln -s"
+echo "$as_me:$LINENO: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
else
- ac_cv_prog_LN_S=ln
-fi
-fi
-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
- echo "$ac_t""yes" 1>&6
-else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6
fi
# Extract the first word of "mv", so it can be a program name with args.
set dummy mv; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4610: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_MV'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_MV+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case "$MV" in
- /*)
+ case $MV in
+ [\\/]* | ?:[\\/]*)
ac_cv_path_MV="$MV" # Let the user override the test with a path.
;;
- ?:/*)
- ac_cv_path_MV="$MV" # Let the user override the test with a dos path.
- ;;
*)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_MV="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
test -z "$ac_cv_path_MV" && ac_cv_path_MV="mv"
;;
esac
fi
-MV="$ac_cv_path_MV"
+MV=$ac_cv_path_MV
+
if test -n "$MV"; then
- echo "$ac_t""$MV" 1>&6
+ echo "$as_me:$LINENO: result: $MV" >&5
+echo "${ECHO_T}$MV" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
# Extract the first word of "cp", so it can be a program name with args.
set dummy cp; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4646: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_CP'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_CP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case "$CP" in
- /*)
+ case $CP in
+ [\\/]* | ?:[\\/]*)
ac_cv_path_CP="$CP" # Let the user override the test with a path.
;;
- ?:/*)
- ac_cv_path_CP="$CP" # Let the user override the test with a dos path.
- ;;
*)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_CP="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
test -z "$ac_cv_path_CP" && ac_cv_path_CP="cp"
;;
esac
fi
-CP="$ac_cv_path_CP"
+CP=$ac_cv_path_CP
+
if test -n "$CP"; then
- echo "$ac_t""$CP" 1>&6
+ echo "$as_me:$LINENO: result: $CP" >&5
+echo "${ECHO_T}$CP" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
# Extract the first word of "rm", so it can be a program name with args.
set dummy rm; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4682: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_RM+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case "$RM" in
- /*)
+ case $RM in
+ [\\/]* | ?:[\\/]*)
ac_cv_path_RM="$RM" # Let the user override the test with a path.
;;
- ?:/*)
- ac_cv_path_RM="$RM" # Let the user override the test with a dos path.
- ;;
*)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_RM="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
test -z "$ac_cv_path_RM" && ac_cv_path_RM="rm"
;;
esac
fi
-RM="$ac_cv_path_RM"
+RM=$ac_cv_path_RM
+
if test -n "$RM"; then
- echo "$ac_t""$RM" 1>&6
+ echo "$as_me:$LINENO: result: $RM" >&5
+echo "${ECHO_T}$RM" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
# Extract the first word of "chmod", so it can be a program name with args.
set dummy chmod; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4718: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_CHMOD'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_CHMOD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case "$CHMOD" in
- /*)
+ case $CHMOD in
+ [\\/]* | ?:[\\/]*)
ac_cv_path_CHMOD="$CHMOD" # Let the user override the test with a path.
;;
- ?:/*)
- ac_cv_path_CHMOD="$CHMOD" # Let the user override the test with a dos path.
- ;;
*)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_CHMOD="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_CHMOD="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
test -z "$ac_cv_path_CHMOD" && ac_cv_path_CHMOD=":"
;;
esac
fi
-CHMOD="$ac_cv_path_CHMOD"
+CHMOD=$ac_cv_path_CHMOD
+
if test -n "$CHMOD"; then
- echo "$ac_t""$CHMOD" 1>&6
+ echo "$as_me:$LINENO: result: $CHMOD" >&5
+echo "${ECHO_T}$CHMOD" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
# Extract the first word of "awk", so it can be a program name with args.
set dummy awk; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4754: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_AWK'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_AWK+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case "$AWK" in
- /*)
+ case $AWK in
+ [\\/]* | ?:[\\/]*)
ac_cv_path_AWK="$AWK" # Let the user override the test with a path.
;;
- ?:/*)
- ac_cv_path_AWK="$AWK" # Let the user override the test with a dos path.
- ;;
*)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_AWK="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_AWK="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
test -z "$ac_cv_path_AWK" && ac_cv_path_AWK="awk"
;;
esac
fi
-AWK="$ac_cv_path_AWK"
+AWK=$ac_cv_path_AWK
+
if test -n "$AWK"; then
- echo "$ac_t""$AWK" 1>&6
+ echo "$as_me:$LINENO: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
# Extract the first word of "sed", so it can be a program name with args.
set dummy sed; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4790: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_SED+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case "$SED" in
- /*)
+ case $SED in
+ [\\/]* | ?:[\\/]*)
ac_cv_path_SED="$SED" # Let the user override the test with a path.
;;
- ?:/*)
- ac_cv_path_SED="$SED" # Let the user override the test with a dos path.
- ;;
*)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_SED="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
test -z "$ac_cv_path_SED" && ac_cv_path_SED="sed"
;;
esac
fi
-SED="$ac_cv_path_SED"
+SED=$ac_cv_path_SED
+
if test -n "$SED"; then
- echo "$ac_t""$SED" 1>&6
+ echo "$as_me:$LINENO: result: $SED" >&5
+echo "${ECHO_T}$SED" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4826: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PERL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case "$PERL" in
- /*)
+ case $PERL in
+ [\\/]* | ?:[\\/]*)
ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
;;
- ?:/*)
- ac_cv_path_PERL="$PERL" # Let the user override the test with a dos path.
- ;;
*)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_PERL="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="perl"
;;
esac
fi
-PERL="$ac_cv_path_PERL"
+PERL=$ac_cv_path_PERL
+
if test -n "$PERL"; then
- echo "$ac_t""$PERL" 1>&6
+ echo "$as_me:$LINENO: result: $PERL" >&5
+echo "${ECHO_T}$PERL" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
# Extract the first word of "ldconfig", so it can be a program name with args.
set dummy ldconfig; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4862: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_LDCONFIG'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_LDCONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case "$LDCONFIG" in
- /*)
+ case $LDCONFIG in
+ [\\/]* | ?:[\\/]*)
ac_cv_path_LDCONFIG="$LDCONFIG" # Let the user override the test with a path.
;;
- ?:/*)
- ac_cv_path_LDCONFIG="$LDCONFIG" # Let the user override the test with a dos path.
- ;;
*)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_LDCONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
test -z "$ac_cv_path_LDCONFIG" && ac_cv_path_LDCONFIG=":"
;;
esac
fi
-LDCONFIG="$ac_cv_path_LDCONFIG"
-if test -n "$LDCONFIG"; then
- echo "$ac_t""$LDCONFIG" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:4896: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
- case $nonopt in
- NONE) build_alias=$host_alias ;;
- *) build_alias=$nonopt ;;
- esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
+LDCONFIG=$ac_cv_path_LDCONFIG
-if test $host != $build; then
- ac_tool_prefix=${host_alias}-
+if test -n "$LDCONFIG"; then
+ echo "$as_me:$LINENO: result: $LDCONFIG" >&5
+echo "${ECHO_T}$LDCONFIG" >&6
else
- ac_tool_prefix=
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4922: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AR+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$AR"; then
ac_cv_prog_AR="$AR" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_AR="${ac_tool_prefix}ar"
- break
- fi
- done
- IFS="$ac_save_ifs"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_AR="${ac_tool_prefix}ar"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
fi
fi
-AR="$ac_cv_prog_AR"
+AR=$ac_cv_prog_AR
if test -n "$AR"; then
- echo "$ac_t""$AR" 1>&6
+ echo "$as_me:$LINENO: result: $AR" >&5
+echo "${ECHO_T}$AR" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
-
+fi
if test -z "$ac_cv_prog_AR"; then
-if test -n "$ac_tool_prefix"; then
+ ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4954: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$AR"; then
- ac_cv_prog_AR="$AR" # Let the user override the test.
+ if test -n "$ac_ct_AR"; then
+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_AR="ar"
- break
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_AR="ar"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="ar"
fi
fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
- echo "$ac_t""$AR" 1>&6
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+ echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+echo "${ECHO_T}$ac_ct_AR" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
+ AR=$ac_ct_AR
else
- AR="ar"
-fi
+ AR="$ac_cv_prog_AR"
fi
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4989: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_RANLIB+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- break
- fi
- done
- IFS="$ac_save_ifs"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
fi
fi
-RANLIB="$ac_cv_prog_RANLIB"
+RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- echo "$ac_t""$RANLIB" 1>&6
+ echo "$as_me:$LINENO: result: $RANLIB" >&5
+echo "${ECHO_T}$RANLIB" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
-
+fi
if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
+ ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5021: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$RANLIB"; then
- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+ if test -n "$ac_ct_RANLIB"; then
+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_RANLIB="ranlib"
- break
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_RANLIB="ranlib"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
fi
fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
- echo "$ac_t""$RANLIB" 1>&6
+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+if test -n "$ac_ct_RANLIB"; then
+ echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+echo "${ECHO_T}$ac_ct_RANLIB" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
+ RANLIB=$ac_ct_RANLIB
else
- RANLIB=":"
-fi
+ RANLIB="$ac_cv_prog_RANLIB"
fi
-# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5056: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_STRIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$STRIP"; then
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- break
- fi
- done
- IFS="$ac_save_ifs"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
fi
fi
-STRIP="$ac_cv_prog_STRIP"
+STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
- echo "$ac_t""$STRIP" 1>&6
+ echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
-
+fi
if test -z "$ac_cv_prog_STRIP"; then
-if test -n "$ac_tool_prefix"; then
+ ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5088: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- if test -n "$STRIP"; then
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+ if test -n "$ac_ct_STRIP"; then
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_STRIP="strip"
- break
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_STRIP="strip"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
fi
fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
- echo "$ac_t""$STRIP" 1>&6
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+ echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
+ STRIP=$ac_ct_STRIP
else
- STRIP=":"
-fi
+ STRIP="$ac_cv_prog_STRIP"
fi
# Find a good install program. We prefer a C program (faster),
@@ -5123,544 +10575,2372 @@ fi
# SunOS /usr/etc/install
# IRIX /sbin/install
# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:5132: checking for a BSD compatible install" >&5
+echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+if test "${ac_cv_path_install+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
- for ac_dir in $PATH; do
- # Account for people who put trailing slashes in PATH elements.
- case "$ac_dir/" in
- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- # Don't use installbsd from OSF since it installs stuff as root
- # by default.
- for ac_prog in ginstall scoinst install; do
- if test -f $ac_dir/$ac_prog; then
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+ ./ | .// | /cC/* | \
+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+ /usr/ucb/* ) ;;
+ *)
+ # OSF1 and SCO ODT 3.0 have their own names for install.
+ # Don't use installbsd from OSF since it installs stuff as root
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
if test $ac_prog = install &&
- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
:
+ elif test $ac_prog = install &&
+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # program-specific install script used by HP pwplus--don't use.
+ :
else
- ac_cv_path_install="$ac_dir/$ac_prog -c"
- break 2
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
fi
fi
done
- ;;
- esac
- done
- IFS="$ac_save_IFS"
+ done
+ ;;
+esac
+done
+
fi
if test "${ac_cv_path_install+set}" = set; then
- INSTALL="$ac_cv_path_install"
+ INSTALL=$ac_cv_path_install
else
# As a last resort, use the slow shell script. We don't cache a
# path for INSTALL within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the path is relative.
- INSTALL="$ac_install_sh"
+ INSTALL=$ac_install_sh
fi
fi
-echo "$ac_t""$INSTALL" 1>&6
+echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
# See if we need a separate native compiler.
if test $cross_compiling = no; then
BUILD_CC="$CC"
-
+
else
for ac_prog in gcc cc
do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5194: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_BUILD_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_BUILD_CC+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
if test -n "$BUILD_CC"; then
ac_cv_prog_BUILD_CC="$BUILD_CC" # Let the user override the test.
else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
- ac_dummy="$PATH"
- for ac_dir in $ac_dummy; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_BUILD_CC="$ac_prog"
- break
- fi
- done
- IFS="$ac_save_ifs"
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_BUILD_CC="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
fi
fi
-BUILD_CC="$ac_cv_prog_BUILD_CC"
+BUILD_CC=$ac_cv_prog_BUILD_CC
if test -n "$BUILD_CC"; then
- echo "$ac_t""$BUILD_CC" 1>&6
+ echo "$as_me:$LINENO: result: $BUILD_CC" >&5
+echo "${ECHO_T}$BUILD_CC" >&6
else
- echo "$ac_t""no" 1>&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
-test -n "$BUILD_CC" && break
+ test -n "$BUILD_CC" && break
done
fi
-for ac_hdr in stdlib.h unistd.h stdarg.h stdint.h errno.h malloc.h mntent.h paths.h dirent.h getopt.h setjmp.h signal.h termios.h linux/fd.h linux/major.h sys/disk.h sys/disklabel.h sys/ioctl.h sys/mkdev.h sys/mount.h sys/queue.h sys/sockio.h sys/socket.h sys/sysmacros.h sys/time.h sys/stat.h sys/types.h sys/wait.h sys/resource.h net/if.h net/if_dl.h netinet/in.h
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+for ac_header in stdlib.h unistd.h stdarg.h stdint.h errno.h malloc.h mntent.h paths.h dirent.h getopt.h setjmp.h signal.h termios.h linux/fd.h linux/major.h sys/disk.h sys/disklabel.h sys/ioctl.h sys/mkdev.h sys/mount.h sys/queue.h sys/sockio.h sys/socket.h sys/sysmacros.h sys/time.h sys/stat.h sys/types.h sys/wait.h sys/resource.h net/if.h net/if_dl.h netinet/in.h
do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5228: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 5233 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
fi
-rm -f conftest*
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
-
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists. ##
+## ------------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- echo "$ac_t""no" 1>&6
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
done
-echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:5265: checking for vprintf" >&5
-if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 5270 "configure"
-#include "confdefs.h"
+
+for ac_func in vprintf
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char vprintf(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char vprintf();
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
-int main() {
+#undef $ac_func
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_vprintf) || defined (__stub___vprintf)
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-vprintf();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
#endif
-; return 0; }
-EOF
-if { (eval echo configure:5293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_vprintf=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_func_vprintf=no"
-fi
-rm -f conftest*
-fi
+int
+main ()
+{
+return f != $ac_func;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_var=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+echo "$as_me:$LINENO: checking for _doprnt" >&5
+echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6
+if test "${ac_cv_func__doprnt+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define _doprnt innocuous__doprnt
-if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
-#define HAVE_VPRINTF 1
-EOF
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char _doprnt (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
-else
- echo "$ac_t""no" 1>&6
-fi
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef _doprnt
-if test "$ac_cv_func_vprintf" != yes; then
-echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:5317: checking for _doprnt" >&5
-if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 5322 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char _doprnt(); below. */
-#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char _doprnt();
-
-int main() {
-
+ builtin and then its argument prototype would still apply. */
+char _doprnt ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub__doprnt) || defined (__stub____doprnt)
choke me
#else
-_doprnt();
+char (*f) () = _doprnt;
+#endif
+#ifdef __cplusplus
+}
#endif
-; return 0; }
-EOF
-if { (eval echo configure:5345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func__doprnt=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_func__doprnt=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
+int
+main ()
+{
+return f != _doprnt;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func__doprnt=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func__doprnt=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
+echo "${ECHO_T}$ac_cv_func__doprnt" >&6
+if test $ac_cv_func__doprnt = yes; then
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_DOPRNT 1
-EOF
+_ACEOF
-else
- echo "$ac_t""no" 1>&6
fi
fi
+done
+
-echo $ac_n "checking whether d_reclen declared in dirent""... $ac_c" 1>&6
-echo "configure:5370: checking whether d_reclen declared in dirent" >&5
-if eval "test \"`echo '$''{'e2fsprogs_cv_have_d_reclen_dirent'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking whether d_reclen declared in dirent" >&5
+echo $ECHO_N "checking whether d_reclen declared in dirent... $ECHO_C" >&6
+if test "${e2fsprogs_cv_have_d_reclen_dirent+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat > conftest.$ac_ext <<EOF
-#line 5375 "configure"
-#include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#include <dirent.h>
-int main() {
-struct dirent de; de.d_reclen = 0;
-; return 0; }
-EOF
-if { (eval echo configure:5382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
+int
+main ()
+{
+struct dirent de; de.d_reclen = 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
e2fsprogs_cv_have_d_reclen_dirent=yes
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- e2fsprogs_cv_have_d_reclen_dirent=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+e2fsprogs_cv_have_d_reclen_dirent=no
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$ac_t""$e2fsprogs_cv_have_d_reclen_dirent" 1>&6
+echo "$as_me:$LINENO: result: $e2fsprogs_cv_have_d_reclen_dirent" >&5
+echo "${ECHO_T}$e2fsprogs_cv_have_d_reclen_dirent" >&6
if test "$e2fsprogs_cv_have_d_reclen_dirent" = yes; then
- cat >> confdefs.h <<\EOF
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_RECLEN_DIRENT 1
-EOF
+_ACEOF
fi
-echo $ac_n "checking whether ssize_t declared""... $ac_c" 1>&6
-echo "configure:5402: checking whether ssize_t declared" >&5
-if eval "test \"`echo '$''{'e2fsprogs_cv_have_ssize_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking whether ssize_t declared" >&5
+echo $ECHO_N "checking whether ssize_t declared... $ECHO_C" >&6
+if test "${e2fsprogs_cv_have_ssize_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat > conftest.$ac_ext <<EOF
-#line 5407 "configure"
-#include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#include <sys/types.h>
-int main() {
-ssize_t a = 0;
-; return 0; }
-EOF
-if { (eval echo configure:5414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
+int
+main ()
+{
+ssize_t a = 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
e2fsprogs_cv_have_ssize_t=yes
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- e2fsprogs_cv_have_ssize_t=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+e2fsprogs_cv_have_ssize_t=no
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$ac_t""$e2fsprogs_cv_have_ssize_t" 1>&6
+echo "$as_me:$LINENO: result: $e2fsprogs_cv_have_ssize_t" >&5
+echo "${ECHO_T}$e2fsprogs_cv_have_ssize_t" >&6
if test "$e2fsprogs_cv_have_ssize_t" = yes; then
- cat >> confdefs.h <<\EOF
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_TYPE_SSIZE_T 1
-EOF
+_ACEOF
fi
-echo $ac_n "checking whether llseek declared in unistd.h""... $ac_c" 1>&6
-echo "configure:5434: checking whether llseek declared in unistd.h" >&5
-if eval "test \"`echo '$''{'e2fsprogs_cv_have_llseek_prototype'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking whether llseek declared in unistd.h" >&5
+echo $ECHO_N "checking whether llseek declared in unistd.h... $ECHO_C" >&6
+if test "${e2fsprogs_cv_have_llseek_prototype+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat > conftest.$ac_ext <<EOF
-#line 5439 "configure"
-#include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#include <unistd.h>
-int main() {
+int
+main ()
+{
extern int llseek(int);
-; return 0; }
-EOF
-if { (eval echo configure:5446: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
e2fsprogs_cv_have_llseek_prototype=no
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- e2fsprogs_cv_have_llseek_prototype=yes
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+e2fsprogs_cv_have_llseek_prototype=yes
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$ac_t""$e2fsprogs_cv_have_llseek_prototype" 1>&6
+echo "$as_me:$LINENO: result: $e2fsprogs_cv_have_llseek_prototype" >&5
+echo "${ECHO_T}$e2fsprogs_cv_have_llseek_prototype" >&6
if test "$e2fsprogs_cv_have_llseek_prototype" = yes; then
- cat >> confdefs.h <<\EOF
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_LLSEEK_PROTOTYPE 1
-EOF
+_ACEOF
fi
-echo $ac_n "checking whether lseek64 declared in unistd.h""... $ac_c" 1>&6
-echo "configure:5466: checking whether lseek64 declared in unistd.h" >&5
-if eval "test \"`echo '$''{'e2fsprogs_cv_have_lseek64_prototype'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking whether lseek64 declared in unistd.h" >&5
+echo $ECHO_N "checking whether lseek64 declared in unistd.h... $ECHO_C" >&6
+if test "${e2fsprogs_cv_have_lseek64_prototype+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat > conftest.$ac_ext <<EOF
-#line 5471 "configure"
-#include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#define _LARGEFILE_SOURCE
#define _LARGEFILE64_SOURCE
#include <unistd.h>
-int main() {
+int
+main ()
+{
extern int lseek64(int);
-; return 0; }
-EOF
-if { (eval echo configure:5480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
e2fsprogs_cv_have_lseek64_prototype=no
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- e2fsprogs_cv_have_lseek64_prototype=yes
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+e2fsprogs_cv_have_lseek64_prototype=yes
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$ac_t""$e2fsprogs_cv_have_lseek64_prototype" 1>&6
+echo "$as_me:$LINENO: result: $e2fsprogs_cv_have_lseek64_prototype" >&5
+echo "${ECHO_T}$e2fsprogs_cv_have_lseek64_prototype" >&6
if test "$e2fsprogs_cv_have_lseek64_prototype" = yes; then
- cat >> confdefs.h <<\EOF
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_LSEEK64_PROTOTYPE 1
-EOF
+_ACEOF
fi
if test "$cross_compiling" = yes -a "$ac_cv_sizeof_long" = ""; then
- # if cross-compiling, with no cached values, just assume something common.
+ # if cross-compiling, with no cached values, just assume something common.
ac_cv_sizeof_short=2
ac_cv_sizeof_int=4
ac_cv_sizeof_long=4
ac_cv_sizeof_long_long=8
- echo "configure: warning: Cross-compiling, so cannot check type sizes; assuming short=2, int=4, long=4, long long=8" 1>&2
+ { echo "$as_me:$LINENO: WARNING: Cross-compiling, so cannot check type sizes; assuming short=2, int=4, long=4, long long=8" >&5
+echo "$as_me: WARNING: Cross-compiling, so cannot check type sizes; assuming short=2, int=4, long=4, long long=8" >&2;}
+fi
+echo "$as_me:$LINENO: checking for short" >&5
+echo $ECHO_N "checking for short... $ECHO_C" >&6
+if test "${ac_cv_type_short+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if ((short *) 0)
+ return 0;
+if (sizeof (short))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_type_short=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_short=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
+echo "${ECHO_T}$ac_cv_type_short" >&6
+
+echo "$as_me:$LINENO: checking size of short" >&5
+echo $ECHO_N "checking size of short... $ECHO_C" >&6
+if test "${ac_cv_sizeof_short+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test "$ac_cv_type_short" = yes; then
+ # The cast to unsigned long works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+ if test "$cross_compiling" = yes; then
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_lo=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo= ac_hi=
fi
-echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:5508: checking size of short" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=$ac_mid
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_short=$ac_lo;;
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (short), 77
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; } ;;
+esac
else
if test "$cross_compiling" = yes; then
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
- cat > conftest.$ac_ext <<EOF
-#line 5516 "configure"
-#include "confdefs.h"
+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+ { (exit 1); exit 1; }; }
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+long longval () { return (long) (sizeof (short)); }
+unsigned long ulongval () { return (long) (sizeof (short)); }
#include <stdio.h>
-#include <sys/types.h>
-main()
+#include <stdlib.h>
+int
+main ()
{
- FILE *f=fopen("conftestval", "w");
- if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(short));
- exit(0);
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ exit (1);
+ if (((long) (sizeof (short))) < 0)
+ {
+ long i = longval ();
+ if (i != ((long) (sizeof (short))))
+ exit (1);
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+ unsigned long i = ulongval ();
+ if (i != ((long) (sizeof (short))))
+ exit (1);
+ fprintf (f, "%lu\n", i);
+ }
+ exit (ferror (f) || fclose (f) != 0);
+
+ ;
+ return 0;
}
-EOF
-if { (eval echo configure:5528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
- ac_cv_sizeof_short=`cat conftestval`
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_short=`cat conftest.val`
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (short), 77
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+rm -f conftest.val
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
ac_cv_sizeof_short=0
fi
-rm -fr conftest*
-fi
-
fi
-echo "$ac_t""$ac_cv_sizeof_short" 1>&6
-cat >> confdefs.h <<EOF
+echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+echo "${ECHO_T}$ac_cv_sizeof_short" >&6
+cat >>confdefs.h <<_ACEOF
#define SIZEOF_SHORT $ac_cv_sizeof_short
-EOF
+_ACEOF
-echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:5548: checking size of int" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for int" >&5
+echo $ECHO_N "checking for int... $ECHO_C" >&6
+if test "${ac_cv_type_int+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if ((int *) 0)
+ return 0;
+if (sizeof (int))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_type_int=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_int=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
+echo "${ECHO_T}$ac_cv_type_int" >&6
+
+echo "$as_me:$LINENO: checking size of int" >&5
+echo $ECHO_N "checking size of int... $ECHO_C" >&6
+if test "${ac_cv_sizeof_int+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test "$ac_cv_type_int" = yes; then
+ # The cast to unsigned long works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
if test "$cross_compiling" = yes; then
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
else
- cat > conftest.$ac_ext <<EOF
-#line 5556 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-#include <sys/types.h>
-main()
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
{
- FILE *f=fopen("conftestval", "w");
- if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(int));
- exit(0);
+static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
}
-EOF
-if { (eval echo configure:5568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
- ac_cv_sizeof_int=`cat conftestval`
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_lo=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
- ac_cv_sizeof_int=0
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo= ac_hi=
fi
-rm -fr conftest*
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
+test_array [0] = 0
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=$ac_mid
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_int=$ac_lo;;
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (int), 77
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; } ;;
+esac
+else
+ if test "$cross_compiling" = yes; then
+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+ { (exit 1); exit 1; }; }
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+long longval () { return (long) (sizeof (int)); }
+unsigned long ulongval () { return (long) (sizeof (int)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ exit (1);
+ if (((long) (sizeof (int))) < 0)
+ {
+ long i = longval ();
+ if (i != ((long) (sizeof (int))))
+ exit (1);
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+ unsigned long i = ulongval ();
+ if (i != ((long) (sizeof (int))))
+ exit (1);
+ fprintf (f, "%lu\n", i);
+ }
+ exit (ferror (f) || fclose (f) != 0);
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_int=`cat conftest.val`
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (int), 77
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+rm -f conftest.val
+else
+ ac_cv_sizeof_int=0
+fi
fi
-echo "$ac_t""$ac_cv_sizeof_int" 1>&6
-cat >> confdefs.h <<EOF
+echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+echo "${ECHO_T}$ac_cv_sizeof_int" >&6
+cat >>confdefs.h <<_ACEOF
#define SIZEOF_INT $ac_cv_sizeof_int
-EOF
+_ACEOF
-echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:5588: checking size of long" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for long" >&5
+echo $ECHO_N "checking for long... $ECHO_C" >&6
+if test "${ac_cv_type_long+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if ((long *) 0)
+ return 0;
+if (sizeof (long))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_type_long=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_long=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+echo "${ECHO_T}$ac_cv_type_long" >&6
+
+echo "$as_me:$LINENO: checking size of long" >&5
+echo $ECHO_N "checking size of long... $ECHO_C" >&6
+if test "${ac_cv_sizeof_long+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test "$ac_cv_type_long" = yes; then
+ # The cast to unsigned long works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
if test "$cross_compiling" = yes; then
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
else
- cat > conftest.$ac_ext <<EOF
-#line 5596 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-#include <sys/types.h>
-main()
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
{
- FILE *f=fopen("conftestval", "w");
- if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(long));
- exit(0);
+static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
}
-EOF
-if { (eval echo configure:5608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
- ac_cv_sizeof_long=`cat conftestval`
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_lo=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
- ac_cv_sizeof_long=0
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo= ac_hi=
fi
-rm -fr conftest*
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=$ac_mid
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_long=$ac_lo;;
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (long), 77
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; } ;;
+esac
+else
+ if test "$cross_compiling" = yes; then
+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+ { (exit 1); exit 1; }; }
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+long longval () { return (long) (sizeof (long)); }
+unsigned long ulongval () { return (long) (sizeof (long)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ exit (1);
+ if (((long) (sizeof (long))) < 0)
+ {
+ long i = longval ();
+ if (i != ((long) (sizeof (long))))
+ exit (1);
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+ unsigned long i = ulongval ();
+ if (i != ((long) (sizeof (long))))
+ exit (1);
+ fprintf (f, "%lu\n", i);
+ }
+ exit (ferror (f) || fclose (f) != 0);
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_long=`cat conftest.val`
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (long), 77
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+rm -f conftest.val
+else
+ ac_cv_sizeof_long=0
fi
-echo "$ac_t""$ac_cv_sizeof_long" 1>&6
-cat >> confdefs.h <<EOF
+fi
+echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long" >&6
+cat >>confdefs.h <<_ACEOF
#define SIZEOF_LONG $ac_cv_sizeof_long
-EOF
+_ACEOF
-echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:5628: checking size of long long" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for long long" >&5
+echo $ECHO_N "checking for long long... $ECHO_C" >&6
+if test "${ac_cv_type_long_long+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if ((long long *) 0)
+ return 0;
+if (sizeof (long long))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_type_long_long=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_type_long_long=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
+echo "${ECHO_T}$ac_cv_type_long_long" >&6
+
+echo "$as_me:$LINENO: checking size of long long" >&5
+echo $ECHO_N "checking size of long long... $ECHO_C" >&6
+if test "${ac_cv_sizeof_long_long+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test "$ac_cv_type_long_long" = yes; then
+ # The cast to unsigned long works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
if test "$cross_compiling" = yes; then
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ # Depending upon the size, compute the lo and hi bounds.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_lo=0 ac_mid=0
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
else
- cat > conftest.$ac_ext <<EOF
-#line 5636 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-#include <sys/types.h>
-main()
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
{
- FILE *f=fopen("conftestval", "w");
- if (!f) exit(1);
- fprintf(f, "%d\n", sizeof(long long));
- exit(0);
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) < 0)];
+test_array [0] = 0
+
+ ;
+ return 0;
}
-EOF
-if { (eval echo configure:5648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
- ac_cv_sizeof_long_long=`cat conftestval`
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=-1 ac_mid=-1
+ while :; do
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) >= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_lo=$ac_mid; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_hi=`expr '(' $ac_mid ')' - 1`
+ if test $ac_mid -le $ac_hi; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
- ac_cv_sizeof_long_long=0
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo= ac_hi=
fi
-rm -fr conftest*
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+# Binary search between lo and hi bounds.
+while test "x$ac_lo" != "x$ac_hi"; do
+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long) (sizeof (long long))) <= $ac_mid)];
+test_array [0] = 0
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_hi=$ac_mid
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_lo=`expr '(' $ac_mid ')' + 1`
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+case $ac_lo in
+?*) ac_cv_sizeof_long_long=$ac_lo;;
+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (long long), 77
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; } ;;
+esac
+else
+ if test "$cross_compiling" = yes; then
+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5
+echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
+ { (exit 1); exit 1; }; }
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+long longval () { return (long) (sizeof (long long)); }
+unsigned long ulongval () { return (long) (sizeof (long long)); }
+#include <stdio.h>
+#include <stdlib.h>
+int
+main ()
+{
+
+ FILE *f = fopen ("conftest.val", "w");
+ if (! f)
+ exit (1);
+ if (((long) (sizeof (long long))) < 0)
+ {
+ long i = longval ();
+ if (i != ((long) (sizeof (long long))))
+ exit (1);
+ fprintf (f, "%ld\n", i);
+ }
+ else
+ {
+ unsigned long i = ulongval ();
+ if (i != ((long) (sizeof (long long))))
+ exit (1);
+ fprintf (f, "%lu\n", i);
+ }
+ exit (ferror (f) || fclose (f) != 0);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_sizeof_long_long=`cat conftest.val`
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long), 77
+See \`config.log' for more details." >&5
+echo "$as_me: error: cannot compute sizeof (long long), 77
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+rm -f conftest.val
+else
+ ac_cv_sizeof_long_long=0
+fi
fi
-echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
-cat >> confdefs.h <<EOF
+echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6
+cat >>confdefs.h <<_ACEOF
#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
-EOF
+_ACEOF
SIZEOF_SHORT=$ac_cv_sizeof_short
@@ -5671,63 +12951,179 @@ SIZEOF_LONG_LONG=$ac_cv_sizeof_long_long
-echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:5676: checking whether byte ordering is bigendian" >&5
-if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
+if test "${ac_cv_c_bigendian+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_cv_c_bigendian=unknown
-# See if sys/param.h defines the BYTE_ORDER macro.
-cat > conftest.$ac_ext <<EOF
-#line 5683 "configure"
-#include "confdefs.h"
+ # See if sys/param.h defines the BYTE_ORDER macro.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
-int main() {
+int
+main ()
+{
#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
bogus endian macros
#endif
-; return 0; }
-EOF
-if { (eval echo configure:5694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
# It does; now see whether it defined to BIG_ENDIAN or not.
-cat > conftest.$ac_ext <<EOF
-#line 5698 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
-int main() {
+int
+main ()
+{
#if BYTE_ORDER != BIG_ENDIAN
not big endian
#endif
-; return 0; }
-EOF
-if { (eval echo configure:5709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_c_bigendian=yes
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- ac_cv_c_bigendian=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_c_bigendian=no
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-if test $ac_cv_c_bigendian = unknown; then
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+# It does not; compile a test program.
if test "$cross_compiling" = yes; then
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ # try to guess the endianness by grepping values into an object file
+ ac_cv_c_bigendian=unknown
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
+short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+int
+main ()
+{
+ _ascii (); _ebcdic ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
+ ac_cv_c_bigendian=yes
+fi
+if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+ if test "$ac_cv_c_bigendian" = unknown; then
+ ac_cv_c_bigendian=no
+ else
+ # finding both strings is unlikely to happen, but who knows?
+ ac_cv_c_bigendian=unknown
+ fi
+fi
else
- cat > conftest.$ac_ext <<EOF
-#line 5729 "configure"
-#include "confdefs.h"
-main () {
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+int
+main ()
+{
/* Are we little or big endian? From Harbison&Steele. */
union
{
@@ -5737,374 +13133,739 @@ main () {
u.l = 1;
exit (u.c[sizeof (long) - 1] == 1);
}
-EOF
-if { (eval echo configure:5742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_c_bigendian=no
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -fr conftest*
- ac_cv_c_bigendian=yes
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+( exit $ac_status )
+ac_cv_c_bigendian=yes
fi
-rm -fr conftest*
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-
fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
+echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+echo "${ECHO_T}$ac_cv_c_bigendian" >&6
+case $ac_cv_c_bigendian in
+ yes)
-echo "$ac_t""$ac_cv_c_bigendian" 1>&6
-if test $ac_cv_c_bigendian = yes; then
- cat >> confdefs.h <<\EOF
+cat >>confdefs.h <<\_ACEOF
#define WORDS_BIGENDIAN 1
-EOF
+_ACEOF
+ ;;
+ no)
+ ;;
+ *)
+ { { echo "$as_me:$LINENO: error: unknown endianness
+presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+echo "$as_me: error: unknown endianness
+presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+ { (exit 1); exit 1; }; } ;;
+esac
-fi
-for ac_hdr in inttypes.h
+for ac_header in inttypes.h
do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5769: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 5774 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5779: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
fi
-rm -f conftest*
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
-
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to the AC_PACKAGE_NAME lists. ##
+## ------------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- echo "$ac_t""no" 1>&6
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
done
-echo $ac_n "checking for intptr_t""... $ac_c" 1>&6
-echo "configure:5806: checking for intptr_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_intptr_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 5811 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "(^|[^a-zA-Z_0-9])intptr_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
- rm -rf conftest*
+echo "$as_me:$LINENO: checking for intptr_t" >&5
+echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
+if test "${ac_cv_type_intptr_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+if ((intptr_t *) 0)
+ return 0;
+if (sizeof (intptr_t))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_type_intptr_t=yes
else
- rm -rf conftest*
- ac_cv_type_intptr_t=no
-fi
-rm -f conftest*
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ac_cv_type_intptr_t=no
fi
-echo "$ac_t""$ac_cv_type_intptr_t" 1>&6
-if test $ac_cv_type_intptr_t = no; then
- cat >> confdefs.h <<\EOF
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_intptr_t" >&5
+echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
+if test $ac_cv_type_intptr_t = yes; then
+ :
+else
+
+cat >>confdefs.h <<_ACEOF
#define intptr_t long
-EOF
+_ACEOF
fi
-echo $ac_n "checking whether struct stat has a st_flags field""... $ac_c" 1>&6
-echo "configure:5839: checking whether struct stat has a st_flags field" >&5
-if eval "test \"`echo '$''{'e2fsprogs_cv_struct_st_flags'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking whether struct stat has a st_flags field" >&5
+echo $ECHO_N "checking whether struct stat has a st_flags field... $ECHO_C" >&6
+if test "${e2fsprogs_cv_struct_st_flags+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat > conftest.$ac_ext <<EOF
-#line 5844 "configure"
-#include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#include <sys/stat.h>
-int main() {
+int
+main ()
+{
struct stat stat; stat.st_flags = 0;
-; return 0; }
-EOF
-if { (eval echo configure:5851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
e2fsprogs_cv_struct_st_flags=yes
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- e2fsprogs_cv_struct_st_flags=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+e2fsprogs_cv_struct_st_flags=no
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$ac_t""$e2fsprogs_cv_struct_st_flags" 1>&6
+echo "$as_me:$LINENO: result: $e2fsprogs_cv_struct_st_flags" >&5
+echo "${ECHO_T}$e2fsprogs_cv_struct_st_flags" >&6
if test "$e2fsprogs_cv_struct_st_flags" = yes; then
- echo $ac_n "checking whether st_flags field is useful""... $ac_c" 1>&6
-echo "configure:5866: checking whether st_flags field is useful" >&5
- if eval "test \"`echo '$''{'e2fsprogs_cv_struct_st_flags_immut'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 5871 "configure"
-#include "confdefs.h"
+ echo "$as_me:$LINENO: checking whether st_flags field is useful" >&5
+echo $ECHO_N "checking whether st_flags field is useful... $ECHO_C" >&6
+ if test "${e2fsprogs_cv_struct_st_flags_immut+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#include <sys/stat.h>
-int main() {
+int
+main ()
+{
struct stat stat; stat.st_flags |= UF_IMMUTABLE;
-; return 0; }
-EOF
-if { (eval echo configure:5878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
e2fsprogs_cv_struct_st_flags_immut=yes
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- e2fsprogs_cv_struct_st_flags_immut=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+e2fsprogs_cv_struct_st_flags_immut=no
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
- echo "$ac_t""$e2fsprogs_cv_struct_st_flags_immut" 1>&6
+ echo "$as_me:$LINENO: result: $e2fsprogs_cv_struct_st_flags_immut" >&5
+echo "${ECHO_T}$e2fsprogs_cv_struct_st_flags_immut" >&6
if test "$e2fsprogs_cv_struct_st_flags_immut" = yes; then
- cat >> confdefs.h <<\EOF
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_STAT_FLAGS 1
-EOF
+_ACEOF
fi
fi
-echo $ac_n "checking whether struct sockaddr contains sa_len""... $ac_c" 1>&6
-echo "configure:5899: checking whether struct sockaddr contains sa_len" >&5
-if eval "test \"`echo '$''{'e2fsprogs_cv_sockaddr_sa_len'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 5904 "configure"
-#include "confdefs.h"
+echo "$as_me:$LINENO: checking whether struct sockaddr contains sa_len" >&5
+echo $ECHO_N "checking whether struct sockaddr contains sa_len... $ECHO_C" >&6
+if test "${e2fsprogs_cv_sockaddr_sa_len+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#include <sys/types.h>
#include <sys/socket.h>
-int main() {
+int
+main ()
+{
struct sockaddr sa;
sa.sa_len;
-; return 0; }
-EOF
-if { (eval echo configure:5914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
e2fsprogs_cv_sockaddr_sa_len=yes
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- e2fsprogs_cv_sockaddr_sa_len=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+e2fsprogs_cv_sockaddr_sa_len=no
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-echo "$ac_t""$e2fsprogs_cv_sockaddr_sa_len" 1>&6
+echo "$as_me:$LINENO: result: $e2fsprogs_cv_sockaddr_sa_len" >&5
+echo "${ECHO_T}$e2fsprogs_cv_sockaddr_sa_len" >&6
if test $e2fsprogs_cv_sockaddr_sa_len = yes; then
- cat >> confdefs.h <<EOF
+
+cat >>confdefs.h <<_ACEOF
#define HAVE_SA_LEN 1
-EOF
+_ACEOF
fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
for ac_func in chflags getrusage llseek lseek64 open64 getmntinfo strtoull strcasecmp srandom fchown mallinfo fdatasync strnlen strptime sysconf pathconf posix_memalign memalign valloc
do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5936: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 5941 "configure"
-#include "confdefs.h"
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char $ac_func();
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
-int main() {
+#undef $ac_func
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-$ac_func();
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
#endif
-; return 0; }
-EOF
-if { (eval echo configure:5964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
+int
+main ()
+{
+return f != $ac_func;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_var=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
fi
done
SOCKET_LIB=''
-echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:5990: checking for socket in -lsocket" >&5
-ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
+echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
+if test "${ac_cv_lib_socket_socket+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_save_LIBS="$LIBS"
+ ac_check_lib_save_LIBS=$LIBS
LIBS="-lsocket $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 5998 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char socket();
-
-int main() {
-socket()
-; return 0; }
-EOF
-if { (eval echo configure:6009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
+ builtin and then its argument prototype would still apply. */
+char socket ();
+int
+main ()
+{
+socket ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_socket_socket=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_socket_socket=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
+echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
+if test $ac_cv_lib_socket_socket = yes; then
SOCKET_LIB=-lsocket
-else
- echo "$ac_t""no" 1>&6
fi
DLOPEN_LIB=''
-echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:6032: checking for dlopen in -ldl" >&5
-ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
+if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_save_LIBS="$LIBS"
+ ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 6040 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char dlopen();
-
-int main() {
-dlopen()
-; return 0; }
-EOF
-if { (eval echo configure:6051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
+ builtin and then its argument prototype would still apply. */
+char dlopen ();
+int
+main ()
+{
+dlopen ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_dl_dlopen=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dl_dlopen=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
+if test $ac_cv_lib_dl_dlopen = yes; then
DLOPEN_LIB=-ldl
-cat >> confdefs.h <<\EOF
+cat >>confdefs.h <<\_ACEOF
#define HAVE_DLOPEN 1
-EOF
+_ACEOF
-else
- echo "$ac_t""no" 1>&6
fi
-echo $ac_n "checking for optreset""... $ac_c" 1>&6
-echo "configure:6077: checking for optreset" >&5
-if eval "test \"`echo '$''{'ac_cv_have_optreset'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking for optreset" >&5
+echo $ECHO_N "checking for optreset... $ECHO_C" >&6
+if test "${ac_cv_have_optreset+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- cat > conftest.$ac_ext <<EOF
-#line 6082 "configure"
-#include "confdefs.h"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#include <unistd.h>
-EOF
+
+_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "optreset" >/dev/null 2>&1; then
- rm -rf conftest*
+ $EGREP "optreset" >/dev/null 2>&1; then
ac_cv_have_optreset=yes
else
- rm -rf conftest*
ac_cv_have_optreset=no
fi
rm -f conftest*
fi
-echo "$ac_t""$ac_cv_have_optreset" 1>&6
+echo "$as_me:$LINENO: result: $ac_cv_have_optreset" >&5
+echo "${ECHO_T}$ac_cv_have_optreset" >&6
if test $ac_cv_have_optreset = yes; then
- cat >> confdefs.h <<\EOF
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_OPTRESET 1
-EOF
+_ACEOF
fi
case "$host_os" in
linux*)
- cat >> confdefs.h <<\EOF
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_EXT2_IOCTLS 1
-EOF
+_ACEOF
;;
esac
@@ -6164,39 +13925,67 @@ fi
-echo $ac_n "checking whether linker accepts -static""... $ac_c" 1>&6
-echo "configure:6169: checking whether linker accepts -static" >&5
-if eval "test \"`echo '$''{'ac_cv_e2fsprogs_use_static'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
+echo "$as_me:$LINENO: checking whether linker accepts -static" >&5
+echo $ECHO_N "checking whether linker accepts -static... $ECHO_C" >&6
+if test "${ac_cv_e2fsprogs_use_static+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
SAVE_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -static"
-cat > conftest.$ac_ext <<EOF
-#line 6175 "configure"
-#include "confdefs.h"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
#include <stdio.h>
-int main() {
+int
+main ()
+{
fflush(stdout);
-; return 0; }
-EOF
-if { (eval echo configure:6182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
- rm -rf conftest*
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
ac_cv_e2fsprogs_use_static=yes
else
- echo "configure: failed program was:" >&5
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- ac_cv_e2fsprogs_use_static=no
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_e2fsprogs_use_static=no
fi
-rm -f conftest*
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$SAVE_LDFLAGS
fi
case "$host_os" in
solaris2.*)
- ac_cv_e2fsprogs_use_static=no
+ ac_cv_e2fsprogs_use_static=no
;;
esac
-echo "$ac_t""$ac_cv_e2fsprogs_use_static" 1>&6
+echo "$as_me:$LINENO: result: $ac_cv_e2fsprogs_use_static" >&5
+echo "${ECHO_T}$ac_cv_e2fsprogs_use_static" >&6
LDFLAG_STATIC=
if test $ac_cv_e2fsprogs_use_static = yes; then
LDFLAG_STATIC=-static
@@ -6205,9 +13994,9 @@ fi
case "$host_os" in
darwin*)
echo "Using Apple Darwin / GNU libintl workaround"
- cat >> confdefs.h <<\EOF
+ cat >>confdefs.h <<\_ACEOF
#define _INTL_REDIRECT_MACROS 1
-EOF
+_ACEOF
;;
esac
@@ -6242,375 +14031,1140 @@ for i in MCONFIG Makefile e2fsprogs.spec \
outlist="$outlist $i"
fi
done
-trap '' 1 2 15
-cat > confcache <<\EOF
+ ac_config_files="$ac_config_files $outlist"
+cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
-# scripts and configure runs. It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems. If it contains results you don't
+# want to keep, you may remove or edit it.
#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already. You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
#
-EOF
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
# So, don't put newlines in cache variables' values.
# Ultrix sh set writes to stderr and can't be redirected directly,
# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
- case `(ac_space=' '; set | grep ac_space) 2>&1` in
- *ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote substitution
- # turns \\\\ into \\, and sed turns \\ into \).
- sed -n \
- -e "s/'/'\\\\''/g" \
- -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
- ;;
- *)
- # `set' quotes correctly as required by POSIX, so do not add quotes.
- sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
- ;;
- esac >> confcache
-if cmp -s $cache_file confcache; then
- :
-else
+{
+ (set) 2>&1 |
+ case `(ac_space=' '; set | grep ac_space) 2>&1` in
+ *ac_space=\ *)
+ # `set' does not quote correctly, so add quotes (double-quote
+ # substitution turns \\\\ into \\, and sed turns \\ into \).
+ sed -n \
+ "s/'/'\\\\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+ ;;
+ *)
+ # `set' quotes correctly as required by POSIX, so do not add quotes.
+ sed -n \
+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ ;;
+ esac;
+} |
+ sed '
+ t clear
+ : clear
+ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+ t end
+ /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+ : end' >>confcache
+if diff $cache_file confcache >/dev/null 2>&1; then :; else
if test -w $cache_file; then
- echo "updating cache $cache_file"
- cat confcache > $cache_file
+ test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+ cat confcache >$cache_file
else
echo "not updating unwritable cache $cache_file"
fi
fi
rm -f confcache
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
test "x$prefix" = xNONE && prefix=$ac_default_prefix
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d'
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
+s/:*\$(srcdir):*/:/;
+s/:*\${srcdir}:*/:/;
+s/:*@srcdir@:*/:/;
+s/^\([^=]*=[ ]*\):*/\1/;
+s/:*$//;
+s/^[^=]*=[ ]*$//;
+}'
fi
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
# Transform confdefs.h into DEFS.
# Protect against shell expansion while executing Makefile rules.
# Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
-
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then we branch to the quote section. Otherwise,
+# look for a macro that doesn't take arguments.
+cat >confdef2opt.sed <<\_ACEOF
+t clear
+: clear
+s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g
+t quote
+s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g
+t quote
+d
+: quote
+s,[ `~#$^&*(){}\\|;'"<>?],\\&,g
+s,\[,\\&,g
+s,\],\\&,g
+s,\$,$$,g
+p
+_ACEOF
+# We use echo to avoid assuming a particular line-breaking character.
+# The extra dot is to prevent the shell from consuming trailing
+# line-breaks from the sub-command output. A line-break within
+# single-quotes doesn't work because, if this script is created in a
+# platform that uses two characters for line-breaks (e.g., DOS), tr
+# would break.
+ac_LF_and_DOT=`echo; echo .`
+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
+rm -f confdef2opt.sed
+
+
+ac_libobjs=
+ac_ltlibobjs=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+ # 1. Remove the extension, and $U if already installed.
+ ac_i=`echo "$ac_i" |
+ sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+ # 2. Add them.
+ ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+ ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
+LTLIBOBJS=$ac_ltlibobjs
+
+
+
+: ${CONFIG_STATUS=./config.status}
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF
+#! $SHELL
+# Generated by $as_me.
# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
+# configure, is in config.log if it exists.
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+SHELL=\${CONFIG_SHELL-$SHELL}
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+## --------------------- ##
+## M4sh Initialization. ##
+## --------------------- ##
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+ set -o posix
+fi
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# Support unset when possible.
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+ as_unset=unset
+else
+ as_unset=false
+fi
+
+
+# Work around bugs in pre-3.0 UWIN ksh.
+$as_unset ENV MAIL MAILPATH
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+for as_var in \
+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+ LC_TELEPHONE LC_TIME
+do
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ eval $as_var=C; export $as_var
+ else
+ $as_unset $as_var
+ fi
+done
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1; then
+ as_expr=expr
+else
+ as_expr=false
+fi
+
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+ as_basename=basename
+else
+ as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)$' \| \
+ . : '\(.\)' 2>/dev/null ||
+echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+ /^X\/\(\/\/\)$/{ s//\1/; q; }
+ /^X\/\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
+
+
+# PATH needs CR, and LINENO needs CR and PATH.
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
+fi
+
+
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+ test "x$as_lineno_3" = "x$as_lineno_2" || {
+ # Find who we are. Look in the path if we contain no path at all
+ # relative or not.
+ case $0 in
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+
+ ;;
+ esac
+ # We did not find ourselves, most probably we were run as `sh COMMAND'
+ # in which case we are not to be found in the path.
+ if test "x$as_myself" = x; then
+ as_myself=$0
+ fi
+ if test ! -f "$as_myself"; then
+ { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ case $CONFIG_SHELL in
+ '')
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
- case "\$ac_option" in
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for as_base in sh bash ksh sh5; do
+ case $as_dir in
+ /*)
+ if ("$as_dir/$as_base" -c '
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+ CONFIG_SHELL=$as_dir/$as_base
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+ fi;;
+ esac
+ done
+done
+;;
+ esac
+
+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+ # uniformly replaced by the line number. The first 'sed' inserts a
+ # line-number line before each line; the second 'sed' does the real
+ # work. The second script uses 'N' to pair each line-number line
+ # with the numbered line, and appends trailing '-' during
+ # substitution so that $LINENO is not a special case at line end.
+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
+ sed '=' <$as_myself |
+ sed '
+ N
+ s,$,-,
+ : loop
+ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+ t loop
+ s,-$,,
+ s,^['$as_cr_digits']*\n,,
+ ' >$as_me.lineno &&
+ chmod +x $as_me.lineno ||
+ { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+ { (exit 1); exit 1; }; }
+
+ # Don't try to exec as it changes $[0], causing all sort of problems
+ # (the dirname of $[0] is not the place where we might find the
+ # original and so on. Autoconf is especially sensible to this).
+ . ./$as_me.lineno
+ # Exit status is that of the last command.
+ exit
+}
+
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+ *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T=' ' ;;
+ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+ *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+ as_expr=expr
+else
+ as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+ # We could just check for DJGPP; but this test a) works b) is more generic
+ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+ if test -f conf$$.exe; then
+ # Don't use ln at all; we don't have any links
+ as_ln_s='cp -p'
+ else
+ as_ln_s='ln -s'
+ fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+else
+ as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+if mkdir -p . 2>/dev/null; then
+ as_mkdir_p=:
+else
+ test -d ./-p && rmdir ./-p
+ as_mkdir_p=false
+fi
+
+as_executable_p="test -f"
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" $as_nl"
+
+# CDPATH.
+$as_unset CDPATH
+
+exec 6>&1
+
+# Open the log real soon, to keep \$[0] and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling. Logging --version etc. is OK.
+exec 5>>config.log
+{
+ echo
+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+} >&5
+cat >&5 <<_CSEOF
+
+This file was extended by $as_me, which was
+generated by GNU Autoconf 2.59. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+ CONFIG_LINKS = $CONFIG_LINKS
+ CONFIG_COMMANDS = $CONFIG_COMMANDS
+ $ $0 $@
+
+_CSEOF
+echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+echo >&5
+_ACEOF
+
+# Files that config.status was made for.
+if test -n "$ac_config_files"; then
+ echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_headers"; then
+ echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_links"; then
+ echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+fi
+
+if test -n "$ac_config_commands"; then
+ echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+ac_cs_usage="\
+\`$as_me' instantiates files from templates according to the
+current configuration.
+
+Usage: $0 [OPTIONS] [FILE]...
+
+ -h, --help print this help, then exit
+ -V, --version print version number, then exit
+ -q, --quiet do not print progress messages
+ -d, --debug don't remove temporary files
+ --recheck update $as_me by reconfiguring in the same conditions
+ --file=FILE[:TEMPLATE]
+ instantiate the configuration file FILE
+
+Configuration files:
+$config_files
+
+Configuration commands:
+$config_commands
+
+Report bugs to <bug-autoconf@gnu.org>."
+_ACEOF
+
+cat >>$CONFIG_STATUS <<_ACEOF
+ac_cs_version="\\
+config.status
+configured by $0, generated by GNU Autoconf 2.59,
+ with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+
+Copyright (C) 2003 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+srcdir=$srcdir
+INSTALL="$INSTALL"
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+# If no file are specified by the user, then we need to provide default
+# value. By we need to know if files were specified by the user.
+ac_need_defaults=:
+while test $# != 0
+do
+ case $1 in
+ --*=*)
+ ac_option=`expr "x$1" : 'x\([^=]*\)='`
+ ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+ ac_shift=:
+ ;;
+ -*)
+ ac_option=$1
+ ac_optarg=$2
+ ac_shift=shift
+ ;;
+ *) # This is not an option, so the user has probably given explicit
+ # arguments.
+ ac_option=$1
+ ac_need_defaults=false;;
+ esac
+
+ case $ac_option in
+ # Handling of the options.
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
- exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
- -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
- echo "$CONFIG_STATUS generated by autoconf version 2.13"
- exit 0 ;;
- -help | --help | --hel | --he | --h)
- echo "\$ac_cs_usage"; exit 0 ;;
- *) echo "\$ac_cs_usage"; exit 1 ;;
+ ac_cs_recheck=: ;;
+ --version | --vers* | -V )
+ echo "$ac_cs_version"; exit 0 ;;
+ --he | --h)
+ # Conflict between --help and --header
+ { { echo "$as_me:$LINENO: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&5
+echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2;}
+ { (exit 1); exit 1; }; };;
+ --help | --hel | -h )
+ echo "$ac_cs_usage"; exit 0 ;;
+ --debug | --d* | -d )
+ debug=: ;;
+ --file | --fil | --fi | --f )
+ $ac_shift
+ CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+ ac_need_defaults=false;;
+ --header | --heade | --head | --hea )
+ $ac_shift
+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+ ac_need_defaults=false;;
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil | --si | --s)
+ ac_cs_silent=: ;;
+
+ # This is an error.
+ -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&5
+echo "$as_me: error: unrecognized option: $1
+Try \`$0 --help' for more information." >&2;}
+ { (exit 1); exit 1; }; } ;;
+
+ *) ac_config_targets="$ac_config_targets $1" ;;
+
esac
+ shift
done
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
+ac_configure_extra_args=
-trap 'rm -fr `echo "$outlist" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
+if $ac_cs_silent; then
+ exec 6>/dev/null
+ ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
+if \$ac_cs_recheck; then
+ echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+ exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+fi
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<_ACEOF
+#
+# INIT-COMMANDS section.
+#
+
+# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+ # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+ # from automake.
+ eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+ # Capture the value of LINGUAS because we need it to compute CATALOGS.
+ LINGUAS="${LINGUAS-%UNSET%}"
+
+
+_ACEOF
+
+
+
+cat >>$CONFIG_STATUS <<\_ACEOF
+for ac_config_target in $ac_config_targets
+do
+ case "$ac_config_target" in
+ # Handling of arguments.
+ "$outlist" ) CONFIG_FILES="$CONFIG_FILES $outlist" ;;
+ "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+done
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used. Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+ test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+ test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+fi
+
+# Have a temporary directory for convenience. Make it in the build tree
+# simply because there is no reason to put it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Create a temporary directory, and hook for its removal unless debugging.
+$debug ||
+{
+ trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+ trap '{ (exit 1); exit 1; }' 1 2 13 15
+}
+
+# Create a (secure) tmp directory for tmp files.
+
+{
+ tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+ test -n "$tmp" && test -d "$tmp"
+} ||
+{
+ tmp=./confstat$$-$RANDOM
+ (umask 077 && mkdir $tmp)
+} ||
+{
+ echo "$me: cannot create a temporary directory in ." >&2
+ { (exit 1); exit 1; }
+}
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<_ACEOF
+
+#
+# CONFIG_FILES section.
+#
+
+# No need to generate the scripts if there are no CONFIG_FILES.
+# This happens for instance when ./config.status config.h
+if test -n "\$CONFIG_FILES"; then
+ # Protect against being on the right side of a sed subst in config.status.
+ sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+ s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+s,@SHELL@,$SHELL,;t t
+s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
+s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+s,@exec_prefix@,$exec_prefix,;t t
+s,@prefix@,$prefix,;t t
+s,@program_transform_name@,$program_transform_name,;t t
+s,@bindir@,$bindir,;t t
+s,@sbindir@,$sbindir,;t t
+s,@libexecdir@,$libexecdir,;t t
+s,@datadir@,$datadir,;t t
+s,@sysconfdir@,$sysconfdir,;t t
+s,@sharedstatedir@,$sharedstatedir,;t t
+s,@localstatedir@,$localstatedir,;t t
+s,@libdir@,$libdir,;t t
+s,@includedir@,$includedir,;t t
+s,@oldincludedir@,$oldincludedir,;t t
+s,@infodir@,$infodir,;t t
+s,@mandir@,$mandir,;t t
+s,@build_alias@,$build_alias,;t t
+s,@host_alias@,$host_alias,;t t
+s,@target_alias@,$target_alias,;t t
+s,@DEFS@,$DEFS,;t t
+s,@ECHO_C@,$ECHO_C,;t t
+s,@ECHO_N@,$ECHO_N,;t t
+s,@ECHO_T@,$ECHO_T,;t t
+s,@LIBS@,$LIBS,;t t
+s,@E2FSPROGS_YEAR@,$E2FSPROGS_YEAR,;t t
+s,@E2FSPROGS_MONTH@,$E2FSPROGS_MONTH,;t t
+s,@E2FSPROGS_DAY@,$E2FSPROGS_DAY,;t t
+s,@E2FSPROGS_VERSION@,$E2FSPROGS_VERSION,;t t
+s,@build@,$build,;t t
+s,@build_cpu@,$build_cpu,;t t
+s,@build_vendor@,$build_vendor,;t t
+s,@build_os@,$build_os,;t t
+s,@host@,$host,;t t
+s,@host_cpu@,$host_cpu,;t t
+s,@host_vendor@,$host_vendor,;t t
+s,@host_os@,$host_os,;t t
+s,@CC@,$CC,;t t
+s,@CFLAGS@,$CFLAGS,;t t
+s,@LDFLAGS@,$LDFLAGS,;t t
+s,@CPPFLAGS@,$CPPFLAGS,;t t
+s,@ac_ct_CC@,$ac_ct_CC,;t t
+s,@EXEEXT@,$EXEEXT,;t t
+s,@OBJEXT@,$OBJEXT,;t t
+s,@LD@,$LD,;t t
+s,@CPP@,$CPP,;t t
+s,@EGREP@,$EGREP,;t t
+s,@LINUX_INCLUDE@,$LINUX_INCLUDE,;t t
+s,@HTREE_CMT@,$HTREE_CMT,;t t
+s,@HTREE_CLR_CMT@,$HTREE_CLR_CMT,;t t
+s,@ELF_CMT@,$ELF_CMT,;t t
+s,@BSDLIB_CMT@,$BSDLIB_CMT,;t t
+s,@PROFILE_CMT@,$PROFILE_CMT,;t t
+s,@CHECKER_CMT@,$CHECKER_CMT,;t t
+s,@LIB_EXT@,$LIB_EXT,;t t
+s,@STATIC_LIB_EXT@,$STATIC_LIB_EXT,;t t
+s,@PROFILED_LIB_EXT@,$PROFILED_LIB_EXT,;t t
+s,@SWAPFS_CMT@,$SWAPFS_CMT,;t t
+s,@DEBUGFS_CMT@,$DEBUGFS_CMT,;t t
+s,@IMAGER_CMT@,$IMAGER_CMT,;t t
+s,@RESIZER_CMT@,$RESIZER_CMT,;t t
+s,@E2FSCK_TYPE@,$E2FSCK_TYPE,;t t
+s,@FSCK_PROG@,$FSCK_PROG,;t t
+s,@FSCK_MAN@,$FSCK_MAN,;t t
+s,@E2INITRD_PROG@,$E2INITRD_PROG,;t t
+s,@E2INITRD_MAN@,$E2INITRD_MAN,;t t
+s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
+s,@PACKAGE@,$PACKAGE,;t t
+s,@VERSION@,$VERSION,;t t
+s,@SET_MAKE@,$SET_MAKE,;t t
+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
+s,@USE_NLS@,$USE_NLS,;t t
+s,@MSGFMT@,$MSGFMT,;t t
+s,@GMSGFMT@,$GMSGFMT,;t t
+s,@XGETTEXT@,$XGETTEXT,;t t
+s,@MSGMERGE@,$MSGMERGE,;t t
+s,@RANLIB@,$RANLIB,;t t
+s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+s,@ALLOCA@,$ALLOCA,;t t
+s,@GLIBC21@,$GLIBC21,;t t
+s,@HAVE_POSIX_PRINTF@,$HAVE_POSIX_PRINTF,;t t
+s,@HAVE_ASPRINTF@,$HAVE_ASPRINTF,;t t
+s,@HAVE_SNPRINTF@,$HAVE_SNPRINTF,;t t
+s,@HAVE_WPRINTF@,$HAVE_WPRINTF,;t t
+s,@LIBICONV@,$LIBICONV,;t t
+s,@LTLIBICONV@,$LTLIBICONV,;t t
+s,@INTLBISON@,$INTLBISON,;t t
+s,@BUILD_INCLUDED_LIBINTL@,$BUILD_INCLUDED_LIBINTL,;t t
+s,@USE_INCLUDED_LIBINTL@,$USE_INCLUDED_LIBINTL,;t t
+s,@CATOBJEXT@,$CATOBJEXT,;t t
+s,@DATADIRNAME@,$DATADIRNAME,;t t
+s,@INSTOBJEXT@,$INSTOBJEXT,;t t
+s,@GENCAT@,$GENCAT,;t t
+s,@INTLOBJS@,$INTLOBJS,;t t
+s,@INTL_LIBTOOL_SUFFIX_PREFIX@,$INTL_LIBTOOL_SUFFIX_PREFIX,;t t
+s,@INTLLIBS@,$INTLLIBS,;t t
+s,@LIBINTL@,$LIBINTL,;t t
+s,@LTLIBINTL@,$LTLIBINTL,;t t
+s,@POSUB@,$POSUB,;t t
+s,@BINARY_TYPE@,$BINARY_TYPE,;t t
+s,@LN@,$LN,;t t
+s,@LN_S@,$LN_S,;t t
+s,@MV@,$MV,;t t
+s,@CP@,$CP,;t t
+s,@RM@,$RM,;t t
+s,@CHMOD@,$CHMOD,;t t
+s,@AWK@,$AWK,;t t
+s,@SED@,$SED,;t t
+s,@PERL@,$PERL,;t t
+s,@LDCONFIG@,$LDCONFIG,;t t
+s,@AR@,$AR,;t t
+s,@ac_ct_AR@,$ac_ct_AR,;t t
+s,@STRIP@,$STRIP,;t t
+s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
+s,@BUILD_CC@,$BUILD_CC,;t t
+s,@SIZEOF_SHORT@,$SIZEOF_SHORT,;t t
+s,@SIZEOF_INT@,$SIZEOF_INT,;t t
+s,@SIZEOF_LONG@,$SIZEOF_LONG,;t t
+s,@SIZEOF_LONG_LONG@,$SIZEOF_LONG_LONG,;t t
+s,@SOCKET_LIB@,$SOCKET_LIB,;t t
+s,@DLOPEN_LIB@,$DLOPEN_LIB,;t t
+s,@LINUX_CMT@,$LINUX_CMT,;t t
+s,@CYGWIN_CMT@,$CYGWIN_CMT,;t t
+s,@UNIX_CMT@,$UNIX_CMT,;t t
+s,@root_prefix@,$root_prefix,;t t
+s,@root_bindir@,$root_bindir,;t t
+s,@root_sbindir@,$root_sbindir,;t t
+s,@root_libdir@,$root_libdir,;t t
+s,@root_sysconfdir@,$root_sysconfdir,;t t
+s,@LDFLAG_STATIC@,$LDFLAG_STATIC,;t t
+s,@SS_DIR@,$SS_DIR,;t t
+s,@ET_DIR@,$ET_DIR,;t t
+s,@DO_TEST_SUITE@,$DO_TEST_SUITE,;t t
+s,@INTL_FLAGS@,$INTL_FLAGS,;t t
+s,@LIBOBJS@,$LIBOBJS,;t t
+s,@LTLIBOBJS@,$LTLIBOBJS,;t t
/@MCONFIG@/r $MCONFIG
-s%@MCONFIG@%%g
-s%@E2FSPROGS_YEAR@%$E2FSPROGS_YEAR%g
-s%@E2FSPROGS_MONTH@%$E2FSPROGS_MONTH%g
-s%@E2FSPROGS_DAY@%$E2FSPROGS_DAY%g
-s%@E2FSPROGS_VERSION@%$E2FSPROGS_VERSION%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@CC@%$CC%g
-s%@LD@%$LD%g
-s%@CPP@%$CPP%g
-s%@LINUX_INCLUDE@%$LINUX_INCLUDE%g
-s%@HTREE_CMT@%$HTREE_CMT%g
-s%@HTREE_CLR_CMT@%$HTREE_CLR_CMT%g
-s%@ELF_CMT@%$ELF_CMT%g
+s,@MCONFIG@,,;t t
/@MAKEFILE_ELF@/r $MAKEFILE_ELF
-s%@MAKEFILE_ELF@%%g
-s%@BSDLIB_CMT@%$BSDLIB_CMT%g
+s,@MAKEFILE_ELF@,,;t t
/@MAKEFILE_BSDLIB@/r $MAKEFILE_BSDLIB
-s%@MAKEFILE_BSDLIB@%%g
-s%@PROFILE_CMT@%$PROFILE_CMT%g
+s,@MAKEFILE_BSDLIB@,,;t t
/@MAKEFILE_PROFILE@/r $MAKEFILE_PROFILE
-s%@MAKEFILE_PROFILE@%%g
-s%@CHECKER_CMT@%$CHECKER_CMT%g
+s,@MAKEFILE_PROFILE@,,;t t
/@MAKEFILE_CHECKER@/r $MAKEFILE_CHECKER
-s%@MAKEFILE_CHECKER@%%g
-s%@LIB_EXT@%$LIB_EXT%g
-s%@STATIC_LIB_EXT@%$STATIC_LIB_EXT%g
-s%@PROFILED_LIB_EXT@%$PROFILED_LIB_EXT%g
-s%@SWAPFS_CMT@%$SWAPFS_CMT%g
-s%@DEBUGFS_CMT@%$DEBUGFS_CMT%g
-s%@IMAGER_CMT@%$IMAGER_CMT%g
-s%@RESIZER_CMT@%$RESIZER_CMT%g
-s%@E2FSCK_TYPE@%$E2FSCK_TYPE%g
-s%@FSCK_PROG@%$FSCK_PROG%g
-s%@FSCK_MAN@%$FSCK_MAN%g
-s%@E2INITRD_PROG@%$E2INITRD_PROG%g
-s%@E2INITRD_MAN@%$E2INITRD_MAN%g
+s,@MAKEFILE_CHECKER@,,;t t
/@MAKEFILE_LIBRARY@/r $MAKEFILE_LIBRARY
-s%@MAKEFILE_LIBRARY@%%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g
-s%@MSGFMT@%$MSGFMT%g
-s%@GMSGFMT@%$GMSGFMT%g
-s%@XGETTEXT@%$XGETTEXT%g
-s%@MSGMERGE@%$MSGMERGE%g
-s%@RANLIB@%$RANLIB%g
-s%@ALLOCA@%$ALLOCA%g
-s%@GLIBC21@%$GLIBC21%g
-s%@LIBICONV@%$LIBICONV%g
-s%@LTLIBICONV@%$LTLIBICONV%g
-s%@INTLBISON@%$INTLBISON%g
-s%@USE_NLS@%$USE_NLS%g
-s%@BUILD_INCLUDED_LIBINTL@%$BUILD_INCLUDED_LIBINTL%g
-s%@USE_INCLUDED_LIBINTL@%$USE_INCLUDED_LIBINTL%g
-s%@CATOBJEXT@%$CATOBJEXT%g
-s%@INTLOBJS@%$INTLOBJS%g
-s%@DATADIRNAME@%$DATADIRNAME%g
-s%@INSTOBJEXT@%$INSTOBJEXT%g
-s%@GENCAT@%$GENCAT%g
-s%@INTL_LIBTOOL_SUFFIX_PREFIX@%$INTL_LIBTOOL_SUFFIX_PREFIX%g
-s%@INTLLIBS@%$INTLLIBS%g
-s%@LIBINTL@%$LIBINTL%g
-s%@LTLIBINTL@%$LTLIBINTL%g
-s%@POSUB@%$POSUB%g
-s%@BINARY_TYPE@%$BINARY_TYPE%g
-s%@LN@%$LN%g
-s%@LN_S@%$LN_S%g
-s%@MV@%$MV%g
-s%@CP@%$CP%g
-s%@RM@%$RM%g
-s%@CHMOD@%$CHMOD%g
-s%@AWK@%$AWK%g
-s%@SED@%$SED%g
-s%@PERL@%$PERL%g
-s%@LDCONFIG@%$LDCONFIG%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@AR@%$AR%g
-s%@STRIP@%$STRIP%g
-s%@BUILD_CC@%$BUILD_CC%g
-s%@SIZEOF_SHORT@%$SIZEOF_SHORT%g
-s%@SIZEOF_INT@%$SIZEOF_INT%g
-s%@SIZEOF_LONG@%$SIZEOF_LONG%g
-s%@SIZEOF_LONG_LONG@%$SIZEOF_LONG_LONG%g
-s%@SOCKET_LIB@%$SOCKET_LIB%g
-s%@DLOPEN_LIB@%$DLOPEN_LIB%g
-s%@LINUX_CMT@%$LINUX_CMT%g
-s%@CYGWIN_CMT@%$CYGWIN_CMT%g
-s%@UNIX_CMT@%$UNIX_CMT%g
-s%@root_prefix@%$root_prefix%g
-s%@root_bindir@%$root_bindir%g
-s%@root_sbindir@%$root_sbindir%g
-s%@root_libdir@%$root_libdir%g
-s%@root_sysconfdir@%$root_sysconfdir%g
-s%@LDFLAG_STATIC@%$LDFLAG_STATIC%g
-s%@SS_DIR@%$SS_DIR%g
-s%@ET_DIR@%$ET_DIR%g
-s%@DO_TEST_SUITE@%$DO_TEST_SUITE%g
-s%@INTL_FLAGS@%$INTL_FLAGS%g
-
+s,@MAKEFILE_LIBRARY@,,;t t
CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
- if test $ac_beg -gt 1; then
- sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
- else
- sed "${ac_end}q" conftest.subs > conftest.s$ac_file
- fi
- if test ! -s conftest.s$ac_file; then
- ac_more_lines=false
- rm -f conftest.s$ac_file
- else
- if test -z "$ac_sed_cmds"; then
- ac_sed_cmds="sed -f conftest.s$ac_file"
+
+_ACEOF
+
+ cat >>$CONFIG_STATUS <<\_ACEOF
+ # Split the substitutions into bite-sized pieces for seds with
+ # small command number limits, like on Digital OSF/1 and HP-UX.
+ ac_max_sed_lines=48
+ ac_sed_frag=1 # Number of current file.
+ ac_beg=1 # First line for current file.
+ ac_end=$ac_max_sed_lines # Line after last line for current file.
+ ac_more_lines=:
+ ac_sed_cmds=
+ while $ac_more_lines; do
+ if test $ac_beg -gt 1; then
+ sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
else
- ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
+ sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
fi
- ac_file=`expr $ac_file + 1`
- ac_beg=$ac_end
- ac_end=`expr $ac_end + $ac_max_sed_cmds`
+ if test ! -s $tmp/subs.frag; then
+ ac_more_lines=false
+ else
+ # The purpose of the label and of the branching condition is to
+ # speed up the sed processing (if there are no `@' at all, there
+ # is no need to browse any of the substitutions).
+ # These are the two extra sed commands mentioned above.
+ (echo ':t
+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+ if test -z "$ac_sed_cmds"; then
+ ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+ else
+ ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+ fi
+ ac_sed_frag=`expr $ac_sed_frag + 1`
+ ac_beg=$ac_end
+ ac_end=`expr $ac_end + $ac_max_sed_lines`
+ fi
+ done
+ if test -z "$ac_sed_cmds"; then
+ ac_sed_cmds=cat
fi
-done
-if test -z "$ac_sed_cmds"; then
- ac_sed_cmds=cat
+fi # test -n "$CONFIG_FILES"
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+ case $ac_file in
+ - | *:- | *:-:* ) # input from stdin
+ cat >$tmp/stdin
+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+ *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+ * ) ac_file_in=$ac_file.in ;;
+ esac
+
+ # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+ ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$ac_file" : 'X\(//\)[^/]' \| \
+ X"$ac_file" : 'X\(//\)$' \| \
+ X"$ac_file" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
+echo X"$ac_file" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+ /^X\(\/\/\)$/{ s//\1/; q; }
+ /^X\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
+ { if $as_mkdir_p; then
+ mkdir -p "$ac_dir"
+ else
+ as_dir="$ac_dir"
+ as_dirs=
+ while test ! -d "$as_dir"; do
+ as_dirs="$as_dir $as_dirs"
+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+ /^X\(\/\/\)$/{ s//\1/; q; }
+ /^X\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
+ done
+ test ! -n "$as_dirs" || mkdir $as_dirs
+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+ { (exit 1); exit 1; }; }; }
+
+ ac_builddir=.
+
+if test "$ac_dir" != .; then
+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ # A "../" for each directory in $ac_dir_suffix.
+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+ ac_dir_suffix= ac_top_builddir=
fi
-EOF
-cat >> $CONFIG_STATUS <<EOF
+case $srcdir in
+ .) # No --srcdir option. We are building in place.
+ ac_srcdir=.
+ if test -z "$ac_top_builddir"; then
+ ac_top_srcdir=.
+ else
+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+ fi ;;
+ [\\/]* | ?:[\\/]* ) # Absolute path.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+ ac_top_srcdir=$srcdir ;;
+ *) # Relative path.
+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+ case "$ac_dir" in
+ .) ac_abs_builddir=`pwd`;;
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+ case ${ac_top_builddir}. in
+ .) ac_abs_top_builddir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+ case $ac_srcdir in
+ .) ac_abs_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+ case $ac_top_srcdir in
+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+ esac;;
+esac
-CONFIG_FILES=\${CONFIG_FILES-"$outlist"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
- case "$ac_file" in
- *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
- ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
- *) ac_file_in="${ac_file}.in" ;;
+
+ case $INSTALL in
+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+ *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
- # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
+ # use $as_me), people would be surprised to read:
+ # /* config.h. Generated by config.status. */
+ if test x"$ac_file" = x-; then
+ configure_input=
+ else
+ configure_input="$ac_file. "
+ fi
+ configure_input=$configure_input"Generated from `echo $ac_file_in |
+ sed 's,.*/,,'` by configure."
+
+ # First look for the input files in the build tree, otherwise in the
+ # src tree.
+ ac_file_inputs=`IFS=:
+ for f in $ac_file_in; do
+ case $f in
+ -) echo $tmp/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo "$f";;
+ *) # Relative
+ if test -f "$f"; then
+ # Build tree
+ echo "$f"
+ elif test -f "$srcdir/$f"; then
+ # Source tree
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+ esac
+ done` || { (exit 1); exit 1; }
- # Remove last slash and all that follows it. Not all systems have dirname.
- ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
- if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
- # The file is in a subdirectory.
- test ! -d "$ac_dir" && mkdir "$ac_dir"
- ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
- # A "../" for each directory in $ac_dir_suffix.
- ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
+ if test x"$ac_file" != x-; then
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF
+ sed "$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s,@configure_input@,$configure_input,;t t
+s,@srcdir@,$ac_srcdir,;t t
+s,@abs_srcdir@,$ac_abs_srcdir,;t t
+s,@top_srcdir@,$ac_top_srcdir,;t t
+s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
+s,@builddir@,$ac_builddir,;t t
+s,@abs_builddir@,$ac_abs_builddir,;t t
+s,@top_builddir@,$ac_top_builddir,;t t
+s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
+s,@INSTALL@,$ac_INSTALL,;t t
+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+ rm -f $tmp/stdin
+ if test x"$ac_file" != x-; then
+ mv $tmp/out $ac_file
else
- ac_dir_suffix= ac_dots=
+ cat $tmp/out
+ rm -f $tmp/out
fi
- case "$ac_given_srcdir" in
- .) srcdir=.
- if test -z "$ac_dots"; then top_srcdir=.
- else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
- /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
- *) # Relative path.
- srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
- top_srcdir="$ac_dots$ac_given_srcdir" ;;
- esac
+done
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF
- case "$ac_given_INSTALL" in
- [/$]*) INSTALL="$ac_given_INSTALL" ;;
- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
- esac
+#
+# CONFIG_COMMANDS section.
+#
+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+ ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+ ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+ ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
+$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$ac_dest" : 'X\(//\)[^/]' \| \
+ X"$ac_dest" : 'X\(//\)$' \| \
+ X"$ac_dest" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
+echo X"$ac_dest" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+ /^X\(\/\/\)$/{ s//\1/; q; }
+ /^X\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
+ { if $as_mkdir_p; then
+ mkdir -p "$ac_dir"
+ else
+ as_dir="$ac_dir"
+ as_dirs=
+ while test ! -d "$as_dir"; do
+ as_dirs="$as_dir $as_dirs"
+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+ /^X\(\/\/\)$/{ s//\1/; q; }
+ /^X\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
+ done
+ test ! -n "$as_dirs" || mkdir $as_dirs
+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+ { (exit 1); exit 1; }; }; }
- echo creating "$ac_file"
- rm -f "$ac_file"
- configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
- case "$ac_file" in
- *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
- *) ac_comsub= ;;
- esac
+ ac_builddir=.
- ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
- sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-# Capture the value of obsolete ALL_LINGUAS because we need it to compute
- # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
- # from automake.
- eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
- # Capture the value of LINGUAS because we need it to compute CATALOGS.
- LINGUAS="${LINGUAS-%UNSET%}"
-
+if test "$ac_dir" != .; then
+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ # A "../" for each directory in $ac_dir_suffix.
+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+ ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+ .) # No --srcdir option. We are building in place.
+ ac_srcdir=.
+ if test -z "$ac_top_builddir"; then
+ ac_top_srcdir=.
+ else
+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+ fi ;;
+ [\\/]* | ?:[\\/]* ) # Absolute path.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+ ac_top_srcdir=$srcdir ;;
+ *) # Relative path.
+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+ case "$ac_dir" in
+ .) ac_abs_builddir=`pwd`;;
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+ case ${ac_top_builddir}. in
+ .) ac_abs_top_builddir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+ case $ac_srcdir in
+ .) ac_abs_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+ case $ac_top_srcdir in
+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+ esac;;
+esac
-EOF
-cat >> $CONFIG_STATUS <<\EOF
+ { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
+echo "$as_me: executing $ac_dest commands" >&6;}
+ case $ac_dest in
+ default-1 )
for ac_file in $CONFIG_FILES; do
# Support "outfile[:infile[:infile...]]"
case "$ac_file" in
@@ -6634,31 +15188,44 @@ cat >> $CONFIG_STATUS <<\EOF
rm -f "$ac_dir/POTFILES"
test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
- # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
+ POMAKEFILEDEPS="POTFILES.in"
+ # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
# on $ac_dir but don't depend on user-specified configuration
# parameters.
if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
# The LINGUAS file contains the set of available languages.
- if test -n "$ALL_LINGUAS"; then
+ if test -n "$OBSOLETE_ALL_LINGUAS"; then
test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
fi
ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
# Hide the ALL_LINGUAS assigment from automake.
eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+ POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+ else
+ # The set of available languages was given in configure.in.
+ eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
fi
+ # Compute POFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+ # Compute UPDATEPOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+ # Compute DUMMYPOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+ # Compute GMOFILES
+ # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
case "$ac_given_srcdir" in
.) srcdirpre= ;;
*) srcdirpre='$(srcdir)/' ;;
esac
POFILES=
- GMOFILES=
UPDATEPOFILES=
DUMMYPOFILES=
+ GMOFILES=
for lang in $ALL_LINGUAS; do
POFILES="$POFILES $srcdirpre$lang.po"
- GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+ GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
done
# CATALOGS depends on both $ac_dir and the user's LINGUAS
# environment variable.
@@ -6693,7 +15260,7 @@ cat >> $CONFIG_STATUS <<\EOF
done
fi
test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
- sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+ sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
if test -f "$f"; then
case "$f" in
@@ -6705,11 +15272,37 @@ cat >> $CONFIG_STATUS <<\EOF
fi
;;
esac
- done
+ done ;;
+ esac
+done
+_ACEOF
-exit 0
-EOF
+cat >>$CONFIG_STATUS <<\_ACEOF
+
+{ (exit 0); exit 0; }
+_ACEOF
chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+ac_clean_files=$ac_clean_files_save
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded. So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status. When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+ ac_cs_success=:
+ ac_config_status_args=
+ test "$silent" = yes &&
+ ac_config_status_args="$ac_config_status_args --quiet"
+ exec 5>/dev/null
+ $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+ exec 5>>config.log
+ # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+ # would make configure fail if this is the last instruction.
+ $ac_cs_success || { (exit 1); exit 1; }
+fi
diff --git a/configure.in b/configure.in
index 5e536a39..180b092c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,6 @@
AC_INIT(version.h)
-AC_PREREQ(2.12)
+AC_PREREQ(2.50)
+AC_CONFIG_AUX_DIR(config)
MCONFIG=./MCONFIG
AC_SUBST_FILE(MCONFIG)
BINARY_TYPE=bin
@@ -502,10 +503,13 @@ echo "Using standard bitmask operations by default"
dnl
dnl Add internationalization support, using gettext.
dnl
+GETTEXT_PACKAGE=e2fsprogs
PACKAGE=e2fsprogs
VERSION="$E2FSPROGS_VERSION"
+VERSION=0.14.1
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
+AC_SUBST(GETTEXT_PACKAGE)
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 1510eb39..b7ff47f0 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -91,7 +91,8 @@ LTV_AGE=2
.SUFFIXES:
.SUFFIXES: .c .y .o .lo .sin .sed
.c.o:
- $(COMPILE) $<
+ @echo " CC $<"
+ @$(COMPILE) $<
.c.lo:
$(LIBTOOL) --mode=compile $(COMPILE) $<
@@ -112,9 +113,10 @@ all-no-yes: libgnuintl.$la
all-no-no:
libintl.a libgnuintl.a: $(OBJECTS)
- rm -f $@
- $(AR) cru $@ $(OBJECTS)
- $(RANLIB) $@
+ @echo " GEN_LIB $<"
+ @rm -f $@
+ @$(AR) cru $@ $(OBJECTS)
+ @$(RANLIB) $@
libintl.la libgnuintl.la: $(OBJECTS)
$(LIBTOOL) --mode=link \
diff --git a/intl/VERSION b/intl/VERSION
index acc8052f..b4b846ca 100644
--- a/intl/VERSION
+++ b/intl/VERSION
@@ -1 +1 @@
-GNU gettext library from gettext-0.11.5
+GNU gettext library from gettext-0.14.1
diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c
index d582ce11..dcdc4008 100644
--- a/intl/bindtextdom.c
+++ b/intl/bindtextdom.c
@@ -1,5 +1,5 @@
/* Implementation of the bindtextdomain(3) function
- Copyright (C) 1995-1998, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
@@ -58,6 +58,11 @@
/* Contains the default location of the message catalogs. */
extern const char _nl_default_dirname[];
+#ifdef _LIBC
+extern const char _nl_default_dirname_internal[] attribute_hidden;
+#else
+# define INTUSE(name) name
+#endif
/* List with bindings of specific domains. */
extern struct binding *_nl_domain_bindings;
@@ -81,11 +86,6 @@ __libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
# define BIND_TEXTDOMAIN_CODESET libintl_bind_textdomain_codeset
#endif
-/* Prototypes for local functions. */
-static void set_binding_values PARAMS ((const char *domainname,
- const char **dirnamep,
- const char **codesetp));
-
/* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP
to be used for the DOMAINNAME message catalog.
If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not
@@ -93,10 +93,8 @@ static void set_binding_values PARAMS ((const char *domainname,
If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither
modified nor returned. */
static void
-set_binding_values (domainname, dirnamep, codesetp)
- const char *domainname;
- const char **dirnamep;
- const char **codesetp;
+set_binding_values (const char *domainname,
+ const char **dirnamep, const char **codesetp)
{
struct binding *binding;
int modified;
@@ -146,8 +144,8 @@ set_binding_values (domainname, dirnamep, codesetp)
char *result = binding->dirname;
if (strcmp (dirname, result) != 0)
{
- if (strcmp (dirname, _nl_default_dirname) == 0)
- result = (char *) _nl_default_dirname;
+ if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0)
+ result = (char *) INTUSE(_nl_default_dirname);
else
{
#if defined _LIBC || defined HAVE_STRDUP
@@ -162,7 +160,7 @@ set_binding_values (domainname, dirnamep, codesetp)
if (__builtin_expect (result != NULL, 1))
{
- if (binding->dirname != _nl_default_dirname)
+ if (binding->dirname != INTUSE(_nl_default_dirname))
free (binding->dirname);
binding->dirname = result;
@@ -216,7 +214,7 @@ set_binding_values (domainname, dirnamep, codesetp)
{
/* Simply return the default values. */
if (dirnamep)
- *dirnamep = _nl_default_dirname;
+ *dirnamep = INTUSE(_nl_default_dirname);
if (codesetp)
*codesetp = NULL;
}
@@ -238,11 +236,11 @@ set_binding_values (domainname, dirnamep, codesetp)
if (dirname == NULL)
/* The default value. */
- dirname = _nl_default_dirname;
+ dirname = INTUSE(_nl_default_dirname);
else
{
- if (strcmp (dirname, _nl_default_dirname) == 0)
- dirname = _nl_default_dirname;
+ if (strcmp (dirname, INTUSE(_nl_default_dirname)) == 0)
+ dirname = INTUSE(_nl_default_dirname);
else
{
char *result;
@@ -265,7 +263,7 @@ set_binding_values (domainname, dirnamep, codesetp)
}
else
/* The default value. */
- new_binding->dirname = (char *) _nl_default_dirname;
+ new_binding->dirname = (char *) INTUSE(_nl_default_dirname);
new_binding->codeset_cntr = 0;
@@ -321,7 +319,7 @@ set_binding_values (domainname, dirnamep, codesetp)
if (0)
{
failed_codeset:
- if (new_binding->dirname != _nl_default_dirname)
+ if (new_binding->dirname != INTUSE(_nl_default_dirname))
free (new_binding->dirname);
failed_dirname:
free (new_binding);
@@ -343,9 +341,7 @@ set_binding_values (domainname, dirnamep, codesetp)
/* Specify that the DOMAINNAME message catalog will be found
in DIRNAME rather than in the system locale data base. */
char *
-BINDTEXTDOMAIN (domainname, dirname)
- const char *domainname;
- const char *dirname;
+BINDTEXTDOMAIN (const char *domainname, const char *dirname)
{
set_binding_values (domainname, &dirname, NULL);
return (char *) dirname;
@@ -354,9 +350,7 @@ BINDTEXTDOMAIN (domainname, dirname)
/* Specify the character encoding in which the messages from the
DOMAINNAME message catalog will be returned. */
char *
-BIND_TEXTDOMAIN_CODESET (domainname, codeset)
- const char *domainname;
- const char *codeset;
+BIND_TEXTDOMAIN_CODESET (const char *domainname, const char *codeset)
{
set_binding_values (domainname, NULL, &codeset);
return (char *) codeset;
diff --git a/intl/config.charset b/intl/config.charset
index 4f98b5b0..43d45fb7 100644
--- a/intl/config.charset
+++ b/intl/config.charset
@@ -1,7 +1,7 @@
#! /bin/sh
# Output a system dependent table of character encoding aliases.
#
-# Copyright (C) 2000-2002 Free Software Foundation, Inc.
+# Copyright (C) 2000-2004 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU Library General Public License as published
@@ -30,77 +30,77 @@
# MIME charset name is preferred.
# The current list of GNU canonical charset names is as follows.
#
-# name used by which systems a MIME name?
-# ASCII, ANSI_X3.4-1968 glibc solaris freebsd
-# ISO-8859-1 glibc aix hpux irix osf solaris freebsd yes
-# ISO-8859-2 glibc aix hpux irix osf solaris freebsd yes
-# ISO-8859-3 glibc solaris yes
-# ISO-8859-4 osf solaris freebsd yes
-# ISO-8859-5 glibc aix hpux irix osf solaris freebsd yes
-# ISO-8859-6 glibc aix hpux solaris yes
-# ISO-8859-7 glibc aix hpux irix osf solaris yes
-# ISO-8859-8 glibc aix hpux osf solaris yes
-# ISO-8859-9 glibc aix hpux irix osf solaris yes
-# ISO-8859-13 glibc
-# ISO-8859-14 glibc
-# ISO-8859-15 glibc aix osf solaris freebsd
-# KOI8-R glibc solaris freebsd yes
-# KOI8-U glibc freebsd yes
-# KOI8-T glibc
-# CP437 dos
-# CP775 dos
-# CP850 aix osf dos
-# CP852 dos
-# CP855 dos
-# CP856 aix
-# CP857 dos
-# CP861 dos
-# CP862 dos
-# CP864 dos
-# CP865 dos
-# CP866 freebsd dos
-# CP869 dos
-# CP874 woe32 dos
-# CP922 aix
-# CP932 aix woe32 dos
-# CP943 aix
-# CP949 osf woe32 dos
-# CP950 woe32 dos
-# CP1046 aix
-# CP1124 aix
-# CP1125 dos
-# CP1129 aix
-# CP1250 woe32
-# CP1251 glibc woe32
-# CP1252 aix woe32
-# CP1253 woe32
-# CP1254 woe32
-# CP1255 glibc woe32
-# CP1256 woe32
-# CP1257 woe32
-# GB2312 glibc aix hpux irix solaris freebsd yes
-# EUC-JP glibc aix hpux irix osf solaris freebsd yes
-# EUC-KR glibc aix hpux irix osf solaris freebsd yes
-# EUC-TW glibc aix hpux irix osf solaris
-# BIG5 glibc aix hpux osf solaris freebsd yes
-# BIG5-HKSCS glibc solaris
-# GBK glibc aix osf solaris woe32 dos
-# GB18030 glibc solaris
-# SHIFT_JIS hpux osf solaris freebsd yes
-# JOHAB glibc solaris woe32
-# TIS-620 glibc aix hpux osf solaris
-# VISCII glibc yes
-# TCVN5712-1 glibc
-# GEORGIAN-PS glibc
-# HP-ROMAN8 hpux
-# HP-ARABIC8 hpux
-# HP-GREEK8 hpux
-# HP-HEBREW8 hpux
-# HP-TURKISH8 hpux
-# HP-KANA8 hpux
-# DEC-KANJI osf
-# DEC-HANYU osf
-# UTF-8 glibc aix hpux osf solaris yes
+# name MIME? used by which systems
+# ASCII, ANSI_X3.4-1968 glibc solaris freebsd darwin
+# ISO-8859-1 Y glibc aix hpux irix osf solaris freebsd darwin
+# ISO-8859-2 Y glibc aix hpux irix osf solaris freebsd darwin
+# ISO-8859-3 Y glibc solaris
+# ISO-8859-4 Y osf solaris freebsd darwin
+# ISO-8859-5 Y glibc aix hpux irix osf solaris freebsd darwin
+# ISO-8859-6 Y glibc aix hpux solaris
+# ISO-8859-7 Y glibc aix hpux irix osf solaris
+# ISO-8859-8 Y glibc aix hpux osf solaris
+# ISO-8859-9 Y glibc aix hpux irix osf solaris
+# ISO-8859-13 glibc
+# ISO-8859-14 glibc
+# ISO-8859-15 glibc aix osf solaris freebsd
+# KOI8-R Y glibc solaris freebsd darwin
+# KOI8-U Y glibc freebsd darwin
+# KOI8-T glibc
+# CP437 dos
+# CP775 dos
+# CP850 aix osf dos
+# CP852 dos
+# CP855 dos
+# CP856 aix
+# CP857 dos
+# CP861 dos
+# CP862 dos
+# CP864 dos
+# CP865 dos
+# CP866 freebsd darwin dos
+# CP869 dos
+# CP874 woe32 dos
+# CP922 aix
+# CP932 aix woe32 dos
+# CP943 aix
+# CP949 osf woe32 dos
+# CP950 woe32 dos
+# CP1046 aix
+# CP1124 aix
+# CP1125 dos
+# CP1129 aix
+# CP1250 woe32
+# CP1251 glibc solaris darwin woe32
+# CP1252 aix woe32
+# CP1253 woe32
+# CP1254 woe32
+# CP1255 glibc woe32
+# CP1256 woe32
+# CP1257 woe32
+# GB2312 Y glibc aix hpux irix solaris freebsd darwin
+# EUC-JP Y glibc aix hpux irix osf solaris freebsd darwin
+# EUC-KR Y glibc aix hpux irix osf solaris freebsd darwin
+# EUC-TW glibc aix hpux irix osf solaris
+# BIG5 Y glibc aix hpux osf solaris freebsd darwin
+# BIG5-HKSCS glibc solaris
+# GBK glibc aix osf solaris woe32 dos
+# GB18030 glibc solaris
+# SHIFT_JIS Y hpux osf solaris freebsd darwin
+# JOHAB glibc solaris woe32
+# TIS-620 glibc aix hpux osf solaris
+# VISCII Y glibc
+# TCVN5712-1 glibc
+# GEORGIAN-PS glibc
+# HP-ROMAN8 hpux
+# HP-ARABIC8 hpux
+# HP-GREEK8 hpux
+# HP-HEBREW8 hpux
+# HP-TURKISH8 hpux
+# HP-KANA8 hpux
+# DEC-KANJI osf
+# DEC-HANYU osf
+# UTF-8 Y glibc aix hpux osf solaris
#
# Note: Names which are not marked as being a MIME name should not be used in
# Internet protocols for information interchange (mail, news, etc.).
@@ -121,6 +121,105 @@ echo "# It was automatically generated from config.charset."
# List of references, updated during installation:
echo "# Packages using this file: "
case "$os" in
+ linux-gnulibc1*)
+ # Linux libc5 doesn't have nl_langinfo(CODESET); therefore
+ # localcharset.c falls back to using the full locale name
+ # from the environment variables.
+ echo "C ASCII"
+ echo "POSIX ASCII"
+ for l in af af_ZA ca ca_ES da da_DK de de_AT de_BE de_CH de_DE de_LU \
+ en en_AU en_BW en_CA en_DK en_GB en_IE en_NZ en_US en_ZA \
+ en_ZW es es_AR es_BO es_CL es_CO es_DO es_EC es_ES es_GT \
+ es_HN es_MX es_PA es_PE es_PY es_SV es_US es_UY es_VE et \
+ et_EE eu eu_ES fi fi_FI fo fo_FO fr fr_BE fr_CA fr_CH fr_FR \
+ fr_LU ga ga_IE gl gl_ES id id_ID in in_ID is is_IS it it_CH \
+ it_IT kl kl_GL nl nl_BE nl_NL no no_NO pt pt_BR pt_PT sv \
+ sv_FI sv_SE; do
+ echo "$l ISO-8859-1"
+ echo "$l.iso-8859-1 ISO-8859-1"
+ echo "$l.iso-8859-15 ISO-8859-15"
+ echo "$l.iso-8859-15@euro ISO-8859-15"
+ echo "$l@euro ISO-8859-15"
+ echo "$l.cp-437 CP437"
+ echo "$l.cp-850 CP850"
+ echo "$l.cp-1252 CP1252"
+ echo "$l.cp-1252@euro CP1252"
+ #echo "$l.atari-st ATARI-ST" # not a commonly used encoding
+ echo "$l.utf-8 UTF-8"
+ echo "$l.utf-8@euro UTF-8"
+ done
+ for l in cs cs_CZ hr hr_HR hu hu_HU pl pl_PL ro ro_RO sk sk_SK sl \
+ sl_SI sr sr_CS sr_YU; do
+ echo "$l ISO-8859-2"
+ echo "$l.iso-8859-2 ISO-8859-2"
+ echo "$l.cp-852 CP852"
+ echo "$l.cp-1250 CP1250"
+ echo "$l.utf-8 UTF-8"
+ done
+ for l in mk mk_MK ru ru_RU; do
+ echo "$l ISO-8859-5"
+ echo "$l.iso-8859-5 ISO-8859-5"
+ echo "$l.koi8-r KOI8-R"
+ echo "$l.cp-866 CP866"
+ echo "$l.cp-1251 CP1251"
+ echo "$l.utf-8 UTF-8"
+ done
+ for l in ar ar_SA; do
+ echo "$l ISO-8859-6"
+ echo "$l.iso-8859-6 ISO-8859-6"
+ echo "$l.cp-864 CP864"
+ #echo "$l.cp-868 CP868" # not a commonly used encoding
+ echo "$l.cp-1256 CP1256"
+ echo "$l.utf-8 UTF-8"
+ done
+ for l in el el_GR gr gr_GR; do
+ echo "$l ISO-8859-7"
+ echo "$l.iso-8859-7 ISO-8859-7"
+ echo "$l.cp-869 CP869"
+ echo "$l.cp-1253 CP1253"
+ echo "$l.cp-1253@euro CP1253"
+ echo "$l.utf-8 UTF-8"
+ echo "$l.utf-8@euro UTF-8"
+ done
+ for l in he he_IL iw iw_IL; do
+ echo "$l ISO-8859-8"
+ echo "$l.iso-8859-8 ISO-8859-8"
+ echo "$l.cp-862 CP862"
+ echo "$l.cp-1255 CP1255"
+ echo "$l.utf-8 UTF-8"
+ done
+ for l in tr tr_TR; do
+ echo "$l ISO-8859-9"
+ echo "$l.iso-8859-9 ISO-8859-9"
+ echo "$l.cp-857 CP857"
+ echo "$l.cp-1254 CP1254"
+ echo "$l.utf-8 UTF-8"
+ done
+ for l in lt lt_LT lv lv_LV; do
+ #echo "$l BALTIC" # not a commonly used encoding, wrong encoding name
+ echo "$l ISO-8859-13"
+ done
+ for l in ru_UA uk uk_UA; do
+ echo "$l KOI8-U"
+ done
+ for l in zh zh_CN; do
+ #echo "$l GB_2312-80" # not a commonly used encoding, wrong encoding name
+ echo "$l GB2312"
+ done
+ for l in ja ja_JP ja_JP.EUC; do
+ echo "$l EUC-JP"
+ done
+ for l in ko ko_KR; do
+ echo "$l EUC-KR"
+ done
+ for l in th th_TH; do
+ echo "$l TIS-620"
+ done
+ for l in fa fa_IR; do
+ #echo "$l ISIRI-3342" # a broken encoding
+ echo "$l.utf-8 UTF-8"
+ done
+ ;;
linux* | *-gnu*)
# With glibc-2.1 or newer, we don't need any canonicalization,
# because glibc has iconv and both glibc and libiconv support all
@@ -231,6 +330,7 @@ case "$os" in
echo "ISO8859-9 ISO-8859-9"
echo "ISO8859-15 ISO-8859-15"
echo "koi8-r KOI8-R"
+ echo "ansi-1251 CP1251"
echo "BIG5 BIG5"
echo "Big5-HKSCS BIG5-HKSCS"
echo "gb2312 GB2312"
@@ -296,6 +396,47 @@ case "$os" in
echo "BIG5 BIG5"
echo "SJIS SHIFT_JIS"
;;
+ darwin*)
+ # Darwin 6.8 doesn't have nl_langinfo(CODESET); therefore
+ # localcharset.c falls back to using the full locale name
+ # from the environment variables.
+ echo "C ASCII"
+ for l in en_AU en_CA en_GB en_US la_LN; do
+ echo "$l.US-ASCII ASCII"
+ done
+ for l in da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES \
+ fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE \
+ nl_NL no_NO pt_PT sv_SE; do
+ echo "$l ISO-8859-1"
+ echo "$l.ISO8859-1 ISO-8859-1"
+ echo "$l.ISO8859-15 ISO-8859-15"
+ done
+ for l in la_LN; do
+ echo "$l.ISO8859-1 ISO-8859-1"
+ echo "$l.ISO8859-15 ISO-8859-15"
+ done
+ for l in cs_CZ hr_HR hu_HU la_LN pl_PL sl_SI; do
+ echo "$l.ISO8859-2 ISO-8859-2"
+ done
+ for l in la_LN lt_LT; do
+ echo "$l.ISO8859-4 ISO-8859-4"
+ done
+ for l in ru_RU; do
+ echo "$l.KOI8-R KOI8-R"
+ echo "$l.ISO8859-5 ISO-8859-5"
+ echo "$l.CP866 CP866"
+ done
+ for l in bg_BG; do
+ echo "$l.CP1251 CP1251"
+ done
+ echo "uk_UA.KOI8-U KOI8-U"
+ echo "zh_TW.BIG5 BIG5"
+ echo "zh_TW.Big5 BIG5"
+ echo "zh_CN.EUC GB2312"
+ echo "ja_JP.EUC EUC-JP"
+ echo "ja_JP.SJIS SHIFT_JIS"
+ echo "ko_KR.EUC EUC-KR"
+ ;;
beos*)
# BeOS has a single locale, and it has UTF-8 encoding.
echo "* UTF-8"
@@ -409,6 +550,7 @@ case "$os" in
echo "sq CP852"
echo "sq_AL CP852"
echo "sr CP852" # CP852 or CP866 or CP855 ??
+ echo "sr_CS CP852" # CP852 or CP866 or CP855 ??
echo "sr_YU CP852" # CP852 or CP866 or CP855 ??
# ISO-8859-3 languages
echo "mt CP850"
diff --git a/intl/dcgettext.c b/intl/dcgettext.c
index ca6a1c82..850acdee 100644
--- a/intl/dcgettext.c
+++ b/intl/dcgettext.c
@@ -1,5 +1,5 @@
/* Implementation of the dcgettext(3) function.
- Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
@@ -44,10 +44,7 @@
/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
locale. */
char *
-DCGETTEXT (domainname, msgid, category)
- const char *domainname;
- const char *msgid;
- int category;
+DCGETTEXT (const char *domainname, const char *msgid, int category)
{
return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category);
}
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index f2f01524..a4452f7a 100644
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -1,5 +1,5 @@
/* Implementation of the internal dcigettext function.
- Copyright (C) 1995-1999, 2000-2002 Free Software Foundation, Inc.
+ Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
@@ -33,14 +33,19 @@
# define alloca __builtin_alloca
# define HAVE_ALLOCA 1
#else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-# include <alloca.h>
+# ifdef _MSC_VER
+# include <malloc.h>
+# define alloca _alloca
# else
-# ifdef _AIX
- #pragma alloca
+# if defined HAVE_ALLOCA_H || defined _LIBC
+# include <alloca.h>
# else
-# ifndef alloca
+# ifdef _AIX
+ #pragma alloca
+# else
+# ifndef alloca
char *alloca ();
+# endif
# endif
# endif
# endif
@@ -143,13 +148,17 @@ extern int errno;
char *getwd ();
# define getcwd(buf, max) getwd (buf)
# else
+# if VMS
+# define getcwd(buf, max) (getcwd) (buf, max, 0)
+# else
char *getcwd ();
+# endif
# endif
# ifndef HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
+static char *stpcpy (char *dest, const char *src);
# endif
# ifndef HAVE_MEMPCPY
-static void *mempcpy PARAMS ((void *dest, const void *src, size_t n));
+static void *mempcpy (void *dest, const void *src, size_t n);
# endif
#endif
@@ -243,11 +252,8 @@ static void *root;
# endif
/* Function to compare two entries in the table of known translations. */
-static int transcmp PARAMS ((const void *p1, const void *p2));
static int
-transcmp (p1, p2)
- const void *p1;
- const void *p2;
+transcmp (const void *p1, const void *p2)
{
const struct known_translation_t *s1;
const struct known_translation_t *s2;
@@ -271,6 +277,13 @@ transcmp (p1, p2)
}
#endif
+#ifndef INTVARDEF
+# define INTVARDEF(name)
+#endif
+#ifndef INTUSE
+# define INTUSE(name) name
+#endif
+
/* Name of the default domain used for gettext(3) prior any call to
textdomain(3). The default value for this is "messages". */
const char _nl_default_default_domain[] attribute_hidden = "messages";
@@ -284,6 +297,7 @@ const char *_nl_current_default_domain attribute_hidden
extern const char _nl_default_dirname[];
#else
const char _nl_default_dirname[] = LOCALEDIR;
+INTVARDEF (_nl_default_dirname)
#endif
/* List with bindings of specific domains created by bindtextdomain()
@@ -291,15 +305,19 @@ const char _nl_default_dirname[] = LOCALEDIR;
struct binding *_nl_domain_bindings;
/* Prototypes for local functions. */
-static char *plural_lookup PARAMS ((struct loaded_l10nfile *domain,
- unsigned long int n,
- const char *translation,
- size_t translation_len))
+static char *plural_lookup (struct loaded_l10nfile *domain,
+ unsigned long int n,
+ const char *translation, size_t translation_len)
internal_function;
-static const char *category_to_name PARAMS ((int category)) internal_function;
-static const char *guess_category_value PARAMS ((int category,
- const char *categoryname))
+static const char *guess_category_value (int category,
+ const char *categoryname)
internal_function;
+#ifdef _LIBC
+# include "../locale/localeinfo.h"
+# define category_to_name(category) _nl_category_names[category]
+#else
+static const char *category_to_name (int category) internal_function;
+#endif
/* For those loosing systems which don't have `alloca' we have to add
@@ -406,13 +424,8 @@ static int enable_secure;
CATEGORY locale and, if PLURAL is nonzero, search over string
depending on the plural form determined by N. */
char *
-DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
- const char *domainname;
- const char *msgid1;
- const char *msgid2;
- int plural;
- unsigned long int n;
- int category;
+DCIGETTEXT (const char *domainname, const char *msgid1, const char *msgid2,
+ int plural, unsigned long int n, int category)
{
#ifndef HAVE_ALLOCA
struct block_list *block_list = NULL;
@@ -437,6 +450,15 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
if (msgid1 == NULL)
return NULL;
+#ifdef _LIBC
+ if (category < 0 || category >= __LC_LAST || category == LC_ALL)
+ /* Bogus. */
+ return (plural == 0
+ ? (char *) msgid1
+ /* Use the Germanic plural rule. */
+ : n == 1 ? (char *) msgid1 : (char *) msgid2);
+#endif
+
__libc_rwlock_rdlock (_nl_state_lock);
/* If DOMAINNAME is NULL, we are interested in the default domain. If
@@ -500,7 +522,7 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
}
if (binding == NULL)
- dirname = (char *) _nl_default_dirname;
+ dirname = (char *) INTUSE(_nl_default_dirname);
else if (IS_ABSOLUTE_PATH (binding->dirname))
dirname = binding->dirname;
else
@@ -528,17 +550,9 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
}
if (ret == NULL)
- {
- /* We cannot get the current working directory. Don't signal an
- error but simply return the default string. */
- FREE_BLOCKS (block_list);
- __libc_rwlock_unlock (_nl_state_lock);
- __set_errno (saved_errno);
- return (plural == 0
- ? (char *) msgid1
- /* Use the Germanic plural rule. */
- : n == 1 ? (char *) msgid1 : (char *) msgid2);
- }
+ /* We cannot get the current working directory. Don't signal an
+ error but simply return the default string. */
+ goto return_untranslated;
stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname);
}
@@ -595,16 +609,7 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
domain. Return the MSGID. */
if (strcmp (single_locale, "C") == 0
|| strcmp (single_locale, "POSIX") == 0)
- {
- FREE_BLOCKS (block_list);
- __libc_rwlock_unlock (_nl_state_lock);
- __set_errno (saved_errno);
- return (plural == 0
- ? (char *) msgid1
- /* Use the Germanic plural rule. */
- : n == 1 ? (char *) msgid1 : (char *) msgid2);
- }
-
+ break;
/* Find structure describing the message catalog matching the
DOMAINNAME and CATEGORY. */
@@ -636,7 +641,6 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
/* Found the translation of MSGID1 in domain DOMAIN:
starting at RETVAL, RETLEN bytes. */
FREE_BLOCKS (block_list);
- __set_errno (saved_errno);
#if defined HAVE_TSEARCH || defined _LIBC
if (foundp == NULL)
{
@@ -675,6 +679,8 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
(*foundp)->translation_length = retlen;
}
#endif
+ __set_errno (saved_errno);
+
/* Now deal with plural. */
if (plural)
retval = plural_lookup (domain, n, retval, retlen);
@@ -684,17 +690,39 @@ DCIGETTEXT (domainname, msgid1, msgid2, plural, n, category)
}
}
}
- /* NOTREACHED */
+
+ return_untranslated:
+ /* Return the untranslated MSGID. */
+ FREE_BLOCKS (block_list);
+ __libc_rwlock_unlock (_nl_state_lock);
+#if 0 /* Doesn't work with diet libc -- TYT */
+#ifndef _LIBC
+ if (!ENABLE_SECURE)
+ {
+ extern void _nl_log_untranslated (const char *logfilename,
+ const char *domainname,
+ const char *msgid1, const char *msgid2,
+ int plural);
+ const char *logfilename = getenv ("GETTEXT_LOG_UNTRANSLATED");
+
+ if (logfilename != NULL && logfilename[0] != '\0')
+ _nl_log_untranslated (logfilename, domainname, msgid1, msgid2, plural);
+ }
+#endif
+#endif
+ __set_errno (saved_errno);
+ return (plural == 0
+ ? (char *) msgid1
+ /* Use the Germanic plural rule. */
+ : n == 1 ? (char *) msgid1 : (char *) msgid2);
}
char *
internal_function
-_nl_find_msg (domain_file, domainbinding, msgid, lengthp)
- struct loaded_l10nfile *domain_file;
- struct binding *domainbinding;
- const char *msgid;
- size_t *lengthp;
+_nl_find_msg (struct loaded_l10nfile *domain_file,
+ struct binding *domainbinding, const char *msgid,
+ size_t *lengthp)
{
struct loaded_domain *domain;
nls_uint32 nstrings;
@@ -1001,11 +1029,8 @@ _nl_find_msg (domain_file, domainbinding, msgid, lengthp)
/* Look up a plural variant. */
static char *
internal_function
-plural_lookup (domain, n, translation, translation_len)
- struct loaded_l10nfile *domain;
- unsigned long int n;
- const char *translation;
- size_t translation_len;
+plural_lookup (struct loaded_l10nfile *domain, unsigned long int n,
+ const char *translation, size_t translation_len)
{
struct loaded_domain *domaindata = (struct loaded_domain *) domain->data;
unsigned long int index;
@@ -1038,12 +1063,11 @@ plural_lookup (domain, n, translation, translation_len)
return (char *) p;
}
-
+#ifndef _LIBC
/* Return string representation of locale CATEGORY. */
static const char *
internal_function
-category_to_name (category)
- int category;
+category_to_name (int category)
{
const char *retval;
@@ -1098,13 +1122,12 @@ category_to_name (category)
return retval;
}
+#endif
/* Guess value of current locale from value of the environment variables. */
static const char *
internal_function
-guess_category_value (category, categoryname)
- int category;
- const char *categoryname;
+guess_category_value (int category, const char *categoryname)
{
const char *language;
const char *retval;
@@ -1120,7 +1143,7 @@ guess_category_value (category, categoryname)
`LC_xxx', and `LANG'. On some systems this can be done by the
`setlocale' function itself. */
#ifdef _LIBC
- retval = setlocale (category, NULL);
+ retval = __current_locale_name (category);
#else
retval = _nl_locale_name (category, categoryname);
#endif
@@ -1145,9 +1168,7 @@ guess_category_value (category, categoryname)
to be defined. */
#if !_LIBC && !HAVE_STPCPY
static char *
-stpcpy (dest, src)
- char *dest;
- const char *src;
+stpcpy (char *dest, const char *src)
{
while ((*dest++ = *src++) != '\0')
/* Do nothing. */ ;
@@ -1157,10 +1178,7 @@ stpcpy (dest, src)
#if !_LIBC && !HAVE_MEMPCPY
static void *
-mempcpy (dest, src, n)
- void *dest;
- const void *src;
- size_t n;
+mempcpy (void *dest, const void *src, size_t n)
{
return (void *) ((char *) memcpy (dest, src, n) + n);
}
@@ -1170,8 +1188,7 @@ mempcpy (dest, src, n)
#ifdef _LIBC
/* If we want to free all resources we have to do some work at
program's end. */
-static void __attribute__ ((unused))
-free_mem (void)
+libc_freeres_fn (free_mem)
{
void *old;
@@ -1179,7 +1196,7 @@ free_mem (void)
{
struct binding *oldp = _nl_domain_bindings;
_nl_domain_bindings = _nl_domain_bindings->next;
- if (oldp->dirname != _nl_default_dirname)
+ if (oldp->dirname != INTUSE(_nl_default_dirname))
/* Yes, this is a pointer comparison. */
free (oldp->dirname);
free (oldp->codeset);
@@ -1201,6 +1218,4 @@ free_mem (void)
free (old);
}
}
-
-text_set_element (__libc_subfreeres, free_mem);
#endif
diff --git a/intl/dcngettext.c b/intl/dcngettext.c
index 17d9ce3e..48a3e09e 100644
--- a/intl/dcngettext.c
+++ b/intl/dcngettext.c
@@ -1,5 +1,5 @@
/* Implementation of the dcngettext(3) function.
- Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
@@ -44,18 +44,14 @@
/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
locale. */
char *
-DCNGETTEXT (domainname, msgid1, msgid2, n, category)
- const char *domainname;
- const char *msgid1;
- const char *msgid2;
- unsigned long int n;
- int category;
+DCNGETTEXT (const char *domainname,
+ const char *msgid1, const char *msgid2, unsigned long int n,
+ int category)
{
return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category);
}
#ifdef _LIBC
/* Alias for function name in GNU C Library. */
-INTDEF(__dcngettext)
weak_alias (__dcngettext, dcngettext);
#endif
diff --git a/intl/dgettext.c b/intl/dgettext.c
index cf5b4037..b64b0f5d 100644
--- a/intl/dgettext.c
+++ b/intl/dgettext.c
@@ -1,5 +1,5 @@
/* Implementation of the dgettext(3) function.
- Copyright (C) 1995-1997, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
@@ -20,9 +20,10 @@
# include <config.h>
#endif
+#include "gettextP.h"
+
#include <locale.h>
-#include "gettextP.h"
#ifdef _LIBC
# include <libintl.h>
#else
@@ -46,9 +47,7 @@
/* Look up MSGID in the DOMAINNAME message catalog of the current
LC_MESSAGES locale. */
char *
-DGETTEXT (domainname, msgid)
- const char *domainname;
- const char *msgid;
+DGETTEXT (const char *domainname, const char *msgid)
{
return DCGETTEXT (domainname, msgid, LC_MESSAGES);
}
diff --git a/intl/dngettext.c b/intl/dngettext.c
index 0afbd2e1..7815637f 100644
--- a/intl/dngettext.c
+++ b/intl/dngettext.c
@@ -1,5 +1,5 @@
/* Implementation of the dngettext(3) function.
- Copyright (C) 1995-1997, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
@@ -20,9 +20,10 @@
# include <config.h>
#endif
+#include "gettextP.h"
+
#include <locale.h>
-#include "gettextP.h"
#ifdef _LIBC
# include <libintl.h>
#else
@@ -37,7 +38,7 @@
prefix. So we have to make a difference here. */
#ifdef _LIBC
# define DNGETTEXT __dngettext
-# define DCNGETTEXT INTUSE(__dcngettext)
+# define DCNGETTEXT __dcngettext
#else
# define DNGETTEXT libintl_dngettext
# define DCNGETTEXT libintl_dcngettext
@@ -46,11 +47,8 @@
/* Look up MSGID in the DOMAINNAME message catalog of the current
LC_MESSAGES locale and skip message according to the plural form. */
char *
-DNGETTEXT (domainname, msgid1, msgid2, n)
- const char *domainname;
- const char *msgid1;
- const char *msgid2;
- unsigned long int n;
+DNGETTEXT (const char *domainname,
+ const char *msgid1, const char *msgid2, unsigned long int n)
{
return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES);
}
diff --git a/intl/eval-plural.h b/intl/eval-plural.h
index 19c7ca6a..01bd5af5 100644
--- a/intl/eval-plural.h
+++ b/intl/eval-plural.h
@@ -1,5 +1,5 @@
/* Plural expression evaluation.
- Copyright (C) 2000-2002 Free Software Foundation, Inc.
+ Copyright (C) 2000-2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
@@ -21,16 +21,10 @@
#endif
/* Evaluate the plural expression and return an index value. */
-STATIC unsigned long int plural_eval PARAMS ((struct expression *pexp,
- unsigned long int n))
- internal_function;
-
STATIC
unsigned long int
internal_function
-plural_eval (pexp, n)
- struct expression *pexp;
- unsigned long int n;
+plural_eval (struct expression *pexp, unsigned long int n)
{
switch (pexp->nargs)
{
diff --git a/intl/explodename.c b/intl/explodename.c
index 2985064c..52c25e72 100644
--- a/intl/explodename.c
+++ b/intl/explodename.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1998, 2000-2001, 2003 Free Software Foundation, Inc.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
This program is free software; you can redistribute it and/or modify it
@@ -38,8 +38,7 @@
/* @@ end of prolog @@ */
char *
-_nl_find_language (name)
- const char *name;
+_nl_find_language (const char *name)
{
while (name[0] != '\0' && name[0] != '_' && name[0] != '@'
&& name[0] != '+' && name[0] != ',')
@@ -50,17 +49,11 @@ _nl_find_language (name)
int
-_nl_explode_name (name, language, modifier, territory, codeset,
- normalized_codeset, special, sponsor, revision)
- char *name;
- const char **language;
- const char **modifier;
- const char **territory;
- const char **codeset;
- const char **normalized_codeset;
- const char **special;
- const char **sponsor;
- const char **revision;
+_nl_explode_name (char *name,
+ const char **language, const char **modifier,
+ const char **territory, const char **codeset,
+ const char **normalized_codeset, const char **special,
+ const char **sponsor, const char **revision)
{
enum { undecided, xpg, cen } syntax;
char *cp;
diff --git a/intl/finddomain.c b/intl/finddomain.c
index 2f103d55..4992a8c9 100644
--- a/intl/finddomain.c
+++ b/intl/finddomain.c
@@ -1,5 +1,5 @@
/* Handle list of needed message catalogs
- Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1995-1999, 2000-2001, 2003 Free Software Foundation, Inc.
Written by Ulrich Drepper <drepper@gnu.org>, 1995.
This program is free software; you can redistribute it and/or modify it
@@ -47,11 +47,8 @@ static struct loaded_l10nfile *_nl_loaded_domains;
established bindings. */
struct loaded_l10nfile *
internal_function
-_nl_find_domain (dirname, locale, domainname, domainbinding)
- const char *dirname;
- char *locale;
- const char *domainname;
- struct binding *domainbinding;
+_nl_find_domain (const char *dirname, char *locale,
+ const char *domainname, struct binding *domainbinding)
{
struct loaded_l10nfile *retval;
const char *language;
@@ -178,8 +175,7 @@ _nl_find_domain (dirname, locale, domainname, domainbinding)
#ifdef _LIBC
-static void __attribute__ ((unused))
-free_mem (void)
+libc_freeres_fn (free_mem)
{
struct loaded_l10nfile *runp = _nl_loaded_domains;
@@ -193,6 +189,4 @@ free_mem (void)
free (here);
}
}
-
-text_set_element (__libc_subfreeres, free_mem);
#endif
diff --git a/intl/gettext.c b/intl/gettext.c
index 43d689f5..92c42faa 100644
--- a/intl/gettext.c
+++ b/intl/gettext.c
@@ -1,5 +1,5 @@
/* Implementation of gettext(3) function.
- Copyright (C) 1995, 1997, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1997, 2000-2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
@@ -52,8 +52,7 @@
LC_MESSAGES locale. If not found, returns MSGID itself (the default
text). */
char *
-GETTEXT (msgid)
- const char *msgid;
+GETTEXT (const char *msgid)
{
return DCGETTEXT (NULL, msgid, LC_MESSAGES);
}
diff --git a/intl/gettextP.h b/intl/gettextP.h
index f085c59b..4d66c3de 100644
--- a/intl/gettextP.h
+++ b/intl/gettextP.h
@@ -1,5 +1,5 @@
/* Header describing internals of libintl library.
- Copyright (C) 1995-1999, 2000-2002 Free Software Foundation, Inc.
+ Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
This program is free software; you can redistribute it and/or modify it
@@ -36,14 +36,6 @@
/* @@ end of prolog @@ */
-#ifndef PARAMS
-# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
-# define PARAMS(args) args
-# else
-# define PARAMS(args) ()
-# endif
-#endif
-
#ifndef internal_function
# define internal_function
#endif
@@ -159,82 +151,63 @@ struct binding
extern int _nl_msg_cat_cntr;
#ifndef _LIBC
-const char *_nl_locale_name PARAMS ((int category, const char *categoryname));
+const char *_nl_locale_name (int category, const char *categoryname);
#endif
-struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname,
- char *__locale,
- const char *__domainname,
- struct binding *__domainbinding))
+struct loaded_l10nfile *_nl_find_domain (const char *__dirname, char *__locale,
+ const char *__domainname,
+ struct binding *__domainbinding)
internal_function;
-void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain,
- struct binding *__domainbinding))
+void _nl_load_domain (struct loaded_l10nfile *__domain,
+ struct binding *__domainbinding)
internal_function;
-void _nl_unload_domain PARAMS ((struct loaded_domain *__domain))
+void _nl_unload_domain (struct loaded_domain *__domain)
internal_function;
-const char *_nl_init_domain_conv PARAMS ((struct loaded_l10nfile *__domain_file,
- struct loaded_domain *__domain,
- struct binding *__domainbinding))
+const char *_nl_init_domain_conv (struct loaded_l10nfile *__domain_file,
+ struct loaded_domain *__domain,
+ struct binding *__domainbinding)
internal_function;
-void _nl_free_domain_conv PARAMS ((struct loaded_domain *__domain))
+void _nl_free_domain_conv (struct loaded_domain *__domain)
internal_function;
-char *_nl_find_msg PARAMS ((struct loaded_l10nfile *domain_file,
- struct binding *domainbinding,
- const char *msgid, size_t *lengthp))
+char *_nl_find_msg (struct loaded_l10nfile *domain_file,
+ struct binding *domainbinding, const char *msgid,
+ size_t *lengthp)
internal_function;
#ifdef _LIBC
-extern char *__gettext PARAMS ((const char *__msgid));
-extern char *__dgettext PARAMS ((const char *__domainname,
- const char *__msgid));
-extern char *__dcgettext PARAMS ((const char *__domainname,
- const char *__msgid, int __category));
-extern char *__ngettext PARAMS ((const char *__msgid1, const char *__msgid2,
- unsigned long int __n));
-extern char *__dngettext PARAMS ((const char *__domainname,
- const char *__msgid1, const char *__msgid2,
- unsigned long int n));
-extern char *__dcngettext PARAMS ((const char *__domainname,
- const char *__msgid1, const char *__msgid2,
- unsigned long int __n, int __category));
-extern char *__dcigettext PARAMS ((const char *__domainname,
- const char *__msgid1, const char *__msgid2,
- int __plural, unsigned long int __n,
- int __category));
-extern char *__textdomain PARAMS ((const char *__domainname));
-extern char *__bindtextdomain PARAMS ((const char *__domainname,
- const char *__dirname));
-extern char *__bind_textdomain_codeset PARAMS ((const char *__domainname,
- const char *__codeset));
+extern char *__gettext (const char *__msgid);
+extern char *__dgettext (const char *__domainname, const char *__msgid);
+extern char *__dcgettext (const char *__domainname, const char *__msgid,
+ int __category);
+extern char *__ngettext (const char *__msgid1, const char *__msgid2,
+ unsigned long int __n);
+extern char *__dngettext (const char *__domainname,
+ const char *__msgid1, const char *__msgid2,
+ unsigned long int n);
+extern char *__dcngettext (const char *__domainname,
+ const char *__msgid1, const char *__msgid2,
+ unsigned long int __n, int __category);
+extern char *__dcigettext (const char *__domainname,
+ const char *__msgid1, const char *__msgid2,
+ int __plural, unsigned long int __n,
+ int __category);
+extern char *__textdomain (const char *__domainname);
+extern char *__bindtextdomain (const char *__domainname,
+ const char *__dirname);
+extern char *__bind_textdomain_codeset (const char *__domainname,
+ const char *__codeset);
#else
-extern char *libintl_gettext PARAMS ((const char *__msgid));
-extern char *libintl_dgettext PARAMS ((const char *__domainname,
- const char *__msgid));
-extern char *libintl_dcgettext PARAMS ((const char *__domainname,
- const char *__msgid, int __category));
-extern char *libintl_ngettext PARAMS ((const char *__msgid1,
- const char *__msgid2,
- unsigned long int __n));
-extern char *libintl_dngettext PARAMS ((const char *__domainname,
- const char *__msgid1,
- const char *__msgid2,
- unsigned long int __n));
-extern char *libintl_dcngettext PARAMS ((const char *__domainname,
- const char *__msgid1,
- const char *__msgid2,
- unsigned long int __n,
- int __category));
-extern char *libintl_dcigettext PARAMS ((const char *__domainname,
- const char *__msgid1,
- const char *__msgid2,
- int __plural, unsigned long int __n,
- int __category));
-extern char *libintl_textdomain PARAMS ((const char *__domainname));
-extern char *libintl_bindtextdomain PARAMS ((const char *__domainname,
- const char *__dirname));
-extern char *libintl_bind_textdomain_codeset PARAMS ((const char *__domainname,
- const char *__codeset));
+/* Declare the exported libintl_* functions, in a way that allows us to
+ call them under their real name. */
+# undef _INTL_REDIRECT_INLINE
+# undef _INTL_REDIRECT_MACROS
+# define _INTL_REDIRECT_MACROS
+# include "libgnuintl.h"
+extern char *libintl_dcigettext (const char *__domainname,
+ const char *__msgid1, const char *__msgid2,
+ int __plural, unsigned long int __n,
+ int __category);
#endif
/* @@ begin of epilog @@ */
diff --git a/intl/gmo.h b/intl/gmo.h
index d1fe4d6b..e7c9cc14 100644
--- a/intl/gmo.h
+++ b/intl/gmo.h
@@ -1,5 +1,5 @@
/* Description of GNU message catalog format: general file layout.
- Copyright (C) 1995, 1997, 2000-2002 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1997, 2000-2002, 2004 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
@@ -29,6 +29,7 @@
/* Revision number of the currently used .mo (binary) file format. */
#define MO_REVISION_NUMBER 0
+#define MO_REVISION_NUMBER_WITH_SYSDEP_I 1
/* The following contortions are an attempt to use the C preprocessor
to determine an unsigned integral type that is 32 bits wide. An
@@ -76,7 +77,7 @@ struct mo_file_header
/* The revision number of the file format. */
nls_uint32 revision;
- /* The following are only used in .mo files with major revision 0. */
+ /* The following are only used in .mo files with major revision 0 or 1. */
/* The number of strings pairs. */
nls_uint32 nstrings;
diff --git a/intl/hash-string.h b/intl/hash-string.h
index b267a877..093e3b1c 100644
--- a/intl/hash-string.h
+++ b/intl/hash-string.h
@@ -1,5 +1,5 @@
/* Description of GNU message catalog format: string hashing function.
- Copyright (C) 1995, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1997-1998, 2000-2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
@@ -18,14 +18,6 @@
/* @@ end of prolog @@ */
-#ifndef PARAMS
-# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
-# define PARAMS(Args) Args
-# else
-# define PARAMS(Args) ()
-# endif
-#endif
-
/* We assume to have `unsigned long int' value with at least 32 bits. */
#define HASHWORDBITS 32
@@ -33,11 +25,8 @@
/* Defines the so called `hashpjw' function by P.J. Weinberger
[see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools,
1986, 1987 Bell Telephone Laboratories, Inc.] */
-static unsigned long int hash_string PARAMS ((const char *__str_param));
-
static inline unsigned long int
-hash_string (str_param)
- const char *str_param;
+hash_string (const char *str_param)
{
unsigned long int hval, g;
const char *str = str_param;
@@ -47,7 +36,7 @@ hash_string (str_param)
while (*str != '\0')
{
hval <<= 4;
- hval += (unsigned long int) *str++;
+ hval += (unsigned char) *str++;
g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4));
if (g != 0)
{
diff --git a/intl/intl-compat.c b/intl/intl-compat.c
index da890159..96f9d955 100644
--- a/intl/intl-compat.c
+++ b/intl/intl-compat.c
@@ -1,6 +1,6 @@
/* intl-compat.c - Stub functions to call gettext functions from GNU gettext
Library.
- Copyright (C) 1995, 2000-2002 Software Foundation, Inc.
+ Copyright (C) 1995, 2000-2003 Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
@@ -21,8 +21,6 @@
# include <config.h>
#endif
-#define _INTL_REDIRECT_MACROS
-#include "libgnuintl.h"
#include "gettextP.h"
/* @@ end of prolog @@ */
@@ -31,7 +29,10 @@
defined in the included GNU libintl library (with "libintl_" prefix).
It is compiled into libintl in order to make the AM_GNU_GETTEXT test
of gettext <= 0.11.2 work with the libintl library >= 0.11.3 which
- has the redirections primarily in the <libintl.h> include file. */
+ has the redirections primarily in the <libintl.h> include file.
+ It is also compiled into libgnuintl so that libgnuintl.so can be used
+ as LD_PRELOADable library on glibc systems, to provide the extra
+ features that the functions in the libc don't have (namely, logging). */
#undef gettext
@@ -45,87 +46,86 @@
#undef bind_textdomain_codeset
+/* When building a DLL, we must export some functions. Note that because
+ the functions are only defined for binary backward compatibility, we
+ don't need to use __declspec(dllimport) in any case. */
+#if defined _MSC_VER && BUILDING_DLL
+# define DLL_EXPORTED __declspec(dllexport)
+#else
+# define DLL_EXPORTED
+#endif
+
+
+DLL_EXPORTED
char *
-gettext (msgid)
- const char *msgid;
+gettext (const char *msgid)
{
return libintl_gettext (msgid);
}
+DLL_EXPORTED
char *
-dgettext (domainname, msgid)
- const char *domainname;
- const char *msgid;
+dgettext (const char *domainname, const char *msgid)
{
return libintl_dgettext (domainname, msgid);
}
+DLL_EXPORTED
char *
-dcgettext (domainname, msgid, category)
- const char *domainname;
- const char *msgid;
- int category;
+dcgettext (const char *domainname, const char *msgid, int category)
{
return libintl_dcgettext (domainname, msgid, category);
}
+DLL_EXPORTED
char *
-ngettext (msgid1, msgid2, n)
- const char *msgid1;
- const char *msgid2;
- unsigned long int n;
+ngettext (const char *msgid1, const char *msgid2, unsigned long int n)
{
return libintl_ngettext (msgid1, msgid2, n);
}
+DLL_EXPORTED
char *
-dngettext (domainname, msgid1, msgid2, n)
- const char *domainname;
- const char *msgid1;
- const char *msgid2;
- unsigned long int n;
+dngettext (const char *domainname,
+ const char *msgid1, const char *msgid2, unsigned long int n)
{
return libintl_dngettext (domainname, msgid1, msgid2, n);
}
+DLL_EXPORTED
char *
-dcngettext (domainname, msgid1, msgid2, n, category)
- const char *domainname;
- const char *msgid1;
- const char *msgid2;
- unsigned long int n;
- int category;
+dcngettext (const char *domainname,
+ const char *msgid1, const char *msgid2, unsigned long int n,
+ int category)
{
return libintl_dcngettext (domainname, msgid1, msgid2, n, category);
}
+DLL_EXPORTED
char *
-textdomain (domainname)
- const char *domainname;
+textdomain (const char *domainname)
{
return libintl_textdomain (domainname);
}
+DLL_EXPORTED
char *
-bindtextdomain (domainname, dirname)
- const char *domainname;
- const char *dirname;
+bindtextdomain (const char *domainname, const char *dirname)
{
return libintl_bindtextdomain (domainname, dirname);
}
+DLL_EXPORTED
char *
-bind_textdomain_codeset (domainname, codeset)
- const char *domainname;
- const char *codeset;
+bind_textdomain_codeset (const char *domainname, const char *codeset)
{
return libintl_bind_textdomain_codeset (domainname, codeset);
}
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index ec8713f8..eb995aaf 100644
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1999, 2000-2003 Free Software Foundation, Inc.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
This program is free software; you can redistribute it and/or modify it
@@ -58,7 +58,7 @@
# endif
#else
# ifndef HAVE_STPCPY
-static char *stpcpy PARAMS ((char *dest, const char *src));
+static char *stpcpy (char *dest, const char *src);
# endif
#endif
@@ -84,12 +84,8 @@ static char *stpcpy PARAMS ((char *dest, const char *src));
#if !defined _LIBC && !defined HAVE___ARGZ_COUNT
/* Returns the number of strings in ARGZ. */
-static size_t argz_count__ PARAMS ((const char *argz, size_t len));
-
static size_t
-argz_count__ (argz, len)
- const char *argz;
- size_t len;
+argz_count__ (const char *argz, size_t len)
{
size_t count = 0;
while (len > 0)
@@ -112,13 +108,8 @@ argz_count__ (argz, len)
#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY
/* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
except the last into the character SEP. */
-static void argz_stringify__ PARAMS ((char *argz, size_t len, int sep));
-
static void
-argz_stringify__ (argz, len, sep)
- char *argz;
- size_t len;
- int sep;
+argz_stringify__ (char *argz, size_t len, int sep)
{
while (len > 0)
{
@@ -139,14 +130,8 @@ argz_stringify__ (argz, len, sep)
#endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */
#if !defined _LIBC && !defined HAVE___ARGZ_NEXT
-static char *argz_next__ PARAMS ((char *argz, size_t argz_len,
- const char *entry));
-
static char *
-argz_next__ (argz, argz_len, entry)
- char *argz;
- size_t argz_len;
- const char *entry;
+argz_next__ (char *argz, size_t argz_len, const char *entry)
{
if (entry)
{
@@ -167,11 +152,8 @@ argz_next__ (argz, argz_len, entry)
/* Return number of bits set in X. */
-static int pop PARAMS ((int x));
-
static inline int
-pop (x)
- int x;
+pop (int x)
{
/* We assume that no more than 16 bits are used. */
x = ((x & ~0x5555) >> 1) + (x & 0x5555);
@@ -184,23 +166,13 @@ pop (x)
struct loaded_l10nfile *
-_nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
- territory, codeset, normalized_codeset, modifier, special,
- sponsor, revision, filename, do_allocate)
- struct loaded_l10nfile **l10nfile_list;
- const char *dirlist;
- size_t dirlist_len;
- int mask;
- const char *language;
- const char *territory;
- const char *codeset;
- const char *normalized_codeset;
- const char *modifier;
- const char *special;
- const char *sponsor;
- const char *revision;
- const char *filename;
- int do_allocate;
+_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
+ const char *dirlist, size_t dirlist_len,
+ int mask, const char *language, const char *territory,
+ const char *codeset, const char *normalized_codeset,
+ const char *modifier, const char *special,
+ const char *sponsor, const char *revision,
+ const char *filename, int do_allocate)
{
char *abs_filename;
struct loaded_l10nfile **lastp;
@@ -393,9 +365,7 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language,
names. The return value is dynamically allocated and has to be
freed by the caller. */
const char *
-_nl_normalize_codeset (codeset, name_len)
- const char *codeset;
- size_t name_len;
+_nl_normalize_codeset (const char *codeset, size_t name_len)
{
int len = 0;
int only_digit = 1;
@@ -442,9 +412,7 @@ _nl_normalize_codeset (codeset, name_len)
to be defined. */
#if !_LIBC && !HAVE_STPCPY
static char *
-stpcpy (dest, src)
- char *dest;
- const char *src;
+stpcpy (char *dest, const char *src)
{
while ((*dest++ = *src++) != '\0')
/* Do nothing. */ ;
diff --git a/intl/libgnuintl.h.in b/intl/libgnuintl.h.in
new file mode 100644
index 00000000..3be7eb99
--- /dev/null
+++ b/intl/libgnuintl.h.in
@@ -0,0 +1,383 @@
+/* Message catalogs for internationalization.
+ Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Library General Public License as published
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+#ifndef _LIBINTL_H
+#define _LIBINTL_H 1
+
+#include <locale.h>
+
+/* The LC_MESSAGES locale category is the category used by the functions
+ gettext() and dgettext(). It is specified in POSIX, but not in ANSI C.
+ On systems that don't define it, use an arbitrary value instead.
+ On Solaris, <locale.h> defines __LOCALE_H (or _LOCALE_H in Solaris 2.5)
+ then includes <libintl.h> (i.e. this file!) and then only defines
+ LC_MESSAGES. To avoid a redefinition warning, don't define LC_MESSAGES
+ in this case. */
+#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun))
+# define LC_MESSAGES 1729
+#endif
+
+/* We define an additional symbol to signal that we use the GNU
+ implementation of gettext. */
+#define __USE_GNU_GETTEXT 1
+
+/* Provide information about the supported file formats. Returns the
+ maximum minor revision number supported for a given major revision. */
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
+ ((major) == 0 ? 1 : -1)
+
+/* Resolve a platform specific conflict on DJGPP. GNU gettext takes
+ precedence over _conio_gettext. */
+#ifdef __DJGPP__
+# undef gettext
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* We redirect the functions to those prefixed with "libintl_". This is
+ necessary, because some systems define gettext/textdomain/... in the C
+ library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer).
+ If we used the unprefixed names, there would be cases where the
+ definition in the C library would override the one in the libintl.so
+ shared library. Recall that on ELF systems, the symbols are looked
+ up in the following order:
+ 1. in the executable,
+ 2. in the shared libraries specified on the link command line, in order,
+ 3. in the dependencies of the shared libraries specified on the link
+ command line,
+ 4. in the dlopen()ed shared libraries, in the order in which they were
+ dlopen()ed.
+ The definition in the C library would override the one in libintl.so if
+ either
+ * -lc is given on the link command line and -lintl isn't, or
+ * -lc is given on the link command line before -lintl, or
+ * libintl.so is a dependency of a dlopen()ed shared library but not
+ linked to the executable at link time.
+ Since Solaris gettext() behaves differently than GNU gettext(), this
+ would be unacceptable.
+
+ The redirection happens by default through macros in C, so that &gettext
+ is independent of the compilation unit, but through inline functions in
+ C++, in order not to interfere with the name mangling of class fields or
+ class methods called 'gettext'. */
+
+/* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS.
+ If he doesn't, we choose the method. A third possible method is
+ _INTL_REDIRECT_ASM, supported only by GCC. */
+#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
+# if __GNUC__ >= 2 && !defined __APPLE_CC__ && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
+# define _INTL_REDIRECT_ASM
+# else
+# ifdef __cplusplus
+# define _INTL_REDIRECT_INLINE
+# else
+# define _INTL_REDIRECT_MACROS
+# endif
+# endif
+#endif
+/* Auxiliary macros. */
+#ifdef _INTL_REDIRECT_ASM
+# define _INTL_ASM(cname) __asm__ (_INTL_ASMNAME (__USER_LABEL_PREFIX__, #cname))
+# define _INTL_ASMNAME(prefix,cnamestring) _INTL_STRINGIFY (prefix) cnamestring
+# define _INTL_STRINGIFY(prefix) #prefix
+#else
+# define _INTL_ASM(cname)
+#endif
+
+/* Look up MSGID in the current default message catalog for the current
+ LC_MESSAGES locale. If not found, returns MSGID itself (the default
+ text). */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_gettext (const char *__msgid);
+static inline char *gettext (const char *__msgid)
+{
+ return libintl_gettext (__msgid);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define gettext libintl_gettext
+#endif
+extern char *gettext (const char *__msgid)
+ _INTL_ASM (libintl_gettext);
+#endif
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current
+ LC_MESSAGES locale. */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_dgettext (const char *__domainname, const char *__msgid);
+static inline char *dgettext (const char *__domainname, const char *__msgid)
+{
+ return libintl_dgettext (__domainname, __msgid);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define dgettext libintl_dgettext
+#endif
+extern char *dgettext (const char *__domainname, const char *__msgid)
+ _INTL_ASM (libintl_dgettext);
+#endif
+
+/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
+ locale. */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_dcgettext (const char *__domainname, const char *__msgid,
+ int __category);
+static inline char *dcgettext (const char *__domainname, const char *__msgid,
+ int __category)
+{
+ return libintl_dcgettext (__domainname, __msgid, __category);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define dcgettext libintl_dcgettext
+#endif
+extern char *dcgettext (const char *__domainname, const char *__msgid,
+ int __category)
+ _INTL_ASM (libintl_dcgettext);
+#endif
+
+
+/* Similar to `gettext' but select the plural form corresponding to the
+ number N. */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_ngettext (const char *__msgid1, const char *__msgid2,
+ unsigned long int __n);
+static inline char *ngettext (const char *__msgid1, const char *__msgid2,
+ unsigned long int __n)
+{
+ return libintl_ngettext (__msgid1, __msgid2, __n);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define ngettext libintl_ngettext
+#endif
+extern char *ngettext (const char *__msgid1, const char *__msgid2,
+ unsigned long int __n)
+ _INTL_ASM (libintl_ngettext);
+#endif
+
+/* Similar to `dgettext' but select the plural form corresponding to the
+ number N. */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_dngettext (const char *__domainname, const char *__msgid1,
+ const char *__msgid2, unsigned long int __n);
+static inline char *dngettext (const char *__domainname, const char *__msgid1,
+ const char *__msgid2, unsigned long int __n)
+{
+ return libintl_dngettext (__domainname, __msgid1, __msgid2, __n);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define dngettext libintl_dngettext
+#endif
+extern char *dngettext (const char *__domainname,
+ const char *__msgid1, const char *__msgid2,
+ unsigned long int __n)
+ _INTL_ASM (libintl_dngettext);
+#endif
+
+/* Similar to `dcgettext' but select the plural form corresponding to the
+ number N. */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_dcngettext (const char *__domainname,
+ const char *__msgid1, const char *__msgid2,
+ unsigned long int __n, int __category);
+static inline char *dcngettext (const char *__domainname,
+ const char *__msgid1, const char *__msgid2,
+ unsigned long int __n, int __category)
+{
+ return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define dcngettext libintl_dcngettext
+#endif
+extern char *dcngettext (const char *__domainname,
+ const char *__msgid1, const char *__msgid2,
+ unsigned long int __n, int __category)
+ _INTL_ASM (libintl_dcngettext);
+#endif
+
+
+/* Set the current default message catalog to DOMAINNAME.
+ If DOMAINNAME is null, return the current default.
+ If DOMAINNAME is "", reset to the default of "messages". */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_textdomain (const char *__domainname);
+static inline char *textdomain (const char *__domainname)
+{
+ return libintl_textdomain (__domainname);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define textdomain libintl_textdomain
+#endif
+extern char *textdomain (const char *__domainname)
+ _INTL_ASM (libintl_textdomain);
+#endif
+
+/* Specify that the DOMAINNAME message catalog will be found
+ in DIRNAME rather than in the system locale data base. */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_bindtextdomain (const char *__domainname,
+ const char *__dirname);
+static inline char *bindtextdomain (const char *__domainname,
+ const char *__dirname)
+{
+ return libintl_bindtextdomain (__domainname, __dirname);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define bindtextdomain libintl_bindtextdomain
+#endif
+extern char *bindtextdomain (const char *__domainname, const char *__dirname)
+ _INTL_ASM (libintl_bindtextdomain);
+#endif
+
+/* Specify the character encoding in which the messages from the
+ DOMAINNAME message catalog will be returned. */
+#ifdef _INTL_REDIRECT_INLINE
+extern char *libintl_bind_textdomain_codeset (const char *__domainname,
+ const char *__codeset);
+static inline char *bind_textdomain_codeset (const char *__domainname,
+ const char *__codeset)
+{
+ return libintl_bind_textdomain_codeset (__domainname, __codeset);
+}
+#else
+#ifdef _INTL_REDIRECT_MACROS
+# define bind_textdomain_codeset libintl_bind_textdomain_codeset
+#endif
+extern char *bind_textdomain_codeset (const char *__domainname,
+ const char *__codeset)
+ _INTL_ASM (libintl_bind_textdomain_codeset);
+#endif
+
+
+/* Support for format strings with positions in *printf(), following the
+ POSIX/XSI specification.
+ Note: These replacements for the *printf() functions are visible only
+ in source files that #include <libintl.h> or #include "gettext.h".
+ Packages that use *printf() in source files that don't refer to _()
+ or gettext() but for which the format string could be the return value
+ of _() or gettext() need to add this #include. Oh well. */
+
+#if !@HAVE_POSIX_PRINTF@
+
+#include <stdio.h>
+#include <stddef.h>
+
+/* Get va_list. */
+#if __STDC__ || defined __cplusplus || defined _MSC_VER
+# include <stdarg.h>
+#else
+# include <varargs.h>
+#endif
+
+#undef fprintf
+#define fprintf libintl_fprintf
+extern int fprintf (FILE *, const char *, ...);
+#undef vfprintf
+#define vfprintf libintl_vfprintf
+extern int vfprintf (FILE *, const char *, va_list);
+
+#undef printf
+#define printf libintl_printf
+extern int printf (const char *, ...);
+#undef vprintf
+#define vprintf libintl_vprintf
+extern int vprintf (const char *, va_list);
+
+#undef sprintf
+#define sprintf libintl_sprintf
+extern int sprintf (char *, const char *, ...);
+#undef vsprintf
+#define vsprintf libintl_vsprintf
+extern int vsprintf (char *, const char *, va_list);
+
+#if @HAVE_SNPRINTF@
+
+#undef snprintf
+#define snprintf libintl_snprintf
+extern int snprintf (char *, size_t, const char *, ...);
+#undef vsnprintf
+#define vsnprintf libintl_vsnprintf
+extern int vsnprintf (char *, size_t, const char *, va_list);
+
+#endif
+
+#if @HAVE_ASPRINTF@
+
+#undef asprintf
+#define asprintf libintl_asprintf
+extern int asprintf (char **, const char *, ...);
+#undef vasprintf
+#define vasprintf libintl_vasprintf
+extern int vasprintf (char **, const char *, va_list);
+
+#endif
+
+#if @HAVE_WPRINTF@
+
+#undef fwprintf
+#define fwprintf libintl_fwprintf
+extern int fwprintf (FILE *, const wchar_t *, ...);
+#undef vfwprintf
+#define vfwprintf libintl_vfwprintf
+extern int vfwprintf (FILE *, const wchar_t *, va_list);
+
+#undef wprintf
+#define wprintf libintl_wprintf
+extern int wprintf (const wchar_t *, ...);
+#undef vwprintf
+#define vwprintf libintl_vwprintf
+extern int vwprintf (const wchar_t *, va_list);
+
+#undef swprintf
+#define swprintf libintl_swprintf
+extern int swprintf (wchar_t *, size_t, const wchar_t *, ...);
+#undef vswprintf
+#define vswprintf libintl_vswprintf
+extern int vswprintf (wchar_t *, size_t, const wchar_t *, va_list);
+
+#endif
+
+#endif
+
+
+/* Support for relocatable packages. */
+
+/* Sets the original and the current installation prefix of the package.
+ Relocation simply replaces a pathname starting with the original prefix
+ by the corresponding pathname with the current prefix instead. Both
+ prefixes should be directory names without trailing slash (i.e. use ""
+ instead of "/"). */
+#define libintl_set_relocation_prefix libintl_set_relocation_prefix
+extern void
+ libintl_set_relocation_prefix (const char *orig_prefix,
+ const char *curr_prefix);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* libintl.h */
diff --git a/intl/loadinfo.h b/intl/loadinfo.h
index 1d3ba616..65e5ebd1 100644
--- a/intl/loadinfo.h
+++ b/intl/loadinfo.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-1999, 2000-2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996-1999, 2000-2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -32,14 +32,6 @@
in gettextP.h.
*/
-#ifndef PARAMS
-# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
-# define PARAMS(args) args
-# else
-# define PARAMS(args) ()
-# endif
-#endif
-
#ifndef internal_function
# define internal_function
#endif
@@ -89,8 +81,8 @@ struct loaded_l10nfile
names. Normalization allows the user to use any of the common
names. The return value is dynamically allocated and has to be
freed by the caller. */
-extern const char *_nl_normalize_codeset PARAMS ((const char *codeset,
- size_t name_len));
+extern const char *_nl_normalize_codeset (const char *codeset,
+ size_t name_len);
/* Lookup a locale dependent file.
*L10NFILE_LIST denotes a pool of lookup results of locale dependent
@@ -107,19 +99,18 @@ extern const char *_nl_normalize_codeset PARAMS ((const char *codeset,
furthermore its ->successor[] field contains a list of other lookup
results from which this lookup result inherits. */
extern struct loaded_l10nfile *
-_nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list,
- const char *dirlist, size_t dirlist_len, int mask,
- const char *language, const char *territory,
- const char *codeset,
- const char *normalized_codeset,
- const char *modifier, const char *special,
- const char *sponsor, const char *revision,
- const char *filename, int do_allocate));
+_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list,
+ const char *dirlist, size_t dirlist_len, int mask,
+ const char *language, const char *territory,
+ const char *codeset, const char *normalized_codeset,
+ const char *modifier, const char *special,
+ const char *sponsor, const char *revision,
+ const char *filename, int do_allocate);
/* Lookup the real locale name for a locale alias NAME, or NULL if
NAME is not a locale alias (but possibly a real locale name).
The return value is statically allocated and must not be freed. */
-extern const char *_nl_expand_alias PARAMS ((const char *name));
+extern const char *_nl_expand_alias (const char *name);
/* Split a locale name NAME into its pieces: language, modifier,
territory, codeset, special, sponsor, revision.
@@ -139,18 +130,16 @@ extern const char *_nl_expand_alias PARAMS ((const char *name));
CEN_SPONSOR for *SPONSOR,
CEN_REVISION for *REVISION.
*/
-extern int _nl_explode_name PARAMS ((char *name, const char **language,
- const char **modifier,
- const char **territory,
- const char **codeset,
- const char **normalized_codeset,
- const char **special,
- const char **sponsor,
- const char **revision));
+extern int _nl_explode_name (char *name, const char **language,
+ const char **modifier, const char **territory,
+ const char **codeset,
+ const char **normalized_codeset,
+ const char **special, const char **sponsor,
+ const char **revision);
/* Split a locale name NAME into a leading language part and all the
rest. Return a pointer to the first character after the language,
i.e. to the first byte of the rest. */
-extern char *_nl_find_language PARAMS ((const char *name));
+extern char *_nl_find_language (const char *name);
#endif /* loadinfo.h */
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
index c32fd75a..c8fc46d2 100644
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -1,5 +1,5 @@
/* Load needed message catalogs.
- Copyright (C) 1995-1999, 2000-2002 Free Software Foundation, Inc.
+ Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
@@ -34,17 +34,23 @@
#include <sys/stat.h>
#ifdef __GNUC__
+# undef alloca
# define alloca __builtin_alloca
# define HAVE_ALLOCA 1
#else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-# include <alloca.h>
+# ifdef _MSC_VER
+# include <malloc.h>
+# define alloca _alloca
# else
-# ifdef _AIX
- #pragma alloca
+# if defined HAVE_ALLOCA_H || defined _LIBC
+# include <alloca.h>
# else
-# ifndef alloca
+# ifdef _AIX
+ #pragma alloca
+# else
+# ifndef alloca
char *alloca ();
+# endif
# endif
# endif
# endif
@@ -485,11 +491,6 @@ char *alloca ();
#endif
-/* Prototypes for local functions. Needed to ensure compiler checking of
- function argument counts despite of K&R C function definition syntax. */
-static const char *get_sysdep_segment_value PARAMS ((const char *name));
-
-
/* We need a sign, whether a new catalog was loaded, which can be associated
with all translations. This is important if the translations are
cached by one of GCC's features. */
@@ -498,8 +499,7 @@ int _nl_msg_cat_cntr;
/* Expand a system dependent string segment. Return NULL if unsupported. */
static const char *
-get_sysdep_segment_value (name)
- const char *name;
+get_sysdep_segment_value (const char *name)
{
/* Test for an ISO C 99 section 7.8.1 format string directive.
Syntax:
@@ -748,6 +748,18 @@ get_sysdep_segment_value (name)
}
}
}
+ /* Test for a glibc specific printf() format directive flag. */
+ if (name[0] == 'I' && name[1] == '\0')
+ {
+#if defined _LIBC || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)
+ /* The 'I' flag, in numeric format directives, replaces ASCII digits
+ with the 'outdigits' defined in the LC_CTYPE locale facet. This is
+ used for Farsi (Persian) and maybe Arabic. */
+ return "I";
+#else
+ return "";
+#endif
+ }
/* Other system dependent strings are not valid. */
return NULL;
}
@@ -756,10 +768,9 @@ get_sysdep_segment_value (name)
Return the header entry. */
const char *
internal_function
-_nl_init_domain_conv (domain_file, domain, domainbinding)
- struct loaded_l10nfile *domain_file;
- struct loaded_domain *domain;
- struct binding *domainbinding;
+_nl_init_domain_conv (struct loaded_l10nfile *domain_file,
+ struct loaded_domain *domain,
+ struct binding *domainbinding)
{
/* Find out about the character set the file is encoded with.
This can be found (in textual form) in the entry "". If this
@@ -820,10 +831,10 @@ _nl_init_domain_conv (domain_file, domain, domainbinding)
if (outcharset == NULL || outcharset[0] == '\0')
{
# ifdef _LIBC
- outcharset = (*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string;
+ outcharset = _NL_CURRENT (LC_CTYPE, CODESET);
# else
# if HAVE_ICONV
- extern const char *locale_charset PARAMS ((void));
+ extern const char *locale_charset (void);
outcharset = locale_charset ();
# endif
# endif
@@ -875,8 +886,7 @@ _nl_init_domain_conv (domain_file, domain, domainbinding)
/* Frees the codeset dependent parts of an opened message catalog. */
void
internal_function
-_nl_free_domain_conv (domain)
- struct loaded_domain *domain;
+_nl_free_domain_conv (struct loaded_domain *domain)
{
if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1)
free (domain->conv_tab);
@@ -896,9 +906,8 @@ _nl_free_domain_conv (domain)
message catalog do nothing. */
void
internal_function
-_nl_load_domain (domain_file, domainbinding)
- struct loaded_l10nfile *domain_file;
- struct binding *domainbinding;
+_nl_load_domain (struct loaded_l10nfile *domain_file,
+ struct binding *domainbinding)
{
int fd;
size_t size;
@@ -1022,10 +1031,11 @@ _nl_load_domain (domain_file, domainbinding)
/* Fill in the information about the available tables. */
revision = W (domain->must_swap, data->revision);
- /* We support only the major revision 0. */
+ /* We support only the major revisions 0 and 1. */
switch (revision >> 16)
{
case 0:
+ case 1:
domain->nstrings = W (domain->must_swap, data->nstrings);
domain->orig_tab = (const struct string_desc *)
((char *) data + W (domain->must_swap, data->orig_tab_offset));
@@ -1065,12 +1075,13 @@ _nl_load_domain (domain_file, domainbinding)
const char **sysdep_segment_values;
const nls_uint32 *orig_sysdep_tab;
const nls_uint32 *trans_sysdep_tab;
+ nls_uint32 n_inmem_sysdep_strings;
size_t memneed;
char *mem;
struct sysdep_string_desc *inmem_orig_sysdep_tab;
struct sysdep_string_desc *inmem_trans_sysdep_tab;
nls_uint32 *inmem_hash_tab;
- unsigned int i;
+ unsigned int i, j;
/* Get the values of the system dependent segments. */
n_sysdep_segments =
@@ -1105,153 +1116,247 @@ _nl_load_domain (domain_file, domainbinding)
+ W (domain->must_swap, data->trans_sysdep_tab_offset));
/* Compute the amount of additional memory needed for the
- system dependent strings and the augmented hash table. */
- memneed = 2 * n_sysdep_strings
- * sizeof (struct sysdep_string_desc)
- + domain->hash_size * sizeof (nls_uint32);
- for (i = 0; i < 2 * n_sysdep_strings; i++)
+ system dependent strings and the augmented hash table.
+ At the same time, also drop string pairs which refer to
+ an undefined system dependent segment. */
+ n_inmem_sysdep_strings = 0;
+ memneed = domain->hash_size * sizeof (nls_uint32);
+ for (i = 0; i < n_sysdep_strings; i++)
{
- const struct sysdep_string *sysdep_string =
- (const struct sysdep_string *)
- ((char *) data
- + W (domain->must_swap,
- i < n_sysdep_strings
- ? orig_sysdep_tab[i]
- : trans_sysdep_tab[i - n_sysdep_strings]));
- size_t need = 0;
- const struct segment_pair *p = sysdep_string->segments;
-
- if (W (domain->must_swap, p->sysdepref) != SEGMENTS_END)
- for (p = sysdep_string->segments;; p++)
- {
- nls_uint32 sysdepref;
-
- need += W (domain->must_swap, p->segsize);
-
- sysdepref = W (domain->must_swap, p->sysdepref);
- if (sysdepref == SEGMENTS_END)
- break;
-
- if (sysdepref >= n_sysdep_segments)
+ int valid = 1;
+ size_t needs[2];
+
+ for (j = 0; j < 2; j++)
+ {
+ const struct sysdep_string *sysdep_string =
+ (const struct sysdep_string *)
+ ((char *) data
+ + W (domain->must_swap,
+ j == 0
+ ? orig_sysdep_tab[i]
+ : trans_sysdep_tab[i]));
+ size_t need = 0;
+ const struct segment_pair *p = sysdep_string->segments;
+
+ if (W (domain->must_swap, p->sysdepref) != SEGMENTS_END)
+ for (p = sysdep_string->segments;; p++)
{
- /* Invalid. */
- freea (sysdep_segment_values);
- goto invalid;
- }
+ nls_uint32 sysdepref;
- need += strlen (sysdep_segment_values[sysdepref]);
- }
+ need += W (domain->must_swap, p->segsize);
- memneed += need;
- }
+ sysdepref = W (domain->must_swap, p->sysdepref);
+ if (sysdepref == SEGMENTS_END)
+ break;
- /* Allocate additional memory. */
- mem = (char *) malloc (memneed);
- if (mem == NULL)
- goto invalid;
-
- domain->malloced = mem;
- inmem_orig_sysdep_tab = (struct sysdep_string_desc *) mem;
- mem += n_sysdep_strings * sizeof (struct sysdep_string_desc);
- inmem_trans_sysdep_tab = (struct sysdep_string_desc *) mem;
- mem += n_sysdep_strings * sizeof (struct sysdep_string_desc);
- inmem_hash_tab = (nls_uint32 *) mem;
- mem += domain->hash_size * sizeof (nls_uint32);
-
- /* Compute the system dependent strings. */
- for (i = 0; i < 2 * n_sysdep_strings; i++)
- {
- const struct sysdep_string *sysdep_string =
- (const struct sysdep_string *)
- ((char *) data
- + W (domain->must_swap,
- i < n_sysdep_strings
- ? orig_sysdep_tab[i]
- : trans_sysdep_tab[i - n_sysdep_strings]));
- const char *static_segments =
- (char *) data
- + W (domain->must_swap, sysdep_string->offset);
- const struct segment_pair *p = sysdep_string->segments;
+ if (sysdepref >= n_sysdep_segments)
+ {
+ /* Invalid. */
+ freea (sysdep_segment_values);
+ goto invalid;
+ }
+
+ if (sysdep_segment_values[sysdepref] == NULL)
+ {
+ /* This particular string pair is invalid. */
+ valid = 0;
+ break;
+ }
- /* Concatenate the segments, and fill
- inmem_orig_sysdep_tab[i] (for i < n_sysdep_strings) and
- inmem_trans_sysdep_tab[i-n_sysdep_strings] (for
- i >= n_sysdep_strings). */
+ need += strlen (sysdep_segment_values[sysdepref]);
+ }
- if (W (domain->must_swap, p->sysdepref) == SEGMENTS_END)
+ needs[j] = need;
+ if (!valid)
+ break;
+ }
+
+ if (valid)
{
- /* Only one static segment. */
- inmem_orig_sysdep_tab[i].length =
- W (domain->must_swap, p->segsize);
- inmem_orig_sysdep_tab[i].pointer = static_segments;
+ n_inmem_sysdep_strings++;
+ memneed += needs[0] + needs[1];
}
- else
+ }
+ memneed += 2 * n_inmem_sysdep_strings
+ * sizeof (struct sysdep_string_desc);
+
+ if (n_inmem_sysdep_strings > 0)
+ {
+ unsigned int k;
+
+ /* Allocate additional memory. */
+ mem = (char *) malloc (memneed);
+ if (mem == NULL)
+ goto invalid;
+
+ domain->malloced = mem;
+ inmem_orig_sysdep_tab = (struct sysdep_string_desc *) mem;
+ mem += n_inmem_sysdep_strings
+ * sizeof (struct sysdep_string_desc);
+ inmem_trans_sysdep_tab = (struct sysdep_string_desc *) mem;
+ mem += n_inmem_sysdep_strings
+ * sizeof (struct sysdep_string_desc);
+ inmem_hash_tab = (nls_uint32 *) mem;
+ mem += domain->hash_size * sizeof (nls_uint32);
+
+ /* Compute the system dependent strings. */
+ k = 0;
+ for (i = 0; i < n_sysdep_strings; i++)
{
- inmem_orig_sysdep_tab[i].pointer = mem;
+ int valid = 1;
- for (p = sysdep_string->segments;; p++)
+ for (j = 0; j < 2; j++)
{
- nls_uint32 segsize =
- W (domain->must_swap, p->segsize);
- nls_uint32 sysdepref =
- W (domain->must_swap, p->sysdepref);
- size_t n;
+ const struct sysdep_string *sysdep_string =
+ (const struct sysdep_string *)
+ ((char *) data
+ + W (domain->must_swap,
+ j == 0
+ ? orig_sysdep_tab[i]
+ : trans_sysdep_tab[i]));
+ const struct segment_pair *p =
+ sysdep_string->segments;
+
+ if (W (domain->must_swap, p->sysdepref)
+ != SEGMENTS_END)
+ for (p = sysdep_string->segments;; p++)
+ {
+ nls_uint32 sysdepref;
+
+ sysdepref =
+ W (domain->must_swap, p->sysdepref);
+ if (sysdepref == SEGMENTS_END)
+ break;
+
+ if (sysdep_segment_values[sysdepref] == NULL)
+ {
+ /* This particular string pair is
+ invalid. */
+ valid = 0;
+ break;
+ }
+ }
+
+ if (!valid)
+ break;
+ }
- if (segsize > 0)
+ if (valid)
+ {
+ for (j = 0; j < 2; j++)
{
- memcpy (mem, static_segments, segsize);
- mem += segsize;
- static_segments += segsize;
+ const struct sysdep_string *sysdep_string =
+ (const struct sysdep_string *)
+ ((char *) data
+ + W (domain->must_swap,
+ j == 0
+ ? orig_sysdep_tab[i]
+ : trans_sysdep_tab[i]));
+ const char *static_segments =
+ (char *) data
+ + W (domain->must_swap, sysdep_string->offset);
+ const struct segment_pair *p =
+ sysdep_string->segments;
+
+ /* Concatenate the segments, and fill
+ inmem_orig_sysdep_tab[k] (for j == 0) and
+ inmem_trans_sysdep_tab[k] (for j == 1). */
+
+ struct sysdep_string_desc *inmem_tab_entry =
+ (j == 0
+ ? inmem_orig_sysdep_tab
+ : inmem_trans_sysdep_tab)
+ + k;
+
+ if (W (domain->must_swap, p->sysdepref)
+ == SEGMENTS_END)
+ {
+ /* Only one static segment. */
+ inmem_tab_entry->length =
+ W (domain->must_swap, p->segsize);
+ inmem_tab_entry->pointer = static_segments;
+ }
+ else
+ {
+ inmem_tab_entry->pointer = mem;
+
+ for (p = sysdep_string->segments;; p++)
+ {
+ nls_uint32 segsize =
+ W (domain->must_swap, p->segsize);
+ nls_uint32 sysdepref =
+ W (domain->must_swap, p->sysdepref);
+ size_t n;
+
+ if (segsize > 0)
+ {
+ memcpy (mem, static_segments, segsize);
+ mem += segsize;
+ static_segments += segsize;
+ }
+
+ if (sysdepref == SEGMENTS_END)
+ break;
+
+ n = strlen (sysdep_segment_values[sysdepref]);
+ memcpy (mem, sysdep_segment_values[sysdepref], n);
+ mem += n;
+ }
+
+ inmem_tab_entry->length =
+ mem - inmem_tab_entry->pointer;
+ }
}
- if (sysdepref == SEGMENTS_END)
- break;
-
- n = strlen (sysdep_segment_values[sysdepref]);
- memcpy (mem, sysdep_segment_values[sysdepref], n);
- mem += n;
+ k++;
}
-
- inmem_orig_sysdep_tab[i].length =
- mem - inmem_orig_sysdep_tab[i].pointer;
}
- }
-
- /* Compute the augmented hash table. */
- for (i = 0; i < domain->hash_size; i++)
- inmem_hash_tab[i] =
- W (domain->must_swap_hash_tab, domain->hash_tab[i]);
- for (i = 0; i < n_sysdep_strings; i++)
- {
- const char *msgid = inmem_orig_sysdep_tab[i].pointer;
- nls_uint32 hash_val = hash_string (msgid);
- nls_uint32 idx = hash_val % domain->hash_size;
- nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2));
-
- for (;;)
+ if (k != n_inmem_sysdep_strings)
+ abort ();
+
+ /* Compute the augmented hash table. */
+ for (i = 0; i < domain->hash_size; i++)
+ inmem_hash_tab[i] =
+ W (domain->must_swap_hash_tab, domain->hash_tab[i]);
+ for (i = 0; i < n_inmem_sysdep_strings; i++)
{
- if (inmem_hash_tab[idx] == 0)
+ const char *msgid = inmem_orig_sysdep_tab[i].pointer;
+ nls_uint32 hash_val = hash_string (msgid);
+ nls_uint32 idx = hash_val % domain->hash_size;
+ nls_uint32 incr =
+ 1 + (hash_val % (domain->hash_size - 2));
+
+ for (;;)
{
- /* Hash table entry is empty. Use it. */
- inmem_hash_tab[idx] = 1 + domain->nstrings + i;
- break;
- }
+ if (inmem_hash_tab[idx] == 0)
+ {
+ /* Hash table entry is empty. Use it. */
+ inmem_hash_tab[idx] = 1 + domain->nstrings + i;
+ break;
+ }
- if (idx >= domain->hash_size - incr)
- idx -= domain->hash_size - incr;
- else
- idx += incr;
+ if (idx >= domain->hash_size - incr)
+ idx -= domain->hash_size - incr;
+ else
+ idx += incr;
+ }
}
- }
- freea (sysdep_segment_values);
+ domain->n_sysdep_strings = n_inmem_sysdep_strings;
+ domain->orig_sysdep_tab = inmem_orig_sysdep_tab;
+ domain->trans_sysdep_tab = inmem_trans_sysdep_tab;
- domain->n_sysdep_strings = n_sysdep_strings;
- domain->orig_sysdep_tab = inmem_orig_sysdep_tab;
- domain->trans_sysdep_tab = inmem_trans_sysdep_tab;
+ domain->hash_tab = inmem_hash_tab;
+ domain->must_swap_hash_tab = 0;
+ }
+ else
+ {
+ domain->n_sysdep_strings = 0;
+ domain->orig_sysdep_tab = NULL;
+ domain->trans_sysdep_tab = NULL;
+ }
- domain->hash_tab = inmem_hash_tab;
- domain->must_swap_hash_tab = 0;
+ freea (sysdep_segment_values);
}
else
{
@@ -1293,8 +1398,7 @@ _nl_load_domain (domain_file, domainbinding)
#ifdef _LIBC
void
internal_function
-_nl_unload_domain (domain)
- struct loaded_domain *domain;
+_nl_unload_domain (struct loaded_domain *domain)
{
if (domain->plural != &__gettext_germanic_plural)
__gettext_free_exp (domain->plural);
diff --git a/intl/localcharset.c b/intl/localcharset.c
index 2b1564e2..4865f103 100644
--- a/intl/localcharset.c
+++ b/intl/localcharset.c
@@ -1,6 +1,6 @@
/* Determine a canonical name for the current locale's character encoding.
- Copyright (C) 2000-2002 Free Software Foundation, Inc.
+ Copyright (C) 2000-2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
@@ -23,6 +23,9 @@
# include <config.h>
#endif
+/* Specification. */
+#include "localcharset.h"
+
#if HAVE_STDDEF_H
# include <stddef.h>
#endif
@@ -64,6 +67,12 @@
# include <os2.h>
#endif
+#if ENABLE_RELOCATABLE
+# include "relocatable.h"
+#else
+# define relocate(pathname) (pathname)
+#endif
+
#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
/* Win32, OS/2, DOS */
# define ISSLASH(C) ((C) == '/' || (C) == '\\')
@@ -77,16 +86,11 @@
# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
#endif
-#ifdef HAVE_GETC_UNLOCKED
+#if HAVE_DECL_GETC_UNLOCKED
# undef getc
# define getc getc_unlocked
#endif
-#ifdef __cplusplus
-/* When compiling with "gcc -x c++", produce a function with C linkage. */
-extern "C" const char * locale_charset (void);
-#endif
-
/* The following static variable is declared 'volatile' to avoid a
possible multithread problem in the function get_charset_aliases. If we
are running in a threaded environment, and if two threads initialize
@@ -110,9 +114,9 @@ get_charset_aliases ()
cp = charset_aliases;
if (cp == NULL)
{
-#if !defined WIN32
+#if !(defined VMS || defined WIN32)
FILE *fp;
- const char *dir = LIBDIR;
+ const char *dir = relocate (LIBDIR);
const char *base = "charset.alias";
char *file_name;
@@ -200,11 +204,36 @@ get_charset_aliases ()
#else
+# if defined VMS
+ /* To avoid the troubles of an extra file charset.alias_vms in the
+ sources of many GNU packages, simply inline the aliases here. */
+ /* The list of encodings is taken from the OpenVMS 7.3-1 documentation
+ "Compaq C Run-Time Library Reference Manual for OpenVMS systems"
+ section 10.7 "Handling Different Character Sets". */
+ cp = "ISO8859-1" "\0" "ISO-8859-1" "\0"
+ "ISO8859-2" "\0" "ISO-8859-2" "\0"
+ "ISO8859-5" "\0" "ISO-8859-5" "\0"
+ "ISO8859-7" "\0" "ISO-8859-7" "\0"
+ "ISO8859-8" "\0" "ISO-8859-8" "\0"
+ "ISO8859-9" "\0" "ISO-8859-9" "\0"
+ /* Japanese */
+ "eucJP" "\0" "EUC-JP" "\0"
+ "SJIS" "\0" "SHIFT_JIS" "\0"
+ "DECKANJI" "\0" "DEC-KANJI" "\0"
+ "SDECKANJI" "\0" "EUC-JP" "\0"
+ /* Chinese */
+ "eucTW" "\0" "EUC-TW" "\0"
+ "DECHANYU" "\0" "DEC-HANYU" "\0"
+ "DECHANZI" "\0" "GB2312" "\0"
+ /* Korean */
+ "DECKOREAN" "\0" "EUC-KR" "\0";
+# endif
+
+# if defined WIN32
/* To avoid the troubles of installing a separate file in the same
directory as the DLL and of retrieving the DLL's directory at
runtime, simply inline the aliases here. */
-# if defined WIN32
cp = "CP936" "\0" "GBK" "\0"
"CP1361" "\0" "JOHAB" "\0"
"CP20127" "\0" "ASCII" "\0"
diff --git a/intl/localcharset.h b/intl/localcharset.h
new file mode 100644
index 00000000..3b137e73
--- /dev/null
+++ b/intl/localcharset.h
@@ -0,0 +1,42 @@
+/* Determine a canonical name for the current locale's character encoding.
+ Copyright (C) 2000-2003 Free Software Foundation, Inc.
+ This file is part of the GNU CHARSET Library.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Library General Public License as published
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+#ifndef _LOCALCHARSET_H
+#define _LOCALCHARSET_H
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Determine the current locale's character encoding, and canonicalize it
+ into one of the canonical names listed in config.charset.
+ The result must not be freed; it is statically allocated.
+ If the canonical name cannot be determined, the result is a non-canonical
+ name. */
+extern const char * locale_charset (void);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* _LOCALCHARSET_H */
diff --git a/intl/locale.alias b/intl/locale.alias
index bd7b9b31..bd6bb256 100644
--- a/intl/locale.alias
+++ b/intl/locale.alias
@@ -1,5 +1,5 @@
# Locale name alias data base.
-# Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
+# Copyright (C) 1996-2001,2003 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU Library General Public License as published
@@ -29,8 +29,8 @@
# Packages using this file:
-bokmal no_NO.ISO-8859-1
-bokml no_NO.ISO-8859-1
+bokmal nb_NO.ISO-8859-1
+bokml nb_NO.ISO-8859-1
catalan ca_ES.ISO-8859-1
croatian hr_HR.ISO-8859-2
czech cs_CZ.ISO-8859-2
@@ -61,9 +61,9 @@ korean ko_KR.eucKR
korean.euc ko_KR.eucKR
ko_KR ko_KR.eucKR
lithuanian lt_LT.ISO-8859-13
-nb_NO no_NO.ISO-8859-1
-nb_NO.ISO-8859-1 no_NO.ISO-8859-1
-norwegian no_NO.ISO-8859-1
+no_NO nb_NO.ISO-8859-1
+no_NO.ISO-8859-1 nb_NO.ISO-8859-1
+norwegian nb_NO.ISO-8859-1
nynorsk nn_NO.ISO-8859-1
polish pl_PL.ISO-8859-2
portuguese pt_PT.ISO-8859-1
diff --git a/intl/localealias.c b/intl/localealias.c
index 456e41e3..2eaf8813 100644
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -1,5 +1,5 @@
/* Handle aliases for locale names.
- Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1995-1999, 2000-2001, 2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
@@ -35,17 +35,23 @@
#include <sys/types.h>
#ifdef __GNUC__
+# undef alloca
# define alloca __builtin_alloca
# define HAVE_ALLOCA 1
#else
-# if defined HAVE_ALLOCA_H || defined _LIBC
-# include <alloca.h>
+# ifdef _MSC_VER
+# include <malloc.h>
+# define alloca _alloca
# else
-# ifdef _AIX
- #pragma alloca
+# if defined HAVE_ALLOCA_H || defined _LIBC
+# include <alloca.h>
# else
-# ifndef alloca
+# ifdef _AIX
+ #pragma alloca
+# else
+# ifndef alloca
char *alloca ();
+# endif
# endif
# endif
# endif
@@ -56,6 +62,12 @@ char *alloca ();
#include "gettextP.h"
+#if ENABLE_RELOCATABLE
+# include "relocatable.h"
+#else
+# define relocate(pathname) (pathname)
+#endif
+
/* @@ end of prolog @@ */
#ifdef _LIBC
@@ -98,11 +110,11 @@ __libc_lock_define_initialized (static, lock);
# define freea(p) free (p)
#endif
-#if defined _LIBC_REENTRANT || defined HAVE_FGETS_UNLOCKED
+#if defined _LIBC_REENTRANT || HAVE_DECL_FGETS_UNLOCKED
# undef fgets
# define fgets(buf, len, s) fgets_unlocked (buf, len, s)
#endif
-#if defined _LIBC_REENTRANT || defined HAVE_FEOF_UNLOCKED
+#if defined _LIBC_REENTRANT || HAVE_DECL_FEOF_UNLOCKED
# undef feof
# define feof(s) feof_unlocked (s)
#endif
@@ -115,25 +127,28 @@ struct alias_map
};
-static char *string_space;
+#ifndef _LIBC
+# define libc_freeres_ptr(decl) decl
+#endif
+
+libc_freeres_ptr (static char *string_space);
static size_t string_space_act;
static size_t string_space_max;
-static struct alias_map *map;
+libc_freeres_ptr (static struct alias_map *map);
static size_t nmap;
static size_t maxmap;
/* Prototypes for local functions. */
-static size_t read_alias_file PARAMS ((const char *fname, int fname_len))
+static size_t read_alias_file (const char *fname, int fname_len)
internal_function;
-static int extend_alias_table PARAMS ((void));
-static int alias_compare PARAMS ((const struct alias_map *map1,
- const struct alias_map *map2));
+static int extend_alias_table (void);
+static int alias_compare (const struct alias_map *map1,
+ const struct alias_map *map2);
const char *
-_nl_expand_alias (name)
- const char *name;
+_nl_expand_alias (const char *name)
{
static const char *locale_alias_path;
struct alias_map *retval;
@@ -156,8 +171,8 @@ _nl_expand_alias (name)
if (nmap > 0)
retval = (struct alias_map *) bsearch (&item, map, nmap,
sizeof (struct alias_map),
- (int (*) PARAMS ((const void *,
- const void *))
+ (int (*) (const void *,
+ const void *)
) alias_compare);
else
retval = NULL;
@@ -199,9 +214,7 @@ _nl_expand_alias (name)
static size_t
internal_function
-read_alias_file (fname, fname_len)
- const char *fname;
- int fname_len;
+read_alias_file (const char *fname, int fname_len)
{
FILE *fp;
char *full_fname;
@@ -217,7 +230,7 @@ read_alias_file (fname, fname_len)
memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile);
#endif
- fp = fopen (full_fname, "r");
+ fp = fopen (relocate (full_fname), "r");
freea (full_fname);
if (fp == NULL)
return 0;
@@ -234,8 +247,10 @@ read_alias_file (fname, fname_len)
a) we are only interested in the first two fields
b) these fields must be usable as file names and so must not
be that long
- */
- char buf[BUFSIZ];
+ We avoid a multi-kilobyte buffer here since this would use up
+ stack space which we might not have if the program ran out of
+ memory. */
+ char buf[400];
char *alias;
char *value;
char *cp;
@@ -244,19 +259,6 @@ read_alias_file (fname, fname_len)
/* EOF reached. */
break;
- /* Possibly not the whole line fits into the buffer. Ignore
- the rest of the line. */
- if (strchr (buf, '\n') == NULL)
- {
- char altbuf[BUFSIZ];
- do
- if (FGETS (altbuf, sizeof altbuf, fp) == NULL)
- /* Make sure the inner loop will be left. The outer loop
- will exit at the `feof' test. */
- break;
- while (strchr (altbuf, '\n') == NULL);
- }
-
cp = buf;
/* Ignore leading white space. */
while (isspace ((unsigned char) cp[0]))
@@ -340,6 +342,14 @@ read_alias_file (fname, fname_len)
++added;
}
}
+
+ /* Possibly not the whole line fits into the buffer. Ignore
+ the rest of the line. */
+ while (strchr (buf, '\n') == NULL)
+ if (FGETS (buf, sizeof buf, fp) == NULL)
+ /* Make sure the inner loop will be left. The outer loop
+ will exit at the `feof' test. */
+ break;
}
/* Should we test for ferror()? I think we have to silently ignore
@@ -348,7 +358,7 @@ read_alias_file (fname, fname_len)
if (added > 0)
qsort (map, nmap, sizeof (struct alias_map),
- (int (*) PARAMS ((const void *, const void *))) alias_compare);
+ (int (*) (const void *, const void *)) alias_compare);
return added;
}
@@ -373,23 +383,8 @@ extend_alias_table ()
}
-#ifdef _LIBC
-static void __attribute__ ((unused))
-free_mem (void)
-{
- if (string_space != NULL)
- free (string_space);
- if (map != NULL)
- free (map);
-}
-text_set_element (__libc_subfreeres, free_mem);
-#endif
-
-
static int
-alias_compare (map1, map2)
- const struct alias_map *map1;
- const struct alias_map *map2;
+alias_compare (const struct alias_map *map1, const struct alias_map *map2)
{
#if defined _LIBC || defined HAVE_STRCASECMP
return strcasecmp (map1->alias, map2->alias);
diff --git a/intl/localename.c b/intl/localename.c
index faacecd5..5662e54f 100644
--- a/intl/localename.c
+++ b/intl/localename.c
@@ -1,5 +1,5 @@
/* Determine the current selected locale.
- Copyright (C) 1995-1999, 2000-2002 Free Software Foundation, Inc.
+ Copyright (C) 1995-1999, 2000-2004 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
@@ -34,6 +34,124 @@
#ifdef WIN32
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
+/* List of language codes, sorted by value:
+ 0x01 LANG_ARABIC
+ 0x02 LANG_BULGARIAN
+ 0x03 LANG_CATALAN
+ 0x04 LANG_CHINESE
+ 0x05 LANG_CZECH
+ 0x06 LANG_DANISH
+ 0x07 LANG_GERMAN
+ 0x08 LANG_GREEK
+ 0x09 LANG_ENGLISH
+ 0x0a LANG_SPANISH
+ 0x0b LANG_FINNISH
+ 0x0c LANG_FRENCH
+ 0x0d LANG_HEBREW
+ 0x0e LANG_HUNGARIAN
+ 0x0f LANG_ICELANDIC
+ 0x10 LANG_ITALIAN
+ 0x11 LANG_JAPANESE
+ 0x12 LANG_KOREAN
+ 0x13 LANG_DUTCH
+ 0x14 LANG_NORWEGIAN
+ 0x15 LANG_POLISH
+ 0x16 LANG_PORTUGUESE
+ 0x17 LANG_RHAETO_ROMANCE
+ 0x18 LANG_ROMANIAN
+ 0x19 LANG_RUSSIAN
+ 0x1a LANG_CROATIAN == LANG_SERBIAN
+ 0x1b LANG_SLOVAK
+ 0x1c LANG_ALBANIAN
+ 0x1d LANG_SWEDISH
+ 0x1e LANG_THAI
+ 0x1f LANG_TURKISH
+ 0x20 LANG_URDU
+ 0x21 LANG_INDONESIAN
+ 0x22 LANG_UKRAINIAN
+ 0x23 LANG_BELARUSIAN
+ 0x24 LANG_SLOVENIAN
+ 0x25 LANG_ESTONIAN
+ 0x26 LANG_LATVIAN
+ 0x27 LANG_LITHUANIAN
+ 0x28 LANG_TAJIK
+ 0x29 LANG_FARSI
+ 0x2a LANG_VIETNAMESE
+ 0x2b LANG_ARMENIAN
+ 0x2c LANG_AZERI
+ 0x2d LANG_BASQUE
+ 0x2e LANG_SORBIAN
+ 0x2f LANG_MACEDONIAN
+ 0x30 LANG_SUTU
+ 0x31 LANG_TSONGA
+ 0x32 LANG_TSWANA
+ 0x33 LANG_VENDA
+ 0x34 LANG_XHOSA
+ 0x35 LANG_ZULU
+ 0x36 LANG_AFRIKAANS
+ 0x37 LANG_GEORGIAN
+ 0x38 LANG_FAEROESE
+ 0x39 LANG_HINDI
+ 0x3a LANG_MALTESE
+ 0x3b LANG_SAAMI
+ 0x3c LANG_GAELIC
+ 0x3d LANG_YIDDISH
+ 0x3e LANG_MALAY
+ 0x3f LANG_KAZAK
+ 0x40 LANG_KYRGYZ
+ 0x41 LANG_SWAHILI
+ 0x42 LANG_TURKMEN
+ 0x43 LANG_UZBEK
+ 0x44 LANG_TATAR
+ 0x45 LANG_BENGALI
+ 0x46 LANG_PUNJABI
+ 0x47 LANG_GUJARATI
+ 0x48 LANG_ORIYA
+ 0x49 LANG_TAMIL
+ 0x4a LANG_TELUGU
+ 0x4b LANG_KANNADA
+ 0x4c LANG_MALAYALAM
+ 0x4d LANG_ASSAMESE
+ 0x4e LANG_MARATHI
+ 0x4f LANG_SANSKRIT
+ 0x50 LANG_MONGOLIAN
+ 0x51 LANG_TIBETAN
+ 0x52 LANG_WELSH
+ 0x53 LANG_CAMBODIAN
+ 0x54 LANG_LAO
+ 0x55 LANG_BURMESE
+ 0x56 LANG_GALICIAN
+ 0x57 LANG_KONKANI
+ 0x58 LANG_MANIPURI
+ 0x59 LANG_SINDHI
+ 0x5a LANG_SYRIAC
+ 0x5b LANG_SINHALESE
+ 0x5c LANG_CHEROKEE
+ 0x5d LANG_INUKTITUT
+ 0x5e LANG_AMHARIC
+ 0x5f LANG_TAMAZIGHT
+ 0x60 LANG_KASHMIRI
+ 0x61 LANG_NEPALI
+ 0x62 LANG_FRISIAN
+ 0x63 LANG_PASHTO
+ 0x64 LANG_TAGALOG
+ 0x65 LANG_DIVEHI
+ 0x66 LANG_EDO
+ 0x67 LANG_FULFULDE
+ 0x68 LANG_HAUSA
+ 0x69 LANG_IBIBIO
+ 0x6a LANG_YORUBA
+ 0x70 LANG_IGBO
+ 0x71 LANG_KANURI
+ 0x72 LANG_OROMO
+ 0x73 LANG_TIGRINYA
+ 0x74 LANG_GUARANI
+ 0x75 LANG_HAWAIIAN
+ 0x76 LANG_LATIN
+ 0x77 LANG_SOMALI
+ 0x78 LANG_YI
+ 0x79 LANG_PAPIAMENTU
+*/
/* Mingw headers don't have latest language and sublanguage codes. */
# ifndef LANG_AFRIKAANS
# define LANG_AFRIKAANS 0x36
@@ -41,6 +159,9 @@
# ifndef LANG_ALBANIAN
# define LANG_ALBANIAN 0x1c
# endif
+# ifndef LANG_AMHARIC
+# define LANG_AMHARIC 0x5e
+# endif
# ifndef LANG_ARABIC
# define LANG_ARABIC 0x01
# endif
@@ -62,12 +183,24 @@
# ifndef LANG_BENGALI
# define LANG_BENGALI 0x45
# endif
+# ifndef LANG_BURMESE
+# define LANG_BURMESE 0x55
+# endif
+# ifndef LANG_CAMBODIAN
+# define LANG_CAMBODIAN 0x53
+# endif
# ifndef LANG_CATALAN
# define LANG_CATALAN 0x03
# endif
+# ifndef LANG_CHEROKEE
+# define LANG_CHEROKEE 0x5c
+# endif
# ifndef LANG_DIVEHI
# define LANG_DIVEHI 0x65
# endif
+# ifndef LANG_EDO
+# define LANG_EDO 0x66
+# endif
# ifndef LANG_ESTONIAN
# define LANG_ESTONIAN 0x25
# endif
@@ -77,27 +210,57 @@
# ifndef LANG_FARSI
# define LANG_FARSI 0x29
# endif
+# ifndef LANG_FRISIAN
+# define LANG_FRISIAN 0x62
+# endif
+# ifndef LANG_FULFULDE
+# define LANG_FULFULDE 0x67
+# endif
+# ifndef LANG_GAELIC
+# define LANG_GAELIC 0x3c
+# endif
# ifndef LANG_GALICIAN
# define LANG_GALICIAN 0x56
# endif
# ifndef LANG_GEORGIAN
# define LANG_GEORGIAN 0x37
# endif
+# ifndef LANG_GUARANI
+# define LANG_GUARANI 0x74
+# endif
# ifndef LANG_GUJARATI
# define LANG_GUJARATI 0x47
# endif
+# ifndef LANG_HAUSA
+# define LANG_HAUSA 0x68
+# endif
+# ifndef LANG_HAWAIIAN
+# define LANG_HAWAIIAN 0x75
+# endif
# ifndef LANG_HEBREW
# define LANG_HEBREW 0x0d
# endif
# ifndef LANG_HINDI
# define LANG_HINDI 0x39
# endif
+# ifndef LANG_IBIBIO
+# define LANG_IBIBIO 0x69
+# endif
+# ifndef LANG_IGBO
+# define LANG_IGBO 0x70
+# endif
# ifndef LANG_INDONESIAN
# define LANG_INDONESIAN 0x21
# endif
+# ifndef LANG_INUKTITUT
+# define LANG_INUKTITUT 0x5d
+# endif
# ifndef LANG_KANNADA
# define LANG_KANNADA 0x4b
# endif
+# ifndef LANG_KANURI
+# define LANG_KANURI 0x71
+# endif
# ifndef LANG_KASHMIRI
# define LANG_KASHMIRI 0x60
# endif
@@ -110,6 +273,12 @@
# ifndef LANG_KYRGYZ
# define LANG_KYRGYZ 0x40
# endif
+# ifndef LANG_LAO
+# define LANG_LAO 0x54
+# endif
+# ifndef LANG_LATIN
+# define LANG_LATIN 0x76
+# endif
# ifndef LANG_LATVIAN
# define LANG_LATVIAN 0x26
# endif
@@ -125,6 +294,9 @@
# ifndef LANG_MALAYALAM
# define LANG_MALAYALAM 0x4c
# endif
+# ifndef LANG_MALTESE
+# define LANG_MALTESE 0x3a
+# endif
# ifndef LANG_MANIPURI
# define LANG_MANIPURI 0x58
# endif
@@ -140,9 +312,24 @@
# ifndef LANG_ORIYA
# define LANG_ORIYA 0x48
# endif
+# ifndef LANG_OROMO
+# define LANG_OROMO 0x72
+# endif
+# ifndef LANG_PAPIAMENTU
+# define LANG_PAPIAMENTU 0x79
+# endif
+# ifndef LANG_PASHTO
+# define LANG_PASHTO 0x63
+# endif
# ifndef LANG_PUNJABI
# define LANG_PUNJABI 0x46
# endif
+# ifndef LANG_RHAETO_ROMANCE
+# define LANG_RHAETO_ROMANCE 0x17
+# endif
+# ifndef LANG_SAAMI
+# define LANG_SAAMI 0x3b
+# endif
# ifndef LANG_SANSKRIT
# define LANG_SANSKRIT 0x4f
# endif
@@ -152,18 +339,36 @@
# ifndef LANG_SINDHI
# define LANG_SINDHI 0x59
# endif
+# ifndef LANG_SINHALESE
+# define LANG_SINHALESE 0x5b
+# endif
# ifndef LANG_SLOVAK
# define LANG_SLOVAK 0x1b
# endif
+# ifndef LANG_SOMALI
+# define LANG_SOMALI 0x77
+# endif
# ifndef LANG_SORBIAN
# define LANG_SORBIAN 0x2e
# endif
+# ifndef LANG_SUTU
+# define LANG_SUTU 0x30
+# endif
# ifndef LANG_SWAHILI
# define LANG_SWAHILI 0x41
# endif
# ifndef LANG_SYRIAC
# define LANG_SYRIAC 0x5a
# endif
+# ifndef LANG_TAGALOG
+# define LANG_TAGALOG 0x64
+# endif
+# ifndef LANG_TAJIK
+# define LANG_TAJIK 0x28
+# endif
+# ifndef LANG_TAMAZIGHT
+# define LANG_TAMAZIGHT 0x5f
+# endif
# ifndef LANG_TAMIL
# define LANG_TAMIL 0x49
# endif
@@ -176,6 +381,21 @@
# ifndef LANG_THAI
# define LANG_THAI 0x1e
# endif
+# ifndef LANG_TIBETAN
+# define LANG_TIBETAN 0x51
+# endif
+# ifndef LANG_TIGRINYA
+# define LANG_TIGRINYA 0x73
+# endif
+# ifndef LANG_TSONGA
+# define LANG_TSONGA 0x31
+# endif
+# ifndef LANG_TSWANA
+# define LANG_TSWANA 0x32
+# endif
+# ifndef LANG_TURKMEN
+# define LANG_TURKMEN 0x42
+# endif
# ifndef LANG_UKRAINIAN
# define LANG_UKRAINIAN 0x22
# endif
@@ -185,9 +405,30 @@
# ifndef LANG_UZBEK
# define LANG_UZBEK 0x43
# endif
+# ifndef LANG_VENDA
+# define LANG_VENDA 0x33
+# endif
# ifndef LANG_VIETNAMESE
# define LANG_VIETNAMESE 0x2a
# endif
+# ifndef LANG_WELSH
+# define LANG_WELSH 0x52
+# endif
+# ifndef LANG_XHOSA
+# define LANG_XHOSA 0x34
+# endif
+# ifndef LANG_YI
+# define LANG_YI 0x78
+# endif
+# ifndef LANG_YIDDISH
+# define LANG_YIDDISH 0x3d
+# endif
+# ifndef LANG_YORUBA
+# define LANG_YORUBA 0x6a
+# endif
+# ifndef LANG_ZULU
+# define LANG_ZULU 0x35
+# endif
# ifndef SUBLANG_ARABIC_SAUDI_ARABIA
# define SUBLANG_ARABIC_SAUDI_ARABIA 0x01
# endif
@@ -242,6 +483,12 @@
# ifndef SUBLANG_AZERI_CYRILLIC
# define SUBLANG_AZERI_CYRILLIC 0x02
# endif
+# ifndef SUBLANG_BENGALI_INDIA
+# define SUBLANG_BENGALI_INDIA 0x00
+# endif
+# ifndef SUBLANG_BENGALI_BANGLADESH
+# define SUBLANG_BENGALI_BANGLADESH 0x01
+# endif
# ifndef SUBLANG_CHINESE_MACAU
# define SUBLANG_CHINESE_MACAU 0x05
# endif
@@ -266,12 +513,54 @@
# ifndef SUBLANG_ENGLISH_PHILIPPINES
# define SUBLANG_ENGLISH_PHILIPPINES 0x0d
# endif
+# ifndef SUBLANG_ENGLISH_INDONESIA
+# define SUBLANG_ENGLISH_INDONESIA 0x0e
+# endif
+# ifndef SUBLANG_ENGLISH_HONGKONG
+# define SUBLANG_ENGLISH_HONGKONG 0x0f
+# endif
+# ifndef SUBLANG_ENGLISH_INDIA
+# define SUBLANG_ENGLISH_INDIA 0x10
+# endif
+# ifndef SUBLANG_ENGLISH_MALAYSIA
+# define SUBLANG_ENGLISH_MALAYSIA 0x11
+# endif
+# ifndef SUBLANG_ENGLISH_SINGAPORE
+# define SUBLANG_ENGLISH_SINGAPORE 0x12
+# endif
# ifndef SUBLANG_FRENCH_LUXEMBOURG
# define SUBLANG_FRENCH_LUXEMBOURG 0x05
# endif
# ifndef SUBLANG_FRENCH_MONACO
# define SUBLANG_FRENCH_MONACO 0x06
# endif
+# ifndef SUBLANG_FRENCH_WESTINDIES
+# define SUBLANG_FRENCH_WESTINDIES 0x07
+# endif
+# ifndef SUBLANG_FRENCH_REUNION
+# define SUBLANG_FRENCH_REUNION 0x08
+# endif
+# ifndef SUBLANG_FRENCH_CONGO
+# define SUBLANG_FRENCH_CONGO 0x09
+# endif
+# ifndef SUBLANG_FRENCH_SENEGAL
+# define SUBLANG_FRENCH_SENEGAL 0x0a
+# endif
+# ifndef SUBLANG_FRENCH_CAMEROON
+# define SUBLANG_FRENCH_CAMEROON 0x0b
+# endif
+# ifndef SUBLANG_FRENCH_COTEDIVOIRE
+# define SUBLANG_FRENCH_COTEDIVOIRE 0x0c
+# endif
+# ifndef SUBLANG_FRENCH_MALI
+# define SUBLANG_FRENCH_MALI 0x0d
+# endif
+# ifndef SUBLANG_FRENCH_MOROCCO
+# define SUBLANG_FRENCH_MOROCCO 0x0e
+# endif
+# ifndef SUBLANG_FRENCH_HAITI
+# define SUBLANG_FRENCH_HAITI 0x0f
+# endif
# ifndef SUBLANG_GERMAN_LUXEMBOURG
# define SUBLANG_GERMAN_LUXEMBOURG 0x04
# endif
@@ -290,12 +579,30 @@
# ifndef SUBLANG_NEPALI_INDIA
# define SUBLANG_NEPALI_INDIA 0x02
# endif
+# ifndef SUBLANG_PUNJABI_INDIA
+# define SUBLANG_PUNJABI_INDIA 0x00
+# endif
+# ifndef SUBLANG_PUNJABI_PAKISTAN
+# define SUBLANG_PUNJABI_PAKISTAN 0x01
+# endif
+# ifndef SUBLANG_ROMANIAN_ROMANIA
+# define SUBLANG_ROMANIAN_ROMANIA 0x00
+# endif
+# ifndef SUBLANG_ROMANIAN_MOLDOVA
+# define SUBLANG_ROMANIAN_MOLDOVA 0x01
+# endif
# ifndef SUBLANG_SERBIAN_LATIN
# define SUBLANG_SERBIAN_LATIN 0x02
# endif
# ifndef SUBLANG_SERBIAN_CYRILLIC
# define SUBLANG_SERBIAN_CYRILLIC 0x03
# endif
+# ifndef SUBLANG_SINDHI_INDIA
+# define SUBLANG_SINDHI_INDIA 0x00
+# endif
+# ifndef SUBLANG_SINDHI_PAKISTAN
+# define SUBLANG_SINDHI_PAKISTAN 0x01
+# endif
# ifndef SUBLANG_SPANISH_GUATEMALA
# define SUBLANG_SPANISH_GUATEMALA 0x04
# endif
@@ -350,6 +657,18 @@
# ifndef SUBLANG_SWEDISH_FINLAND
# define SUBLANG_SWEDISH_FINLAND 0x02
# endif
+# ifndef SUBLANG_TAMAZIGHT_ARABIC
+# define SUBLANG_TAMAZIGHT_ARABIC 0x01
+# endif
+# ifndef SUBLANG_TAMAZIGHT_LATIN
+# define SUBLANG_TAMAZIGHT_LATIN 0x02
+# endif
+# ifndef SUBLANG_TIGRINYA_ETHIOPIA
+# define SUBLANG_TIGRINYA_ETHIOPIA 0x00
+# endif
+# ifndef SUBLANG_TIGRINYA_ERITREA
+# define SUBLANG_TIGRINYA_ERITREA 0x01
+# endif
# ifndef SUBLANG_URDU_PAKISTAN
# define SUBLANG_URDU_PAKISTAN 0x01
# endif
@@ -381,9 +700,7 @@
The result must not be freed; it is statically allocated. */
const char *
-_nl_locale_name (category, categoryname)
- int category;
- const char *categoryname;
+_nl_locale_name (int category, const char *categoryname)
{
const char *retval;
@@ -454,7 +771,7 @@ _nl_locale_name (category, categoryname)
{
case LANG_AFRIKAANS: return "af_ZA";
case LANG_ALBANIAN: return "sq_AL";
- case 0x5e: /* AMHARIC */ return "am_ET";
+ case LANG_AMHARIC: return "am_ET";
case LANG_ARABIC:
switch (sub)
{
@@ -489,12 +806,18 @@ _nl_locale_name (category, categoryname)
case LANG_BASQUE:
return "eu"; /* Ambiguous: could be "eu_ES" or "eu_FR". */
case LANG_BELARUSIAN: return "be_BY";
- case LANG_BENGALI: return "bn_IN";
+ case LANG_BENGALI:
+ switch (sub)
+ {
+ case SUBLANG_BENGALI_INDIA: return "bn_IN";
+ case SUBLANG_BENGALI_BANGLADESH: return "bn_BD";
+ }
+ return "bn";
case LANG_BULGARIAN: return "bg_BG";
- case 0x55: /* BURMESE */ return "my_MM";
- case 0x53: /* CAMBODIAN */ return "km_KH";
+ case LANG_BURMESE: return "my_MM";
+ case LANG_CAMBODIAN: return "km_KH";
case LANG_CATALAN: return "ca_ES";
- case 0x5c: /* CHEROKEE */ return "chr_US";
+ case LANG_CHEROKEE: return "chr_US";
case LANG_CHINESE:
switch (sub)
{
@@ -516,13 +839,13 @@ _nl_locale_name (category, categoryname)
switch (sub)
{
case SUBLANG_DEFAULT: return "hr_HR";
- case SUBLANG_SERBIAN_LATIN: return "sr_YU";
- case SUBLANG_SERBIAN_CYRILLIC: return "sr_YU@cyrillic";
+ case SUBLANG_SERBIAN_LATIN: return "sr_CS";
+ case SUBLANG_SERBIAN_CYRILLIC: return "sr_CS@cyrillic";
}
return "hr";
case LANG_CZECH: return "cs_CZ";
case LANG_DANISH: return "da_DK";
- case LANG_DIVEHI: return "div_MV";
+ case LANG_DIVEHI: return "dv_MV";
case LANG_DUTCH:
switch (sub)
{
@@ -530,7 +853,7 @@ _nl_locale_name (category, categoryname)
case SUBLANG_DUTCH_BELGIAN: /* FLEMISH, VLAAMS */ return "nl_BE";
}
return "nl";
- case 0x66: /* EDO */ return "bin_NG";
+ case LANG_EDO: return "bin_NG";
case LANG_ENGLISH:
switch (sub)
{
@@ -551,6 +874,11 @@ _nl_locale_name (category, categoryname)
case SUBLANG_ENGLISH_TRINIDAD: return "en_TT";
case SUBLANG_ENGLISH_ZIMBABWE: return "en_ZW";
case SUBLANG_ENGLISH_PHILIPPINES: return "en_PH";
+ case SUBLANG_ENGLISH_INDONESIA: return "en_ID";
+ case SUBLANG_ENGLISH_HONGKONG: return "en_HK";
+ case SUBLANG_ENGLISH_INDIA: return "en_IN";
+ case SUBLANG_ENGLISH_MALAYSIA: return "en_MY";
+ case SUBLANG_ENGLISH_SINGAPORE: return "en_SG";
}
return "en";
case LANG_ESTONIAN: return "et_EE";
@@ -566,11 +894,22 @@ _nl_locale_name (category, categoryname)
case SUBLANG_FRENCH_SWISS: return "fr_CH";
case SUBLANG_FRENCH_LUXEMBOURG: return "fr_LU";
case SUBLANG_FRENCH_MONACO: return "fr_MC";
+ case SUBLANG_FRENCH_WESTINDIES: return "fr"; /* Caribbean? */
+ case SUBLANG_FRENCH_REUNION: return "fr_RE";
+ case SUBLANG_FRENCH_CONGO: return "fr_CG";
+ case SUBLANG_FRENCH_SENEGAL: return "fr_SN";
+ case SUBLANG_FRENCH_CAMEROON: return "fr_CM";
+ case SUBLANG_FRENCH_COTEDIVOIRE: return "fr_CI";
+ case SUBLANG_FRENCH_MALI: return "fr_ML";
+ case SUBLANG_FRENCH_MOROCCO: return "fr_MA";
+ case SUBLANG_FRENCH_HAITI: return "fr_HT";
}
return "fr";
- case 0x62: /* FRISIAN */ return "fy_NL";
- case 0x67: /* FULFULDE */ return "ful_NG";
- case 0x3c: /* GAELIC */
+ case LANG_FRISIAN: return "fy_NL";
+ case LANG_FULFULDE:
+ /* Spoken in Nigeria, Guinea, Senegal, Mali, Niger, Cameroon, Benin. */
+ return "ff_NG";
+ case LANG_GAELIC:
switch (sub)
{
case 0x01: /* SCOTTISH */ return "gd_GB";
@@ -590,21 +929,21 @@ _nl_locale_name (category, categoryname)
}
return "de";
case LANG_GREEK: return "el_GR";
- case 0x74: /* GUARANI */ return "gn_PY";
+ case LANG_GUARANI: return "gn_PY";
case LANG_GUJARATI: return "gu_IN";
- case 0x68: /* HAUSA */ return "ha_NG";
- case 0x75: /* HAWAIIAN */
+ case LANG_HAUSA: return "ha_NG";
+ case LANG_HAWAIIAN:
/* FIXME: Do they mean Hawaiian ("haw_US", 1000 speakers)
or Hawaii Creole English ("cpe_US", 600000 speakers)? */
return "cpe_US";
case LANG_HEBREW: return "he_IL";
case LANG_HINDI: return "hi_IN";
case LANG_HUNGARIAN: return "hu_HU";
- case 0x69: /* IBIBIO */ return "nic_NG";
+ case LANG_IBIBIO: return "nic_NG";
case LANG_ICELANDIC: return "is_IS";
- case 0x70: /* IGBO */ return "ibo_NG";
+ case LANG_IGBO: return "ig_NG";
case LANG_INDONESIAN: return "id_ID";
- case 0x5d: /* INUKTITUT */ return "iu_CA";
+ case LANG_INUKTITUT: return "iu_CA";
case LANG_ITALIAN:
switch (sub)
{
@@ -614,7 +953,7 @@ _nl_locale_name (category, categoryname)
return "it";
case LANG_JAPANESE: return "ja_JP";
case LANG_KANNADA: return "kn_IN";
- case 0x71: /* KANURI */ return "kau_NG";
+ case LANG_KANURI: return "kr_NG";
case LANG_KASHMIRI:
switch (sub)
{
@@ -628,8 +967,8 @@ _nl_locale_name (category, categoryname)
return "kok_IN";
case LANG_KOREAN: return "ko_KR";
case LANG_KYRGYZ: return "ky_KG";
- case 0x54: /* LAO */ return "lo_LA";
- case 0x76: /* LATIN */ return "la_VA";
+ case LANG_LAO: return "lo_LA";
+ case LANG_LATIN: return "la_VA";
case LANG_LATVIAN: return "lv_LV";
case LANG_LITHUANIAN: return "lt_LT";
case LANG_MACEDONIAN: return "mk_MK";
@@ -641,7 +980,7 @@ _nl_locale_name (category, categoryname)
}
return "ms";
case LANG_MALAYALAM: return "ml_IN";
- case 0x3a: /* MALTESE */ return "mt_MT";
+ case LANG_MALTESE: return "mt_MT";
case LANG_MANIPURI:
/* FIXME: Adjust this when such locales appear on Unix. */
return "mni_IN";
@@ -663,9 +1002,9 @@ _nl_locale_name (category, categoryname)
}
return "no";
case LANG_ORIYA: return "or_IN";
- case 0x72: /* OROMO */ return "om_ET";
- case 0x79: /* PAPIAMENTU */ return "pap_AN";
- case 0x63: /* PASHTO */
+ case LANG_OROMO: return "om_ET";
+ case LANG_PAPIAMENTU: return "pap_AN";
+ case LANG_PASHTO:
return "ps"; /* Ambiguous: could be "ps_PK" or "ps_AF". */
case LANG_POLISH: return "pl_PL";
case LANG_PORTUGUESE:
@@ -677,18 +1016,36 @@ _nl_locale_name (category, categoryname)
case SUBLANG_PORTUGUESE_BRAZILIAN: return "pt_BR";
}
return "pt";
- case LANG_PUNJABI: return "pa_IN";
- case 0x17: /* RHAETO-ROMANCE */ return "rm_CH";
- case LANG_ROMANIAN: return "ro_RO";
+ case LANG_PUNJABI:
+ switch (sub)
+ {
+ case SUBLANG_PUNJABI_INDIA: return "pa_IN"; /* Gurmukhi script */
+ case SUBLANG_PUNJABI_PAKISTAN: return "pa_PK"; /* Arabic script */
+ }
+ return "pa";
+ case LANG_RHAETO_ROMANCE: return "rm_CH";
+ case LANG_ROMANIAN:
+ switch (sub)
+ {
+ case SUBLANG_ROMANIAN_ROMANIA: return "ro_RO";
+ case SUBLANG_ROMANIAN_MOLDOVA: return "ro_MD";
+ }
+ return "ro";
case LANG_RUSSIAN:
- return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA". */
- case 0x3b: /* SAMI */ return "se_NO";
+ return "ru"; /* Ambiguous: could be "ru_RU" or "ru_UA" or "ru_MD". */
+ case LANG_SAAMI: /* actually Northern Sami */ return "se_NO";
case LANG_SANSKRIT: return "sa_IN";
- case LANG_SINDHI: return "sd";
- case 0x5b: /* SINHALESE */ return "si_LK";
+ case LANG_SINDHI:
+ switch (sub)
+ {
+ case SUBLANG_SINDHI_INDIA: return "sd_IN";
+ case SUBLANG_SINDHI_PAKISTAN: return "sd_PK";
+ }
+ return "sd";
+ case LANG_SINHALESE: return "si_LK";
case LANG_SLOVAK: return "sk_SK";
case LANG_SLOVENIAN: return "sl_SI";
- case 0x77: /* SOMALI */ return "so_SO";
+ case LANG_SOMALI: return "so_SO";
case LANG_SORBIAN:
/* FIXME: Adjust this when such locales appear on Unix. */
return "wen_DE";
@@ -718,7 +1075,7 @@ _nl_locale_name (category, categoryname)
case SUBLANG_SPANISH_PUERTO_RICO: return "es_PR";
}
return "es";
- case 0x30: /* SUTU */ return "bnt_TZ";
+ case LANG_SUTU: return "bnt_TZ"; /* or "st_LS" or "nso_ZA"? */
case LANG_SWAHILI: return "sw_KE";
case LANG_SWEDISH:
switch (sub)
@@ -728,19 +1085,33 @@ _nl_locale_name (category, categoryname)
}
return "sv";
case LANG_SYRIAC: return "syr_TR"; /* An extinct language. */
- case 0x64: /* TAGALOG */ return "tl_PH";
- case 0x28: /* TAJIK */ return "tg_TJ";
- case 0x5f: /* TAMAZIGHT */ return "ber_MA";
+ case LANG_TAGALOG: return "tl_PH";
+ case LANG_TAJIK: return "tg_TJ";
+ case LANG_TAMAZIGHT:
+ switch (sub)
+ {
+ /* FIXME: Adjust this when Tamazight locales appear on Unix. */
+ case SUBLANG_TAMAZIGHT_ARABIC: return "ber_MA@arabic";
+ case SUBLANG_TAMAZIGHT_LATIN: return "ber_MA@latin";
+ }
+ return "ber_MA";
case LANG_TAMIL:
return "ta"; /* Ambiguous: could be "ta_IN" or "ta_LK" or "ta_SG". */
case LANG_TATAR: return "tt_RU";
case LANG_TELUGU: return "te_IN";
case LANG_THAI: return "th_TH";
- case 0x51: /* TIBETAN */ return "bo_CN";
- case 0x73: /* TIGRINYA */ return "ti_ET";
- case 0x31: /* TSONGA */ return "ts_ZA";
+ case LANG_TIBETAN: return "bo_CN";
+ case LANG_TIGRINYA:
+ switch (sub)
+ {
+ case SUBLANG_TIGRINYA_ETHIOPIA: return "ti_ET";
+ case SUBLANG_TIGRINYA_ERITREA: return "ti_ER";
+ }
+ return "ti";
+ case LANG_TSONGA: return "ts_ZA";
+ case LANG_TSWANA: return "tn_BW";
case LANG_TURKISH: return "tr_TR";
- case 0x42: /* TURKMEN */ return "tk_TM";
+ case LANG_TURKMEN: return "tk_TM";
case LANG_UKRAINIAN: return "uk_UA";
case LANG_URDU:
switch (sub)
@@ -752,19 +1123,18 @@ _nl_locale_name (category, categoryname)
case LANG_UZBEK:
switch (sub)
{
- /* FIXME: Adjust this when Uzbek locales appear on Unix. */
- case SUBLANG_UZBEK_LATIN: return "uz_UZ@latin";
+ case SUBLANG_UZBEK_LATIN: return "uz_UZ";
case SUBLANG_UZBEK_CYRILLIC: return "uz_UZ@cyrillic";
}
return "uz";
- case 0x33: /* VENDA */ return "ven_ZA";
+ case LANG_VENDA: return "ve_ZA";
case LANG_VIETNAMESE: return "vi_VN";
- case 0x52: /* WELSH */ return "cy_GB";
- case 0x34: /* XHOSA */ return "xh_ZA";
- case 0x78: /* YI */ return "sit_CN";
- case 0x3d: /* YIDDISH */ return "yi_IL";
- case 0x6a: /* YORUBA */ return "yo_NG";
- case 0x35: /* ZULU */ return "zu_ZA";
+ case LANG_WELSH: return "cy_GB";
+ case LANG_XHOSA: return "xh_ZA";
+ case LANG_YI: return "sit_CN";
+ case LANG_YIDDISH: return "yi_IL";
+ case LANG_YORUBA: return "yo_NG";
+ case LANG_ZULU: return "zu_ZA";
default: return "C";
}
diff --git a/intl/log.c b/intl/log.c
new file mode 100644
index 00000000..cb6076e8
--- /dev/null
+++ b/intl/log.c
@@ -0,0 +1,98 @@
+/* Log file output.
+ Copyright (C) 2003 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Library General Public License as published
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+/* Written by Bruno Haible <bruno@clisp.org>. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* Print an ASCII string with quotes and escape sequences where needed. */
+static void
+print_escaped (FILE *stream, const char *str)
+{
+ putc ('"', stream);
+ for (; *str != '\0'; str++)
+ if (*str == '\n')
+ {
+ fputs ("\\n\"", stream);
+ if (str[1] == '\0')
+ return;
+ fputs ("\n\"", stream);
+ }
+ else
+ {
+ if (*str == '"' || *str == '\\')
+ putc ('\\', stream);
+ putc (*str, stream);
+ }
+ putc ('"', stream);
+}
+
+/* Add to the log file an entry denoting a failed translation. */
+void
+_nl_log_untranslated (const char *logfilename, const char *domainname,
+ const char *msgid1, const char *msgid2, int plural)
+{
+ static char *last_logfilename = NULL;
+ static FILE *last_logfile = NULL;
+ FILE *logfile;
+
+ /* Can we reuse the last opened logfile? */
+ if (last_logfilename == NULL || strcmp (logfilename, last_logfilename) != 0)
+ {
+ /* Close the last used logfile. */
+ if (last_logfilename != NULL)
+ {
+ if (last_logfile != NULL)
+ {
+ fclose (last_logfile);
+ last_logfile = NULL;
+ }
+ free (last_logfilename);
+ last_logfilename = NULL;
+ }
+ /* Open the logfile. */
+ last_logfilename = (char *) malloc (strlen (logfilename) + 1);
+ if (last_logfilename == NULL)
+ return;
+ strcpy (last_logfilename, logfilename);
+ last_logfile = fopen (logfilename, "a");
+ if (last_logfile == NULL)
+ return;
+ }
+ logfile = last_logfile;
+
+ fprintf (logfile, "domain ");
+ print_escaped (logfile, domainname);
+ fprintf (logfile, "\nmsgid ");
+ print_escaped (logfile, msgid1);
+ if (plural)
+ {
+ fprintf (logfile, "\nmsgid_plural ");
+ print_escaped (logfile, msgid2);
+ fprintf (logfile, "\nmsgstr[0] \"\"\n");
+ }
+ else
+ fprintf (logfile, "\nmsgstr \"\"\n");
+ putc ('\n', logfile);
+}
diff --git a/intl/ngettext.c b/intl/ngettext.c
index 69fe1f74..e73e00c4 100644
--- a/intl/ngettext.c
+++ b/intl/ngettext.c
@@ -1,5 +1,5 @@
/* Implementation of ngettext(3) function.
- Copyright (C) 1995, 1997, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1997, 2000-2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
@@ -44,7 +44,7 @@
prefix. So we have to make a difference here. */
#ifdef _LIBC
# define NGETTEXT __ngettext
-# define DCNGETTEXT INTUSE(__dcngettext)
+# define DCNGETTEXT __dcngettext
#else
# define NGETTEXT libintl_ngettext
# define DCNGETTEXT libintl_dcngettext
@@ -54,10 +54,7 @@
LC_MESSAGES locale. If not found, returns MSGID itself (the default
text). */
char *
-NGETTEXT (msgid1, msgid2, n)
- const char *msgid1;
- const char *msgid2;
- unsigned long int n;
+NGETTEXT (const char *msgid1, const char *msgid2, unsigned long int n)
{
return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES);
}
diff --git a/intl/plural-exp.c b/intl/plural-exp.c
index c937c011..8c04e642 100644
--- a/intl/plural-exp.c
+++ b/intl/plural-exp.c
@@ -1,5 +1,5 @@
/* Expression parsing for plural form selection.
- Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
This program is free software; you can redistribute it and/or modify it
@@ -96,10 +96,8 @@ init_germanic_plural ()
void
internal_function
-EXTRACT_PLURAL_EXPRESSION (nullentry, pluralp, npluralsp)
- const char *nullentry;
- struct expression **pluralp;
- unsigned long int *npluralsp;
+EXTRACT_PLURAL_EXPRESSION (const char *nullentry, struct expression **pluralp,
+ unsigned long int *npluralsp)
{
if (nullentry != NULL)
{
diff --git a/intl/plural-exp.h b/intl/plural-exp.h
index 9e5d1658..49e2c5bf 100644
--- a/intl/plural-exp.h
+++ b/intl/plural-exp.h
@@ -1,5 +1,5 @@
/* Expression parsing and evaluation for plural form selection.
- Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 2000-2003 Free Software Foundation, Inc.
Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
This program is free software; you can redistribute it and/or modify it
@@ -20,14 +20,6 @@
#ifndef _PLURAL_EXP_H
#define _PLURAL_EXP_H
-#ifndef PARAMS
-# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES
-# define PARAMS(args) args
-# else
-# define PARAMS(args) ()
-# endif
-#endif
-
#ifndef internal_function
# define internal_function
#endif
@@ -109,18 +101,18 @@ struct parse_args
# define EXTRACT_PLURAL_EXPRESSION extract_plural_expression
#endif
-extern void FREE_EXPRESSION PARAMS ((struct expression *exp))
+extern void FREE_EXPRESSION (struct expression *exp)
internal_function;
-extern int PLURAL_PARSE PARAMS ((void *arg));
+extern int PLURAL_PARSE (void *arg);
extern struct expression GERMANIC_PLURAL attribute_hidden;
-extern void EXTRACT_PLURAL_EXPRESSION PARAMS ((const char *nullentry,
- struct expression **pluralp,
- unsigned long int *npluralsp))
+extern void EXTRACT_PLURAL_EXPRESSION (const char *nullentry,
+ struct expression **pluralp,
+ unsigned long int *npluralsp)
internal_function;
#if !defined (_LIBC) && !defined (IN_LIBINTL)
-extern unsigned long int plural_eval PARAMS ((struct expression *pexp,
- unsigned long int n));
+extern unsigned long int plural_eval (struct expression *pexp,
+ unsigned long int n);
#endif
#endif /* _PLURAL_EXP_H */
diff --git a/intl/plural.c b/intl/plural.c
index c9ff63fb..72494f9e 100644
--- a/intl/plural.c
+++ b/intl/plural.c
@@ -1,6 +1,5 @@
-
-/* A Bison parser, made from plural.y
- by GNU Bison version 1.28 */
+/* A Bison parser, made from plural.y
+ by GNU bison 1.35. */
#define YYBISON 1 /* Identify Bison output. */
@@ -11,16 +10,16 @@
#define yychar __gettextchar
#define yydebug __gettextdebug
#define yynerrs __gettextnerrs
-#define EQUOP2 257
-#define CMPOP2 258
-#define ADDOP2 259
-#define MULOP2 260
-#define NUMBER 261
+# define EQUOP2 257
+# define CMPOP2 258
+# define ADDOP2 259
+# define MULOP2 260
+# define NUMBER 261
#line 1 "plural.y"
/* Expression parsing for plural form selection.
- Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
This program is free software; you can redistribute it and/or modify it
@@ -64,36 +63,25 @@
#define YYPARSE_PARAM arg
#line 49 "plural.y"
+#ifndef YYSTYPE
typedef union {
unsigned long int num;
enum operator op;
struct expression *exp;
-} YYSTYPE;
+} yystype;
+# define YYSTYPE yystype
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
#line 55 "plural.y"
/* Prototypes for local functions. */
-static struct expression *new_exp PARAMS ((int nargs, enum operator op,
- struct expression * const *args));
-static inline struct expression *new_exp_0 PARAMS ((enum operator op));
-static inline struct expression *new_exp_1 PARAMS ((enum operator op,
- struct expression *right));
-static struct expression *new_exp_2 PARAMS ((enum operator op,
- struct expression *left,
- struct expression *right));
-static inline struct expression *new_exp_3 PARAMS ((enum operator op,
- struct expression *bexp,
- struct expression *tbranch,
- struct expression *fbranch));
-static int yylex PARAMS ((YYSTYPE *lval, const char **pexp));
-static void yyerror PARAMS ((const char *str));
+static int yylex (YYSTYPE *lval, const char **pexp);
+static void yyerror (const char *str);
/* Allocation of expressions. */
static struct expression *
-new_exp (nargs, op, args)
- int nargs;
- enum operator op;
- struct expression * const *args;
+new_exp (int nargs, enum operator op, struct expression * const *args)
{
int i;
struct expression *newp;
@@ -122,16 +110,13 @@ new_exp (nargs, op, args)
}
static inline struct expression *
-new_exp_0 (op)
- enum operator op;
+new_exp_0 (enum operator op)
{
return new_exp (0, op, NULL);
}
static inline struct expression *
-new_exp_1 (op, right)
- enum operator op;
- struct expression *right;
+new_exp_1 (enum operator op, struct expression *right)
{
struct expression *args[1];
@@ -140,10 +125,7 @@ new_exp_1 (op, right)
}
static struct expression *
-new_exp_2 (op, left, right)
- enum operator op;
- struct expression *left;
- struct expression *right;
+new_exp_2 (enum operator op, struct expression *left, struct expression *right)
{
struct expression *args[2];
@@ -153,11 +135,8 @@ new_exp_2 (op, left, right)
}
static inline struct expression *
-new_exp_3 (op, bexp, tbranch, fbranch)
- enum operator op;
- struct expression *bexp;
- struct expression *tbranch;
- struct expression *fbranch;
+new_exp_3 (enum operator op, struct expression *bexp,
+ struct expression *tbranch, struct expression *fbranch)
{
struct expression *args[3];
@@ -167,12 +146,8 @@ new_exp_3 (op, bexp, tbranch, fbranch)
return new_exp (3, op, args);
}
-#include <stdio.h>
-
-#ifndef __cplusplus
-#ifndef __STDC__
-#define const
-#endif
+#ifndef YYDEBUG
+# define YYDEBUG 0
#endif
@@ -181,129 +156,152 @@ new_exp_3 (op, bexp, tbranch, fbranch)
#define YYFLAG -32768
#define YYNTBASE 16
+/* YYTRANSLATE(YYLEX) -- Bison token number corresponding to YYLEX. */
#define YYTRANSLATE(x) ((unsigned)(x) <= 261 ? yytranslate[x] : 18)
-static const char yytranslate[] = { 0,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 10, 2, 2, 2, 2, 5, 2, 14,
- 15, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 12, 2, 2,
- 2, 2, 3, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 13,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 4, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 1, 6, 7, 8, 9,
- 11
+/* YYTRANSLATE[YYLEX] -- Bison token number corresponding to YYLEX. */
+static const char yytranslate[] =
+{
+ 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 10, 2, 2, 2, 2, 5, 2,
+ 14, 15, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 12, 2,
+ 2, 2, 2, 3, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 13, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 4, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 1, 6, 7, 8,
+ 9, 11
};
-#if YYDEBUG != 0
-static const short yyprhs[] = { 0,
- 0, 2, 8, 12, 16, 20, 24, 28, 32, 35,
- 37, 39
+#if YYDEBUG
+static const short yyprhs[] =
+{
+ 0, 0, 2, 8, 12, 16, 20, 24, 28, 32,
+ 35, 37, 39
};
-
-static const short yyrhs[] = { 17,
- 0, 17, 3, 17, 12, 17, 0, 17, 4, 17,
- 0, 17, 5, 17, 0, 17, 6, 17, 0, 17,
- 7, 17, 0, 17, 8, 17, 0, 17, 9, 17,
- 0, 10, 17, 0, 13, 0, 11, 0, 14, 17,
- 15, 0
+static const short yyrhs[] =
+{
+ 17, 0, 17, 3, 17, 12, 17, 0, 17, 4,
+ 17, 0, 17, 5, 17, 0, 17, 6, 17, 0,
+ 17, 7, 17, 0, 17, 8, 17, 0, 17, 9,
+ 17, 0, 10, 17, 0, 13, 0, 11, 0, 14,
+ 17, 15, 0
};
#endif
-#if YYDEBUG != 0
-static const short yyrline[] = { 0,
- 174, 182, 186, 190, 194, 198, 202, 206, 210, 214,
- 218, 223
+#if YYDEBUG
+/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
+static const short yyrline[] =
+{
+ 0, 150, 158, 162, 166, 170, 174, 178, 182, 186,
+ 190, 194, 199
};
#endif
-#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
+#if (YYDEBUG) || defined YYERROR_VERBOSE
-static const char * const yytname[] = { "$","error","$undefined.","'?'","'|'",
-"'&'","EQUOP2","CMPOP2","ADDOP2","MULOP2","'!'","NUMBER","':'","'n'","'('","')'",
-"start","exp", NULL
+/* YYTNAME[TOKEN_NUM] -- String name of the token TOKEN_NUM. */
+static const char *const yytname[] =
+{
+ "$", "error", "$undefined.", "'?'", "'|'", "'&'", "EQUOP2", "CMPOP2",
+ "ADDOP2", "MULOP2", "'!'", "NUMBER", "':'", "'n'", "'('", "')'",
+ "start", "exp", 0
};
#endif
-static const short yyr1[] = { 0,
- 16, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
+static const short yyr1[] =
+{
+ 0, 16, 17, 17, 17, 17, 17, 17, 17, 17,
+ 17, 17, 17
};
-static const short yyr2[] = { 0,
- 1, 5, 3, 3, 3, 3, 3, 3, 2, 1,
- 1, 3
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
+static const short yyr2[] =
+{
+ 0, 1, 5, 3, 3, 3, 3, 3, 3, 2,
+ 1, 1, 3
};
-static const short yydefact[] = { 0,
- 0, 11, 10, 0, 1, 9, 0, 0, 0, 0,
- 0, 0, 0, 0, 12, 0, 3, 4, 5, 6,
- 7, 8, 0, 2, 0, 0, 0
+/* YYDEFACT[S] -- default rule to reduce with in state S when YYTABLE
+ doesn't specify something else to do. Zero means the default is an
+ error. */
+static const short yydefact[] =
+{
+ 0, 0, 11, 10, 0, 1, 9, 0, 0, 0,
+ 0, 0, 0, 0, 0, 12, 0, 3, 4, 5,
+ 6, 7, 8, 0, 2, 0, 0, 0
};
-static const short yydefgoto[] = { 25,
- 5
+static const short yydefgoto[] =
+{
+ 25, 5
};
-static const short yypact[] = { -9,
- -9,-32768,-32768, -9, 34,-32768, 11, -9, -9, -9,
- -9, -9, -9, -9,-32768, 24, 39, 43, 16, 26,
- -3,-32768, -9, 34, 21, 53,-32768
+static const short yypact[] =
+{
+ -9, -9,-32768,-32768, -9, 34,-32768, 11, -9, -9,
+ -9, -9, -9, -9, -9,-32768, 24, 39, 43, 16,
+ 26, -3,-32768, -9, 34, 21, 53,-32768
};
-static const short yypgoto[] = {-32768,
- -1
+static const short yypgoto[] =
+{
+ -32768, -1
};
#define YYLAST 53
-static const short yytable[] = { 6,
- 1, 2, 7, 3, 4, 14, 16, 17, 18, 19,
- 20, 21, 22, 8, 9, 10, 11, 12, 13, 14,
- 26, 24, 12, 13, 14, 15, 8, 9, 10, 11,
- 12, 13, 14, 13, 14, 23, 8, 9, 10, 11,
- 12, 13, 14, 10, 11, 12, 13, 14, 11, 12,
- 13, 14, 27
+static const short yytable[] =
+{
+ 6, 1, 2, 7, 3, 4, 14, 16, 17, 18,
+ 19, 20, 21, 22, 8, 9, 10, 11, 12, 13,
+ 14, 26, 24, 12, 13, 14, 15, 8, 9, 10,
+ 11, 12, 13, 14, 13, 14, 23, 8, 9, 10,
+ 11, 12, 13, 14, 10, 11, 12, 13, 14, 11,
+ 12, 13, 14, 27
};
-static const short yycheck[] = { 1,
- 10, 11, 4, 13, 14, 9, 8, 9, 10, 11,
- 12, 13, 14, 3, 4, 5, 6, 7, 8, 9,
- 0, 23, 7, 8, 9, 15, 3, 4, 5, 6,
- 7, 8, 9, 8, 9, 12, 3, 4, 5, 6,
- 7, 8, 9, 5, 6, 7, 8, 9, 6, 7,
- 8, 9, 0
+static const short yycheck[] =
+{
+ 1, 10, 11, 4, 13, 14, 9, 8, 9, 10,
+ 11, 12, 13, 14, 3, 4, 5, 6, 7, 8,
+ 9, 0, 23, 7, 8, 9, 15, 3, 4, 5,
+ 6, 7, 8, 9, 8, 9, 12, 3, 4, 5,
+ 6, 7, 8, 9, 5, 6, 7, 8, 9, 6,
+ 7, 8, 9, 0
};
#define YYPURE 1
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
-#line 3 "/usr/local/share/bison.simple"
-/* This file comes from bison-1.28. */
+#line 3 "/usr/local/share/bison/bison.simple"
/* Skeleton output parser for bison,
- Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
+
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 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
@@ -325,62 +323,131 @@ static const short yycheck[] = { 1,
This special exception was added by the Free Software Foundation
in version 1.24 of Bison. */
-/* This is the parser code that is written into each bison parser
- when the %semantic_parser declaration is not specified in the grammar.
- It was written by Richard Stallman by simplifying the hairy parser
- used when %semantic_parser is specified. */
+/* This is the parser code that is written into each bison parser when
+ the %semantic_parser declaration is not specified in the grammar.
+ It was written by Richard Stallman by simplifying the hairy parser
+ used when %semantic_parser is specified. */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+ infringing on user name space. This should be done even for local
+ variables, as they might otherwise be expanded by user macros.
+ There are some unavoidable exceptions within include files to
+ define necessary library symbols; they are noted "INFRINGES ON
+ USER NAME SPACE" below. */
+
+#if ! defined (yyoverflow) || defined (YYERROR_VERBOSE)
+
+/* The parser invokes alloca or malloc; define the necessary symbols. */
+
+# if YYSTACK_USE_ALLOCA
+# define YYSTACK_ALLOC alloca
+# else
+# ifndef YYSTACK_USE_ALLOCA
+# if defined (alloca) || defined (_ALLOCA_H)
+# define YYSTACK_ALLOC alloca
+# else
+# ifdef __GNUC__
+# define YYSTACK_ALLOC __builtin_alloca
+# endif
+# endif
+# endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+ /* Pacify GCC's `empty if-body' warning. */
+# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+# else
+# if defined (__STDC__) || defined (__cplusplus)
+# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+# define YYSIZE_T size_t
+# endif
+# define YYSTACK_ALLOC malloc
+# define YYSTACK_FREE free
+# endif
+#endif /* ! defined (yyoverflow) || defined (YYERROR_VERBOSE) */
+
+
+#if (! defined (yyoverflow) \
+ && (! defined (__cplusplus) \
+ || (YYLTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member. */
+union yyalloc
+{
+ short yyss;
+ YYSTYPE yyvs;
+# if YYLSP_NEEDED
+ YYLTYPE yyls;
+# endif
+};
+
+/* The size of the maximum gap between one aligned stack and the next. */
+# define YYSTACK_GAP_MAX (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+ N elements. */
+# if YYLSP_NEEDED
+# define YYSTACK_BYTES(N) \
+ ((N) * (sizeof (short) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \
+ + 2 * YYSTACK_GAP_MAX)
+# else
+# define YYSTACK_BYTES(N) \
+ ((N) * (sizeof (short) + sizeof (YYSTYPE)) \
+ + YYSTACK_GAP_MAX)
+# endif
+
+/* Copy COUNT objects from FROM to TO. The source and destination do
+ not overlap. */
+# ifndef YYCOPY
+# if 1 < __GNUC__
+# define YYCOPY(To, From, Count) \
+ __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+# else
+# define YYCOPY(To, From, Count) \
+ do \
+ { \
+ register YYSIZE_T yyi; \
+ for (yyi = 0; yyi < (Count); yyi++) \
+ (To)[yyi] = (From)[yyi]; \
+ } \
+ while (0)
+# endif
+# endif
+
+/* Relocate STACK from its old location to the new one. The
+ local variables YYSIZE and YYSTACKSIZE give the old and new number of
+ elements in the stack, and YYPTR gives the new location of the
+ stack. Advance YYPTR to a properly aligned location for the next
+ stack. */
+# define YYSTACK_RELOCATE(Stack) \
+ do \
+ { \
+ YYSIZE_T yynewbytes; \
+ YYCOPY (&yyptr->Stack, Stack, yysize); \
+ Stack = &yyptr->Stack; \
+ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAX; \
+ yyptr += yynewbytes / sizeof (*yyptr); \
+ } \
+ while (0)
-#ifndef YYSTACK_USE_ALLOCA
-#ifdef alloca
-#define YYSTACK_USE_ALLOCA
-#else /* alloca not defined */
-#ifdef __GNUC__
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#else /* not GNU C. */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
-#define YYSTACK_USE_ALLOCA
-#include <alloca.h>
-#else /* not sparc */
-/* We think this test detects Watcom and Microsoft C. */
-/* This used to test MSDOS, but that is a bad idea
- since that symbol is in the user namespace. */
-#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
-#if 0 /* No need for malloc.h, which pollutes the namespace;
- instead, just don't use alloca. */
-#include <malloc.h>
#endif
-#else /* not MSDOS, or __TURBOC__ */
-#if defined(_AIX)
-/* I don't know what this was needed for, but it pollutes the namespace.
- So I turned it off. rms, 2 May 1997. */
-/* #include <malloc.h> */
- #pragma alloca
-#define YYSTACK_USE_ALLOCA
-#else /* not MSDOS, or __TURBOC__, or _AIX */
-#if 0
-#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
- and on HPUX 10. Eventually we can turn this on. */
-#define YYSTACK_USE_ALLOCA
-#define alloca __builtin_alloca
-#endif /* __hpux */
+
+
+#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
+# define YYSIZE_T __SIZE_TYPE__
#endif
-#endif /* not _AIX */
-#endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc */
-#endif /* not GNU C */
-#endif /* alloca not defined */
-#endif /* YYSTACK_USE_ALLOCA not defined */
-
-#ifdef YYSTACK_USE_ALLOCA
-#define YYSTACK_ALLOC alloca
-#else
-#define YYSTACK_ALLOC malloc
+#if ! defined (YYSIZE_T) && defined (size_t)
+# define YYSIZE_T size_t
+#endif
+#if ! defined (YYSIZE_T)
+# if defined (__STDC__) || defined (__cplusplus)
+# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+# define YYSIZE_T size_t
+# endif
+#endif
+#if ! defined (YYSIZE_T)
+# define YYSIZE_T unsigned int
#endif
-
-/* Note: there must be only one dollar sign in this file.
- It is replaced by the list of actions, each action
- as one case of the switch. */
#define yyerrok (yyerrstatus = 0)
#define yyclearin (yychar = YYEMPTY)
@@ -389,131 +456,161 @@ static const short yycheck[] = { 1,
#define YYACCEPT goto yyacceptlab
#define YYABORT goto yyabortlab
#define YYERROR goto yyerrlab1
-/* Like YYERROR except do call yyerror.
- This remains here temporarily to ease the
- transition to the new meaning of YYERROR, for GCC.
+/* Like YYERROR except do call yyerror. This remains here temporarily
+ to ease the transition to the new meaning of YYERROR, for GCC.
Once GCC version 2 has supplanted version 1, this can go. */
#define YYFAIL goto yyerrlab
#define YYRECOVERING() (!!yyerrstatus)
-#define YYBACKUP(token, value) \
+#define YYBACKUP(Token, Value) \
do \
if (yychar == YYEMPTY && yylen == 1) \
- { yychar = (token), yylval = (value); \
+ { \
+ yychar = (Token); \
+ yylval = (Value); \
yychar1 = YYTRANSLATE (yychar); \
YYPOPSTACK; \
goto yybackup; \
} \
else \
- { yyerror ("syntax error: cannot back up"); YYERROR; } \
+ { \
+ yyerror ("syntax error: cannot back up"); \
+ YYERROR; \
+ } \
while (0)
#define YYTERROR 1
#define YYERRCODE 256
-#ifndef YYPURE
-#define YYLEX yylex()
-#endif
-
-#ifdef YYPURE
-#ifdef YYLSP_NEEDED
-#ifdef YYLEX_PARAM
-#define YYLEX yylex(&yylval, &yylloc, YYLEX_PARAM)
-#else
-#define YYLEX yylex(&yylval, &yylloc)
-#endif
-#else /* not YYLSP_NEEDED */
-#ifdef YYLEX_PARAM
-#define YYLEX yylex(&yylval, YYLEX_PARAM)
-#else
-#define YYLEX yylex(&yylval)
-#endif
-#endif /* not YYLSP_NEEDED */
-#endif
-
-/* If nonreentrant, generate the variables here */
-
-#ifndef YYPURE
-int yychar; /* the lookahead symbol */
-YYSTYPE yylval; /* the semantic value of the */
- /* lookahead symbol */
+/* YYLLOC_DEFAULT -- Compute the default location (before the actions
+ are run).
-#ifdef YYLSP_NEEDED
-YYLTYPE yylloc; /* location data for the lookahead */
- /* symbol */
-#endif
-
-int yynerrs; /* number of parse errors so far */
-#endif /* not YYPURE */
+ When YYLLOC_DEFAULT is run, CURRENT is set the location of the
+ first token. By default, to implement support for ranges, extend
+ its range to the last symbol. */
-#if YYDEBUG != 0
-int yydebug; /* nonzero means print parse trace */
-/* Since this is uninitialized, it does not stop multiple parsers
- from coexisting. */
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N) \
+ Current.last_line = Rhs[N].last_line; \
+ Current.last_column = Rhs[N].last_column;
#endif
-/* YYINITDEPTH indicates the initial size of the parser's stacks */
+/* YYLEX -- calling `yylex' with the right arguments. */
+
+#if YYPURE
+# if YYLSP_NEEDED
+# ifdef YYLEX_PARAM
+# define YYLEX yylex (&yylval, &yylloc, YYLEX_PARAM)
+# else
+# define YYLEX yylex (&yylval, &yylloc)
+# endif
+# else /* !YYLSP_NEEDED */
+# ifdef YYLEX_PARAM
+# define YYLEX yylex (&yylval, YYLEX_PARAM)
+# else
+# define YYLEX yylex (&yylval)
+# endif
+# endif /* !YYLSP_NEEDED */
+#else /* !YYPURE */
+# define YYLEX yylex ()
+#endif /* !YYPURE */
+
+
+/* Enable debugging if requested. */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+# define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args) \
+do { \
+ if (yydebug) \
+ YYFPRINTF Args; \
+} while (0)
+/* Nonzero means print parse trace. It is left uninitialized so that
+ multiple parsers can coexist. */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+#endif /* !YYDEBUG */
+
+/* YYINITDEPTH -- initial size of the parser's stacks. */
#ifndef YYINITDEPTH
-#define YYINITDEPTH 200
+# define YYINITDEPTH 200
#endif
-/* YYMAXDEPTH is the maximum size the stacks can grow to
- (effective only if the built-in stack extension method is used). */
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+ if the built-in stack extension method is used).
+
+ Do not make this value too large; the results are undefined if
+ SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
+ evaluated with infinite-precision integer arithmetic. */
#if YYMAXDEPTH == 0
-#undef YYMAXDEPTH
+# undef YYMAXDEPTH
#endif
#ifndef YYMAXDEPTH
-#define YYMAXDEPTH 10000
+# define YYMAXDEPTH 10000
#endif
-/* Define __yy_memcpy. Note that the size argument
- should be passed with type unsigned int, because that is what the non-GCC
- definitions require. With GCC, __builtin_memcpy takes an arg
- of type size_t, but it can handle unsigned int. */
-
-#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */
-#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT)
-#else /* not GNU C or C++ */
-#ifndef __cplusplus
-
-/* This is the most reliable way to avoid incompatibilities
- in available built-in functions on various systems. */
-static void
-__yy_memcpy (to, from, count)
- char *to;
- char *from;
- unsigned int count;
-{
- register char *f = from;
- register char *t = to;
- register int i = count;
+#ifdef YYERROR_VERBOSE
- while (i-- > 0)
- *t++ = *f++;
-}
+# ifndef yystrlen
+# if defined (__GLIBC__) && defined (_STRING_H)
+# define yystrlen strlen
+# else
+/* Return the length of YYSTR. */
+static YYSIZE_T
+# if defined (__STDC__) || defined (__cplusplus)
+yystrlen (const char *yystr)
+# else
+yystrlen (yystr)
+ const char *yystr;
+# endif
+{
+ register const char *yys = yystr;
-#else /* __cplusplus */
+ while (*yys++ != '\0')
+ continue;
-/* This is the most reliable way to avoid incompatibilities
- in available built-in functions on various systems. */
-static void
-__yy_memcpy (char *to, char *from, unsigned int count)
+ return yys - yystr - 1;
+}
+# endif
+# endif
+
+# ifndef yystpcpy
+# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
+# define yystpcpy stpcpy
+# else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+ YYDEST. */
+static char *
+# if defined (__STDC__) || defined (__cplusplus)
+yystpcpy (char *yydest, const char *yysrc)
+# else
+yystpcpy (yydest, yysrc)
+ char *yydest;
+ const char *yysrc;
+# endif
{
- register char *t = to;
- register char *f = from;
- register int i = count;
+ register char *yyd = yydest;
+ register const char *yys = yysrc;
- while (i-- > 0)
- *t++ = *f++;
-}
+ while ((*yyd++ = *yys++) != '\0')
+ continue;
-#endif
+ return yyd - 1;
+}
+# endif
+# endif
#endif
-#line 217 "/usr/local/share/bison.simple"
+#line 315 "/usr/local/share/bison/bison.simple"
+
/* The user can define YYPARSE_PARAM as the name of an argument to be passed
into yyparse. The argument should have type void *.
@@ -522,76 +619,121 @@ __yy_memcpy (char *to, char *from, unsigned int count)
to the proper pointer type. */
#ifdef YYPARSE_PARAM
-#ifdef __cplusplus
-#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL
-#else /* not __cplusplus */
-#define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
-#endif /* not __cplusplus */
-#else /* not YYPARSE_PARAM */
-#define YYPARSE_PARAM_ARG
-#define YYPARSE_PARAM_DECL
-#endif /* not YYPARSE_PARAM */
+# if defined (__STDC__) || defined (__cplusplus)
+# define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
+# define YYPARSE_PARAM_DECL
+# else
+# define YYPARSE_PARAM_ARG YYPARSE_PARAM
+# define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
+# endif
+#else /* !YYPARSE_PARAM */
+# define YYPARSE_PARAM_ARG
+# define YYPARSE_PARAM_DECL
+#endif /* !YYPARSE_PARAM */
/* Prevent warning if -Wstrict-prototypes. */
#ifdef __GNUC__
-#ifdef YYPARSE_PARAM
+# ifdef YYPARSE_PARAM
int yyparse (void *);
-#else
+# else
int yyparse (void);
+# endif
#endif
+
+/* YY_DECL_VARIABLES -- depending whether we use a pure parser,
+ variables are global, or local to YYPARSE. */
+
+#define YY_DECL_NON_LSP_VARIABLES \
+/* The lookahead symbol. */ \
+int yychar; \
+ \
+/* The semantic value of the lookahead symbol. */ \
+YYSTYPE yylval; \
+ \
+/* Number of parse errors so far. */ \
+int yynerrs;
+
+#if YYLSP_NEEDED
+# define YY_DECL_VARIABLES \
+YY_DECL_NON_LSP_VARIABLES \
+ \
+/* Location data for the lookahead symbol. */ \
+YYLTYPE yylloc;
+#else
+# define YY_DECL_VARIABLES \
+YY_DECL_NON_LSP_VARIABLES
#endif
+
+/* If nonreentrant, generate the variables here. */
+
+#if !YYPURE
+YY_DECL_VARIABLES
+#endif /* !YYPURE */
+
int
-yyparse(YYPARSE_PARAM_ARG)
+yyparse (YYPARSE_PARAM_ARG)
YYPARSE_PARAM_DECL
{
+ /* If reentrant, generate the variables here. */
+#if YYPURE
+ YY_DECL_VARIABLES
+#endif /* !YYPURE */
+
register int yystate;
register int yyn;
+ int yyresult;
+ /* Number of tokens to shift before error messages enabled. */
+ int yyerrstatus;
+ /* Lookahead token as an internal (translated) token number. */
+ int yychar1 = 0;
+
+ /* Three stacks and their tools:
+ `yyss': related to states,
+ `yyvs': related to semantic values,
+ `yyls': related to locations.
+
+ Refer to the stacks thru separate pointers, to allow yyoverflow
+ to reallocate them elsewhere. */
+
+ /* The state stack. */
+ short yyssa[YYINITDEPTH];
+ short *yyss = yyssa;
register short *yyssp;
- register YYSTYPE *yyvsp;
- int yyerrstatus; /* number of tokens to shift before error messages enabled */
- int yychar1 = 0; /* lookahead token as an internal (translated) token number */
-
- short yyssa[YYINITDEPTH]; /* the state stack */
- YYSTYPE yyvsa[YYINITDEPTH]; /* the semantic value stack */
- short *yyss = yyssa; /* refer to the stacks thru separate pointers */
- YYSTYPE *yyvs = yyvsa; /* to allow yyoverflow to reallocate them elsewhere */
+ /* The semantic value stack. */
+ YYSTYPE yyvsa[YYINITDEPTH];
+ YYSTYPE *yyvs = yyvsa;
+ register YYSTYPE *yyvsp;
-#ifdef YYLSP_NEEDED
- YYLTYPE yylsa[YYINITDEPTH]; /* the location stack */
+#if YYLSP_NEEDED
+ /* The location stack. */
+ YYLTYPE yylsa[YYINITDEPTH];
YYLTYPE *yyls = yylsa;
YYLTYPE *yylsp;
+#endif
-#define YYPOPSTACK (yyvsp--, yyssp--, yylsp--)
+#if YYLSP_NEEDED
+# define YYPOPSTACK (yyvsp--, yyssp--, yylsp--)
#else
-#define YYPOPSTACK (yyvsp--, yyssp--)
+# define YYPOPSTACK (yyvsp--, yyssp--)
#endif
- int yystacksize = YYINITDEPTH;
- int yyfree_stacks = 0;
+ YYSIZE_T yystacksize = YYINITDEPTH;
-#ifdef YYPURE
- int yychar;
- YYSTYPE yylval;
- int yynerrs;
-#ifdef YYLSP_NEEDED
- YYLTYPE yylloc;
-#endif
-#endif
- YYSTYPE yyval; /* the variable used to return */
- /* semantic values from the action */
- /* routines */
+ /* The variables used to return semantic value and location from the
+ action routines. */
+ YYSTYPE yyval;
+#if YYLSP_NEEDED
+ YYLTYPE yyloc;
+#endif
+ /* When reducing, the number of symbols on the RHS of the reduced
+ rule. */
int yylen;
-#if YYDEBUG != 0
- if (yydebug)
- fprintf(stderr, "Starting parse\n");
-#endif
+ YYDPRINTF ((stderr, "Starting parse\n"));
yystate = 0;
yyerrstatus = 0;
@@ -603,110 +745,110 @@ yyparse(YYPARSE_PARAM_ARG)
so that they stay on the same level as the state stack.
The wasted elements are never initialized. */
- yyssp = yyss - 1;
+ yyssp = yyss;
yyvsp = yyvs;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
yylsp = yyls;
#endif
+ goto yysetstate;
-/* Push a new state, which is found in yystate . */
-/* In all cases, when you get here, the value and location stacks
- have just been pushed. so pushing a state here evens the stacks. */
-yynewstate:
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate. |
+`------------------------------------------------------------*/
+ yynewstate:
+ /* In all cases, when you get here, the value and location stacks
+ have just been pushed. so pushing a state here evens the stacks.
+ */
+ yyssp++;
- *++yyssp = yystate;
+ yysetstate:
+ *yyssp = yystate;
if (yyssp >= yyss + yystacksize - 1)
{
- /* Give user a chance to reallocate the stack */
- /* Use copies of these so that the &'s don't force the real ones into memory. */
- YYSTYPE *yyvs1 = yyvs;
- short *yyss1 = yyss;
-#ifdef YYLSP_NEEDED
- YYLTYPE *yyls1 = yyls;
-#endif
-
/* Get the current used size of the three stacks, in elements. */
- int size = yyssp - yyss + 1;
+ YYSIZE_T yysize = yyssp - yyss + 1;
#ifdef yyoverflow
- /* Each stack pointer address is followed by the size of
- the data in use in that stack, in bytes. */
-#ifdef YYLSP_NEEDED
- /* This used to be a conditional around just the two extra args,
- but that might be undefined if yyoverflow is a macro. */
- yyoverflow("parser stack overflow",
- &yyss1, size * sizeof (*yyssp),
- &yyvs1, size * sizeof (*yyvsp),
- &yyls1, size * sizeof (*yylsp),
- &yystacksize);
-#else
- yyoverflow("parser stack overflow",
- &yyss1, size * sizeof (*yyssp),
- &yyvs1, size * sizeof (*yyvsp),
- &yystacksize);
-#endif
-
- yyss = yyss1; yyvs = yyvs1;
-#ifdef YYLSP_NEEDED
- yyls = yyls1;
-#endif
+ {
+ /* Give user a chance to reallocate the stack. Use copies of
+ these so that the &'s don't force the real ones into
+ memory. */
+ YYSTYPE *yyvs1 = yyvs;
+ short *yyss1 = yyss;
+
+ /* Each stack pointer address is followed by the size of the
+ data in use in that stack, in bytes. */
+# if YYLSP_NEEDED
+ YYLTYPE *yyls1 = yyls;
+ /* This used to be a conditional around just the two extra args,
+ but that might be undefined if yyoverflow is a macro. */
+ yyoverflow ("parser stack overflow",
+ &yyss1, yysize * sizeof (*yyssp),
+ &yyvs1, yysize * sizeof (*yyvsp),
+ &yyls1, yysize * sizeof (*yylsp),
+ &yystacksize);
+ yyls = yyls1;
+# else
+ yyoverflow ("parser stack overflow",
+ &yyss1, yysize * sizeof (*yyssp),
+ &yyvs1, yysize * sizeof (*yyvsp),
+ &yystacksize);
+# endif
+ yyss = yyss1;
+ yyvs = yyvs1;
+ }
#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+ goto yyoverflowlab;
+# else
/* Extend the stack our own way. */
if (yystacksize >= YYMAXDEPTH)
- {
- yyerror("parser stack overflow");
- if (yyfree_stacks)
- {
- free (yyss);
- free (yyvs);
-#ifdef YYLSP_NEEDED
- free (yyls);
-#endif
- }
- return 2;
- }
+ goto yyoverflowlab;
yystacksize *= 2;
if (yystacksize > YYMAXDEPTH)
yystacksize = YYMAXDEPTH;
-#ifndef YYSTACK_USE_ALLOCA
- yyfree_stacks = 1;
-#endif
- yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
- __yy_memcpy ((char *)yyss, (char *)yyss1,
- size * (unsigned int) sizeof (*yyssp));
- yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
- __yy_memcpy ((char *)yyvs, (char *)yyvs1,
- size * (unsigned int) sizeof (*yyvsp));
-#ifdef YYLSP_NEEDED
- yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
- __yy_memcpy ((char *)yyls, (char *)yyls1,
- size * (unsigned int) sizeof (*yylsp));
-#endif
+
+ {
+ short *yyss1 = yyss;
+ union yyalloc *yyptr =
+ (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+ if (! yyptr)
+ goto yyoverflowlab;
+ YYSTACK_RELOCATE (yyss);
+ YYSTACK_RELOCATE (yyvs);
+# if YYLSP_NEEDED
+ YYSTACK_RELOCATE (yyls);
+# endif
+# undef YYSTACK_RELOCATE
+ if (yyss1 != yyssa)
+ YYSTACK_FREE (yyss1);
+ }
+# endif
#endif /* no yyoverflow */
- yyssp = yyss + size - 1;
- yyvsp = yyvs + size - 1;
-#ifdef YYLSP_NEEDED
- yylsp = yyls + size - 1;
+ yyssp = yyss + yysize - 1;
+ yyvsp = yyvs + yysize - 1;
+#if YYLSP_NEEDED
+ yylsp = yyls + yysize - 1;
#endif
-#if YYDEBUG != 0
- if (yydebug)
- fprintf(stderr, "Stack size increased to %d\n", yystacksize);
-#endif
+ YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+ (unsigned long int) yystacksize));
if (yyssp >= yyss + yystacksize - 1)
YYABORT;
}
-#if YYDEBUG != 0
- if (yydebug)
- fprintf(stderr, "Entering state %d\n", yystate);
-#endif
+ YYDPRINTF ((stderr, "Entering state %d\n", yystate));
goto yybackup;
- yybackup:
+
+
+/*-----------.
+| yybackup. |
+`-----------*/
+yybackup:
/* Do appropriate processing given the current state. */
/* Read a lookahead token if we need one and don't already have one. */
@@ -725,10 +867,7 @@ yynewstate:
if (yychar == YYEMPTY)
{
-#if YYDEBUG != 0
- if (yydebug)
- fprintf(stderr, "Reading a token: ");
-#endif
+ YYDPRINTF ((stderr, "Reading a token: "));
yychar = YYLEX;
}
@@ -739,25 +878,25 @@ yynewstate:
yychar1 = 0;
yychar = YYEOF; /* Don't call YYLEX any more */
-#if YYDEBUG != 0
- if (yydebug)
- fprintf(stderr, "Now at end of input.\n");
-#endif
+ YYDPRINTF ((stderr, "Now at end of input.\n"));
}
else
{
- yychar1 = YYTRANSLATE(yychar);
+ yychar1 = YYTRANSLATE (yychar);
-#if YYDEBUG != 0
+#if YYDEBUG
+ /* We have to keep this `#if YYDEBUG', since we use variables
+ which are defined only if `YYDEBUG' is set. */
if (yydebug)
{
- fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
- /* Give the individual parser a way to print the precise meaning
- of a token, for further debugging info. */
-#ifdef YYPRINT
+ YYFPRINTF (stderr, "Next token is %d (%s",
+ yychar, yytname[yychar1]);
+ /* Give the individual parser a way to print the precise
+ meaning of a token, for further debugging info. */
+# ifdef YYPRINT
YYPRINT (stderr, yychar, yylval);
-#endif
- fprintf (stderr, ")\n");
+# endif
+ YYFPRINTF (stderr, ")\n");
}
#endif
}
@@ -789,177 +928,185 @@ yynewstate:
YYACCEPT;
/* Shift the lookahead token. */
-
-#if YYDEBUG != 0
- if (yydebug)
- fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
-#endif
+ YYDPRINTF ((stderr, "Shifting token %d (%s), ",
+ yychar, yytname[yychar1]));
/* Discard the token being shifted unless it is eof. */
if (yychar != YYEOF)
yychar = YYEMPTY;
*++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
*++yylsp = yylloc;
#endif
- /* count tokens shifted since error; after three, turn off error status. */
- if (yyerrstatus) yyerrstatus--;
+ /* Count tokens shifted since error; after three, turn off error
+ status. */
+ if (yyerrstatus)
+ yyerrstatus--;
yystate = yyn;
goto yynewstate;
-/* Do the default action for the current state. */
-yydefault:
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state. |
+`-----------------------------------------------------------*/
+yydefault:
yyn = yydefact[yystate];
if (yyn == 0)
goto yyerrlab;
+ goto yyreduce;
+
-/* Do a reduction. yyn is the number of a rule to reduce with. */
+/*-----------------------------.
+| yyreduce -- Do a reduction. |
+`-----------------------------*/
yyreduce:
+ /* yyn is the number of a rule to reduce with. */
yylen = yyr2[yyn];
- if (yylen > 0)
- yyval = yyvsp[1-yylen]; /* implement default value of the action */
-#if YYDEBUG != 0
+ /* If YYLEN is nonzero, implement the default value of the action:
+ `$$ = $1'.
+
+ Otherwise, the following line sets YYVAL to the semantic value of
+ the lookahead token. This behavior is undocumented and Bison
+ users should not rely upon it. Assigning to YYVAL
+ unconditionally makes the parser a bit smaller, and it avoids a
+ GCC warning that YYVAL may be used uninitialized. */
+ yyval = yyvsp[1-yylen];
+
+#if YYLSP_NEEDED
+ /* Similarly for the default location. Let the user run additional
+ commands if for instance locations are ranges. */
+ yyloc = yylsp[1-yylen];
+ YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
+#endif
+
+#if YYDEBUG
+ /* We have to keep this `#if YYDEBUG', since we use variables which
+ are defined only if `YYDEBUG' is set. */
if (yydebug)
{
- int i;
+ int yyi;
- fprintf (stderr, "Reducing via rule %d (line %d), ",
- yyn, yyrline[yyn]);
+ YYFPRINTF (stderr, "Reducing via rule %d (line %d), ",
+ yyn, yyrline[yyn]);
/* Print the symbols being reduced, and their result. */
- for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
- fprintf (stderr, "%s ", yytname[yyrhs[i]]);
- fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
+ for (yyi = yyprhs[yyn]; yyrhs[yyi] > 0; yyi++)
+ YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
+ YYFPRINTF (stderr, " -> %s\n", yytname[yyr1[yyn]]);
}
#endif
-
switch (yyn) {
case 1:
-#line 175 "plural.y"
+#line 151 "plural.y"
{
if (yyvsp[0].exp == NULL)
YYABORT;
((struct parse_args *) arg)->res = yyvsp[0].exp;
- ;
- break;}
+ }
+ break;
case 2:
-#line 183 "plural.y"
+#line 159 "plural.y"
{
yyval.exp = new_exp_3 (qmop, yyvsp[-4].exp, yyvsp[-2].exp, yyvsp[0].exp);
- ;
- break;}
+ }
+ break;
case 3:
-#line 187 "plural.y"
+#line 163 "plural.y"
{
yyval.exp = new_exp_2 (lor, yyvsp[-2].exp, yyvsp[0].exp);
- ;
- break;}
+ }
+ break;
case 4:
-#line 191 "plural.y"
+#line 167 "plural.y"
{
yyval.exp = new_exp_2 (land, yyvsp[-2].exp, yyvsp[0].exp);
- ;
- break;}
+ }
+ break;
case 5:
-#line 195 "plural.y"
+#line 171 "plural.y"
{
yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
- ;
- break;}
+ }
+ break;
case 6:
-#line 199 "plural.y"
+#line 175 "plural.y"
{
yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
- ;
- break;}
+ }
+ break;
case 7:
-#line 203 "plural.y"
+#line 179 "plural.y"
{
yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
- ;
- break;}
+ }
+ break;
case 8:
-#line 207 "plural.y"
+#line 183 "plural.y"
{
yyval.exp = new_exp_2 (yyvsp[-1].op, yyvsp[-2].exp, yyvsp[0].exp);
- ;
- break;}
+ }
+ break;
case 9:
-#line 211 "plural.y"
+#line 187 "plural.y"
{
yyval.exp = new_exp_1 (lnot, yyvsp[0].exp);
- ;
- break;}
+ }
+ break;
case 10:
-#line 215 "plural.y"
+#line 191 "plural.y"
{
yyval.exp = new_exp_0 (var);
- ;
- break;}
+ }
+ break;
case 11:
-#line 219 "plural.y"
+#line 195 "plural.y"
{
if ((yyval.exp = new_exp_0 (num)) != NULL)
yyval.exp->val.num = yyvsp[0].num;
- ;
- break;}
+ }
+ break;
case 12:
-#line 224 "plural.y"
+#line 200 "plural.y"
{
yyval.exp = yyvsp[-1].exp;
- ;
- break;}
+ }
+ break;
}
- /* the action file gets copied in in place of this dollarsign */
-#line 543 "/usr/local/share/bison.simple"
+
+#line 705 "/usr/local/share/bison/bison.simple"
+
yyvsp -= yylen;
yyssp -= yylen;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
yylsp -= yylen;
#endif
-#if YYDEBUG != 0
+#if YYDEBUG
if (yydebug)
{
- short *ssp1 = yyss - 1;
- fprintf (stderr, "state stack now");
- while (ssp1 != yyssp)
- fprintf (stderr, " %d", *++ssp1);
- fprintf (stderr, "\n");
+ short *yyssp1 = yyss - 1;
+ YYFPRINTF (stderr, "state stack now");
+ while (yyssp1 != yyssp)
+ YYFPRINTF (stderr, " %d", *++yyssp1);
+ YYFPRINTF (stderr, "\n");
}
#endif
*++yyvsp = yyval;
-
-#ifdef YYLSP_NEEDED
- yylsp++;
- if (yylen == 0)
- {
- yylsp->first_line = yylloc.first_line;
- yylsp->first_column = yylloc.first_column;
- yylsp->last_line = (yylsp-1)->last_line;
- yylsp->last_column = (yylsp-1)->last_column;
- yylsp->text = 0;
- }
- else
- {
- yylsp->last_line = (yylsp+yylen-1)->last_line;
- yylsp->last_column = (yylsp+yylen-1)->last_column;
- }
+#if YYLSP_NEEDED
+ *++yylsp = yyloc;
#endif
- /* Now "shift" the result of the reduction.
- Determine what state that goes to,
- based on the state we popped back to
- and the rule number reduced by. */
+ /* Now `shift' the result of the reduction. Determine what state
+ that goes to, based on the state we popped back to and the rule
+ number reduced by. */
yyn = yyr1[yyn];
@@ -971,10 +1118,13 @@ case 12:
goto yynewstate;
-yyerrlab: /* here on detecting error */
- if (! yyerrstatus)
- /* If not already recovering from an error, report this error. */
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+ /* If not already recovering from an error, report this error. */
+ if (!yyerrstatus)
{
++yynerrs;
@@ -983,102 +1133,121 @@ yyerrlab: /* here on detecting error */
if (yyn > YYFLAG && yyn < YYLAST)
{
- int size = 0;
- char *msg;
- int x, count;
-
- count = 0;
- /* Start X at -yyn if nec to avoid negative indexes in yycheck. */
- for (x = (yyn < 0 ? -yyn : 0);
- x < (sizeof(yytname) / sizeof(char *)); x++)
- if (yycheck[x + yyn] == x)
- size += strlen(yytname[x]) + 15, count++;
- msg = (char *) malloc(size + 15);
- if (msg != 0)
+ YYSIZE_T yysize = 0;
+ char *yymsg;
+ int yyx, yycount;
+
+ yycount = 0;
+ /* Start YYX at -YYN if negative to avoid negative indexes in
+ YYCHECK. */
+ for (yyx = yyn < 0 ? -yyn : 0;
+ yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
+ if (yycheck[yyx + yyn] == yyx)
+ yysize += yystrlen (yytname[yyx]) + 15, yycount++;
+ yysize += yystrlen ("parse error, unexpected ") + 1;
+ yysize += yystrlen (yytname[YYTRANSLATE (yychar)]);
+ yymsg = (char *) YYSTACK_ALLOC (yysize);
+ if (yymsg != 0)
{
- strcpy(msg, "parse error");
+ char *yyp = yystpcpy (yymsg, "parse error, unexpected ");
+ yyp = yystpcpy (yyp, yytname[YYTRANSLATE (yychar)]);
- if (count < 5)
+ if (yycount < 5)
{
- count = 0;
- for (x = (yyn < 0 ? -yyn : 0);
- x < (sizeof(yytname) / sizeof(char *)); x++)
- if (yycheck[x + yyn] == x)
+ yycount = 0;
+ for (yyx = yyn < 0 ? -yyn : 0;
+ yyx < (int) (sizeof (yytname) / sizeof (char *));
+ yyx++)
+ if (yycheck[yyx + yyn] == yyx)
{
- strcat(msg, count == 0 ? ", expecting `" : " or `");
- strcat(msg, yytname[x]);
- strcat(msg, "'");
- count++;
+ const char *yyq = ! yycount ? ", expecting " : " or ";
+ yyp = yystpcpy (yyp, yyq);
+ yyp = yystpcpy (yyp, yytname[yyx]);
+ yycount++;
}
}
- yyerror(msg);
- free(msg);
+ yyerror (yymsg);
+ YYSTACK_FREE (yymsg);
}
else
- yyerror ("parse error; also virtual memory exceeded");
+ yyerror ("parse error; also virtual memory exhausted");
}
else
-#endif /* YYERROR_VERBOSE */
- yyerror("parse error");
+#endif /* defined (YYERROR_VERBOSE) */
+ yyerror ("parse error");
}
-
goto yyerrlab1;
-yyerrlab1: /* here on error raised explicitly by an action */
+
+/*--------------------------------------------------.
+| yyerrlab1 -- error raised explicitly by an action |
+`--------------------------------------------------*/
+yyerrlab1:
if (yyerrstatus == 3)
{
- /* if just tried and failed to reuse lookahead token after an error, discard it. */
+ /* If just tried and failed to reuse lookahead token after an
+ error, discard it. */
/* return failure if at end of input */
if (yychar == YYEOF)
YYABORT;
-
-#if YYDEBUG != 0
- if (yydebug)
- fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
-#endif
-
+ YYDPRINTF ((stderr, "Discarding token %d (%s).\n",
+ yychar, yytname[yychar1]));
yychar = YYEMPTY;
}
- /* Else will try to reuse lookahead token
- after shifting the error token. */
+ /* Else will try to reuse lookahead token after shifting the error
+ token. */
yyerrstatus = 3; /* Each real token shifted decrements this */
goto yyerrhandle;
-yyerrdefault: /* current state does not do anything special for the error token. */
+/*-------------------------------------------------------------------.
+| yyerrdefault -- current state does not do anything special for the |
+| error token. |
+`-------------------------------------------------------------------*/
+yyerrdefault:
#if 0
/* This is wrong; only states that explicitly want error tokens
should shift them. */
- yyn = yydefact[yystate]; /* If its default is to accept any token, ok. Otherwise pop it.*/
- if (yyn) goto yydefault;
+
+ /* If its default is to accept any token, ok. Otherwise pop it. */
+ yyn = yydefact[yystate];
+ if (yyn)
+ goto yydefault;
#endif
-yyerrpop: /* pop the current state because it cannot handle the error token */
- if (yyssp == yyss) YYABORT;
+/*---------------------------------------------------------------.
+| yyerrpop -- pop the current state because it cannot handle the |
+| error token |
+`---------------------------------------------------------------*/
+yyerrpop:
+ if (yyssp == yyss)
+ YYABORT;
yyvsp--;
yystate = *--yyssp;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
yylsp--;
#endif
-#if YYDEBUG != 0
+#if YYDEBUG
if (yydebug)
{
- short *ssp1 = yyss - 1;
- fprintf (stderr, "Error: state stack now");
- while (ssp1 != yyssp)
- fprintf (stderr, " %d", *++ssp1);
- fprintf (stderr, "\n");
+ short *yyssp1 = yyss - 1;
+ YYFPRINTF (stderr, "Error: state stack now");
+ while (yyssp1 != yyssp)
+ YYFPRINTF (stderr, " %d", *++yyssp1);
+ YYFPRINTF (stderr, "\n");
}
#endif
+/*--------------.
+| yyerrhandle. |
+`--------------*/
yyerrhandle:
-
yyn = yypact[yystate];
if (yyn == YYFLAG)
goto yyerrdefault;
@@ -1101,50 +1270,52 @@ yyerrhandle:
if (yyn == YYFINAL)
YYACCEPT;
-#if YYDEBUG != 0
- if (yydebug)
- fprintf(stderr, "Shifting error token, ");
-#endif
+ YYDPRINTF ((stderr, "Shifting error token, "));
*++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
+#if YYLSP_NEEDED
*++yylsp = yylloc;
#endif
yystate = yyn;
goto yynewstate;
- yyacceptlab:
- /* YYACCEPT comes here. */
- if (yyfree_stacks)
- {
- free (yyss);
- free (yyvs);
-#ifdef YYLSP_NEEDED
- free (yyls);
-#endif
- }
- return 0;
- yyabortlab:
- /* YYABORT comes here. */
- if (yyfree_stacks)
- {
- free (yyss);
- free (yyvs);
-#ifdef YYLSP_NEEDED
- free (yyls);
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here. |
+`-------------------------------------*/
+yyacceptlab:
+ yyresult = 0;
+ goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here. |
+`-----------------------------------*/
+yyabortlab:
+ yyresult = 1;
+ goto yyreturn;
+
+/*---------------------------------------------.
+| yyoverflowab -- parser overflow comes here. |
+`---------------------------------------------*/
+yyoverflowlab:
+ yyerror ("parser stack overflow");
+ yyresult = 2;
+ /* Fall through. */
+
+yyreturn:
+#ifndef yyoverflow
+ if (yyss != yyssa)
+ YYSTACK_FREE (yyss);
#endif
- }
- return 1;
+ return yyresult;
}
-#line 229 "plural.y"
+#line 205 "plural.y"
void
internal_function
-FREE_EXPRESSION (exp)
- struct expression *exp;
+FREE_EXPRESSION (struct expression *exp)
{
if (exp == NULL)
return;
@@ -1170,9 +1341,7 @@ FREE_EXPRESSION (exp)
static int
-yylex (lval, pexp)
- YYSTYPE *lval;
- const char **pexp;
+yylex (YYSTYPE *lval, const char **pexp)
{
const char *exp = *pexp;
int result;
@@ -1315,8 +1484,7 @@ yylex (lval, pexp)
static void
-yyerror (str)
- const char *str;
+yyerror (const char *str)
{
/* Do nothing. We don't print error messages here. */
}
diff --git a/intl/plural.y b/intl/plural.y
index 616b7c11..4d33bd7c 100644
--- a/intl/plural.y
+++ b/intl/plural.y
@@ -1,6 +1,6 @@
%{
/* Expression parsing for plural form selection.
- Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 2000-2001, 2003 Free Software Foundation, Inc.
Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
This program is free software; you can redistribute it and/or modify it
@@ -54,28 +54,13 @@
%{
/* Prototypes for local functions. */
-static struct expression *new_exp PARAMS ((int nargs, enum operator op,
- struct expression * const *args));
-static inline struct expression *new_exp_0 PARAMS ((enum operator op));
-static inline struct expression *new_exp_1 PARAMS ((enum operator op,
- struct expression *right));
-static struct expression *new_exp_2 PARAMS ((enum operator op,
- struct expression *left,
- struct expression *right));
-static inline struct expression *new_exp_3 PARAMS ((enum operator op,
- struct expression *bexp,
- struct expression *tbranch,
- struct expression *fbranch));
-static int yylex PARAMS ((YYSTYPE *lval, const char **pexp));
-static void yyerror PARAMS ((const char *str));
+static int yylex (YYSTYPE *lval, const char **pexp);
+static void yyerror (const char *str);
/* Allocation of expressions. */
static struct expression *
-new_exp (nargs, op, args)
- int nargs;
- enum operator op;
- struct expression * const *args;
+new_exp (int nargs, enum operator op, struct expression * const *args)
{
int i;
struct expression *newp;
@@ -104,16 +89,13 @@ new_exp (nargs, op, args)
}
static inline struct expression *
-new_exp_0 (op)
- enum operator op;
+new_exp_0 (enum operator op)
{
return new_exp (0, op, NULL);
}
static inline struct expression *
-new_exp_1 (op, right)
- enum operator op;
- struct expression *right;
+new_exp_1 (enum operator op, struct expression *right)
{
struct expression *args[1];
@@ -122,10 +104,7 @@ new_exp_1 (op, right)
}
static struct expression *
-new_exp_2 (op, left, right)
- enum operator op;
- struct expression *left;
- struct expression *right;
+new_exp_2 (enum operator op, struct expression *left, struct expression *right)
{
struct expression *args[2];
@@ -135,11 +114,8 @@ new_exp_2 (op, left, right)
}
static inline struct expression *
-new_exp_3 (op, bexp, tbranch, fbranch)
- enum operator op;
- struct expression *bexp;
- struct expression *tbranch;
- struct expression *fbranch;
+new_exp_3 (enum operator op, struct expression *bexp,
+ struct expression *tbranch, struct expression *fbranch)
{
struct expression *args[3];
@@ -230,8 +206,7 @@ exp: exp '?' exp ':' exp
void
internal_function
-FREE_EXPRESSION (exp)
- struct expression *exp;
+FREE_EXPRESSION (struct expression *exp)
{
if (exp == NULL)
return;
@@ -257,9 +232,7 @@ FREE_EXPRESSION (exp)
static int
-yylex (lval, pexp)
- YYSTYPE *lval;
- const char **pexp;
+yylex (YYSTYPE *lval, const char **pexp)
{
const char *exp = *pexp;
int result;
@@ -402,8 +375,7 @@ yylex (lval, pexp)
static void
-yyerror (str)
- const char *str;
+yyerror (const char *str)
{
/* Do nothing. We don't print error messages here. */
}
diff --git a/intl/printf-args.c b/intl/printf-args.c
new file mode 100644
index 00000000..f6f3219e
--- /dev/null
+++ b/intl/printf-args.c
@@ -0,0 +1,119 @@
+/* Decomposed printf argument list.
+ Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Library General Public License as published
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+/* Specification. */
+#include "printf-args.h"
+
+#ifdef STATIC
+STATIC
+#endif
+int
+printf_fetchargs (va_list args, arguments *a)
+{
+ size_t i;
+ argument *ap;
+
+ for (i = 0, ap = &a->arg[0]; i < a->count; i++, ap++)
+ switch (ap->type)
+ {
+ case TYPE_SCHAR:
+ ap->a.a_schar = va_arg (args, /*signed char*/ int);
+ break;
+ case TYPE_UCHAR:
+ ap->a.a_uchar = va_arg (args, /*unsigned char*/ int);
+ break;
+ case TYPE_SHORT:
+ ap->a.a_short = va_arg (args, /*short*/ int);
+ break;
+ case TYPE_USHORT:
+ ap->a.a_ushort = va_arg (args, /*unsigned short*/ int);
+ break;
+ case TYPE_INT:
+ ap->a.a_int = va_arg (args, int);
+ break;
+ case TYPE_UINT:
+ ap->a.a_uint = va_arg (args, unsigned int);
+ break;
+ case TYPE_LONGINT:
+ ap->a.a_longint = va_arg (args, long int);
+ break;
+ case TYPE_ULONGINT:
+ ap->a.a_ulongint = va_arg (args, unsigned long int);
+ break;
+#ifdef HAVE_LONG_LONG
+ case TYPE_LONGLONGINT:
+ ap->a.a_longlongint = va_arg (args, long long int);
+ break;
+ case TYPE_ULONGLONGINT:
+ ap->a.a_ulonglongint = va_arg (args, unsigned long long int);
+ break;
+#endif
+ case TYPE_DOUBLE:
+ ap->a.a_double = va_arg (args, double);
+ break;
+#ifdef HAVE_LONG_DOUBLE
+ case TYPE_LONGDOUBLE:
+ ap->a.a_longdouble = va_arg (args, long double);
+ break;
+#endif
+ case TYPE_CHAR:
+ ap->a.a_char = va_arg (args, int);
+ break;
+#ifdef HAVE_WINT_T
+ case TYPE_WIDE_CHAR:
+ ap->a.a_wide_char = va_arg (args, wint_t);
+ break;
+#endif
+ case TYPE_STRING:
+ ap->a.a_string = va_arg (args, const char *);
+ break;
+#ifdef HAVE_WCHAR_T
+ case TYPE_WIDE_STRING:
+ ap->a.a_wide_string = va_arg (args, const wchar_t *);
+ break;
+#endif
+ case TYPE_POINTER:
+ ap->a.a_pointer = va_arg (args, void *);
+ break;
+ case TYPE_COUNT_SCHAR_POINTER:
+ ap->a.a_count_schar_pointer = va_arg (args, signed char *);
+ break;
+ case TYPE_COUNT_SHORT_POINTER:
+ ap->a.a_count_short_pointer = va_arg (args, short *);
+ break;
+ case TYPE_COUNT_INT_POINTER:
+ ap->a.a_count_int_pointer = va_arg (args, int *);
+ break;
+ case TYPE_COUNT_LONGINT_POINTER:
+ ap->a.a_count_longint_pointer = va_arg (args, long int *);
+ break;
+#ifdef HAVE_LONG_LONG
+ case TYPE_COUNT_LONGLONGINT_POINTER:
+ ap->a.a_count_longlongint_pointer = va_arg (args, long long int *);
+ break;
+#endif
+ default:
+ /* Unknown type. */
+ return -1;
+ }
+ return 0;
+}
diff --git a/intl/printf-args.h b/intl/printf-args.h
new file mode 100644
index 00000000..f11e64c0
--- /dev/null
+++ b/intl/printf-args.h
@@ -0,0 +1,137 @@
+/* Decomposed printf argument list.
+ Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Library General Public License as published
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+#ifndef _PRINTF_ARGS_H
+#define _PRINTF_ARGS_H
+
+/* Get size_t. */
+#include <stddef.h>
+
+/* Get wchar_t. */
+#ifdef HAVE_WCHAR_T
+# include <stddef.h>
+#endif
+
+/* Get wint_t. */
+#ifdef HAVE_WINT_T
+# include <wchar.h>
+#endif
+
+/* Get va_list. */
+#include <stdarg.h>
+
+
+/* Argument types */
+typedef enum
+{
+ TYPE_NONE,
+ TYPE_SCHAR,
+ TYPE_UCHAR,
+ TYPE_SHORT,
+ TYPE_USHORT,
+ TYPE_INT,
+ TYPE_UINT,
+ TYPE_LONGINT,
+ TYPE_ULONGINT,
+#ifdef HAVE_LONG_LONG
+ TYPE_LONGLONGINT,
+ TYPE_ULONGLONGINT,
+#endif
+ TYPE_DOUBLE,
+#ifdef HAVE_LONG_DOUBLE
+ TYPE_LONGDOUBLE,
+#endif
+ TYPE_CHAR,
+#ifdef HAVE_WINT_T
+ TYPE_WIDE_CHAR,
+#endif
+ TYPE_STRING,
+#ifdef HAVE_WCHAR_T
+ TYPE_WIDE_STRING,
+#endif
+ TYPE_POINTER,
+ TYPE_COUNT_SCHAR_POINTER,
+ TYPE_COUNT_SHORT_POINTER,
+ TYPE_COUNT_INT_POINTER,
+ TYPE_COUNT_LONGINT_POINTER
+#ifdef HAVE_LONG_LONG
+, TYPE_COUNT_LONGLONGINT_POINTER
+#endif
+} arg_type;
+
+/* Polymorphic argument */
+typedef struct
+{
+ arg_type type;
+ union
+ {
+ signed char a_schar;
+ unsigned char a_uchar;
+ short a_short;
+ unsigned short a_ushort;
+ int a_int;
+ unsigned int a_uint;
+ long int a_longint;
+ unsigned long int a_ulongint;
+#ifdef HAVE_LONG_LONG
+ long long int a_longlongint;
+ unsigned long long int a_ulonglongint;
+#endif
+ float a_float;
+ double a_double;
+#ifdef HAVE_LONG_DOUBLE
+ long double a_longdouble;
+#endif
+ int a_char;
+#ifdef HAVE_WINT_T
+ wint_t a_wide_char;
+#endif
+ const char* a_string;
+#ifdef HAVE_WCHAR_T
+ const wchar_t* a_wide_string;
+#endif
+ void* a_pointer;
+ signed char * a_count_schar_pointer;
+ short * a_count_short_pointer;
+ int * a_count_int_pointer;
+ long int * a_count_longint_pointer;
+#ifdef HAVE_LONG_LONG
+ long long int * a_count_longlongint_pointer;
+#endif
+ }
+ a;
+}
+argument;
+
+typedef struct
+{
+ size_t count;
+ argument *arg;
+}
+arguments;
+
+
+/* Fetch the arguments, putting them into a. */
+#ifdef STATIC
+STATIC
+#else
+extern
+#endif
+int printf_fetchargs (va_list args, arguments *a);
+
+#endif /* _PRINTF_ARGS_H */
diff --git a/intl/printf-parse.c b/intl/printf-parse.c
new file mode 100644
index 00000000..d19f903d
--- /dev/null
+++ b/intl/printf-parse.c
@@ -0,0 +1,537 @@
+/* Formatted output to strings.
+ Copyright (C) 1999-2000, 2002-2003 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Library General Public License as published
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+/* Specification. */
+#if WIDE_CHAR_VERSION
+# include "wprintf-parse.h"
+#else
+# include "printf-parse.h"
+#endif
+
+/* Get size_t, NULL. */
+#include <stddef.h>
+
+/* Get intmax_t. */
+#if HAVE_STDINT_H_WITH_UINTMAX
+# include <stdint.h>
+#endif
+#if HAVE_INTTYPES_H_WITH_UINTMAX
+# include <inttypes.h>
+#endif
+
+/* malloc(), realloc(), free(). */
+#include <stdlib.h>
+
+/* Checked size_t computations. */
+#include "xsize.h"
+
+#if WIDE_CHAR_VERSION
+# define PRINTF_PARSE wprintf_parse
+# define CHAR_T wchar_t
+# define DIRECTIVE wchar_t_directive
+# define DIRECTIVES wchar_t_directives
+#else
+# define PRINTF_PARSE printf_parse
+# define CHAR_T char
+# define DIRECTIVE char_directive
+# define DIRECTIVES char_directives
+#endif
+
+#ifdef STATIC
+STATIC
+#endif
+int
+PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
+{
+ const CHAR_T *cp = format; /* pointer into format */
+ size_t arg_posn = 0; /* number of regular arguments consumed */
+ size_t d_allocated; /* allocated elements of d->dir */
+ size_t a_allocated; /* allocated elements of a->arg */
+ size_t max_width_length = 0;
+ size_t max_precision_length = 0;
+
+ d->count = 0;
+ d_allocated = 1;
+ d->dir = malloc (d_allocated * sizeof (DIRECTIVE));
+ if (d->dir == NULL)
+ /* Out of memory. */
+ return -1;
+
+ a->count = 0;
+ a_allocated = 0;
+ a->arg = NULL;
+
+#define REGISTER_ARG(_index_,_type_) \
+ { \
+ size_t n = (_index_); \
+ if (n >= a_allocated) \
+ { \
+ size_t memory_size; \
+ argument *memory; \
+ \
+ a_allocated = xtimes (a_allocated, 2); \
+ if (a_allocated <= n) \
+ a_allocated = xsum (n, 1); \
+ memory_size = xtimes (a_allocated, sizeof (argument)); \
+ if (size_overflow_p (memory_size)) \
+ /* Overflow, would lead to out of memory. */ \
+ goto error; \
+ memory = (a->arg \
+ ? realloc (a->arg, memory_size) \
+ : malloc (memory_size)); \
+ if (memory == NULL) \
+ /* Out of memory. */ \
+ goto error; \
+ a->arg = memory; \
+ } \
+ while (a->count <= n) \
+ a->arg[a->count++].type = TYPE_NONE; \
+ if (a->arg[n].type == TYPE_NONE) \
+ a->arg[n].type = (_type_); \
+ else if (a->arg[n].type != (_type_)) \
+ /* Ambiguous type for positional argument. */ \
+ goto error; \
+ }
+
+ while (*cp != '\0')
+ {
+ CHAR_T c = *cp++;
+ if (c == '%')
+ {
+ size_t arg_index = ARG_NONE;
+ DIRECTIVE *dp = &d->dir[d->count];/* pointer to next directive */
+
+ /* Initialize the next directive. */
+ dp->dir_start = cp - 1;
+ dp->flags = 0;
+ dp->width_start = NULL;
+ dp->width_end = NULL;
+ dp->width_arg_index = ARG_NONE;
+ dp->precision_start = NULL;
+ dp->precision_end = NULL;
+ dp->precision_arg_index = ARG_NONE;
+ dp->arg_index = ARG_NONE;
+
+ /* Test for positional argument. */
+ if (*cp >= '0' && *cp <= '9')
+ {
+ const CHAR_T *np;
+
+ for (np = cp; *np >= '0' && *np <= '9'; np++)
+ ;
+ if (*np == '$')
+ {
+ size_t n = 0;
+
+ for (np = cp; *np >= '0' && *np <= '9'; np++)
+ n = xsum (xtimes (n, 10), *np - '0');
+ if (n == 0)
+ /* Positional argument 0. */
+ goto error;
+ if (size_overflow_p (n))
+ /* n too large, would lead to out of memory later. */
+ goto error;
+ arg_index = n - 1;
+ cp = np + 1;
+ }
+ }
+
+ /* Read the flags. */
+ for (;;)
+ {
+ if (*cp == '\'')
+ {
+ dp->flags |= FLAG_GROUP;
+ cp++;
+ }
+ else if (*cp == '-')
+ {
+ dp->flags |= FLAG_LEFT;
+ cp++;
+ }
+ else if (*cp == '+')
+ {
+ dp->flags |= FLAG_SHOWSIGN;
+ cp++;
+ }
+ else if (*cp == ' ')
+ {
+ dp->flags |= FLAG_SPACE;
+ cp++;
+ }
+ else if (*cp == '#')
+ {
+ dp->flags |= FLAG_ALT;
+ cp++;
+ }
+ else if (*cp == '0')
+ {
+ dp->flags |= FLAG_ZERO;
+ cp++;
+ }
+ else
+ break;
+ }
+
+ /* Parse the field width. */
+ if (*cp == '*')
+ {
+ dp->width_start = cp;
+ cp++;
+ dp->width_end = cp;
+ if (max_width_length < 1)
+ max_width_length = 1;
+
+ /* Test for positional argument. */
+ if (*cp >= '0' && *cp <= '9')
+ {
+ const CHAR_T *np;
+
+ for (np = cp; *np >= '0' && *np <= '9'; np++)
+ ;
+ if (*np == '$')
+ {
+ size_t n = 0;
+
+ for (np = cp; *np >= '0' && *np <= '9'; np++)
+ n = xsum (xtimes (n, 10), *np - '0');
+ if (n == 0)
+ /* Positional argument 0. */
+ goto error;
+ if (size_overflow_p (n))
+ /* n too large, would lead to out of memory later. */
+ goto error;
+ dp->width_arg_index = n - 1;
+ cp = np + 1;
+ }
+ }
+ if (dp->width_arg_index == ARG_NONE)
+ {
+ dp->width_arg_index = arg_posn++;
+ if (dp->width_arg_index == ARG_NONE)
+ /* arg_posn wrapped around. */
+ goto error;
+ }
+ REGISTER_ARG (dp->width_arg_index, TYPE_INT);
+ }
+ else if (*cp >= '0' && *cp <= '9')
+ {
+ size_t width_length;
+
+ dp->width_start = cp;
+ for (; *cp >= '0' && *cp <= '9'; cp++)
+ ;
+ dp->width_end = cp;
+ width_length = dp->width_end - dp->width_start;
+ if (max_width_length < width_length)
+ max_width_length = width_length;
+ }
+
+ /* Parse the precision. */
+ if (*cp == '.')
+ {
+ cp++;
+ if (*cp == '*')
+ {
+ dp->precision_start = cp - 1;
+ cp++;
+ dp->precision_end = cp;
+ if (max_precision_length < 2)
+ max_precision_length = 2;
+
+ /* Test for positional argument. */
+ if (*cp >= '0' && *cp <= '9')
+ {
+ const CHAR_T *np;
+
+ for (np = cp; *np >= '0' && *np <= '9'; np++)
+ ;
+ if (*np == '$')
+ {
+ size_t n = 0;
+
+ for (np = cp; *np >= '0' && *np <= '9'; np++)
+ n = xsum (xtimes (n, 10), *np - '0');
+ if (n == 0)
+ /* Positional argument 0. */
+ goto error;
+ if (size_overflow_p (n))
+ /* n too large, would lead to out of memory
+ later. */
+ goto error;
+ dp->precision_arg_index = n - 1;
+ cp = np + 1;
+ }
+ }
+ if (dp->precision_arg_index == ARG_NONE)
+ {
+ dp->precision_arg_index = arg_posn++;
+ if (dp->precision_arg_index == ARG_NONE)
+ /* arg_posn wrapped around. */
+ goto error;
+ }
+ REGISTER_ARG (dp->precision_arg_index, TYPE_INT);
+ }
+ else
+ {
+ size_t precision_length;
+
+ dp->precision_start = cp - 1;
+ for (; *cp >= '0' && *cp <= '9'; cp++)
+ ;
+ dp->precision_end = cp;
+ precision_length = dp->precision_end - dp->precision_start;
+ if (max_precision_length < precision_length)
+ max_precision_length = precision_length;
+ }
+ }
+
+ {
+ arg_type type;
+
+ /* Parse argument type/size specifiers. */
+ {
+ int flags = 0;
+
+ for (;;)
+ {
+ if (*cp == 'h')
+ {
+ flags |= (1 << (flags & 1));
+ cp++;
+ }
+ else if (*cp == 'L')
+ {
+ flags |= 4;
+ cp++;
+ }
+ else if (*cp == 'l')
+ {
+ flags += 8;
+ cp++;
+ }
+#ifdef HAVE_INTMAX_T
+ else if (*cp == 'j')
+ {
+ if (sizeof (intmax_t) > sizeof (long))
+ {
+ /* intmax_t = long long */
+ flags += 16;
+ }
+ else if (sizeof (intmax_t) > sizeof (int))
+ {
+ /* intmax_t = long */
+ flags += 8;
+ }
+ cp++;
+ }
+#endif
+ else if (*cp == 'z' || *cp == 'Z')
+ {
+ /* 'z' is standardized in ISO C 99, but glibc uses 'Z'
+ because the warning facility in gcc-2.95.2 understands
+ only 'Z' (see gcc-2.95.2/gcc/c-common.c:1784). */
+ if (sizeof (size_t) > sizeof (long))
+ {
+ /* size_t = long long */
+ flags += 16;
+ }
+ else if (sizeof (size_t) > sizeof (int))
+ {
+ /* size_t = long */
+ flags += 8;
+ }
+ cp++;
+ }
+ else if (*cp == 't')
+ {
+ if (sizeof (ptrdiff_t) > sizeof (long))
+ {
+ /* ptrdiff_t = long long */
+ flags += 16;
+ }
+ else if (sizeof (ptrdiff_t) > sizeof (int))
+ {
+ /* ptrdiff_t = long */
+ flags += 8;
+ }
+ cp++;
+ }
+ else
+ break;
+ }
+
+ /* Read the conversion character. */
+ c = *cp++;
+ switch (c)
+ {
+ case 'd': case 'i':
+#ifdef HAVE_LONG_LONG
+ if (flags >= 16 || (flags & 4))
+ type = TYPE_LONGLONGINT;
+ else
+#endif
+ if (flags >= 8)
+ type = TYPE_LONGINT;
+ else if (flags & 2)
+ type = TYPE_SCHAR;
+ else if (flags & 1)
+ type = TYPE_SHORT;
+ else
+ type = TYPE_INT;
+ break;
+ case 'o': case 'u': case 'x': case 'X':
+#ifdef HAVE_LONG_LONG
+ if (flags >= 16 || (flags & 4))
+ type = TYPE_ULONGLONGINT;
+ else
+#endif
+ if (flags >= 8)
+ type = TYPE_ULONGINT;
+ else if (flags & 2)
+ type = TYPE_UCHAR;
+ else if (flags & 1)
+ type = TYPE_USHORT;
+ else
+ type = TYPE_UINT;
+ break;
+ case 'f': case 'F': case 'e': case 'E': case 'g': case 'G':
+ case 'a': case 'A':
+#ifdef HAVE_LONG_DOUBLE
+ if (flags >= 16 || (flags & 4))
+ type = TYPE_LONGDOUBLE;
+ else
+#endif
+ type = TYPE_DOUBLE;
+ break;
+ case 'c':
+ if (flags >= 8)
+#ifdef HAVE_WINT_T
+ type = TYPE_WIDE_CHAR;
+#else
+ goto error;
+#endif
+ else
+ type = TYPE_CHAR;
+ break;
+#ifdef HAVE_WINT_T
+ case 'C':
+ type = TYPE_WIDE_CHAR;
+ c = 'c';
+ break;
+#endif
+ case 's':
+ if (flags >= 8)
+#ifdef HAVE_WCHAR_T
+ type = TYPE_WIDE_STRING;
+#else
+ goto error;
+#endif
+ else
+ type = TYPE_STRING;
+ break;
+#ifdef HAVE_WCHAR_T
+ case 'S':
+ type = TYPE_WIDE_STRING;
+ c = 's';
+ break;
+#endif
+ case 'p':
+ type = TYPE_POINTER;
+ break;
+ case 'n':
+#ifdef HAVE_LONG_LONG
+ if (flags >= 16 || (flags & 4))
+ type = TYPE_COUNT_LONGLONGINT_POINTER;
+ else
+#endif
+ if (flags >= 8)
+ type = TYPE_COUNT_LONGINT_POINTER;
+ else if (flags & 2)
+ type = TYPE_COUNT_SCHAR_POINTER;
+ else if (flags & 1)
+ type = TYPE_COUNT_SHORT_POINTER;
+ else
+ type = TYPE_COUNT_INT_POINTER;
+ break;
+ case '%':
+ type = TYPE_NONE;
+ break;
+ default:
+ /* Unknown conversion character. */
+ goto error;
+ }
+ }
+
+ if (type != TYPE_NONE)
+ {
+ dp->arg_index = arg_index;
+ if (dp->arg_index == ARG_NONE)
+ {
+ dp->arg_index = arg_posn++;
+ if (dp->arg_index == ARG_NONE)
+ /* arg_posn wrapped around. */
+ goto error;
+ }
+ REGISTER_ARG (dp->arg_index, type);
+ }
+ dp->conversion = c;
+ dp->dir_end = cp;
+ }
+
+ d->count++;
+ if (d->count >= d_allocated)
+ {
+ size_t memory_size;
+ DIRECTIVE *memory;
+
+ d_allocated = xtimes (d_allocated, 2);
+ memory_size = xtimes (d_allocated, sizeof (DIRECTIVE));
+ if (size_overflow_p (memory_size))
+ /* Overflow, would lead to out of memory. */
+ goto error;
+ memory = realloc (d->dir, memory_size);
+ if (memory == NULL)
+ /* Out of memory. */
+ goto error;
+ d->dir = memory;
+ }
+ }
+ }
+ d->dir[d->count].dir_start = cp;
+
+ d->max_width_length = max_width_length;
+ d->max_precision_length = max_precision_length;
+ return 0;
+
+error:
+ if (a->arg)
+ free (a->arg);
+ if (d->dir)
+ free (d->dir);
+ return -1;
+}
+
+#undef DIRECTIVES
+#undef DIRECTIVE
+#undef CHAR_T
+#undef PRINTF_PARSE
diff --git a/intl/printf-parse.h b/intl/printf-parse.h
new file mode 100644
index 00000000..8aec50e2
--- /dev/null
+++ b/intl/printf-parse.h
@@ -0,0 +1,75 @@
+/* Parse printf format string.
+ Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Library General Public License as published
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+#ifndef _PRINTF_PARSE_H
+#define _PRINTF_PARSE_H
+
+#include "printf-args.h"
+
+
+/* Flags */
+#define FLAG_GROUP 1 /* ' flag */
+#define FLAG_LEFT 2 /* - flag */
+#define FLAG_SHOWSIGN 4 /* + flag */
+#define FLAG_SPACE 8 /* space flag */
+#define FLAG_ALT 16 /* # flag */
+#define FLAG_ZERO 32
+
+/* arg_index value indicating that no argument is consumed. */
+#define ARG_NONE (~(size_t)0)
+
+/* A parsed directive. */
+typedef struct
+{
+ const char* dir_start;
+ const char* dir_end;
+ int flags;
+ const char* width_start;
+ const char* width_end;
+ size_t width_arg_index;
+ const char* precision_start;
+ const char* precision_end;
+ size_t precision_arg_index;
+ char conversion; /* d i o u x X f e E g G c s p n U % but not C S */
+ size_t arg_index;
+}
+char_directive;
+
+/* A parsed format string. */
+typedef struct
+{
+ size_t count;
+ char_directive *dir;
+ size_t max_width_length;
+ size_t max_precision_length;
+}
+char_directives;
+
+
+/* Parses the format string. Fills in the number N of directives, and fills
+ in directives[0], ..., directives[N-1], and sets directives[N].dir_start
+ to the end of the format string. Also fills in the arg_type fields of the
+ arguments and the needed count of arguments. */
+#ifdef STATIC
+STATIC
+#else
+extern
+#endif
+int printf_parse (const char *format, char_directives *d, arguments *a);
+
+#endif /* _PRINTF_PARSE_H */
diff --git a/intl/printf.c b/intl/printf.c
new file mode 100644
index 00000000..878646c2
--- /dev/null
+++ b/intl/printf.c
@@ -0,0 +1,371 @@
+/* Formatted output to strings, using POSIX/XSI format strings with positions.
+ Copyright (C) 2003 Free Software Foundation, Inc.
+ Written by Bruno Haible <bruno@clisp.org>, 2003.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Library General Public License as published
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+# define HAVE_ALLOCA 1
+#else
+# ifdef _MSC_VER
+# include <malloc.h>
+# define alloca _alloca
+# else
+# if defined HAVE_ALLOCA_H || defined _LIBC
+# include <alloca.h>
+# else
+# ifdef _AIX
+ #pragma alloca
+# else
+# ifndef alloca
+char *alloca ();
+# endif
+# endif
+# endif
+# endif
+#endif
+
+#include <stdio.h>
+
+#if !HAVE_POSIX_PRINTF
+
+#include <stdlib.h>
+#include <string.h>
+
+/* When building a DLL, we must export some functions. Note that because
+ the functions are only defined for binary backward compatibility, we
+ don't need to use __declspec(dllimport) in any case. */
+#if defined _MSC_VER && BUILDING_DLL
+# define DLL_EXPORTED __declspec(dllexport)
+#else
+# define DLL_EXPORTED
+#endif
+
+#define STATIC static
+
+/* Define auxiliary functions declared in "printf-args.h". */
+#include "printf-args.c"
+
+/* Define auxiliary functions declared in "printf-parse.h". */
+#include "printf-parse.c"
+
+/* Define functions declared in "vasnprintf.h". */
+#define vasnprintf libintl_vasnprintf
+#include "vasnprintf.c"
+#if 0 /* not needed */
+#define asnprintf libintl_asnprintf
+#include "asnprintf.c"
+#endif
+
+DLL_EXPORTED
+int
+libintl_vfprintf (FILE *stream, const char *format, va_list args)
+{
+ if (strchr (format, '$') == NULL)
+ return vfprintf (stream, format, args);
+ else
+ {
+ size_t length;
+ char *result = libintl_vasnprintf (NULL, &length, format, args);
+ int retval = -1;
+ if (result != NULL)
+ {
+ if (fwrite (result, 1, length, stream) == length)
+ retval = length;
+ free (result);
+ }
+ return retval;
+ }
+}
+
+DLL_EXPORTED
+int
+libintl_fprintf (FILE *stream, const char *format, ...)
+{
+ va_list args;
+ int retval;
+
+ va_start (args, format);
+ retval = libintl_vfprintf (stream, format, args);
+ va_end (args);
+ return retval;
+}
+
+DLL_EXPORTED
+int
+libintl_vprintf (const char *format, va_list args)
+{
+ return libintl_vfprintf (stdout, format, args);
+}
+
+DLL_EXPORTED
+int
+libintl_printf (const char *format, ...)
+{
+ va_list args;
+ int retval;
+
+ va_start (args, format);
+ retval = libintl_vprintf (format, args);
+ va_end (args);
+ return retval;
+}
+
+DLL_EXPORTED
+int
+libintl_vsprintf (char *resultbuf, const char *format, va_list args)
+{
+ if (strchr (format, '$') == NULL)
+ return vsprintf (resultbuf, format, args);
+ else
+ {
+ size_t length = (size_t) ~0 / (4 * sizeof (char));
+ char *result = libintl_vasnprintf (resultbuf, &length, format, args);
+ if (result != resultbuf)
+ {
+ free (result);
+ return -1;
+ }
+ else
+ return length;
+ }
+}
+
+DLL_EXPORTED
+int
+libintl_sprintf (char *resultbuf, const char *format, ...)
+{
+ va_list args;
+ int retval;
+
+ va_start (args, format);
+ retval = libintl_vsprintf (resultbuf, format, args);
+ va_end (args);
+ return retval;
+}
+
+#if HAVE_SNPRINTF
+
+# if HAVE_DECL__SNPRINTF
+ /* Windows. */
+# define system_vsnprintf _vsnprintf
+# else
+ /* Unix. */
+# define system_vsnprintf vsnprintf
+# endif
+
+DLL_EXPORTED
+int
+libintl_vsnprintf (char *resultbuf, size_t length, const char *format, va_list args)
+{
+ if (strchr (format, '$') == NULL)
+ return system_vsnprintf (resultbuf, length, format, args);
+ else
+ {
+ size_t maxlength = length;
+ char *result = libintl_vasnprintf (resultbuf, &length, format, args);
+ if (result != resultbuf)
+ {
+ if (maxlength > 0)
+ {
+ if (length < maxlength)
+ abort ();
+ memcpy (resultbuf, result, maxlength - 1);
+ resultbuf[maxlength - 1] = '\0';
+ }
+ free (result);
+ return -1;
+ }
+ else
+ return length;
+ }
+}
+
+DLL_EXPORTED
+int
+libintl_snprintf (char *resultbuf, size_t length, const char *format, ...)
+{
+ va_list args;
+ int retval;
+
+ va_start (args, format);
+ retval = libintl_vsnprintf (resultbuf, length, format, args);
+ va_end (args);
+ return retval;
+}
+
+#endif
+
+#if HAVE_ASPRINTF
+
+DLL_EXPORTED
+int
+libintl_vasprintf (char **resultp, const char *format, va_list args)
+{
+ size_t length;
+ char *result = libintl_vasnprintf (NULL, &length, format, args);
+ if (result == NULL)
+ return -1;
+ *resultp = result;
+ return length;
+}
+
+DLL_EXPORTED
+int
+libintl_asprintf (char **resultp, const char *format, ...)
+{
+ va_list args;
+ int retval;
+
+ va_start (args, format);
+ retval = libintl_vasprintf (resultp, format, args);
+ va_end (args);
+ return retval;
+}
+
+#endif
+
+#if HAVE_FWPRINTF
+
+#include <wchar.h>
+
+#define WIDE_CHAR_VERSION 1
+
+/* Define auxiliary functions declared in "wprintf-parse.h". */
+#include "printf-parse.c"
+
+/* Define functions declared in "vasnprintf.h". */
+#define vasnwprintf libintl_vasnwprintf
+#include "vasnprintf.c"
+#if 0 /* not needed */
+#define asnwprintf libintl_asnwprintf
+#include "asnprintf.c"
+#endif
+
+# if HAVE_DECL__SNWPRINTF
+ /* Windows. */
+# define system_vswprintf _vsnwprintf
+# else
+ /* Unix. */
+# define system_vswprintf vswprintf
+# endif
+
+DLL_EXPORTED
+int
+libintl_vfwprintf (FILE *stream, const wchar_t *format, va_list args)
+{
+ if (wcschr (format, '$') == NULL)
+ return vfwprintf (stream, format, args);
+ else
+ {
+ size_t length;
+ wchar_t *result = libintl_vasnwprintf (NULL, &length, format, args);
+ int retval = -1;
+ if (result != NULL)
+ {
+ size_t i;
+ for (i = 0; i < length; i++)
+ if (fputwc (result[i], stream) == WEOF)
+ break;
+ if (i == length)
+ retval = length;
+ free (result);
+ }
+ return retval;
+ }
+}
+
+DLL_EXPORTED
+int
+libintl_fwprintf (FILE *stream, const wchar_t *format, ...)
+{
+ va_list args;
+ int retval;
+
+ va_start (args, format);
+ retval = libintl_vfwprintf (stream, format, args);
+ va_end (args);
+ return retval;
+}
+
+DLL_EXPORTED
+int
+libintl_vwprintf (const wchar_t *format, va_list args)
+{
+ return libintl_vfwprintf (stdout, format, args);
+}
+
+DLL_EXPORTED
+int
+libintl_wprintf (const wchar_t *format, ...)
+{
+ va_list args;
+ int retval;
+
+ va_start (args, format);
+ retval = libintl_vwprintf (format, args);
+ va_end (args);
+ return retval;
+}
+
+DLL_EXPORTED
+int
+libintl_vswprintf (wchar_t *resultbuf, size_t length, const wchar_t *format, va_list args)
+{
+ if (wcschr (format, '$') == NULL)
+ return system_vswprintf (resultbuf, length, format, args);
+ else
+ {
+ size_t maxlength = length;
+ wchar_t *result = libintl_vasnwprintf (resultbuf, &length, format, args);
+ if (result != resultbuf)
+ {
+ if (maxlength > 0)
+ {
+ if (length < maxlength)
+ abort ();
+ memcpy (resultbuf, result, (maxlength - 1) * sizeof (wchar_t));
+ resultbuf[maxlength - 1] = 0;
+ }
+ free (result);
+ return -1;
+ }
+ else
+ return length;
+ }
+}
+
+DLL_EXPORTED
+int
+libintl_swprintf (wchar_t *resultbuf, size_t length, const wchar_t *format, ...)
+{
+ va_list args;
+ int retval;
+
+ va_start (args, format);
+ retval = libintl_vswprintf (resultbuf, length, format, args);
+ va_end (args);
+ return retval;
+}
+
+#endif
+
+#endif
diff --git a/intl/relocatable.c b/intl/relocatable.c
new file mode 100644
index 00000000..bf7c7085
--- /dev/null
+++ b/intl/relocatable.c
@@ -0,0 +1,449 @@
+/* Provide relocatable packages.
+ Copyright (C) 2003 Free Software Foundation, Inc.
+ Written by Bruno Haible <bruno@clisp.org>, 2003.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Library General Public License as published
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+
+/* Tell glibc's <stdio.h> to provide a prototype for getline().
+ This must come before <config.h> because <config.h> may include
+ <features.h>, and once <features.h> has been included, it's too late. */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+/* Specification. */
+#include "relocatable.h"
+
+#if ENABLE_RELOCATABLE
+
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifdef NO_XMALLOC
+# define xmalloc malloc
+#else
+# include "xalloc.h"
+#endif
+
+#if defined _WIN32 || defined __WIN32__
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+#endif
+
+#if DEPENDS_ON_LIBCHARSET
+# include <libcharset.h>
+#endif
+#if DEPENDS_ON_LIBICONV && HAVE_ICONV
+# include <iconv.h>
+#endif
+#if DEPENDS_ON_LIBINTL && ENABLE_NLS
+# include <libintl.h>
+#endif
+
+/* Faked cheap 'bool'. */
+#undef bool
+#undef false
+#undef true
+#define bool int
+#define false 0
+#define true 1
+
+/* Pathname support.
+ ISSLASH(C) tests whether C is a directory separator character.
+ IS_PATH_WITH_DIR(P) tests whether P contains a directory specification.
+ */
+#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
+ /* Win32, OS/2, DOS */
+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
+# define HAS_DEVICE(P) \
+ ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
+ && (P)[1] == ':')
+# define IS_PATH_WITH_DIR(P) \
+ (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P))
+# define FILESYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0)
+#else
+ /* Unix */
+# define ISSLASH(C) ((C) == '/')
+# define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL)
+# define FILESYSTEM_PREFIX_LEN(P) 0
+#endif
+
+/* Original installation prefix. */
+static char *orig_prefix;
+static size_t orig_prefix_len;
+/* Current installation prefix. */
+static char *curr_prefix;
+static size_t curr_prefix_len;
+/* These prefixes do not end in a slash. Anything that will be concatenated
+ to them must start with a slash. */
+
+/* Sets the original and the current installation prefix of this module.
+ Relocation simply replaces a pathname starting with the original prefix
+ by the corresponding pathname with the current prefix instead. Both
+ prefixes should be directory names without trailing slash (i.e. use ""
+ instead of "/"). */
+static void
+set_this_relocation_prefix (const char *orig_prefix_arg,
+ const char *curr_prefix_arg)
+{
+ if (orig_prefix_arg != NULL && curr_prefix_arg != NULL
+ /* Optimization: if orig_prefix and curr_prefix are equal, the
+ relocation is a nop. */
+ && strcmp (orig_prefix_arg, curr_prefix_arg) != 0)
+ {
+ /* Duplicate the argument strings. */
+ char *memory;
+
+ orig_prefix_len = strlen (orig_prefix_arg);
+ curr_prefix_len = strlen (curr_prefix_arg);
+ memory = (char *) xmalloc (orig_prefix_len + 1 + curr_prefix_len + 1);
+#ifdef NO_XMALLOC
+ if (memory != NULL)
+#endif
+ {
+ memcpy (memory, orig_prefix_arg, orig_prefix_len + 1);
+ orig_prefix = memory;
+ memory += orig_prefix_len + 1;
+ memcpy (memory, curr_prefix_arg, curr_prefix_len + 1);
+ curr_prefix = memory;
+ return;
+ }
+ }
+ orig_prefix = NULL;
+ curr_prefix = NULL;
+ /* Don't worry about wasted memory here - this function is usually only
+ called once. */
+}
+
+/* Sets the original and the current installation prefix of the package.
+ Relocation simply replaces a pathname starting with the original prefix
+ by the corresponding pathname with the current prefix instead. Both
+ prefixes should be directory names without trailing slash (i.e. use ""
+ instead of "/"). */
+void
+set_relocation_prefix (const char *orig_prefix_arg, const char *curr_prefix_arg)
+{
+ set_this_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
+
+ /* Now notify all dependent libraries. */
+#if DEPENDS_ON_LIBCHARSET
+ libcharset_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
+#endif
+#if DEPENDS_ON_LIBICONV && HAVE_ICONV && _LIBICONV_VERSION >= 0x0109
+ libiconv_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
+#endif
+#if DEPENDS_ON_LIBINTL && ENABLE_NLS && defined libintl_set_relocation_prefix
+ libintl_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg);
+#endif
+}
+
+#if !defined IN_LIBRARY || (defined PIC && defined INSTALLDIR)
+
+/* Convenience function:
+ Computes the current installation prefix, based on the original
+ installation prefix, the original installation directory of a particular
+ file, and the current pathname of this file. Returns NULL upon failure. */
+#ifdef IN_LIBRARY
+#define compute_curr_prefix local_compute_curr_prefix
+static
+#endif
+const char *
+compute_curr_prefix (const char *orig_installprefix,
+ const char *orig_installdir,
+ const char *curr_pathname)
+{
+ const char *curr_installdir;
+ const char *rel_installdir;
+
+ if (curr_pathname == NULL)
+ return NULL;
+
+ /* Determine the relative installation directory, relative to the prefix.
+ This is simply the difference between orig_installprefix and
+ orig_installdir. */
+ if (strncmp (orig_installprefix, orig_installdir, strlen (orig_installprefix))
+ != 0)
+ /* Shouldn't happen - nothing should be installed outside $(prefix). */
+ return NULL;
+ rel_installdir = orig_installdir + strlen (orig_installprefix);
+
+ /* Determine the current installation directory. */
+ {
+ const char *p_base = curr_pathname + FILESYSTEM_PREFIX_LEN (curr_pathname);
+ const char *p = curr_pathname + strlen (curr_pathname);
+ char *q;
+
+ while (p > p_base)
+ {
+ p--;
+ if (ISSLASH (*p))
+ break;
+ }
+
+ q = (char *) xmalloc (p - curr_pathname + 1);
+#ifdef NO_XMALLOC
+ if (q == NULL)
+ return NULL;
+#endif
+ memcpy (q, curr_pathname, p - curr_pathname);
+ q[p - curr_pathname] = '\0';
+ curr_installdir = q;
+ }
+
+ /* Compute the current installation prefix by removing the trailing
+ rel_installdir from it. */
+ {
+ const char *rp = rel_installdir + strlen (rel_installdir);
+ const char *cp = curr_installdir + strlen (curr_installdir);
+ const char *cp_base =
+ curr_installdir + FILESYSTEM_PREFIX_LEN (curr_installdir);
+
+ while (rp > rel_installdir && cp > cp_base)
+ {
+ bool same = false;
+ const char *rpi = rp;
+ const char *cpi = cp;
+
+ while (rpi > rel_installdir && cpi > cp_base)
+ {
+ rpi--;
+ cpi--;
+ if (ISSLASH (*rpi) || ISSLASH (*cpi))
+ {
+ if (ISSLASH (*rpi) && ISSLASH (*cpi))
+ same = true;
+ break;
+ }
+#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
+ /* Win32, OS/2, DOS - case insignificant filesystem */
+ if ((*rpi >= 'a' && *rpi <= 'z' ? *rpi - 'a' + 'A' : *rpi)
+ != (*cpi >= 'a' && *cpi <= 'z' ? *cpi - 'a' + 'A' : *cpi))
+ break;
+#else
+ if (*rpi != *cpi)
+ break;
+#endif
+ }
+ if (!same)
+ break;
+ /* The last pathname component was the same. opi and cpi now point
+ to the slash before it. */
+ rp = rpi;
+ cp = cpi;
+ }
+
+ if (rp > rel_installdir)
+ /* Unexpected: The curr_installdir does not end with rel_installdir. */
+ return NULL;
+
+ {
+ size_t curr_prefix_len = cp - curr_installdir;
+ char *curr_prefix;
+
+ curr_prefix = (char *) xmalloc (curr_prefix_len + 1);
+#ifdef NO_XMALLOC
+ if (curr_prefix == NULL)
+ return NULL;
+#endif
+ memcpy (curr_prefix, curr_installdir, curr_prefix_len);
+ curr_prefix[curr_prefix_len] = '\0';
+
+ return curr_prefix;
+ }
+ }
+}
+
+#endif /* !IN_LIBRARY || PIC */
+
+#if defined PIC && defined INSTALLDIR
+
+/* Full pathname of shared library, or NULL. */
+static char *shared_library_fullname;
+
+#if defined _WIN32 || defined __WIN32__
+
+/* Determine the full pathname of the shared library when it is loaded. */
+
+BOOL WINAPI
+DllMain (HINSTANCE module_handle, DWORD event, LPVOID reserved)
+{
+ (void) reserved;
+
+ if (event == DLL_PROCESS_ATTACH)
+ {
+ /* The DLL is being loaded into an application's address range. */
+ static char location[MAX_PATH];
+
+ if (!GetModuleFileName (module_handle, location, sizeof (location)))
+ /* Shouldn't happen. */
+ return FALSE;
+
+ if (!IS_PATH_WITH_DIR (location))
+ /* Shouldn't happen. */
+ return FALSE;
+
+ shared_library_fullname = strdup (location);
+ }
+
+ return TRUE;
+}
+
+#else /* Unix */
+
+static void
+find_shared_library_fullname ()
+{
+#if defined __linux__ && __GLIBC__ >= 2
+ /* Linux has /proc/self/maps. glibc 2 has the getline() function. */
+ FILE *fp;
+
+ /* Open the current process' maps file. It describes one VMA per line. */
+ fp = fopen ("/proc/self/maps", "r");
+ if (fp)
+ {
+ unsigned long address = (unsigned long) &find_shared_library_fullname;
+ for (;;)
+ {
+ unsigned long start, end;
+ int c;
+
+ if (fscanf (fp, "%lx-%lx", &start, &end) != 2)
+ break;
+ if (address >= start && address <= end - 1)
+ {
+ /* Found it. Now see if this line contains a filename. */
+ while (c = getc (fp), c != EOF && c != '\n' && c != '/')
+ continue;
+ if (c == '/')
+ {
+ size_t size;
+ int len;
+
+ ungetc (c, fp);
+ shared_library_fullname = NULL; size = 0;
+ len = getline (&shared_library_fullname, &size, fp);
+ if (len >= 0)
+ {
+ /* Success: filled shared_library_fullname. */
+ if (len > 0 && shared_library_fullname[len - 1] == '\n')
+ shared_library_fullname[len - 1] = '\0';
+ }
+ }
+ break;
+ }
+ while (c = getc (fp), c != EOF && c != '\n')
+ continue;
+ }
+ fclose (fp);
+ }
+#endif
+}
+
+#endif /* WIN32 / Unix */
+
+/* Return the full pathname of the current shared library.
+ Return NULL if unknown.
+ Guaranteed to work only on Linux and Woe32. */
+static char *
+get_shared_library_fullname ()
+{
+#if !(defined _WIN32 || defined __WIN32__)
+ static bool tried_find_shared_library_fullname;
+ if (!tried_find_shared_library_fullname)
+ {
+ find_shared_library_fullname ();
+ tried_find_shared_library_fullname = true;
+ }
+#endif
+ return shared_library_fullname;
+}
+
+#endif /* PIC */
+
+/* Returns the pathname, relocated according to the current installation
+ directory. */
+const char *
+relocate (const char *pathname)
+{
+#if defined PIC && defined INSTALLDIR
+ static int initialized;
+
+ /* Initialization code for a shared library. */
+ if (!initialized)
+ {
+ /* At this point, orig_prefix and curr_prefix likely have already been
+ set through the main program's set_program_name_and_installdir
+ function. This is sufficient in the case that the library has
+ initially been installed in the same orig_prefix. But we can do
+ better, to also cover the cases that 1. it has been installed
+ in a different prefix before being moved to orig_prefix and (later)
+ to curr_prefix, 2. unlike the program, it has not moved away from
+ orig_prefix. */
+ const char *orig_installprefix = INSTALLPREFIX;
+ const char *orig_installdir = INSTALLDIR;
+ const char *curr_prefix_better;
+
+ curr_prefix_better =
+ compute_curr_prefix (orig_installprefix, orig_installdir,
+ get_shared_library_fullname ());
+ if (curr_prefix_better == NULL)
+ curr_prefix_better = curr_prefix;
+
+ set_relocation_prefix (orig_installprefix, curr_prefix_better);
+
+ initialized = 1;
+ }
+#endif
+
+ /* Note: It is not necessary to perform case insensitive comparison here,
+ even for DOS-like filesystems, because the pathname argument was
+ typically created from the same Makefile variable as orig_prefix came
+ from. */
+ if (orig_prefix != NULL && curr_prefix != NULL
+ && strncmp (pathname, orig_prefix, orig_prefix_len) == 0)
+ {
+ if (pathname[orig_prefix_len] == '\0')
+ /* pathname equals orig_prefix. */
+ return curr_prefix;
+ if (ISSLASH (pathname[orig_prefix_len]))
+ {
+ /* pathname starts with orig_prefix. */
+ const char *pathname_tail = &pathname[orig_prefix_len];
+ char *result =
+ (char *) xmalloc (curr_prefix_len + strlen (pathname_tail) + 1);
+
+#ifdef NO_XMALLOC
+ if (result != NULL)
+#endif
+ {
+ memcpy (result, curr_prefix, curr_prefix_len);
+ strcpy (result + curr_prefix_len, pathname_tail);
+ return result;
+ }
+ }
+ }
+ /* Nothing to relocate. */
+ return pathname;
+}
+
+#endif
diff --git a/intl/relocatable.h b/intl/relocatable.h
new file mode 100644
index 00000000..48c5b71e
--- /dev/null
+++ b/intl/relocatable.h
@@ -0,0 +1,77 @@
+/* Provide relocatable packages.
+ Copyright (C) 2003 Free Software Foundation, Inc.
+ Written by Bruno Haible <bruno@clisp.org>, 2003.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Library General Public License as published
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+#ifndef _RELOCATABLE_H
+#define _RELOCATABLE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* This can be enabled through the configure --enable-relocatable option. */
+#if ENABLE_RELOCATABLE
+
+/* When building a DLL, we must export some functions. Note that because
+ this is a private .h file, we don't need to use __declspec(dllimport)
+ in any case. */
+#if defined _MSC_VER && BUILDING_DLL
+# define RELOCATABLE_DLL_EXPORTED __declspec(dllexport)
+#else
+# define RELOCATABLE_DLL_EXPORTED
+#endif
+
+/* Sets the original and the current installation prefix of the package.
+ Relocation simply replaces a pathname starting with the original prefix
+ by the corresponding pathname with the current prefix instead. Both
+ prefixes should be directory names without trailing slash (i.e. use ""
+ instead of "/"). */
+extern RELOCATABLE_DLL_EXPORTED void
+ set_relocation_prefix (const char *orig_prefix,
+ const char *curr_prefix);
+
+/* Returns the pathname, relocated according to the current installation
+ directory. */
+extern const char * relocate (const char *pathname);
+
+/* Memory management: relocate() leaks memory, because it has to construct
+ a fresh pathname. If this is a problem because your program calls
+ relocate() frequently, think about caching the result. */
+
+/* Convenience function:
+ Computes the current installation prefix, based on the original
+ installation prefix, the original installation directory of a particular
+ file, and the current pathname of this file. Returns NULL upon failure. */
+extern const char * compute_curr_prefix (const char *orig_installprefix,
+ const char *orig_installdir,
+ const char *curr_pathname);
+
+#else
+
+/* By default, we use the hardwired pathnames. */
+#define relocate(pathname) (pathname)
+
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RELOCATABLE_H */
diff --git a/intl/textdomain.c b/intl/textdomain.c
index f259c696..8745a843 100644
--- a/intl/textdomain.c
+++ b/intl/textdomain.c
@@ -1,5 +1,5 @@
/* Implementation of the textdomain(3) function.
- Copyright (C) 1995-1998, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1995-1998, 2000-2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
@@ -77,8 +77,7 @@ __libc_rwlock_define (extern, _nl_state_lock attribute_hidden)
If DOMAINNAME is null, return the current default.
If DOMAINNAME is "", reset to the default of "messages". */
char *
-TEXTDOMAIN (domainname)
- const char *domainname;
+TEXTDOMAIN (const char *domainname)
{
char *new_domain;
char *old_domain;
diff --git a/intl/vasnprintf.c b/intl/vasnprintf.c
new file mode 100644
index 00000000..8a62282d
--- /dev/null
+++ b/intl/vasnprintf.c
@@ -0,0 +1,887 @@
+/* vsprintf with automatic memory allocation.
+ Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Library General Public License as published
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+/* Tell glibc's <stdio.h> to provide a prototype for snprintf().
+ This must come before <config.h> because <config.h> may include
+ <features.h>, and once <features.h> has been included, it's too late. */
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE 1
+#endif
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#ifndef IN_LIBINTL
+# include <alloca.h>
+#endif
+
+/* Specification. */
+#if WIDE_CHAR_VERSION
+# include "vasnwprintf.h"
+#else
+# include "vasnprintf.h"
+#endif
+
+#include <stdio.h> /* snprintf(), sprintf() */
+#include <stdlib.h> /* abort(), malloc(), realloc(), free() */
+#include <string.h> /* memcpy(), strlen() */
+#include <errno.h> /* errno */
+#include <limits.h> /* CHAR_BIT */
+#include <float.h> /* DBL_MAX_EXP, LDBL_MAX_EXP */
+#if WIDE_CHAR_VERSION
+# include "wprintf-parse.h"
+#else
+# include "printf-parse.h"
+#endif
+
+/* Checked size_t computations. */
+#include "xsize.h"
+
+#ifdef HAVE_WCHAR_T
+# ifdef HAVE_WCSLEN
+# define local_wcslen wcslen
+# else
+ /* Solaris 2.5.1 has wcslen() in a separate library libw.so. To avoid
+ a dependency towards this library, here is a local substitute.
+ Define this substitute only once, even if this file is included
+ twice in the same compilation unit. */
+# ifndef local_wcslen_defined
+# define local_wcslen_defined 1
+static size_t
+local_wcslen (const wchar_t *s)
+{
+ const wchar_t *ptr;
+
+ for (ptr = s; *ptr != (wchar_t) 0; ptr++)
+ ;
+ return ptr - s;
+}
+# endif
+# endif
+#endif
+
+#if WIDE_CHAR_VERSION
+# define VASNPRINTF vasnwprintf
+# define CHAR_T wchar_t
+# define DIRECTIVE wchar_t_directive
+# define DIRECTIVES wchar_t_directives
+# define PRINTF_PARSE wprintf_parse
+# define USE_SNPRINTF 1
+# if HAVE_DECL__SNWPRINTF
+ /* On Windows, the function swprintf() has a different signature than
+ on Unix; we use the _snwprintf() function instead. */
+# define SNPRINTF _snwprintf
+# else
+ /* Unix. */
+# define SNPRINTF swprintf
+# endif
+#else
+# define VASNPRINTF vasnprintf
+# define CHAR_T char
+# define DIRECTIVE char_directive
+# define DIRECTIVES char_directives
+# define PRINTF_PARSE printf_parse
+# define USE_SNPRINTF (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF)
+# if HAVE_DECL__SNPRINTF
+ /* Windows. */
+# define SNPRINTF _snprintf
+# else
+ /* Unix. */
+# define SNPRINTF snprintf
+# endif
+#endif
+
+CHAR_T *
+VASNPRINTF (CHAR_T *resultbuf, size_t *lengthp, const CHAR_T *format, va_list args)
+{
+ DIRECTIVES d;
+ arguments a;
+
+ if (PRINTF_PARSE (format, &d, &a) < 0)
+ {
+ errno = EINVAL;
+ return NULL;
+ }
+
+#define CLEANUP() \
+ free (d.dir); \
+ if (a.arg) \
+ free (a.arg);
+
+ if (printf_fetchargs (args, &a) < 0)
+ {
+ CLEANUP ();
+ errno = EINVAL;
+ return NULL;
+ }
+
+ {
+ size_t buf_neededlength;
+ CHAR_T *buf;
+ CHAR_T *buf_malloced;
+ const CHAR_T *cp;
+ size_t i;
+ DIRECTIVE *dp;
+ /* Output string accumulator. */
+ CHAR_T *result;
+ size_t allocated;
+ size_t length;
+
+ /* Allocate a small buffer that will hold a directive passed to
+ sprintf or snprintf. */
+ buf_neededlength =
+ xsum4 (7, d.max_width_length, d.max_precision_length, 6);
+#if HAVE_ALLOCA
+ if (buf_neededlength < 4000 / sizeof (CHAR_T))
+ {
+ buf = (CHAR_T *) alloca (buf_neededlength * sizeof (CHAR_T));
+ buf_malloced = NULL;
+ }
+ else
+#endif
+ {
+ size_t buf_memsize = xtimes (buf_neededlength, sizeof (CHAR_T));
+ if (size_overflow_p (buf_memsize))
+ goto out_of_memory_1;
+ buf = (CHAR_T *) malloc (buf_memsize);
+ if (buf == NULL)
+ goto out_of_memory_1;
+ buf_malloced = buf;
+ }
+
+ if (resultbuf != NULL)
+ {
+ result = resultbuf;
+ allocated = *lengthp;
+ }
+ else
+ {
+ result = NULL;
+ allocated = 0;
+ }
+ length = 0;
+ /* Invariants:
+ result is either == resultbuf or == NULL or malloc-allocated.
+ If length > 0, then result != NULL. */
+
+ /* Ensures that allocated >= needed. Aborts through a jump to
+ out_of_memory if needed is SIZE_MAX or otherwise too big. */
+#define ENSURE_ALLOCATION(needed) \
+ if ((needed) > allocated) \
+ { \
+ size_t memory_size; \
+ CHAR_T *memory; \
+ \
+ allocated = (allocated > 0 ? xtimes (allocated, 2) : 12); \
+ if ((needed) > allocated) \
+ allocated = (needed); \
+ memory_size = xtimes (allocated, sizeof (CHAR_T)); \
+ if (size_overflow_p (memory_size)) \
+ goto out_of_memory; \
+ if (result == resultbuf || result == NULL) \
+ memory = (CHAR_T *) malloc (memory_size); \
+ else \
+ memory = (CHAR_T *) realloc (result, memory_size); \
+ if (memory == NULL) \
+ goto out_of_memory; \
+ if (result == resultbuf && length > 0) \
+ memcpy (memory, result, length * sizeof (CHAR_T)); \
+ result = memory; \
+ }
+
+ for (cp = format, i = 0, dp = &d.dir[0]; ; cp = dp->dir_end, i++, dp++)
+ {
+ if (cp != dp->dir_start)
+ {
+ size_t n = dp->dir_start - cp;
+ size_t augmented_length = xsum (length, n);
+
+ ENSURE_ALLOCATION (augmented_length);
+ memcpy (result + length, cp, n * sizeof (CHAR_T));
+ length = augmented_length;
+ }
+ if (i == d.count)
+ break;
+
+ /* Execute a single directive. */
+ if (dp->conversion == '%')
+ {
+ size_t augmented_length;
+
+ if (!(dp->arg_index == ARG_NONE))
+ abort ();
+ augmented_length = xsum (length, 1);
+ ENSURE_ALLOCATION (augmented_length);
+ result[length] = '%';
+ length = augmented_length;
+ }
+ else
+ {
+ if (!(dp->arg_index != ARG_NONE))
+ abort ();
+
+ if (dp->conversion == 'n')
+ {
+ switch (a.arg[dp->arg_index].type)
+ {
+ case TYPE_COUNT_SCHAR_POINTER:
+ *a.arg[dp->arg_index].a.a_count_schar_pointer = length;
+ break;
+ case TYPE_COUNT_SHORT_POINTER:
+ *a.arg[dp->arg_index].a.a_count_short_pointer = length;
+ break;
+ case TYPE_COUNT_INT_POINTER:
+ *a.arg[dp->arg_index].a.a_count_int_pointer = length;
+ break;
+ case TYPE_COUNT_LONGINT_POINTER:
+ *a.arg[dp->arg_index].a.a_count_longint_pointer = length;
+ break;
+#ifdef HAVE_LONG_LONG
+ case TYPE_COUNT_LONGLONGINT_POINTER:
+ *a.arg[dp->arg_index].a.a_count_longlongint_pointer = length;
+ break;
+#endif
+ default:
+ abort ();
+ }
+ }
+ else
+ {
+ arg_type type = a.arg[dp->arg_index].type;
+ CHAR_T *p;
+ unsigned int prefix_count;
+ int prefixes[2];
+#if !USE_SNPRINTF
+ size_t tmp_length;
+ CHAR_T tmpbuf[700];
+ CHAR_T *tmp;
+
+ /* Allocate a temporary buffer of sufficient size for calling
+ sprintf. */
+ {
+ size_t width;
+ size_t precision;
+
+ width = 0;
+ if (dp->width_start != dp->width_end)
+ {
+ if (dp->width_arg_index != ARG_NONE)
+ {
+ int arg;
+
+ if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
+ abort ();
+ arg = a.arg[dp->width_arg_index].a.a_int;
+ width = (arg < 0 ? (unsigned int) (-arg) : arg);
+ }
+ else
+ {
+ const CHAR_T *digitp = dp->width_start;
+
+ do
+ width = xsum (xtimes (width, 10), *digitp++ - '0');
+ while (digitp != dp->width_end);
+ }
+ }
+
+ precision = 6;
+ if (dp->precision_start != dp->precision_end)
+ {
+ if (dp->precision_arg_index != ARG_NONE)
+ {
+ int arg;
+
+ if (!(a.arg[dp->precision_arg_index].type == TYPE_INT))
+ abort ();
+ arg = a.arg[dp->precision_arg_index].a.a_int;
+ precision = (arg < 0 ? 0 : arg);
+ }
+ else
+ {
+ const CHAR_T *digitp = dp->precision_start + 1;
+
+ precision = 0;
+ do
+ precision = xsum (xtimes (precision, 10), *digitp++ - '0');
+ while (digitp != dp->precision_end);
+ }
+ }
+
+ switch (dp->conversion)
+ {
+
+ case 'd': case 'i': case 'u':
+# ifdef HAVE_LONG_LONG
+ if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
+ tmp_length =
+ (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
+ * 0.30103 /* binary -> decimal */
+ * 2 /* estimate for FLAG_GROUP */
+ )
+ + 1 /* turn floor into ceil */
+ + 1; /* account for leading sign */
+ else
+# endif
+ if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
+ tmp_length =
+ (unsigned int) (sizeof (unsigned long) * CHAR_BIT
+ * 0.30103 /* binary -> decimal */
+ * 2 /* estimate for FLAG_GROUP */
+ )
+ + 1 /* turn floor into ceil */
+ + 1; /* account for leading sign */
+ else
+ tmp_length =
+ (unsigned int) (sizeof (unsigned int) * CHAR_BIT
+ * 0.30103 /* binary -> decimal */
+ * 2 /* estimate for FLAG_GROUP */
+ )
+ + 1 /* turn floor into ceil */
+ + 1; /* account for leading sign */
+ break;
+
+ case 'o':
+# ifdef HAVE_LONG_LONG
+ if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
+ tmp_length =
+ (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
+ * 0.333334 /* binary -> octal */
+ )
+ + 1 /* turn floor into ceil */
+ + 1; /* account for leading sign */
+ else
+# endif
+ if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
+ tmp_length =
+ (unsigned int) (sizeof (unsigned long) * CHAR_BIT
+ * 0.333334 /* binary -> octal */
+ )
+ + 1 /* turn floor into ceil */
+ + 1; /* account for leading sign */
+ else
+ tmp_length =
+ (unsigned int) (sizeof (unsigned int) * CHAR_BIT
+ * 0.333334 /* binary -> octal */
+ )
+ + 1 /* turn floor into ceil */
+ + 1; /* account for leading sign */
+ break;
+
+ case 'x': case 'X':
+# ifdef HAVE_LONG_LONG
+ if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
+ tmp_length =
+ (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
+ * 0.25 /* binary -> hexadecimal */
+ )
+ + 1 /* turn floor into ceil */
+ + 2; /* account for leading sign or alternate form */
+ else
+# endif
+ if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
+ tmp_length =
+ (unsigned int) (sizeof (unsigned long) * CHAR_BIT
+ * 0.25 /* binary -> hexadecimal */
+ )
+ + 1 /* turn floor into ceil */
+ + 2; /* account for leading sign or alternate form */
+ else
+ tmp_length =
+ (unsigned int) (sizeof (unsigned int) * CHAR_BIT
+ * 0.25 /* binary -> hexadecimal */
+ )
+ + 1 /* turn floor into ceil */
+ + 2; /* account for leading sign or alternate form */
+ break;
+
+ case 'f': case 'F':
+# ifdef HAVE_LONG_DOUBLE
+ if (type == TYPE_LONGDOUBLE)
+ tmp_length =
+ (unsigned int) (LDBL_MAX_EXP
+ * 0.30103 /* binary -> decimal */
+ * 2 /* estimate for FLAG_GROUP */
+ )
+ + 1 /* turn floor into ceil */
+ + 10; /* sign, decimal point etc. */
+ else
+# endif
+ tmp_length =
+ (unsigned int) (DBL_MAX_EXP
+ * 0.30103 /* binary -> decimal */
+ * 2 /* estimate for FLAG_GROUP */
+ )
+ + 1 /* turn floor into ceil */
+ + 10; /* sign, decimal point etc. */
+ tmp_length = xsum (tmp_length, precision);
+ break;
+
+ case 'e': case 'E': case 'g': case 'G':
+ case 'a': case 'A':
+ tmp_length =
+ 12; /* sign, decimal point, exponent etc. */
+ tmp_length = xsum (tmp_length, precision);
+ break;
+
+ case 'c':
+# if defined HAVE_WINT_T && !WIDE_CHAR_VERSION
+ if (type == TYPE_WIDE_CHAR)
+ tmp_length = MB_CUR_MAX;
+ else
+# endif
+ tmp_length = 1;
+ break;
+
+ case 's':
+# ifdef HAVE_WCHAR_T
+ if (type == TYPE_WIDE_STRING)
+ {
+ tmp_length =
+ local_wcslen (a.arg[dp->arg_index].a.a_wide_string);
+
+# if !WIDE_CHAR_VERSION
+ tmp_length = xtimes (tmp_length, MB_CUR_MAX);
+# endif
+ }
+ else
+# endif
+ tmp_length = strlen (a.arg[dp->arg_index].a.a_string);
+ break;
+
+ case 'p':
+ tmp_length =
+ (unsigned int) (sizeof (void *) * CHAR_BIT
+ * 0.25 /* binary -> hexadecimal */
+ )
+ + 1 /* turn floor into ceil */
+ + 2; /* account for leading 0x */
+ break;
+
+ default:
+ abort ();
+ }
+
+ if (tmp_length < width)
+ tmp_length = width;
+
+ tmp_length = xsum (tmp_length, 1); /* account for trailing NUL */
+ }
+
+ if (tmp_length <= sizeof (tmpbuf) / sizeof (CHAR_T))
+ tmp = tmpbuf;
+ else
+ {
+ size_t tmp_memsize = xtimes (tmp_length, sizeof (CHAR_T));
+
+ if (size_overflow_p (tmp_memsize))
+ /* Overflow, would lead to out of memory. */
+ goto out_of_memory;
+ tmp = (CHAR_T *) malloc (tmp_memsize);
+ if (tmp == NULL)
+ /* Out of memory. */
+ goto out_of_memory;
+ }
+#endif
+
+ /* Construct the format string for calling snprintf or
+ sprintf. */
+ p = buf;
+ *p++ = '%';
+ if (dp->flags & FLAG_GROUP)
+ *p++ = '\'';
+ if (dp->flags & FLAG_LEFT)
+ *p++ = '-';
+ if (dp->flags & FLAG_SHOWSIGN)
+ *p++ = '+';
+ if (dp->flags & FLAG_SPACE)
+ *p++ = ' ';
+ if (dp->flags & FLAG_ALT)
+ *p++ = '#';
+ if (dp->flags & FLAG_ZERO)
+ *p++ = '0';
+ if (dp->width_start != dp->width_end)
+ {
+ size_t n = dp->width_end - dp->width_start;
+ memcpy (p, dp->width_start, n * sizeof (CHAR_T));
+ p += n;
+ }
+ if (dp->precision_start != dp->precision_end)
+ {
+ size_t n = dp->precision_end - dp->precision_start;
+ memcpy (p, dp->precision_start, n * sizeof (CHAR_T));
+ p += n;
+ }
+
+ switch (type)
+ {
+#ifdef HAVE_LONG_LONG
+ case TYPE_LONGLONGINT:
+ case TYPE_ULONGLONGINT:
+ *p++ = 'l';
+ /*FALLTHROUGH*/
+#endif
+ case TYPE_LONGINT:
+ case TYPE_ULONGINT:
+#ifdef HAVE_WINT_T
+ case TYPE_WIDE_CHAR:
+#endif
+#ifdef HAVE_WCHAR_T
+ case TYPE_WIDE_STRING:
+#endif
+ *p++ = 'l';
+ break;
+#ifdef HAVE_LONG_DOUBLE
+ case TYPE_LONGDOUBLE:
+ *p++ = 'L';
+ break;
+#endif
+ default:
+ break;
+ }
+ *p = dp->conversion;
+#if USE_SNPRINTF
+ p[1] = '%';
+ p[2] = 'n';
+ p[3] = '\0';
+#else
+ p[1] = '\0';
+#endif
+
+ /* Construct the arguments for calling snprintf or sprintf. */
+ prefix_count = 0;
+ if (dp->width_arg_index != ARG_NONE)
+ {
+ if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
+ abort ();
+ prefixes[prefix_count++] = a.arg[dp->width_arg_index].a.a_int;
+ }
+ if (dp->precision_arg_index != ARG_NONE)
+ {
+ if (!(a.arg[dp->precision_arg_index].type == TYPE_INT))
+ abort ();
+ prefixes[prefix_count++] = a.arg[dp->precision_arg_index].a.a_int;
+ }
+
+#if USE_SNPRINTF
+ /* Prepare checking whether snprintf returns the count
+ via %n. */
+ ENSURE_ALLOCATION (xsum (length, 1));
+ result[length] = '\0';
+#endif
+
+ for (;;)
+ {
+ size_t maxlen;
+ int count;
+ int retcount;
+
+ maxlen = allocated - length;
+ count = -1;
+ retcount = 0;
+
+#if USE_SNPRINTF
+# define SNPRINTF_BUF(arg) \
+ switch (prefix_count) \
+ { \
+ case 0: \
+ retcount = SNPRINTF (result + length, maxlen, buf, \
+ arg, &count); \
+ break; \
+ case 1: \
+ retcount = SNPRINTF (result + length, maxlen, buf, \
+ prefixes[0], arg, &count); \
+ break; \
+ case 2: \
+ retcount = SNPRINTF (result + length, maxlen, buf, \
+ prefixes[0], prefixes[1], arg, \
+ &count); \
+ break; \
+ default: \
+ abort (); \
+ }
+#else
+# define SNPRINTF_BUF(arg) \
+ switch (prefix_count) \
+ { \
+ case 0: \
+ count = sprintf (tmp, buf, arg); \
+ break; \
+ case 1: \
+ count = sprintf (tmp, buf, prefixes[0], arg); \
+ break; \
+ case 2: \
+ count = sprintf (tmp, buf, prefixes[0], prefixes[1],\
+ arg); \
+ break; \
+ default: \
+ abort (); \
+ }
+#endif
+
+ switch (type)
+ {
+ case TYPE_SCHAR:
+ {
+ int arg = a.arg[dp->arg_index].a.a_schar;
+ SNPRINTF_BUF (arg);
+ }
+ break;
+ case TYPE_UCHAR:
+ {
+ unsigned int arg = a.arg[dp->arg_index].a.a_uchar;
+ SNPRINTF_BUF (arg);
+ }
+ break;
+ case TYPE_SHORT:
+ {
+ int arg = a.arg[dp->arg_index].a.a_short;
+ SNPRINTF_BUF (arg);
+ }
+ break;
+ case TYPE_USHORT:
+ {
+ unsigned int arg = a.arg[dp->arg_index].a.a_ushort;
+ SNPRINTF_BUF (arg);
+ }
+ break;
+ case TYPE_INT:
+ {
+ int arg = a.arg[dp->arg_index].a.a_int;
+ SNPRINTF_BUF (arg);
+ }
+ break;
+ case TYPE_UINT:
+ {
+ unsigned int arg = a.arg[dp->arg_index].a.a_uint;
+ SNPRINTF_BUF (arg);
+ }
+ break;
+ case TYPE_LONGINT:
+ {
+ long int arg = a.arg[dp->arg_index].a.a_longint;
+ SNPRINTF_BUF (arg);
+ }
+ break;
+ case TYPE_ULONGINT:
+ {
+ unsigned long int arg = a.arg[dp->arg_index].a.a_ulongint;
+ SNPRINTF_BUF (arg);
+ }
+ break;
+#ifdef HAVE_LONG_LONG
+ case TYPE_LONGLONGINT:
+ {
+ long long int arg = a.arg[dp->arg_index].a.a_longlongint;
+ SNPRINTF_BUF (arg);
+ }
+ break;
+ case TYPE_ULONGLONGINT:
+ {
+ unsigned long long int arg = a.arg[dp->arg_index].a.a_ulonglongint;
+ SNPRINTF_BUF (arg);
+ }
+ break;
+#endif
+ case TYPE_DOUBLE:
+ {
+ double arg = a.arg[dp->arg_index].a.a_double;
+ SNPRINTF_BUF (arg);
+ }
+ break;
+#ifdef HAVE_LONG_DOUBLE
+ case TYPE_LONGDOUBLE:
+ {
+ long double arg = a.arg[dp->arg_index].a.a_longdouble;
+ SNPRINTF_BUF (arg);
+ }
+ break;
+#endif
+ case TYPE_CHAR:
+ {
+ int arg = a.arg[dp->arg_index].a.a_char;
+ SNPRINTF_BUF (arg);
+ }
+ break;
+#ifdef HAVE_WINT_T
+ case TYPE_WIDE_CHAR:
+ {
+ wint_t arg = a.arg[dp->arg_index].a.a_wide_char;
+ SNPRINTF_BUF (arg);
+ }
+ break;
+#endif
+ case TYPE_STRING:
+ {
+ const char *arg = a.arg[dp->arg_index].a.a_string;
+ SNPRINTF_BUF (arg);
+ }
+ break;
+#ifdef HAVE_WCHAR_T
+ case TYPE_WIDE_STRING:
+ {
+ const wchar_t *arg = a.arg[dp->arg_index].a.a_wide_string;
+ SNPRINTF_BUF (arg);
+ }
+ break;
+#endif
+ case TYPE_POINTER:
+ {
+ void *arg = a.arg[dp->arg_index].a.a_pointer;
+ SNPRINTF_BUF (arg);
+ }
+ break;
+ default:
+ abort ();
+ }
+
+#if USE_SNPRINTF
+ /* Portability: Not all implementations of snprintf()
+ are ISO C 99 compliant. Determine the number of
+ bytes that snprintf() has produced or would have
+ produced. */
+ if (count >= 0)
+ {
+ /* Verify that snprintf() has NUL-terminated its
+ result. */
+ if (count < maxlen && result[length + count] != '\0')
+ abort ();
+ /* Portability hack. */
+ if (retcount > count)
+ count = retcount;
+ }
+ else
+ {
+ /* snprintf() doesn't understand the '%n'
+ directive. */
+ if (p[1] != '\0')
+ {
+ /* Don't use the '%n' directive; instead, look
+ at the snprintf() return value. */
+ p[1] = '\0';
+ continue;
+ }
+ else
+ {
+ /* Look at the snprintf() return value. */
+ if (retcount < 0)
+ {
+ /* HP-UX 10.20 snprintf() is doubly deficient:
+ It doesn't understand the '%n' directive,
+ *and* it returns -1 (rather than the length
+ that would have been required) when the
+ buffer is too small. */
+ size_t bigger_need =
+ xsum (xtimes (allocated, 2), 12);
+ ENSURE_ALLOCATION (bigger_need);
+ continue;
+ }
+ else
+ count = retcount;
+ }
+ }
+#endif
+
+ /* Attempt to handle failure. */
+ if (count < 0)
+ {
+ if (!(result == resultbuf || result == NULL))
+ free (result);
+ if (buf_malloced != NULL)
+ free (buf_malloced);
+ CLEANUP ();
+ errno = EINVAL;
+ return NULL;
+ }
+
+#if !USE_SNPRINTF
+ if (count >= tmp_length)
+ /* tmp_length was incorrectly calculated - fix the
+ code above! */
+ abort ();
+#endif
+
+ /* Make room for the result. */
+ if (count >= maxlen)
+ {
+ /* Need at least count bytes. But allocate
+ proportionally, to avoid looping eternally if
+ snprintf() reports a too small count. */
+ size_t n =
+ xmax (xsum (length, count), xtimes (allocated, 2));
+
+ ENSURE_ALLOCATION (n);
+#if USE_SNPRINTF
+ continue;
+#endif
+ }
+
+#if USE_SNPRINTF
+ /* The snprintf() result did fit. */
+#else
+ /* Append the sprintf() result. */
+ memcpy (result + length, tmp, count * sizeof (CHAR_T));
+ if (tmp != tmpbuf)
+ free (tmp);
+#endif
+
+ length += count;
+ break;
+ }
+ }
+ }
+ }
+
+ /* Add the final NUL. */
+ ENSURE_ALLOCATION (xsum (length, 1));
+ result[length] = '\0';
+
+ if (result != resultbuf && length + 1 < allocated)
+ {
+ /* Shrink the allocated memory if possible. */
+ CHAR_T *memory;
+
+ memory = (CHAR_T *) realloc (result, (length + 1) * sizeof (CHAR_T));
+ if (memory != NULL)
+ result = memory;
+ }
+
+ if (buf_malloced != NULL)
+ free (buf_malloced);
+ CLEANUP ();
+ *lengthp = length;
+ return result;
+
+ out_of_memory:
+ if (!(result == resultbuf || result == NULL))
+ free (result);
+ if (buf_malloced != NULL)
+ free (buf_malloced);
+ out_of_memory_1:
+ CLEANUP ();
+ errno = ENOMEM;
+ return NULL;
+ }
+}
+
+#undef SNPRINTF
+#undef USE_SNPRINTF
+#undef PRINTF_PARSE
+#undef DIRECTIVES
+#undef DIRECTIVE
+#undef CHAR_T
+#undef VASNPRINTF
diff --git a/intl/vasnprintf.h b/intl/vasnprintf.h
new file mode 100644
index 00000000..65f1bc13
--- /dev/null
+++ b/intl/vasnprintf.h
@@ -0,0 +1,61 @@
+/* vsprintf with automatic memory allocation.
+ Copyright (C) 2002-2003 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Library General Public License as published
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+#ifndef _VASNPRINTF_H
+#define _VASNPRINTF_H
+
+/* Get va_list. */
+#include <stdarg.h>
+
+/* Get size_t. */
+#include <stddef.h>
+
+#ifndef __attribute__
+/* This feature is available in gcc versions 2.5 and later. */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+# define __attribute__(Spec) /* empty */
+# endif
+/* The __-protected variants of `format' and `printf' attributes
+ are accepted by gcc versions 2.6.4 (effectively 2.7) and later. */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+# define __format__ format
+# define __printf__ printf
+# endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Write formatted output to a string dynamically allocated with malloc().
+ You can pass a preallocated buffer for the result in RESULTBUF and its
+ size in *LENGTHP; otherwise you pass RESULTBUF = NULL.
+ If successful, return the address of the string (this may be = RESULTBUF
+ if no dynamic memory allocation was necessary) and set *LENGTHP to the
+ number of resulting bytes, excluding the trailing NUL. Upon error, set
+ errno and return NULL. */
+extern char * asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...)
+ __attribute__ ((__format__ (__printf__, 3, 4)));
+extern char * vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args)
+ __attribute__ ((__format__ (__printf__, 3, 0)));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _VASNPRINTF_H */
diff --git a/intl/vasnwprintf.h b/intl/vasnwprintf.h
new file mode 100644
index 00000000..d3cef4cb
--- /dev/null
+++ b/intl/vasnwprintf.h
@@ -0,0 +1,46 @@
+/* vswprintf with automatic memory allocation.
+ Copyright (C) 2002-2003 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Library General Public License as published
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+#ifndef _VASNWPRINTF_H
+#define _VASNWPRINTF_H
+
+/* Get va_list. */
+#include <stdarg.h>
+
+/* Get wchar_t, size_t. */
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Write formatted output to a string dynamically allocated with malloc().
+ You can pass a preallocated buffer for the result in RESULTBUF and its
+ size in *LENGTHP; otherwise you pass RESULTBUF = NULL.
+ If successful, return the address of the string (this may be = RESULTBUF
+ if no dynamic memory allocation was necessary) and set *LENGTHP to the
+ number of resulting bytes, excluding the trailing NUL. Upon error, set
+ errno and return NULL. */
+extern wchar_t * asnwprintf (wchar_t *resultbuf, size_t *lengthp, const wchar_t *format, ...);
+extern wchar_t * vasnwprintf (wchar_t *resultbuf, size_t *lengthp, const wchar_t *format, va_list args);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _VASNWPRINTF_H */
diff --git a/intl/wprintf-parse.h b/intl/wprintf-parse.h
new file mode 100644
index 00000000..24a2cfc2
--- /dev/null
+++ b/intl/wprintf-parse.h
@@ -0,0 +1,75 @@
+/* Parse printf format string.
+ Copyright (C) 1999, 2002-2003 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Library General Public License as published
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+#ifndef _WPRINTF_PARSE_H
+#define _WPRINTF_PARSE_H
+
+#include "printf-args.h"
+
+
+/* Flags */
+#define FLAG_GROUP 1 /* ' flag */
+#define FLAG_LEFT 2 /* - flag */
+#define FLAG_SHOWSIGN 4 /* + flag */
+#define FLAG_SPACE 8 /* space flag */
+#define FLAG_ALT 16 /* # flag */
+#define FLAG_ZERO 32
+
+/* arg_index value indicating that no argument is consumed. */
+#define ARG_NONE (~(size_t)0)
+
+/* A parsed directive. */
+typedef struct
+{
+ const wchar_t* dir_start;
+ const wchar_t* dir_end;
+ int flags;
+ const wchar_t* width_start;
+ const wchar_t* width_end;
+ size_t width_arg_index;
+ const wchar_t* precision_start;
+ const wchar_t* precision_end;
+ size_t precision_arg_index;
+ wchar_t conversion; /* d i o u x X f e E g G c s p n U % but not C S */
+ size_t arg_index;
+}
+wchar_t_directive;
+
+/* A parsed format string. */
+typedef struct
+{
+ size_t count;
+ wchar_t_directive *dir;
+ size_t max_width_length;
+ size_t max_precision_length;
+}
+wchar_t_directives;
+
+
+/* Parses the format string. Fills in the number N of directives, and fills
+ in directives[0], ..., directives[N-1], and sets directives[N].dir_start
+ to the end of the format string. Also fills in the arg_type fields of the
+ arguments and the needed count of arguments. */
+#ifdef STATIC
+STATIC
+#else
+extern
+#endif
+int wprintf_parse (const wchar_t *format, wchar_t_directives *d, arguments *a);
+
+#endif /* _WPRINTF_PARSE_H */
diff --git a/intl/xsize.h b/intl/xsize.h
new file mode 100644
index 00000000..362e24b7
--- /dev/null
+++ b/intl/xsize.h
@@ -0,0 +1,109 @@
+/* xsize.h -- Checked size_t computations.
+
+ Copyright (C) 2003 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Library General Public License as published
+ by the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ USA. */
+
+#ifndef _XSIZE_H
+#define _XSIZE_H
+
+/* Get size_t. */
+#include <stddef.h>
+
+/* Get SIZE_MAX. */
+#include <limits.h>
+#if HAVE_STDINT_H
+# include <stdint.h>
+#endif
+
+/* The size of memory objects is often computed through expressions of
+ type size_t. Example:
+ void* p = malloc (header_size + n * element_size).
+ These computations can lead to overflow. When this happens, malloc()
+ returns a piece of memory that is way too small, and the program then
+ crashes while attempting to fill the memory.
+ To avoid this, the functions and macros in this file check for overflow.
+ The convention is that SIZE_MAX represents overflow.
+ malloc (SIZE_MAX) is not guaranteed to fail -- think of a malloc
+ implementation that uses mmap --, it's recommended to use size_overflow_p()
+ or size_in_bounds_p() before invoking malloc().
+ The example thus becomes:
+ size_t size = xsum (header_size, xtimes (n, element_size));
+ void *p = (size_in_bounds_p (size) ? malloc (size) : NULL);
+*/
+
+/* Convert an arbitrary value >= 0 to type size_t. */
+#define xcast_size_t(N) \
+ ((N) <= SIZE_MAX ? (size_t) (N) : SIZE_MAX)
+
+/* Sum of two sizes, with overflow check. */
+static inline size_t
+#if __GNUC__ >= 3
+__attribute__ ((__pure__))
+#endif
+xsum (size_t size1, size_t size2)
+{
+ size_t sum = size1 + size2;
+ return (sum >= size1 ? sum : SIZE_MAX);
+}
+
+/* Sum of three sizes, with overflow check. */
+static inline size_t
+#if __GNUC__ >= 3
+__attribute__ ((__pure__))
+#endif
+xsum3 (size_t size1, size_t size2, size_t size3)
+{
+ return xsum (xsum (size1, size2), size3);
+}
+
+/* Sum of four sizes, with overflow check. */
+static inline size_t
+#if __GNUC__ >= 3
+__attribute__ ((__pure__))
+#endif
+xsum4 (size_t size1, size_t size2, size_t size3, size_t size4)
+{
+ return xsum (xsum (xsum (size1, size2), size3), size4);
+}
+
+/* Maximum of two sizes, with overflow check. */
+static inline size_t
+#if __GNUC__ >= 3
+__attribute__ ((__pure__))
+#endif
+xmax (size_t size1, size_t size2)
+{
+ /* No explicit check is needed here, because for any n:
+ max (SIZE_MAX, n) == SIZE_MAX and max (n, SIZE_MAX) == SIZE_MAX. */
+ return (size1 >= size2 ? size1 : size2);
+}
+
+/* Multiplication of a count with an element size, with overflow check.
+ The count must be >= 0 and the element size must be > 0.
+ This is a macro, not an inline function, so that it works correctly even
+ when N is of a wider tupe and N > SIZE_MAX. */
+#define xtimes(N, ELSIZE) \
+ ((N) <= SIZE_MAX / (ELSIZE) ? (size_t) (N) * (ELSIZE) : SIZE_MAX)
+
+/* Check for overflow. */
+#define size_overflow_p(SIZE) \
+ ((SIZE) == SIZE_MAX)
+/* Check against overflow. */
+#define size_in_bounds_p(SIZE) \
+ ((SIZE) != SIZE_MAX)
+
+#endif /* _XSIZE_H */
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 7fadb882..53efc5e1 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -1,5 +1,5 @@
# Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2002 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 1995-1997, 2000-2004 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
#
# This file can be copied and used freely without restrictions. It can
# be used in projects which are not available under the GNU General Public
@@ -7,6 +7,8 @@
# functionality.
# Please note that the actual code of GNU gettext is covered by the GNU
# General Public License and is *not* in the public domain.
+#
+# Origin: gettext-0.14
PACKAGE = @PACKAGE@
VERSION = @VERSION@
@@ -27,7 +29,7 @@ gettextsrcdir = $(datadir)/gettext/po
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
+mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@
@@ -42,9 +44,9 @@ POFILES = @POFILES@
GMOFILES = @GMOFILES@
UPDATEPOFILES = @UPDATEPOFILES@
DUMMYPOFILES = @DUMMYPOFILES@
-DISTFILES.common = Makefile.in.in Makevars remove-potcdate.sin \
+DISTFILES.common = Makefile.in.in remove-potcdate.sin \
$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
-DISTFILES = $(DISTFILES.common) POTFILES.in $(DOMAIN).pot \
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in $(DOMAIN).pot stamp-po \
$(POFILES) $(GMOFILES) \
$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
@@ -55,7 +57,7 @@ CATALOGS = @CATALOGS@
# Makevars gets inserted here. (Don't remove this line!)
.SUFFIXES:
-.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-update
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
.po.mo:
@echo "$(MSGFMT) -c -o $@ $<"; \
@@ -64,8 +66,8 @@ CATALOGS = @CATALOGS@
.po.gmo:
@lang=`echo $* | sed -e 's,.*/,,'`; \
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
- echo " MSGFMT $${lang}.po"; \
- $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $(srcdir)/$${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+ echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
+ cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
.sin.sed:
sed -e '/^#/d' $< > t-$@
@@ -74,19 +76,35 @@ CATALOGS = @CATALOGS@
all: all-@USE_NLS@
-all-yes: $(CATALOGS)
+all-yes: stamp-po
all-no:
+# stamp-po is a timestamp denoting the last time at which the CATALOGS have
+# been loosely updated. Its purpose is that when a developer or translator
+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
+# invocations of "make" will do nothing. This timestamp would not be necessary
+# if updating the $(CATALOGS) would always touch them; however, the rule for
+# $(POFILES) has been designed to not touch files that don't need to be
+# changed.
+stamp-po: $(srcdir)/$(DOMAIN).pot
+ test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+ @echo "touch stamp-po"
+ @echo timestamp > stamp-poT
+ @mv stamp-poT stamp-po
+
# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
# otherwise packages like GCC can not be built if only parts of the source
# have been downloaded.
+# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
--add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
- --keyword=_ --keyword=N_ --keyword=P_:1,2 \
--files-from=$(srcdir)/POTFILES.in \
- --copyright-holder='$(COPYRIGHT_HOLDER)'
+ --copyright-holder='$(COPYRIGHT_HOLDER)' \
+ --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)'
test ! -f $(DOMAIN).po || { \
if test -f $(srcdir)/$(DOMAIN).pot; then \
sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
@@ -102,25 +120,37 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
fi; \
}
+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
+# every "make" invocation, only create it when it is missing.
+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
$(srcdir)/$(DOMAIN).pot:
$(MAKE) $(DOMAIN).pot-update
+# This target rebuilds a PO file if $(DOMAIN).pot has changed.
+# Note that a PO file is not touched if it doesn't need to be changed.
$(POFILES): $(srcdir)/$(DOMAIN).pot
@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
- test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
- echo " MSGMERGE $${lang}.po"; \
- cd $(srcdir) && $(MSGMERGE_UPDATE) -q $${lang}.po $(DOMAIN).pot
+ if test -f "$(srcdir)/$${lang}.po"; then \
+ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+ echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+ cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
+ else \
+ $(MAKE) $${lang}.po-create; \
+ fi
install: install-exec install-data
install-exec:
install-data: install-data-@USE_NLS@
- if test "$(PACKAGE)" = "gettext"; then \
+ if test "$(PACKAGE)" = "gettext-tools"; then \
$(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
- for file in $(DISTFILES.common); do \
+ for file in $(DISTFILES.common) Makevars.template; do \
$(INSTALL_DATA) $(srcdir)/$$file \
$(DESTDIR)$(gettextsrcdir)/$$file; \
done; \
+ for file in Makevars; do \
+ rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+ done; \
else \
: ; \
fi
@@ -171,7 +201,7 @@ install-strip: install
installdirs: installdirs-exec installdirs-data
installdirs-exec:
installdirs-data: installdirs-data-@USE_NLS@
- if test "$(PACKAGE)" = "gettext"; then \
+ if test "$(PACKAGE)" = "gettext-tools"; then \
$(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
else \
: ; \
@@ -216,8 +246,8 @@ installcheck:
uninstall: uninstall-exec uninstall-data
uninstall-exec:
uninstall-data: uninstall-data-@USE_NLS@
- if test "$(PACKAGE)" = "gettext"; then \
- for file in $(DISTFILES.common); do \
+ if test "$(PACKAGE)" = "gettext-tools"; then \
+ for file in $(DISTFILES.common) Makevars.template; do \
rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
done; \
else \
@@ -236,10 +266,11 @@ uninstall-data-yes:
check: all
-dvi info tags TAGS ID:
+info dvi ps pdf html tags TAGS ctags CTAGS ID:
mostlyclean:
- rm -f remove-potcdate.sed *.gmo
+ rm -f remove-potcdate.sed
+ rm -f stamp-poT
rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
rm -fr *.o
@@ -251,7 +282,7 @@ distclean: clean
maintainer-clean: distclean
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
- rm -f $(GMOFILES)
+ rm -f stamp-po $(GMOFILES)
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
dist distdir:
@@ -260,7 +291,17 @@ dist distdir:
# This is a separate target because 'update-po' must be executed before.
dist2: $(DISTFILES)
dists="$(DISTFILES)"; \
- if test -f $(srcdir)/ChangeLog; then dists="$$dists ChangeLog"; fi; \
+ if test "$(PACKAGE)" = "gettext-tools"; then \
+ dists="$$dists Makevars.template"; \
+ fi; \
+ if test -f $(srcdir)/ChangeLog; then \
+ dists="$$dists ChangeLog"; \
+ fi; \
+ for i in 0 1 2 3 4 5 6 7 8 9; do \
+ if test -f $(srcdir)/ChangeLog.$$i; then \
+ dists="$$dists ChangeLog.$$i"; \
+ fi; \
+ done; \
if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
for file in $$dists; do \
if test -f $$file; then \
@@ -272,18 +313,25 @@ dist2: $(DISTFILES)
update-po: Makefile
$(MAKE) $(DOMAIN).pot-update
- $(MAKE) $(UPDATEPOFILES)
+ test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
$(MAKE) update-gmo
+# General rule for creating PO files.
+
+.nop.po-create:
+ @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
+ echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
+ exit 1
+
# General rule for updating PO files.
.nop.po-update:
@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
- if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \
+ if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
tmpdir=`pwd`; \
echo "$$lang:"; \
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
- echo " MSGMERGE $$lang.po"; \
+ echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
cd $(srcdir); \
if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
@@ -306,7 +354,7 @@ $(DUMMYPOFILES):
update-gmo: Makefile $(GMOFILES)
@:
-Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+Makefile: Makefile.in.in $(top_builddir)/config.status @POMAKEFILEDEPS@
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
$(SHELL) ./config.status
diff --git a/po/Makevars b/po/Makevars
index 3f8a2a68..e20108d6 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -20,6 +20,22 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
# their copyright.
COPYRIGHT_HOLDER = Theodore Ts''o
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+# in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+# understood.
+# - Strings which make invalid assumptions about notation of date, time or
+# money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = tytso@alum.mit.edu
+
# This is the list of locale categories, beyond LC_MESSAGES, for which the
# message catalogs shall be used. It is usually empty.
EXTRA_LOCALE_CATEGORIES =
diff --git a/po/Rules-quot b/po/Rules-quot
index 5f46d237..9c2a995e 100644
--- a/po/Rules-quot
+++ b/po/Rules-quot
@@ -4,6 +4,11 @@ DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.heade
.SUFFIXES: .insert-header .po-update-en
+en@quot.po-create:
+ $(MAKE) en@quot.po-update
+en@boldquot.po-create:
+ $(MAKE) en@boldquot.po-update
+
en@quot.po-update: en@quot.po-update-en
en@boldquot.po-update: en@boldquot.po-update-en
diff --git a/po/cs.gmo b/po/cs.gmo
new file mode 100644
index 00000000..61741845
--- /dev/null
+++ b/po/cs.gmo
Binary files differ
diff --git a/po/cs.po b/po/cs.po
index 282f2dce..38c4176f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: e2fsprogs VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-24 14:17-0500\n"
+"Report-Msgid-Bugs-To: tytso@alum.mit.edu\n"
+"POT-Creation-Date: 2004-11-30 18:46-0500\n"
"PO-Revision-Date: 2003-04-27 15:48+0200\n"
"Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: e2fsck/badblocks.c:22 misc/mke2fs.c:194
+#: e2fsck/badblocks.c:22 misc/mke2fs.c:223
#, c-format
msgid "Bad block %u out of range; ignored.\n"
msgstr "Špatný blok %u mimo rozsah; ignorován.\n"
@@ -29,10 +29,10 @@ msgid "while reading the bad blocks inode"
msgstr "při čtení inode špatných bloků"
#: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
-#: e2fsck/unix.c:881 e2fsck/unix.c:913 misc/badblocks.c:997
+#: e2fsck/unix.c:915 e2fsck/unix.c:947 misc/badblocks.c:997
#: misc/badblocks.c:1005 misc/badblocks.c:1019 misc/badblocks.c:1031
-#: misc/dumpe2fs.c:332 misc/e2image.c:486 misc/e2image.c:502 misc/mke2fs.c:210
-#: misc/tune2fs.c:757 resize/main.c:228
+#: misc/dumpe2fs.c:332 misc/e2image.c:475 misc/e2image.c:564
+#: misc/e2image.c:580 misc/mke2fs.c:239 misc/tune2fs.c:775 resize/main.c:232
#, c-format
msgid "while trying to open %s"
msgstr "při pokusu otevřít %s"
@@ -42,7 +42,7 @@ msgstr "při pokusu otevřít %s"
msgid "while trying popen '%s'"
msgstr "při pokusu popen '%s'"
-#: e2fsck/badblocks.c:93 misc/mke2fs.c:217
+#: e2fsck/badblocks.c:93 misc/mke2fs.c:246
msgid "while reading in list of bad blocks from file"
msgstr "při načítání seznamu špatných bloků ze souboru"
@@ -102,6 +102,7 @@ msgid "%s: %s filename nblocks blocksize\n"
msgstr "%s: %s názevsouboru pbloků velikostbloku\n"
#: e2fsck/extend.c:43
+#, c-format
msgid "Illegal number of blocks!\n"
msgstr "Neplatný počet bloků!\n"
@@ -116,6 +117,7 @@ msgid "Usage: %s disk\n"
msgstr "Použití: %s disk\n"
#: e2fsck/flushb.c:63
+#, c-format
msgid "BLKFLSBUF ioctl not supported! Can't flush buffers.\n"
msgstr ""
"ioctl BLKFLSBUF nepodporováno! Nemohu synchronizovat vyrovnávací paměti.\n"
@@ -126,12 +128,12 @@ msgstr ""
msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n"
msgstr "Použití: %s [-F] [-I bloky_inode_bufferů] zařízení\n"
-#: e2fsck/iscan.c:83 e2fsck/unix.c:701 resize/main.c:205
+#: e2fsck/iscan.c:83 e2fsck/unix.c:729 resize/main.c:209
#, c-format
msgid "while opening %s for flushing"
msgstr "při otevírání %s pro synchronizaci"
-#: e2fsck/iscan.c:88 e2fsck/unix.c:707 resize/main.c:212
+#: e2fsck/iscan.c:88 e2fsck/unix.c:735 resize/main.c:216
#, c-format
msgid "while trying to flush %s"
msgstr "při pokusu synchronizovat %s"
@@ -149,31 +151,31 @@ msgstr "při získávání další inode"
msgid "%d inodes scanned.\n"
msgstr "prozkoumáno %d inode.\n"
-#: e2fsck/journal.c:449
+#: e2fsck/journal.c:463
msgid "reading journal superblock\n"
msgstr "čtení superbloku žurnálu\n"
-#: e2fsck/journal.c:506
+#: e2fsck/journal.c:520
#, c-format
msgid "%s: no valid journal superblock found\n"
msgstr "%s: nenalezen platný superblok žurnálu\n"
-#: e2fsck/journal.c:515
+#: e2fsck/journal.c:529
#, c-format
msgid "%s: journal too short\n"
msgstr "%s: žurnál příliš krátký\n"
-#: e2fsck/journal.c:787
+#: e2fsck/journal.c:802
#, c-format
msgid "%s: recovering journal\n"
msgstr "%s: obnovuji žurnál\n"
-#: e2fsck/journal.c:789
+#: e2fsck/journal.c:804
#, c-format
msgid "%s: won't do journal recovery while read-only\n"
msgstr "%s: nebudu obnovovat žurnál v režimu jen pro čtení\n"
-#: e2fsck/journal.c:810
+#: e2fsck/journal.c:825
#, c-format
msgid "while trying to re-open %s"
msgstr "při pokusu znovu otevřít %s"
@@ -331,77 +333,77 @@ msgstr "<Rezervovaná inode 10>"
msgid "multiply claimed inode map"
msgstr "mapa několikrát alokovaných inode"
-#: e2fsck/pass1b.c:551 e2fsck/pass1b.c:688
+#: e2fsck/pass1b.c:554 e2fsck/pass1b.c:691
#, c-format
msgid "internal error; can't find dup_blk for %d\n"
msgstr "interní chyba, nemohu najít dup_blk pro %d\n"
-#: e2fsck/pass1b.c:731
+#: e2fsck/pass1b.c:734
msgid "returned from clone_file_block"
msgstr "vrácený z clone_file_block"
-#: e2fsck/pass1.c:297
+#: e2fsck/pass1.c:298
msgid "in-use inode map"
msgstr "mapa používaných inode"
-#: e2fsck/pass1.c:306
+#: e2fsck/pass1.c:307
msgid "directory inode map"
msgstr "mapa inode adresářů"
-#: e2fsck/pass1.c:314
+#: e2fsck/pass1.c:315
msgid "regular file inode map"
msgstr "mapa inode obyčejných souborů"
-#: e2fsck/pass1.c:321
+#: e2fsck/pass1.c:322
msgid "in-use block map"
msgstr "mapa používaných bloků"
-#: e2fsck/pass1.c:368
+#: e2fsck/pass1.c:369
msgid "doing inode scan"
msgstr "procházím inode"
-#: e2fsck/pass1.c:751
+#: e2fsck/pass1.c:752
msgid "Pass 1"
msgstr "Průchod 1"
-#: e2fsck/pass1.c:810
+#: e2fsck/pass1.c:811
#, c-format
msgid "reading indirect blocks of inode %u"
msgstr "čtu nepřímé bloky inode %u"
-#: e2fsck/pass1.c:852
+#: e2fsck/pass1.c:853
msgid "bad inode map"
msgstr "mapa špatných inode"
-#: e2fsck/pass1.c:874
+#: e2fsck/pass1.c:875
msgid "inode in bad block map"
msgstr "inode v mapě špatných bloků"
-#: e2fsck/pass1.c:894
+#: e2fsck/pass1.c:895
msgid "imagic inode map"
msgstr "mapa imagic inode"
-#: e2fsck/pass1.c:921
+#: e2fsck/pass1.c:922
msgid "multiply claimed block map"
msgstr "mapa několikrát alokovaných bloků"
-#: e2fsck/pass1.c:1020
+#: e2fsck/pass1.c:1021
msgid "ext attr block map"
msgstr "mapa bloků rozšířených atributů"
-#: e2fsck/pass1.c:1782
+#: e2fsck/pass1.c:1783
msgid "block bitmap"
msgstr "bitmapa bloků"
-#: e2fsck/pass1.c:1786
+#: e2fsck/pass1.c:1787
msgid "inode bitmap"
msgstr "bitmapa inode"
-#: e2fsck/pass1.c:1790
+#: e2fsck/pass1.c:1791
msgid "inode table"
msgstr "tabulka inode"
-#: e2fsck/pass2.c:293
+#: e2fsck/pass2.c:294
msgid "Pass 2"
msgstr "Průchod 2"
@@ -1728,7 +1730,7 @@ msgstr "Interní chyba: pokažený konec bitmapy (%N)\n"
msgid "Unhandled error code (0x%x)!\n"
msgstr "Neobsloužený kód chyby (0x%x)!\n"
-#: e2fsck/problem.c:1594
+#: e2fsck/problem.c:1595
msgid "IGNORED"
msgstr "IGNOROVÁNO"
@@ -1791,6 +1793,7 @@ msgid "while writing inode table (group %d)"
msgstr "při zápisu tabulky inode (skupina %d)"
#: e2fsck/swapfs.c:222
+#, c-format
msgid "Pass 0: Doing byte-swap of filesystem\n"
msgstr "Průchod 0: Prováním přehození bajtů systému souborů\n"
@@ -1807,7 +1810,7 @@ msgstr ""
msgid "Byte swap"
msgstr "Přehození bajtů"
-#: e2fsck/unix.c:67
+#: e2fsck/unix.c:74
#, c-format
msgid ""
"Usage: %s [-panyrcdfvstDFSV] [-b superblock] [-B blocksize]\n"
@@ -1820,7 +1823,8 @@ msgstr ""
"\t\t[-l|-L soubor_špatných_bloků] [-C fd] [-j ext-žurnál]\n"
"\t\t[-E rozšířené-přepínače] zařízení\n"
-#: e2fsck/unix.c:73
+#: e2fsck/unix.c:80
+#, c-format
msgid ""
"\n"
"Emergency help:\n"
@@ -1841,7 +1845,8 @@ msgstr ""
" -f Vynutit kontrolu, i když je systém souborů označen "
"čistý\n"
-#: e2fsck/unix.c:79
+#: e2fsck/unix.c:86
+#, c-format
msgid ""
" -v Be verbose\n"
" -b superblock Use alternative superblock\n"
@@ -1857,154 +1862,33 @@ msgstr ""
" -l soubor_špatných Přidat do seznamu špatných bloků\n"
" -L soubor_špatných Nastavit seznam špatných bloků\n"
-#: e2fsck/unix.c:113
+#: e2fsck/unix.c:120
#, c-format
msgid "%s: %d/%d files (%0d.%d%% non-contiguous), %d/%d blocks\n"
msgstr "%s: %d/%d souborů (%0d.%d%% nesouvislých), %d/%d bloků\n"
-#: e2fsck/unix.c:119
-#, fuzzy, c-format
-msgid ""
-"\n"
-"%8d inode used (%d%%)\n"
-msgid_plural ""
-"\n"
-"%8d inodes used (%d%%)\n"
-msgstr[0] ""
-"\n"
-"%8d použitých inode (%d%%)\n"
-msgstr[1] ""
-"\n"
-"%8d použitých inode (%d%%)\n"
-
-#: e2fsck/unix.c:121
-#, fuzzy, c-format
-msgid "%8d non-contiguous inode (%0d.%d%%)\n"
-msgid_plural "%8d non-contiguous inodes (%0d.%d%%)\n"
-msgstr[0] "%8d nesouvislých inode (%0d.%d%%)\n"
-msgstr[1] "%8d nesouvislých inode (%0d.%d%%)\n"
-
-#: e2fsck/unix.c:125
+#: e2fsck/unix.c:132
#, c-format
msgid " # of inodes with ind/dind/tind blocks: %d/%d/%d\n"
msgstr " # inode s ind/dind/tind bloky: %d/%d/%d\n"
-#: e2fsck/unix.c:127
-#, fuzzy, c-format
-msgid "%8d block used (%d%%)\n"
-msgid_plural "%8d blocks used (%d%%)\n"
-msgstr[0] ""
-"\n"
-"%8d použitých inode (%d%%)\n"
-msgstr[1] ""
-"\n"
-"%8d použitých inode (%d%%)\n"
-
-#: e2fsck/unix.c:130
-#, fuzzy, c-format
-msgid "%8d bad block\n"
-msgid_plural "%8d bad blocks\n"
-msgstr[0] "inode v mapě špatných bloků"
-msgstr[1] "inode v mapě špatných bloků"
-
-#: e2fsck/unix.c:132
-#, fuzzy, c-format
-msgid "%8d large file\n"
-msgid_plural "%8d large files\n"
-msgstr[0] "%8d velkých souborů\n"
-msgstr[1] "%8d velkých souborů\n"
-
-#: e2fsck/unix.c:134
-#, fuzzy, c-format
-msgid ""
-"\n"
-"%8d regular file\n"
-msgid_plural ""
-"\n"
-"%8d regular files\n"
-msgstr[0] "%8d velkých souborů\n"
-msgstr[1] "%8d velkých souborů\n"
-
-#: e2fsck/unix.c:136
-#, fuzzy, c-format
-msgid "%8d directory\n"
-msgid_plural "%8d directories\n"
-msgstr[0] "dadresář"
-msgstr[1] "dadresář"
-
-#: e2fsck/unix.c:138
-#, fuzzy, c-format
-msgid "%8d character device file\n"
-msgid_plural "%8d character device files\n"
-msgstr[0] "%8d velkých souborů\n"
-msgstr[1] "%8d velkých souborů\n"
-
-#: e2fsck/unix.c:141
-#, fuzzy, c-format
-msgid "%8d block device file\n"
-msgid_plural "%8d block device files\n"
-msgstr[0] "%8d velkých souborů\n"
-msgstr[1] "%8d velkých souborů\n"
-
-#: e2fsck/unix.c:143
-#, c-format
-msgid "%8d fifo\n"
-msgid_plural "%8d fifos\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: e2fsck/unix.c:145
-#, c-format
-msgid "%8d link\n"
-msgid_plural "%8d links\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: e2fsck/unix.c:148
-#, c-format
-msgid "%8d symbolic link"
-msgid_plural "%8d symbolic links"
-msgstr[0] ""
-msgstr[1] ""
-
-#: e2fsck/unix.c:150
-#, c-format
-msgid " (%d fast symbolic link)\n"
-msgid_plural " (%d fast symbolic links)\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: e2fsck/unix.c:152
-#, c-format
-msgid "%8d socket\n"
-msgid_plural "%8d sockets\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: e2fsck/unix.c:155
-#, fuzzy, c-format
-msgid "%8d file\n"
-msgid_plural "%8d files\n"
-msgstr[0] "%8d velkých souborů\n"
-msgstr[1] "%8d velkých souborů\n"
-
-#: e2fsck/unix.c:169 misc/badblocks.c:781 misc/tune2fs.c:773 misc/util.c:145
+#: e2fsck/unix.c:176 misc/badblocks.c:781 misc/tune2fs.c:791 misc/util.c:151
#: resize/main.c:97
#, c-format
msgid "while determining whether %s is mounted."
msgstr "při zjišťování, jestli je %s připojen."
-#: e2fsck/unix.c:184
+#: e2fsck/unix.c:191
#, c-format
msgid "Warning! %s is mounted.\n"
msgstr "Varování! %s je připojen.\n"
-#: e2fsck/unix.c:188
+#: e2fsck/unix.c:195
#, c-format
msgid "%s is mounted. "
msgstr "%s je připojen. "
-#: e2fsck/unix.c:190
+#: e2fsck/unix.c:197
msgid ""
"Cannot continue, aborting.\n"
"\n"
@@ -2012,7 +1896,8 @@ msgstr ""
"Nemohu pokračovat, končím.\n"
"\n"
-#: e2fsck/unix.c:191
+#: e2fsck/unix.c:198
+#, c-format
msgid ""
"\n"
"\n"
@@ -2026,60 +1911,63 @@ msgstr ""
"způsobit VÁŽNÉ poškození systému souborů.\n"
"\n"
-#: e2fsck/unix.c:194
+#: e2fsck/unix.c:201
msgid "Do you really want to continue"
msgstr "Chcete opravdu pokračovat"
-#: e2fsck/unix.c:196
+#: e2fsck/unix.c:203
+#, c-format
msgid "check aborted.\n"
msgstr "kontrola přerušena.\n"
-#: e2fsck/unix.c:245
+#: e2fsck/unix.c:264
msgid " contains a file system with errors"
msgstr " obsahuje systém souborů s chybami"
-#: e2fsck/unix.c:247
+#: e2fsck/unix.c:266
msgid " was not cleanly unmounted"
msgstr " nebyl čistě odpojen"
-#: e2fsck/unix.c:251
+#: e2fsck/unix.c:270
#, c-format
msgid " has been mounted %u times without being checked"
msgstr " byl připojen %ukrát bez kontroly"
-#: e2fsck/unix.c:259
+#: e2fsck/unix.c:278
#, c-format
msgid " has gone %u days without being checked"
msgstr " nebyl kontrolován %u dní"
-#: e2fsck/unix.c:268
+#: e2fsck/unix.c:287
msgid ", check forced.\n"
msgstr ", kontrola vynucena.\n"
-#: e2fsck/unix.c:271
+#: e2fsck/unix.c:290
#, fuzzy, c-format
msgid "%s: clean, %d/%d files, %d/%d blocks"
msgstr "%s: čistý, %d/%d souborů, %d/%d bloků\n"
-#: e2fsck/unix.c:286
+#: e2fsck/unix.c:306
msgid " (check after next mount)"
msgstr ""
-#: e2fsck/unix.c:288
+#: e2fsck/unix.c:308
#, c-format
msgid " (check in %ld mounts)"
msgstr ""
-#: e2fsck/unix.c:430
+#: e2fsck/unix.c:450
#, c-format
msgid "ERROR: Couldn't open /dev/null (%s)\n"
msgstr "CHYBA: Nemohu otevřít /dev/null (%s)\n"
-#: e2fsck/unix.c:501
+#: e2fsck/unix.c:521
+#, c-format
msgid "Invalid EA version.\n"
msgstr "Neplatná verze EA.\n"
-#: e2fsck/unix.c:510
+#: e2fsck/unix.c:532
+#, c-format
msgid ""
"Extended options are separated by commas, and may take an argument which\n"
"is set off by an equals ('=') sign. Valid raid options are:\n"
@@ -2091,71 +1979,77 @@ msgstr ""
"\tea_ver=<verze_ea (1 nebo 2)\n"
"\n"
-#: e2fsck/unix.c:568
+#: e2fsck/unix.c:590
#, c-format
msgid "Error validating file descriptor %d: %s\n"
msgstr "Chyba při ověřování platnosti deskriptoru souboru %d: %s\n"
-#: e2fsck/unix.c:572
+#: e2fsck/unix.c:594
msgid "Invalid completion information file descriptor"
msgstr "Neplatný deskriptor souborů informace o dokončení"
-#: e2fsck/unix.c:587
+#: e2fsck/unix.c:609
msgid "Only one the options -p/-a, -n or -y may be specified."
msgstr "Může být zadán jen jeden z přepínačů -p/-a, -n nebo -y."
-#: e2fsck/unix.c:608
+#: e2fsck/unix.c:630
+#, c-format
msgid "The -t option is not supported on this version of e2fsck.\n"
msgstr "Přepínač -t není v této verzi e2fsck podporován.\n"
-#: e2fsck/unix.c:673
+#: e2fsck/unix.c:695
+#, c-format
msgid "Byte-swapping filesystems not compiled in this version of e2fsck\n"
msgstr "Přehození bajtů systémů souborů není zabudováno v této verzi e2fsck\n"
-#: e2fsck/unix.c:690 misc/tune2fs.c:444 misc/tune2fs.c:699 misc/tune2fs.c:716
+#: e2fsck/unix.c:718 misc/tune2fs.c:458 misc/tune2fs.c:716 misc/tune2fs.c:733
#, c-format
msgid "Unable to resolve '%s'"
msgstr ""
-#: e2fsck/unix.c:716
+#: e2fsck/unix.c:744
+#, c-format
msgid "Incompatible options not allowed when byte-swapping.\n"
msgstr "Při přehození bajtů nejsou dovoleny nekompatibilní přepínače.\n"
-#: e2fsck/unix.c:723
+#: e2fsck/unix.c:751
+#, c-format
msgid "The -c and the -l/-L options may not be both used at the same time.\n"
msgstr "Přepínače -c a -l/-L nemohou být použity zároveň.\n"
-#: e2fsck/unix.c:801
+#: e2fsck/unix.c:829
+#, c-format
msgid "Error: ext2fs library version out of date!\n"
msgstr "Chyba: stará verze knihovny ext2fs!\n"
-#: e2fsck/unix.c:809
+#: e2fsck/unix.c:837
msgid "while trying to initialize program"
msgstr "při pokusu inicializovat program"
-#: e2fsck/unix.c:823
+#: e2fsck/unix.c:851
#, c-format
msgid "\tUsing %s, %s\n"
msgstr "\tPoužívám %s, %s\n"
-#: e2fsck/unix.c:835
+#: e2fsck/unix.c:863
msgid "need terminal for interactive repairs"
msgstr "pro interaktivní opravy potřebuji terminál"
-#: e2fsck/unix.c:871
+#: e2fsck/unix.c:905
#, c-format
msgid "%s trying backup blocks...\n"
msgstr "%s zkouším záložní bloky...\n"
-#: e2fsck/unix.c:872
+#: e2fsck/unix.c:906
msgid "Couldn't find ext2 superblock,"
msgstr "Nemohu najít superblok ext2,"
-#: e2fsck/unix.c:873
+#: e2fsck/unix.c:907
msgid "Group descriptors look bad..."
msgstr "Deskriptory skupin vypadají špatně..."
-#: e2fsck/unix.c:884
+#: e2fsck/unix.c:918
+#, c-format
msgid ""
"The filesystem revision is apparently too high for this version of e2fsck.\n"
"(Or the filesystem superblock is corrupt)\n"
@@ -2165,20 +2059,23 @@ msgstr ""
"(Nebo je superblok systému souborů poškozen)\n"
"\n"
-#: e2fsck/unix.c:890
+#: e2fsck/unix.c:924
+#, c-format
msgid "Could this be a zero-length partition?\n"
msgstr "Mohl by toto být oddíl nulové délky?\n"
-#: e2fsck/unix.c:892
+#: e2fsck/unix.c:926
#, c-format
msgid "You must have %s access to the filesystem or be root\n"
msgstr "Musíte mít přístup %s k systému souborů nebo být root\n"
-#: e2fsck/unix.c:897
+#: e2fsck/unix.c:931
+#, c-format
msgid "Possibly non-existent or swap device?\n"
msgstr "Pravděpodobně neexistující nebo odkládací zařízení?\n"
-#: e2fsck/unix.c:900
+#: e2fsck/unix.c:934
+#, c-format
msgid ""
"Disk write-protected; use the -n option to do a read-only\n"
"check of the device.\n"
@@ -2186,16 +2083,17 @@ msgstr ""
"Disk chráněn proti zápisu; použijte přepínač -n pro provedení\n"
"kontroly zařízení jen pro čtení.\n"
-#: e2fsck/unix.c:916
+#: e2fsck/unix.c:950
msgid "Get a newer version of e2fsck!"
msgstr "Sežeňte novější verzi e2fsck!"
-#: e2fsck/unix.c:937
+#: e2fsck/unix.c:971
#, c-format
msgid "while checking ext3 journal for %s"
msgstr "při kontrole žurnálu ext3 pro %s"
-#: e2fsck/unix.c:948
+#: e2fsck/unix.c:982
+#, c-format
msgid ""
"Warning: skipping journal recovery because doing a read-only filesystem "
"check.\n"
@@ -2203,21 +2101,21 @@ msgstr ""
"Varování: přeskakuji obnovu žurnálu, protože prováním kontrolu systému "
"souborů jen pro čtení.\n"
-#: e2fsck/unix.c:961
+#: e2fsck/unix.c:995
#, c-format
msgid "unable to set superblock flags on %s\n"
msgstr "nemohu nastavit příznaky superbloku na %s\n"
-#: e2fsck/unix.c:967
+#: e2fsck/unix.c:1001
#, c-format
msgid "while recovering ext3 journal of %s"
msgstr "při obnově žurnálu ext3 %s"
-#: e2fsck/unix.c:996
+#: e2fsck/unix.c:1030
msgid "Warning: compression support is experimental.\n"
msgstr "Varování: podpora komprese je experimentální.\n"
-#: e2fsck/unix.c:1001
+#: e2fsck/unix.c:1035
#, c-format
msgid ""
"E2fsck not compiled with HTREE support,\n"
@@ -2226,37 +2124,39 @@ msgstr ""
"E2fsck nepřeložen s podporou HTREE,\n"
"\tale systém souborů %s má adresáře HTREE.\n"
-#: e2fsck/unix.c:1044
+#: e2fsck/unix.c:1078
#, c-format
msgid "%s: Filesystem byte order already normalized.\n"
msgstr "%s: Pořadí bajtů systému souborů již normalizováno.\n"
-#: e2fsck/unix.c:1064
+#: e2fsck/unix.c:1098
msgid "while reading bad blocks inode"
msgstr "při čtení inode špatných bloků"
-#: e2fsck/unix.c:1066
+#: e2fsck/unix.c:1100
+#, c-format
msgid "This doesn't bode well, but we'll try to go on...\n"
msgstr "Toto nevypadá dobře, ale zkusíme pokračovat...\n"
-#: e2fsck/unix.c:1073
+#: e2fsck/unix.c:1107
+#, c-format
msgid "Restarting e2fsck from the beginning...\n"
msgstr "Spouštím e2fsck od začátku...\n"
-#: e2fsck/unix.c:1077
+#: e2fsck/unix.c:1111
msgid "while resetting context"
msgstr "při nulování kontextu"
-#: e2fsck/unix.c:1084
+#: e2fsck/unix.c:1118
#, c-format
msgid "%s: e2fsck canceled.\n"
msgstr "%s: e2fsck přerušen.\n"
-#: e2fsck/unix.c:1089
+#: e2fsck/unix.c:1123
msgid "aborted"
msgstr "přerušen"
-#: e2fsck/unix.c:1097
+#: e2fsck/unix.c:1131
#, c-format
msgid ""
"\n"
@@ -2265,12 +2165,12 @@ msgstr ""
"\n"
"%s: ***** SYSTÉM SOUBORŮ BYL ZMĚNĚN *****\n"
-#: e2fsck/unix.c:1100
+#: e2fsck/unix.c:1134
#, c-format
msgid "%s: ***** REBOOT LINUX *****\n"
msgstr "%s: ***** ZNOVU ZAVEĎTE LINUX *****\n"
-#: e2fsck/unix.c:1106
+#: e2fsck/unix.c:1140
#, c-format
msgid ""
"\n"
@@ -2510,7 +2410,7 @@ msgstr ""
msgid "during test data write, block %lu"
msgstr "při testovacím zápisu dat, blok %lu"
-#: misc/badblocks.c:788 misc/util.c:152
+#: misc/badblocks.c:788 misc/util.c:158
#, c-format
msgid "%s is mounted; "
msgstr "%s je připojen; "
@@ -2523,7 +2423,7 @@ msgstr "badblocks přesto vynucen. Doufám, že /etc/mtab je nesprávná.\n"
msgid "it's not safe to run badblocks!\n"
msgstr "není bezpečné spouštět badblocks!\n"
-#: misc/badblocks.c:853 misc/mke2fs.c:898
+#: misc/badblocks.c:853 misc/mke2fs.c:926
#, c-format
msgid "bad block size - %s"
msgstr "špatná velikost bloku - %s"
@@ -2558,7 +2458,7 @@ msgstr ""
msgid "while trying to determine device size"
msgstr "při pokusu zjistit velikost zařízení"
-#: misc/badblocks.c:972 misc/mke2fs.c:1071
+#: misc/badblocks.c:972 misc/mke2fs.c:1099
#, c-format
msgid "bad blocks count - %s"
msgstr "špatný počet bloků - %s"
@@ -2630,11 +2530,11 @@ msgstr "při nastavování verze %s"
msgid "Couldn't allocate path variable in chattr_dir_proc"
msgstr "Nemohu alokovat proměnou path v chattr_dir_proc"
-#: misc/chattr.c:287
+#: misc/chattr.c:291
msgid "= is incompatible with - and +\n"
msgstr "= je neslučitelné s - a +\n"
-#: misc/chattr.c:295
+#: misc/chattr.c:299
msgid "Must use '-v', =, - or +\n"
msgstr "Musíte použít '-v', =, - nebo +\n"
@@ -2662,10 +2562,12 @@ msgid "Backup"
msgstr "Záložní"
#: misc/dumpe2fs.c:130
+#, c-format
msgid ", Group descriptors at "
msgstr ", Deskriptory skupin v "
#: misc/dumpe2fs.c:135
+#, c-format
msgid " Group descriptor at "
msgstr " Deskriptor skupiny v "
@@ -2711,7 +2613,7 @@ msgstr "při tisku seznamu špatných bloků"
msgid "Bad blocks: %d"
msgstr "Špatné bloky: %d"
-#: misc/dumpe2fs.c:227 misc/tune2fs.c:150
+#: misc/dumpe2fs.c:227 misc/tune2fs.c:153
msgid "while reading journal superblock"
msgstr "při čtení superbloku žurnálu"
@@ -2738,16 +2640,18 @@ msgstr ""
"Začátek žurnálu: %d\n"
"Počet uživatelů žurnálu: %d\n"
-#: misc/dumpe2fs.c:307 misc/mke2fs.c:1085
+#: misc/dumpe2fs.c:307 misc/mke2fs.c:1113
#, c-format
msgid "\tUsing %s\n"
msgstr "\tPoužívám %s\n"
-#: misc/dumpe2fs.c:334 misc/e2image.c:488 misc/tune2fs.c:760 resize/main.c:230
+#: misc/dumpe2fs.c:334 misc/e2image.c:566 misc/tune2fs.c:778 resize/main.c:234
+#, c-format
msgid "Couldn't find valid filesystem superblock.\n"
msgstr "Nemohu najít platný superblok systému souborů.\n"
#: misc/dumpe2fs.c:345
+#, c-format
msgid "Note: This is a byte-swapped filesystem\n"
msgstr "Poznámka: Tento systém souborů má přehozené bajty\n"
@@ -2761,8 +2665,8 @@ msgstr ""
"%s: %s: chyba při čtení bitmap: %s\n"
#: misc/e2image.c:50
-#, c-format
-msgid "Usage: %s [-r] device file\n"
+#, fuzzy, c-format
+msgid "Usage: %s [-r] device image_file\n"
msgstr "Použití: %s [-r] zařízení soubor\n"
#: misc/e2image.c:61
@@ -2797,34 +2701,42 @@ msgid "e2label: cannot open %s\n"
msgstr "e2label: nemohu otevřít %s\n"
#: misc/e2label.c:62
+#, c-format
msgid "e2label: cannot seek to superblock\n"
msgstr "e2label: nemohu se posunout na superblok\n"
#: misc/e2label.c:67
+#, c-format
msgid "e2label: error reading superblock\n"
msgstr "e2label: chyba při čtení superbloku\n"
#: misc/e2label.c:71
+#, c-format
msgid "e2label: not an ext2 filesystem\n"
msgstr "e2label: není systém souborů ext2\n"
-#: misc/e2label.c:96 misc/tune2fs.c:867
+#: misc/e2label.c:96 misc/tune2fs.c:885
+#, c-format
msgid "Warning: label too long, truncating.\n"
msgstr "Varování: jmenovka příliš dlouhá, zkracuji.\n"
#: misc/e2label.c:99
+#, c-format
msgid "e2label: cannot seek to superblock again\n"
msgstr "e2label: nemohu se zase posunout na superblok\n"
#: misc/e2label.c:104
+#, c-format
msgid "e2label: error writing superblock\n"
msgstr "e2label: chyba při zápisu superbloku\n"
-#: misc/e2label.c:116 misc/tune2fs.c:439
+#: misc/e2label.c:116 misc/tune2fs.c:450
+#, c-format
msgid "Usage: e2label device [newlabel]\n"
msgstr "Použití: e2label zařízení [novájmenovka]\n"
#: misc/findsuper.c:126
+#, c-format
msgid "Usage: findsuper device [skipbytes [startkb]]\n"
msgstr "Použití: findsuper zařízení [přeskakovatbajtů [startkb]]\n"
@@ -2835,6 +2747,7 @@ msgid "skipbytes should be a number, not %s\n"
msgstr "přeskakovatbajtů by mělo být číslo, ne %s\n"
#: misc/findsuper.c:137
+#, c-format
msgid "skipbytes must be a multiple of the sector size\n"
msgstr "přeskakovatbajtů musí být násobek velikosti sektoru\n"
@@ -2854,6 +2767,7 @@ msgid "starting at %Ld, with %d byte increments\n"
msgstr "začínám na %Ld s přírůstky %d bajtů\n"
#: misc/findsuper.c:158
+#, c-format
msgid " thisoff block fs_blk_sz blksz grp last_mount\n"
msgstr " tentopos blok fs_blk_sz blksz grp last_mount\n"
@@ -2973,7 +2887,7 @@ msgstr "Při čtení příznaků %s"
msgid "While reading version on %s"
msgstr "Při čtení verze %s"
-#: misc/mke2fs.c:91
+#: misc/mke2fs.c:92
#, c-format
msgid ""
"Usage: %s [-c|-t|-l filename] [-b block-size] [-f fragment-size]\n"
@@ -2990,35 +2904,35 @@ msgstr ""
" [-O vlastnost[,...]] [-r revize-ss] [-R přepínače_raid] [-qvSV]\n"
" zařízení [počet-bloků]\n"
-#: misc/mke2fs.c:235
+#: misc/mke2fs.c:264
#, c-format
msgid "Running command: %s\n"
msgstr "Spouštím příkaz: %s\n"
-#: misc/mke2fs.c:239
+#: misc/mke2fs.c:268
#, c-format
msgid "while trying run '%s'"
msgstr "při pokusu spustit '%s'"
-#: misc/mke2fs.c:246
+#: misc/mke2fs.c:275
msgid "while processing list of bad blocks from program"
msgstr "při zpracovávání seznamu špatných bloků z programu"
-#: misc/mke2fs.c:273
+#: misc/mke2fs.c:302
#, c-format
msgid "Block %d in primary superblock/group descriptor area bad.\n"
msgstr "Blok %d v oblasti primárního superbloku/deskriptorů skupin špatný.\n"
-#: misc/mke2fs.c:275
+#: misc/mke2fs.c:304
#, c-format
msgid "Blocks %d through %d must be good in order to build a filesystem.\n"
msgstr "Bloky %d až %d musí být pro vytvoření systému souborů v pořádku.\n"
-#: misc/mke2fs.c:278
+#: misc/mke2fs.c:307
msgid "Aborting....\n"
msgstr "Končím....\n"
-#: misc/mke2fs.c:298
+#: misc/mke2fs.c:327
#, c-format
msgid ""
"Warning: the backup superblock/group descriptors at block %d contain\n"
@@ -3029,23 +2943,23 @@ msgstr ""
"\tšpatné bloky.\n"
"\n"
-#: misc/mke2fs.c:316
+#: misc/mke2fs.c:345
msgid "while marking bad blocks as used"
msgstr "při označování špatných bloků jako použité"
-#: misc/mke2fs.c:374
+#: misc/mke2fs.c:403
msgid "done \n"
msgstr "hotovo \n"
-#: misc/mke2fs.c:409
+#: misc/mke2fs.c:438
msgid "while allocating zeroizing buffer"
msgstr "Při alokaci nulovací vyrovnávací paměti"
-#: misc/mke2fs.c:450
+#: misc/mke2fs.c:479
msgid "Writing inode tables: "
msgstr "Zapisuji tabulky inode: "
-#: misc/mke2fs.c:461
+#: misc/mke2fs.c:490
#, c-format
msgid ""
"\n"
@@ -3054,67 +2968,67 @@ msgstr ""
"\n"
"Nemohu zapsat %d bloků v tabulce inode začínající v %d: %s\n"
-#: misc/mke2fs.c:484
+#: misc/mke2fs.c:513
msgid "while creating root dir"
msgstr "při vytváření kořenového adresáře"
-#: misc/mke2fs.c:491
+#: misc/mke2fs.c:520
msgid "while reading root inode"
msgstr "při čtení kořenové inode"
-#: misc/mke2fs.c:500
+#: misc/mke2fs.c:529
msgid "while setting root inode ownership"
msgstr "při nastavování vlastnictví kořenové inode"
-#: misc/mke2fs.c:518
+#: misc/mke2fs.c:547
msgid "while creating /lost+found"
msgstr "při vytváření /lost+found"
-#: misc/mke2fs.c:525
+#: misc/mke2fs.c:554
msgid "while looking up /lost+found"
msgstr "při vyhledávání /lost+found"
-#: misc/mke2fs.c:535
+#: misc/mke2fs.c:564
msgid "while expanding /lost+found"
msgstr "při zvětšování /lost+found"
-#: misc/mke2fs.c:551
+#: misc/mke2fs.c:580
msgid "while setting bad block inode"
msgstr "při nastavování inode špatných bloků"
-#: misc/mke2fs.c:583
+#: misc/mke2fs.c:612
#, c-format
msgid "Out of memory erasing sectors %d-%d\n"
msgstr "Nedostatek paměti při mazání sektorů %d-%d\n"
-#: misc/mke2fs.c:593
+#: misc/mke2fs.c:622
#, c-format
msgid "Warning: could not read block 0: %s\n"
msgstr "Varování: nemohu načíst blok 0: %s\n"
-#: misc/mke2fs.c:609
+#: misc/mke2fs.c:638
#, c-format
msgid "Warning: could not erase sector %d: %s\n"
msgstr "Varování: nemohu vymazat sektor %d: %s\n"
-#: misc/mke2fs.c:625
+#: misc/mke2fs.c:654
msgid "while initializing journal superblock"
msgstr "při inicializaci superbloku žurnálu"
-#: misc/mke2fs.c:631
+#: misc/mke2fs.c:660
msgid "Zeroing journal device: "
msgstr "Nuluji zařízení žurnálu: "
-#: misc/mke2fs.c:638
+#: misc/mke2fs.c:667
#, c-format
msgid "while zeroing journal device (block %u, count %d)"
msgstr "při nulování zařízení žurnálu (blok %u, počet %d)"
-#: misc/mke2fs.c:649
+#: misc/mke2fs.c:678
msgid "while writing journal superblock"
msgstr "při zápisu superbloku žurnálu"
-#: misc/mke2fs.c:664
+#: misc/mke2fs.c:693
#, c-format
msgid ""
"warning: %d blocks unused.\n"
@@ -3123,77 +3037,81 @@ msgstr ""
"varování: nepoužito %d bloků.\n"
"\n"
-#: misc/mke2fs.c:669
+#: misc/mke2fs.c:698
#, c-format
msgid "Filesystem label=%s\n"
msgstr "Jmenovka systému souborů=%s\n"
-#: misc/mke2fs.c:670
+#: misc/mke2fs.c:699
msgid "OS type: "
msgstr "Typ OS: "
-#: misc/mke2fs.c:675
+#: misc/mke2fs.c:704
msgid "(unknown os)"
msgstr "(neznámý os)"
-#: misc/mke2fs.c:678
+#: misc/mke2fs.c:707
#, c-format
msgid "Block size=%u (log=%u)\n"
msgstr "Velikost bloku=%u (log=%u)\n"
-#: misc/mke2fs.c:680
+#: misc/mke2fs.c:709
#, c-format
msgid "Fragment size=%u (log=%u)\n"
msgstr "Velikost fragmentu=%u (log=%u)\n"
-#: misc/mke2fs.c:682
+#: misc/mke2fs.c:711
#, c-format
msgid "%u inodes, %u blocks\n"
msgstr "%u inode, %u bloků\n"
-#: misc/mke2fs.c:684
+#: misc/mke2fs.c:713
#, c-format
msgid "%u blocks (%2.2f%%) reserved for the super user\n"
msgstr "%u bloků (%2.2f%%) rezervováno pro superuživatele\n"
-#: misc/mke2fs.c:687
+#: misc/mke2fs.c:716
#, c-format
msgid "First data block=%u\n"
msgstr "První blok dat=%u\n"
-#: misc/mke2fs.c:689
+#: misc/mke2fs.c:718
#, c-format
msgid "%u block groups\n"
msgstr "%u skupin bloků\n"
-#: misc/mke2fs.c:691
+#: misc/mke2fs.c:720
#, c-format
msgid "%u block group\n"
msgstr "%u skupina bloků\n"
-#: misc/mke2fs.c:692
+#: misc/mke2fs.c:721
#, c-format
msgid "%u blocks per group, %u fragments per group\n"
msgstr "%u bloků ve skupině, %u fragmentů ve skupině\n"
-#: misc/mke2fs.c:694
+#: misc/mke2fs.c:723
#, c-format
msgid "%u inodes per group\n"
msgstr "%u inode ve skupině\n"
-#: misc/mke2fs.c:701
+#: misc/mke2fs.c:730
+#, c-format
msgid "Superblock backups stored on blocks: "
msgstr "Zálohy superbloku uloženy v blocích: "
-#: misc/mke2fs.c:751
+#: misc/mke2fs.c:780
+#, c-format
msgid "Couldn't allocate memory to parse raid options!\n"
msgstr "Nemohu alokovat paměť pro zpracování přepínačů raid!\n"
-#: misc/mke2fs.c:776
+#: misc/mke2fs.c:805
+#, c-format
msgid "Invalid stride parameter.\n"
msgstr "Neplatný parametr stride.\n"
-#: misc/mke2fs.c:784
+#: misc/mke2fs.c:813
+#, c-format
msgid ""
"\n"
"Bad raid options specified.\n"
@@ -3214,70 +3132,71 @@ msgstr ""
"Platné přepínače raid jsou:\n"
" stride=<délka stride v blocích>\n"
-#: misc/mke2fs.c:902
+#: misc/mke2fs.c:930
#, c-format
msgid "Warning: blocksize %d not usable on most systems.\n"
msgstr "Varování: velikost bloku %d není na většině systémů použitelná.\n"
-#: misc/mke2fs.c:919
+#: misc/mke2fs.c:947
#, c-format
msgid "bad fragment size - %s"
msgstr "špatná velikost fragmentu - %s"
-#: misc/mke2fs.c:925
+#: misc/mke2fs.c:953
+#, c-format
msgid "Warning: fragments not supported. Ignoring -f option\n"
msgstr "Varování: fragmenty nepodporovány. Ignoruji přepínač -f\n"
-#: misc/mke2fs.c:932
+#: misc/mke2fs.c:960
msgid "Illegal number for blocks per group"
msgstr "Neplatný počet bloků ve skupině"
-#: misc/mke2fs.c:937
+#: misc/mke2fs.c:965
msgid "blocks per group must be multiple of 8"
msgstr "bloky ve skupině musí být násobek 8"
-#: misc/mke2fs.c:947
+#: misc/mke2fs.c:975
#, c-format
msgid "bad inode ratio %s (min %d/max %d"
msgstr "špatný podíl inode %s (min %d/max %d"
-#: misc/mke2fs.c:966
+#: misc/mke2fs.c:994
msgid "in malloc for bad_blocks_filename"
msgstr "v malloc pro bad_blocks_filename"
-#: misc/mke2fs.c:975
+#: misc/mke2fs.c:1003
#, c-format
msgid "bad reserved blocks percent - %s"
msgstr "špatné procento rezervovaných bloků - %s"
-#: misc/mke2fs.c:1007
+#: misc/mke2fs.c:1035
#, c-format
msgid "bad inode size - %s"
msgstr "špatná velikost inode - %s"
-#: misc/mke2fs.c:1043 misc/tune2fs.c:294
+#: misc/mke2fs.c:1071 misc/tune2fs.c:302
#, c-format
msgid "Invalid filesystem option set: %s\n"
msgstr "Neplatný sada přepínačů systému souborů: %s\n"
-#: misc/mke2fs.c:1112 misc/mke2fs.c:1449
+#: misc/mke2fs.c:1140 misc/mke2fs.c:1477
#, c-format
msgid "while trying to open journal device %s\n"
msgstr "při pokusu otevřít zařízení žurnálu %s\n"
# FIXME: thanminimum
-#: misc/mke2fs.c:1118
+#: misc/mke2fs.c:1146
#, fuzzy, c-format
msgid "Journal dev blocksize (%d) smaller than minimum blocksize %d\n"
msgstr ""
"Velikost bloku zařízení žurnálu (%d) menší než minimální velikost bloku %d\n"
-#: misc/mke2fs.c:1132
+#: misc/mke2fs.c:1160
#, c-format
msgid "%d-byte blocks too big for system (max %d)"
msgstr "%d-bajtové bloky příliš velké pro systém (max %d)"
-#: misc/mke2fs.c:1136
+#: misc/mke2fs.c:1164
#, c-format
msgid ""
"Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
@@ -3285,15 +3204,15 @@ msgstr ""
"Varování: %d-bajtové bloky příliš velké pro systém (max %d), donucen "
"pokračovat\n"
-#: misc/mke2fs.c:1161
+#: misc/mke2fs.c:1189
msgid "filesystem"
msgstr "systém souborů"
-#: misc/mke2fs.c:1174 resize/main.c:264
+#: misc/mke2fs.c:1202 resize/main.c:268
msgid "while trying to determine filesystem size"
msgstr "při pokusu zjistit velikost systému souborů"
-#: misc/mke2fs.c:1180
+#: misc/mke2fs.c:1208
msgid ""
"Couldn't determine device size; you must specify\n"
"the size of the filesystem\n"
@@ -3301,7 +3220,7 @@ msgstr ""
"Nemohu zjistit velikost zařízení; musíte zadat\n"
"velikost systému souborů\n"
-#: misc/mke2fs.c:1187
+#: misc/mke2fs.c:1215
msgid ""
"Device size reported to be zero. Invalid partition specified, or\n"
"\tpartition table wasn't reread after running fdisk, due to\n"
@@ -3313,57 +3232,57 @@ msgstr ""
" oddíl se používá. Možná budete muset pro opětovné načtení\n"
" své tabulky oddílů znovu zavést systém.\n"
-#: misc/mke2fs.c:1205
+#: misc/mke2fs.c:1233
msgid "Filesystem larger than apparent device size."
msgstr "Systém souborů větší než velikost zařízení."
-#: misc/mke2fs.c:1227
+#: misc/mke2fs.c:1255
#, fuzzy
msgid "while trying to determine hardware sector size"
msgstr "při pokusu zjistit velikost zařízení"
-#: misc/mke2fs.c:1241
+#: misc/mke2fs.c:1269
msgid "blocks per group count out of range"
msgstr "počet bloků ve skupině mimo rozsah"
-#: misc/mke2fs.c:1251
+#: misc/mke2fs.c:1279
#, c-format
msgid "bad inode size %d (min %d/max %d)"
msgstr "špatná velikost inode %d (min %d/max %d)"
-#: misc/mke2fs.c:1257
+#: misc/mke2fs.c:1285
#, c-format
msgid "Warning: %d-byte inodes not usable on most systems\n"
msgstr "Varování: %d-bajtové inode nejsou na většině systémů použitelné\n"
-#: misc/mke2fs.c:1308
+#: misc/mke2fs.c:1336
msgid "while setting up superblock"
msgstr "při nastavování superbloku"
-#: misc/mke2fs.c:1342
+#: misc/mke2fs.c:1370
#, c-format
msgid "unknown os - %s"
msgstr "neznámý os - %s"
-#: misc/mke2fs.c:1396
+#: misc/mke2fs.c:1424
msgid "while trying to allocate filesystem tables"
msgstr "při pokusu alokovat tabulky systému souborů"
-#: misc/mke2fs.c:1427
+#: misc/mke2fs.c:1455
#, c-format
msgid "while zeroing block %u at end of filesystem"
msgstr "při nulování bloku %u na konci systému souborů"
-#: misc/mke2fs.c:1442 misc/tune2fs.c:376
+#: misc/mke2fs.c:1470 misc/tune2fs.c:387
msgid "journal"
msgstr "žurnál"
-#: misc/mke2fs.c:1454
+#: misc/mke2fs.c:1482
#, c-format
msgid "Adding journal to device %s: "
msgstr "Přidávám žurnál k zařízení %s: "
-#: misc/mke2fs.c:1461
+#: misc/mke2fs.c:1489
#, c-format
msgid ""
"\n"
@@ -3372,16 +3291,17 @@ msgstr ""
"\n"
"\tpři pokusu přidat žurnál k zařízení %s"
-#: misc/mke2fs.c:1466 misc/mke2fs.c:1490 misc/tune2fs.c:404 misc/tune2fs.c:418
+#: misc/mke2fs.c:1494 misc/mke2fs.c:1518 misc/tune2fs.c:415 misc/tune2fs.c:429
+#, c-format
msgid "done\n"
msgstr "hotovo\n"
-#: misc/mke2fs.c:1478
+#: misc/mke2fs.c:1506
#, c-format
msgid "Creating journal (%d blocks): "
msgstr "Vytvářím žurnál (%d bloků): "
-#: misc/mke2fs.c:1486
+#: misc/mke2fs.c:1514
msgid ""
"\n"
"\twhile trying to create journal"
@@ -3389,11 +3309,13 @@ msgstr ""
"\n"
"\tpři pokusu vytvořit žurnál"
-#: misc/mke2fs.c:1495
+#: misc/mke2fs.c:1523
+#, c-format
msgid "Writing superblocks and filesystem accounting information: "
msgstr "Zapisuji superbloky a účtovací informace systému souborů: "
-#: misc/mke2fs.c:1500
+#: misc/mke2fs.c:1528
+#, c-format
msgid ""
"\n"
"Warning, had trouble writing out superblocks."
@@ -3401,7 +3323,8 @@ msgstr ""
"\n"
"Varování, měl jsem problémy při zápisu superbloků."
-#: misc/mke2fs.c:1503
+#: misc/mke2fs.c:1531
+#, c-format
msgid ""
"done\n"
"\n"
@@ -3409,7 +3332,8 @@ msgstr ""
"hotovo\n"
"\n"
-#: misc/mklost+found.c:48
+#: misc/mklost+found.c:49
+#, c-format
msgid "Usage: mklost+found\n"
msgstr "Použití: mklost+found\n"
@@ -3445,11 +3369,11 @@ msgstr "ioctl HDIO_GETGEO"
msgid "BLKGETSIZE ioctl"
msgstr "ioctl BLKGETSIZE"
-#: misc/tune2fs.c:74
+#: misc/tune2fs.c:77
msgid "Please run e2fsck on the filesystem.\n"
msgstr "Spusťte prosím na tomto systému souborů e2fsck.\n"
-#: misc/tune2fs.c:81
+#: misc/tune2fs.c:84
#, c-format
msgid ""
"Usage: %s [-c max-mounts-count] [-e errors-behavior] [-g group]\n"
@@ -3467,53 +3391,53 @@ msgstr ""
" [-M poslední-adresář-připojení]\t[-O [^]vlastnost[,...]]\n"
" [-T čas-poslední-kontroly] [-U UUID] zařízení\n"
-#: misc/tune2fs.c:138
+#: misc/tune2fs.c:141
msgid "while trying to open external journal"
msgstr "při pokusu otevřít externí žurnál"
-#: misc/tune2fs.c:142
+#: misc/tune2fs.c:145
#, c-format
msgid "%s is not a journal device.\n"
msgstr "%s není zařízení žurnálu.\n"
-#: misc/tune2fs.c:157
+#: misc/tune2fs.c:160
msgid "Journal superblock not found!\n"
msgstr "Superblok žurnálu nenalezen!\n"
-#: misc/tune2fs.c:169
+#: misc/tune2fs.c:172
msgid "Filesystem's UUID not found on journal device.\n"
msgstr "UUID systému souborů nenalezeno na zařízení žurnálu.\n"
-#: misc/tune2fs.c:190
+#: misc/tune2fs.c:193
msgid "Journal NOT removed\n"
msgstr "Žurnál NEODSTRANĚN\n"
-#: misc/tune2fs.c:196
+#: misc/tune2fs.c:199
msgid "Journal removed\n"
msgstr "Žurnál odstraněn\n"
-#: misc/tune2fs.c:228
+#: misc/tune2fs.c:231
msgid "while reading journal inode"
msgstr "při čtení inode žurnálu"
-#: misc/tune2fs.c:235
+#: misc/tune2fs.c:238
msgid "while reading bitmaps"
msgstr "při čtení bitmap"
-#: misc/tune2fs.c:242
+#: misc/tune2fs.c:245
msgid "while clearing journal inode"
msgstr "při mazání inode žurnálu"
-#: misc/tune2fs.c:253
+#: misc/tune2fs.c:256
msgid "while writing journal inode"
msgstr "při zápisu inode žurnálu"
-#: misc/tune2fs.c:268
+#: misc/tune2fs.c:271
#, c-format
msgid "Invalid mount option set: %s\n"
msgstr "Nastaven neplatný přepínač připojení: %s\n"
-#: misc/tune2fs.c:309
+#: misc/tune2fs.c:317
msgid ""
"The has_journal flag may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
@@ -3521,7 +3445,7 @@ msgstr ""
"Příznak has_journal může být vymazán jen když je systém souborů\n"
"odpojen nebo připojen jen pro čtení.\n"
-#: misc/tune2fs.c:317
+#: misc/tune2fs.c:325
msgid ""
"The needs_recovery flag is set. Please run e2fsck before clearing\n"
"the has_journal flag.\n"
@@ -3529,11 +3453,11 @@ msgstr ""
"Příznak needs_recovery je nastaven. Před vymazáním příznaku has_journal\n"
"prosím spusťte e2fsck.\n"
-#: misc/tune2fs.c:371
+#: misc/tune2fs.c:382
msgid "The filesystem already has a journal.\n"
msgstr "Systém souborů již žurnál má.\n"
-#: misc/tune2fs.c:388
+#: misc/tune2fs.c:399
#, c-format
msgid ""
"\n"
@@ -3542,21 +3466,21 @@ msgstr ""
"\n"
"\tpři pokusu otevřít žurnál na %s\n"
-#: misc/tune2fs.c:392
+#: misc/tune2fs.c:403
#, c-format
msgid "Creating journal on device %s: "
msgstr "Vytvářím žurnál na zařízení %s: "
-#: misc/tune2fs.c:400
+#: misc/tune2fs.c:411
#, c-format
msgid "while adding filesystem to journal on %s"
msgstr "při přidávání systému souborů do žurnálu na %s"
-#: misc/tune2fs.c:406
+#: misc/tune2fs.c:417
msgid "Creating journal inode: "
msgstr "Vytvářím inode žurnálu: "
-#: misc/tune2fs.c:415
+#: misc/tune2fs.c:426
msgid ""
"\n"
"\twhile trying to create journal file"
@@ -3564,95 +3488,95 @@ msgstr ""
"\n"
"\tpři pokusu vytvořit soubor žurnálu"
-#: misc/tune2fs.c:478
+#: misc/tune2fs.c:492
#, c-format
msgid "Couldn't parse date/time specifier: %s"
msgstr "Nemohu zpracovat určení data/času: %s"
-#: misc/tune2fs.c:500 misc/tune2fs.c:513
+#: misc/tune2fs.c:514 misc/tune2fs.c:527
#, c-format
msgid "bad mounts count - %s"
msgstr "špatný počet připojení - %s"
-#: misc/tune2fs.c:529
+#: misc/tune2fs.c:543
#, c-format
msgid "bad error behavior - %s"
msgstr "špatné chování při chybách - %s"
-#: misc/tune2fs.c:552
+#: misc/tune2fs.c:566
#, c-format
msgid "bad gid/group name - %s"
msgstr "špatné gid/jméno skupiny - %s"
-#: misc/tune2fs.c:585
+#: misc/tune2fs.c:599
#, c-format
msgid "bad interval - %s"
msgstr "Špatný interval - %s"
-#: misc/tune2fs.c:613
+#: misc/tune2fs.c:627
#, c-format
msgid "bad reserved block ratio - %s"
msgstr "špatný podíl rezervovaných bloků - %s"
-#: misc/tune2fs.c:628
+#: misc/tune2fs.c:642
msgid "-o may only be specified once"
msgstr "-o může být zadáno jen jednou"
-#: misc/tune2fs.c:638
+#: misc/tune2fs.c:652
msgid "-O may only be specified once"
msgstr "-O může být zadáno jen jednou"
-#: misc/tune2fs.c:648
+#: misc/tune2fs.c:662
#, c-format
msgid "bad reserved blocks count - %s"
msgstr "špatný počet rezervovaných bloků - %s"
-#: misc/tune2fs.c:677
+#: misc/tune2fs.c:691
#, c-format
msgid "bad uid/user name - %s"
msgstr "špatné uid/jméno uživatele - %s"
-#: misc/tune2fs.c:783
+#: misc/tune2fs.c:801
#, c-format
msgid "Setting maximal mount count to %d\n"
msgstr "Nastavuji maximální počet připojení na %d\n"
-#: misc/tune2fs.c:789
+#: misc/tune2fs.c:807
#, c-format
msgid "Setting current mount count to %d\n"
msgstr "Nastavuji aktuální počet připojení na %d\n"
-#: misc/tune2fs.c:794
+#: misc/tune2fs.c:812
#, c-format
msgid "Setting error behavior to %d\n"
msgstr "Nastavuji chování při chybách na %d\n"
-#: misc/tune2fs.c:799
+#: misc/tune2fs.c:817
#, c-format
msgid "Setting reserved blocks gid to %lu\n"
msgstr "Nastavuji gid rezervovaných bloků na %lu\n"
-#: misc/tune2fs.c:804
+#: misc/tune2fs.c:822
#, c-format
msgid "Setting interval between check %lu seconds\n"
msgstr "Nastavuji interval mezi kontrolami na %lu sekund\n"
-#: misc/tune2fs.c:810
+#: misc/tune2fs.c:828
#, c-format
msgid "Setting reserved blocks percentage to %lu (%u blocks)\n"
msgstr "Nastavuji procenta rezervovaných bloků na %lu (%u bloků)\n"
-#: misc/tune2fs.c:816
+#: misc/tune2fs.c:834
#, c-format
msgid "reserved blocks count is too big (%lu)"
msgstr "počet rezervovaných bloků je příliš velký (%lu)"
-#: misc/tune2fs.c:822
+#: misc/tune2fs.c:840
#, c-format
msgid "Setting reserved blocks count to %lu\n"
msgstr "Nastavuji počet rezervovaných bloků na %lu\n"
-#: misc/tune2fs.c:828
+#: misc/tune2fs.c:846
msgid ""
"\n"
"The filesystem already has sparse superblocks.\n"
@@ -3660,7 +3584,7 @@ msgstr ""
"\n"
"Systém souborů již má řídké superbloky.\n"
-#: misc/tune2fs.c:835
+#: misc/tune2fs.c:853
#, c-format
msgid ""
"\n"
@@ -3669,7 +3593,7 @@ msgstr ""
"\n"
"Příznak řídkých superbloků nastaven. %s"
-#: misc/tune2fs.c:842
+#: misc/tune2fs.c:860
msgid ""
"\n"
"The filesystem already has sparse superblocks disabled.\n"
@@ -3677,7 +3601,7 @@ msgstr ""
"\n"
"Systém souborů již má řídké superbloky zakázány.\n"
-#: misc/tune2fs.c:850
+#: misc/tune2fs.c:868
#, c-format
msgid ""
"\n"
@@ -3686,17 +3610,17 @@ msgstr ""
"\n"
"Příznak řídkých superbloků vymazán. %s"
-#: misc/tune2fs.c:857
+#: misc/tune2fs.c:875
#, c-format
msgid "Setting time filesystem last checked to %s\n"
msgstr "Nastavuji čas poslední kontroly systému souborů na %s\n"
-#: misc/tune2fs.c:863
+#: misc/tune2fs.c:881
#, c-format
msgid "Setting reserved blocks uid to %lu\n"
msgstr "Nastavuji uid rezervovaných bloků na %lu\n"
-#: misc/tune2fs.c:896
+#: misc/tune2fs.c:914
msgid "Invalid UUID format\n"
msgstr "Neplatný formát UUID\n"
@@ -3717,31 +3641,31 @@ msgstr ""
"\n"
"Zařízení zřejmě neexistuje; zadali jste je správně?\n"
-#: misc/util.c:101
+#: misc/util.c:107
#, c-format
msgid "%s is not a block special device.\n"
msgstr "%s není speciální blokové zařízení.\n"
-#: misc/util.c:130
+#: misc/util.c:136
#, c-format
msgid "%s is entire device, not just one partition!\n"
msgstr "%s je celé zařízení, ne jen jeden oddíl!\n"
-#: misc/util.c:154
+#: misc/util.c:160
msgid "mke2fs forced anyway. Hope /etc/mtab is incorrect.\n"
msgstr "mke2fs přesto vynucen. Doufám, že /etc/mtab je nesprávná.\n"
-#: misc/util.c:157
+#: misc/util.c:163
#, c-format
msgid "will not make a %s here!\n"
msgstr "nebudu tady vytvářet %s!\n"
-#: misc/util.c:171
+#: misc/util.c:177
msgid "Couldn't allocate memory to parse journal options!\n"
msgstr "Nemohu alokovat paměť pro zpracování přepínačů žurnálu!\n"
# FIXME: raid/journal
-#: misc/util.c:213
+#: misc/util.c:219
#, fuzzy
msgid ""
"\n"
@@ -3769,7 +3693,7 @@ msgstr ""
"\n"
"Velikost žurnálu musí být mezi 1024 a 102400 bloky systému souborů.\n"
-#: misc/util.c:240
+#: misc/util.c:246
msgid ""
"\n"
"Filesystem too small for a journal\n"
@@ -3777,7 +3701,7 @@ msgstr ""
"\n"
"Systém souborů příliš malý na žurnál\n"
-#: misc/util.c:247
+#: misc/util.c:253
#, c-format
msgid ""
"\n"
@@ -3788,7 +3712,7 @@ msgstr ""
"Požadovaná velikost žurnálu je %d bloků; musí být\n"
"mezi 1024 a 102400 bloky. Končím.\n"
-#: misc/util.c:255
+#: misc/util.c:261
msgid ""
"\n"
"Journal size too big for filesystem.\n"
@@ -3796,7 +3720,7 @@ msgstr ""
"\n"
"Velikost žurnálu příliš velká pro systém souborů.\n"
-#: misc/util.c:274
+#: misc/util.c:280
#, c-format
msgid ""
"This filesystem will be automatically checked every %d mounts or\n"
@@ -3881,7 +3805,7 @@ msgstr "resize2fs %s (%s)\n"
msgid "bad filesystem size - %s"
msgstr "špatná velikost systému souborů - %s"
-#: resize/main.c:296
+#: resize/main.c:300
#, fuzzy, c-format
msgid ""
"The containing partition (or device) is only %d (%dk) blocks.\n"
@@ -3892,7 +3816,7 @@ msgstr ""
"Požadovali jste novou velikost %d bloků.\n"
"\n"
-#: resize/main.c:303
+#: resize/main.c:307
#, c-format
msgid ""
"The filesystem is already %d blocks long. Nothing to do!\n"
@@ -3901,7 +3825,7 @@ msgstr ""
"Systém již je dlouhý %d bloků. Není co dělat!\n"
"\n"
-#: resize/main.c:310
+#: resize/main.c:314
#, c-format
msgid ""
"Please run 'e2fsck -f %s' first.\n"
@@ -3910,12 +3834,12 @@ msgstr ""
"Spusťte prosím nejdříve 'e2fsck -f %s'.\n"
"\n"
-#: resize/main.c:320
+#: resize/main.c:324
#, c-format
msgid "while trying to resize %s"
msgstr "při pokusu změnit velikost %s"
-#: resize/main.c:325
+#: resize/main.c:329
#, c-format
msgid ""
"The filesystem on %s is now %d blocks long.\n"
@@ -3924,61 +3848,139 @@ msgstr ""
"Systém souborů na %s je nyní %d bloků dlouhý.\n"
"\n"
-#: resize/resize2fs.c:109
+#: resize/resize2fs.c:110
#, c-format
msgid "Number of free blocks: %d/%d, Needed: %d\n"
msgstr "Počet volných bloků: %d/%d, Potřeba: %d\n"
-#: resize/resize2fs.c:458
+#: resize/resize2fs.c:459
msgid "meta-data blocks"
msgstr "bloky meta-dat"
-#: resize/resize2fs.c:581
+#: resize/resize2fs.c:582
msgid "reserved blocks"
msgstr "rezervované bloky"
-#: resize/resize2fs.c:586
+#: resize/resize2fs.c:587
msgid "blocks to be moved"
msgstr "bloky pro přesun"
-#: resize/resize2fs.c:816
+#: resize/resize2fs.c:817
+#, c-format
msgid "Going into desperation mode for block allocations\n"
msgstr "Přecházím do zoufalého režimu alokace bloků\n"
-#: resize/resize2fs.c:920
+#: resize/resize2fs.c:921
#, c-format
msgid "Moving %d blocks %u->%u\n"
msgstr "Přesouvám %d bloků %u->%u\n"
-#: resize/resize2fs.c:997
+#: resize/resize2fs.c:998
#, c-format
msgid "ino=%u, blockcnt=%lld, %u->%u\n"
msgstr "ino=%u, početbloků=%lld, %u->%u\n"
-#: resize/resize2fs.c:1165
+#: resize/resize2fs.c:1166
#, c-format
msgid "Inode moved %u->%u\n"
msgstr "Inode přesunuta %u->%u\n"
-#: resize/resize2fs.c:1233
+#: resize/resize2fs.c:1234
#, c-format
msgid "Inode translate (dir=%u, name=%.*s, %u->%u)\n"
msgstr "Překlad inode (adr=%u, název=%.*s, %u->%u)\n"
-#: resize/resize2fs.c:1360
+#: resize/resize2fs.c:1361
#, c-format
msgid "Itable move group %d block %u->%u (diff %d)\n"
msgstr "Přesun itable skupina %d blok %u->%u (rozdíl %d)\n"
-#: resize/resize2fs.c:1386
+#: resize/resize2fs.c:1387
#, c-format
msgid "%d blocks of zeros...\n"
msgstr "%d blocků nul...\n"
-#: resize/resize2fs.c:1421
+#: resize/resize2fs.c:1422
+#, c-format
msgid "Inode table move finished.\n"
msgstr "Přesun tabulky inode dokončen.\n"
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "%8d inode used (%d%%)\n"
+#~ msgid_plural ""
+#~ "\n"
+#~ "%8d inodes used (%d%%)\n"
+#~ msgstr[0] ""
+#~ "\n"
+#~ "%8d použitých inode (%d%%)\n"
+#~ msgstr[1] ""
+#~ "\n"
+#~ "%8d použitých inode (%d%%)\n"
+
+#, fuzzy
+#~ msgid "%8d non-contiguous inode (%0d.%d%%)\n"
+#~ msgid_plural "%8d non-contiguous inodes (%0d.%d%%)\n"
+#~ msgstr[0] "%8d nesouvislých inode (%0d.%d%%)\n"
+#~ msgstr[1] "%8d nesouvislých inode (%0d.%d%%)\n"
+
+#, fuzzy
+#~ msgid "%8d block used (%d%%)\n"
+#~ msgid_plural "%8d blocks used (%d%%)\n"
+#~ msgstr[0] ""
+#~ "\n"
+#~ "%8d použitých inode (%d%%)\n"
+#~ msgstr[1] ""
+#~ "\n"
+#~ "%8d použitých inode (%d%%)\n"
+
+#, fuzzy
+#~ msgid "%8d bad block\n"
+#~ msgid_plural "%8d bad blocks\n"
+#~ msgstr[0] "inode v mapě špatných bloků"
+#~ msgstr[1] "inode v mapě špatných bloků"
+
+#, fuzzy
+#~ msgid "%8d large file\n"
+#~ msgid_plural "%8d large files\n"
+#~ msgstr[0] "%8d velkých souborů\n"
+#~ msgstr[1] "%8d velkých souborů\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "%8d regular file\n"
+#~ msgid_plural ""
+#~ "\n"
+#~ "%8d regular files\n"
+#~ msgstr[0] "%8d velkých souborů\n"
+#~ msgstr[1] "%8d velkých souborů\n"
+
+#, fuzzy
+#~ msgid "%8d directory\n"
+#~ msgid_plural "%8d directories\n"
+#~ msgstr[0] "dadresář"
+#~ msgstr[1] "dadresář"
+
+#, fuzzy
+#~ msgid "%8d character device file\n"
+#~ msgid_plural "%8d character device files\n"
+#~ msgstr[0] "%8d velkých souborů\n"
+#~ msgstr[1] "%8d velkých souborů\n"
+
+#, fuzzy
+#~ msgid "%8d block device file\n"
+#~ msgid_plural "%8d block device files\n"
+#~ msgstr[0] "%8d velkých souborů\n"
+#~ msgstr[1] "%8d velkých souborů\n"
+
+#, fuzzy
+#~ msgid "%8d file\n"
+#~ msgid_plural "%8d files\n"
+#~ msgstr[0] "%8d velkých souborů\n"
+#~ msgstr[1] "%8d velkých souborů\n"
+
#~ msgid ""
#~ "\n"
#~ "This inconsistency can not be fixed with e2fsck; to fix it, use\n"
diff --git a/po/de.gmo b/po/de.gmo
new file mode 100644
index 00000000..d6f48e65
--- /dev/null
+++ b/po/de.gmo
Binary files differ
diff --git a/po/de.po b/po/de.po
index 2cb18918..280478e6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: e2fsprogs-1.28\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-24 14:17-0500\n"
+"Report-Msgid-Bugs-To: tytso@alum.mit.edu\n"
+"POT-Creation-Date: 2004-11-30 18:46-0500\n"
"PO-Revision-Date: 2003-08-24 23:00MEST\n"
"Last-Translator: Marc Langer <marc@marclanger.de>\n"
"Language-Team: deutsch <gnome-de@gnome.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: e2fsck/badblocks.c:22 misc/mke2fs.c:194
+#: e2fsck/badblocks.c:22 misc/mke2fs.c:223
#, c-format
msgid "Bad block %u out of range; ignored.\n"
msgstr "Bad block %u auerhalb des gltigen Bereichs; ignoriert.\n"
@@ -30,10 +30,10 @@ msgid "while reading the bad blocks inode"
msgstr "whrend des Lesens des 'Bad Block'-Inodes"
#: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
-#: e2fsck/unix.c:881 e2fsck/unix.c:913 misc/badblocks.c:997
+#: e2fsck/unix.c:915 e2fsck/unix.c:947 misc/badblocks.c:997
#: misc/badblocks.c:1005 misc/badblocks.c:1019 misc/badblocks.c:1031
-#: misc/dumpe2fs.c:332 misc/e2image.c:486 misc/e2image.c:502 misc/mke2fs.c:210
-#: misc/tune2fs.c:757 resize/main.c:228
+#: misc/dumpe2fs.c:332 misc/e2image.c:475 misc/e2image.c:564
+#: misc/e2image.c:580 misc/mke2fs.c:239 misc/tune2fs.c:775 resize/main.c:232
#, c-format
msgid "while trying to open %s"
msgstr "beim Versuch, %s zu ffnen"
@@ -43,7 +43,7 @@ msgstr "beim Versuch, %s zu ffnen"
msgid "while trying popen '%s'"
msgstr "beim Versuch, '%s' mittels 'popen' zu ffnen"
-#: e2fsck/badblocks.c:93 misc/mke2fs.c:217
+#: e2fsck/badblocks.c:93 misc/mke2fs.c:246
msgid "while reading in list of bad blocks from file"
msgstr "beim Lesen der 'Bad Block'-Liste aus der Datei"
@@ -105,6 +105,7 @@ msgid "%s: %s filename nblocks blocksize\n"
msgstr "%s: %s Dateiname nblocks Blockgre\n"
#: e2fsck/extend.c:43
+#, c-format
msgid "Illegal number of blocks!\n"
msgstr "Blockanzahl nicht zulssig!\n"
@@ -119,6 +120,7 @@ msgid "Usage: %s disk\n"
msgstr "Verwendung: %s Laufwerk\n"
#: e2fsck/flushb.c:63
+#, c-format
msgid "BLKFLSBUF ioctl not supported! Can't flush buffers.\n"
msgstr "BLKFLSBUF ioctl nicht untersttzt! Kann Puffer nicht leeren.\n"
@@ -127,12 +129,12 @@ msgstr "BLKFLSBUF ioctl nicht untersttzt! Kann Puffer nicht leeren.\n"
msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n"
msgstr "Verwendung: %s [-F] [-I inode_buffer_blocks] Gert\n"
-#: e2fsck/iscan.c:83 e2fsck/unix.c:701 resize/main.c:205
+#: e2fsck/iscan.c:83 e2fsck/unix.c:729 resize/main.c:209
#, c-format
msgid "while opening %s for flushing"
msgstr "beim ffnen von %s fr die Puffer-Leerung."
-#: e2fsck/iscan.c:88 e2fsck/unix.c:707 resize/main.c:212
+#: e2fsck/iscan.c:88 e2fsck/unix.c:735 resize/main.c:216
#, c-format
msgid "while trying to flush %s"
msgstr "whrend des Rckschreibeversuches auf %s."
@@ -150,31 +152,31 @@ msgstr "beim Laden des nchsten Inodes"
msgid "%d inodes scanned.\n"
msgstr "%d Inodes gescannt.\n"
-#: e2fsck/journal.c:449
+#: e2fsck/journal.c:463
msgid "reading journal superblock\n"
msgstr "Lese Journal-Superblock\n"
-#: e2fsck/journal.c:506
+#: e2fsck/journal.c:520
#, c-format
msgid "%s: no valid journal superblock found\n"
msgstr "%s: keinen gltigen Journal-Superblock gefunden\n"
-#: e2fsck/journal.c:515
+#: e2fsck/journal.c:529
#, c-format
msgid "%s: journal too short\n"
msgstr "%s: Das Journal ist zu kurz.\n"
-#: e2fsck/journal.c:787
+#: e2fsck/journal.c:802
#, c-format
msgid "%s: recovering journal\n"
msgstr "%s: stelle das Journal wieder her\n"
-#: e2fsck/journal.c:789
+#: e2fsck/journal.c:804
#, c-format
msgid "%s: won't do journal recovery while read-only\n"
msgstr "%s: Das Journal ist nur lesbar - Keine Wiederherstellung\n"
-#: e2fsck/journal.c:810
+#: e2fsck/journal.c:825
#, c-format
msgid "while trying to re-open %s"
msgstr "beim Versuch, %s erneut zu ffnen"
@@ -331,77 +333,77 @@ msgstr "<Der reservierte Inode 10>"
msgid "multiply claimed inode map"
msgstr "mehrfach beanspruchte Inode-Liste"
-#: e2fsck/pass1b.c:551 e2fsck/pass1b.c:688
+#: e2fsck/pass1b.c:554 e2fsck/pass1b.c:691
#, c-format
msgid "internal error; can't find dup_blk for %d\n"
msgstr "interner Fehler; dup_blk fr %d nicht gefunden\n"
-#: e2fsck/pass1b.c:731
+#: e2fsck/pass1b.c:734
msgid "returned from clone_file_block"
msgstr "zurckgegeben von clone_file_block"
-#: e2fsck/pass1.c:297
+#: e2fsck/pass1.c:298
msgid "in-use inode map"
msgstr "'in-use inode'-Liste"
-#: e2fsck/pass1.c:306
+#: e2fsck/pass1.c:307
msgid "directory inode map"
msgstr "'directory inode'-Liste"
-#: e2fsck/pass1.c:314
+#: e2fsck/pass1.c:315
msgid "regular file inode map"
msgstr "'regular file inode'-Liste"
-#: e2fsck/pass1.c:321
+#: e2fsck/pass1.c:322
msgid "in-use block map"
msgstr "'in-use block'-Liste"
-#: e2fsck/pass1.c:368
+#: e2fsck/pass1.c:369
msgid "doing inode scan"
msgstr "Inode-Scan"
-#: e2fsck/pass1.c:751
+#: e2fsck/pass1.c:752
msgid "Pass 1"
msgstr "Durchgang 1"
-#: e2fsck/pass1.c:810
+#: e2fsck/pass1.c:811
#, c-format
msgid "reading indirect blocks of inode %u"
msgstr "lese indirekte Blcke von Inode %u"
-#: e2fsck/pass1.c:852
+#: e2fsck/pass1.c:853
msgid "bad inode map"
msgstr "fehlerhafte Inode-Liste"
-#: e2fsck/pass1.c:874
+#: e2fsck/pass1.c:875
msgid "inode in bad block map"
msgstr "Inode in 'Bad Blocks'-Liste"
-#: e2fsck/pass1.c:894
+#: e2fsck/pass1.c:895
msgid "imagic inode map"
msgstr "i'magic inode'-Liste"
-#: e2fsck/pass1.c:921
+#: e2fsck/pass1.c:922
msgid "multiply claimed block map"
msgstr "multiply claimed block map"
-#: e2fsck/pass1.c:1020
+#: e2fsck/pass1.c:1021
msgid "ext attr block map"
msgstr "ext attr block map"
-#: e2fsck/pass1.c:1782
+#: e2fsck/pass1.c:1783
msgid "block bitmap"
msgstr "block bitmap"
-#: e2fsck/pass1.c:1786
+#: e2fsck/pass1.c:1787
msgid "inode bitmap"
msgstr "inode bitmap"
-#: e2fsck/pass1.c:1790
+#: e2fsck/pass1.c:1791
msgid "inode table"
msgstr "Inode-Tabelle"
-#: e2fsck/pass2.c:293
+#: e2fsck/pass2.c:294
msgid "Pass 2"
msgstr "Durchgang 2"
@@ -1702,7 +1704,7 @@ msgstr "Interner Fehler: fudging end of bitmap (%N)\n"
msgid "Unhandled error code (0x%x)!\n"
msgstr "Unbenutzter Fehlercode (0x%x)!\n"
-#: e2fsck/problem.c:1594
+#: e2fsck/problem.c:1595
msgid "IGNORED"
msgstr "IGNORIERT"
@@ -1765,6 +1767,7 @@ msgid "while writing inode table (group %d)"
msgstr "beim Schreiben der Inode-Tabelle (Gruppe %d)"
#: e2fsck/swapfs.c:222
+#, c-format
msgid "Pass 0: Doing byte-swap of filesystem\n"
msgstr "Durchgang 0: Byte-Swap des Dateisystems\n"
@@ -1781,7 +1784,7 @@ msgstr ""
msgid "Byte swap"
msgstr "Byte Swap"
-#: e2fsck/unix.c:67
+#: e2fsck/unix.c:74
#, c-format
msgid ""
"Usage: %s [-panyrcdfvstDFSV] [-b superblock] [-B blocksize]\n"
@@ -1794,7 +1797,8 @@ msgstr ""
"\t\t[-l|-L bad_blocks_file] [-C fd] [-j ext-journal]\n"
"\t\t[-E erweiterte_Optionen] Gert\n"
-#: e2fsck/unix.c:73
+#: e2fsck/unix.c:80
+#, c-format
msgid ""
"\n"
"Emergency help:\n"
@@ -1813,7 +1817,8 @@ msgstr ""
" -c suche nach defekten Blcken\n"
" -f erzwinge die berprfung auch wenn alles i.O. erscheint\n"
-#: e2fsck/unix.c:79
+#: e2fsck/unix.c:86
+#, c-format
msgid ""
" -v Be verbose\n"
" -b superblock Use alternative superblock\n"
@@ -1829,154 +1834,33 @@ msgstr ""
" -l bad_blocks_file zur Liste der defekten Blcke hinzufgen\n"
" -L bad_blocks_file Liste der defekten Blcke definieren\n"
-#: e2fsck/unix.c:113
+#: e2fsck/unix.c:120
#, c-format
msgid "%s: %d/%d files (%0d.%d%% non-contiguous), %d/%d blocks\n"
msgstr "%s: %d/%d Dateien (%0d.%d%% nicht zusammenhngend), %d/%d Blcke\n"
-#: e2fsck/unix.c:119
-#, c-format
-msgid ""
-"\n"
-"%8d inode used (%d%%)\n"
-msgid_plural ""
-"\n"
-"%8d inodes used (%d%%)\n"
-msgstr[0] ""
-"\n"
-"%8d Inode benutzt (%d%%)\n"
-msgstr[1] ""
-"\n"
-"%8d Inodes benutzt (%d%%)\n"
-
-#: e2fsck/unix.c:121
-#, c-format
-msgid "%8d non-contiguous inode (%0d.%d%%)\n"
-msgid_plural "%8d non-contiguous inodes (%0d.%d%%)\n"
-msgstr[0] "%8d nicht zusammenhngender Inode (%0d.%d%%)\n"
-msgstr[1] "%8d nicht zusammenhngende Inodes (%0d.%d%%)\n"
-
-#: e2fsck/unix.c:125
+#: e2fsck/unix.c:132
#, c-format
msgid " # of inodes with ind/dind/tind blocks: %d/%d/%d\n"
msgstr " # von Inodes mit ind/dind/tind Blcken: %d/%d/%d\n"
-#: e2fsck/unix.c:127
-#, c-format
-msgid "%8d block used (%d%%)\n"
-msgid_plural "%8d blocks used (%d%%)\n"
-msgstr[0] "%8d Block benutzt (%d%%)\n"
-msgstr[1] "%8d Blcke benutzt (%d%%)\n"
-
-#: e2fsck/unix.c:130
-#, c-format
-msgid "%8d bad block\n"
-msgid_plural "%8d bad blocks\n"
-msgstr[0] "%8d defekter Block\n"
-msgstr[1] "%8d defekte Blcke\n"
-
-#: e2fsck/unix.c:132
-#, c-format
-msgid "%8d large file\n"
-msgid_plural "%8d large files\n"
-msgstr[0] "%8d groe Datei\n"
-msgstr[1] "%8d groe Dateien\n"
-
-#: e2fsck/unix.c:134
-#, c-format
-msgid ""
-"\n"
-"%8d regular file\n"
-msgid_plural ""
-"\n"
-"%8d regular files\n"
-msgstr[0] ""
-"\n"
-"%8d gewhnliche Datei\n"
-msgstr[1] ""
-"\n"
-"%8d gewhnliche Dateien\n"
-
-#: e2fsck/unix.c:136
-#, c-format
-msgid "%8d directory\n"
-msgid_plural "%8d directories\n"
-msgstr[0] "%8d Verzeichnis\n"
-msgstr[1] "%8d Verzeichnisse\n"
-
-#: e2fsck/unix.c:138
-#, c-format
-msgid "%8d character device file\n"
-msgid_plural "%8d character device files\n"
-msgstr[0] "%8d character device-Datei\n"
-msgstr[1] "%8d character device-Dateien\n"
-
-#: e2fsck/unix.c:141
-#, c-format
-msgid "%8d block device file\n"
-msgid_plural "%8d block device files\n"
-msgstr[0] "%8d block device-Datei\n"
-msgstr[1] "%8d block device-Dateien\n"
-
-#: e2fsck/unix.c:143
-#, c-format
-msgid "%8d fifo\n"
-msgid_plural "%8d fifos\n"
-msgstr[0] "%8d FIFO\n"
-msgstr[1] "%8d FIFOs\n"
-
-#: e2fsck/unix.c:145
-#, c-format
-msgid "%8d link\n"
-msgid_plural "%8d links\n"
-msgstr[0] "%8d Link\n"
-msgstr[1] "%8d Links\n"
-
-#: e2fsck/unix.c:148
-#, c-format
-msgid "%8d symbolic link"
-msgid_plural "%8d symbolic links"
-msgstr[0] "%8d symbolischer Link"
-msgstr[1] "%8d symbolische Links"
-
-#: e2fsck/unix.c:150
-#, c-format
-msgid " (%d fast symbolic link)\n"
-msgid_plural " (%d fast symbolic links)\n"
-msgstr[0] " (%d schneller symbolischer Link)\n"
-msgstr[1] " (%d schnelle symbolische Links)\n"
-
-#: e2fsck/unix.c:152
-#, c-format
-msgid "%8d socket\n"
-msgid_plural "%8d sockets\n"
-msgstr[0] "%8d Socket\n"
-msgstr[1] "%8d Sockets\n"
-
-#: e2fsck/unix.c:155
-#, c-format
-msgid "%8d file\n"
-msgid_plural "%8d files\n"
-msgstr[0] "%8d Datei\n"
-msgstr[1] "%8d Dateien\n"
-
-#: e2fsck/unix.c:169 misc/badblocks.c:781 misc/tune2fs.c:773 misc/util.c:145
+#: e2fsck/unix.c:176 misc/badblocks.c:781 misc/tune2fs.c:791 misc/util.c:151
#: resize/main.c:97
#, c-format
msgid "while determining whether %s is mounted."
msgstr "bei der Prfung, ob %s eingehngt ist."
-#: e2fsck/unix.c:184
+#: e2fsck/unix.c:191
#, c-format
msgid "Warning! %s is mounted.\n"
msgstr "Warnung! %s ist eingehngt.\n"
-#: e2fsck/unix.c:188
+#: e2fsck/unix.c:195
#, c-format
msgid "%s is mounted. "
msgstr "%s ist eingehngt. "
-#: e2fsck/unix.c:190
+#: e2fsck/unix.c:197
msgid ""
"Cannot continue, aborting.\n"
"\n"
@@ -1984,7 +1868,8 @@ msgstr ""
"Fortsetzung nicht mglich, breche ab.\n"
"\n"
-#: e2fsck/unix.c:191
+#: e2fsck/unix.c:198
+#, c-format
msgid ""
"\n"
"\n"
@@ -1998,60 +1883,63 @@ msgstr ""
"Dateisystem kann das Dateisystem STARK BESCHDIGEN.\n"
"\n"
-#: e2fsck/unix.c:194
+#: e2fsck/unix.c:201
msgid "Do you really want to continue"
msgstr "Wirklich fortfahren"
-#: e2fsck/unix.c:196
+#: e2fsck/unix.c:203
+#, c-format
msgid "check aborted.\n"
msgstr "Prfung abgebrochen.\n"
-#: e2fsck/unix.c:245
+#: e2fsck/unix.c:264
msgid " contains a file system with errors"
msgstr " enthlt ein fehlerhaftes Dateisystem"
-#: e2fsck/unix.c:247
+#: e2fsck/unix.c:266
msgid " was not cleanly unmounted"
msgstr " wurde nicht ordnungsgem ausgehngt"
-#: e2fsck/unix.c:251
+#: e2fsck/unix.c:270
#, c-format
msgid " has been mounted %u times without being checked"
msgstr " wurde %u mal ohne berprfung eingehngt"
-#: e2fsck/unix.c:259
+#: e2fsck/unix.c:278
#, c-format
msgid " has gone %u days without being checked"
msgstr " wurde %u Tage ohne berprfung genutzt"
-#: e2fsck/unix.c:268
+#: e2fsck/unix.c:287
msgid ", check forced.\n"
msgstr ", Prfung erzwungen.\n"
-#: e2fsck/unix.c:271
+#: e2fsck/unix.c:290
#, c-format
msgid "%s: clean, %d/%d files, %d/%d blocks"
msgstr "%s: i.O., %d/%d Dateien, %d/%d Blcke"
-#: e2fsck/unix.c:286
+#: e2fsck/unix.c:306
msgid " (check after next mount)"
msgstr " (Prfung nach nchstem Einhngen)"
-#: e2fsck/unix.c:288
+#: e2fsck/unix.c:308
#, c-format
msgid " (check in %ld mounts)"
msgstr " (Prfung nach %ld Einhngevorgngen)"
-#: e2fsck/unix.c:430
+#: e2fsck/unix.c:450
#, c-format
msgid "ERROR: Couldn't open /dev/null (%s)\n"
msgstr "Fehler: Kann /dev/null (%s) nicht ffnen\n"
-#: e2fsck/unix.c:501
+#: e2fsck/unix.c:521
+#, c-format
msgid "Invalid EA version.\n"
msgstr "Invalid EA version.\n"
-#: e2fsck/unix.c:510
+#: e2fsck/unix.c:532
+#, c-format
msgid ""
"Extended options are separated by commas, and may take an argument which\n"
"is set off by an equals ('=') sign. Valid raid options are:\n"
@@ -2064,73 +1952,79 @@ msgstr ""
"\tea_ver=<ea_version (1 or 2)\n"
"\n"
-#: e2fsck/unix.c:568
+#: e2fsck/unix.c:590
#, c-format
msgid "Error validating file descriptor %d: %s\n"
msgstr "Fehler bei berprfung des Datei-Deskriptors %d: %s\n"
-#: e2fsck/unix.c:572
+#: e2fsck/unix.c:594
msgid "Invalid completion information file descriptor"
msgstr "Ungltiger 'completion information'-Datei-Deskriptor"
-#: e2fsck/unix.c:587
+#: e2fsck/unix.c:609
msgid "Only one the options -p/-a, -n or -y may be specified."
msgstr "Nur eine der Optionen -p/-a, -n oder -y darf angegeben werden."
-#: e2fsck/unix.c:608
+#: e2fsck/unix.c:630
+#, c-format
msgid "The -t option is not supported on this version of e2fsck.\n"
msgstr "Die -t Option wird von dieser e2fsck-Version nicht untersttzt.\n"
-#: e2fsck/unix.c:673
+#: e2fsck/unix.c:695
+#, c-format
msgid "Byte-swapping filesystems not compiled in this version of e2fsck\n"
msgstr ""
"Das Byte-Swapping wurde in diese Version von e2fsck nicht einkompiliert.\n"
-#: e2fsck/unix.c:690 misc/tune2fs.c:444 misc/tune2fs.c:699 misc/tune2fs.c:716
+#: e2fsck/unix.c:718 misc/tune2fs.c:458 misc/tune2fs.c:716 misc/tune2fs.c:733
#, c-format
msgid "Unable to resolve '%s'"
msgstr "Nicht mglich %s aufzulsen"
-#: e2fsck/unix.c:716
+#: e2fsck/unix.c:744
+#, c-format
msgid "Incompatible options not allowed when byte-swapping.\n"
msgstr "Inkompatible Optionen sind beim Byte-Swapping nicht erlaubt.\n"
-#: e2fsck/unix.c:723
+#: e2fsck/unix.c:751
+#, c-format
msgid "The -c and the -l/-L options may not be both used at the same time.\n"
msgstr ""
"Die -c und -l/-L Optionen drfen nicht gleichzeitig verwendet werden.\n"
-#: e2fsck/unix.c:801
+#: e2fsck/unix.c:829
+#, c-format
msgid "Error: ext2fs library version out of date!\n"
msgstr "Fehler: ext2fs-Bibliotheks-Version ist zu alt!\n"
-#: e2fsck/unix.c:809
+#: e2fsck/unix.c:837
msgid "while trying to initialize program"
msgstr "bei der Programminitialisierung"
-#: e2fsck/unix.c:823
+#: e2fsck/unix.c:851
#, c-format
msgid "\tUsing %s, %s\n"
msgstr "\tBenutze %s, %s\n"
-#: e2fsck/unix.c:835
+#: e2fsck/unix.c:863
msgid "need terminal for interactive repairs"
msgstr "Bentige ein Terminal fr interaktive Reparaturen"
-#: e2fsck/unix.c:871
+#: e2fsck/unix.c:905
#, c-format
msgid "%s trying backup blocks...\n"
msgstr "%s versuche Backup-Blcke...\n"
-#: e2fsck/unix.c:872
+#: e2fsck/unix.c:906
msgid "Couldn't find ext2 superblock,"
msgstr "Konnte den ext2-Superblock nicht finden,"
-#: e2fsck/unix.c:873
+#: e2fsck/unix.c:907
msgid "Group descriptors look bad..."
msgstr "Gruppen-Deskriptoren scheinen defekt zu sein..."
-#: e2fsck/unix.c:884
+#: e2fsck/unix.c:918
+#, c-format
msgid ""
"The filesystem revision is apparently too high for this version of e2fsck.\n"
"(Or the filesystem superblock is corrupt)\n"
@@ -2140,21 +2034,24 @@ msgstr ""
"von e2fsck (oder der Dateisystem-Superblock ist defekt).\n"
"\n"
-#: e2fsck/unix.c:890
+#: e2fsck/unix.c:924
+#, c-format
msgid "Could this be a zero-length partition?\n"
msgstr "Knnte es eine Partion der Lnge Null sein?\n"
-#: e2fsck/unix.c:892
+#: e2fsck/unix.c:926
#, c-format
msgid "You must have %s access to the filesystem or be root\n"
msgstr "Sie bentigen %s- oder root-Rechte fr das Dateisystem.\n"
-#: e2fsck/unix.c:897
+#: e2fsck/unix.c:931
+#, c-format
msgid "Possibly non-existent or swap device?\n"
msgstr ""
"Mglicherweise ist die Partition nicht vorhanden oder eine Swap-Partition?\n"
-#: e2fsck/unix.c:900
+#: e2fsck/unix.c:934
+#, c-format
msgid ""
"Disk write-protected; use the -n option to do a read-only\n"
"check of the device.\n"
@@ -2162,16 +2059,17 @@ msgstr ""
"Laufwerk ist schreibgeschtzt, nutzen Sie die -n Option\n"
"um es im Nur-Lesen-Modus zu prfen.\n"
-#: e2fsck/unix.c:916
+#: e2fsck/unix.c:950
msgid "Get a newer version of e2fsck!"
msgstr "Neuere Version von e2fsck bentigt!"
-#: e2fsck/unix.c:937
+#: e2fsck/unix.c:971
#, c-format
msgid "while checking ext3 journal for %s"
msgstr "whrend der Prfung des ext3-Journals fr %s"
-#: e2fsck/unix.c:948
+#: e2fsck/unix.c:982
+#, c-format
msgid ""
"Warning: skipping journal recovery because doing a read-only filesystem "
"check.\n"
@@ -2179,21 +2077,21 @@ msgstr ""
"Warnung: berspringe Journal-Wiederherstellung, da das Dateisystem im Nur-"
"Lesen-Modus ist.\n"
-#: e2fsck/unix.c:961
+#: e2fsck/unix.c:995
#, c-format
msgid "unable to set superblock flags on %s\n"
msgstr "Superblock-Flags konntan auf %s nicht gesetzt werden\n"
-#: e2fsck/unix.c:967
+#: e2fsck/unix.c:1001
#, c-format
msgid "while recovering ext3 journal of %s"
msgstr "bei der Wiederherstellung des ext3-Journals von %s"
-#: e2fsck/unix.c:996
+#: e2fsck/unix.c:1030
msgid "Warning: compression support is experimental.\n"
msgstr "Warnung: Die Kompressionsuntersttzung ist experimentell.\n"
-#: e2fsck/unix.c:1001
+#: e2fsck/unix.c:1035
#, c-format
msgid ""
"E2fsck not compiled with HTREE support,\n"
@@ -2202,37 +2100,39 @@ msgstr ""
"Die Untersttzung fr HTREE wurde in e2fsck nicht aktiviert,\n"
"\taber das Dateisystem %s besitzt HTREE Verzeichnisse.\n"
-#: e2fsck/unix.c:1044
+#: e2fsck/unix.c:1078
#, c-format
msgid "%s: Filesystem byte order already normalized.\n"
msgstr "%s: die Byte-Reihenfolge des Dateisystems wurde schon normalisiert.\n"
-#: e2fsck/unix.c:1064
+#: e2fsck/unix.c:1098
msgid "while reading bad blocks inode"
msgstr "beim Lesen des Bad-Block-Inodes"
-#: e2fsck/unix.c:1066
+#: e2fsck/unix.c:1100
+#, c-format
msgid "This doesn't bode well, but we'll try to go on...\n"
msgstr "Das verheit nichts gutes, aber wir versuchen es trotzdem ..\n"
-#: e2fsck/unix.c:1073
+#: e2fsck/unix.c:1107
+#, c-format
msgid "Restarting e2fsck from the beginning...\n"
msgstr "Beginne e2fsck neu ...\n"
-#: e2fsck/unix.c:1077
+#: e2fsck/unix.c:1111
msgid "while resetting context"
msgstr "beim Rcksetzen des Kontexts"
-#: e2fsck/unix.c:1084
+#: e2fsck/unix.c:1118
#, c-format
msgid "%s: e2fsck canceled.\n"
msgstr "%s: e2fsck abgebrochhen.\n"
-#: e2fsck/unix.c:1089
+#: e2fsck/unix.c:1123
msgid "aborted"
msgstr "abgebrochen"
-#: e2fsck/unix.c:1097
+#: e2fsck/unix.c:1131
#, c-format
msgid ""
"\n"
@@ -2241,12 +2141,12 @@ msgstr ""
"\n"
"%s: ***** DATEISYSTEM WURDE VERNDERT *****\n"
-#: e2fsck/unix.c:1100
+#: e2fsck/unix.c:1134
#, c-format
msgid "%s: ***** REBOOT LINUX *****\n"
msgstr "%s: ***** LINUX MUSS NEU GESTARTET WERDEN *****\n"
-#: e2fsck/unix.c:1106
+#: e2fsck/unix.c:1140
#, c-format
msgid ""
"\n"
@@ -2469,7 +2369,8 @@ msgstr ""
#: misc/badblocks.c:599
msgid "Checking for bad blocks (non-destructive read-write test)\n"
-msgstr "Suche nach defekten Blcken (zerstrungsfreier Lesen+Schreiben-Modus)\n"
+msgstr ""
+"Suche nach defekten Blcken (zerstrungsfreier Lesen+Schreiben-Modus)\n"
#: misc/badblocks.c:606
msgid ""
@@ -2484,7 +2385,7 @@ msgstr ""
msgid "during test data write, block %lu"
msgstr "beim Schreiben der Test-Daten; Block %lu"
-#: misc/badblocks.c:788 misc/util.c:152
+#: misc/badblocks.c:788 misc/util.c:158
#, c-format
msgid "%s is mounted; "
msgstr "%s ist eingehngt; "
@@ -2498,7 +2399,7 @@ msgstr ""
msgid "it's not safe to run badblocks!\n"
msgstr "es ist zu unsicher, Badblocks zu starten!\n"
-#: misc/badblocks.c:853 misc/mke2fs.c:898
+#: misc/badblocks.c:853 misc/mke2fs.c:926
#, c-format
msgid "bad block size - %s"
msgstr "bad block Gre - %s"
@@ -2532,7 +2433,7 @@ msgstr ""
msgid "while trying to determine device size"
msgstr "beim Versuch, die Gertegre festzustellen"
-#: misc/badblocks.c:972 misc/mke2fs.c:1071
+#: misc/badblocks.c:972 misc/mke2fs.c:1099
#, c-format
msgid "bad blocks count - %s"
msgstr "Bad Blocks Anzahl - %s"
@@ -2604,11 +2505,11 @@ msgstr "beim Setzen der Version in %s"
msgid "Couldn't allocate path variable in chattr_dir_proc"
msgstr "Konnte Pfad-Variable in chattr_dir_proc nicht reservieren"
-#: misc/chattr.c:287
+#: misc/chattr.c:291
msgid "= is incompatible with - and +\n"
msgstr "= ist inkompatibel mit - und +\n"
-#: misc/chattr.c:295
+#: misc/chattr.c:299
msgid "Must use '-v', =, - or +\n"
msgstr "Benutze '-v', =, - oder +\n"
@@ -2636,10 +2537,12 @@ msgid "Backup"
msgstr "Backup"
#: misc/dumpe2fs.c:130
+#, c-format
msgid ", Group descriptors at "
msgstr ", Gruppendeskriptoren in "
#: misc/dumpe2fs.c:135
+#, c-format
msgid " Group descriptor at "
msgstr ", Gruppendeskriptor in "
@@ -2685,7 +2588,7 @@ msgstr "beim Ausgeben der 'Bad Block'-Liste"
msgid "Bad blocks: %d"
msgstr "Bad Blocks: %d"
-#: misc/dumpe2fs.c:227 misc/tune2fs.c:150
+#: misc/dumpe2fs.c:227 misc/tune2fs.c:153
msgid "while reading journal superblock"
msgstr "beim Lesen des Journal-Superblocks"
@@ -2712,16 +2615,18 @@ msgstr ""
"Journal Start: %d\n"
"Journal Nutzeranzahl: %d\n"
-#: misc/dumpe2fs.c:307 misc/mke2fs.c:1085
+#: misc/dumpe2fs.c:307 misc/mke2fs.c:1113
#, c-format
msgid "\tUsing %s\n"
msgstr "\tBenutze %s\n"
-#: misc/dumpe2fs.c:334 misc/e2image.c:488 misc/tune2fs.c:760 resize/main.c:230
+#: misc/dumpe2fs.c:334 misc/e2image.c:566 misc/tune2fs.c:778 resize/main.c:234
+#, c-format
msgid "Couldn't find valid filesystem superblock.\n"
msgstr "Kann keinen gltigen Dateisystem-Superblock finden.\n"
#: misc/dumpe2fs.c:345
+#, c-format
msgid "Note: This is a byte-swapped filesystem\n"
msgstr "Anmerkung: Dieses ist ein Byte-Swapped Dateisystem.\n"
@@ -2735,8 +2640,8 @@ msgstr ""
"%s: %s: Fehler beim Lesen von Bitmaps: %s\n"
#: misc/e2image.c:50
-#, c-format
-msgid "Usage: %s [-r] device file\n"
+#, fuzzy, c-format
+msgid "Usage: %s [-r] device image_file\n"
msgstr "Verwendung: %s [-r] Gertedatei\n"
#: misc/e2image.c:61
@@ -2770,34 +2675,42 @@ msgid "e2label: cannot open %s\n"
msgstr "e2label: Kann %s nicht ffnen.\n"
#: misc/e2label.c:62
+#, c-format
msgid "e2label: cannot seek to superblock\n"
msgstr "e2label: cannot seek to superblock\n"
#: misc/e2label.c:67
+#, c-format
msgid "e2label: error reading superblock\n"
msgstr "e2label: Lesefehler im Superblock\n"
#: misc/e2label.c:71
+#, c-format
msgid "e2label: not an ext2 filesystem\n"
msgstr "e2label: Kein ext2 Dateisystem\n"
-#: misc/e2label.c:96 misc/tune2fs.c:867
+#: misc/e2label.c:96 misc/tune2fs.c:885
+#, c-format
msgid "Warning: label too long, truncating.\n"
msgstr "Warnung: Name zu lang, krze ihn.\n"
#: misc/e2label.c:99
+#, c-format
msgid "e2label: cannot seek to superblock again\n"
msgstr "e2label: cannot seek to superblock again\n"
#: misc/e2label.c:104
+#, c-format
msgid "e2label: error writing superblock\n"
msgstr "e2label: Fehler beim Schreiben des Superblocks\n"
-#: misc/e2label.c:116 misc/tune2fs.c:439
+#: misc/e2label.c:116 misc/tune2fs.c:450
+#, c-format
msgid "Usage: e2label device [newlabel]\n"
msgstr "Verwendung: e2label Gert [neuer_Name]\n"
#: misc/findsuper.c:126
+#, c-format
msgid "Usage: findsuper device [skipbytes [startkb]]\n"
msgstr "Verwendung: findsuper Gert [skipbytes [startkb]]\n"
@@ -2807,6 +2720,7 @@ msgid "skipbytes should be a number, not %s\n"
msgstr "skipbytes sollte eine Zahl sein, nicht %s\n"
#: misc/findsuper.c:137
+#, c-format
msgid "skipbytes must be a multiple of the sector size\n"
msgstr "skipbytes mssen ein vielfaches der Sektorgre sein\n"
@@ -2826,6 +2740,7 @@ msgid "starting at %Ld, with %d byte increments\n"
msgstr "starting at %Ld, with %d byte increments\n"
#: misc/findsuper.c:158
+#, c-format
msgid " thisoff block fs_blk_sz blksz grp last_mount\n"
msgstr " thisoff block fs_blk_sz blksz grp last_mount\n"
@@ -2947,7 +2862,7 @@ msgstr "Beim Lesen der Flags von %s"
msgid "While reading version on %s"
msgstr "Beim Lesen der Version von %s"
-#: misc/mke2fs.c:91
+#: misc/mke2fs.c:92
#, c-format
msgid ""
"Usage: %s [-c|-t|-l filename] [-b block-size] [-f fragment-size]\n"
@@ -2962,37 +2877,37 @@ msgstr ""
"\t[-L volume-label] [-M last-mounted-directory] [-O feature[,...]]\n"
"\t[-r fs-revision] [-R raid_opts] [-qvSV] Gert [Blockanzahl]\n"
-#: misc/mke2fs.c:235
+#: misc/mke2fs.c:264
#, c-format
msgid "Running command: %s\n"
msgstr "Fhre aus: %s\n"
-#: misc/mke2fs.c:239
+#: misc/mke2fs.c:268
#, c-format
msgid "while trying run '%s'"
msgstr "whrend des Ausfhrungsversuchs von '%s'"
-#: misc/mke2fs.c:246
+#: misc/mke2fs.c:275
msgid "while processing list of bad blocks from program"
msgstr "beim Auswerten der 'Bad Block'-Liste vom Programm"
-#: misc/mke2fs.c:273
+#: misc/mke2fs.c:302
#, c-format
msgid "Block %d in primary superblock/group descriptor area bad.\n"
msgstr "Block %d im primren Superblock/Gruppendeskriptorbereich defekt.\n"
-#: misc/mke2fs.c:275
+#: misc/mke2fs.c:304
#, c-format
msgid "Blocks %d through %d must be good in order to build a filesystem.\n"
msgstr ""
"Die Blcke %d bis einschlielich %d mssen i.O. sein um ein Dateisystem zu "
"erstellen.\n"
-#: misc/mke2fs.c:278
+#: misc/mke2fs.c:307
msgid "Aborting....\n"
msgstr "Breche ab...\n"
-#: misc/mke2fs.c:298
+#: misc/mke2fs.c:327
#, c-format
msgid ""
"Warning: the backup superblock/group descriptors at block %d contain\n"
@@ -3004,23 +2919,23 @@ msgstr ""
"\tdefekte Blcke.\n"
"\n"
-#: misc/mke2fs.c:316
+#: misc/mke2fs.c:345
msgid "while marking bad blocks as used"
msgstr "beim Markieren von defekten Blcken als 'belegt'"
-#: misc/mke2fs.c:374
+#: misc/mke2fs.c:403
msgid "done \n"
msgstr "erledigt \n"
-#: misc/mke2fs.c:409
+#: misc/mke2fs.c:438
msgid "while allocating zeroizing buffer"
msgstr "while allocating zeroizing buffer"
-#: misc/mke2fs.c:450
+#: misc/mke2fs.c:479
msgid "Writing inode tables: "
msgstr "Schreibe Inode-Tabellen: "
-#: misc/mke2fs.c:461
+#: misc/mke2fs.c:490
#, c-format
msgid ""
"\n"
@@ -3029,67 +2944,67 @@ msgstr ""
"\n"
"Konnte %d Blcke nicht in Inoden-Tabelle schreiben, beginnend bei %d: %s\n"
-#: misc/mke2fs.c:484
+#: misc/mke2fs.c:513
msgid "while creating root dir"
msgstr "beim Erstellen des Wurzelverzeichnisses"
-#: misc/mke2fs.c:491
+#: misc/mke2fs.c:520
msgid "while reading root inode"
msgstr "beim Lesen des Root-Inode"
-#: misc/mke2fs.c:500
+#: misc/mke2fs.c:529
msgid "while setting root inode ownership"
msgstr "beim Setzen des Root-Inode-Eigentmers"
-#: misc/mke2fs.c:518
+#: misc/mke2fs.c:547
msgid "while creating /lost+found"
msgstr "beim Erstellen von /lost+found"
-#: misc/mke2fs.c:525
+#: misc/mke2fs.c:554
msgid "while looking up /lost+found"
msgstr "beim Suchen von /lost+found"
-#: misc/mke2fs.c:535
+#: misc/mke2fs.c:564
msgid "while expanding /lost+found"
msgstr "beim Expandieren von /lost+found"
-#: misc/mke2fs.c:551
+#: misc/mke2fs.c:580
msgid "while setting bad block inode"
msgstr "beim Setzen des 'Bad Block'-Inodes"
-#: misc/mke2fs.c:583
+#: misc/mke2fs.c:612
#, c-format
msgid "Out of memory erasing sectors %d-%d\n"
msgstr "Speicher voll beim Lschen der Sektoren %d-%d\n"
-#: misc/mke2fs.c:593
+#: misc/mke2fs.c:622
#, c-format
msgid "Warning: could not read block 0: %s\n"
msgstr "Warnung: konnte Block %s nicht lesen\n"
-#: misc/mke2fs.c:609
+#: misc/mke2fs.c:638
#, c-format
msgid "Warning: could not erase sector %d: %s\n"
msgstr "Warnung: konnte Sektor %d: %s nicht lschen\n"
-#: misc/mke2fs.c:625
+#: misc/mke2fs.c:654
msgid "while initializing journal superblock"
msgstr "beim Initialisieren des Journal-Superblocks"
-#: misc/mke2fs.c:631
+#: misc/mke2fs.c:660
msgid "Zeroing journal device: "
msgstr "berschreibe Journal-Device mit Nullen: "
-#: misc/mke2fs.c:638
+#: misc/mke2fs.c:667
#, c-format
msgid "while zeroing journal device (block %u, count %d)"
msgstr "beim berschreiben des Journal-Device mit Nullen (Block %u, Nr. %d)"
-#: misc/mke2fs.c:649
+#: misc/mke2fs.c:678
msgid "while writing journal superblock"
msgstr "beim Schreiben des Journal-Superblocks"
-#: misc/mke2fs.c:664
+#: misc/mke2fs.c:693
#, c-format
msgid ""
"warning: %d blocks unused.\n"
@@ -3098,78 +3013,82 @@ msgstr ""
"Warnung: %d Blcke unbenutzt.\n"
"\n"
-#: misc/mke2fs.c:669
+#: misc/mke2fs.c:698
#, c-format
msgid "Filesystem label=%s\n"
msgstr "Dateisystem-Label=%s\n"
-#: misc/mke2fs.c:670
+#: misc/mke2fs.c:699
msgid "OS type: "
msgstr "OS-Typ: "
-#: misc/mke2fs.c:675
+#: misc/mke2fs.c:704
msgid "(unknown os)"
msgstr "(unbekanntes OS)"
-#: misc/mke2fs.c:678
+#: misc/mke2fs.c:707
#, c-format
msgid "Block size=%u (log=%u)\n"
msgstr "Blockgre=%u (log=%u)\n"
-#: misc/mke2fs.c:680
+#: misc/mke2fs.c:709
#, c-format
msgid "Fragment size=%u (log=%u)\n"
msgstr "Fragmentgre=%u (log=%u)\n"
-#: misc/mke2fs.c:682
+#: misc/mke2fs.c:711
#, c-format
msgid "%u inodes, %u blocks\n"
msgstr "%u Inodes, %u Blcke\n"
-#: misc/mke2fs.c:684
+#: misc/mke2fs.c:713
#, c-format
msgid "%u blocks (%2.2f%%) reserved for the super user\n"
msgstr "%u Blcke (%2.2f%%) reserviert fr den Superuser\n"
-#: misc/mke2fs.c:687
+#: misc/mke2fs.c:716
#, c-format
msgid "First data block=%u\n"
msgstr "erster Datenblock=%u\n"
-#: misc/mke2fs.c:689
+#: misc/mke2fs.c:718
#, c-format
msgid "%u block groups\n"
msgstr "%u Blockgruppen\n"
-#: misc/mke2fs.c:691
+#: misc/mke2fs.c:720
#, c-format
msgid "%u block group\n"
msgstr "%u Blockgruppe\n"
-#: misc/mke2fs.c:692
+#: misc/mke2fs.c:721
#, c-format
msgid "%u blocks per group, %u fragments per group\n"
msgstr "%u Blcke pro Gruppe, %u Fragmente pro Gruppe\n"
-#: misc/mke2fs.c:694
+#: misc/mke2fs.c:723
#, c-format
msgid "%u inodes per group\n"
msgstr "%u Inodes pro Gruppe\n"
-#: misc/mke2fs.c:701
+#: misc/mke2fs.c:730
+#, c-format
msgid "Superblock backups stored on blocks: "
msgstr "Superblock-Sicherungskopien gespeichert in den Blcken: "
-#: misc/mke2fs.c:751
+#: misc/mke2fs.c:780
+#, c-format
msgid "Couldn't allocate memory to parse raid options!\n"
msgstr ""
"Speicher zum Parsen der RAID-Optionen konnte nicht reserviert werden!\n"
-#: misc/mke2fs.c:776
+#: misc/mke2fs.c:805
+#, c-format
msgid "Invalid stride parameter.\n"
msgstr "Ungltiger \"stride\"-Parameter.\n"
-#: misc/mke2fs.c:784
+#: misc/mke2fs.c:813
+#, c-format
msgid ""
"\n"
"Bad raid options specified.\n"
@@ -3192,83 +3111,84 @@ msgstr ""
"\tstride=<stride length in blocks>\n"
"\n"
-#: misc/mke2fs.c:902
+#: misc/mke2fs.c:930
#, c-format
msgid "Warning: blocksize %d not usable on most systems.\n"
msgstr "Warnung: Blockgre %d ist auf den meisten Systemen unbrauchbar.\n"
-#: misc/mke2fs.c:919
+#: misc/mke2fs.c:947
#, c-format
msgid "bad fragment size - %s"
msgstr "falsche Fragmentgre - %s"
-#: misc/mke2fs.c:925
+#: misc/mke2fs.c:953
+#, c-format
msgid "Warning: fragments not supported. Ignoring -f option\n"
msgstr "Warnung: Fragmente werden nicht untersttzt. Ignoriere -f Option\n"
-#: misc/mke2fs.c:932
+#: misc/mke2fs.c:960
msgid "Illegal number for blocks per group"
msgstr "unzulssige Angabe fr Blcke pro Gruppe"
-#: misc/mke2fs.c:937
+#: misc/mke2fs.c:965
msgid "blocks per group must be multiple of 8"
msgstr "Anzahl der Blcke pro Gruppe muss ein Vielfaches von 8 sein"
-#: misc/mke2fs.c:947
+#: misc/mke2fs.c:975
#, c-format
msgid "bad inode ratio %s (min %d/max %d"
msgstr "Unzulssiges Inode-Verhltnis %s (Min %d/Max %d"
-#: misc/mke2fs.c:966
+#: misc/mke2fs.c:994
msgid "in malloc for bad_blocks_filename"
msgstr "in malloc for bad_blocks_filename"
-#: misc/mke2fs.c:975
+#: misc/mke2fs.c:1003
#, c-format
msgid "bad reserved blocks percent - %s"
msgstr "Unzulssige \"Reservierte Blcke\"-Prozentangabe - %s"
-#: misc/mke2fs.c:1007
+#: misc/mke2fs.c:1035
#, c-format
msgid "bad inode size - %s"
msgstr "Unzulssige Inode-Gre - %s"
-#: misc/mke2fs.c:1043 misc/tune2fs.c:294
+#: misc/mke2fs.c:1071 misc/tune2fs.c:302
#, c-format
msgid "Invalid filesystem option set: %s\n"
msgstr "Unvollstndige Dateisystem-Option gesetzt: %s\n"
-#: misc/mke2fs.c:1112 misc/mke2fs.c:1449
+#: misc/mke2fs.c:1140 misc/mke2fs.c:1477
#, c-format
msgid "while trying to open journal device %s\n"
msgstr "beim Versuch, das Journal-Device %s zu ffnen\n"
-#: misc/mke2fs.c:1118
+#: misc/mke2fs.c:1146
#, c-format
msgid "Journal dev blocksize (%d) smaller than minimum blocksize %d\n"
msgstr "Journal-Device Blockgre (%d) kleiner als Minimum-Blockgre %d\n"
-#: misc/mke2fs.c:1132
+#: misc/mke2fs.c:1160
#, c-format
msgid "%d-byte blocks too big for system (max %d)"
msgstr "%d-Byte Blcke zu gro fr das System (max %d)"
-#: misc/mke2fs.c:1136
+#: misc/mke2fs.c:1164
#, c-format
msgid ""
"Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
msgstr ""
"Warnung: %d-byte Blcke zu gro fr das System (max %d), fahre dennoch fort\n"
-#: misc/mke2fs.c:1161
+#: misc/mke2fs.c:1189
msgid "filesystem"
msgstr "Dateisystem"
-#: misc/mke2fs.c:1174 resize/main.c:264
+#: misc/mke2fs.c:1202 resize/main.c:268
msgid "while trying to determine filesystem size"
msgstr "beim Bestimmen der Dateisystemgre"
-#: misc/mke2fs.c:1180
+#: misc/mke2fs.c:1208
msgid ""
"Couldn't determine device size; you must specify\n"
"the size of the filesystem\n"
@@ -3276,7 +3196,7 @@ msgstr ""
"Konnte die Gertegre nicht ermitteln. Geben\n"
"Sie die Gre des Dateisystems an\n"
-#: misc/mke2fs.c:1187
+#: misc/mke2fs.c:1215
msgid ""
"Device size reported to be zero. Invalid partition specified, or\n"
"\tpartition table wasn't reread after running fdisk, due to\n"
@@ -3289,57 +3209,57 @@ msgstr ""
"\tund gesperrt ist. Sie knnten gezwungen sein, neu zu booten, um die\n"
"\tPartitionstabelle neu einzulesen.\n"
-#: misc/mke2fs.c:1205
+#: misc/mke2fs.c:1233
msgid "Filesystem larger than apparent device size."
msgstr "Dateisystem ist grer als augenscheinlich das Gert selbst."
-#: misc/mke2fs.c:1227
+#: misc/mke2fs.c:1255
msgid "while trying to determine hardware sector size"
msgstr "beim Ermitteln der Hardware-Sektorgre"
-#: misc/mke2fs.c:1241
+#: misc/mke2fs.c:1269
msgid "blocks per group count out of range"
msgstr "Anzahl der Blcke pro Gruppe nicht im gltigen Bereich"
-#: misc/mke2fs.c:1251
+#: misc/mke2fs.c:1279
#, c-format
msgid "bad inode size %d (min %d/max %d)"
msgstr "ungltige Inode-Gre %d (min %d/max %d)"
-#: misc/mke2fs.c:1257
+#: misc/mke2fs.c:1285
#, c-format
msgid "Warning: %d-byte inodes not usable on most systems\n"
msgstr ""
"Warnung: %d-Byte Inodes sind auf den meisten Systemen nicht benutzbar\n"
-#: misc/mke2fs.c:1308
+#: misc/mke2fs.c:1336
msgid "while setting up superblock"
msgstr "beim Erstellen des Superblocks"
-#: misc/mke2fs.c:1342
+#: misc/mke2fs.c:1370
#, c-format
msgid "unknown os - %s"
msgstr "unbekanntes OS - %s"
-#: misc/mke2fs.c:1396
+#: misc/mke2fs.c:1424
msgid "while trying to allocate filesystem tables"
msgstr "beim Zuordnen von Dateisystemtabellen"
-#: misc/mke2fs.c:1427
+#: misc/mke2fs.c:1455
#, c-format
msgid "while zeroing block %u at end of filesystem"
msgstr "beim Nullen von Block %u am Ende des Dateisystems"
-#: misc/mke2fs.c:1442 misc/tune2fs.c:376
+#: misc/mke2fs.c:1470 misc/tune2fs.c:387
msgid "journal"
msgstr "Journal"
-#: misc/mke2fs.c:1454
+#: misc/mke2fs.c:1482
#, c-format
msgid "Adding journal to device %s: "
msgstr "Erstelle Journal auf Gert %s: "
-#: misc/mke2fs.c:1461
+#: misc/mke2fs.c:1489
#, c-format
msgid ""
"\n"
@@ -3348,16 +3268,17 @@ msgstr ""
"\n"
"\tbeim Erstellen des Journals auf Gert %s"
-#: misc/mke2fs.c:1466 misc/mke2fs.c:1490 misc/tune2fs.c:404 misc/tune2fs.c:418
+#: misc/mke2fs.c:1494 misc/mke2fs.c:1518 misc/tune2fs.c:415 misc/tune2fs.c:429
+#, c-format
msgid "done\n"
msgstr "erledigt\n"
-#: misc/mke2fs.c:1478
+#: misc/mke2fs.c:1506
#, c-format
msgid "Creating journal (%d blocks): "
msgstr "Erstelle Journal (%d Blcke): "
-#: misc/mke2fs.c:1486
+#: misc/mke2fs.c:1514
msgid ""
"\n"
"\twhile trying to create journal"
@@ -3365,11 +3286,13 @@ msgstr ""
"\n"
"\tbeim Erstellen des Journals"
-#: misc/mke2fs.c:1495
+#: misc/mke2fs.c:1523
+#, c-format
msgid "Writing superblocks and filesystem accounting information: "
msgstr "Schreibe Superblcke und Dateisystem-Accountinginformationen: "
-#: misc/mke2fs.c:1500
+#: misc/mke2fs.c:1528
+#, c-format
msgid ""
"\n"
"Warning, had trouble writing out superblocks."
@@ -3377,7 +3300,8 @@ msgstr ""
"\n"
"Warnung: Probleme beim Schreiben der Superblcke."
-#: misc/mke2fs.c:1503
+#: misc/mke2fs.c:1531
+#, c-format
msgid ""
"done\n"
"\n"
@@ -3385,7 +3309,8 @@ msgstr ""
"erledigt\n"
"\n"
-#: misc/mklost+found.c:48
+#: misc/mklost+found.c:49
+#, c-format
msgid "Usage: mklost+found\n"
msgstr "Verwendung: mklost+found\n"
@@ -3422,11 +3347,11 @@ msgstr "HDIO_GETGEO ioctl"
msgid "BLKGETSIZE ioctl"
msgstr "BLKGETSIZE ioctl"
-#: misc/tune2fs.c:74
+#: misc/tune2fs.c:77
msgid "Please run e2fsck on the filesystem.\n"
msgstr "Bitte e2fsck ber das Dateisystem laufen lassen.\n"
-#: misc/tune2fs.c:81
+#: misc/tune2fs.c:84
#, c-format
msgid ""
"Usage: %s [-c max-mounts-count] [-e errors-behavior] [-g group]\n"
@@ -3443,53 +3368,53 @@ msgstr ""
"\t[-u user] [-C mount-count] [-L volume-label] [-M last-mounted-dir]\n"
"\t[-O [^]feature[,...]] [-T last-check-time] [-U UUID] Gert\n"
-#: misc/tune2fs.c:138
+#: misc/tune2fs.c:141
msgid "while trying to open external journal"
msgstr "beim ffnen des externen Journals"
-#: misc/tune2fs.c:142
+#: misc/tune2fs.c:145
#, c-format
msgid "%s is not a journal device.\n"
msgstr "%s ist kein Journal-Gert.\n"
-#: misc/tune2fs.c:157
+#: misc/tune2fs.c:160
msgid "Journal superblock not found!\n"
msgstr "Journal-Superblock nicht gefunden!\n"
-#: misc/tune2fs.c:169
+#: misc/tune2fs.c:172
msgid "Filesystem's UUID not found on journal device.\n"
msgstr "UUID des Dateisystems auf Journal-Gert nicht gefunden.\n"
-#: misc/tune2fs.c:190
+#: misc/tune2fs.c:193
msgid "Journal NOT removed\n"
msgstr "Journal NICHT gelscht\n"
-#: misc/tune2fs.c:196
+#: misc/tune2fs.c:199
msgid "Journal removed\n"
msgstr "Journal gelscht\n"
-#: misc/tune2fs.c:228
+#: misc/tune2fs.c:231
msgid "while reading journal inode"
msgstr "beim Lesen des Journal-Inodes"
-#: misc/tune2fs.c:235
+#: misc/tune2fs.c:238
msgid "while reading bitmaps"
msgstr "beim Lesen von Bitmaps"
-#: misc/tune2fs.c:242
+#: misc/tune2fs.c:245
msgid "while clearing journal inode"
msgstr "beim Bereinigen des Journal-Inodes"
-#: misc/tune2fs.c:253
+#: misc/tune2fs.c:256
msgid "while writing journal inode"
msgstr "beim Schreiben des Journal-Inodes"
-#: misc/tune2fs.c:268
+#: misc/tune2fs.c:271
#, c-format
msgid "Invalid mount option set: %s\n"
msgstr "Ungltige Einhnge-Option gesetzt: %s\n"
-#: misc/tune2fs.c:309
+#: misc/tune2fs.c:317
msgid ""
"The has_journal flag may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
@@ -3497,7 +3422,7 @@ msgstr ""
"Das has_jounal Flag kann nur gelscht werden, wenn das Dateisystem\n"
"nicht eingehngt oder im Nur-Lesen-Modus ist.\n"
-#: misc/tune2fs.c:317
+#: misc/tune2fs.c:325
msgid ""
"The needs_recovery flag is set. Please run e2fsck before clearing\n"
"the has_journal flag.\n"
@@ -3505,11 +3430,11 @@ msgstr ""
"Das needs_recovery Flag ist gesetzt. Bitte starten sie e2fsck vor\n"
"der Lschung des has_journal Flags.\n"
-#: misc/tune2fs.c:371
+#: misc/tune2fs.c:382
msgid "The filesystem already has a journal.\n"
msgstr "Das Dateisystem hat schon ein Journal.\n"
-#: misc/tune2fs.c:388
+#: misc/tune2fs.c:399
#, c-format
msgid ""
"\n"
@@ -3518,21 +3443,21 @@ msgstr ""
"\n"
"\tbeim ffnen des Journals auf %s\n"
-#: misc/tune2fs.c:392
+#: misc/tune2fs.c:403
#, c-format
msgid "Creating journal on device %s: "
msgstr "Erstelle Journal auf Gert %s: "
-#: misc/tune2fs.c:400
+#: misc/tune2fs.c:411
#, c-format
msgid "while adding filesystem to journal on %s"
msgstr "beim Hinzufgen des Dateisystems zum Journal auf %s"
-#: misc/tune2fs.c:406
+#: misc/tune2fs.c:417
msgid "Creating journal inode: "
msgstr "Erstelle Journal-Inode: "
-#: misc/tune2fs.c:415
+#: misc/tune2fs.c:426
msgid ""
"\n"
"\twhile trying to create journal file"
@@ -3540,95 +3465,95 @@ msgstr ""
"\n"
"\tbeim Erstellen der Journaldatei"
-#: misc/tune2fs.c:478
+#: misc/tune2fs.c:492
#, c-format
msgid "Couldn't parse date/time specifier: %s"
msgstr "Konnte Datum/Zeit nicht parsen: %s"
-#: misc/tune2fs.c:500 misc/tune2fs.c:513
+#: misc/tune2fs.c:514 misc/tune2fs.c:527
#, c-format
msgid "bad mounts count - %s"
msgstr "Ungltiger Mounts-Zhler - %s"
-#: misc/tune2fs.c:529
+#: misc/tune2fs.c:543
#, c-format
msgid "bad error behavior - %s"
msgstr "ungltiges Fehler-Verhalten - %s"
-#: misc/tune2fs.c:552
+#: misc/tune2fs.c:566
#, c-format
msgid "bad gid/group name - %s"
msgstr "ungltige(r) GID oder Gruppenname - %s"
-#: misc/tune2fs.c:585
+#: misc/tune2fs.c:599
#, c-format
msgid "bad interval - %s"
msgstr "ungltiges Intervall - %s"
-#: misc/tune2fs.c:613
+#: misc/tune2fs.c:627
#, c-format
msgid "bad reserved block ratio - %s"
msgstr "ungltiges Reservierte-Blcke-Verhltnis - %s"
-#: misc/tune2fs.c:628
+#: misc/tune2fs.c:642
msgid "-o may only be specified once"
msgstr "-o darf nur eimal angegeben werden"
-#: misc/tune2fs.c:638
+#: misc/tune2fs.c:652
msgid "-O may only be specified once"
msgstr "-O darf nur eimal angegeben werden"
-#: misc/tune2fs.c:648
+#: misc/tune2fs.c:662
#, c-format
msgid "bad reserved blocks count - %s"
msgstr "ungltige Anzahl von reservierten Blcken - %s"
-#: misc/tune2fs.c:677
+#: misc/tune2fs.c:691
#, c-format
msgid "bad uid/user name - %s"
msgstr "ungltige(r) UID/Benutzername - %s"
-#: misc/tune2fs.c:783
+#: misc/tune2fs.c:801
#, c-format
msgid "Setting maximal mount count to %d\n"
msgstr "Setze maximale Mount-Anzahl zu auf %d\n"
-#: misc/tune2fs.c:789
+#: misc/tune2fs.c:807
#, c-format
msgid "Setting current mount count to %d\n"
msgstr "Setze derzeitige Mount-Anzahl auf %d\n"
-#: misc/tune2fs.c:794
+#: misc/tune2fs.c:812
#, c-format
msgid "Setting error behavior to %d\n"
msgstr "Setze Fehler-Verhalten auf %d\n"
-#: misc/tune2fs.c:799
+#: misc/tune2fs.c:817
#, c-format
msgid "Setting reserved blocks gid to %lu\n"
msgstr "Setze GID fr reservierte Blcke auf %lu\n"
-#: misc/tune2fs.c:804
+#: misc/tune2fs.c:822
#, c-format
msgid "Setting interval between check %lu seconds\n"
msgstr "Setze Intervall zwischen Checks auf %lu Sekunden\n"
-#: misc/tune2fs.c:810
+#: misc/tune2fs.c:828
#, c-format
msgid "Setting reserved blocks percentage to %lu (%u blocks)\n"
msgstr "Setze Verhltnis der reservierten Blcke auf %lu (%u blocks)\n"
-#: misc/tune2fs.c:816
+#: misc/tune2fs.c:834
#, c-format
msgid "reserved blocks count is too big (%lu)"
msgstr "Anzahl der reservierten Blcke zu gro (%lu)"
-#: misc/tune2fs.c:822
+#: misc/tune2fs.c:840
#, c-format
msgid "Setting reserved blocks count to %lu\n"
msgstr "Setze Anzahl der reservierten Blcke auf %lu\n"
-#: misc/tune2fs.c:828
+#: misc/tune2fs.c:846
msgid ""
"\n"
"The filesystem already has sparse superblocks.\n"
@@ -3636,7 +3561,7 @@ msgstr ""
"\n"
"Das Dateisystem hat bereits einen \"sparse superblock\".\n"
-#: misc/tune2fs.c:835
+#: misc/tune2fs.c:853
#, c-format
msgid ""
"\n"
@@ -3645,7 +3570,7 @@ msgstr ""
"\n"
"Sparse superblock Flag gesetzt. %s"
-#: misc/tune2fs.c:842
+#: misc/tune2fs.c:860
msgid ""
"\n"
"The filesystem already has sparse superblocks disabled.\n"
@@ -3653,7 +3578,7 @@ msgstr ""
"\n"
"Sparse Superblocks sind auf dem Dateisystem bereits deaktiviert.\n"
-#: misc/tune2fs.c:850
+#: misc/tune2fs.c:868
#, c-format
msgid ""
"\n"
@@ -3662,17 +3587,17 @@ msgstr ""
"\n"
"Sparse superblock Flag gelscht. %s"
-#: misc/tune2fs.c:857
+#: misc/tune2fs.c:875
#, c-format
msgid "Setting time filesystem last checked to %s\n"
msgstr "Setze Zeit des letzten Dateisystemchecks auf %s\n"
-#: misc/tune2fs.c:863
+#: misc/tune2fs.c:881
#, c-format
msgid "Setting reserved blocks uid to %lu\n"
msgstr "Setze UID fr reservierte Blcke auf %lu\n"
-#: misc/tune2fs.c:896
+#: misc/tune2fs.c:914
msgid "Invalid UUID format\n"
msgstr "Ungltiges UUID Format\n"
@@ -3693,30 +3618,30 @@ msgstr ""
"\n"
"Das Gert scheint nicht zu existieren, haben Sie es richtig angegeben?\n"
-#: misc/util.c:101
+#: misc/util.c:107
#, c-format
msgid "%s is not a block special device.\n"
msgstr "%s ist kein spezielles Block-Gert.\n"
-#: misc/util.c:130
+#: misc/util.c:136
#, c-format
msgid "%s is entire device, not just one partition!\n"
msgstr "%s ist ein vollstndiges Gert, nicht nur eine Partition!\n"
-#: misc/util.c:154
+#: misc/util.c:160
msgid "mke2fs forced anyway. Hope /etc/mtab is incorrect.\n"
msgstr "mke2fs trotzdem erzwungen. Hoffentlich stimmt /etc/mtab nicht.\n"
-#: misc/util.c:157
+#: misc/util.c:163
#, c-format
msgid "will not make a %s here!\n"
msgstr "werde dort kein %s erstellen!\n"
-#: misc/util.c:171
+#: misc/util.c:177
msgid "Couldn't allocate memory to parse journal options!\n"
msgstr "Konnte keinen Speicher zuweisen, um Journal-Optionen zu parsen!\n"
-#: misc/util.c:213
+#: misc/util.c:219
msgid ""
"\n"
"Bad journal options specified.\n"
@@ -3745,7 +3670,7 @@ msgstr ""
"Die Journalgre muss zwischen 1024 und 102400 Dateisystem-Blcken liegen.\n"
"\n"
-#: misc/util.c:240
+#: misc/util.c:246
msgid ""
"\n"
"Filesystem too small for a journal\n"
@@ -3753,7 +3678,7 @@ msgstr ""
"\n"
"Dateisystem zu klein fr ein Journal\n"
-#: misc/util.c:247
+#: misc/util.c:253
#, c-format
msgid ""
"\n"
@@ -3764,7 +3689,7 @@ msgstr ""
"Die angegebene Journalgre ist %d Blcke. Sie muss aber zwischen\n"
"1024 und 102400 Dateisystem-Blcken liegen. Breche ab! \n"
-#: misc/util.c:255
+#: misc/util.c:261
msgid ""
"\n"
"Journal size too big for filesystem.\n"
@@ -3772,7 +3697,7 @@ msgstr ""
"\n"
"Das Journal ist zu gro fr dieses Dateisystem.\n"
-#: misc/util.c:274
+#: misc/util.c:280
#, c-format
msgid ""
"This filesystem will be automatically checked every %d mounts or\n"
@@ -3858,7 +3783,7 @@ msgstr "resize2fs %s (%s)\n"
msgid "bad filesystem size - %s"
msgstr "ungltige Dateisystemgre - %s"
-#: resize/main.c:296
+#: resize/main.c:300
#, c-format
msgid ""
"The containing partition (or device) is only %d (%dk) blocks.\n"
@@ -3869,7 +3794,7 @@ msgstr ""
"Die geforderte neue Gre ist %d Blcke.\n"
"\n"
-#: resize/main.c:303
+#: resize/main.c:307
#, c-format
msgid ""
"The filesystem is already %d blocks long. Nothing to do!\n"
@@ -3878,7 +3803,7 @@ msgstr ""
"Das Dateisystem ist schon %d Blcke gro. Nichts zu tun!\n"
"\n"
-#: resize/main.c:310
+#: resize/main.c:314
#, c-format
msgid ""
"Please run 'e2fsck -f %s' first.\n"
@@ -3887,12 +3812,12 @@ msgstr ""
"Bitte zuerst 'e2fsck -f %s ' laufen lassen.\n"
"\n"
-#: resize/main.c:320
+#: resize/main.c:324
#, c-format
msgid "while trying to resize %s"
msgstr "beim Versuch, die Gre von %s zu ndern"
-#: resize/main.c:325
+#: resize/main.c:329
#, c-format
msgid ""
"The filesystem on %s is now %d blocks long.\n"
@@ -3901,63 +3826,156 @@ msgstr ""
"Das Dateisystem auf %s ist nun %d Blcke gro.\n"
"\n"
-#: resize/resize2fs.c:109
+#: resize/resize2fs.c:110
#, c-format
msgid "Number of free blocks: %d/%d, Needed: %d\n"
msgstr "Anzahl der freien Blcke ist: %d / %d ; bentigt: %d\n"
-#: resize/resize2fs.c:458
+#: resize/resize2fs.c:459
msgid "meta-data blocks"
msgstr "Metadaten-Blcke"
-#: resize/resize2fs.c:581
+#: resize/resize2fs.c:582
msgid "reserved blocks"
msgstr "reservierte Blcke"
-#: resize/resize2fs.c:586
+#: resize/resize2fs.c:587
msgid "blocks to be moved"
msgstr "zu verschiebene Blcke"
-#: resize/resize2fs.c:816
+#: resize/resize2fs.c:817
+#, c-format
msgid "Going into desperation mode for block allocations\n"
msgstr "Gehe in Verzweifelungs-Modus fr die Blockzuordnung\n"
-#: resize/resize2fs.c:920
+#: resize/resize2fs.c:921
#, c-format
msgid "Moving %d blocks %u->%u\n"
msgstr "Verschiebe %d Blcke %u->%u\n"
-#: resize/resize2fs.c:997
+#: resize/resize2fs.c:998
#, c-format
msgid "ino=%u, blockcnt=%lld, %u->%u\n"
msgstr "ino=%u, blockcnt=%lld, %u->%u\n"
-#: resize/resize2fs.c:1165
+#: resize/resize2fs.c:1166
#, c-format
msgid "Inode moved %u->%u\n"
msgstr "Inode verschoben %u->%u\n"
-#: resize/resize2fs.c:1233
+#: resize/resize2fs.c:1234
#, c-format
msgid "Inode translate (dir=%u, name=%.*s, %u->%u)\n"
msgstr "Inode translate (dir=%u, name=%.*s, %u->%u)\n"
-#: resize/resize2fs.c:1360
+#: resize/resize2fs.c:1361
#, c-format
msgid "Itable move group %d block %u->%u (diff %d)\n"
msgstr "Itable move group %d block %u->%u (diff %d)\n"
-#: resize/resize2fs.c:1386
+#: resize/resize2fs.c:1387
#, c-format
msgid "%d blocks of zeros...\n"
msgstr "%d Blcke mit Nullen...\n"
-#: resize/resize2fs.c:1421
+#: resize/resize2fs.c:1422
+#, c-format
msgid "Inode table move finished.\n"
msgstr "Verschieben der Inode-Tabelle fertiggestellt.\n"
#~ msgid ""
#~ "\n"
+#~ "%8d inode used (%d%%)\n"
+#~ msgid_plural ""
+#~ "\n"
+#~ "%8d inodes used (%d%%)\n"
+#~ msgstr[0] ""
+#~ "\n"
+#~ "%8d Inode benutzt (%d%%)\n"
+#~ msgstr[1] ""
+#~ "\n"
+#~ "%8d Inodes benutzt (%d%%)\n"
+
+#~ msgid "%8d non-contiguous inode (%0d.%d%%)\n"
+#~ msgid_plural "%8d non-contiguous inodes (%0d.%d%%)\n"
+#~ msgstr[0] "%8d nicht zusammenhngender Inode (%0d.%d%%)\n"
+#~ msgstr[1] "%8d nicht zusammenhngende Inodes (%0d.%d%%)\n"
+
+#~ msgid "%8d block used (%d%%)\n"
+#~ msgid_plural "%8d blocks used (%d%%)\n"
+#~ msgstr[0] "%8d Block benutzt (%d%%)\n"
+#~ msgstr[1] "%8d Blcke benutzt (%d%%)\n"
+
+#~ msgid "%8d bad block\n"
+#~ msgid_plural "%8d bad blocks\n"
+#~ msgstr[0] "%8d defekter Block\n"
+#~ msgstr[1] "%8d defekte Blcke\n"
+
+#~ msgid "%8d large file\n"
+#~ msgid_plural "%8d large files\n"
+#~ msgstr[0] "%8d groe Datei\n"
+#~ msgstr[1] "%8d groe Dateien\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "%8d regular file\n"
+#~ msgid_plural ""
+#~ "\n"
+#~ "%8d regular files\n"
+#~ msgstr[0] ""
+#~ "\n"
+#~ "%8d gewhnliche Datei\n"
+#~ msgstr[1] ""
+#~ "\n"
+#~ "%8d gewhnliche Dateien\n"
+
+#~ msgid "%8d directory\n"
+#~ msgid_plural "%8d directories\n"
+#~ msgstr[0] "%8d Verzeichnis\n"
+#~ msgstr[1] "%8d Verzeichnisse\n"
+
+#~ msgid "%8d character device file\n"
+#~ msgid_plural "%8d character device files\n"
+#~ msgstr[0] "%8d character device-Datei\n"
+#~ msgstr[1] "%8d character device-Dateien\n"
+
+#~ msgid "%8d block device file\n"
+#~ msgid_plural "%8d block device files\n"
+#~ msgstr[0] "%8d block device-Datei\n"
+#~ msgstr[1] "%8d block device-Dateien\n"
+
+#~ msgid "%8d fifo\n"
+#~ msgid_plural "%8d fifos\n"
+#~ msgstr[0] "%8d FIFO\n"
+#~ msgstr[1] "%8d FIFOs\n"
+
+#~ msgid "%8d link\n"
+#~ msgid_plural "%8d links\n"
+#~ msgstr[0] "%8d Link\n"
+#~ msgstr[1] "%8d Links\n"
+
+#~ msgid "%8d symbolic link"
+#~ msgid_plural "%8d symbolic links"
+#~ msgstr[0] "%8d symbolischer Link"
+#~ msgstr[1] "%8d symbolische Links"
+
+#~ msgid " (%d fast symbolic link)\n"
+#~ msgid_plural " (%d fast symbolic links)\n"
+#~ msgstr[0] " (%d schneller symbolischer Link)\n"
+#~ msgstr[1] " (%d schnelle symbolische Links)\n"
+
+#~ msgid "%8d socket\n"
+#~ msgid_plural "%8d sockets\n"
+#~ msgstr[0] "%8d Socket\n"
+#~ msgstr[1] "%8d Sockets\n"
+
+#~ msgid "%8d file\n"
+#~ msgid_plural "%8d files\n"
+#~ msgstr[0] "%8d Datei\n"
+#~ msgstr[1] "%8d Dateien\n"
+
+#~ msgid ""
+#~ "\n"
#~ "This inconsistency can not be fixed with e2fsck; to fix it, use\n"
#~ "dumpe2fs -b to dump out the bad @b list and e2fsck -L filename\n"
#~ "to read it back in again.\n"
diff --git a/po/e2fsprogs.pot b/po/e2fsprogs.pot
index 3433dd1d..e08dc5ab 100644
--- a/po/e2fsprogs.pot
+++ b/po/e2fsprogs.pot
@@ -7,17 +7,16 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-24 14:17-0500\n"
+"Report-Msgid-Bugs-To: tytso@alum.mit.edu\n"
+"POT-Creation-Date: 2004-11-30 18:46-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: e2fsck/badblocks.c:22 misc/mke2fs.c:194
+#: e2fsck/badblocks.c:22 misc/mke2fs.c:223
#, c-format
msgid "Bad block %u out of range; ignored.\n"
msgstr ""
@@ -31,10 +30,10 @@ msgid "while reading the bad blocks inode"
msgstr ""
#: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
-#: e2fsck/unix.c:881 e2fsck/unix.c:913 misc/badblocks.c:997
+#: e2fsck/unix.c:915 e2fsck/unix.c:947 misc/badblocks.c:997
#: misc/badblocks.c:1005 misc/badblocks.c:1019 misc/badblocks.c:1031
-#: misc/dumpe2fs.c:332 misc/e2image.c:486 misc/e2image.c:502 misc/mke2fs.c:210
-#: misc/tune2fs.c:757 resize/main.c:228
+#: misc/dumpe2fs.c:332 misc/e2image.c:475 misc/e2image.c:564
+#: misc/e2image.c:580 misc/mke2fs.c:239 misc/tune2fs.c:775 resize/main.c:232
#, c-format
msgid "while trying to open %s"
msgstr ""
@@ -44,7 +43,7 @@ msgstr ""
msgid "while trying popen '%s'"
msgstr ""
-#: e2fsck/badblocks.c:93 misc/mke2fs.c:217
+#: e2fsck/badblocks.c:93 misc/mke2fs.c:246
msgid "while reading in list of bad blocks from file"
msgstr ""
@@ -104,6 +103,7 @@ msgid "%s: %s filename nblocks blocksize\n"
msgstr ""
#: e2fsck/extend.c:43
+#, c-format
msgid "Illegal number of blocks!\n"
msgstr ""
@@ -118,6 +118,7 @@ msgid "Usage: %s disk\n"
msgstr ""
#: e2fsck/flushb.c:63
+#, c-format
msgid "BLKFLSBUF ioctl not supported! Can't flush buffers.\n"
msgstr ""
@@ -126,12 +127,12 @@ msgstr ""
msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n"
msgstr ""
-#: e2fsck/iscan.c:83 e2fsck/unix.c:701 resize/main.c:205
+#: e2fsck/iscan.c:83 e2fsck/unix.c:729 resize/main.c:209
#, c-format
msgid "while opening %s for flushing"
msgstr ""
-#: e2fsck/iscan.c:88 e2fsck/unix.c:707 resize/main.c:212
+#: e2fsck/iscan.c:88 e2fsck/unix.c:735 resize/main.c:216
#, c-format
msgid "while trying to flush %s"
msgstr ""
@@ -149,31 +150,31 @@ msgstr ""
msgid "%d inodes scanned.\n"
msgstr ""
-#: e2fsck/journal.c:449
+#: e2fsck/journal.c:463
msgid "reading journal superblock\n"
msgstr ""
-#: e2fsck/journal.c:506
+#: e2fsck/journal.c:520
#, c-format
msgid "%s: no valid journal superblock found\n"
msgstr ""
-#: e2fsck/journal.c:515
+#: e2fsck/journal.c:529
#, c-format
msgid "%s: journal too short\n"
msgstr ""
-#: e2fsck/journal.c:787
+#: e2fsck/journal.c:802
#, c-format
msgid "%s: recovering journal\n"
msgstr ""
-#: e2fsck/journal.c:789
+#: e2fsck/journal.c:804
#, c-format
msgid "%s: won't do journal recovery while read-only\n"
msgstr ""
-#: e2fsck/journal.c:810
+#: e2fsck/journal.c:825
#, c-format
msgid "while trying to re-open %s"
msgstr ""
@@ -330,77 +331,77 @@ msgstr ""
msgid "multiply claimed inode map"
msgstr ""
-#: e2fsck/pass1b.c:551 e2fsck/pass1b.c:688
+#: e2fsck/pass1b.c:554 e2fsck/pass1b.c:691
#, c-format
msgid "internal error; can't find dup_blk for %d\n"
msgstr ""
-#: e2fsck/pass1b.c:731
+#: e2fsck/pass1b.c:734
msgid "returned from clone_file_block"
msgstr ""
-#: e2fsck/pass1.c:297
+#: e2fsck/pass1.c:298
msgid "in-use inode map"
msgstr ""
-#: e2fsck/pass1.c:306
+#: e2fsck/pass1.c:307
msgid "directory inode map"
msgstr ""
-#: e2fsck/pass1.c:314
+#: e2fsck/pass1.c:315
msgid "regular file inode map"
msgstr ""
-#: e2fsck/pass1.c:321
+#: e2fsck/pass1.c:322
msgid "in-use block map"
msgstr ""
-#: e2fsck/pass1.c:368
+#: e2fsck/pass1.c:369
msgid "doing inode scan"
msgstr ""
-#: e2fsck/pass1.c:751
+#: e2fsck/pass1.c:752
msgid "Pass 1"
msgstr ""
-#: e2fsck/pass1.c:810
+#: e2fsck/pass1.c:811
#, c-format
msgid "reading indirect blocks of inode %u"
msgstr ""
-#: e2fsck/pass1.c:852
+#: e2fsck/pass1.c:853
msgid "bad inode map"
msgstr ""
-#: e2fsck/pass1.c:874
+#: e2fsck/pass1.c:875
msgid "inode in bad block map"
msgstr ""
-#: e2fsck/pass1.c:894
+#: e2fsck/pass1.c:895
msgid "imagic inode map"
msgstr ""
-#: e2fsck/pass1.c:921
+#: e2fsck/pass1.c:922
msgid "multiply claimed block map"
msgstr ""
-#: e2fsck/pass1.c:1020
+#: e2fsck/pass1.c:1021
msgid "ext attr block map"
msgstr ""
-#: e2fsck/pass1.c:1782
+#: e2fsck/pass1.c:1783
msgid "block bitmap"
msgstr ""
-#: e2fsck/pass1.c:1786
+#: e2fsck/pass1.c:1787
msgid "inode bitmap"
msgstr ""
-#: e2fsck/pass1.c:1790
+#: e2fsck/pass1.c:1791
msgid "inode table"
msgstr ""
-#: e2fsck/pass2.c:293
+#: e2fsck/pass2.c:294
msgid "Pass 2"
msgstr ""
@@ -1624,7 +1625,7 @@ msgstr ""
msgid "Unhandled error code (0x%x)!\n"
msgstr ""
-#: e2fsck/problem.c:1594
+#: e2fsck/problem.c:1595
msgid "IGNORED"
msgstr ""
@@ -1687,6 +1688,7 @@ msgid "while writing inode table (group %d)"
msgstr ""
#: e2fsck/swapfs.c:222
+#, c-format
msgid "Pass 0: Doing byte-swap of filesystem\n"
msgstr ""
@@ -1701,7 +1703,7 @@ msgstr ""
msgid "Byte swap"
msgstr ""
-#: e2fsck/unix.c:67
+#: e2fsck/unix.c:74
#, c-format
msgid ""
"Usage: %s [-panyrcdfvstDFSV] [-b superblock] [-B blocksize]\n"
@@ -1710,7 +1712,8 @@ msgid ""
"\t\t[-E extended-options] device\n"
msgstr ""
-#: e2fsck/unix.c:73
+#: e2fsck/unix.c:80
+#, c-format
msgid ""
"\n"
"Emergency help:\n"
@@ -1722,7 +1725,8 @@ msgid ""
" -f Force checking even if filesystem is marked clean\n"
msgstr ""
-#: e2fsck/unix.c:79
+#: e2fsck/unix.c:86
+#, c-format
msgid ""
" -v Be verbose\n"
" -b superblock Use alternative superblock\n"
@@ -1732,152 +1736,40 @@ msgid ""
" -L bad_blocks_file Set badblocks list\n"
msgstr ""
-#: e2fsck/unix.c:113
+#: e2fsck/unix.c:120
#, c-format
msgid "%s: %d/%d files (%0d.%d%% non-contiguous), %d/%d blocks\n"
msgstr ""
-#: e2fsck/unix.c:119
-#, c-format
-msgid ""
-"\n"
-"%8d inode used (%d%%)\n"
-msgid_plural ""
-"\n"
-"%8d inodes used (%d%%)\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: e2fsck/unix.c:121
-#, c-format
-msgid "%8d non-contiguous inode (%0d.%d%%)\n"
-msgid_plural "%8d non-contiguous inodes (%0d.%d%%)\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: e2fsck/unix.c:125
+#: e2fsck/unix.c:132
#, c-format
msgid " # of inodes with ind/dind/tind blocks: %d/%d/%d\n"
msgstr ""
-#: e2fsck/unix.c:127
-#, c-format
-msgid "%8d block used (%d%%)\n"
-msgid_plural "%8d blocks used (%d%%)\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: e2fsck/unix.c:130
-#, c-format
-msgid "%8d bad block\n"
-msgid_plural "%8d bad blocks\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: e2fsck/unix.c:132
-#, c-format
-msgid "%8d large file\n"
-msgid_plural "%8d large files\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: e2fsck/unix.c:134
-#, c-format
-msgid ""
-"\n"
-"%8d regular file\n"
-msgid_plural ""
-"\n"
-"%8d regular files\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: e2fsck/unix.c:136
-#, c-format
-msgid "%8d directory\n"
-msgid_plural "%8d directories\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: e2fsck/unix.c:138
-#, c-format
-msgid "%8d character device file\n"
-msgid_plural "%8d character device files\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: e2fsck/unix.c:141
-#, c-format
-msgid "%8d block device file\n"
-msgid_plural "%8d block device files\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: e2fsck/unix.c:143
-#, c-format
-msgid "%8d fifo\n"
-msgid_plural "%8d fifos\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: e2fsck/unix.c:145
-#, c-format
-msgid "%8d link\n"
-msgid_plural "%8d links\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: e2fsck/unix.c:148
-#, c-format
-msgid "%8d symbolic link"
-msgid_plural "%8d symbolic links"
-msgstr[0] ""
-msgstr[1] ""
-
-#: e2fsck/unix.c:150
-#, c-format
-msgid " (%d fast symbolic link)\n"
-msgid_plural " (%d fast symbolic links)\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: e2fsck/unix.c:152
-#, c-format
-msgid "%8d socket\n"
-msgid_plural "%8d sockets\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: e2fsck/unix.c:155
-#, c-format
-msgid "%8d file\n"
-msgid_plural "%8d files\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: e2fsck/unix.c:169 misc/badblocks.c:781 misc/tune2fs.c:773 misc/util.c:145
+#: e2fsck/unix.c:176 misc/badblocks.c:781 misc/tune2fs.c:791 misc/util.c:151
#: resize/main.c:97
#, c-format
msgid "while determining whether %s is mounted."
msgstr ""
-#: e2fsck/unix.c:184
+#: e2fsck/unix.c:191
#, c-format
msgid "Warning! %s is mounted.\n"
msgstr ""
-#: e2fsck/unix.c:188
+#: e2fsck/unix.c:195
#, c-format
msgid "%s is mounted. "
msgstr ""
-#: e2fsck/unix.c:190
+#: e2fsck/unix.c:197
msgid ""
"Cannot continue, aborting.\n"
"\n"
msgstr ""
-#: e2fsck/unix.c:191
+#: e2fsck/unix.c:198
+#, c-format
msgid ""
"\n"
"\n"
@@ -1886,60 +1778,63 @@ msgid ""
"\n"
msgstr ""
-#: e2fsck/unix.c:194
+#: e2fsck/unix.c:201
msgid "Do you really want to continue"
msgstr ""
-#: e2fsck/unix.c:196
+#: e2fsck/unix.c:203
+#, c-format
msgid "check aborted.\n"
msgstr ""
-#: e2fsck/unix.c:245
+#: e2fsck/unix.c:264
msgid " contains a file system with errors"
msgstr ""
-#: e2fsck/unix.c:247
+#: e2fsck/unix.c:266
msgid " was not cleanly unmounted"
msgstr ""
-#: e2fsck/unix.c:251
+#: e2fsck/unix.c:270
#, c-format
msgid " has been mounted %u times without being checked"
msgstr ""
-#: e2fsck/unix.c:259
+#: e2fsck/unix.c:278
#, c-format
msgid " has gone %u days without being checked"
msgstr ""
-#: e2fsck/unix.c:268
+#: e2fsck/unix.c:287
msgid ", check forced.\n"
msgstr ""
-#: e2fsck/unix.c:271
+#: e2fsck/unix.c:290
#, c-format
msgid "%s: clean, %d/%d files, %d/%d blocks"
msgstr ""
-#: e2fsck/unix.c:286
+#: e2fsck/unix.c:306
msgid " (check after next mount)"
msgstr ""
-#: e2fsck/unix.c:288
+#: e2fsck/unix.c:308
#, c-format
msgid " (check in %ld mounts)"
msgstr ""
-#: e2fsck/unix.c:430
+#: e2fsck/unix.c:450
#, c-format
msgid "ERROR: Couldn't open /dev/null (%s)\n"
msgstr ""
-#: e2fsck/unix.c:501
+#: e2fsck/unix.c:521
+#, c-format
msgid "Invalid EA version.\n"
msgstr ""
-#: e2fsck/unix.c:510
+#: e2fsck/unix.c:532
+#, c-format
msgid ""
"Extended options are separated by commas, and may take an argument which\n"
"is set off by an equals ('=') sign. Valid raid options are:\n"
@@ -1947,175 +1842,187 @@ msgid ""
"\n"
msgstr ""
-#: e2fsck/unix.c:568
+#: e2fsck/unix.c:590
#, c-format
msgid "Error validating file descriptor %d: %s\n"
msgstr ""
-#: e2fsck/unix.c:572
+#: e2fsck/unix.c:594
msgid "Invalid completion information file descriptor"
msgstr ""
-#: e2fsck/unix.c:587
+#: e2fsck/unix.c:609
msgid "Only one the options -p/-a, -n or -y may be specified."
msgstr ""
-#: e2fsck/unix.c:608
+#: e2fsck/unix.c:630
+#, c-format
msgid "The -t option is not supported on this version of e2fsck.\n"
msgstr ""
-#: e2fsck/unix.c:673
+#: e2fsck/unix.c:695
+#, c-format
msgid "Byte-swapping filesystems not compiled in this version of e2fsck\n"
msgstr ""
-#: e2fsck/unix.c:690 misc/tune2fs.c:444 misc/tune2fs.c:699 misc/tune2fs.c:716
+#: e2fsck/unix.c:718 misc/tune2fs.c:458 misc/tune2fs.c:716 misc/tune2fs.c:733
#, c-format
msgid "Unable to resolve '%s'"
msgstr ""
-#: e2fsck/unix.c:716
+#: e2fsck/unix.c:744
+#, c-format
msgid "Incompatible options not allowed when byte-swapping.\n"
msgstr ""
-#: e2fsck/unix.c:723
+#: e2fsck/unix.c:751
+#, c-format
msgid "The -c and the -l/-L options may not be both used at the same time.\n"
msgstr ""
-#: e2fsck/unix.c:801
+#: e2fsck/unix.c:829
+#, c-format
msgid "Error: ext2fs library version out of date!\n"
msgstr ""
-#: e2fsck/unix.c:809
+#: e2fsck/unix.c:837
msgid "while trying to initialize program"
msgstr ""
-#: e2fsck/unix.c:823
+#: e2fsck/unix.c:851
#, c-format
msgid "\tUsing %s, %s\n"
msgstr ""
-#: e2fsck/unix.c:835
+#: e2fsck/unix.c:863
msgid "need terminal for interactive repairs"
msgstr ""
-#: e2fsck/unix.c:871
+#: e2fsck/unix.c:905
#, c-format
msgid "%s trying backup blocks...\n"
msgstr ""
-#: e2fsck/unix.c:872
+#: e2fsck/unix.c:906
msgid "Couldn't find ext2 superblock,"
msgstr ""
-#: e2fsck/unix.c:873
+#: e2fsck/unix.c:907
msgid "Group descriptors look bad..."
msgstr ""
-#: e2fsck/unix.c:884
+#: e2fsck/unix.c:918
+#, c-format
msgid ""
"The filesystem revision is apparently too high for this version of e2fsck.\n"
"(Or the filesystem superblock is corrupt)\n"
"\n"
msgstr ""
-#: e2fsck/unix.c:890
+#: e2fsck/unix.c:924
+#, c-format
msgid "Could this be a zero-length partition?\n"
msgstr ""
-#: e2fsck/unix.c:892
+#: e2fsck/unix.c:926
#, c-format
msgid "You must have %s access to the filesystem or be root\n"
msgstr ""
-#: e2fsck/unix.c:897
+#: e2fsck/unix.c:931
+#, c-format
msgid "Possibly non-existent or swap device?\n"
msgstr ""
-#: e2fsck/unix.c:900
+#: e2fsck/unix.c:934
+#, c-format
msgid ""
"Disk write-protected; use the -n option to do a read-only\n"
"check of the device.\n"
msgstr ""
-#: e2fsck/unix.c:916
+#: e2fsck/unix.c:950
msgid "Get a newer version of e2fsck!"
msgstr ""
-#: e2fsck/unix.c:937
+#: e2fsck/unix.c:971
#, c-format
msgid "while checking ext3 journal for %s"
msgstr ""
-#: e2fsck/unix.c:948
+#: e2fsck/unix.c:982
+#, c-format
msgid ""
"Warning: skipping journal recovery because doing a read-only filesystem "
"check.\n"
msgstr ""
-#: e2fsck/unix.c:961
+#: e2fsck/unix.c:995
#, c-format
msgid "unable to set superblock flags on %s\n"
msgstr ""
-#: e2fsck/unix.c:967
+#: e2fsck/unix.c:1001
#, c-format
msgid "while recovering ext3 journal of %s"
msgstr ""
-#: e2fsck/unix.c:996
+#: e2fsck/unix.c:1030
msgid "Warning: compression support is experimental.\n"
msgstr ""
-#: e2fsck/unix.c:1001
+#: e2fsck/unix.c:1035
#, c-format
msgid ""
"E2fsck not compiled with HTREE support,\n"
"\tbut filesystem %s has HTREE directories.\n"
msgstr ""
-#: e2fsck/unix.c:1044
+#: e2fsck/unix.c:1078
#, c-format
msgid "%s: Filesystem byte order already normalized.\n"
msgstr ""
-#: e2fsck/unix.c:1064
+#: e2fsck/unix.c:1098
msgid "while reading bad blocks inode"
msgstr ""
-#: e2fsck/unix.c:1066
+#: e2fsck/unix.c:1100
+#, c-format
msgid "This doesn't bode well, but we'll try to go on...\n"
msgstr ""
-#: e2fsck/unix.c:1073
+#: e2fsck/unix.c:1107
+#, c-format
msgid "Restarting e2fsck from the beginning...\n"
msgstr ""
-#: e2fsck/unix.c:1077
+#: e2fsck/unix.c:1111
msgid "while resetting context"
msgstr ""
-#: e2fsck/unix.c:1084
+#: e2fsck/unix.c:1118
#, c-format
msgid "%s: e2fsck canceled.\n"
msgstr ""
-#: e2fsck/unix.c:1089
+#: e2fsck/unix.c:1123
msgid "aborted"
msgstr ""
-#: e2fsck/unix.c:1097
+#: e2fsck/unix.c:1131
#, c-format
msgid ""
"\n"
"%s: ***** FILE SYSTEM WAS MODIFIED *****\n"
msgstr ""
-#: e2fsck/unix.c:1100
+#: e2fsck/unix.c:1134
#, c-format
msgid "%s: ***** REBOOT LINUX *****\n"
msgstr ""
-#: e2fsck/unix.c:1106
+#: e2fsck/unix.c:1140
#, c-format
msgid ""
"\n"
@@ -2335,7 +2242,7 @@ msgstr ""
msgid "during test data write, block %lu"
msgstr ""
-#: misc/badblocks.c:788 misc/util.c:152
+#: misc/badblocks.c:788 misc/util.c:158
#, c-format
msgid "%s is mounted; "
msgstr ""
@@ -2348,7 +2255,7 @@ msgstr ""
msgid "it's not safe to run badblocks!\n"
msgstr ""
-#: misc/badblocks.c:853 misc/mke2fs.c:898
+#: misc/badblocks.c:853 misc/mke2fs.c:926
#, c-format
msgid "bad block size - %s"
msgstr ""
@@ -2381,7 +2288,7 @@ msgstr ""
msgid "while trying to determine device size"
msgstr ""
-#: misc/badblocks.c:972 misc/mke2fs.c:1071
+#: misc/badblocks.c:972 misc/mke2fs.c:1099
#, c-format
msgid "bad blocks count - %s"
msgstr ""
@@ -2453,11 +2360,11 @@ msgstr ""
msgid "Couldn't allocate path variable in chattr_dir_proc"
msgstr ""
-#: misc/chattr.c:287
+#: misc/chattr.c:291
msgid "= is incompatible with - and +\n"
msgstr ""
-#: misc/chattr.c:295
+#: misc/chattr.c:299
msgid "Must use '-v', =, - or +\n"
msgstr ""
@@ -2485,10 +2392,12 @@ msgid "Backup"
msgstr ""
#: misc/dumpe2fs.c:130
+#, c-format
msgid ", Group descriptors at "
msgstr ""
#: misc/dumpe2fs.c:135
+#, c-format
msgid " Group descriptor at "
msgstr ""
@@ -2530,7 +2439,7 @@ msgstr ""
msgid "Bad blocks: %d"
msgstr ""
-#: misc/dumpe2fs.c:227 misc/tune2fs.c:150
+#: misc/dumpe2fs.c:227 misc/tune2fs.c:153
msgid "while reading journal superblock"
msgstr ""
@@ -2550,16 +2459,18 @@ msgid ""
"Journal number of users: %d\n"
msgstr ""
-#: misc/dumpe2fs.c:307 misc/mke2fs.c:1085
+#: misc/dumpe2fs.c:307 misc/mke2fs.c:1113
#, c-format
msgid "\tUsing %s\n"
msgstr ""
-#: misc/dumpe2fs.c:334 misc/e2image.c:488 misc/tune2fs.c:760 resize/main.c:230
+#: misc/dumpe2fs.c:334 misc/e2image.c:566 misc/tune2fs.c:778 resize/main.c:234
+#, c-format
msgid "Couldn't find valid filesystem superblock.\n"
msgstr ""
#: misc/dumpe2fs.c:345
+#, c-format
msgid "Note: This is a byte-swapped filesystem\n"
msgstr ""
@@ -2572,7 +2483,7 @@ msgstr ""
#: misc/e2image.c:50
#, c-format
-msgid "Usage: %s [-r] device file\n"
+msgid "Usage: %s [-r] device image_file\n"
msgstr ""
#: misc/e2image.c:61
@@ -2606,34 +2517,42 @@ msgid "e2label: cannot open %s\n"
msgstr ""
#: misc/e2label.c:62
+#, c-format
msgid "e2label: cannot seek to superblock\n"
msgstr ""
#: misc/e2label.c:67
+#, c-format
msgid "e2label: error reading superblock\n"
msgstr ""
#: misc/e2label.c:71
+#, c-format
msgid "e2label: not an ext2 filesystem\n"
msgstr ""
-#: misc/e2label.c:96 misc/tune2fs.c:867
+#: misc/e2label.c:96 misc/tune2fs.c:885
+#, c-format
msgid "Warning: label too long, truncating.\n"
msgstr ""
#: misc/e2label.c:99
+#, c-format
msgid "e2label: cannot seek to superblock again\n"
msgstr ""
#: misc/e2label.c:104
+#, c-format
msgid "e2label: error writing superblock\n"
msgstr ""
-#: misc/e2label.c:116 misc/tune2fs.c:439
+#: misc/e2label.c:116 misc/tune2fs.c:450
+#, c-format
msgid "Usage: e2label device [newlabel]\n"
msgstr ""
#: misc/findsuper.c:126
+#, c-format
msgid "Usage: findsuper device [skipbytes [startkb]]\n"
msgstr ""
@@ -2643,6 +2562,7 @@ msgid "skipbytes should be a number, not %s\n"
msgstr ""
#: misc/findsuper.c:137
+#, c-format
msgid "skipbytes must be a multiple of the sector size\n"
msgstr ""
@@ -2662,6 +2582,7 @@ msgid "starting at %Ld, with %d byte increments\n"
msgstr ""
#: misc/findsuper.c:158
+#, c-format
msgid " thisoff block fs_blk_sz blksz grp last_mount\n"
msgstr ""
@@ -2773,7 +2694,7 @@ msgstr ""
msgid "While reading version on %s"
msgstr ""
-#: misc/mke2fs.c:91
+#: misc/mke2fs.c:92
#, c-format
msgid ""
"Usage: %s [-c|-t|-l filename] [-b block-size] [-f fragment-size]\n"
@@ -2783,35 +2704,35 @@ msgid ""
"\t[-r fs-revision] [-R raid_opts] [-qvSV] device [blocks-count]\n"
msgstr ""
-#: misc/mke2fs.c:235
+#: misc/mke2fs.c:264
#, c-format
msgid "Running command: %s\n"
msgstr ""
-#: misc/mke2fs.c:239
+#: misc/mke2fs.c:268
#, c-format
msgid "while trying run '%s'"
msgstr ""
-#: misc/mke2fs.c:246
+#: misc/mke2fs.c:275
msgid "while processing list of bad blocks from program"
msgstr ""
-#: misc/mke2fs.c:273
+#: misc/mke2fs.c:302
#, c-format
msgid "Block %d in primary superblock/group descriptor area bad.\n"
msgstr ""
-#: misc/mke2fs.c:275
+#: misc/mke2fs.c:304
#, c-format
msgid "Blocks %d through %d must be good in order to build a filesystem.\n"
msgstr ""
-#: misc/mke2fs.c:278
+#: misc/mke2fs.c:307
msgid "Aborting....\n"
msgstr ""
-#: misc/mke2fs.c:298
+#: misc/mke2fs.c:327
#, c-format
msgid ""
"Warning: the backup superblock/group descriptors at block %d contain\n"
@@ -2819,167 +2740,171 @@ msgid ""
"\n"
msgstr ""
-#: misc/mke2fs.c:316
+#: misc/mke2fs.c:345
msgid "while marking bad blocks as used"
msgstr ""
-#: misc/mke2fs.c:374
+#: misc/mke2fs.c:403
msgid "done \n"
msgstr ""
-#: misc/mke2fs.c:409
+#: misc/mke2fs.c:438
msgid "while allocating zeroizing buffer"
msgstr ""
-#: misc/mke2fs.c:450
+#: misc/mke2fs.c:479
msgid "Writing inode tables: "
msgstr ""
-#: misc/mke2fs.c:461
+#: misc/mke2fs.c:490
#, c-format
msgid ""
"\n"
"Could not write %d blocks in inode table starting at %d: %s\n"
msgstr ""
-#: misc/mke2fs.c:484
+#: misc/mke2fs.c:513
msgid "while creating root dir"
msgstr ""
-#: misc/mke2fs.c:491
+#: misc/mke2fs.c:520
msgid "while reading root inode"
msgstr ""
-#: misc/mke2fs.c:500
+#: misc/mke2fs.c:529
msgid "while setting root inode ownership"
msgstr ""
-#: misc/mke2fs.c:518
+#: misc/mke2fs.c:547
msgid "while creating /lost+found"
msgstr ""
-#: misc/mke2fs.c:525
+#: misc/mke2fs.c:554
msgid "while looking up /lost+found"
msgstr ""
-#: misc/mke2fs.c:535
+#: misc/mke2fs.c:564
msgid "while expanding /lost+found"
msgstr ""
-#: misc/mke2fs.c:551
+#: misc/mke2fs.c:580
msgid "while setting bad block inode"
msgstr ""
-#: misc/mke2fs.c:583
+#: misc/mke2fs.c:612
#, c-format
msgid "Out of memory erasing sectors %d-%d\n"
msgstr ""
-#: misc/mke2fs.c:593
+#: misc/mke2fs.c:622
#, c-format
msgid "Warning: could not read block 0: %s\n"
msgstr ""
-#: misc/mke2fs.c:609
+#: misc/mke2fs.c:638
#, c-format
msgid "Warning: could not erase sector %d: %s\n"
msgstr ""
-#: misc/mke2fs.c:625
+#: misc/mke2fs.c:654
msgid "while initializing journal superblock"
msgstr ""
-#: misc/mke2fs.c:631
+#: misc/mke2fs.c:660
msgid "Zeroing journal device: "
msgstr ""
-#: misc/mke2fs.c:638
+#: misc/mke2fs.c:667
#, c-format
msgid "while zeroing journal device (block %u, count %d)"
msgstr ""
-#: misc/mke2fs.c:649
+#: misc/mke2fs.c:678
msgid "while writing journal superblock"
msgstr ""
-#: misc/mke2fs.c:664
+#: misc/mke2fs.c:693
#, c-format
msgid ""
"warning: %d blocks unused.\n"
"\n"
msgstr ""
-#: misc/mke2fs.c:669
+#: misc/mke2fs.c:698
#, c-format
msgid "Filesystem label=%s\n"
msgstr ""
-#: misc/mke2fs.c:670
+#: misc/mke2fs.c:699
msgid "OS type: "
msgstr ""
-#: misc/mke2fs.c:675
+#: misc/mke2fs.c:704
msgid "(unknown os)"
msgstr ""
-#: misc/mke2fs.c:678
+#: misc/mke2fs.c:707
#, c-format
msgid "Block size=%u (log=%u)\n"
msgstr ""
-#: misc/mke2fs.c:680
+#: misc/mke2fs.c:709
#, c-format
msgid "Fragment size=%u (log=%u)\n"
msgstr ""
-#: misc/mke2fs.c:682
+#: misc/mke2fs.c:711
#, c-format
msgid "%u inodes, %u blocks\n"
msgstr ""
-#: misc/mke2fs.c:684
+#: misc/mke2fs.c:713
#, c-format
msgid "%u blocks (%2.2f%%) reserved for the super user\n"
msgstr ""
-#: misc/mke2fs.c:687
+#: misc/mke2fs.c:716
#, c-format
msgid "First data block=%u\n"
msgstr ""
-#: misc/mke2fs.c:689
+#: misc/mke2fs.c:718
#, c-format
msgid "%u block groups\n"
msgstr ""
-#: misc/mke2fs.c:691
+#: misc/mke2fs.c:720
#, c-format
msgid "%u block group\n"
msgstr ""
-#: misc/mke2fs.c:692
+#: misc/mke2fs.c:721
#, c-format
msgid "%u blocks per group, %u fragments per group\n"
msgstr ""
-#: misc/mke2fs.c:694
+#: misc/mke2fs.c:723
#, c-format
msgid "%u inodes per group\n"
msgstr ""
-#: misc/mke2fs.c:701
+#: misc/mke2fs.c:730
+#, c-format
msgid "Superblock backups stored on blocks: "
msgstr ""
-#: misc/mke2fs.c:751
+#: misc/mke2fs.c:780
+#, c-format
msgid "Couldn't allocate memory to parse raid options!\n"
msgstr ""
-#: misc/mke2fs.c:776
+#: misc/mke2fs.c:805
+#, c-format
msgid "Invalid stride parameter.\n"
msgstr ""
-#: misc/mke2fs.c:784
+#: misc/mke2fs.c:813
+#, c-format
msgid ""
"\n"
"Bad raid options specified.\n"
@@ -2992,88 +2917,89 @@ msgid ""
"\n"
msgstr ""
-#: misc/mke2fs.c:902
+#: misc/mke2fs.c:930
#, c-format
msgid "Warning: blocksize %d not usable on most systems.\n"
msgstr ""
-#: misc/mke2fs.c:919
+#: misc/mke2fs.c:947
#, c-format
msgid "bad fragment size - %s"
msgstr ""
-#: misc/mke2fs.c:925
+#: misc/mke2fs.c:953
+#, c-format
msgid "Warning: fragments not supported. Ignoring -f option\n"
msgstr ""
-#: misc/mke2fs.c:932
+#: misc/mke2fs.c:960
msgid "Illegal number for blocks per group"
msgstr ""
-#: misc/mke2fs.c:937
+#: misc/mke2fs.c:965
msgid "blocks per group must be multiple of 8"
msgstr ""
-#: misc/mke2fs.c:947
+#: misc/mke2fs.c:975
#, c-format
msgid "bad inode ratio %s (min %d/max %d"
msgstr ""
-#: misc/mke2fs.c:966
+#: misc/mke2fs.c:994
msgid "in malloc for bad_blocks_filename"
msgstr ""
-#: misc/mke2fs.c:975
+#: misc/mke2fs.c:1003
#, c-format
msgid "bad reserved blocks percent - %s"
msgstr ""
-#: misc/mke2fs.c:1007
+#: misc/mke2fs.c:1035
#, c-format
msgid "bad inode size - %s"
msgstr ""
-#: misc/mke2fs.c:1043 misc/tune2fs.c:294
+#: misc/mke2fs.c:1071 misc/tune2fs.c:302
#, c-format
msgid "Invalid filesystem option set: %s\n"
msgstr ""
-#: misc/mke2fs.c:1112 misc/mke2fs.c:1449
+#: misc/mke2fs.c:1140 misc/mke2fs.c:1477
#, c-format
msgid "while trying to open journal device %s\n"
msgstr ""
-#: misc/mke2fs.c:1118
+#: misc/mke2fs.c:1146
#, c-format
msgid "Journal dev blocksize (%d) smaller than minimum blocksize %d\n"
msgstr ""
-#: misc/mke2fs.c:1132
+#: misc/mke2fs.c:1160
#, c-format
msgid "%d-byte blocks too big for system (max %d)"
msgstr ""
-#: misc/mke2fs.c:1136
+#: misc/mke2fs.c:1164
#, c-format
msgid ""
"Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
msgstr ""
-#: misc/mke2fs.c:1161
+#: misc/mke2fs.c:1189
msgid "filesystem"
msgstr ""
-#: misc/mke2fs.c:1174 resize/main.c:264
+#: misc/mke2fs.c:1202 resize/main.c:268
msgid "while trying to determine filesystem size"
msgstr ""
-#: misc/mke2fs.c:1180
+#: misc/mke2fs.c:1208
msgid ""
"Couldn't determine device size; you must specify\n"
"the size of the filesystem\n"
msgstr ""
-#: misc/mke2fs.c:1187
+#: misc/mke2fs.c:1215
msgid ""
"Device size reported to be zero. Invalid partition specified, or\n"
"\tpartition table wasn't reread after running fdisk, due to\n"
@@ -3081,94 +3007,99 @@ msgid ""
"\tto re-read your partition table.\n"
msgstr ""
-#: misc/mke2fs.c:1205
+#: misc/mke2fs.c:1233
msgid "Filesystem larger than apparent device size."
msgstr ""
-#: misc/mke2fs.c:1227
+#: misc/mke2fs.c:1255
msgid "while trying to determine hardware sector size"
msgstr ""
-#: misc/mke2fs.c:1241
+#: misc/mke2fs.c:1269
msgid "blocks per group count out of range"
msgstr ""
-#: misc/mke2fs.c:1251
+#: misc/mke2fs.c:1279
#, c-format
msgid "bad inode size %d (min %d/max %d)"
msgstr ""
-#: misc/mke2fs.c:1257
+#: misc/mke2fs.c:1285
#, c-format
msgid "Warning: %d-byte inodes not usable on most systems\n"
msgstr ""
-#: misc/mke2fs.c:1308
+#: misc/mke2fs.c:1336
msgid "while setting up superblock"
msgstr ""
-#: misc/mke2fs.c:1342
+#: misc/mke2fs.c:1370
#, c-format
msgid "unknown os - %s"
msgstr ""
-#: misc/mke2fs.c:1396
+#: misc/mke2fs.c:1424
msgid "while trying to allocate filesystem tables"
msgstr ""
-#: misc/mke2fs.c:1427
+#: misc/mke2fs.c:1455
#, c-format
msgid "while zeroing block %u at end of filesystem"
msgstr ""
-#: misc/mke2fs.c:1442 misc/tune2fs.c:376
+#: misc/mke2fs.c:1470 misc/tune2fs.c:387
msgid "journal"
msgstr ""
-#: misc/mke2fs.c:1454
+#: misc/mke2fs.c:1482
#, c-format
msgid "Adding journal to device %s: "
msgstr ""
-#: misc/mke2fs.c:1461
+#: misc/mke2fs.c:1489
#, c-format
msgid ""
"\n"
"\twhile trying to add journal to device %s"
msgstr ""
-#: misc/mke2fs.c:1466 misc/mke2fs.c:1490 misc/tune2fs.c:404 misc/tune2fs.c:418
+#: misc/mke2fs.c:1494 misc/mke2fs.c:1518 misc/tune2fs.c:415 misc/tune2fs.c:429
+#, c-format
msgid "done\n"
msgstr ""
-#: misc/mke2fs.c:1478
+#: misc/mke2fs.c:1506
#, c-format
msgid "Creating journal (%d blocks): "
msgstr ""
-#: misc/mke2fs.c:1486
+#: misc/mke2fs.c:1514
msgid ""
"\n"
"\twhile trying to create journal"
msgstr ""
-#: misc/mke2fs.c:1495
+#: misc/mke2fs.c:1523
+#, c-format
msgid "Writing superblocks and filesystem accounting information: "
msgstr ""
-#: misc/mke2fs.c:1500
+#: misc/mke2fs.c:1528
+#, c-format
msgid ""
"\n"
"Warning, had trouble writing out superblocks."
msgstr ""
-#: misc/mke2fs.c:1503
+#: misc/mke2fs.c:1531
+#, c-format
msgid ""
"done\n"
"\n"
msgstr ""
-#: misc/mklost+found.c:48
+#: misc/mklost+found.c:49
+#, c-format
msgid "Usage: mklost+found\n"
msgstr ""
@@ -3197,11 +3128,11 @@ msgstr ""
msgid "BLKGETSIZE ioctl"
msgstr ""
-#: misc/tune2fs.c:74
+#: misc/tune2fs.c:77
msgid "Please run e2fsck on the filesystem.\n"
msgstr ""
-#: misc/tune2fs.c:81
+#: misc/tune2fs.c:84
#, c-format
msgid ""
"Usage: %s [-c max-mounts-count] [-e errors-behavior] [-g group]\n"
@@ -3212,220 +3143,220 @@ msgid ""
"\t[-O [^]feature[,...]] [-T last-check-time] [-U UUID] device\n"
msgstr ""
-#: misc/tune2fs.c:138
+#: misc/tune2fs.c:141
msgid "while trying to open external journal"
msgstr ""
-#: misc/tune2fs.c:142
+#: misc/tune2fs.c:145
#, c-format
msgid "%s is not a journal device.\n"
msgstr ""
-#: misc/tune2fs.c:157
+#: misc/tune2fs.c:160
msgid "Journal superblock not found!\n"
msgstr ""
-#: misc/tune2fs.c:169
+#: misc/tune2fs.c:172
msgid "Filesystem's UUID not found on journal device.\n"
msgstr ""
-#: misc/tune2fs.c:190
+#: misc/tune2fs.c:193
msgid "Journal NOT removed\n"
msgstr ""
-#: misc/tune2fs.c:196
+#: misc/tune2fs.c:199
msgid "Journal removed\n"
msgstr ""
-#: misc/tune2fs.c:228
+#: misc/tune2fs.c:231
msgid "while reading journal inode"
msgstr ""
-#: misc/tune2fs.c:235
+#: misc/tune2fs.c:238
msgid "while reading bitmaps"
msgstr ""
-#: misc/tune2fs.c:242
+#: misc/tune2fs.c:245
msgid "while clearing journal inode"
msgstr ""
-#: misc/tune2fs.c:253
+#: misc/tune2fs.c:256
msgid "while writing journal inode"
msgstr ""
-#: misc/tune2fs.c:268
+#: misc/tune2fs.c:271
#, c-format
msgid "Invalid mount option set: %s\n"
msgstr ""
-#: misc/tune2fs.c:309
+#: misc/tune2fs.c:317
msgid ""
"The has_journal flag may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
msgstr ""
-#: misc/tune2fs.c:317
+#: misc/tune2fs.c:325
msgid ""
"The needs_recovery flag is set. Please run e2fsck before clearing\n"
"the has_journal flag.\n"
msgstr ""
-#: misc/tune2fs.c:371
+#: misc/tune2fs.c:382
msgid "The filesystem already has a journal.\n"
msgstr ""
-#: misc/tune2fs.c:388
+#: misc/tune2fs.c:399
#, c-format
msgid ""
"\n"
"\twhile trying to open journal on %s\n"
msgstr ""
-#: misc/tune2fs.c:392
+#: misc/tune2fs.c:403
#, c-format
msgid "Creating journal on device %s: "
msgstr ""
-#: misc/tune2fs.c:400
+#: misc/tune2fs.c:411
#, c-format
msgid "while adding filesystem to journal on %s"
msgstr ""
-#: misc/tune2fs.c:406
+#: misc/tune2fs.c:417
msgid "Creating journal inode: "
msgstr ""
-#: misc/tune2fs.c:415
+#: misc/tune2fs.c:426
msgid ""
"\n"
"\twhile trying to create journal file"
msgstr ""
-#: misc/tune2fs.c:478
+#: misc/tune2fs.c:492
#, c-format
msgid "Couldn't parse date/time specifier: %s"
msgstr ""
-#: misc/tune2fs.c:500 misc/tune2fs.c:513
+#: misc/tune2fs.c:514 misc/tune2fs.c:527
#, c-format
msgid "bad mounts count - %s"
msgstr ""
-#: misc/tune2fs.c:529
+#: misc/tune2fs.c:543
#, c-format
msgid "bad error behavior - %s"
msgstr ""
-#: misc/tune2fs.c:552
+#: misc/tune2fs.c:566
#, c-format
msgid "bad gid/group name - %s"
msgstr ""
-#: misc/tune2fs.c:585
+#: misc/tune2fs.c:599
#, c-format
msgid "bad interval - %s"
msgstr ""
-#: misc/tune2fs.c:613
+#: misc/tune2fs.c:627
#, c-format
msgid "bad reserved block ratio - %s"
msgstr ""
-#: misc/tune2fs.c:628
+#: misc/tune2fs.c:642
msgid "-o may only be specified once"
msgstr ""
-#: misc/tune2fs.c:638
+#: misc/tune2fs.c:652
msgid "-O may only be specified once"
msgstr ""
-#: misc/tune2fs.c:648
+#: misc/tune2fs.c:662
#, c-format
msgid "bad reserved blocks count - %s"
msgstr ""
-#: misc/tune2fs.c:677
+#: misc/tune2fs.c:691
#, c-format
msgid "bad uid/user name - %s"
msgstr ""
-#: misc/tune2fs.c:783
+#: misc/tune2fs.c:801
#, c-format
msgid "Setting maximal mount count to %d\n"
msgstr ""
-#: misc/tune2fs.c:789
+#: misc/tune2fs.c:807
#, c-format
msgid "Setting current mount count to %d\n"
msgstr ""
-#: misc/tune2fs.c:794
+#: misc/tune2fs.c:812
#, c-format
msgid "Setting error behavior to %d\n"
msgstr ""
-#: misc/tune2fs.c:799
+#: misc/tune2fs.c:817
#, c-format
msgid "Setting reserved blocks gid to %lu\n"
msgstr ""
-#: misc/tune2fs.c:804
+#: misc/tune2fs.c:822
#, c-format
msgid "Setting interval between check %lu seconds\n"
msgstr ""
-#: misc/tune2fs.c:810
+#: misc/tune2fs.c:828
#, c-format
msgid "Setting reserved blocks percentage to %lu (%u blocks)\n"
msgstr ""
-#: misc/tune2fs.c:816
+#: misc/tune2fs.c:834
#, c-format
msgid "reserved blocks count is too big (%lu)"
msgstr ""
-#: misc/tune2fs.c:822
+#: misc/tune2fs.c:840
#, c-format
msgid "Setting reserved blocks count to %lu\n"
msgstr ""
-#: misc/tune2fs.c:828
+#: misc/tune2fs.c:846
msgid ""
"\n"
"The filesystem already has sparse superblocks.\n"
msgstr ""
-#: misc/tune2fs.c:835
+#: misc/tune2fs.c:853
#, c-format
msgid ""
"\n"
"Sparse superblock flag set. %s"
msgstr ""
-#: misc/tune2fs.c:842
+#: misc/tune2fs.c:860
msgid ""
"\n"
"The filesystem already has sparse superblocks disabled.\n"
msgstr ""
-#: misc/tune2fs.c:850
+#: misc/tune2fs.c:868
#, c-format
msgid ""
"\n"
"Sparse superblock flag cleared. %s"
msgstr ""
-#: misc/tune2fs.c:857
+#: misc/tune2fs.c:875
#, c-format
msgid "Setting time filesystem last checked to %s\n"
msgstr ""
-#: misc/tune2fs.c:863
+#: misc/tune2fs.c:881
#, c-format
msgid "Setting reserved blocks uid to %lu\n"
msgstr ""
-#: misc/tune2fs.c:896
+#: misc/tune2fs.c:914
msgid "Invalid UUID format\n"
msgstr ""
@@ -3444,30 +3375,30 @@ msgid ""
"The device apparently does not exist; did you specify it correctly?\n"
msgstr ""
-#: misc/util.c:101
+#: misc/util.c:107
#, c-format
msgid "%s is not a block special device.\n"
msgstr ""
-#: misc/util.c:130
+#: misc/util.c:136
#, c-format
msgid "%s is entire device, not just one partition!\n"
msgstr ""
-#: misc/util.c:154
+#: misc/util.c:160
msgid "mke2fs forced anyway. Hope /etc/mtab is incorrect.\n"
msgstr ""
-#: misc/util.c:157
+#: misc/util.c:163
#, c-format
msgid "will not make a %s here!\n"
msgstr ""
-#: misc/util.c:171
+#: misc/util.c:177
msgid "Couldn't allocate memory to parse journal options!\n"
msgstr ""
-#: misc/util.c:213
+#: misc/util.c:219
msgid ""
"\n"
"Bad journal options specified.\n"
@@ -3483,13 +3414,13 @@ msgid ""
"\n"
msgstr ""
-#: misc/util.c:240
+#: misc/util.c:246
msgid ""
"\n"
"Filesystem too small for a journal\n"
msgstr ""
-#: misc/util.c:247
+#: misc/util.c:253
#, c-format
msgid ""
"\n"
@@ -3497,13 +3428,13 @@ msgid ""
"between 1024 and 102400 blocks. Aborting.\n"
msgstr ""
-#: misc/util.c:255
+#: misc/util.c:261
msgid ""
"\n"
"Journal size too big for filesystem.\n"
msgstr ""
-#: misc/util.c:274
+#: misc/util.c:280
#, c-format
msgid ""
"This filesystem will be automatically checked every %d mounts or\n"
@@ -3582,7 +3513,7 @@ msgstr ""
msgid "bad filesystem size - %s"
msgstr ""
-#: resize/main.c:296
+#: resize/main.c:300
#, c-format
msgid ""
"The containing partition (or device) is only %d (%dk) blocks.\n"
@@ -3590,83 +3521,85 @@ msgid ""
"\n"
msgstr ""
-#: resize/main.c:303
+#: resize/main.c:307
#, c-format
msgid ""
"The filesystem is already %d blocks long. Nothing to do!\n"
"\n"
msgstr ""
-#: resize/main.c:310
+#: resize/main.c:314
#, c-format
msgid ""
"Please run 'e2fsck -f %s' first.\n"
"\n"
msgstr ""
-#: resize/main.c:320
+#: resize/main.c:324
#, c-format
msgid "while trying to resize %s"
msgstr ""
-#: resize/main.c:325
+#: resize/main.c:329
#, c-format
msgid ""
"The filesystem on %s is now %d blocks long.\n"
"\n"
msgstr ""
-#: resize/resize2fs.c:109
+#: resize/resize2fs.c:110
#, c-format
msgid "Number of free blocks: %d/%d, Needed: %d\n"
msgstr ""
-#: resize/resize2fs.c:458
+#: resize/resize2fs.c:459
msgid "meta-data blocks"
msgstr ""
-#: resize/resize2fs.c:581
+#: resize/resize2fs.c:582
msgid "reserved blocks"
msgstr ""
-#: resize/resize2fs.c:586
+#: resize/resize2fs.c:587
msgid "blocks to be moved"
msgstr ""
-#: resize/resize2fs.c:816
+#: resize/resize2fs.c:817
+#, c-format
msgid "Going into desperation mode for block allocations\n"
msgstr ""
-#: resize/resize2fs.c:920
+#: resize/resize2fs.c:921
#, c-format
msgid "Moving %d blocks %u->%u\n"
msgstr ""
-#: resize/resize2fs.c:997
+#: resize/resize2fs.c:998
#, c-format
msgid "ino=%u, blockcnt=%lld, %u->%u\n"
msgstr ""
-#: resize/resize2fs.c:1165
+#: resize/resize2fs.c:1166
#, c-format
msgid "Inode moved %u->%u\n"
msgstr ""
-#: resize/resize2fs.c:1233
+#: resize/resize2fs.c:1234
#, c-format
msgid "Inode translate (dir=%u, name=%.*s, %u->%u)\n"
msgstr ""
-#: resize/resize2fs.c:1360
+#: resize/resize2fs.c:1361
#, c-format
msgid "Itable move group %d block %u->%u (diff %d)\n"
msgstr ""
-#: resize/resize2fs.c:1386
+#: resize/resize2fs.c:1387
#, c-format
msgid "%d blocks of zeros...\n"
msgstr ""
-#: resize/resize2fs.c:1421
+#: resize/resize2fs.c:1422
+#, c-format
msgid "Inode table move finished.\n"
msgstr ""
diff --git a/po/es.gmo b/po/es.gmo
new file mode 100644
index 00000000..435a7a64
--- /dev/null
+++ b/po/es.gmo
Binary files differ
diff --git a/po/es.po b/po/es.po
index ef430544..4bc902ed 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: e2fsprogs 1.34\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-24 14:17-0500\n"
+"Report-Msgid-Bugs-To: tytso@alum.mit.edu\n"
+"POT-Creation-Date: 2004-11-30 18:46-0500\n"
"PO-Revision-Date: 2003-12-24 14:12-0500\n"
"Last-Translator: Max de Mendizbal <max@upn.mx>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Transfer-Encoding: 8-bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: e2fsck/badblocks.c:22 misc/mke2fs.c:194
+#: e2fsck/badblocks.c:22 misc/mke2fs.c:223
#, c-format
msgid "Bad block %u out of range; ignored.\n"
msgstr "Bloque malo %u fuera del intervalo; se ignora.\n"
@@ -29,10 +29,10 @@ msgid "while reading the bad blocks inode"
msgstr "mientras se lea el nodo i de bloques malos"
#: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
-#: e2fsck/unix.c:881 e2fsck/unix.c:913 misc/badblocks.c:997
+#: e2fsck/unix.c:915 e2fsck/unix.c:947 misc/badblocks.c:997
#: misc/badblocks.c:1005 misc/badblocks.c:1019 misc/badblocks.c:1031
-#: misc/dumpe2fs.c:332 misc/e2image.c:486 misc/e2image.c:502 misc/mke2fs.c:210
-#: misc/tune2fs.c:757 resize/main.c:228
+#: misc/dumpe2fs.c:332 misc/e2image.c:475 misc/e2image.c:564
+#: misc/e2image.c:580 misc/mke2fs.c:239 misc/tune2fs.c:775 resize/main.c:232
#, c-format
msgid "while trying to open %s"
msgstr "mientras se intentaba abrir %s"
@@ -42,7 +42,7 @@ msgstr "mientras se intentaba abrir %s"
msgid "while trying popen '%s'"
msgstr "mientras se intentaba un popen a '%s'"
-#: e2fsck/badblocks.c:93 misc/mke2fs.c:217
+#: e2fsck/badblocks.c:93 misc/mke2fs.c:246
msgid "while reading in list of bad blocks from file"
msgstr "mientras se lea una lista de bloques malos desde un fichero"
@@ -104,6 +104,7 @@ msgid "%s: %s filename nblocks blocksize\n"
msgstr "%s: %s fichero nbloques tamaodelbloque\n"
#: e2fsck/extend.c:43
+#, c-format
msgid "Illegal number of blocks!\n"
msgstr "Nmero ilegal de bloques!\n"
@@ -118,6 +119,7 @@ msgid "Usage: %s disk\n"
msgstr "Modo de empleo: %s disco\n"
#: e2fsck/flushb.c:63
+#, c-format
msgid "BLKFLSBUF ioctl not supported! Can't flush buffers.\n"
msgstr "No est implementado el BLKFLSBUF! No puedo vaciar los bfers.\n"
@@ -126,12 +128,12 @@ msgstr "No est implementado el BLKFLSBUF! No puedo vaciar los bfers.\n"
msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n"
msgstr "Modo de empleo: %s [-F] [-I bfer_de_bloques_del_nodo_i] dispositivo\n"
-#: e2fsck/iscan.c:83 e2fsck/unix.c:701 resize/main.c:205
+#: e2fsck/iscan.c:83 e2fsck/unix.c:729 resize/main.c:209
#, c-format
msgid "while opening %s for flushing"
msgstr "mientras se abra %s para su vaciado"
-#: e2fsck/iscan.c:88 e2fsck/unix.c:707 resize/main.c:212
+#: e2fsck/iscan.c:88 e2fsck/unix.c:735 resize/main.c:216
#, c-format
msgid "while trying to flush %s"
msgstr "mientras se intentaba vaciar %s"
@@ -149,34 +151,34 @@ msgstr "mientras se obtena el siguiente nodo i"
msgid "%d inodes scanned.\n"
msgstr "%d nodos i explorados.\n"
-#: e2fsck/journal.c:449
+#: e2fsck/journal.c:463
msgid "reading journal superblock\n"
msgstr "leyendo el sper bloque del archivo de transacciones\n"
-#: e2fsck/journal.c:506
+#: e2fsck/journal.c:520
#, c-format
msgid "%s: no valid journal superblock found\n"
msgstr ""
"%s: se encontr un sper bloque no vlido del archivo de transacciones\n"
-#: e2fsck/journal.c:515
+#: e2fsck/journal.c:529
#, c-format
msgid "%s: journal too short\n"
msgstr "%s: el fichero de transacciones es demasiado corto\n"
-#: e2fsck/journal.c:787
+#: e2fsck/journal.c:802
#, c-format
msgid "%s: recovering journal\n"
msgstr "%s: recuperando el fichero de transacciones\n"
-#: e2fsck/journal.c:789
+#: e2fsck/journal.c:804
#, c-format
msgid "%s: won't do journal recovery while read-only\n"
msgstr ""
"%s: no se puede hacer la recuperacin del fichero de transacciones en modo "
"de slo lectura\n"
-#: e2fsck/journal.c:810
+#: e2fsck/journal.c:825
#, c-format
msgid "while trying to re-open %s"
msgstr "mientras se intentaba reabrir %s"
@@ -333,77 +335,77 @@ msgstr "<El nodo i 10 reservado>"
msgid "multiply claimed inode map"
msgstr "<El mapa de nodos i reclamado muchas veces>"
-#: e2fsck/pass1b.c:551 e2fsck/pass1b.c:688
+#: e2fsck/pass1b.c:554 e2fsck/pass1b.c:691
#, c-format
msgid "internal error; can't find dup_blk for %d\n"
msgstr "error interno; no se encontr el dup_blk para %d\n"
-#: e2fsck/pass1b.c:731
+#: e2fsck/pass1b.c:734
msgid "returned from clone_file_block"
msgstr "regresado del clone_file_block"
-#: e2fsck/pass1.c:297
+#: e2fsck/pass1.c:298
msgid "in-use inode map"
msgstr "el mapa de nodos i est en uso"
-#: e2fsck/pass1.c:306
+#: e2fsck/pass1.c:307
msgid "directory inode map"
msgstr "directorio del mapa de nodos i"
-#: e2fsck/pass1.c:314
+#: e2fsck/pass1.c:315
msgid "regular file inode map"
msgstr "mapa de nodos i de fichero regular"
-#: e2fsck/pass1.c:321
+#: e2fsck/pass1.c:322
msgid "in-use block map"
msgstr "mapa de bloques en uso"
-#: e2fsck/pass1.c:368
+#: e2fsck/pass1.c:369
msgid "doing inode scan"
msgstr "haciendo la exploracin del nodo i"
-#: e2fsck/pass1.c:751
+#: e2fsck/pass1.c:752
msgid "Pass 1"
msgstr "Paso 1"
-#: e2fsck/pass1.c:810
+#: e2fsck/pass1.c:811
#, c-format
msgid "reading indirect blocks of inode %u"
msgstr "leyendo bloques indirectos del nodo i %u"
-#: e2fsck/pass1.c:852
+#: e2fsck/pass1.c:853
msgid "bad inode map"
msgstr "mapa de nodos i malos"
-#: e2fsck/pass1.c:874
+#: e2fsck/pass1.c:875
msgid "inode in bad block map"
msgstr "el nodo i est en el mapa de bloques malos"
-#: e2fsck/pass1.c:894
+#: e2fsck/pass1.c:895
msgid "imagic inode map"
msgstr "mapa de nodos i mgico i"
-#: e2fsck/pass1.c:921
+#: e2fsck/pass1.c:922
msgid "multiply claimed block map"
msgstr "mapa de bloques reclamado muchas veces"
-#: e2fsck/pass1.c:1020
+#: e2fsck/pass1.c:1021
msgid "ext attr block map"
msgstr "mapa de bloques de atributos extentidos"
-#: e2fsck/pass1.c:1782
+#: e2fsck/pass1.c:1783
msgid "block bitmap"
msgstr "mapa de bits del bloque"
-#: e2fsck/pass1.c:1786
+#: e2fsck/pass1.c:1787
msgid "inode bitmap"
msgstr "mapa de bits del nodo i"
-#: e2fsck/pass1.c:1790
+#: e2fsck/pass1.c:1791
msgid "inode table"
msgstr "tabla de nodos i"
-#: e2fsck/pass2.c:293
+#: e2fsck/pass2.c:294
msgid "Pass 2"
msgstr "Paso 2"
@@ -1733,7 +1735,7 @@ msgstr "Error interno: el final del bitmap no tiene sentido (%N)\n"
msgid "Unhandled error code (0x%x)!\n"
msgstr "Cdigo de error no previsto (0x%x)!\n"
-#: e2fsck/problem.c:1594
+#: e2fsck/problem.c:1595
msgid "IGNORED"
msgstr "IGNORADO"
@@ -1796,6 +1798,7 @@ msgid "while writing inode table (group %d)"
msgstr "mientras se escriba la tabla de nodos i (grupo %d)"
#: e2fsck/swapfs.c:222
+#, c-format
msgid "Pass 0: Doing byte-swap of filesystem\n"
msgstr "Paso 0: haciendo el intercambio de bytes del sistema de ficheros\n"
@@ -1813,7 +1816,7 @@ msgstr ""
msgid "Byte swap"
msgstr "Intercambio de bytes"
-#: e2fsck/unix.c:67
+#: e2fsck/unix.c:74
#, c-format
msgid ""
"Usage: %s [-panyrcdfvstDFSV] [-b superblock] [-B blocksize]\n"
@@ -1827,7 +1830,8 @@ msgstr ""
"ext]\n"
"\t\t[-E opciones-extendidas] dispositivo\n"
-#: e2fsck/unix.c:73
+#: e2fsck/unix.c:80
+#, c-format
msgid ""
"\n"
"Emergency help:\n"
@@ -1848,7 +1852,8 @@ msgstr ""
" -f Fuerza la revisin an si el sistema de archivos \n"
" est marcado como limpio\n"
-#: e2fsck/unix.c:79
+#: e2fsck/unix.c:86
+#, c-format
msgid ""
" -v Be verbose\n"
" -b superblock Use alternative superblock\n"
@@ -1869,154 +1874,33 @@ msgstr ""
" -L fichero_de_bloques_malos \n"
" Pone la lista de bloques malos\n"
-#: e2fsck/unix.c:113
+#: e2fsck/unix.c:120
#, c-format
msgid "%s: %d/%d files (%0d.%d%% non-contiguous), %d/%d blocks\n"
msgstr "%s: ficheros %d/%d (%0d.%d%% no contiguos), bloques %d/%d\n"
-#: e2fsck/unix.c:119
-#, c-format
-msgid ""
-"\n"
-"%8d inode used (%d%%)\n"
-msgid_plural ""
-"\n"
-"%8d inodes used (%d%%)\n"
-msgstr[0] ""
-"\n"
-"%8d nodo i utilizado (%d%%)\n"
-msgstr[1] ""
-"\n"
-"%8d nodos i utilizados (%d%%)\n"
-
-#: e2fsck/unix.c:121
-#, c-format
-msgid "%8d non-contiguous inode (%0d.%d%%)\n"
-msgid_plural "%8d non-contiguous inodes (%0d.%d%%)\n"
-msgstr[0] "%8d nodo i no contiguo (%0d.%d%%)\n"
-msgstr[1] "%8d nodos i no contiguos (%0d.%d%%)\n"
-
-#: e2fsck/unix.c:125
+#: e2fsck/unix.c:132
#, c-format
msgid " # of inodes with ind/dind/tind blocks: %d/%d/%d\n"
msgstr " # de nodos i con bloques ind/dind/tind: %d/%d/%d\n"
-#: e2fsck/unix.c:127
-#, c-format
-msgid "%8d block used (%d%%)\n"
-msgid_plural "%8d blocks used (%d%%)\n"
-msgstr[0] "%8d bloque usado (%d%%)\n"
-msgstr[1] "%d bloques usados (%d%%)\n"
-
-#: e2fsck/unix.c:130
-#, c-format
-msgid "%8d bad block\n"
-msgid_plural "%8d bad blocks\n"
-msgstr[0] "%8d bloque malo\n"
-msgstr[1] "%8d bloques malos\n"
-
-#: e2fsck/unix.c:132
-#, c-format
-msgid "%8d large file\n"
-msgid_plural "%8d large files\n"
-msgstr[0] "%8d fichero grande\n"
-msgstr[1] "%8d ficheros grandes\n"
-
-#: e2fsck/unix.c:134
-#, c-format
-msgid ""
-"\n"
-"%8d regular file\n"
-msgid_plural ""
-"\n"
-"%8d regular files\n"
-msgstr[0] ""
-"\n"
-"%8d fichero regular\n"
-msgstr[1] ""
-"\n"
-"%8d ficheros regulares\n"
-
-#: e2fsck/unix.c:136
-#, c-format
-msgid "%8d directory\n"
-msgid_plural "%8d directories\n"
-msgstr[0] "%8d directorio\n"
-msgstr[1] "%8d directorios\n"
-
-#: e2fsck/unix.c:138
-#, c-format
-msgid "%8d character device file\n"
-msgid_plural "%8d character device files\n"
-msgstr[0] "%8d fichero de dispositivo tipo carcter\n"
-msgstr[1] "%8d ficheros de dispositivo tipo carcter\n"
-
-#: e2fsck/unix.c:141
-#, c-format
-msgid "%8d block device file\n"
-msgid_plural "%8d block device files\n"
-msgstr[0] "%8d fichero de dispositivo tipo bloque\n"
-msgstr[1] "%8d ficheros de dispositivo tipo bloque\n"
-
-#: e2fsck/unix.c:143
-#, c-format
-msgid "%8d fifo\n"
-msgid_plural "%8d fifos\n"
-msgstr[0] "%8d fifo\n"
-msgstr[1] "%8d fifos\n"
-
-#: e2fsck/unix.c:145
-#, c-format
-msgid "%8d link\n"
-msgid_plural "%8d links\n"
-msgstr[0] "%8d vnculo\n"
-msgstr[1] "%8d vnculos\n"
-
-#: e2fsck/unix.c:148
-#, c-format
-msgid "%8d symbolic link"
-msgid_plural "%8d symbolic links"
-msgstr[0] "%8d vnculo simblico"
-msgstr[1] "%8d vnculos simblicos"
-
-#: e2fsck/unix.c:150
-#, c-format
-msgid " (%d fast symbolic link)\n"
-msgid_plural " (%d fast symbolic links)\n"
-msgstr[0] "(%d vnculo simblico rpido)\n"
-msgstr[1] "(%d vnculos simblicos rpidos)\n"
-
-#: e2fsck/unix.c:152
-#, c-format
-msgid "%8d socket\n"
-msgid_plural "%8d sockets\n"
-msgstr[0] "%8d socket\n"
-msgstr[1] "%8d sockets\n"
-
-#: e2fsck/unix.c:155
-#, c-format
-msgid "%8d file\n"
-msgid_plural "%8d files\n"
-msgstr[0] "%8d fichero\n"
-msgstr[1] "%8d ficheros\n"
-
-#: e2fsck/unix.c:169 misc/badblocks.c:781 misc/tune2fs.c:773 misc/util.c:145
+#: e2fsck/unix.c:176 misc/badblocks.c:781 misc/tune2fs.c:791 misc/util.c:151
#: resize/main.c:97
#, c-format
msgid "while determining whether %s is mounted."
msgstr "mientras se estaba determinando si %s est montado."
-#: e2fsck/unix.c:184
+#: e2fsck/unix.c:191
#, c-format
msgid "Warning! %s is mounted.\n"
msgstr "Cuidado! %s est montado.\n"
-#: e2fsck/unix.c:188
+#: e2fsck/unix.c:195
#, c-format
msgid "%s is mounted. "
msgstr "%s est montado. "
-#: e2fsck/unix.c:190
+#: e2fsck/unix.c:197
msgid ""
"Cannot continue, aborting.\n"
"\n"
@@ -2024,7 +1908,8 @@ msgstr ""
"No se puede continuar, se finaliza.\n"
"\n"
-#: e2fsck/unix.c:191
+#: e2fsck/unix.c:198
+#, c-format
msgid ""
"\n"
"\n"
@@ -2037,60 +1922,63 @@ msgstr ""
"CUIDADO!! Correr e2fsck en un sistema de ficheros montado\n"
"puede causar GRAVES daos al sistema de archivos.\n"
-#: e2fsck/unix.c:194
+#: e2fsck/unix.c:201
msgid "Do you really want to continue"
msgstr "De veras quieres continuar?"
-#: e2fsck/unix.c:196
+#: e2fsck/unix.c:203
+#, c-format
msgid "check aborted.\n"
msgstr "revisin terminada.\n"
-#: e2fsck/unix.c:245
+#: e2fsck/unix.c:264
msgid " contains a file system with errors"
msgstr " contiene un sistema de ficheros con errores"
-#: e2fsck/unix.c:247
+#: e2fsck/unix.c:266
msgid " was not cleanly unmounted"
msgstr " no fue desmontado limpiamente"
-#: e2fsck/unix.c:251
+#: e2fsck/unix.c:270
#, c-format
msgid " has been mounted %u times without being checked"
msgstr " ha sido montado %u veces sin ser revisado"
-#: e2fsck/unix.c:259
+#: e2fsck/unix.c:278
#, c-format
msgid " has gone %u days without being checked"
msgstr " ya lleva %u dias sin ser revisado"
-#: e2fsck/unix.c:268
+#: e2fsck/unix.c:287
msgid ", check forced.\n"
msgstr ", se fuerza la revisin.\n"
-#: e2fsck/unix.c:271
+#: e2fsck/unix.c:290
#, fuzzy, c-format
msgid "%s: clean, %d/%d files, %d/%d blocks"
msgstr "%s: limpio, ficheros %d/%d, bloques %d/%d\n"
-#: e2fsck/unix.c:286
+#: e2fsck/unix.c:306
msgid " (check after next mount)"
msgstr ""
-#: e2fsck/unix.c:288
+#: e2fsck/unix.c:308
#, c-format
msgid " (check in %ld mounts)"
msgstr ""
-#: e2fsck/unix.c:430
+#: e2fsck/unix.c:450
#, c-format
msgid "ERROR: Couldn't open /dev/null (%s)\n"
msgstr "ERROR: no se puede abrir /dev/null (%s)\n"
-#: e2fsck/unix.c:501
+#: e2fsck/unix.c:521
+#, c-format
msgid "Invalid EA version.\n"
msgstr "Versin de EA no vlida.\n"
-#: e2fsck/unix.c:510
+#: e2fsck/unix.c:532
+#, c-format
msgid ""
"Extended options are separated by commas, and may take an argument which\n"
"is set off by an equals ('=') sign. Valid raid options are:\n"
@@ -2103,75 +1991,81 @@ msgstr ""
"\tea_ver=<versin_ea (1 o 2)\n"
"\n"
-#: e2fsck/unix.c:568
+#: e2fsck/unix.c:590
#, c-format
msgid "Error validating file descriptor %d: %s\n"
msgstr "Error al validar el descriptor de ficheros %d: %s\n"
-#: e2fsck/unix.c:572
+#: e2fsck/unix.c:594
msgid "Invalid completion information file descriptor"
msgstr "Informacin de consistencia invlida en el descriptor de ficheros"
-#: e2fsck/unix.c:587
+#: e2fsck/unix.c:609
msgid "Only one the options -p/-a, -n or -y may be specified."
msgstr "Slo una de las opciones -p/-a, -n o -y puede ser especificada."
-#: e2fsck/unix.c:608
+#: e2fsck/unix.c:630
+#, c-format
msgid "The -t option is not supported on this version of e2fsck.\n"
msgstr "La opcin -t no est implementada en esta versin de e2fsck.\n"
-#: e2fsck/unix.c:673
+#: e2fsck/unix.c:695
+#, c-format
msgid "Byte-swapping filesystems not compiled in this version of e2fsck\n"
msgstr ""
"Los sistemas con intercambio de bytes no estn compilados en esta versin de "
"e2fsck\n"
-#: e2fsck/unix.c:690 misc/tune2fs.c:444 misc/tune2fs.c:699 misc/tune2fs.c:716
+#: e2fsck/unix.c:718 misc/tune2fs.c:458 misc/tune2fs.c:716 misc/tune2fs.c:733
#, c-format
msgid "Unable to resolve '%s'"
msgstr ""
-#: e2fsck/unix.c:716
+#: e2fsck/unix.c:744
+#, c-format
msgid "Incompatible options not allowed when byte-swapping.\n"
msgstr ""
"Las opciones incompatibles no estn permitidas cuando se hace intercambio de "
"bytes.\n"
-#: e2fsck/unix.c:723
+#: e2fsck/unix.c:751
+#, c-format
msgid "The -c and the -l/-L options may not be both used at the same time.\n"
msgstr "Las opciones -c y -l/-L no pueden ser utilizadas simultneamente.\n"
-#: e2fsck/unix.c:801
+#: e2fsck/unix.c:829
+#, c-format
msgid "Error: ext2fs library version out of date!\n"
msgstr "Error: la versin de la biblioteca ext2fs est caduca!\n"
-#: e2fsck/unix.c:809
+#: e2fsck/unix.c:837
msgid "while trying to initialize program"
msgstr "mientras se intentaba inicializar el programa"
-#: e2fsck/unix.c:823
+#: e2fsck/unix.c:851
#, c-format
msgid "\tUsing %s, %s\n"
msgstr "\tUsando %s, %s\n"
-#: e2fsck/unix.c:835
+#: e2fsck/unix.c:863
msgid "need terminal for interactive repairs"
msgstr "se necesita una terminal para hacer las reparaciones interactivas"
-#: e2fsck/unix.c:871
+#: e2fsck/unix.c:905
#, c-format
msgid "%s trying backup blocks...\n"
msgstr "%s est intentando respaldar los bloques...\n"
-#: e2fsck/unix.c:872
+#: e2fsck/unix.c:906
msgid "Couldn't find ext2 superblock,"
msgstr "No se puede encontrar el sper bloque del ext2,"
-#: e2fsck/unix.c:873
+#: e2fsck/unix.c:907
msgid "Group descriptors look bad..."
msgstr "Los descriptores de los grupos no se ven bien..."
-#: e2fsck/unix.c:884
+#: e2fsck/unix.c:918
+#, c-format
msgid ""
"The filesystem revision is apparently too high for this version of e2fsck.\n"
"(Or the filesystem superblock is corrupt)\n"
@@ -2181,20 +2075,23 @@ msgstr ""
"versin del e2fsck. (O el sper bloque del sistema de archivos est "
"corrupto)\n"
-#: e2fsck/unix.c:890
+#: e2fsck/unix.c:924
+#, c-format
msgid "Could this be a zero-length partition?\n"
msgstr "Podra ser esta una particin de longitud cero?\n"
-#: e2fsck/unix.c:892
+#: e2fsck/unix.c:926
#, c-format
msgid "You must have %s access to the filesystem or be root\n"
msgstr "Se debe tener acceso %s al sistema de ficheros o ser root\n"
-#: e2fsck/unix.c:897
+#: e2fsck/unix.c:931
+#, c-format
msgid "Possibly non-existent or swap device?\n"
msgstr "Es posible que no exista o que sea un dispositivo de intercambio?\n"
-#: e2fsck/unix.c:900
+#: e2fsck/unix.c:934
+#, c-format
msgid ""
"Disk write-protected; use the -n option to do a read-only\n"
"check of the device.\n"
@@ -2202,16 +2099,17 @@ msgstr ""
"El disco est protegido contra escritura; utilice la opcin -n para\n"
"hacer una revisin de slo lectura al dispositivo.\n"
-#: e2fsck/unix.c:916
+#: e2fsck/unix.c:950
msgid "Get a newer version of e2fsck!"
msgstr "Consiga una versin ms nueva de e2fsck!"
-#: e2fsck/unix.c:937
+#: e2fsck/unix.c:971
#, c-format
msgid "while checking ext3 journal for %s"
msgstr "mientras se revisaba el fichero de transacciones ext3 para %s"
-#: e2fsck/unix.c:948
+#: e2fsck/unix.c:982
+#, c-format
msgid ""
"Warning: skipping journal recovery because doing a read-only filesystem "
"check.\n"
@@ -2220,21 +2118,21 @@ msgstr ""
"debido a que se est haciendo una revisin de slo lectura del sistema de "
"ficheros.\n"
-#: e2fsck/unix.c:961
+#: e2fsck/unix.c:995
#, c-format
msgid "unable to set superblock flags on %s\n"
msgstr "no es posible poner las banderas de sper bloque en %s\n"
-#: e2fsck/unix.c:967
+#: e2fsck/unix.c:1001
#, c-format
msgid "while recovering ext3 journal of %s"
msgstr "mientras se recuperaba el fichero de transacciones ext3 de %s"
-#: e2fsck/unix.c:996
+#: e2fsck/unix.c:1030
msgid "Warning: compression support is experimental.\n"
msgstr "Cuidado: el soporte a la compresin es experimental.\n"
-#: e2fsck/unix.c:1001
+#: e2fsck/unix.c:1035
#, c-format
msgid ""
"E2fsck not compiled with HTREE support,\n"
@@ -2243,37 +2141,39 @@ msgstr ""
"E2fsck no est compilado con soporte a RBOLES-H,\n"
"\tpero el sistema de ficheros %s tiene directorios con RBOLES-H.\n"
-#: e2fsck/unix.c:1044
+#: e2fsck/unix.c:1078
#, c-format
msgid "%s: Filesystem byte order already normalized.\n"
msgstr "%s: el orden de los bytes del sistema de ficheros ya se normaliz.\n"
-#: e2fsck/unix.c:1064
+#: e2fsck/unix.c:1098
msgid "while reading bad blocks inode"
msgstr "mientras se lean los bloques malos del nodo i"
-#: e2fsck/unix.c:1066
+#: e2fsck/unix.c:1100
+#, c-format
msgid "This doesn't bode well, but we'll try to go on...\n"
msgstr "Esto no se se ve muy bien, pero se intentar continuar...\n"
-#: e2fsck/unix.c:1073
+#: e2fsck/unix.c:1107
+#, c-format
msgid "Restarting e2fsck from the beginning...\n"
msgstr "Reiniciando e2fsck desde el principio...\n"
-#: e2fsck/unix.c:1077
+#: e2fsck/unix.c:1111
msgid "while resetting context"
msgstr "mientras se reajusta el contexto"
-#: e2fsck/unix.c:1084
+#: e2fsck/unix.c:1118
#, c-format
msgid "%s: e2fsck canceled.\n"
msgstr "%s: se cancela e2fsck.\n"
-#: e2fsck/unix.c:1089
+#: e2fsck/unix.c:1123
msgid "aborted"
msgstr "finalizado"
-#: e2fsck/unix.c:1097
+#: e2fsck/unix.c:1131
#, c-format
msgid ""
"\n"
@@ -2282,12 +2182,12 @@ msgstr ""
"\n"
"%s: ***** EL SISTEMA DE FICHEROS FUE MODIFICADO *****\n"
-#: e2fsck/unix.c:1100
+#: e2fsck/unix.c:1134
#, c-format
msgid "%s: ***** REBOOT LINUX *****\n"
msgstr "%s: ***** REINICIE A LINUX *****\n"
-#: e2fsck/unix.c:1106
+#: e2fsck/unix.c:1140
#, c-format
msgid ""
"\n"
@@ -2528,7 +2428,7 @@ msgstr ""
msgid "during test data write, block %lu"
msgstr "durante la prueba de escritura de datos del bloque %lu"
-#: misc/badblocks.c:788 misc/util.c:152
+#: misc/badblocks.c:788 misc/util.c:158
#, c-format
msgid "%s is mounted; "
msgstr "%s est montado; "
@@ -2543,7 +2443,7 @@ msgstr ""
msgid "it's not safe to run badblocks!\n"
msgstr "No es seguro correr los bloques malos!\n"
-#: misc/badblocks.c:853 misc/mke2fs.c:898
+#: misc/badblocks.c:853 misc/mke2fs.c:926
#, c-format
msgid "bad block size - %s"
msgstr "tamao de los bloques malos - %s"
@@ -2580,7 +2480,7 @@ msgstr ""
msgid "while trying to determine device size"
msgstr "mientras se intentaba determinar el tamao del dispositivo"
-#: misc/badblocks.c:972 misc/mke2fs.c:1071
+#: misc/badblocks.c:972 misc/mke2fs.c:1099
#, c-format
msgid "bad blocks count - %s"
msgstr "cuenta de bloques malos - %s"
@@ -2653,11 +2553,11 @@ msgstr "mientras se estaba poniendo la versin en %s"
msgid "Couldn't allocate path variable in chattr_dir_proc"
msgstr "No se puede reservar la variable de ruta en chattr_dir_proc"
-#: misc/chattr.c:287
+#: misc/chattr.c:291
msgid "= is incompatible with - and +\n"
msgstr "= es incompatible con - y +\n"
-#: misc/chattr.c:295
+#: misc/chattr.c:299
msgid "Must use '-v', =, - or +\n"
msgstr "Se debe usar '-v', =, - o +\n"
@@ -2687,10 +2587,12 @@ msgid "Backup"
msgstr "Respaldo"
#: misc/dumpe2fs.c:130
+#, c-format
msgid ", Group descriptors at "
msgstr ", descriptores de Grupo en "
#: misc/dumpe2fs.c:135
+#, c-format
msgid " Group descriptor at "
msgstr " Descriptor de Grupo en "
@@ -2736,7 +2638,7 @@ msgstr "mientras se imprima la lista de bloques malos"
msgid "Bad blocks: %d"
msgstr "Bloques malos: %d"
-#: misc/dumpe2fs.c:227 misc/tune2fs.c:150
+#: misc/dumpe2fs.c:227 misc/tune2fs.c:153
msgid "while reading journal superblock"
msgstr "mientras se lea el sper bloque del fichero de transacciones"
@@ -2765,17 +2667,19 @@ msgstr ""
"Inicio del fichero de transacciones %d\n"
"Nmero de usuarios del fichero de transacciones %d\n"
-#: misc/dumpe2fs.c:307 misc/mke2fs.c:1085
+#: misc/dumpe2fs.c:307 misc/mke2fs.c:1113
#, c-format
msgid "\tUsing %s\n"
msgstr "\tUsando %s\n"
-#: misc/dumpe2fs.c:334 misc/e2image.c:488 misc/tune2fs.c:760 resize/main.c:230
+#: misc/dumpe2fs.c:334 misc/e2image.c:566 misc/tune2fs.c:778 resize/main.c:234
+#, c-format
msgid "Couldn't find valid filesystem superblock.\n"
msgstr ""
"No se pudo encontrar un sper bloque vlido para el sistema de ficheros.\n"
#: misc/dumpe2fs.c:345
+#, c-format
msgid "Note: This is a byte-swapped filesystem\n"
msgstr "Nota: este es un sistema de archivos con intercambio de bytes\n"
@@ -2789,8 +2693,8 @@ msgstr ""
"%s: %s: error leyendo los mapas de bits: %s\n"
#: misc/e2image.c:50
-#, c-format
-msgid "Usage: %s [-r] device file\n"
+#, fuzzy, c-format
+msgid "Usage: %s [-r] device image_file\n"
msgstr "Modo de empleo: %s [-r] dispositivo fichero\n"
#: misc/e2image.c:61
@@ -2824,34 +2728,42 @@ msgid "e2label: cannot open %s\n"
msgstr "e2label: no se puede abrir %s\n"
#: misc/e2label.c:62
+#, c-format
msgid "e2label: cannot seek to superblock\n"
msgstr "e2label: no se puede buscar al sper bloque\n"
#: misc/e2label.c:67
+#, c-format
msgid "e2label: error reading superblock\n"
msgstr "e2label: error leyendo el sper bloque\n"
#: misc/e2label.c:71
+#, c-format
msgid "e2label: not an ext2 filesystem\n"
msgstr "e2label: no es un sistema de ficheros ext2\n"
-#: misc/e2label.c:96 misc/tune2fs.c:867
+#: misc/e2label.c:96 misc/tune2fs.c:885
+#, c-format
msgid "Warning: label too long, truncating.\n"
msgstr "Cuidado: la etiqueta es muy larga, truncando.\n"
#: misc/e2label.c:99
+#, c-format
msgid "e2label: cannot seek to superblock again\n"
msgstr "e2label: no se puede encontrar de nuevo al sper bloque\n"
#: misc/e2label.c:104
+#, c-format
msgid "e2label: error writing superblock\n"
msgstr "e2label: error escribiendo el sper bloque\n"
-#: misc/e2label.c:116 misc/tune2fs.c:439
+#: misc/e2label.c:116 misc/tune2fs.c:450
+#, c-format
msgid "Usage: e2label device [newlabel]\n"
msgstr "Modo de empleo: e2label dispositivo [nuevabandera]\n"
#: misc/findsuper.c:126
+#, c-format
msgid "Usage: findsuper device [skipbytes [startkb]]\n"
msgstr ""
"Modo de empleo: findsuper dispositivo [bytesporsaltar [principioenkb]]\n"
@@ -2862,6 +2774,7 @@ msgid "skipbytes should be a number, not %s\n"
msgstr "los bytesporsaltar deben ser un nmero, no %s\n"
#: misc/findsuper.c:137
+#, c-format
msgid "skipbytes must be a multiple of the sector size\n"
msgstr "los bytesporsaltar deben ser un mltiplo del tamao del sector\n"
@@ -2881,6 +2794,7 @@ msgid "starting at %Ld, with %d byte increments\n"
msgstr "comenzando en %Ld, con incrementos de %d bytes\n"
#: misc/findsuper.c:158
+#, c-format
msgid " thisoff block fs_blk_sz blksz grp last_mount\n"
msgstr " este bloque fs_blk_sz blksz grp ultimo_montado\n"
@@ -3002,7 +2916,7 @@ msgstr "Mientras se lean las banderas en %s"
msgid "While reading version on %s"
msgstr "Mientras se lea la versin en %s"
-#: misc/mke2fs.c:91
+#: misc/mke2fs.c:92
#, c-format
msgid ""
"Usage: %s [-c|-t|-l filename] [-b block-size] [-f fragment-size]\n"
@@ -3020,39 +2934,39 @@ msgstr ""
" \t[-r revisin-del-fs] [-R opciones-raid]\n"
"\t[-qsSV] dispositivo [cuenta-de-bloques]\n"
-#: misc/mke2fs.c:235
+#: misc/mke2fs.c:264
#, c-format
msgid "Running command: %s\n"
msgstr "Ejecutando comando: %s\n"
-#: misc/mke2fs.c:239
+#: misc/mke2fs.c:268
#, c-format
msgid "while trying run '%s'"
msgstr "mientras se intentaba correr '%s'"
-#: misc/mke2fs.c:246
+#: misc/mke2fs.c:275
msgid "while processing list of bad blocks from program"
msgstr "mientras se procesaba la lista de bloques malos del programa"
-#: misc/mke2fs.c:273
+#: misc/mke2fs.c:302
#, c-format
msgid "Block %d in primary superblock/group descriptor area bad.\n"
msgstr ""
"El bloque %d en el rea del descriptor primario del sper bloque/grupo est "
"mal.\n"
-#: misc/mke2fs.c:275
+#: misc/mke2fs.c:304
#, c-format
msgid "Blocks %d through %d must be good in order to build a filesystem.\n"
msgstr ""
"Los bloques del %d al %d deben estar correctos para poder construir un "
"sistema de ficheros.\n"
-#: misc/mke2fs.c:278
+#: misc/mke2fs.c:307
msgid "Aborting....\n"
msgstr "Finalizando...\n"
-#: misc/mke2fs.c:298
+#: misc/mke2fs.c:327
#, c-format
msgid ""
"Warning: the backup superblock/group descriptors at block %d contain\n"
@@ -3064,23 +2978,23 @@ msgstr ""
"\tcontienen bloques malos.\n"
"\n"
-#: misc/mke2fs.c:316
+#: misc/mke2fs.c:345
msgid "while marking bad blocks as used"
msgstr "mientras se marcaban los bloques malos como utilizados"
-#: misc/mke2fs.c:374
+#: misc/mke2fs.c:403
msgid "done \n"
msgstr "terminado \n"
-#: misc/mke2fs.c:409
+#: misc/mke2fs.c:438
msgid "while allocating zeroizing buffer"
msgstr "mientras se reservaba el bfer con ceros"
-#: misc/mke2fs.c:450
+#: misc/mke2fs.c:479
msgid "Writing inode tables: "
msgstr "Mientras se escriban las tablas de nodos i: "
-#: misc/mke2fs.c:461
+#: misc/mke2fs.c:490
#, c-format
msgid ""
"\n"
@@ -3090,69 +3004,69 @@ msgstr ""
"No se pueden escribir %d bloques en la tabla de nodos i al principio de %d: %"
"s\n"
-#: misc/mke2fs.c:484
+#: misc/mke2fs.c:513
msgid "while creating root dir"
msgstr "mientras se creaba el directorio raz"
-#: misc/mke2fs.c:491
+#: misc/mke2fs.c:520
msgid "while reading root inode"
msgstr "mientras se lea el nodo i raz"
-#: misc/mke2fs.c:500
+#: misc/mke2fs.c:529
msgid "while setting root inode ownership"
msgstr "mientras se ponan los permisos del dueo del nodo i raz"
-#: misc/mke2fs.c:518
+#: misc/mke2fs.c:547
msgid "while creating /lost+found"
msgstr "mientras se creaba /lost+found"
-#: misc/mke2fs.c:525
+#: misc/mke2fs.c:554
msgid "while looking up /lost+found"
msgstr "mientras se revisaba /lost+found"
-#: misc/mke2fs.c:535
+#: misc/mke2fs.c:564
msgid "while expanding /lost+found"
msgstr "mientras se expanda /lost+found"
-#: misc/mke2fs.c:551
+#: misc/mke2fs.c:580
msgid "while setting bad block inode"
msgstr "mientras se pona el nodo i de bloques malos"
-#: misc/mke2fs.c:583
+#: misc/mke2fs.c:612
#, c-format
msgid "Out of memory erasing sectors %d-%d\n"
msgstr "Se agot la memoria cuando se borraban los sectores %d-%d\n"
-#: misc/mke2fs.c:593
+#: misc/mke2fs.c:622
#, c-format
msgid "Warning: could not read block 0: %s\n"
msgstr "Cuidado: no se puede leer el bloque 0: %s\n"
-#: misc/mke2fs.c:609
+#: misc/mke2fs.c:638
#, c-format
msgid "Warning: could not erase sector %d: %s\n"
msgstr "Cuidado: no se puede borrar el sector %d: %s\n"
-#: misc/mke2fs.c:625
+#: misc/mke2fs.c:654
msgid "while initializing journal superblock"
msgstr "mientras se inicializaba el sper bloque del fichero de transacciones"
-#: misc/mke2fs.c:631
+#: misc/mke2fs.c:660
msgid "Zeroing journal device: "
msgstr "Rellenando con ceros el fichero de transacciones del dispositivo"
-#: misc/mke2fs.c:638
+#: misc/mke2fs.c:667
#, c-format
msgid "while zeroing journal device (block %u, count %d)"
msgstr ""
"mientras se inicializaba con ceros el fichero de transacciones del "
"dispositivo (bloque %u, cuenta %d)"
-#: misc/mke2fs.c:649
+#: misc/mke2fs.c:678
msgid "while writing journal superblock"
msgstr "mientras se escriba el sper bloque del fichero de transacciones"
-#: misc/mke2fs.c:664
+#: misc/mke2fs.c:693
#, c-format
msgid ""
"warning: %d blocks unused.\n"
@@ -3161,79 +3075,83 @@ msgstr ""
"cuidado: hay %d bloques sin usar.\n"
"\n"
-#: misc/mke2fs.c:669
+#: misc/mke2fs.c:698
#, c-format
msgid "Filesystem label=%s\n"
msgstr "Etiqueta del sistema de ficheros=%s\n"
-#: misc/mke2fs.c:670
+#: misc/mke2fs.c:699
msgid "OS type: "
msgstr "Tipo de SO: "
-#: misc/mke2fs.c:675
+#: misc/mke2fs.c:704
msgid "(unknown os)"
msgstr "(so desconocido)"
-#: misc/mke2fs.c:678
+#: misc/mke2fs.c:707
#, c-format
msgid "Block size=%u (log=%u)\n"
msgstr "Tamao del bloque=%u (bitcora=%u)\n"
-#: misc/mke2fs.c:680
+#: misc/mke2fs.c:709
#, c-format
msgid "Fragment size=%u (log=%u)\n"
msgstr "Tamao del fragmento=%u (bitcora=%u)\n"
-#: misc/mke2fs.c:682
+#: misc/mke2fs.c:711
#, c-format
msgid "%u inodes, %u blocks\n"
msgstr "%u nodos i, %u bloques\n"
-#: misc/mke2fs.c:684
+#: misc/mke2fs.c:713
#, c-format
msgid "%u blocks (%2.2f%%) reserved for the super user\n"
msgstr "%u bloques (%2.2f%%) reservados para el sper usuario\n"
-#: misc/mke2fs.c:687
+#: misc/mke2fs.c:716
#, c-format
msgid "First data block=%u\n"
msgstr "Primer bloque de datos=%u\n"
-#: misc/mke2fs.c:689
+#: misc/mke2fs.c:718
#, c-format
msgid "%u block groups\n"
msgstr "%u bloque de grupos\n"
-#: misc/mke2fs.c:691
+#: misc/mke2fs.c:720
#, c-format
msgid "%u block group\n"
msgstr "%u bloque de grupo\n"
-#: misc/mke2fs.c:692
+#: misc/mke2fs.c:721
#, c-format
msgid "%u blocks per group, %u fragments per group\n"
msgstr "%u bloques por grupo, %u fragmentos por grupo\n"
-#: misc/mke2fs.c:694
+#: misc/mke2fs.c:723
#, c-format
msgid "%u inodes per group\n"
msgstr "%u nodos i por grupo\n"
-#: misc/mke2fs.c:701
+#: misc/mke2fs.c:730
+#, c-format
msgid "Superblock backups stored on blocks: "
msgstr "Respaldo del sper bloque guardado en los bloques: "
-#: misc/mke2fs.c:751
+#: misc/mke2fs.c:780
+#, c-format
msgid "Couldn't allocate memory to parse raid options!\n"
msgstr ""
"No se puede reservar memoria para analizar sintcticamente las opciones del "
"raid!\n"
-#: misc/mke2fs.c:776
+#: misc/mke2fs.c:805
+#, c-format
msgid "Invalid stride parameter.\n"
msgstr "Parmetro de zancada no vlido.\n"
-#: misc/mke2fs.c:784
+#: misc/mke2fs.c:813
+#, c-format
msgid ""
"\n"
"Bad raid options specified.\n"
@@ -3256,73 +3174,74 @@ msgstr ""
"\n"
"\n"
-#: misc/mke2fs.c:902
+#: misc/mke2fs.c:930
#, c-format
msgid "Warning: blocksize %d not usable on most systems.\n"
msgstr ""
"Cuidado: el tamao del bloque %d no se puede utilizar en muchos sistemas.\n"
-#: misc/mke2fs.c:919
+#: misc/mke2fs.c:947
#, c-format
msgid "bad fragment size - %s"
msgstr "Tamao incorrecto del fragmento - %s"
-#: misc/mke2fs.c:925
+#: misc/mke2fs.c:953
+#, c-format
msgid "Warning: fragments not supported. Ignoring -f option\n"
msgstr ""
"Cuidado: no estn implementados los fragmentos. Se ignora la opcin -f\n"
-#: misc/mke2fs.c:932
+#: misc/mke2fs.c:960
msgid "Illegal number for blocks per group"
msgstr "Nmero ilegal de bloques por grupo"
-#: misc/mke2fs.c:937
+#: misc/mke2fs.c:965
msgid "blocks per group must be multiple of 8"
msgstr "los bloques por grupo deben ser un mltiplo de 8"
-#: misc/mke2fs.c:947
+#: misc/mke2fs.c:975
#, c-format
msgid "bad inode ratio %s (min %d/max %d"
msgstr "proporcin de nodos i malos %s (min %d/max %d"
-#: misc/mke2fs.c:966
+#: misc/mke2fs.c:994
msgid "in malloc for bad_blocks_filename"
msgstr "en malloc para fichero_de_bloques_malos"
-#: misc/mke2fs.c:975
+#: misc/mke2fs.c:1003
#, c-format
msgid "bad reserved blocks percent - %s"
msgstr "porcentaje incorrecto de bloques malos reservados - %s"
-#: misc/mke2fs.c:1007
+#: misc/mke2fs.c:1035
#, c-format
msgid "bad inode size - %s"
msgstr "tamao incorrecto de los nodos i - %s"
-#: misc/mke2fs.c:1043 misc/tune2fs.c:294
+#: misc/mke2fs.c:1071 misc/tune2fs.c:302
#, c-format
msgid "Invalid filesystem option set: %s\n"
msgstr "Se puso una opcin no vlida para el sistema de ficheros: %s\n"
-#: misc/mke2fs.c:1112 misc/mke2fs.c:1449
+#: misc/mke2fs.c:1140 misc/mke2fs.c:1477
#, c-format
msgid "while trying to open journal device %s\n"
msgstr ""
"mientras se intentaba abrir el fichero de transacciones del dispositivo %s\n"
-#: misc/mke2fs.c:1118
+#: misc/mke2fs.c:1146
#, c-format
msgid "Journal dev blocksize (%d) smaller than minimum blocksize %d\n"
msgstr ""
"El tamao del bloque del dispositivo del fichero de transacciones (%d) es\n"
"menor que el tamao del bloque mnimo %d\n"
-#: misc/mke2fs.c:1132
+#: misc/mke2fs.c:1160
#, c-format
msgid "%d-byte blocks too big for system (max %d)"
msgstr "los bloques de %d-bytes son muy grandes para el sistema (mx %d)"
-#: misc/mke2fs.c:1136
+#: misc/mke2fs.c:1164
#, c-format
msgid ""
"Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
@@ -3330,15 +3249,15 @@ msgstr ""
"Cuidado: los bloques de %d-bytes son muy grandes para el sistema \n"
"(mx %d), se est forzado a continuar\n"
-#: misc/mke2fs.c:1161
+#: misc/mke2fs.c:1189
msgid "filesystem"
msgstr "sistema de ficheros"
-#: misc/mke2fs.c:1174 resize/main.c:264
+#: misc/mke2fs.c:1202 resize/main.c:268
msgid "while trying to determine filesystem size"
msgstr "mientras se intentaba determinar el tamao del sistema de ficheros"
-#: misc/mke2fs.c:1180
+#: misc/mke2fs.c:1208
msgid ""
"Couldn't determine device size; you must specify\n"
"the size of the filesystem\n"
@@ -3346,7 +3265,7 @@ msgstr ""
"No se puede determinar el tamao del dispositivo; se deber especificar\n"
"explcitamente el tamao del sistema de ficheros\n"
-#: misc/mke2fs.c:1187
+#: misc/mke2fs.c:1215
msgid ""
"Device size reported to be zero. Invalid partition specified, or\n"
"\tpartition table wasn't reread after running fdisk, due to\n"
@@ -3359,59 +3278,59 @@ msgstr ""
"\tparticin modificada est ocupada o en uso. Es necesario reiniciar\n"
"\tpara poder releer la tabla de particin.\n"
-#: misc/mke2fs.c:1205
+#: misc/mke2fs.c:1233
msgid "Filesystem larger than apparent device size."
msgstr ""
"El sistema de ficheros es ms grande que el tamao aparente del dispositivo."
-#: misc/mke2fs.c:1227
+#: misc/mke2fs.c:1255
msgid "while trying to determine hardware sector size"
msgstr "mientras se intentaba determinar el tamao del sector por hardware"
-#: misc/mke2fs.c:1241
+#: misc/mke2fs.c:1269
msgid "blocks per group count out of range"
msgstr "la cuenta de bloques por grupo est fuera del intervalo"
-#: misc/mke2fs.c:1251
+#: misc/mke2fs.c:1279
#, c-format
msgid "bad inode size %d (min %d/max %d)"
msgstr "tamao del nodo i incorrecto %d (mn %d/mx %d)"
-#: misc/mke2fs.c:1257
+#: misc/mke2fs.c:1285
#, c-format
msgid "Warning: %d-byte inodes not usable on most systems\n"
msgstr ""
"Cuidado: los nodos i de %d-bytes no se pueden utilizar en muchos sistemas\n"
-#: misc/mke2fs.c:1308
+#: misc/mke2fs.c:1336
msgid "while setting up superblock"
msgstr "mientras se ajustaba el sper bloque"
-#: misc/mke2fs.c:1342
+#: misc/mke2fs.c:1370
#, c-format
msgid "unknown os - %s"
msgstr "sistema operativo desconocido - %s"
-#: misc/mke2fs.c:1396
+#: misc/mke2fs.c:1424
msgid "while trying to allocate filesystem tables"
msgstr "mientras se intentaban reservar las tablas del sistema de ficheros"
-#: misc/mke2fs.c:1427
+#: misc/mke2fs.c:1455
#, c-format
msgid "while zeroing block %u at end of filesystem"
msgstr ""
"mientras se inicializaba a cero el bloque %u al final del sistema de ficheros"
-#: misc/mke2fs.c:1442 misc/tune2fs.c:376
+#: misc/mke2fs.c:1470 misc/tune2fs.c:387
msgid "journal"
msgstr "fichero de transacciones"
-#: misc/mke2fs.c:1454
+#: misc/mke2fs.c:1482
#, c-format
msgid "Adding journal to device %s: "
msgstr "Aadiendo el fichero de transacciones al dispositivo %s: "
-#: misc/mke2fs.c:1461
+#: misc/mke2fs.c:1489
#, c-format
msgid ""
"\n"
@@ -3420,16 +3339,17 @@ msgstr ""
"\n"
"\tmientras se intentaba aadir el fichero de transacciones al dispositivo %s"
-#: misc/mke2fs.c:1466 misc/mke2fs.c:1490 misc/tune2fs.c:404 misc/tune2fs.c:418
+#: misc/mke2fs.c:1494 misc/mke2fs.c:1518 misc/tune2fs.c:415 misc/tune2fs.c:429
+#, c-format
msgid "done\n"
msgstr "hecho\n"
-#: misc/mke2fs.c:1478
+#: misc/mke2fs.c:1506
#, c-format
msgid "Creating journal (%d blocks): "
msgstr "Creando el fichero de transacciones (%d bloques): "
-#: misc/mke2fs.c:1486
+#: misc/mke2fs.c:1514
msgid ""
"\n"
"\twhile trying to create journal"
@@ -3437,12 +3357,14 @@ msgstr ""
"\n"
"\tmientras se intentaba crear el fichero de transacciones"
-#: misc/mke2fs.c:1495
+#: misc/mke2fs.c:1523
+#, c-format
msgid "Writing superblocks and filesystem accounting information: "
msgstr ""
"Escribiendo superbloques y la informacin contable del sistema de ficheros: "
-#: misc/mke2fs.c:1500
+#: misc/mke2fs.c:1528
+#, c-format
msgid ""
"\n"
"Warning, had trouble writing out superblocks."
@@ -3450,7 +3372,8 @@ msgstr ""
"\n"
"Cuidado, se tuvo un problema al escribir en los sper bloques."
-#: misc/mke2fs.c:1503
+#: misc/mke2fs.c:1531
+#, c-format
msgid ""
"done\n"
"\n"
@@ -3458,7 +3381,8 @@ msgstr ""
"hecho\n"
"\n"
-#: misc/mklost+found.c:48
+#: misc/mklost+found.c:49
+#, c-format
msgid "Usage: mklost+found\n"
msgstr "Modo de empleo: mklost+found\n"
@@ -3494,11 +3418,11 @@ msgstr "HDIO_GETGEO ioctl"
msgid "BLKGETSIZE ioctl"
msgstr "BLKGETSIZE ioctl"
-#: misc/tune2fs.c:74
+#: misc/tune2fs.c:77
msgid "Please run e2fsck on the filesystem.\n"
msgstr "Por favor ejecute e2fsck sobre el sistema de ficheros.\n"
-#: misc/tune2fs.c:81
+#: misc/tune2fs.c:84
#, c-format
msgid ""
"Usage: %s [-c max-mounts-count] [-e errors-behavior] [-g group]\n"
@@ -3517,55 +3441,55 @@ msgstr ""
"\t[-M ltimo-directorio-montado] [-O [^]caracterstica[,...]]\n"
"\t[-T ltima-fecha-de-revisn] [-U UUID] dispositivo\n"
-#: misc/tune2fs.c:138
+#: misc/tune2fs.c:141
msgid "while trying to open external journal"
msgstr "mientras se intentaba abrir el fichero de transacciones externo"
-#: misc/tune2fs.c:142
+#: misc/tune2fs.c:145
#, c-format
msgid "%s is not a journal device.\n"
msgstr "%s no es un dispositivo con fichero de transacciones.\n"
-#: misc/tune2fs.c:157
+#: misc/tune2fs.c:160
msgid "Journal superblock not found!\n"
msgstr "No se encontr el sper bloque del fichero de transacciones!\n"
-#: misc/tune2fs.c:169
+#: misc/tune2fs.c:172
msgid "Filesystem's UUID not found on journal device.\n"
msgstr ""
"No se encontr el UUID del sistema de ficheros en el fichero de\n"
"transacciones del dispositivo.\n"
-#: misc/tune2fs.c:190
+#: misc/tune2fs.c:193
msgid "Journal NOT removed\n"
msgstr "NO se ha eliminado al fichero de transacciones\n"
-#: misc/tune2fs.c:196
+#: misc/tune2fs.c:199
msgid "Journal removed\n"
msgstr "Fichero de transacciones eliminado\n"
-#: misc/tune2fs.c:228
+#: misc/tune2fs.c:231
msgid "while reading journal inode"
msgstr "mientras se lea el nodo i del fichero de transacciones"
-#: misc/tune2fs.c:235
+#: misc/tune2fs.c:238
msgid "while reading bitmaps"
msgstr "mientras se lean los mapas de bits"
-#: misc/tune2fs.c:242
+#: misc/tune2fs.c:245
msgid "while clearing journal inode"
msgstr "mientras se borraba el nodo i del fichero de transacciones"
-#: misc/tune2fs.c:253
+#: misc/tune2fs.c:256
msgid "while writing journal inode"
msgstr "mientras se escriba el nodo i del fichero de transacciones"
-#: misc/tune2fs.c:268
+#: misc/tune2fs.c:271
#, c-format
msgid "Invalid mount option set: %s\n"
msgstr "Se puso una opcin de montaje no vlida: %s\n"
-#: misc/tune2fs.c:309
+#: misc/tune2fs.c:317
msgid ""
"The has_journal flag may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
@@ -3573,7 +3497,7 @@ msgstr ""
"La bandera has_journal slo puede ser borrada cuando el sistema de\n"
"ficheros no est montada o lo est, pero en modo de slo lectura.\n"
-#: misc/tune2fs.c:317
+#: misc/tune2fs.c:325
msgid ""
"The needs_recovery flag is set. Please run e2fsck before clearing\n"
"the has_journal flag.\n"
@@ -3581,11 +3505,11 @@ msgstr ""
"La bandera needs_recovery est puesta. Por favor ejecute e2fsck antes\n"
"de limpiar la bandera has_journal.\n"
-#: misc/tune2fs.c:371
+#: misc/tune2fs.c:382
msgid "The filesystem already has a journal.\n"
msgstr "El sistema de ficheros ya tiene un fichero de transacciones.\n"
-#: misc/tune2fs.c:388
+#: misc/tune2fs.c:399
#, c-format
msgid ""
"\n"
@@ -3594,22 +3518,22 @@ msgstr ""
"\n"
"\tmientras se intentaba abrir el fichero de transacciones en %s\n"
-#: misc/tune2fs.c:392
+#: misc/tune2fs.c:403
#, c-format
msgid "Creating journal on device %s: "
msgstr "Creando un fichero de transacciones en el dispositivo %s: "
-#: misc/tune2fs.c:400
+#: misc/tune2fs.c:411
#, c-format
msgid "while adding filesystem to journal on %s"
msgstr ""
"mientras se agregaba un sistema de ficheros al fichero de transacciones en %s"
-#: misc/tune2fs.c:406
+#: misc/tune2fs.c:417
msgid "Creating journal inode: "
msgstr "Creando el nodo i del fichero de transacciones: "
-#: misc/tune2fs.c:415
+#: misc/tune2fs.c:426
msgid ""
"\n"
"\twhile trying to create journal file"
@@ -3617,96 +3541,96 @@ msgstr ""
"\n"
"\tmientras intentaba crear el fichero de transacciones"
-#: misc/tune2fs.c:478
+#: misc/tune2fs.c:492
#, c-format
msgid "Couldn't parse date/time specifier: %s"
msgstr ""
"No se puede analizar sintcticamente el especificador de fecha/hora: %s"
-#: misc/tune2fs.c:500 misc/tune2fs.c:513
+#: misc/tune2fs.c:514 misc/tune2fs.c:527
#, c-format
msgid "bad mounts count - %s"
msgstr "cuenta de montajes incorrectos - %s"
-#: misc/tune2fs.c:529
+#: misc/tune2fs.c:543
#, c-format
msgid "bad error behavior - %s"
msgstr "comportamiento de errores incorrecto - %s"
-#: misc/tune2fs.c:552
+#: misc/tune2fs.c:566
#, c-format
msgid "bad gid/group name - %s"
msgstr "nombre del gid/grupo incorrecto - %s"
-#: misc/tune2fs.c:585
+#: misc/tune2fs.c:599
#, c-format
msgid "bad interval - %s"
msgstr "intervalo incorrecto - %s"
-#: misc/tune2fs.c:613
+#: misc/tune2fs.c:627
#, c-format
msgid "bad reserved block ratio - %s"
msgstr "proporcin de bloques reservados incorrecta - %s"
-#: misc/tune2fs.c:628
+#: misc/tune2fs.c:642
msgid "-o may only be specified once"
msgstr "-o solo podra ser especificado una vez"
-#: misc/tune2fs.c:638
+#: misc/tune2fs.c:652
msgid "-O may only be specified once"
msgstr "-O slo puede ser especificado una vez"
-#: misc/tune2fs.c:648
+#: misc/tune2fs.c:662
#, c-format
msgid "bad reserved blocks count - %s"
msgstr "cuenta de bloques reservados incorrecta - %s"
-#: misc/tune2fs.c:677
+#: misc/tune2fs.c:691
#, c-format
msgid "bad uid/user name - %s"
msgstr "nombre de uid/usuario incorrecto - %s"
-#: misc/tune2fs.c:783
+#: misc/tune2fs.c:801
#, c-format
msgid "Setting maximal mount count to %d\n"
msgstr "Se pone la cuenta de montajes mxima a %d\n"
-#: misc/tune2fs.c:789
+#: misc/tune2fs.c:807
#, c-format
msgid "Setting current mount count to %d\n"
msgstr "Se pone la cuenta de montajes actual a %d\n"
-#: misc/tune2fs.c:794
+#: misc/tune2fs.c:812
#, c-format
msgid "Setting error behavior to %d\n"
msgstr "Se pone el comportamiento de errores a %d\n"
-#: misc/tune2fs.c:799
+#: misc/tune2fs.c:817
#, c-format
msgid "Setting reserved blocks gid to %lu\n"
msgstr "Se pone el gid de los bloques reservados %lu\n"
-#: misc/tune2fs.c:804
+#: misc/tune2fs.c:822
#, c-format
msgid "Setting interval between check %lu seconds\n"
msgstr "Se pone el intervalo entre revisiones en %lu segundos\n"
-#: misc/tune2fs.c:810
+#: misc/tune2fs.c:828
#, c-format
msgid "Setting reserved blocks percentage to %lu (%u blocks)\n"
msgstr "Se pone el porcentaje de bloques reservados a %lu (%u bloques)\n"
-#: misc/tune2fs.c:816
+#: misc/tune2fs.c:834
#, c-format
msgid "reserved blocks count is too big (%lu)"
msgstr "la cantidad de bloques reservados es muy grande (%lu)"
-#: misc/tune2fs.c:822
+#: misc/tune2fs.c:840
#, c-format
msgid "Setting reserved blocks count to %lu\n"
msgstr "Se pone la cantidad de bloques reservados a %lu\n"
-#: misc/tune2fs.c:828
+#: misc/tune2fs.c:846
msgid ""
"\n"
"The filesystem already has sparse superblocks.\n"
@@ -3714,7 +3638,7 @@ msgstr ""
"\n"
"El sistema de ficheros ya tiene sper bloques dispersos.\n"
-#: misc/tune2fs.c:835
+#: misc/tune2fs.c:853
#, c-format
msgid ""
"\n"
@@ -3723,7 +3647,7 @@ msgstr ""
"\n"
"La bandera de sper bloques dispersos est puesta. %s"
-#: misc/tune2fs.c:842
+#: misc/tune2fs.c:860
msgid ""
"\n"
"The filesystem already has sparse superblocks disabled.\n"
@@ -3731,7 +3655,7 @@ msgstr ""
"\n"
"El sistema de ficheros ya tiene los sper bloques dispersos deshabilitados.\n"
-#: misc/tune2fs.c:850
+#: misc/tune2fs.c:868
#, c-format
msgid ""
"\n"
@@ -3740,17 +3664,17 @@ msgstr ""
"\n"
"La bandera de sper bloques dispersos ha sido borrada. %s"
-#: misc/tune2fs.c:857
+#: misc/tune2fs.c:875
#, c-format
msgid "Setting time filesystem last checked to %s\n"
msgstr "Se pone la hora de la ltima revisin al sistema de ficheros a %s\n"
-#: misc/tune2fs.c:863
+#: misc/tune2fs.c:881
#, c-format
msgid "Setting reserved blocks uid to %lu\n"
msgstr "Se pone el uid de los bloques reservados a %lu\n"
-#: misc/tune2fs.c:896
+#: misc/tune2fs.c:914
msgid "Invalid UUID format\n"
msgstr "Formato del UUID no vlido\n"
@@ -3771,33 +3695,33 @@ msgstr ""
"\n"
"En apariencia, el dispositivo no existe; Se especific correctamente?\n"
-#: misc/util.c:101
+#: misc/util.c:107
#, c-format
msgid "%s is not a block special device.\n"
msgstr "%s no es un dispositivo especial de bloques.\n"
-#: misc/util.c:130
+#: misc/util.c:136
#, c-format
msgid "%s is entire device, not just one partition!\n"
msgstr "%s es todo el dispositivo, no slo una particin!\n"
-#: misc/util.c:154
+#: misc/util.c:160
msgid "mke2fs forced anyway. Hope /etc/mtab is incorrect.\n"
msgstr ""
"Se fuerza de todas formas mke2fs. Se espera que /etc/mtab est incorrecta.\n"
-#: misc/util.c:157
+#: misc/util.c:163
#, c-format
msgid "will not make a %s here!\n"
msgstr "No se har un %s aqu!\n"
-#: misc/util.c:171
+#: misc/util.c:177
msgid "Couldn't allocate memory to parse journal options!\n"
msgstr ""
"No se puede reservar memoria para la revisin sintctica de las opciones "
"del fichero de transacciones!\n"
-#: misc/util.c:213
+#: misc/util.c:219
msgid ""
"\n"
"Bad journal options specified.\n"
@@ -3826,7 +3750,7 @@ msgstr ""
"bloques del sistema de ficheros.\n"
"\n"
-#: misc/util.c:240
+#: misc/util.c:246
msgid ""
"\n"
"Filesystem too small for a journal\n"
@@ -3835,7 +3759,7 @@ msgstr ""
"El sistema de ficheros es demasiado pequeo para un fichero de "
"transacciones\n"
-#: misc/util.c:247
+#: misc/util.c:253
#, c-format
msgid ""
"\n"
@@ -3847,7 +3771,7 @@ msgstr ""
"debera\n"
"estar entre 1024 y 102400 bloques. Finalizando.\n"
-#: misc/util.c:255
+#: misc/util.c:261
msgid ""
"\n"
"Journal size too big for filesystem.\n"
@@ -3856,7 +3780,7 @@ msgstr ""
"El tamao del fichero de transacciones es muy grande para el sistema de "
"ficheros.\n"
-#: misc/util.c:274
+#: misc/util.c:280
#, c-format
msgid ""
"This filesystem will be automatically checked every %d mounts or\n"
@@ -3943,7 +3867,7 @@ msgstr "resize2fs %s (%s)\n"
msgid "bad filesystem size - %s"
msgstr "tamao del sistema de ficheros malo - %s"
-#: resize/main.c:296
+#: resize/main.c:300
#, c-format
msgid ""
"The containing partition (or device) is only %d (%dk) blocks.\n"
@@ -3954,7 +3878,7 @@ msgstr ""
"Y se ha solicitado un nuevo tamao de %d bloques.\n"
"\n"
-#: resize/main.c:303
+#: resize/main.c:307
#, c-format
msgid ""
"The filesystem is already %d blocks long. Nothing to do!\n"
@@ -3963,7 +3887,7 @@ msgstr ""
"El sistema de ficheros ya mide %d bloques. No hay nada que hacer!\n"
"\n"
-#: resize/main.c:310
+#: resize/main.c:314
#, c-format
msgid ""
"Please run 'e2fsck -f %s' first.\n"
@@ -3972,12 +3896,12 @@ msgstr ""
"Por favor corra primero 'e2fsck -f %s'.\n"
"\n"
-#: resize/main.c:320
+#: resize/main.c:324
#, c-format
msgid "while trying to resize %s"
msgstr "mientras se intentaba modificar el tamao %s"
-#: resize/main.c:325
+#: resize/main.c:329
#, c-format
msgid ""
"The filesystem on %s is now %d blocks long.\n"
@@ -3986,63 +3910,156 @@ msgstr ""
"El sistema de ficheros en %s mide ahora %d bloques.\n"
"\n"
-#: resize/resize2fs.c:109
+#: resize/resize2fs.c:110
#, c-format
msgid "Number of free blocks: %d/%d, Needed: %d\n"
msgstr "Nmero de bloques libres: %d/%d, se necesitan: %d\n"
-#: resize/resize2fs.c:458
+#: resize/resize2fs.c:459
msgid "meta-data blocks"
msgstr "bloques de meta-datos"
-#: resize/resize2fs.c:581
+#: resize/resize2fs.c:582
msgid "reserved blocks"
msgstr "bloques reservados"
-#: resize/resize2fs.c:586
+#: resize/resize2fs.c:587
msgid "blocks to be moved"
msgstr "bloques por ser movidos"
-#: resize/resize2fs.c:816
+#: resize/resize2fs.c:817
+#, c-format
msgid "Going into desperation mode for block allocations\n"
msgstr "Entrando al modo desesperado para reservar bloques\n"
-#: resize/resize2fs.c:920
+#: resize/resize2fs.c:921
#, c-format
msgid "Moving %d blocks %u->%u\n"
msgstr "Moviendo %d bloques %u->%u\n"
-#: resize/resize2fs.c:997
+#: resize/resize2fs.c:998
#, c-format
msgid "ino=%u, blockcnt=%lld, %u->%u\n"
msgstr "ino=%u, blockcnt=%lld, %u-%u\n"
-#: resize/resize2fs.c:1165
+#: resize/resize2fs.c:1166
#, c-format
msgid "Inode moved %u->%u\n"
msgstr "Nodo i movido %u->%u\n"
-#: resize/resize2fs.c:1233
+#: resize/resize2fs.c:1234
#, c-format
msgid "Inode translate (dir=%u, name=%.*s, %u->%u)\n"
msgstr "Traduccin de nodo i (dir=%u, nombre=%.*s, %u->%u)\n"
-#: resize/resize2fs.c:1360
+#: resize/resize2fs.c:1361
#, c-format
msgid "Itable move group %d block %u->%u (diff %d)\n"
msgstr "La tabla i mueve al grupo %d bloque %u->%u (diferencia %d)\n"
-#: resize/resize2fs.c:1386
+#: resize/resize2fs.c:1387
#, c-format
msgid "%d blocks of zeros...\n"
msgstr "%d bloques de ceros...\n"
-#: resize/resize2fs.c:1421
+#: resize/resize2fs.c:1422
+#, c-format
msgid "Inode table move finished.\n"
msgstr "El movimiento de la tabla de los nodos i ha terminado.\n"
#~ msgid ""
#~ "\n"
+#~ "%8d inode used (%d%%)\n"
+#~ msgid_plural ""
+#~ "\n"
+#~ "%8d inodes used (%d%%)\n"
+#~ msgstr[0] ""
+#~ "\n"
+#~ "%8d nodo i utilizado (%d%%)\n"
+#~ msgstr[1] ""
+#~ "\n"
+#~ "%8d nodos i utilizados (%d%%)\n"
+
+#~ msgid "%8d non-contiguous inode (%0d.%d%%)\n"
+#~ msgid_plural "%8d non-contiguous inodes (%0d.%d%%)\n"
+#~ msgstr[0] "%8d nodo i no contiguo (%0d.%d%%)\n"
+#~ msgstr[1] "%8d nodos i no contiguos (%0d.%d%%)\n"
+
+#~ msgid "%8d block used (%d%%)\n"
+#~ msgid_plural "%8d blocks used (%d%%)\n"
+#~ msgstr[0] "%8d bloque usado (%d%%)\n"
+#~ msgstr[1] "%d bloques usados (%d%%)\n"
+
+#~ msgid "%8d bad block\n"
+#~ msgid_plural "%8d bad blocks\n"
+#~ msgstr[0] "%8d bloque malo\n"
+#~ msgstr[1] "%8d bloques malos\n"
+
+#~ msgid "%8d large file\n"
+#~ msgid_plural "%8d large files\n"
+#~ msgstr[0] "%8d fichero grande\n"
+#~ msgstr[1] "%8d ficheros grandes\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "%8d regular file\n"
+#~ msgid_plural ""
+#~ "\n"
+#~ "%8d regular files\n"
+#~ msgstr[0] ""
+#~ "\n"
+#~ "%8d fichero regular\n"
+#~ msgstr[1] ""
+#~ "\n"
+#~ "%8d ficheros regulares\n"
+
+#~ msgid "%8d directory\n"
+#~ msgid_plural "%8d directories\n"
+#~ msgstr[0] "%8d directorio\n"
+#~ msgstr[1] "%8d directorios\n"
+
+#~ msgid "%8d character device file\n"
+#~ msgid_plural "%8d character device files\n"
+#~ msgstr[0] "%8d fichero de dispositivo tipo carcter\n"
+#~ msgstr[1] "%8d ficheros de dispositivo tipo carcter\n"
+
+#~ msgid "%8d block device file\n"
+#~ msgid_plural "%8d block device files\n"
+#~ msgstr[0] "%8d fichero de dispositivo tipo bloque\n"
+#~ msgstr[1] "%8d ficheros de dispositivo tipo bloque\n"
+
+#~ msgid "%8d fifo\n"
+#~ msgid_plural "%8d fifos\n"
+#~ msgstr[0] "%8d fifo\n"
+#~ msgstr[1] "%8d fifos\n"
+
+#~ msgid "%8d link\n"
+#~ msgid_plural "%8d links\n"
+#~ msgstr[0] "%8d vnculo\n"
+#~ msgstr[1] "%8d vnculos\n"
+
+#~ msgid "%8d symbolic link"
+#~ msgid_plural "%8d symbolic links"
+#~ msgstr[0] "%8d vnculo simblico"
+#~ msgstr[1] "%8d vnculos simblicos"
+
+#~ msgid " (%d fast symbolic link)\n"
+#~ msgid_plural " (%d fast symbolic links)\n"
+#~ msgstr[0] "(%d vnculo simblico rpido)\n"
+#~ msgstr[1] "(%d vnculos simblicos rpidos)\n"
+
+#~ msgid "%8d socket\n"
+#~ msgid_plural "%8d sockets\n"
+#~ msgstr[0] "%8d socket\n"
+#~ msgstr[1] "%8d sockets\n"
+
+#~ msgid "%8d file\n"
+#~ msgid_plural "%8d files\n"
+#~ msgstr[0] "%8d fichero\n"
+#~ msgstr[1] "%8d ficheros\n"
+
+#~ msgid ""
+#~ "\n"
#~ "This inconsistency can not be fixed with e2fsck; to fix it, use\n"
#~ "dumpe2fs -b to dump out the bad @b list and e2fsck -L filename\n"
#~ "to read it back in again.\n"
diff --git a/po/fr.gmo b/po/fr.gmo
new file mode 100644
index 00000000..29d7d926
--- /dev/null
+++ b/po/fr.gmo
Binary files differ
diff --git a/po/fr.po b/po/fr.po
index 55d562bb..49d4147d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: GNU e2fsprogs 1.35\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-24 14:17-0500\n"
+"Report-Msgid-Bugs-To: tytso@alum.mit.edu\n"
+"POT-Creation-Date: 2004-11-30 18:46-0500\n"
"PO-Revision-Date: 2004-09-19 08:00-0500\n"
"Last-Translator: Michel Robitaille <robitail@IRO.UMontreal.CA>\n"
"Language-Team: French <traduc@traduc.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Transfer-Encoding: 8-bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: e2fsck/badblocks.c:22 misc/mke2fs.c:194
+#: e2fsck/badblocks.c:22 misc/mke2fs.c:223
#, c-format
msgid "Bad block %u out of range; ignored.\n"
msgstr "Bloc corrompu %u hors limite; ignor.\n"
@@ -29,10 +29,10 @@ msgid "while reading the bad blocks inode"
msgstr "lors de la lecture de l'inode des blocs corrompus"
#: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
-#: e2fsck/unix.c:881 e2fsck/unix.c:913 misc/badblocks.c:997
+#: e2fsck/unix.c:915 e2fsck/unix.c:947 misc/badblocks.c:997
#: misc/badblocks.c:1005 misc/badblocks.c:1019 misc/badblocks.c:1031
-#: misc/dumpe2fs.c:332 misc/e2image.c:486 misc/e2image.c:502 misc/mke2fs.c:210
-#: misc/tune2fs.c:757 resize/main.c:228
+#: misc/dumpe2fs.c:332 misc/e2image.c:475 misc/e2image.c:564
+#: misc/e2image.c:580 misc/mke2fs.c:239 misc/tune2fs.c:775 resize/main.c:232
#, c-format
msgid "while trying to open %s"
msgstr "lors de la tentative d'ouverture de %s"
@@ -42,7 +42,7 @@ msgstr "lors de la tentative d'ouverture de %s"
msgid "while trying popen '%s'"
msgstr "lors de la tentative d'ouverture via popen() '%s'"
-#: e2fsck/badblocks.c:93 misc/mke2fs.c:217
+#: e2fsck/badblocks.c:93 misc/mke2fs.c:246
msgid "while reading in list of bad blocks from file"
msgstr "lors de la lecture de la liste des blocs corrompus partir du fichier"
@@ -53,7 +53,9 @@ msgstr "lors de la mise jour de l'inode des blocs corrompus"
#: e2fsck/badblocks.c:129
#, c-format
msgid "Warning illegal block %u found in bad block inode. Cleared.\n"
-msgstr "AVERTISSEMENT bloc illgal %u repr dans l'inode des blocs corrompus. Effac.\n"
+msgstr ""
+"AVERTISSEMENT bloc illgal %u repr dans l'inode des blocs corrompus. "
+"Effac.\n"
#: e2fsck/ehandler.c:53
#, c-format
@@ -102,6 +104,7 @@ msgid "%s: %s filename nblocks blocksize\n"
msgstr "%s: %s nom de fichier nblocs de taille de blocs\n"
#: e2fsck/extend.c:43
+#, c-format
msgid "Illegal number of blocks!\n"
msgstr "Nombre illgal de blocs!\n"
@@ -116,6 +119,7 @@ msgid "Usage: %s disk\n"
msgstr "Usage: %s disque\n"
#: e2fsck/flushb.c:63
+#, c-format
msgid "BLKFLSBUF ioctl not supported! Can't flush buffers.\n"
msgstr "BLKFLSBUF ioctl n'est pas support! Ne peut vider les tampons.\n"
@@ -124,12 +128,12 @@ msgstr "BLKFLSBUF ioctl n'est pas support! Ne peut vider les tampons.\n"
msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n"
msgstr "Usage: %s [-F] [-I inode_blocs_tampons] priphrique\n"
-#: e2fsck/iscan.c:83 e2fsck/unix.c:701 resize/main.c:205
+#: e2fsck/iscan.c:83 e2fsck/unix.c:729 resize/main.c:209
#, c-format
msgid "while opening %s for flushing"
msgstr "lors de l'ouverture de %s pour la vidange"
-#: e2fsck/iscan.c:88 e2fsck/unix.c:707 resize/main.c:212
+#: e2fsck/iscan.c:88 e2fsck/unix.c:735 resize/main.c:216
#, c-format
msgid "while trying to flush %s"
msgstr "lors de la tentative de vidange de %s"
@@ -147,31 +151,33 @@ msgstr "lors de l'obtention du prochain inode"
msgid "%d inodes scanned.\n"
msgstr "%d inodes scruts.\n"
-#: e2fsck/journal.c:449
+#: e2fsck/journal.c:463
msgid "reading journal superblock\n"
msgstr "lecture en cours du journal du superbloc\n"
-#: e2fsck/journal.c:506
+#: e2fsck/journal.c:520
#, c-format
msgid "%s: no valid journal superblock found\n"
msgstr "%s: aucun journal valide du superbloc n'a t repr\n"
-#: e2fsck/journal.c:515
+#: e2fsck/journal.c:529
#, c-format
msgid "%s: journal too short\n"
msgstr "%s: journal trop court\n"
-#: e2fsck/journal.c:787
+#: e2fsck/journal.c:802
#, c-format
msgid "%s: recovering journal\n"
msgstr "%s: recupration du journal\n"
-#: e2fsck/journal.c:789
+#: e2fsck/journal.c:804
#, c-format
msgid "%s: won't do journal recovery while read-only\n"
-msgstr "%s: aucune rcupration du journal n'est possible tant qu'il est en lecture seulement\n"
+msgstr ""
+"%s: aucune rcupration du journal n'est possible tant qu'il est en lecture "
+"seulement\n"
-#: e2fsck/journal.c:810
+#: e2fsck/journal.c:825
#, c-format
msgid "while trying to re-open %s"
msgstr "lors de la tentative de r-ouverture de %s"
@@ -328,77 +334,77 @@ msgstr "<L'inode rserv 10>"
msgid "multiply claimed inode map"
msgstr "carte des inodes rclams de multiples fois"
-#: e2fsck/pass1b.c:551 e2fsck/pass1b.c:688
+#: e2fsck/pass1b.c:554 e2fsck/pass1b.c:691
#, c-format
msgid "internal error; can't find dup_blk for %d\n"
msgstr "erreur interne; ne peut reprer dup_blk pour %d\n"
-#: e2fsck/pass1b.c:731
+#: e2fsck/pass1b.c:734
msgid "returned from clone_file_block"
msgstr "retourn partir de clone_file_block"
-#: e2fsck/pass1.c:297
+#: e2fsck/pass1.c:298
msgid "in-use inode map"
msgstr "carte des inodes en usage"
-#: e2fsck/pass1.c:306
+#: e2fsck/pass1.c:307
msgid "directory inode map"
msgstr "carte des inodes de rpertoires"
-#: e2fsck/pass1.c:314
+#: e2fsck/pass1.c:315
msgid "regular file inode map"
msgstr "carte des inode fichiers rguliers"
-#: e2fsck/pass1.c:321
+#: e2fsck/pass1.c:322
msgid "in-use block map"
msgstr "carte des blocs en usage"
-#: e2fsck/pass1.c:368
+#: e2fsck/pass1.c:369
msgid "doing inode scan"
msgstr "scrutation en cours des inodes"
-#: e2fsck/pass1.c:751
+#: e2fsck/pass1.c:752
msgid "Pass 1"
msgstr "Passe 1"
-#: e2fsck/pass1.c:810
+#: e2fsck/pass1.c:811
#, c-format
msgid "reading indirect blocks of inode %u"
msgstr "lecture des blocs indirects de l'inode %u"
-#: e2fsck/pass1.c:852
+#: e2fsck/pass1.c:853
msgid "bad inode map"
msgstr "carte d'inodes corrompus"
-#: e2fsck/pass1.c:874
+#: e2fsck/pass1.c:875
msgid "inode in bad block map"
msgstr "inode dans une carte de bloc corrompue"
-#: e2fsck/pass1.c:894
+#: e2fsck/pass1.c:895
msgid "imagic inode map"
msgstr "carte d'inode magique"
-#: e2fsck/pass1.c:921
+#: e2fsck/pass1.c:922
msgid "multiply claimed block map"
msgstr "carte des blocs rclams de multiples fois"
-#: e2fsck/pass1.c:1020
+#: e2fsck/pass1.c:1021
msgid "ext attr block map"
msgstr "carte des blocs d'attributs externes"
-#: e2fsck/pass1.c:1782
+#: e2fsck/pass1.c:1783
msgid "block bitmap"
msgstr "bitmap de blocs"
-#: e2fsck/pass1.c:1786
+#: e2fsck/pass1.c:1787
msgid "inode bitmap"
msgstr "bitmap d'inodes"
-#: e2fsck/pass1.c:1790
+#: e2fsck/pass1.c:1791
msgid "inode table"
msgstr "table d'inodes"
-#: e2fsck/pass2.c:293
+#: e2fsck/pass2.c:294
msgid "Pass 2"
msgstr "Passe 2"
@@ -606,10 +612,13 @@ msgid ""
"\n"
msgstr ""
"\n"
-"Le @S devrait tre lu ou ne contient pas une extension correcte de type ext2\n"
-"@f. Si le @v est valide et qu'il contient rellement une extension de type ext2\n"
+"Le @S devrait tre lu ou ne contient pas une extension correcte de type "
+"ext2\n"
+"@f. Si le @v est valide et qu'il contient rellement une extension de type "
+"ext2\n"
"@f (qui n'est pas de type swap ou autre), alors le @S\n"
-"est corrompu, et vous devrierz tenter d'excuter e2fsck avec un @S alternatif:\n"
+"est corrompu, et vous devrierz tenter d'excuter e2fsck avec un @S "
+"alternatif:\n"
" e2fsck -b %S <@v>\n"
"\n"
@@ -630,7 +639,8 @@ msgid ""
"from the @b size.\n"
msgstr ""
"@S @b_size = %b, fragsize = %c.\n"
-"Cette version de e2fsck ne supporte pas des fragments de tailles diffrentes\n"
+"Cette version de e2fsck ne supporte pas des fragments de tailles "
+"diffrentes\n"
" partir de la taille @b.\n"
#: e2fsck/problem.c:141
@@ -664,7 +674,8 @@ msgstr ""
"ncessitant une relocalisation, ou une partie de table d'inodes\n"
"devant tre dplac, vous dsirerez peut-tre excuter e2fsck\n"
"avec l'option '-b %S' d'abord. Le problme rside seulement avec\n"
-"avec le descripteur de groupe du bloc primaire, et le descripteur d'archivage\n"
+"avec le descripteur de groupe du bloc primaire, et le descripteur "
+"d'archivage\n"
"de groupe de blocs peut tre en bon tat.\n"
"\n"
@@ -709,11 +720,13 @@ msgstr "Externe @j ne supporte pas ce @f\n"
#: e2fsck/problem.c:210
msgid ""
"Ext3 @j @S is unknown type %N (unsupported).\n"
-"It is likely that your copy of e2fsck is old and/or doesn't support this @j format.\n"
+"It is likely that your copy of e2fsck is old and/or doesn't support this @j "
+"format.\n"
"It is also possible the @j @S is corrupt.\n"
msgstr ""
"Ext3 @j @S est un type inconnu %N (non support).\n"
-"Il semble que votre copie de e2fsck soit un peu vieillotte/ou ne supporte pas le format @j.\n"
+"Il semble que votre copie de e2fsck soit un peu vieillotte/ou ne supporte "
+"pas le format @j.\n"
"Il est possible que @j @S soit corrompu.\n"
#: e2fsck/problem.c:218
@@ -743,7 +756,9 @@ msgstr "Exctuer @j de toutes manires"
#: e2fsck/problem.c:248
msgid "Recovery flag not set in backup @S, so running @j anyway.\n"
-msgstr "Fanion de recouvrement n'est pas activ dans l'archivage de @S, aussi @j sera excut malgr tout.\n"
+msgstr ""
+"Fanion de recouvrement n'est pas activ dans l'archivage de @S, aussi @j "
+"sera excut malgr tout.\n"
#: e2fsck/problem.c:253
msgid "%s @o @i %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n"
@@ -769,11 +784,15 @@ msgstr "@I @i %i dans la liste @o @i.\n"
#: e2fsck/problem.c:283
msgid "Ext3 @j @S has an unknown read-only feature flag set.\n"
-msgstr "Ext3 @j @S a un fanion d'option slectionn en lecture seulement qui est inconnu.\n"
+msgstr ""
+"Ext3 @j @S a un fanion d'option slectionn en lecture seulement qui est "
+"inconnu.\n"
#: e2fsck/problem.c:288
msgid "Ext3 @j @S has an unknown incompatible feature flag set.\n"
-msgstr "Ext3 @j @S a un fanion d'option slectionn en lecture seulement qui est incompatible.\n"
+msgstr ""
+"Ext3 @j @S a un fanion d'option slectionn en lecture seulement qui est "
+"incompatible.\n"
#: e2fsck/problem.c:293
msgid "@j version not supported by this e2fsck.\n"
@@ -825,7 +844,9 @@ msgstr "@r n'est pas un @d. "
#: e2fsck/problem.c:330
msgid "@r has dtime set (probably due to old mke2fs). "
-msgstr "@r a la variable dtime qui a t initialis (probablement en raison d'un vieux mke2fs). "
+msgstr ""
+"@r a la variable dtime qui a t initialis (probablement en raison d'un "
+"vieux mke2fs). "
#: e2fsck/problem.c:335
msgid "Reserved @i %i %Q has bad mode. "
@@ -935,8 +956,10 @@ msgid ""
"guarantees.\n"
"\n"
msgstr ""
-"Vous pouvez librer le @b (en souhaitant que tout ce passe bien) partir de la\n"
-"@b des corrompuss et souhaiter que @b soit rellement correct, mais il n'y a pas de\n"
+"Vous pouvez librer le @b (en souhaitant que tout ce passe bien) partir de "
+"la\n"
+"@b des corrompuss et souhaiter que @b soit rellement correct, mais il n'y a "
+"pas de\n"
"guarantie.\n"
"\n"
@@ -946,7 +969,8 @@ msgstr "Le @S (%b) primaire est sur la liste @b des errons.\n"
#: e2fsck/problem.c:454
msgid "Block %b in the primary @g descriptors is on the bad @b list\n"
-msgstr "Bloc %b dans le descripteur @g primaire est sur la liste @b des corrompus\n"
+msgstr ""
+"Bloc %b dans le descripteur @g primaire est sur la liste @b des corrompus\n"
#: e2fsck/problem.c:460
msgid "Warning: Group %g's @S (%b) is bad.\n"
@@ -954,11 +978,15 @@ msgstr "AVERTISSEMENT: groupe %g's @S (%b) est erron.\n"
#: e2fsck/problem.c:465
msgid "Warning: Group %g's copy of the @g descriptors has a bad @b (%b).\n"
-msgstr "AVERTISSEMENT: grope %g's est une copie du descripteur @g dont @b (%b) est corrompu.\n"
+msgstr ""
+"AVERTISSEMENT: grope %g's est une copie du descripteur @g dont @b (%b) est "
+"corrompu.\n"
#: e2fsck/problem.c:471
msgid "Programming error? @b #%b claimed for no reason in process_bad_@b.\n"
-msgstr "Erreur de programmation? @b #%b reclam pour aucune raison dans process_bad_@b.\n"
+msgstr ""
+"Erreur de programmation? @b #%b reclam pour aucune raison dans "
+"process_bad_@b.\n"
#: e2fsck/problem.c:477
msgid "@A %N contiguous @b(s) in @b @g %g for %s: %m\n"
@@ -1008,7 +1036,9 @@ msgstr "ERREUR lors de la boucle d'itration sur @bs dans @i %i: %m\n"
#: e2fsck/problem.c:537
msgid "Error storing @i count information (@i=%i, count=%N): %m\n"
-msgstr "ERREUR lors du stockage du compteur d'information @i (@i=%i, compteur=%N): %m\n"
+msgstr ""
+"ERREUR lors du stockage du compteur d'information @i (@i=%i, compteur=%N): %"
+"m\n"
#: e2fsck/problem.c:542
msgid "Error storing @d @b information (@i=%i, @b=%b, num=%N): %m\n"
@@ -1036,7 +1066,8 @@ msgstr ""
#: e2fsck/problem.c:567
#, c-format
msgid "@i %i has @cion flag set on @f without @cion support. "
-msgstr "@i %i a le fanion @cion qui est initialis sur @f sans soutien @cion. "
+msgstr ""
+"@i %i a le fanion @cion qui est initialis sur @f sans soutien @cion. "
#: e2fsck/problem.c:587
msgid "@j is not regular file. "
@@ -1049,7 +1080,9 @@ msgstr "@i %i fait partie d'une liste @i orphelin. "
#: e2fsck/problem.c:598
msgid "@is that were part of a corrupted orphan linked list found. "
-msgstr "@is qui faisait partie d'un orphelin corrompu a t repr dans une liste de liens. "
+msgstr ""
+"@is qui faisait partie d'un orphelin corrompu a t repr dans une liste de "
+"liens. "
#: e2fsck/problem.c:608
msgid "Error reading @a @b %b for @i %i. "
@@ -1111,7 +1144,8 @@ msgstr "@b #%B (%b) provoque le lien symbolique tre trop grand. "
#: e2fsck/problem.c:677
#, c-format
msgid "@i %i has INDEX_FL flag set on @f without htree support.\n"
-msgstr "@i %i a le fanion INDEX_FL qui est initialis sur @f sans souten HTree.\n"
+msgstr ""
+"@i %i a le fanion INDEX_FL qui est initialis sur @f sans souten HTree.\n"
#: e2fsck/problem.c:682
#, c-format
@@ -1413,7 +1447,8 @@ msgstr "@a @b @F invalide (%If).\n"
#: e2fsck/problem.c:1033
msgid "@f contains large files, but lacks LARGE_FILE flag in @S.\n"
-msgstr "@f contient de grands fichiers, mais n'a pas le fanion LARGE_FILE dans @S.\n"
+msgstr ""
+"@f contient de grands fichiers, mais n'a pas le fanion LARGE_FILE dans @S.\n"
#: e2fsck/problem.c:1038
msgid "@p @h %d: node (%B) not referenced\n"
@@ -1437,7 +1472,9 @@ msgstr "Invalide @h %d (%q). "
#: e2fsck/problem.c:1062
msgid "Forcibly clearing HTREE flag on @i %d (%q). (Beta test code)\n"
-msgstr "Forcer la mise zro du fanion HTREE sur @i %d (%q). (Code en phase beta test)\n"
+msgstr ""
+"Forcer la mise zro du fanion HTREE sur @i %d (%q). (Code en phase beta "
+"test)\n"
#: e2fsck/problem.c:1067
msgid "@p @h %d (%q): bad @b number %b.\n"
@@ -1549,7 +1586,8 @@ msgstr "ext2fs_new_dir_@b: %m lors de la tentative de cration de @d @b\n"
#: e2fsck/problem.c:1184
#, c-format
msgid "ext2fs_write_dir_@b: %m while writing the @d @b for /@l\n"
-msgstr "ext2fs_write_dir_@b: %m lors de la tentative d'criture de @d @b pour /@l\n"
+msgstr ""
+"ext2fs_write_dir_@b: %m lors de la tentative d'criture de @d @b pour /@l\n"
#: e2fsck/problem.c:1189
#, c-format
@@ -1571,7 +1609,8 @@ msgid ""
"Couldn't fix parent of @i %i: Couldn't find parent @d entry\n"
"\n"
msgstr ""
-"Ne peut appliquer un correctif sur le parent de @i %i: ne peut reprer l'entre du parent de @d\n"
+"Ne peut appliquer un correctif sur le parent de @i %i: ne peut reprer "
+"l'entre du parent de @d\n"
"\n"
#: e2fsck/problem.c:1204
@@ -1633,8 +1672,10 @@ msgid ""
"@i_link_info[%i] is %N, @i.i_links_count is %Il. They should be the same!\n"
msgstr ""
"AVERTISSEMENT: bug de programamtion dans E2FSCK!\n"
-"\tou quelqu'un d'idiot (vous) est en train de vrifier un systme de fichiers mont (EN LIGNE).\n"
-"@i_link_info[%i] est %N, @i.i_links_count est %Il. Ils devraient tre les mmes!\n"
+"\tou quelqu'un d'idiot (vous) est en train de vrifier un systme de "
+"fichiers mont (EN LIGNE).\n"
+"@i_link_info[%i] est %N, @i.i_links_count est %Il. Ils devraient tre les "
+"mmes!\n"
#: e2fsck/problem.c:1302
msgid "Pass 5: Checking @g summary information\n"
@@ -1677,8 +1718,12 @@ msgid "Free @bs count wrong (%b, counted=%c).\n"
msgstr "Le dcompte @bs libre est erron (%b, dcompte=%c).\n"
#: e2fsck/problem.c:1382
-msgid "PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B endpoints (%i, %j)\n"
-msgstr "ERREUR DE PROGRAMMATION: @f (#%N) @B points de terminaison (%b, %c) ne concorde pas avec @B points de terminaison calculs (%i, %j)\n"
+msgid ""
+"PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B "
+"endpoints (%i, %j)\n"
+msgstr ""
+"ERREUR DE PROGRAMMATION: @f (#%N) @B points de terminaison (%b, %c) ne "
+"concorde pas avec @B points de terminaison calculs (%i, %j)\n"
#: e2fsck/problem.c:1388
msgid "Internal error: fudging end of bitmap (%N)\n"
@@ -1689,7 +1734,7 @@ msgstr "ERREUR interne: ajustement approximatif de la fin du bitmap (%N)\n"
msgid "Unhandled error code (0x%x)!\n"
msgstr "Code d'erreur non trait (0x%x)!\n"
-#: e2fsck/problem.c:1594
+#: e2fsck/problem.c:1595
msgid "IGNORED"
msgstr "IGNOR"
@@ -1752,8 +1797,10 @@ msgid "while writing inode table (group %d)"
msgstr "lors de l'criture de la table d'inodes (groupe %d)"
#: e2fsck/swapfs.c:222
+#, c-format
msgid "Pass 0: Doing byte-swap of filesystem\n"
-msgstr "Pass 0: traitement de l'change octet apr octet du systme de fichiers\n"
+msgstr ""
+"Pass 0: traitement de l'change octet apr octet du systme de fichiers\n"
#: e2fsck/swapfs.c:229
#, c-format
@@ -1761,14 +1808,16 @@ msgid ""
"%s: the filesystem must be freshly checked using fsck\n"
"and not mounted before trying to byte-swap it.\n"
msgstr ""
-"%s: le systme de fichiers doit avoir t rcemment vrifi en utilisant fsck\n"
-"et ne doit pas avoir t mont avant d'essayer un change par octet sur celui-ci.\n"
+"%s: le systme de fichiers doit avoir t rcemment vrifi en utilisant "
+"fsck\n"
+"et ne doit pas avoir t mont avant d'essayer un change par octet sur "
+"celui-ci.\n"
#: e2fsck/swapfs.c:264
msgid "Byte swap"
msgstr "change d'octets"
-#: e2fsck/unix.c:67
+#: e2fsck/unix.c:74
#, c-format
msgid ""
"Usage: %s [-panyrcdfvstDFSV] [-b superblock] [-B blocksize]\n"
@@ -1781,14 +1830,16 @@ msgstr ""
"\t\t[-l|-L fichier_de_blocs_corrompus] [-C fd] [-j journal_externe]\n"
"\t\t[-E options_tendues] priphrique\n"
-#: e2fsck/unix.c:73
+#: e2fsck/unix.c:80
+#, c-format
msgid ""
"\n"
"Emergency help:\n"
" -p Automatic repair (no questions)\n"
" -n Make no changes to the filesystem\n"
" -y Assume \"yes\" to all questions\n"
-" -c Check for bad blocks and add them to the badblock list\n"
+" -c Check for bad blocks and add them to the badblock "
+"list\n"
" -f Force checking even if filesystem is marked clean\n"
msgstr ""
"\n"
@@ -1796,10 +1847,13 @@ msgstr ""
" -p rparation automatique (sans discussion)\n"
" -n faire aucun changement au systme de fichiers\n"
" -y assumer \"yes\" (pour oui) toutes les questions\n"
-" -c vrifier la prsence de blocs corrompus et les ajouter la liste des blocs corrompus\n"
-" -f forcer la vrification mme si le systme de fichiers est class propre\n"
+" -c vrifier la prsence de blocs corrompus et les ajouter "
+" la liste des blocs corrompus\n"
+" -f forcer la vrification mme si le systme de fichiers "
+"est class propre\n"
-#: e2fsck/unix.c:79
+#: e2fsck/unix.c:86
+#, c-format
msgid ""
" -v Be verbose\n"
" -b superblock Use alternative superblock\n"
@@ -1810,159 +1864,39 @@ msgid ""
msgstr ""
" -v travailler en mode bavard\n"
" -b superblock utiliser un bloc alternatif pour le superbloc\n"
-" -B blocksize forcer la taille de bloc lors de la recherche du superbloc\n"
+" -B blocksize forcer la taille de bloc lors de la recherche du "
+"superbloc\n"
" -j external-journal fixer la localisation du journal externe\n"
" -l bad_blocks_file ajouter la liste des blocs corrompus\n"
" -L bad_blocks_file fixer la liste des blocs corrompus\n"
-#: e2fsck/unix.c:113
+#: e2fsck/unix.c:120
#, c-format
msgid "%s: %d/%d files (%0d.%d%% non-contiguous), %d/%d blocks\n"
msgstr "%s: %d/%d fichier (%0d.%d%% non contigus), %d/%d blocs\n"
-#: e2fsck/unix.c:119
-#, c-format
-msgid ""
-"\n"
-"%8d inode used (%d%%)\n"
-msgid_plural ""
-"\n"
-"%8d inodes used (%d%%)\n"
-msgstr[0] ""
-"\n"
-"%8d inode utilis (%d%%)\n"
-msgstr[1] ""
-"\n"
-"%8d inodes utiliss (%d%%)\n"
-
-#: e2fsck/unix.c:121
-#, c-format
-msgid "%8d non-contiguous inode (%0d.%d%%)\n"
-msgid_plural "%8d non-contiguous inodes (%0d.%d%%)\n"
-msgstr[0] "%8d inode non contigu (%0d.%d%%)\n"
-msgstr[1] "%8d inodes non contigus (%0d.%d%%)\n"
-
-#: e2fsck/unix.c:125
+#: e2fsck/unix.c:132
#, c-format
msgid " # of inodes with ind/dind/tind blocks: %d/%d/%d\n"
msgstr " # de inodes avec des blocs ind/dind/tind: %d/%d/%d\n"
-#: e2fsck/unix.c:127
-#, c-format
-msgid "%8d block used (%d%%)\n"
-msgid_plural "%8d blocks used (%d%%)\n"
-msgstr[0] "%8d bloc utilis (%d%%)\n"
-msgstr[1] "%8d blocs utiliss (%d%%)\n"
-
-#: e2fsck/unix.c:130
-#, c-format
-msgid "%8d bad block\n"
-msgid_plural "%8d bad blocks\n"
-msgstr[0] "%8d bloc corrompu\n"
-msgstr[1] "%8d blocs corrompus\n"
-
-#: e2fsck/unix.c:132
-#, c-format
-msgid "%8d large file\n"
-msgid_plural "%8d large files\n"
-msgstr[0] "%8d fichier de grande taille\n"
-msgstr[1] "%8d fichiers de grande taille\n"
-
-#: e2fsck/unix.c:134
-#, c-format
-msgid ""
-"\n"
-"%8d regular file\n"
-msgid_plural ""
-"\n"
-"%8d regular files\n"
-msgstr[0] ""
-"\n"
-"%8d fichier rgulier\n"
-msgstr[1] ""
-"\n"
-"%8d fichiers rguliers\n"
-
-#: e2fsck/unix.c:136
-#, c-format
-msgid "%8d directory\n"
-msgid_plural "%8d directories\n"
-msgstr[0] "%8d rpertoire\n"
-msgstr[1] "%8d rpertoires\n"
-
-#: e2fsck/unix.c:138
-#, c-format
-msgid "%8d character device file\n"
-msgid_plural "%8d character device files\n"
-msgstr[0] "%8d fichier de priphrique par caractre\n"
-msgstr[1] "%8d fichiers de priphrique par caractre\n"
-
-#: e2fsck/unix.c:141
-#, c-format
-msgid "%8d block device file\n"
-msgid_plural "%8d block device files\n"
-msgstr[0] "%8d fichier de priphrique par bloc\n"
-msgstr[1] "%8d fichiers de priphrique par bloc\n"
-
-#: e2fsck/unix.c:143
-#, c-format
-msgid "%8d fifo\n"
-msgid_plural "%8d fifos\n"
-msgstr[0] "%8d fifo\n"
-msgstr[1] "%8d fifos\n"
-
-#: e2fsck/unix.c:145
-#, c-format
-msgid "%8d link\n"
-msgid_plural "%8d links\n"
-msgstr[0] "%8d lien\n"
-msgstr[1] "%8d liens\n"
-
-#: e2fsck/unix.c:148
-#, c-format
-msgid "%8d symbolic link"
-msgid_plural "%8d symbolic links"
-msgstr[0] "%8d lien symbolique"
-msgstr[1] "%8d liens symboliques"
-
-#: e2fsck/unix.c:150
-#, c-format
-msgid " (%d fast symbolic link)\n"
-msgid_plural " (%d fast symbolic links)\n"
-msgstr[0] " (%d lien symbolique rapide)\n"
-msgstr[1] " (%d liens symboliques rapides)\n"
-
-#: e2fsck/unix.c:152
-#, c-format
-msgid "%8d socket\n"
-msgid_plural "%8d sockets\n"
-msgstr[0] "%8d socket\n"
-msgstr[1] "%8d sockets\n"
-
-#: e2fsck/unix.c:155
-#, c-format
-msgid "%8d file\n"
-msgid_plural "%8d files\n"
-msgstr[0] "%8d fichier\n"
-msgstr[1] "%8d fichiers\n"
-
-#: e2fsck/unix.c:169 misc/badblocks.c:781 misc/tune2fs.c:773 misc/util.c:145
+#: e2fsck/unix.c:176 misc/badblocks.c:781 misc/tune2fs.c:791 misc/util.c:151
#: resize/main.c:97
#, c-format
msgid "while determining whether %s is mounted."
msgstr "lors de la dtermination savoir si %s est mont."
-#: e2fsck/unix.c:184
+#: e2fsck/unix.c:191
#, c-format
msgid "Warning! %s is mounted.\n"
msgstr "AVERTISSEMENT! %s est mont.\n"
-#: e2fsck/unix.c:188
+#: e2fsck/unix.c:195
#, c-format
msgid "%s is mounted. "
msgstr "%s est mont. "
-#: e2fsck/unix.c:190
+#: e2fsck/unix.c:197
msgid ""
"Cannot continue, aborting.\n"
"\n"
@@ -1970,7 +1904,8 @@ msgstr ""
"Ne peut continuer, arrt immdiat.\n"
"\n"
-#: e2fsck/unix.c:191
+#: e2fsck/unix.c:198
+#, c-format
msgid ""
"\n"
"\n"
@@ -1980,163 +1915,182 @@ msgid ""
msgstr ""
"\n"
"\n"
-"AVERTISSEMENT!!! L'excution de e2fsck sur un systme de ficheirs mont peut\n"
+"AVERTISSEMENT!!! L'excution de e2fsck sur un systme de ficheirs mont "
+"peut\n"
"cause des dommages SVRES au systme de fichiers.\n"
"\n"
-#: e2fsck/unix.c:194
+#: e2fsck/unix.c:201
msgid "Do you really want to continue"
msgstr "Dsirez-vous rellement continuer"
-#: e2fsck/unix.c:196
+#: e2fsck/unix.c:203
+#, c-format
msgid "check aborted.\n"
msgstr "vrification stopp.\n"
-#: e2fsck/unix.c:245
+#: e2fsck/unix.c:264
msgid " contains a file system with errors"
msgstr " contient un systme de fichiers comportant des erreurs"
-#: e2fsck/unix.c:247
+#: e2fsck/unix.c:266
msgid " was not cleanly unmounted"
msgstr " n'a pas t dmont proprement"
-#: e2fsck/unix.c:251
+#: e2fsck/unix.c:270
#, c-format
msgid " has been mounted %u times without being checked"
msgstr " a t mont %u fois sans avoir t vrifi"
-#: e2fsck/unix.c:259
+#: e2fsck/unix.c:278
#, c-format
msgid " has gone %u days without being checked"
msgstr " a pass %u jours sans avoir t vrifi"
-#: e2fsck/unix.c:268
+#: e2fsck/unix.c:287
msgid ", check forced.\n"
msgstr ", vrification force.\n"
-#: e2fsck/unix.c:271
+#: e2fsck/unix.c:290
#, c-format
msgid "%s: clean, %d/%d files, %d/%d blocks"
msgstr "%s: propre, %d/%d fichiers, %d/%d blocs"
-#: e2fsck/unix.c:286
+#: e2fsck/unix.c:306
msgid " (check after next mount)"
msgstr " (vrifier lors du prochain montage)"
-#: e2fsck/unix.c:288
+#: e2fsck/unix.c:308
#, c-format
msgid " (check in %ld mounts)"
msgstr " (vrifi dans %ld montages)"
-#: e2fsck/unix.c:430
+#: e2fsck/unix.c:450
#, c-format
msgid "ERROR: Couldn't open /dev/null (%s)\n"
msgstr "ERREUR: ne peut ouvrir /dev/null (%s)\n"
-#: e2fsck/unix.c:501
+#: e2fsck/unix.c:521
+#, c-format
msgid "Invalid EA version.\n"
msgstr "Version EA invalide.\n"
-#: e2fsck/unix.c:510
+#: e2fsck/unix.c:532
+#, c-format
msgid ""
"Extended options are separated by commas, and may take an argument which\n"
"is set off by an equals ('=') sign. Valid raid options are:\n"
"\tea_ver=<ea_version (1 or 2)\n"
"\n"
msgstr ""
-"Les optioons tendues sont spares par des virgules, et peuvent prendre un argument\n"
-"lequele peut tre initialis par un signe d'galit ('='). Les options RAID valides sont:\n"
+"Les optioons tendues sont spares par des virgules, et peuvent prendre un "
+"argument\n"
+"lequele peut tre initialis par un signe d'galit ('='). Les options RAID "
+"valides sont:\n"
"\tea_ver=<ea_version (1 or 2)\n"
"\n"
-#: e2fsck/unix.c:568
+#: e2fsck/unix.c:590
#, c-format
msgid "Error validating file descriptor %d: %s\n"
msgstr "ERREUR lors de la validation du descripteur de fichier %d: %s\n"
-#: e2fsck/unix.c:572
+#: e2fsck/unix.c:594
msgid "Invalid completion information file descriptor"
msgstr "Compltion invalide du descripteur de fichier d'information"
-#: e2fsck/unix.c:587
+#: e2fsck/unix.c:609
msgid "Only one the options -p/-a, -n or -y may be specified."
msgstr "Seule une des options suivantes -p/-a, -n ou -y peut tre spcifie."
-#: e2fsck/unix.c:608
+#: e2fsck/unix.c:630
+#, c-format
msgid "The -t option is not supported on this version of e2fsck.\n"
msgstr "L'option -t n,est pas supporte sur cette version de e2fsck.\n"
-#: e2fsck/unix.c:673
+#: e2fsck/unix.c:695
+#, c-format
msgid "Byte-swapping filesystems not compiled in this version of e2fsck\n"
-msgstr "Les systmes de fichiers d'change d'octet ne sont pas compils pour cette version de e2fsck\n"
+msgstr ""
+"Les systmes de fichiers d'change d'octet ne sont pas compils pour cette "
+"version de e2fsck\n"
-#: e2fsck/unix.c:690 misc/tune2fs.c:444 misc/tune2fs.c:699 misc/tune2fs.c:716
+#: e2fsck/unix.c:718 misc/tune2fs.c:458 misc/tune2fs.c:716 misc/tune2fs.c:733
#, c-format
msgid "Unable to resolve '%s'"
msgstr "Incapable de rsoudre '%s'"
-#: e2fsck/unix.c:716
+#: e2fsck/unix.c:744
+#, c-format
msgid "Incompatible options not allowed when byte-swapping.\n"
-msgstr "Les options incompatibles ne sont pas permises lors de l'changes d'octets.\n"
+msgstr ""
+"Les options incompatibles ne sont pas permises lors de l'changes d'octets.\n"
-#: e2fsck/unix.c:723
+#: e2fsck/unix.c:751
+#, c-format
msgid "The -c and the -l/-L options may not be both used at the same time.\n"
msgstr "Les options -c et -l/-L ne peuvent tre utiliss en mme temps.\n"
-#: e2fsck/unix.c:801
+#: e2fsck/unix.c:829
+#, c-format
msgid "Error: ext2fs library version out of date!\n"
msgstr "ERREUR: la version de la librairie ext2fs est prime!\n"
-#: e2fsck/unix.c:809
+#: e2fsck/unix.c:837
msgid "while trying to initialize program"
msgstr "lors de la tentative d'initialisation du programme"
-#: e2fsck/unix.c:823
+#: e2fsck/unix.c:851
#, c-format
msgid "\tUsing %s, %s\n"
msgstr "\tUtilisation de %s, %s\n"
-#: e2fsck/unix.c:835
+#: e2fsck/unix.c:863
msgid "need terminal for interactive repairs"
msgstr "a besoin d'un termianl pour des rparations en mode interactif"
-#: e2fsck/unix.c:871
+#: e2fsck/unix.c:905
#, c-format
msgid "%s trying backup blocks...\n"
msgstr "%s tente d'archiver les blocs...\n"
-#: e2fsck/unix.c:872
+#: e2fsck/unix.c:906
msgid "Couldn't find ext2 superblock,"
msgstr "Ne peut reprer le superbloc ext2,"
-#: e2fsck/unix.c:873
+#: e2fsck/unix.c:907
msgid "Group descriptors look bad..."
msgstr "Descripteur de groupe semble en mauvais tat..."
-#: e2fsck/unix.c:884
+#: e2fsck/unix.c:918
+#, c-format
msgid ""
"The filesystem revision is apparently too high for this version of e2fsck.\n"
"(Or the filesystem superblock is corrupt)\n"
"\n"
msgstr ""
-"La rvision du systme de fichiers est apparemment trop grande pour cette version de e2fsck.\n"
+"La rvision du systme de fichiers est apparemment trop grande pour cette "
+"version de e2fsck.\n"
"(ou sinon le superbloc du systme de fichiers est corrompu)\n"
"\n"
-#: e2fsck/unix.c:890
+#: e2fsck/unix.c:924
+#, c-format
msgid "Could this be a zero-length partition?\n"
msgstr "Est-ce que la partition a une taille de longueur zro?\n"
-#: e2fsck/unix.c:892
+#: e2fsck/unix.c:926
#, c-format
msgid "You must have %s access to the filesystem or be root\n"
msgstr "Vous devez avoir un accs %s au systme de fichiers ou tre root\n"
-#: e2fsck/unix.c:897
+#: e2fsck/unix.c:931
+#, c-format
msgid "Possibly non-existent or swap device?\n"
msgstr "Possiblement un prriphrique inexistent ou pour le swap?\n"
-#: e2fsck/unix.c:900
+#: e2fsck/unix.c:934
+#, c-format
msgid ""
"Disk write-protected; use the -n option to do a read-only\n"
"check of the device.\n"
@@ -2144,34 +2098,39 @@ msgstr ""
"Disque protg en criture; utiliser l'option -n pour effectuer une\n"
"vrification du priphrique en mode lecture seulement.\n"
-#: e2fsck/unix.c:916
+#: e2fsck/unix.c:950
msgid "Get a newer version of e2fsck!"
msgstr "Veuillez obtenir une version plus rcente de e2fsck!"
-#: e2fsck/unix.c:937
+#: e2fsck/unix.c:971
#, c-format
msgid "while checking ext3 journal for %s"
msgstr "lors de la vrification du journal ext3 pour %s"
-#: e2fsck/unix.c:948
-msgid "Warning: skipping journal recovery because doing a read-only filesystem check.\n"
-msgstr "AVERTISSEMENT: escamotage du recouvrement du journal parce qu'on vrifie un systme de fichiers en mode lecture seulement.\n"
+#: e2fsck/unix.c:982
+#, c-format
+msgid ""
+"Warning: skipping journal recovery because doing a read-only filesystem "
+"check.\n"
+msgstr ""
+"AVERTISSEMENT: escamotage du recouvrement du journal parce qu'on vrifie un "
+"systme de fichiers en mode lecture seulement.\n"
-#: e2fsck/unix.c:961
+#: e2fsck/unix.c:995
#, c-format
msgid "unable to set superblock flags on %s\n"
msgstr "incapable d'initialiser les fanions du superbloc sur %s\n"
-#: e2fsck/unix.c:967
+#: e2fsck/unix.c:1001
#, c-format
msgid "while recovering ext3 journal of %s"
msgstr "lors du recouvrement du juornal ext3 de %s"
-#: e2fsck/unix.c:996
+#: e2fsck/unix.c:1030
msgid "Warning: compression support is experimental.\n"
msgstr "AVERTISSEMENT: le soutien de la compression est exprimental.\n"
-#: e2fsck/unix.c:1001
+#: e2fsck/unix.c:1035
#, c-format
msgid ""
"E2fsck not compiled with HTREE support,\n"
@@ -2180,37 +2139,39 @@ msgstr ""
"E2fsck n'est pas compil avec le soutien pour HTREE,\n"
"\tmais le systme de fichiers %s a des rpertoires HTREE.\n"
-#: e2fsck/unix.c:1044
+#: e2fsck/unix.c:1078
#, c-format
msgid "%s: Filesystem byte order already normalized.\n"
msgstr "%s: l'ordre des octet du systme de fichiers a dj t normalis.\n"
-#: e2fsck/unix.c:1064
+#: e2fsck/unix.c:1098
msgid "while reading bad blocks inode"
msgstr "lors de la lecture de l'inode des blocs corrompus"
-#: e2fsck/unix.c:1066
+#: e2fsck/unix.c:1100
+#, c-format
msgid "This doesn't bode well, but we'll try to go on...\n"
msgstr "cela ne semble pas tre bien, mais on va quand mme essayer...\n"
-#: e2fsck/unix.c:1073
+#: e2fsck/unix.c:1107
+#, c-format
msgid "Restarting e2fsck from the beginning...\n"
msgstr "Re-dmarrer e2fsck depuis le dbut...\n"
-#: e2fsck/unix.c:1077
+#: e2fsck/unix.c:1111
msgid "while resetting context"
msgstr "lors de la rinitialisation du contexte"
-#: e2fsck/unix.c:1084
+#: e2fsck/unix.c:1118
#, c-format
msgid "%s: e2fsck canceled.\n"
msgstr "%s: e2fsck a t annul.\n"
-#: e2fsck/unix.c:1089
+#: e2fsck/unix.c:1123
msgid "aborted"
msgstr "arrt"
-#: e2fsck/unix.c:1097
+#: e2fsck/unix.c:1131
#, c-format
msgid ""
"\n"
@@ -2219,12 +2180,12 @@ msgstr ""
"\n"
"%s: ***** SYSTME DE FICHIER A T MODIFI *****\n"
-#: e2fsck/unix.c:1100
+#: e2fsck/unix.c:1134
#, c-format
msgid "%s: ***** REBOOT LINUX *****\n"
msgstr "%s: ***** R-AMORCER LINUX *****\n"
-#: e2fsck/unix.c:1106
+#: e2fsck/unix.c:1140
#, c-format
msgid ""
"\n"
@@ -2232,7 +2193,8 @@ msgid ""
"\n"
msgstr ""
"\n"
-"%s: ********** AVERTISSEMENT: le systme de fichiers a encore des erreurs **********\n"
+"%s: ********** AVERTISSEMENT: le systme de fichiers a encore des erreurs "
+"**********\n"
"\n"
#: e2fsck/util.c:131 misc/util.c:68
@@ -2376,11 +2338,14 @@ msgstr "complt \n"
#, c-format
msgid ""
"Usage: %s [-b block_size] [-i input_file] [-o output_file] [-svwnf]\n"
-" [-c blocks_at_once] [-p num_passes] [-t test_pattern [-t test_pattern [...]]]\n"
+" [-c blocks_at_once] [-p num_passes] [-t test_pattern [-t test_pattern "
+"[...]]]\n"
" device [last_block [start_block]]\n"
msgstr ""
-"Usage: %s [-b taille_de_bloc] [-i fichier_d_entre] [-o fichier_de_sortie] [-svwnf]\n"
-" [-c blocs_a_la_fois] [-p nombre_de_passes] [-t patron_de_test [-t patron_de_test [...]]]\n"
+"Usage: %s [-b taille_de_bloc] [-i fichier_d_entre] [-o fichier_de_sortie] [-"
+"svwnf]\n"
+" [-c blocs_a_la_fois] [-p nombre_de_passes] [-t patron_de_test [-t "
+"patron_de_test [...]]]\n"
" priphrique [dernier_bloc [premier_bloc]]\n"
#: misc/badblocks.c:227
@@ -2440,11 +2405,15 @@ msgstr "Lecture et comparaison: "
#: misc/badblocks.c:595
msgid "Checking for bad blocks in non-destructive read-write mode\n"
-msgstr "Vrification de blocs corrompus dans un mode non destructif de lecture-criture\n"
+msgstr ""
+"Vrification de blocs corrompus dans un mode non destructif de lecture-"
+"criture\n"
#: misc/badblocks.c:599
msgid "Checking for bad blocks (non-destructive read-write test)\n"
-msgstr "Vrification de blocs corrompus (en mode test non destructif de lecture-criture)\n"
+msgstr ""
+"Vrification de blocs corrompus (en mode test non destructif de lecture-"
+"criture)\n"
#: misc/badblocks.c:606
msgid ""
@@ -2459,20 +2428,22 @@ msgstr ""
msgid "during test data write, block %lu"
msgstr "lors du test d'criture de donnes, bloc %lu"
-#: misc/badblocks.c:788 misc/util.c:152
+#: misc/badblocks.c:788 misc/util.c:158
#, c-format
msgid "%s is mounted; "
msgstr "%s est mont; "
#: misc/badblocks.c:790
msgid "badblocks forced anyway. Hope /etc/mtab is incorrect.\n"
-msgstr "l'excution de badblocks est forc de toutes manires. En esprant que /etc/mtab soit incorrect.\n"
+msgstr ""
+"l'excution de badblocks est forc de toutes manires. En esprant que /etc/"
+"mtab soit incorrect.\n"
#: misc/badblocks.c:794
msgid "it's not safe to run badblocks!\n"
msgstr "il n'est pas scuritaire d'excuter badbloks!\n"
-#: misc/badblocks.c:853 misc/mke2fs.c:898
+#: misc/badblocks.c:853 misc/mke2fs.c:926
#, c-format
msgid "bad block size - %s"
msgstr "taille des blocs corrompus - %s"
@@ -2489,7 +2460,9 @@ msgstr "test_pattern invalide: %s\n"
#: misc/badblocks.c:940
msgid "Maximum of one test_pattern may be specified in read-only mode"
-msgstr "Au maximum une seul patron_de_test peut tre spcif en mode lecture seulement"
+msgstr ""
+"Au maximum une seul patron_de_test peut tre spcif en mode lecture "
+"seulement"
#: misc/badblocks.c:946
msgid "Random test_pattern is not allowed in read-only mode"
@@ -2507,7 +2480,7 @@ msgstr ""
msgid "while trying to determine device size"
msgstr "lors de la tentative de dtermination de la taille du priphrique"
-#: misc/badblocks.c:972 misc/mke2fs.c:1071
+#: misc/badblocks.c:972 misc/mke2fs.c:1099
#, c-format
msgid "bad blocks count - %s"
msgstr "dcompte de blocs corrompus - %s"
@@ -2579,18 +2552,19 @@ msgstr "lors de l'initialisation de la version sur %s"
msgid "Couldn't allocate path variable in chattr_dir_proc"
msgstr "Ne peut allour une variable de chemin dans chattr_dir_proc"
-#: misc/chattr.c:287
+#: misc/chattr.c:291
msgid "= is incompatible with - and +\n"
msgstr "= est incompatible avec - et +\n"
-#: misc/chattr.c:295
+#: misc/chattr.c:299
msgid "Must use '-v', =, - or +\n"
msgstr "Vous devez utiliser '-v', = - ou +\n"
#: misc/dumpe2fs.c:54
#, c-format
msgid "Usage: %s [-bfhixV] [-ob superblock] [-oB blocksize] device\n"
-msgstr "Usage: %s [-bfhixV] [-ob super_bloc] [-oB taille_de_bloc] priphrique\n"
+msgstr ""
+"Usage: %s [-bfhixV] [-ob super_bloc] [-oB taille_de_bloc] priphrique\n"
#: misc/dumpe2fs.c:120
#, c-format
@@ -2611,10 +2585,12 @@ msgid "Backup"
msgstr "Archive"
#: misc/dumpe2fs.c:130
+#, c-format
msgid ", Group descriptors at "
msgstr ", Descripteurs de groupes "
#: misc/dumpe2fs.c:135
+#, c-format
msgid " Group descriptor at "
msgstr " Descripteur de groupe "
@@ -2660,7 +2636,7 @@ msgstr "lors de l'affichage de la liste des blocs corrompus"
msgid "Bad blocks: %d"
msgstr "Blocs corrompus: %d"
-#: misc/dumpe2fs.c:227 misc/tune2fs.c:150
+#: misc/dumpe2fs.c:227 misc/tune2fs.c:153
msgid "while reading journal superblock"
msgstr "lors de la lecture du journal du superbloc"
@@ -2687,16 +2663,18 @@ msgstr ""
"Journal dbut: %d\n"
"Journal nomber d'usagers: %d\n"
-#: misc/dumpe2fs.c:307 misc/mke2fs.c:1085
+#: misc/dumpe2fs.c:307 misc/mke2fs.c:1113
#, c-format
msgid "\tUsing %s\n"
msgstr "\tUtilisation de %s\n"
-#: misc/dumpe2fs.c:334 misc/e2image.c:488 misc/tune2fs.c:760 resize/main.c:230
+#: misc/dumpe2fs.c:334 misc/e2image.c:566 misc/tune2fs.c:778 resize/main.c:234
+#, c-format
msgid "Couldn't find valid filesystem superblock.\n"
msgstr "Ne peut reprer un superbloc valide du systme de fichiers.\n"
#: misc/dumpe2fs.c:345
+#, c-format
msgid "Note: This is a byte-swapped filesystem\n"
msgstr "Note: ce systme de fichiers est change d'octets\n"
@@ -2710,8 +2688,8 @@ msgstr ""
"%s: %s: ERREUR lors de la lecture de bitmaps: %s\n"
#: misc/e2image.c:50
-#, c-format
-msgid "Usage: %s [-r] device file\n"
+#, fuzzy, c-format
+msgid "Usage: %s [-r] device image_file\n"
msgstr "Usage: %s [-r] priphrique fichier\n"
#: misc/e2image.c:61
@@ -2721,7 +2699,8 @@ msgstr "Ne peut allouer un tampon d'en-tte\n"
#: misc/e2image.c:80
#, c-format
msgid "short write (only %d bytes) for writing image header"
-msgstr "criture croute (seulement %d octets) pour l'criture de l'en-tte image"
+msgstr ""
+"criture croute (seulement %d octets) pour l'criture de l'en-tte image"
#: misc/e2image.c:99
msgid "while writing superblock"
@@ -2745,34 +2724,42 @@ msgid "e2label: cannot open %s\n"
msgstr "e2lable: ne peut ouvrir %s\n"
#: misc/e2label.c:62
+#, c-format
msgid "e2label: cannot seek to superblock\n"
msgstr "e2label: ne peut atteidnre le superbloc\n"
#: misc/e2label.c:67
+#, c-format
msgid "e2label: error reading superblock\n"
msgstr "e2label: ERREUR de lecture su superbloc\n"
#: misc/e2label.c:71
+#, c-format
msgid "e2label: not an ext2 filesystem\n"
msgstr "e2label: n'est pas un systme de fichiers ext2\n"
-#: misc/e2label.c:96 misc/tune2fs.c:867
+#: misc/e2label.c:96 misc/tune2fs.c:885
+#, c-format
msgid "Warning: label too long, truncating.\n"
msgstr "AVERTISSEMENT: tiquette trop longue, sera tronque.\n"
#: misc/e2label.c:99
+#, c-format
msgid "e2label: cannot seek to superblock again\n"
msgstr "e2label: ne peut atteindre le superbloc nouveau\n"
#: misc/e2label.c:104
+#, c-format
msgid "e2label: error writing superblock\n"
msgstr "e2label: ERREUR lors de l'criture du superbloc\n"
-#: misc/e2label.c:116 misc/tune2fs.c:439
+#: misc/e2label.c:116 misc/tune2fs.c:450
+#, c-format
msgid "Usage: e2label device [newlabel]\n"
msgstr "Usage: e2label priphrique [nouvelle_tiquette]\n"
#: misc/findsuper.c:126
+#, c-format
msgid "Usage: findsuper device [skipbytes [startkb]]\n"
msgstr "Usage: findsuper priphrique [octets__escamoter [dbut_en_Ko]]\n"
@@ -2782,6 +2769,7 @@ msgid "skipbytes should be a number, not %s\n"
msgstr "octets escamoter doit tre un nombre, non pas %s\n"
#: misc/findsuper.c:137
+#, c-format
msgid "skipbytes must be a multiple of the sector size\n"
msgstr "octets escamoter doit tre un multiple de la taille de secteur\n"
@@ -2801,6 +2789,7 @@ msgid "starting at %Ld, with %d byte increments\n"
msgstr "dbut %Ld, avec un incrment de %d octets\n"
#: misc/findsuper.c:158
+#, c-format
msgid " thisoff block fs_blk_sz blksz grp last_mount\n"
msgstr " thisoff block fs_blk_sz blksz grp last_mount\n"
@@ -2832,7 +2821,8 @@ msgid ""
msgstr ""
"AVERTISSEMENT: votre fichier /etc/fstab ne contient pas de champ\n"
"\tfsck passno. Je vais arranger cette situation pour vous pour l'excution\n"
-"\tmais vous devriez corriger votre fichier /etc/fstab aussi tt que possible.\n"
+"\tmais vous devriez corriger votre fichier /etc/fstab aussi tt que "
+"possible.\n"
"\n"
#: misc/fsck.c:455
@@ -2848,7 +2838,8 @@ msgstr "%s: wait: pas d'autres processus enfants?!?\n"
#: misc/fsck.c:590
#, c-format
msgid "Warning... %s for device %s exited with signal %d.\n"
-msgstr "AVERTISSEMENT... %s pour le priphrique %s a termin avec le signal %d.\n"
+msgstr ""
+"AVERTISSEMENT... %s pour le priphrique %s a termin avec le signal %d.\n"
#: misc/fsck.c:596
#, c-format
@@ -2870,7 +2861,8 @@ msgid ""
"Either all or none of the filesystem types passed to -t must be prefixed\n"
"with 'no' or '!'.\n"
msgstr ""
-"Soit tous ou aucun des types de systmes de fichiers passs -t ne doit tre prfixs\n"
+"Soit tous ou aucun des types de systmes de fichiers passs -t ne doit "
+"tre prfixs\n"
"pas 'no' ou '!'.\n"
#: misc/fsck.c:732
@@ -2893,7 +2885,9 @@ msgstr "--en attente-- (passe %d)\n"
#: misc/fsck.c:1034
msgid "Usage: fsck [-ACNPRTV] [-t fstype] [fs-options] [filesys ...]\n"
-msgstr "Usage: fsck [-ACNPRTV] [-t type_de_sys_de_fichiers] [options_sys_de_fichiers] [sys_de_fichiers ...]\n"
+msgstr ""
+"Usage: fsck [-ACNPRTV] [-t type_de_sys_de_fichiers] "
+"[options_sys_de_fichiers] [sys_de_fichiers ...]\n"
#: misc/fsck.c:1076
#, c-format
@@ -2920,7 +2914,7 @@ msgstr "Lors de la lecture des faniosn sur %s"
msgid "While reading version on %s"
msgstr "Lors de la lecture de la version sur %s"
-#: misc/mke2fs.c:91
+#: misc/mke2fs.c:92
#, c-format
msgid ""
"Usage: %s [-c|-t|-l filename] [-b block-size] [-f fragment-size]\n"
@@ -2929,41 +2923,49 @@ msgid ""
"\t[-L volume-label] [-M last-mounted-directory] [-O feature[,...]]\n"
"\t[-r fs-revision] [-R raid_opts] [-qvSV] device [blocks-count]\n"
msgstr ""
-"Usage: %s [-c|-t|-l nom-de-fichier] [-b taille-de-bloc] [-f taille-de-fragment]\n"
+"Usage: %s [-c|-t|-l nom-de-fichier] [-b taille-de-bloc] [-f taille-de-"
+"fragment]\n"
"\t[-i octets-par-inode] [-j] [-J options-journal] [-N nomber-d-inodes]\n"
-"\t[-m pourcentage-de-blocs-rservs] [-o systme-d-exploitation] [-g blocs-par-groupe]\n"
+"\t[-m pourcentage-de-blocs-rservs] [-o systme-d-exploitation] [-g blocs-"
+"par-groupe]\n"
"\t[-L tiquette-du-volume] [-M dernier-rpertoire-mont] [-O options[,...]]\n"
-"\t[-r rvision-du-systme-de-fichier] [-R options-RAID] [-qvSV] priphrique [compteur-de-blocs]\n"
+"\t[-r rvision-du-systme-de-fichier] [-R options-RAID] [-qvSV] priphrique "
+"[compteur-de-blocs]\n"
-#: misc/mke2fs.c:235
+#: misc/mke2fs.c:264
#, c-format
msgid "Running command: %s\n"
msgstr "Excution de la commande: %s\n"
-#: misc/mke2fs.c:239
+#: misc/mke2fs.c:268
#, c-format
msgid "while trying run '%s'"
msgstr "lors de la tentative d'excution de '%s'"
-#: misc/mke2fs.c:246
+#: misc/mke2fs.c:275
msgid "while processing list of bad blocks from program"
-msgstr "lors du traitement de la liste des blocs corrompus partir du programme"
+msgstr ""
+"lors du traitement de la liste des blocs corrompus partir du programme"
-#: misc/mke2fs.c:273
+#: misc/mke2fs.c:302
#, c-format
msgid "Block %d in primary superblock/group descriptor area bad.\n"
-msgstr "Bloc %d dans la zone du descripteur du superbloc/groupe primaire est corrompu.\n"
+msgstr ""
+"Bloc %d dans la zone du descripteur du superbloc/groupe primaire est "
+"corrompu.\n"
-#: misc/mke2fs.c:275
+#: misc/mke2fs.c:304
#, c-format
msgid "Blocks %d through %d must be good in order to build a filesystem.\n"
-msgstr "Blocs de %d %d doivent tre en bon tat pour gnrer le systme de fichiers.\n"
+msgstr ""
+"Blocs de %d %d doivent tre en bon tat pour gnrer le systme de "
+"fichiers.\n"
-#: misc/mke2fs.c:278
+#: misc/mke2fs.c:307
msgid "Aborting....\n"
msgstr "Arrt immdiat...\n"
-#: misc/mke2fs.c:298
+#: misc/mke2fs.c:327
#, c-format
msgid ""
"Warning: the backup superblock/group descriptors at block %d contain\n"
@@ -2974,23 +2976,23 @@ msgstr ""
"\tcontient des blocs corrompus.\n"
"\n"
-#: misc/mke2fs.c:316
+#: misc/mke2fs.c:345
msgid "while marking bad blocks as used"
msgstr "lors du marquage des bloc corrompus utiliss"
-#: misc/mke2fs.c:374
+#: misc/mke2fs.c:403
msgid "done \n"
msgstr "complt \n"
-#: misc/mke2fs.c:409
+#: misc/mke2fs.c:438
msgid "while allocating zeroizing buffer"
msgstr "lors de l'allocation d'un tampon mis zro"
-#: misc/mke2fs.c:450
+#: misc/mke2fs.c:479
msgid "Writing inode tables: "
msgstr "criture des tables d'inodes: "
-#: misc/mke2fs.c:461
+#: misc/mke2fs.c:490
#, c-format
msgid ""
"\n"
@@ -2999,67 +3001,67 @@ msgstr ""
"\n"
"Ne peut crire %d blocs dans la table d'inodes dbutant %d: %s\n"
-#: misc/mke2fs.c:484
+#: misc/mke2fs.c:513
msgid "while creating root dir"
msgstr "lors de la cration du rpertoire racine"
-#: misc/mke2fs.c:491
+#: misc/mke2fs.c:520
msgid "while reading root inode"
msgstr "lors de la lecture de l'inode racine"
-#: misc/mke2fs.c:500
+#: misc/mke2fs.c:529
msgid "while setting root inode ownership"
msgstr "lors de l'initialisation de la proprit de l'inode racine"
-#: misc/mke2fs.c:518
+#: misc/mke2fs.c:547
msgid "while creating /lost+found"
msgstr "lors de la cration de /perdu+trouv"
-#: misc/mke2fs.c:525
+#: misc/mke2fs.c:554
msgid "while looking up /lost+found"
msgstr "lors de la recherche de /perdu+trouv"
-#: misc/mke2fs.c:535
+#: misc/mke2fs.c:564
msgid "while expanding /lost+found"
msgstr "lors de l'expansion de /perdu+trouv"
-#: misc/mke2fs.c:551
+#: misc/mke2fs.c:580
msgid "while setting bad block inode"
msgstr "lors de l'initialisation de l'inode de blocs corrompus"
-#: misc/mke2fs.c:583
+#: misc/mke2fs.c:612
#, c-format
msgid "Out of memory erasing sectors %d-%d\n"
msgstr "Mmoire puise lors de l'effacement des secteurs %d-%d\n"
-#: misc/mke2fs.c:593
+#: misc/mke2fs.c:622
#, c-format
msgid "Warning: could not read block 0: %s\n"
msgstr "AVERTISSEMENT: ne peut lire le bloc 0: %s\n"
-#: misc/mke2fs.c:609
+#: misc/mke2fs.c:638
#, c-format
msgid "Warning: could not erase sector %d: %s\n"
msgstr "AVERTISSEMENT: ne peut effacer le secteur %d: %s\n"
-#: misc/mke2fs.c:625
+#: misc/mke2fs.c:654
msgid "while initializing journal superblock"
msgstr "lors de l'initialisation du journal du superbloc"
-#: misc/mke2fs.c:631
+#: misc/mke2fs.c:660
msgid "Zeroing journal device: "
msgstr "Mise zro du journal du priphrique: "
-#: misc/mke2fs.c:638
+#: misc/mke2fs.c:667
#, c-format
msgid "while zeroing journal device (block %u, count %d)"
msgstr "lors de la mise zro du journal du priphrique (bloc %u, compte %d)"
-#: misc/mke2fs.c:649
+#: misc/mke2fs.c:678
msgid "while writing journal superblock"
msgstr "lors de l'criture au journal du superbloc"
-#: misc/mke2fs.c:664
+#: misc/mke2fs.c:693
#, c-format
msgid ""
"warning: %d blocks unused.\n"
@@ -3068,77 +3070,81 @@ msgstr ""
"AVERTISSEMENT: %d blocs inutiliss.\n"
"\n"
-#: misc/mke2fs.c:669
+#: misc/mke2fs.c:698
#, c-format
msgid "Filesystem label=%s\n"
msgstr "tiquette de systme de fichiers=%s\n"
-#: misc/mke2fs.c:670
+#: misc/mke2fs.c:699
msgid "OS type: "
msgstr "Type de systme d'exploitation: "
-#: misc/mke2fs.c:675
+#: misc/mke2fs.c:704
msgid "(unknown os)"
msgstr "(systme d'exploitation inconnu)"
-#: misc/mke2fs.c:678
+#: misc/mke2fs.c:707
#, c-format
msgid "Block size=%u (log=%u)\n"
msgstr "Taille de bloc=%u (log=%u)\n"
-#: misc/mke2fs.c:680
+#: misc/mke2fs.c:709
#, c-format
msgid "Fragment size=%u (log=%u)\n"
msgstr "Taille de fragment=%u (log=%u)\n"
-#: misc/mke2fs.c:682
+#: misc/mke2fs.c:711
#, c-format
msgid "%u inodes, %u blocks\n"
msgstr "%u inodes, %u blocs\n"
-#: misc/mke2fs.c:684
+#: misc/mke2fs.c:713
#, c-format
msgid "%u blocks (%2.2f%%) reserved for the super user\n"
msgstr "%u blocs (%2.2f%%) rserv pour le super usager\n"
-#: misc/mke2fs.c:687
+#: misc/mke2fs.c:716
#, c-format
msgid "First data block=%u\n"
msgstr "Premier bloc de donnes=%u\n"
-#: misc/mke2fs.c:689
+#: misc/mke2fs.c:718
#, c-format
msgid "%u block groups\n"
msgstr "%u bloc de groupes\n"
-#: misc/mke2fs.c:691
+#: misc/mke2fs.c:720
#, c-format
msgid "%u block group\n"
msgstr "%u bloc de groupe\n"
-#: misc/mke2fs.c:692
+#: misc/mke2fs.c:721
#, c-format
msgid "%u blocks per group, %u fragments per group\n"
msgstr "%u blocs par groupe, %u fragments par groupe\n"
-#: misc/mke2fs.c:694
+#: misc/mke2fs.c:723
#, c-format
msgid "%u inodes per group\n"
msgstr "%u inodes par groupe\n"
-#: misc/mke2fs.c:701
+#: misc/mke2fs.c:730
+#, c-format
msgid "Superblock backups stored on blocks: "
msgstr "Archive du superbloc stocke sur les blocs: "
-#: misc/mke2fs.c:751
+#: misc/mke2fs.c:780
+#, c-format
msgid "Couldn't allocate memory to parse raid options!\n"
msgstr "Ne peut allouer de la mmoire pour analyser les options RAID!\n"
-#: misc/mke2fs.c:776
+#: misc/mke2fs.c:805
+#, c-format
msgid "Invalid stride parameter.\n"
msgstr "Paramtre 'stride' invalide.\n"
-#: misc/mke2fs.c:784
+#: misc/mke2fs.c:813
+#, c-format
msgid ""
"\n"
"Bad raid options specified.\n"
@@ -3153,88 +3159,98 @@ msgstr ""
"\n"
"Options RAID spcifies sont errones.\n"
"\n"
-"Les options RAID sont spares par des virgules, et peuvent prendre un argument\n"
+"Les options RAID sont spares par des virgules, et peuvent prendre un "
+"argument\n"
"\tqui est initialis l'aide d'un signe d'galit ('=').\n"
"\n"
"Les options RAID valides sont:\n"
"\tstride=<stride longueur en blocs>\n"
"\n"
-#: misc/mke2fs.c:902
+#: misc/mke2fs.c:930
#, c-format
msgid "Warning: blocksize %d not usable on most systems.\n"
-msgstr "AVERTISSEMENT: taille de bloc %d n,est pas utilisable sur la plupart des systmes.\n"
+msgstr ""
+"AVERTISSEMENT: taille de bloc %d n,est pas utilisable sur la plupart des "
+"systmes.\n"
-#: misc/mke2fs.c:919
+#: misc/mke2fs.c:947
#, c-format
msgid "bad fragment size - %s"
msgstr "taille de fragment errone - %s"
-#: misc/mke2fs.c:925
+#: misc/mke2fs.c:953
+#, c-format
msgid "Warning: fragments not supported. Ignoring -f option\n"
msgstr "AVERTISSEMENT: fragments non supports. L'option -f est ignore\n"
-#: misc/mke2fs.c:932
+#: misc/mke2fs.c:960
msgid "Illegal number for blocks per group"
msgstr "Nombre de blocs par groupe illgal"
-#: misc/mke2fs.c:937
+#: misc/mke2fs.c:965
msgid "blocks per group must be multiple of 8"
msgstr "blocs par groupe doit tre un multiple de 8"
-#: misc/mke2fs.c:947
+#: misc/mke2fs.c:975
#, c-format
msgid "bad inode ratio %s (min %d/max %d"
msgstr "taux d'inodes erron %s (min %d/max %d)"
-#: misc/mke2fs.c:966
+#: misc/mke2fs.c:994
msgid "in malloc for bad_blocks_filename"
msgstr "dans malloc pour bad_blocks_filename"
-#: misc/mke2fs.c:975
+#: misc/mke2fs.c:1003
#, c-format
msgid "bad reserved blocks percent - %s"
msgstr "pourcentage de blocs rservs erron - %s"
-#: misc/mke2fs.c:1007
+#: misc/mke2fs.c:1035
#, c-format
msgid "bad inode size - %s"
msgstr "taille d'inode errone - %s"
-#: misc/mke2fs.c:1043 misc/tune2fs.c:294
+#: misc/mke2fs.c:1071 misc/tune2fs.c:302
#, c-format
msgid "Invalid filesystem option set: %s\n"
msgstr "Jeu d'options de systme de fichiers invalide: %s\n"
-#: misc/mke2fs.c:1112 misc/mke2fs.c:1449
+#: misc/mke2fs.c:1140 misc/mke2fs.c:1477
#, c-format
msgid "while trying to open journal device %s\n"
msgstr "lors de la tentative d'ouverture du journal du priphrique %s\n"
-#: misc/mke2fs.c:1118
+#: misc/mke2fs.c:1146
#, c-format
msgid "Journal dev blocksize (%d) smaller than minimum blocksize %d\n"
-msgstr "taille de bloc du journal du priphrique (%d) est plus petit que la taille de blocs minimum %d\n"
+msgstr ""
+"taille de bloc du journal du priphrique (%d) est plus petit que la taille "
+"de blocs minimum %d\n"
-#: misc/mke2fs.c:1132
+#: misc/mke2fs.c:1160
#, c-format
msgid "%d-byte blocks too big for system (max %d)"
msgstr "blocs de %d octets trop gros pour le systme (max %d)"
-#: misc/mke2fs.c:1136
+#: misc/mke2fs.c:1164
#, c-format
-msgid "Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
-msgstr "AVERTISSEMENT: blocs de %d octets trop gros pour le systme (max %d), poursuite force\n"
+msgid ""
+"Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
+msgstr ""
+"AVERTISSEMENT: blocs de %d octets trop gros pour le systme (max %d), "
+"poursuite force\n"
-#: misc/mke2fs.c:1161
+#: misc/mke2fs.c:1189
msgid "filesystem"
msgstr "systme de fichiers"
-#: misc/mke2fs.c:1174 resize/main.c:264
+#: misc/mke2fs.c:1202 resize/main.c:268
msgid "while trying to determine filesystem size"
-msgstr "lors de la tentative de dtermination de la taille du systme de fichiers"
+msgstr ""
+"lors de la tentative de dtermination de la taille du systme de fichiers"
-#: misc/mke2fs.c:1180
+#: misc/mke2fs.c:1208
msgid ""
"Couldn't determine device size; you must specify\n"
"the size of the filesystem\n"
@@ -3242,68 +3258,73 @@ msgstr ""
"Ne peut dterminer la taille du priphrique; vous devez spcifier\n"
"la taille du systme de fichiers\n"
-#: misc/mke2fs.c:1187
+#: misc/mke2fs.c:1215
msgid ""
"Device size reported to be zero. Invalid partition specified, or\n"
"\tpartition table wasn't reread after running fdisk, due to\n"
"\ta modified partition being busy and in use. You may need to reboot\n"
"\tto re-read your partition table.\n"
msgstr ""
-"La taille rapporte du priphrique est zro. Partition spcifi est invalide ou\n"
-"\tla table de partition n'a pas t relue aprs l'excution de fdisk, d au fait\n"
+"La taille rapporte du priphrique est zro. Partition spcifi est "
+"invalide ou\n"
+"\tla table de partition n'a pas t relue aprs l'excution de fdisk, d au "
+"fait\n"
"\tla partition modifi tait occupe et utilise. Vous devez r-amorcer\n"
"\tpour forcer une relecture de la table de partitions.\n"
-#: misc/mke2fs.c:1205
+#: misc/mke2fs.c:1233
msgid "Filesystem larger than apparent device size."
msgstr "Systme de fichiers plus grand que la taille apparente du priphrique"
-#: misc/mke2fs.c:1227
+#: misc/mke2fs.c:1255
msgid "while trying to determine hardware sector size"
-msgstr "lors de la tentative de dtermination de la taille matrielle de secteur"
+msgstr ""
+"lors de la tentative de dtermination de la taille matrielle de secteur"
-#: misc/mke2fs.c:1241
+#: misc/mke2fs.c:1269
msgid "blocks per group count out of range"
msgstr "compteur blocs par groupe hors limite"
-#: misc/mke2fs.c:1251
+#: misc/mke2fs.c:1279
#, c-format
msgid "bad inode size %d (min %d/max %d)"
msgstr "taille d'inode errone %d (min %d/max %d)"
-#: misc/mke2fs.c:1257
+#: misc/mke2fs.c:1285
#, c-format
msgid "Warning: %d-byte inodes not usable on most systems\n"
-msgstr "AVERTISSEMENT: inodes de %d octets ne sont pas utilisables sur la plupart des systmes\n"
+msgstr ""
+"AVERTISSEMENT: inodes de %d octets ne sont pas utilisables sur la plupart "
+"des systmes\n"
-#: misc/mke2fs.c:1308
+#: misc/mke2fs.c:1336
msgid "while setting up superblock"
msgstr "lors de l'initialisation du superblc"
-#: misc/mke2fs.c:1342
+#: misc/mke2fs.c:1370
#, c-format
msgid "unknown os - %s"
msgstr "systme d'exploitation inconnu - %s"
-#: misc/mke2fs.c:1396
+#: misc/mke2fs.c:1424
msgid "while trying to allocate filesystem tables"
msgstr "lors de la tentative d'allocation des tables de systmes de fichiers"
-#: misc/mke2fs.c:1427
+#: misc/mke2fs.c:1455
#, c-format
msgid "while zeroing block %u at end of filesystem"
msgstr "lors de la mise zro du bloc %u la fin du systme de fichiers"
-#: misc/mke2fs.c:1442 misc/tune2fs.c:376
+#: misc/mke2fs.c:1470 misc/tune2fs.c:387
msgid "journal"
msgstr "journal"
-#: misc/mke2fs.c:1454
+#: misc/mke2fs.c:1482
#, c-format
msgid "Adding journal to device %s: "
msgstr "Ajout du journal au priphrique %s: "
-#: misc/mke2fs.c:1461
+#: misc/mke2fs.c:1489
#, c-format
msgid ""
"\n"
@@ -3312,16 +3333,17 @@ msgstr ""
"\n"
"\tlors de la tentative d'ajout d'un journal au priphrique %s"
-#: misc/mke2fs.c:1466 misc/mke2fs.c:1490 misc/tune2fs.c:404 misc/tune2fs.c:418
+#: misc/mke2fs.c:1494 misc/mke2fs.c:1518 misc/tune2fs.c:415 misc/tune2fs.c:429
+#, c-format
msgid "done\n"
msgstr "complt\n"
-#: misc/mke2fs.c:1478
+#: misc/mke2fs.c:1506
#, c-format
msgid "Creating journal (%d blocks): "
msgstr "Cration du journal (%d blocs): "
-#: misc/mke2fs.c:1486
+#: misc/mke2fs.c:1514
msgid ""
"\n"
"\twhile trying to create journal"
@@ -3329,11 +3351,15 @@ msgstr ""
"\n"
"\tlors de la tentative de cration du journal"
-#: misc/mke2fs.c:1495
+#: misc/mke2fs.c:1523
+#, c-format
msgid "Writing superblocks and filesystem accounting information: "
-msgstr "criture des superblocs et de l'information de comptabilit du systme de fichiers: "
+msgstr ""
+"criture des superblocs et de l'information de comptabilit du systme de "
+"fichiers: "
-#: misc/mke2fs.c:1500
+#: misc/mke2fs.c:1528
+#, c-format
msgid ""
"\n"
"Warning, had trouble writing out superblocks."
@@ -3341,7 +3367,8 @@ msgstr ""
"\n"
"AVERTISSEMENT, des problmes sont survenus lors de l'criture des superblocs."
-#: misc/mke2fs.c:1503
+#: misc/mke2fs.c:1531
+#, c-format
msgid ""
"done\n"
"\n"
@@ -3349,7 +3376,8 @@ msgstr ""
"complt\n"
"\n"
-#: misc/mklost+found.c:48
+#: misc/mklost+found.c:49
+#, c-format
msgid "Usage: mklost+found\n"
msgstr "Usage: mklost+found\n"
@@ -3371,7 +3399,8 @@ msgid ""
msgstr ""
"Usage: %s <dev1> <dev2> <dev3>\n"
"\n"
-"Ce programme affiche les informations des partitions pour un ensemble de priphriques\n"
+"Ce programme affiche les informations des partitions pour un ensemble de "
+"priphriques\n"
"Une faon commune d'utiliser ce programme est:\n"
"\n"
"\t%s /dev/hda?\n"
@@ -3385,11 +3414,11 @@ msgstr "HDIO_GETGEO ioctl"
msgid "BLKGETSIZE ioctl"
msgstr "BLKGETSIZE ioctl"
-#: misc/tune2fs.c:74
+#: misc/tune2fs.c:77
msgid "Please run e2fsck on the filesystem.\n"
msgstr "SVP excuter e2fsck sur le systme de fichiers.\n"
-#: misc/tune2fs.c:81
+#: misc/tune2fs.c:84
#, c-format
msgid ""
"Usage: %s [-c max-mounts-count] [-e errors-behavior] [-g group]\n"
@@ -3399,60 +3428,64 @@ msgid ""
"\t[-u user] [-C mount-count] [-L volume-label] [-M last-mounted-dir]\n"
"\t[-O [^]feature[,...]] [-T last-check-time] [-U UUID] device\n"
msgstr ""
-"Usage: %s [-c limite-maximale-de-montage] [-e compteur-d-erreurs-de-comportement] [-g groupe]\n"
+"Usage: %s [-c limite-maximale-de-montage] [-e compteur-d-erreurs-de-"
+"comportement] [-g groupe]\n"
"\t[-i intervalle[d|m|w]] [-j] [-J options-journal]\n"
"\t[-l] [-s fanion-de-dispersion] [-m pourcentage-de-blocs-rservs]\n"
"\t[-o [^]options-de-montage[,...]] [-r compteur-de-blocs-rservs]\n"
-"\t[-u usager] [-C compteur-de-montage] [-L tiquette-du-volume] [-M dernier-rpertoire-mont]\n"
-"\t[-O [^]option[,...]] [-T date-de-dernire-vrification] [-U UUID] priphrique\n"
+"\t[-u usager] [-C compteur-de-montage] [-L tiquette-du-volume] [-M dernier-"
+"rpertoire-mont]\n"
+"\t[-O [^]option[,...]] [-T date-de-dernire-vrification] [-U UUID] "
+"priphrique\n"
-#: misc/tune2fs.c:138
+#: misc/tune2fs.c:141
msgid "while trying to open external journal"
msgstr "lors de la tentative d'ouverture du journal externe"
-#: misc/tune2fs.c:142
+#: misc/tune2fs.c:145
#, c-format
msgid "%s is not a journal device.\n"
msgstr "%s n'est pas un journal de priphrique.\n"
-#: misc/tune2fs.c:157
+#: misc/tune2fs.c:160
msgid "Journal superblock not found!\n"
msgstr "Journal du superbloc n'a pas t repr!\n"
-#: misc/tune2fs.c:169
+#: misc/tune2fs.c:172
msgid "Filesystem's UUID not found on journal device.\n"
-msgstr "Systme de fichiers UUID n'a pas t repr sur le journal du priphrique.\n"
+msgstr ""
+"Systme de fichiers UUID n'a pas t repr sur le journal du priphrique.\n"
-#: misc/tune2fs.c:190
+#: misc/tune2fs.c:193
msgid "Journal NOT removed\n"
msgstr "Journal N'A PAS t enlev\n"
-#: misc/tune2fs.c:196
+#: misc/tune2fs.c:199
msgid "Journal removed\n"
msgstr "Journal enlev\n"
-#: misc/tune2fs.c:228
+#: misc/tune2fs.c:231
msgid "while reading journal inode"
msgstr "lors de la lecture de l'inode du journal"
-#: misc/tune2fs.c:235
+#: misc/tune2fs.c:238
msgid "while reading bitmaps"
msgstr "lors de la lecture des bitmaps"
-#: misc/tune2fs.c:242
+#: misc/tune2fs.c:245
msgid "while clearing journal inode"
msgstr "lors de l'effacement de l'inode du journal"
-#: misc/tune2fs.c:253
+#: misc/tune2fs.c:256
msgid "while writing journal inode"
msgstr "lors de l'criture de l'inode du journal"
-#: misc/tune2fs.c:268
+#: misc/tune2fs.c:271
#, c-format
msgid "Invalid mount option set: %s\n"
msgstr "Jeu d'options pour le montage invalide: %s\n"
-#: misc/tune2fs.c:309
+#: misc/tune2fs.c:317
msgid ""
"The has_journal flag may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
@@ -3460,7 +3493,7 @@ msgstr ""
"Le fanion has_journal peut seulement tre effacer lorsque le\n"
"systme de fichiers est dmont ou mont en lecture seulement.\n"
-#: misc/tune2fs.c:317
+#: misc/tune2fs.c:325
msgid ""
"The needs_recovery flag is set. Please run e2fsck before clearing\n"
"the has_journal flag.\n"
@@ -3468,11 +3501,11 @@ msgstr ""
"Le fanion needs_recovery est initialis. SVP excuter e2fsck avant\n"
"d'effacer le fanion has_journal.\n"
-#: misc/tune2fs.c:371
+#: misc/tune2fs.c:382
msgid "The filesystem already has a journal.\n"
msgstr "Le systme de fichiers a un journal.\n"
-#: misc/tune2fs.c:388
+#: misc/tune2fs.c:399
#, c-format
msgid ""
"\n"
@@ -3481,21 +3514,21 @@ msgstr ""
"\n"
"\tlors de la tentative d'ouverture du journal sur %s\n"
-#: misc/tune2fs.c:392
+#: misc/tune2fs.c:403
#, c-format
msgid "Creating journal on device %s: "
msgstr "Cration du journal sur le priphrique %s: "
-#: misc/tune2fs.c:400
+#: misc/tune2fs.c:411
#, c-format
msgid "while adding filesystem to journal on %s"
msgstr "lors de l'ajout du systme de fichiers au journal sur %s"
-#: misc/tune2fs.c:406
+#: misc/tune2fs.c:417
msgid "Creating journal inode: "
msgstr "Cration de l'inode du journal: "
-#: misc/tune2fs.c:415
+#: misc/tune2fs.c:426
msgid ""
"\n"
"\twhile trying to create journal file"
@@ -3503,95 +3536,96 @@ msgstr ""
"\n"
"\tlors de la tentative de cration du fichier journal"
-#: misc/tune2fs.c:478
+#: misc/tune2fs.c:492
#, c-format
msgid "Couldn't parse date/time specifier: %s"
msgstr "Ne peut analyser le spcificateur de date/temps: %s"
-#: misc/tune2fs.c:500 misc/tune2fs.c:513
+#: misc/tune2fs.c:514 misc/tune2fs.c:527
#, c-format
msgid "bad mounts count - %s"
msgstr "compteur de montage erron - %s"
-#: misc/tune2fs.c:529
+#: misc/tune2fs.c:543
#, c-format
msgid "bad error behavior - %s"
msgstr "ERREUR de comportement errone - %s"
-#: misc/tune2fs.c:552
+#: misc/tune2fs.c:566
#, c-format
msgid "bad gid/group name - %s"
msgstr "nom gid/groupe erron - %s"
-#: misc/tune2fs.c:585
+#: misc/tune2fs.c:599
#, c-format
msgid "bad interval - %s"
msgstr "intervalle erron - %s"
-#: misc/tune2fs.c:613
+#: misc/tune2fs.c:627
#, c-format
msgid "bad reserved block ratio - %s"
msgstr "taux de rservation de blocs erron - %s"
-#: misc/tune2fs.c:628
+#: misc/tune2fs.c:642
msgid "-o may only be specified once"
msgstr "-o peut seulement tre spcifi une seule fois"
-#: misc/tune2fs.c:638
+#: misc/tune2fs.c:652
msgid "-O may only be specified once"
msgstr "-O peut seulement tre spcifi une seule fois"
-#: misc/tune2fs.c:648
+#: misc/tune2fs.c:662
#, c-format
msgid "bad reserved blocks count - %s"
msgstr "compteur de rservation de blocs erron - %s"
-#: misc/tune2fs.c:677
+#: misc/tune2fs.c:691
#, c-format
msgid "bad uid/user name - %s"
msgstr "nom uid/usager erron - %s"
-#: misc/tune2fs.c:783
+#: misc/tune2fs.c:801
#, c-format
msgid "Setting maximal mount count to %d\n"
msgstr "Initialisation du compteur de montage maximal %d\n"
-#: misc/tune2fs.c:789
+#: misc/tune2fs.c:807
#, c-format
msgid "Setting current mount count to %d\n"
msgstr "Initialisation du compteur courant de montage %d\n"
-#: misc/tune2fs.c:794
+#: misc/tune2fs.c:812
#, c-format
msgid "Setting error behavior to %d\n"
msgstr "Initialisation du compteur d'erreur de comportement %d\n"
-#: misc/tune2fs.c:799
+#: misc/tune2fs.c:817
#, c-format
msgid "Setting reserved blocks gid to %lu\n"
msgstr "Initialisation du gid de blocs rservs %lu\n"
-#: misc/tune2fs.c:804
+#: misc/tune2fs.c:822
#, c-format
msgid "Setting interval between check %lu seconds\n"
msgstr "Initialisation de l'intervalle de vrification %lu secondes\n"
-#: misc/tune2fs.c:810
+#: misc/tune2fs.c:828
#, c-format
msgid "Setting reserved blocks percentage to %lu (%u blocks)\n"
-msgstr "Initialisation du pourcentage de rservation de blocs %lu (%u blocs)\n"
+msgstr ""
+"Initialisation du pourcentage de rservation de blocs %lu (%u blocs)\n"
-#: misc/tune2fs.c:816
+#: misc/tune2fs.c:834
#, c-format
msgid "reserved blocks count is too big (%lu)"
msgstr "compteur de blocs rservs est trop grand (%lu)"
-#: misc/tune2fs.c:822
+#: misc/tune2fs.c:840
#, c-format
msgid "Setting reserved blocks count to %lu\n"
msgstr "Initialisation du compteur de blocs rservs %lu\n"
-#: misc/tune2fs.c:828
+#: misc/tune2fs.c:846
msgid ""
"\n"
"The filesystem already has sparse superblocks.\n"
@@ -3599,7 +3633,7 @@ msgstr ""
"\n"
"Le systme de fichiers dj des superblocs disperss.\n"
-#: misc/tune2fs.c:835
+#: misc/tune2fs.c:853
#, c-format
msgid ""
"\n"
@@ -3608,7 +3642,7 @@ msgstr ""
"\n"
"Fanion de superbloc dispers est initialis. %s"
-#: misc/tune2fs.c:842
+#: misc/tune2fs.c:860
msgid ""
"\n"
"The filesystem already has sparse superblocks disabled.\n"
@@ -3616,7 +3650,7 @@ msgstr ""
"\n"
"Le superbloc dispers est dsactiv sur le systme de fichiers.\n"
-#: misc/tune2fs.c:850
+#: misc/tune2fs.c:868
#, c-format
msgid ""
"\n"
@@ -3625,17 +3659,19 @@ msgstr ""
"\n"
"Fanion de superbloc dispers est effac. %s"
-#: misc/tune2fs.c:857
+#: misc/tune2fs.c:875
#, c-format
msgid "Setting time filesystem last checked to %s\n"
-msgstr "Initialisation de la date de la dernire vrification du systme de fichiers %s\n"
+msgstr ""
+"Initialisation de la date de la dernire vrification du systme de fichiers "
+" %s\n"
-#: misc/tune2fs.c:863
+#: misc/tune2fs.c:881
#, c-format
msgid "Setting reserved blocks uid to %lu\n"
msgstr "Initialisation du uid de blocs rservs %lu\n"
-#: misc/tune2fs.c:896
+#: misc/tune2fs.c:914
msgid "Invalid UUID format\n"
msgstr "Format UUID invalide\n"
@@ -3654,32 +3690,35 @@ msgid ""
"The device apparently does not exist; did you specify it correctly?\n"
msgstr ""
"\n"
-"Le priphrique n'existe pas apparemment; l'avez-vous spcifi correctement?\n"
+"Le priphrique n'existe pas apparemment; l'avez-vous spcifi "
+"correctement?\n"
-#: misc/util.c:101
+#: misc/util.c:107
#, c-format
msgid "%s is not a block special device.\n"
msgstr "%s n'est pas un priphrique spcial bloc.\n"
-#: misc/util.c:130
+#: misc/util.c:136
#, c-format
msgid "%s is entire device, not just one partition!\n"
msgstr "%s est le priphrique en entier, pas seulement juste une partition!\n"
-#: misc/util.c:154
+#: misc/util.c:160
msgid "mke2fs forced anyway. Hope /etc/mtab is incorrect.\n"
-msgstr "mke2fs est forc de toutes manires. En esprant que /etc/mtab soit incorrect.\n"
+msgstr ""
+"mke2fs est forc de toutes manires. En esprant que /etc/mtab soit "
+"incorrect.\n"
-#: misc/util.c:157
+#: misc/util.c:163
#, c-format
msgid "will not make a %s here!\n"
msgstr "ne fera pas un %s ici!\n"
-#: misc/util.c:171
+#: misc/util.c:177
msgid "Couldn't allocate memory to parse journal options!\n"
msgstr "Ne peut allouer de la mmoire pour analyser les options du journal!\n"
-#: misc/util.c:213
+#: misc/util.c:219
msgid ""
"\n"
"Bad journal options specified.\n"
@@ -3704,10 +3743,11 @@ msgstr ""
"\tsize=<taille du journal en mgaoctets>\n"
"\tdevice=<priphrique du journal>\n"
"\n"
-"La taille du journal doit tre comprise entre 1024 et 102400 blocs du systme de fichiers.\n"
+"La taille du journal doit tre comprise entre 1024 et 102400 blocs du "
+"systme de fichiers.\n"
"\n"
-#: misc/util.c:240
+#: misc/util.c:246
msgid ""
"\n"
"Filesystem too small for a journal\n"
@@ -3715,7 +3755,7 @@ msgstr ""
"\n"
"Le systme de fichiers est trop petit pour un journal\n"
-#: misc/util.c:247
+#: misc/util.c:253
#, c-format
msgid ""
"\n"
@@ -3726,7 +3766,7 @@ msgstr ""
"La taille requise du journal est de %d blocs; elle doit tre\n"
"entre 1024 et 102400 blocs. Arrt immdiat.\n"
-#: misc/util.c:255
+#: misc/util.c:261
msgid ""
"\n"
"Journal size too big for filesystem.\n"
@@ -3734,14 +3774,16 @@ msgstr ""
"\n"
"La taille du journal est trop grande pour le systme de fichiers.\n"
-#: misc/util.c:274
+#: misc/util.c:280
#, c-format
msgid ""
"This filesystem will be automatically checked every %d mounts or\n"
"%g days, whichever comes first. Use tune2fs -c or -i to override.\n"
msgstr ""
-"Le systme de fichiers sera automatiquement vrifi tous les %d montages ou aprs\n"
-"%g jours, selon la premire ventualit. Utiliser tune2fs -c ou -i pour craser la valeur.\n"
+"Le systme de fichiers sera automatiquement vrifi tous les %d montages ou "
+"aprs\n"
+"%g jours, selon la premire ventualit. Utiliser tune2fs -c ou -i pour "
+"craser la valeur.\n"
#: misc/uuidgen.c:30
#, c-format
@@ -3819,7 +3861,7 @@ msgstr "resize2fs %s (%s)\n"
msgid "bad filesystem size - %s"
msgstr "taille errone du systme de fichiers - %s"
-#: resize/main.c:296
+#: resize/main.c:300
#, c-format
msgid ""
"The containing partition (or device) is only %d (%dk) blocks.\n"
@@ -3830,7 +3872,7 @@ msgstr ""
"Vous avez demand une nouvelle taille de %d blocs.\n"
"\n"
-#: resize/main.c:303
+#: resize/main.c:307
#, c-format
msgid ""
"The filesystem is already %d blocks long. Nothing to do!\n"
@@ -3839,7 +3881,7 @@ msgstr ""
"Le systme de fichier a dj %d blocs. Rien modifier!\n"
"\n"
-#: resize/main.c:310
+#: resize/main.c:314
#, c-format
msgid ""
"Please run 'e2fsck -f %s' first.\n"
@@ -3848,12 +3890,12 @@ msgstr ""
"SVP excuter 'e2fsck -f %s' d'abord.\n"
"\n"
-#: resize/main.c:320
+#: resize/main.c:324
#, c-format
msgid "while trying to resize %s"
msgstr "lors de la tentative de modification de la taille %s"
-#: resize/main.c:325
+#: resize/main.c:329
#, c-format
msgid ""
"The filesystem on %s is now %d blocks long.\n"
@@ -3862,57 +3904,150 @@ msgstr ""
"Le systme de fichiers %s a maintenant une taille de %d blocs.\n"
"\n"
-#: resize/resize2fs.c:109
+#: resize/resize2fs.c:110
#, c-format
msgid "Number of free blocks: %d/%d, Needed: %d\n"
msgstr "Nombre de blocs libres: %d/%d, A besoin de: %d\n"
-#: resize/resize2fs.c:458
+#: resize/resize2fs.c:459
msgid "meta-data blocks"
msgstr "blocs de mtadonnes"
-#: resize/resize2fs.c:581
+#: resize/resize2fs.c:582
msgid "reserved blocks"
msgstr "blocs rservs"
-#: resize/resize2fs.c:586
+#: resize/resize2fs.c:587
msgid "blocks to be moved"
msgstr "blocs dplacer"
-#: resize/resize2fs.c:816
+#: resize/resize2fs.c:817
+#, c-format
msgid "Going into desperation mode for block allocations\n"
msgstr "Passage en mode dsespr pour l'allocation de blocs\n"
-#: resize/resize2fs.c:920
+#: resize/resize2fs.c:921
#, c-format
msgid "Moving %d blocks %u->%u\n"
msgstr "Dplacement de %d blocs %u->%u\n"
-#: resize/resize2fs.c:997
+#: resize/resize2fs.c:998
#, c-format
msgid "ino=%u, blockcnt=%lld, %u->%u\n"
msgstr "ino=%u, blockcnt=%lld, %u->%u\n"
-#: resize/resize2fs.c:1165
+#: resize/resize2fs.c:1166
#, c-format
msgid "Inode moved %u->%u\n"
msgstr "Inode dplac %u->%u\n"
-#: resize/resize2fs.c:1233
+#: resize/resize2fs.c:1234
#, c-format
msgid "Inode translate (dir=%u, name=%.*s, %u->%u)\n"
msgstr "Translation d'inode (rpertoire=%u, nom=%.*s, %u->%u)\n"
-#: resize/resize2fs.c:1360
+#: resize/resize2fs.c:1361
#, c-format
msgid "Itable move group %d block %u->%u (diff %d)\n"
msgstr "Dplacement du groupe Itable %d bloc %u->%u (diff %d)\n"
-#: resize/resize2fs.c:1386
+#: resize/resize2fs.c:1387
#, c-format
msgid "%d blocks of zeros...\n"
msgstr "%d blocs de zros...\n"
-#: resize/resize2fs.c:1421
+#: resize/resize2fs.c:1422
+#, c-format
msgid "Inode table move finished.\n"
msgstr "Dplacement de la table d'inodes complt.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "%8d inode used (%d%%)\n"
+#~ msgid_plural ""
+#~ "\n"
+#~ "%8d inodes used (%d%%)\n"
+#~ msgstr[0] ""
+#~ "\n"
+#~ "%8d inode utilis (%d%%)\n"
+#~ msgstr[1] ""
+#~ "\n"
+#~ "%8d inodes utiliss (%d%%)\n"
+
+#~ msgid "%8d non-contiguous inode (%0d.%d%%)\n"
+#~ msgid_plural "%8d non-contiguous inodes (%0d.%d%%)\n"
+#~ msgstr[0] "%8d inode non contigu (%0d.%d%%)\n"
+#~ msgstr[1] "%8d inodes non contigus (%0d.%d%%)\n"
+
+#~ msgid "%8d block used (%d%%)\n"
+#~ msgid_plural "%8d blocks used (%d%%)\n"
+#~ msgstr[0] "%8d bloc utilis (%d%%)\n"
+#~ msgstr[1] "%8d blocs utiliss (%d%%)\n"
+
+#~ msgid "%8d bad block\n"
+#~ msgid_plural "%8d bad blocks\n"
+#~ msgstr[0] "%8d bloc corrompu\n"
+#~ msgstr[1] "%8d blocs corrompus\n"
+
+#~ msgid "%8d large file\n"
+#~ msgid_plural "%8d large files\n"
+#~ msgstr[0] "%8d fichier de grande taille\n"
+#~ msgstr[1] "%8d fichiers de grande taille\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "%8d regular file\n"
+#~ msgid_plural ""
+#~ "\n"
+#~ "%8d regular files\n"
+#~ msgstr[0] ""
+#~ "\n"
+#~ "%8d fichier rgulier\n"
+#~ msgstr[1] ""
+#~ "\n"
+#~ "%8d fichiers rguliers\n"
+
+#~ msgid "%8d directory\n"
+#~ msgid_plural "%8d directories\n"
+#~ msgstr[0] "%8d rpertoire\n"
+#~ msgstr[1] "%8d rpertoires\n"
+
+#~ msgid "%8d character device file\n"
+#~ msgid_plural "%8d character device files\n"
+#~ msgstr[0] "%8d fichier de priphrique par caractre\n"
+#~ msgstr[1] "%8d fichiers de priphrique par caractre\n"
+
+#~ msgid "%8d block device file\n"
+#~ msgid_plural "%8d block device files\n"
+#~ msgstr[0] "%8d fichier de priphrique par bloc\n"
+#~ msgstr[1] "%8d fichiers de priphrique par bloc\n"
+
+#~ msgid "%8d fifo\n"
+#~ msgid_plural "%8d fifos\n"
+#~ msgstr[0] "%8d fifo\n"
+#~ msgstr[1] "%8d fifos\n"
+
+#~ msgid "%8d link\n"
+#~ msgid_plural "%8d links\n"
+#~ msgstr[0] "%8d lien\n"
+#~ msgstr[1] "%8d liens\n"
+
+#~ msgid "%8d symbolic link"
+#~ msgid_plural "%8d symbolic links"
+#~ msgstr[0] "%8d lien symbolique"
+#~ msgstr[1] "%8d liens symboliques"
+
+#~ msgid " (%d fast symbolic link)\n"
+#~ msgid_plural " (%d fast symbolic links)\n"
+#~ msgstr[0] " (%d lien symbolique rapide)\n"
+#~ msgstr[1] " (%d liens symboliques rapides)\n"
+
+#~ msgid "%8d socket\n"
+#~ msgid_plural "%8d sockets\n"
+#~ msgstr[0] "%8d socket\n"
+#~ msgstr[1] "%8d sockets\n"
+
+#~ msgid "%8d file\n"
+#~ msgid_plural "%8d files\n"
+#~ msgstr[0] "%8d fichier\n"
+#~ msgstr[1] "%8d fichiers\n"
diff --git a/po/it.gmo b/po/it.gmo
new file mode 100644
index 00000000..80e516ff
--- /dev/null
+++ b/po/it.gmo
Binary files differ
diff --git a/po/it.po b/po/it.po
index 549aa17d..bd40973c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: e2fsprogs 1.35\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-24 14:17-0500\n"
+"Report-Msgid-Bugs-To: tytso@alum.mit.edu\n"
+"POT-Creation-Date: 2004-11-30 18:46-0500\n"
"PO-Revision-Date: 2004-11-02 19:56+0100\n"
"Last-Translator: Andrea Spadaccini <lupin85@email.it>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: e2fsck/badblocks.c:22 misc/mke2fs.c:194
+#: e2fsck/badblocks.c:22 misc/mke2fs.c:223
#, c-format
msgid "Bad block %u out of range; ignored.\n"
msgstr "Blocco non valido %u fuori dall'intervallo; ignorato.\n"
@@ -30,10 +30,10 @@ msgid "while reading the bad blocks inode"
msgstr "durante la lettura dell'inode dei blocchi non validi"
#: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
-#: e2fsck/unix.c:881 e2fsck/unix.c:913 misc/badblocks.c:997
+#: e2fsck/unix.c:915 e2fsck/unix.c:947 misc/badblocks.c:997
#: misc/badblocks.c:1005 misc/badblocks.c:1019 misc/badblocks.c:1031
-#: misc/dumpe2fs.c:332 misc/e2image.c:486 misc/e2image.c:502 misc/mke2fs.c:210
-#: misc/tune2fs.c:757 resize/main.c:228
+#: misc/dumpe2fs.c:332 misc/e2image.c:475 misc/e2image.c:564
+#: misc/e2image.c:580 misc/mke2fs.c:239 misc/tune2fs.c:775 resize/main.c:232
#, c-format
msgid "while trying to open %s"
msgstr "durante l'apertura di %s"
@@ -43,7 +43,7 @@ msgstr "durante l'apertura di %s"
msgid "while trying popen '%s'"
msgstr "provando ad effettuare il popen di '%s'"
-#: e2fsck/badblocks.c:93 misc/mke2fs.c:217
+#: e2fsck/badblocks.c:93 misc/mke2fs.c:246
msgid "while reading in list of bad blocks from file"
msgstr "durante la lettura della lista di blocchi non validi da file"
@@ -54,7 +54,9 @@ msgstr "aggiornando l'inode di un blocco non valido"
#: e2fsck/badblocks.c:129
#, c-format
msgid "Warning illegal block %u found in bad block inode. Cleared.\n"
-msgstr "Attenzione blocco illegale %u trovato nell'inode di un blocco non valido. Azzerato.\n"
+msgstr ""
+"Attenzione blocco illegale %u trovato nell'inode di un blocco non valido. "
+"Azzerato.\n"
#: e2fsck/ehandler.c:53
#, c-format
@@ -103,6 +105,7 @@ msgid "%s: %s filename nblocks blocksize\n"
msgstr "%s: %s nomefile nblocchi dim_blocco\n"
#: e2fsck/extend.c:43
+#, c-format
msgid "Illegal number of blocks!\n"
msgstr "Numero di blocchi non valido!\n"
@@ -117,6 +120,7 @@ msgid "Usage: %s disk\n"
msgstr "Utilizzo: %s disco\n"
#: e2fsck/flushb.c:63
+#, c-format
msgid "BLKFLSBUF ioctl not supported! Can't flush buffers.\n"
msgstr "Ioctl BLKFLSBUF non supportato! Impossibile svuotare i buffer.\n"
@@ -125,12 +129,12 @@ msgstr "Ioctl BLKFLSBUF non supportato! Impossibile svuotare i buffer.\n"
msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n"
msgstr "Utilizzo: %s [-F] [-I blocchi_buffer_inode] device\n"
-#: e2fsck/iscan.c:83 e2fsck/unix.c:701 resize/main.c:205
+#: e2fsck/iscan.c:83 e2fsck/unix.c:729 resize/main.c:209
#, c-format
msgid "while opening %s for flushing"
msgstr "aprendo %s per lo svuotamento"
-#: e2fsck/iscan.c:88 e2fsck/unix.c:707 resize/main.c:212
+#: e2fsck/iscan.c:88 e2fsck/unix.c:735 resize/main.c:216
#, c-format
msgid "while trying to flush %s"
msgstr "provando a svuotare %s"
@@ -148,31 +152,31 @@ msgstr ""
msgid "%d inodes scanned.\n"
msgstr "%d inode analizzati.\n"
-#: e2fsck/journal.c:449
+#: e2fsck/journal.c:463
msgid "reading journal superblock\n"
msgstr "lettura del superblocco del journal\n"
-#: e2fsck/journal.c:506
+#: e2fsck/journal.c:520
#, c-format
msgid "%s: no valid journal superblock found\n"
msgstr "%s: non stato trovato un superblocco valido del journal\n"
-#: e2fsck/journal.c:515
+#: e2fsck/journal.c:529
#, c-format
msgid "%s: journal too short\n"
msgstr "%s: journal troppo breve\n"
-#: e2fsck/journal.c:787
+#: e2fsck/journal.c:802
#, c-format
msgid "%s: recovering journal\n"
msgstr "%s: ripristino del journal\n"
-#: e2fsck/journal.c:789
+#: e2fsck/journal.c:804
#, c-format
msgid "%s: won't do journal recovery while read-only\n"
msgstr "%s: impossibile ripritinare il journal in modalit sola lettura\n"
-#: e2fsck/journal.c:810
+#: e2fsck/journal.c:825
#, c-format
msgid "while trying to re-open %s"
msgstr "durante la riapertura di %s"
@@ -330,78 +334,78 @@ msgstr "<Inode riservato 10>"
msgid "multiply claimed inode map"
msgstr "mappa degli inode richiesta da pi parti"
-#: e2fsck/pass1b.c:551 e2fsck/pass1b.c:688
+#: e2fsck/pass1b.c:554 e2fsck/pass1b.c:691
#, c-format
msgid "internal error; can't find dup_blk for %d\n"
msgstr "errore interno; impossibile trovare dup_blk per %d\n"
-#: e2fsck/pass1b.c:731
+#: e2fsck/pass1b.c:734
msgid "returned from clone_file_block"
msgstr "ritornato da clone_file_block"
-#: e2fsck/pass1.c:297
+#: e2fsck/pass1.c:298
msgid "in-use inode map"
msgstr "mappa degli inode in utilizzo"
-#: e2fsck/pass1.c:306
+#: e2fsck/pass1.c:307
msgid "directory inode map"
msgstr "mappa degli inode delle directory"
-#: e2fsck/pass1.c:314
+#: e2fsck/pass1.c:315
msgid "regular file inode map"
msgstr "mappa degli inode dei file regolari"
-#: e2fsck/pass1.c:321
+#: e2fsck/pass1.c:322
msgid "in-use block map"
msgstr "mappa dei blocchi in utilizzo"
-#: e2fsck/pass1.c:368
+#: e2fsck/pass1.c:369
msgid "doing inode scan"
msgstr "scansione degli inode"
-#: e2fsck/pass1.c:751
+#: e2fsck/pass1.c:752
msgid "Pass 1"
msgstr "Passo 1"
-#: e2fsck/pass1.c:810
+#: e2fsck/pass1.c:811
#, c-format
msgid "reading indirect blocks of inode %u"
msgstr "lettura dei blocchi indiretti dell'inode %u"
-#: e2fsck/pass1.c:852
+#: e2fsck/pass1.c:853
msgid "bad inode map"
msgstr "mappa degli inode non valida"
-#: e2fsck/pass1.c:874
+#: e2fsck/pass1.c:875
msgid "inode in bad block map"
msgstr "inode nella mappa dei blocchi non validi"
-#: e2fsck/pass1.c:894
+#: e2fsck/pass1.c:895
msgid "imagic inode map"
msgstr "mappa degli inode imagic"
-#: e2fsck/pass1.c:921
+#: e2fsck/pass1.c:922
#, fuzzy
msgid "multiply claimed block map"
msgstr "mappa dei blocchi richiesta da pi contesti"
-#: e2fsck/pass1.c:1020
+#: e2fsck/pass1.c:1021
msgid "ext attr block map"
msgstr ""
-#: e2fsck/pass1.c:1782
+#: e2fsck/pass1.c:1783
msgid "block bitmap"
msgstr "mappa dei bit del blocco"
-#: e2fsck/pass1.c:1786
+#: e2fsck/pass1.c:1787
msgid "inode bitmap"
msgstr "mappa dei bit dell'inode"
-#: e2fsck/pass1.c:1790
+#: e2fsck/pass1.c:1791
msgid "inode table"
msgstr "tavola degli inode"
-#: e2fsck/pass2.c:293
+#: e2fsck/pass2.c:294
msgid "Pass 2"
msgstr "Passo 2"
@@ -720,11 +724,13 @@ msgstr "Il @j esterno non supporta questo @f\n"
#: e2fsck/problem.c:210
msgid ""
"Ext3 @j @S is unknown type %N (unsupported).\n"
-"It is likely that your copy of e2fsck is old and/or doesn't support this @j format.\n"
+"It is likely that your copy of e2fsck is old and/or doesn't support this @j "
+"format.\n"
"It is also possible the @j @S is corrupt.\n"
msgstr ""
"Il @S del @j ext3 del tipo sconosciuto %N (non supportato).\n"
-"E' probabile che questa copia di e2fsck sia vecchia e/o non supporti questo formato di @j.\n"
+"E' probabile che questa copia di e2fsck sia vecchia e/o non supporti questo "
+"formato di @j.\n"
"E' anche possibile che il @S del @j sia corrotto.\n"
#: e2fsck/problem.c:218
@@ -783,12 +789,16 @@ msgstr "@i @I %i nella lista degli @i @o.\n"
#: e2fsck/problem.c:283
#, fuzzy
msgid "Ext3 @j @S has an unknown read-only feature flag set.\n"
-msgstr "Il @S del @j ext3 ha impostato il flag a sola lettura di una caratteristica sconosciuta.\n"
+msgstr ""
+"Il @S del @j ext3 ha impostato il flag a sola lettura di una caratteristica "
+"sconosciuta.\n"
#: e2fsck/problem.c:288
#, fuzzy
msgid "Ext3 @j @S has an unknown incompatible feature flag set.\n"
-msgstr "Il @S del @j ext3 ha impostato il flag di una caratteristica non compatibile.\n"
+msgstr ""
+"Il @S del @j ext3 ha impostato il flag di una caratteristica non "
+"compatibile.\n"
#: e2fsck/problem.c:293
msgid "@j version not supported by this e2fsck.\n"
@@ -840,7 +850,8 @@ msgstr "L'@r non una @d. "
#: e2fsck/problem.c:330
msgid "@r has dtime set (probably due to old mke2fs). "
-msgstr "L'@r ha il dtime impostato (probabilmente a causa di un vecchio mke2fs)."
+msgstr ""
+"L'@r ha il dtime impostato (probabilmente a causa di un vecchio mke2fs)."
#: e2fsck/problem.c:335
msgid "Reserved @i %i %Q has bad mode. "
@@ -966,7 +977,9 @@ msgstr "Il @S primario (%b) nella listi dei @b(i) non validi.\n"
#: e2fsck/problem.c:454
msgid "Block %b in the primary @g descriptors is on the bad @b list\n"
-msgstr "Il blocco %b nei descrittori primari del @g nella lista dei @b(i) non validi\n"
+msgstr ""
+"Il blocco %b nei descrittori primari del @g nella lista dei @b(i) non "
+"validi\n"
#: e2fsck/problem.c:460
msgid "Warning: Group %g's @S (%b) is bad.\n"
@@ -975,12 +988,16 @@ msgstr "Attenzione: Il @S (%b) del gruppo %g non valido.\n"
#: e2fsck/problem.c:465
#, fuzzy
msgid "Warning: Group %g's copy of the @g descriptors has a bad @b (%b).\n"
-msgstr "Attenzione: La copia dei descrittori di @g del gruppo %g ha un @b (%b) non valido.\n"
+msgstr ""
+"Attenzione: La copia dei descrittori di @g del gruppo %g ha un @b (%b) non "
+"valido.\n"
#: e2fsck/problem.c:471
#, fuzzy
msgid "Programming error? @b #%b claimed for no reason in process_bad_@b.\n"
-msgstr "Errore di programmazione? Il @b #%b ha reclamato senza ragione in process_bad_@b.\n"
+msgstr ""
+"Errore di programmazione? Il @b #%b ha reclamato senza ragione in "
+"process_bad_@b.\n"
#: e2fsck/problem.c:477
#, fuzzy
@@ -1031,12 +1048,14 @@ msgstr "Errore scorrendo i @b(i) nell'@i %i: %m\n"
#: e2fsck/problem.c:537
msgid "Error storing @i count information (@i=%i, count=%N): %m\n"
-msgstr "Errore salvando le informazioni sul numero di @i (@i=%i, numero=%N): %m\n"
+msgstr ""
+"Errore salvando le informazioni sul numero di @i (@i=%i, numero=%N): %m\n"
#: e2fsck/problem.c:542
#, fuzzy
msgid "Error storing @d @b information (@i=%i, @b=%b, num=%N): %m\n"
-msgstr "Errore salvando le informazioni sui @b(i) di @d (@i=%i, @b=%b, num=%N): %m\n"
+msgstr ""
+"Errore salvando le informazioni sui @b(i) di @d (@i=%i, @b=%b, num=%N): %m\n"
#: e2fsck/problem.c:548
#, c-format
@@ -1074,7 +1093,8 @@ msgstr "L'@i %i faceva parte della lista degli @i orfani. "
#: e2fsck/problem.c:598
#, fuzzy
msgid "@is that were part of a corrupted orphan linked list found. "
-msgstr "trovati @i che facevano parte di una lista di orfani corrotti collegati. "
+msgstr ""
+"trovati @i che facevano parte di una lista di orfani corrotti collegati. "
#: e2fsck/problem.c:608
#, fuzzy
@@ -1146,7 +1166,8 @@ msgstr "Il @b #%B (%b) fa diventare il link simbolico troppo grande. "
#: e2fsck/problem.c:677
#, c-format
msgid "@i %i has INDEX_FL flag set on @f without htree support.\n"
-msgstr "L'@i %i ga il flag INDEX_FL impostato nel @f senza il supporto htree.\n"
+msgstr ""
+"L'@i %i ga il flag INDEX_FL impostato nel @f senza il supporto htree.\n"
#: e2fsck/problem.c:682
#, c-format
@@ -1210,11 +1231,13 @@ msgstr "Errore scorrendo i @b(i) nell'@i %i (%s): %m\n"
#: e2fsck/problem.c:751 e2fsck/problem.c:1072
#, fuzzy
msgid "Error addjusting refcount for @a @b %b (@i %i): %m\n"
-msgstr "Errore sistemando il conteggio dei riferimenti per il @b @a %b (@i %i): %m\n"
+msgstr ""
+"Errore sistemando il conteggio dei riferimenti per il @b @a %b (@i %i): %m\n"
#: e2fsck/problem.c:757
msgid "Pass 1C: Scan directories for @is with dup @bs.\n"
-msgstr "Passo 1C: Analisi delle directory relativa agli @i con @b(i) duplicati.\n"
+msgstr ""
+"Passo 1C: Analisi delle directory relativa agli @i con @b(i) duplicati.\n"
#: e2fsck/problem.c:763
#, fuzzy
@@ -1461,7 +1484,9 @@ msgstr ""
#: e2fsck/problem.c:1033
msgid "@f contains large files, but lacks LARGE_FILE flag in @S.\n"
-msgstr "Il @f contiene files di grandi dimensioni, ma nel @S non specificato il flag LARGE_FILE.\n"
+msgstr ""
+"Il @f contiene files di grandi dimensioni, ma nel @S non specificato il "
+"flag LARGE_FILE.\n"
#: e2fsck/problem.c:1038
#, fuzzy
@@ -1489,7 +1514,8 @@ msgstr "@h %d non valido (%q). "
#: e2fsck/problem.c:1062
msgid "Forcibly clearing HTREE flag on @i %d (%q). (Beta test code)\n"
-msgstr "Pulizia forzata del flag HTREE nell'@i %d (%q). (Codice in beta testing)\n"
+msgstr ""
+"Pulizia forzata del flag HTREE nell'@i %d (%q). (Codice in beta testing)\n"
#: e2fsck/problem.c:1067
msgid "@p @h %d (%q): bad @b number %b.\n"
@@ -1731,20 +1757,23 @@ msgid "Free @bs count wrong (%b, counted=%c).\n"
msgstr "Numero dei @b(i) liberi errato (%b, contati=%c).\n"
#: e2fsck/problem.c:1382
-msgid "PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B endpoints (%i, %j)\n"
+msgid ""
+"PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B "
+"endpoints (%i, %j)\n"
msgstr ""
#: e2fsck/problem.c:1388
#, fuzzy
msgid "Internal error: fudging end of bitmap (%N)\n"
-msgstr "Errore interno: impossibile individuare la fine della mappa di bit (%N)\n"
+msgstr ""
+"Errore interno: impossibile individuare la fine della mappa di bit (%N)\n"
#: e2fsck/problem.c:1522
#, c-format
msgid "Unhandled error code (0x%x)!\n"
msgstr "Codice errore non gestito (0x%x)!\n"
-#: e2fsck/problem.c:1594
+#: e2fsck/problem.c:1595
msgid "IGNORED"
msgstr "IGNORATO"
@@ -1807,6 +1836,7 @@ msgid "while writing inode table (group %d)"
msgstr "scrivendo la tavola degli inode (gruppo %d)"
#: e2fsck/swapfs.c:222
+#, c-format
msgid "Pass 0: Doing byte-swap of filesystem\n"
msgstr "Pass 0: Esecuzione del byte-swap del filesystem\n"
@@ -1823,7 +1853,7 @@ msgstr ""
msgid "Byte swap"
msgstr "Byte-swap"
-#: e2fsck/unix.c:67
+#: e2fsck/unix.c:74
#, c-format
msgid ""
"Usage: %s [-panyrcdfvstDFSV] [-b superblock] [-B blocksize]\n"
@@ -1836,14 +1866,16 @@ msgstr ""
"\t\t[-l|-L file_blocchi_non_validi] [-C fd] [-j ext-journal]\n"
"\t\t[-E opzioni-estese] device\n"
-#: e2fsck/unix.c:73
+#: e2fsck/unix.c:80
+#, c-format
msgid ""
"\n"
"Emergency help:\n"
" -p Automatic repair (no questions)\n"
" -n Make no changes to the filesystem\n"
" -y Assume \"yes\" to all questions\n"
-" -c Check for bad blocks and add them to the badblock list\n"
+" -c Check for bad blocks and add them to the badblock "
+"list\n"
" -f Force checking even if filesystem is marked clean\n"
msgstr ""
"\n"
@@ -1851,10 +1883,13 @@ msgstr ""
" -p Riparazione automatica (senza domande)\n"
" -n Non effettuare cambiamenti nel filesystem\n"
" -y Risposta affermativa a tutte le domande\n"
-" -c Cerca blocchi non validi, ed aggiungili alla lista dei blocchi non validi\n"
-" -f Forza il controllo anche se il filesystem segnato come pulito\n"
+" -c Cerca blocchi non validi, ed aggiungili alla lista dei "
+"blocchi non validi\n"
+" -f Forza il controllo anche se il filesystem segnato "
+"come pulito\n"
-#: e2fsck/unix.c:79
+#: e2fsck/unix.c:86
+#, c-format
msgid ""
" -v Be verbose\n"
" -b superblock Use alternative superblock\n"
@@ -1865,159 +1900,39 @@ msgid ""
msgstr ""
" -v Modalit prolissa\n"
" -b superblocco Usa un superblocco alternativo\n"
-" -B dim_blocco Forza la dimensione dei blocchi durante la ricerca del superblocco\n"
+" -B dim_blocco Forza la dimensione dei blocchi durante la ricerca del "
+"superblocco\n"
" -j journal-esterno Specifica la posizione del journal esterno\n"
" -l file_bad_blocks Aggiungi alla lista dei blocchi non validi\n"
" -L file_bad_blocks Imposta la lista dei blocchi non validi\n"
-#: e2fsck/unix.c:113
+#: e2fsck/unix.c:120
#, c-format
msgid "%s: %d/%d files (%0d.%d%% non-contiguous), %d/%d blocks\n"
msgstr "%s: %d/%d files (%0d.%d%% non contigui), %d/%d blocchi\n"
-#: e2fsck/unix.c:119
-#, c-format
-msgid ""
-"\n"
-"%8d inode used (%d%%)\n"
-msgid_plural ""
-"\n"
-"%8d inodes used (%d%%)\n"
-msgstr[0] ""
-"\n"
-"%8d inode usato (%d%%)\n"
-msgstr[1] ""
-"\n"
-"%8d inode usati (%d%%)\n"
-
-#: e2fsck/unix.c:121
-#, c-format
-msgid "%8d non-contiguous inode (%0d.%d%%)\n"
-msgid_plural "%8d non-contiguous inodes (%0d.%d%%)\n"
-msgstr[0] "%8d inode non contiguo (%0d.%d%%)\n"
-msgstr[1] "%8d inode non contigui (%0d.%d%%)\n"
-
-#: e2fsck/unix.c:125
+#: e2fsck/unix.c:132
#, c-format
msgid " # of inodes with ind/dind/tind blocks: %d/%d/%d\n"
msgstr " # di inode con blocchi ind/dind/tind: %d/%d/%d\n"
-#: e2fsck/unix.c:127
-#, c-format
-msgid "%8d block used (%d%%)\n"
-msgid_plural "%8d blocks used (%d%%)\n"
-msgstr[0] "%8d blocco usato (%d%%)\n"
-msgstr[1] "%8d blocchi usati (%d%%)\n"
-
-#: e2fsck/unix.c:130
-#, c-format
-msgid "%8d bad block\n"
-msgid_plural "%8d bad blocks\n"
-msgstr[0] "%8d blocco non valido\n"
-msgstr[1] "%8d blocchi non validi\n"
-
-#: e2fsck/unix.c:132
-#, c-format
-msgid "%8d large file\n"
-msgid_plural "%8d large files\n"
-msgstr[0] "%8d file grande\n"
-msgstr[1] "%8d file grandi\n"
-
-#: e2fsck/unix.c:134
-#, c-format
-msgid ""
-"\n"
-"%8d regular file\n"
-msgid_plural ""
-"\n"
-"%8d regular files\n"
-msgstr[0] ""
-"\n"
-"%8d file regolare\n"
-msgstr[1] ""
-"\n"
-"%8d file regolari\n"
-
-#: e2fsck/unix.c:136
-#, c-format
-msgid "%8d directory\n"
-msgid_plural "%8d directories\n"
-msgstr[0] "%8d directory\n"
-msgstr[1] "%8d directory\n"
-
-#: e2fsck/unix.c:138
-#, c-format
-msgid "%8d character device file\n"
-msgid_plural "%8d character device files\n"
-msgstr[0] "%8d file di dispositivo a caratteri\n"
-msgstr[1] "%8d file di dispositivi a caratteri\n"
-
-#: e2fsck/unix.c:141
-#, c-format
-msgid "%8d block device file\n"
-msgid_plural "%8d block device files\n"
-msgstr[0] "%8d file di dispositivo a blocchi\n"
-msgstr[1] "%8d file di dispositivi a blocchi\n"
-
-#: e2fsck/unix.c:143
-#, c-format
-msgid "%8d fifo\n"
-msgid_plural "%8d fifos\n"
-msgstr[0] "%8d fifo\n"
-msgstr[1] "%8d fifo\n"
-
-#: e2fsck/unix.c:145
-#, c-format
-msgid "%8d link\n"
-msgid_plural "%8d links\n"
-msgstr[0] "%8d collegamento\n"
-msgstr[1] "%8d collegamenti\n"
-
-#: e2fsck/unix.c:148
-#, c-format
-msgid "%8d symbolic link"
-msgid_plural "%8d symbolic links"
-msgstr[0] "%8d collegamento simbolico"
-msgstr[1] "%8d collegamenti simbolici"
-
-#: e2fsck/unix.c:150
-#, c-format
-msgid " (%d fast symbolic link)\n"
-msgid_plural " (%d fast symbolic links)\n"
-msgstr[0] " (%d collegamento simbolico veloce)\n"
-msgstr[1] " (%d collegamenti simbolici veloci)\n"
-
-#: e2fsck/unix.c:152
-#, c-format
-msgid "%8d socket\n"
-msgid_plural "%8d sockets\n"
-msgstr[0] "%8d socket\n"
-msgstr[1] "%8d socket\n"
-
-#: e2fsck/unix.c:155
-#, c-format
-msgid "%8d file\n"
-msgid_plural "%8d files\n"
-msgstr[0] "%8d file\n"
-msgstr[1] "%8d file\n"
-
-#: e2fsck/unix.c:169 misc/badblocks.c:781 misc/tune2fs.c:773 misc/util.c:145
+#: e2fsck/unix.c:176 misc/badblocks.c:781 misc/tune2fs.c:791 misc/util.c:151
#: resize/main.c:97
#, c-format
msgid "while determining whether %s is mounted."
msgstr "determinando se %s montato."
-#: e2fsck/unix.c:184
+#: e2fsck/unix.c:191
#, c-format
msgid "Warning! %s is mounted.\n"
msgstr "Attenzione! %s montato.\n"
-#: e2fsck/unix.c:188
+#: e2fsck/unix.c:195
#, c-format
msgid "%s is mounted. "
msgstr "%s montato. "
-#: e2fsck/unix.c:190
+#: e2fsck/unix.c:197
msgid ""
"Cannot continue, aborting.\n"
"\n"
@@ -2025,7 +1940,8 @@ msgstr ""
"Impossibile continuare, operazione annullata.\n"
"\n"
-#: e2fsck/unix.c:191
+#: e2fsck/unix.c:198
+#, c-format
msgid ""
"\n"
"\n"
@@ -2039,163 +1955,176 @@ msgstr ""
"causare SERI danni al filesystem.\n"
"\n"
-#: e2fsck/unix.c:194
+#: e2fsck/unix.c:201
msgid "Do you really want to continue"
msgstr "Continuare"
-#: e2fsck/unix.c:196
+#: e2fsck/unix.c:203
+#, c-format
msgid "check aborted.\n"
msgstr "controllo annullato.\n"
-#: e2fsck/unix.c:245
+#: e2fsck/unix.c:264
msgid " contains a file system with errors"
msgstr " contiene un filesystem con errori"
-#: e2fsck/unix.c:247
+#: e2fsck/unix.c:266
msgid " was not cleanly unmounted"
msgstr " non stato smontato in maniera corretta"
-#: e2fsck/unix.c:251
+#: e2fsck/unix.c:270
#, c-format
msgid " has been mounted %u times without being checked"
msgstr " stato montato %u volte senza essere controllato"
-#: e2fsck/unix.c:259
+#: e2fsck/unix.c:278
#, c-format
msgid " has gone %u days without being checked"
msgstr " non stato controllato negli ultimi %u giorni"
-#: e2fsck/unix.c:268
+#: e2fsck/unix.c:287
msgid ", check forced.\n"
msgstr ", controllo forzato.\n"
-#: e2fsck/unix.c:271
+#: e2fsck/unix.c:290
#, fuzzy, c-format
msgid "%s: clean, %d/%d files, %d/%d blocks"
msgstr "%s: a posto, %d/%d file, %d/%d blocchi"
-#: e2fsck/unix.c:286
+#: e2fsck/unix.c:306
msgid " (check after next mount)"
msgstr " (controllo dopo il prossimo mount)"
-#: e2fsck/unix.c:288
+#: e2fsck/unix.c:308
#, c-format
msgid " (check in %ld mounts)"
msgstr " (controllo tra %ld mount)"
-#: e2fsck/unix.c:430
+#: e2fsck/unix.c:450
#, c-format
msgid "ERROR: Couldn't open /dev/null (%s)\n"
msgstr "ERRORE: Impossibile aprire /dev/null (%s)\n"
-#: e2fsck/unix.c:501
+#: e2fsck/unix.c:521
+#, c-format
msgid "Invalid EA version.\n"
msgstr "Versione EA non valida.\n"
-#: e2fsck/unix.c:510
+#: e2fsck/unix.c:532
+#, c-format
msgid ""
"Extended options are separated by commas, and may take an argument which\n"
"is set off by an equals ('=') sign. Valid raid options are:\n"
"\tea_ver=<ea_version (1 or 2)\n"
"\n"
msgstr ""
-"Le opzioni estese sono separate da virgole, e potrebbero avere un parametro,\n"
+"Le opzioni estese sono separate da virgole, e potrebbero avere un "
+"parametro,\n"
"specificato da un segno di uguale ('='). Opzioni raid valide sono:\n"
"\tea_ver=<versione_ea (1 o 2)\n"
"\n"
"\tea_ver=<versione_ea (1 o 2)\n"
"\n"
-#: e2fsck/unix.c:568
+#: e2fsck/unix.c:590
#, c-format
msgid "Error validating file descriptor %d: %s\n"
msgstr "Errore convalidando il descrittore di file %d: %s\n"
-#: e2fsck/unix.c:572
+#: e2fsck/unix.c:594
#, fuzzy
msgid "Invalid completion information file descriptor"
msgstr "Informazioni di completamento descrittore di file non valide"
-#: e2fsck/unix.c:587
+#: e2fsck/unix.c:609
msgid "Only one the options -p/-a, -n or -y may be specified."
msgstr "Solo una tra le opzioni -p/-a, -n o -y pu essere specificata."
-#: e2fsck/unix.c:608
+#: e2fsck/unix.c:630
+#, c-format
msgid "The -t option is not supported on this version of e2fsck.\n"
msgstr "L'opzione -t non supportata da questa versione di e2fsck.\n"
-#: e2fsck/unix.c:673
+#: e2fsck/unix.c:695
+#, c-format
msgid "Byte-swapping filesystems not compiled in this version of e2fsck\n"
msgstr ""
-#: e2fsck/unix.c:690 misc/tune2fs.c:444 misc/tune2fs.c:699 misc/tune2fs.c:716
+#: e2fsck/unix.c:718 misc/tune2fs.c:458 misc/tune2fs.c:716 misc/tune2fs.c:733
#, c-format
msgid "Unable to resolve '%s'"
msgstr "Impossibile risolvere '%s'"
-#: e2fsck/unix.c:716
+#: e2fsck/unix.c:744
+#, c-format
msgid "Incompatible options not allowed when byte-swapping.\n"
msgstr ""
-#: e2fsck/unix.c:723
+#: e2fsck/unix.c:751
+#, c-format
msgid "The -c and the -l/-L options may not be both used at the same time.\n"
msgstr "Le opzioni -c e -I/-L non possono essere usate contemporaneamente.\n"
-#: e2fsck/unix.c:801
+#: e2fsck/unix.c:829
+#, c-format
msgid "Error: ext2fs library version out of date!\n"
msgstr "Errore: versione obsoleta della libreria ext2fs!\n"
-#: e2fsck/unix.c:809
+#: e2fsck/unix.c:837
msgid "while trying to initialize program"
msgstr "tentando di inizializzare il programma"
-#: e2fsck/unix.c:823
+#: e2fsck/unix.c:851
#, c-format
msgid "\tUsing %s, %s\n"
msgstr "\tUtilizzando %s, %s\n"
-#: e2fsck/unix.c:835
+#: e2fsck/unix.c:863
msgid "need terminal for interactive repairs"
msgstr "serve il terminale per il riparo interattivo"
-#: e2fsck/unix.c:871
+#: e2fsck/unix.c:905
#, fuzzy, c-format
msgid "%s trying backup blocks...\n"
msgstr "%s cercando tra i blocchi di backup...\n"
-#: e2fsck/unix.c:872
+#: e2fsck/unix.c:906
msgid "Couldn't find ext2 superblock,"
msgstr "Impossibile trovare il superblocco ext2"
-#: e2fsck/unix.c:873
+#: e2fsck/unix.c:907
msgid "Group descriptors look bad..."
msgstr "I descrittori di gruppo sembrano non validi..."
-#: e2fsck/unix.c:884
+#: e2fsck/unix.c:918
+#, c-format
msgid ""
"The filesystem revision is apparently too high for this version of e2fsck.\n"
"(Or the filesystem superblock is corrupt)\n"
"\n"
msgstr ""
-"La revisione del filesystem sembra troppo alta per questa versione di e2fsck.\n"
+"La revisione del filesystem sembra troppo alta per questa versione di "
+"e2fsck.\n"
"(O il superblocco del filesystem corrotto)\n"
"\n"
-#: e2fsck/unix.c:890
+#: e2fsck/unix.c:924
+#, c-format
msgid "Could this be a zero-length partition?\n"
msgstr "E' possibile che questa sia una partizione di dimensione zero?\n"
-#: e2fsck/unix.c:892
+#: e2fsck/unix.c:926
#, c-format
msgid "You must have %s access to the filesystem or be root\n"
msgstr "Serve accesso di tipo %s al filesystem, o necessario essere root\n"
-#: e2fsck/unix.c:897
-#, fuzzy
+#: e2fsck/unix.c:931
+#, fuzzy, c-format
msgid "Possibly non-existent or swap device?\n"
msgstr "Possibilmente non esistente o dispositivo di swap?\n"
-#: e2fsck/unix.c:900
+#: e2fsck/unix.c:934
+#, c-format
msgid ""
"Disk write-protected; use the -n option to do a read-only\n"
"check of the device.\n"
@@ -2203,35 +2132,40 @@ msgstr ""
"Disco protetto da scrittura: usare l'opzione -n per controllare\n"
"in modalit sola lettura.\n"
-#: e2fsck/unix.c:916
+#: e2fsck/unix.c:950
msgid "Get a newer version of e2fsck!"
msgstr "Utilizzare una versione pi nuova di e2fsck."
-#: e2fsck/unix.c:937
+#: e2fsck/unix.c:971
#, c-format
msgid "while checking ext3 journal for %s"
msgstr "controllando il journal ext3 per %s"
-#: e2fsck/unix.c:948
-msgid "Warning: skipping journal recovery because doing a read-only filesystem check.\n"
-msgstr "Attenzione: essendo un controllo a sola lettura, il journal non verr ripristinato.\n"
+#: e2fsck/unix.c:982
+#, c-format
+msgid ""
+"Warning: skipping journal recovery because doing a read-only filesystem "
+"check.\n"
+msgstr ""
+"Attenzione: essendo un controllo a sola lettura, il journal non verr "
+"ripristinato.\n"
# fuzzy
-#: e2fsck/unix.c:961
+#: e2fsck/unix.c:995
#, c-format
msgid "unable to set superblock flags on %s\n"
msgstr "impossibile impostarei i flag del superblocco a %s\n"
-#: e2fsck/unix.c:967
+#: e2fsck/unix.c:1001
#, c-format
msgid "while recovering ext3 journal of %s"
msgstr "ripristinando il journal ext3 di %s"
-#: e2fsck/unix.c:996
+#: e2fsck/unix.c:1030
msgid "Warning: compression support is experimental.\n"
msgstr "Attenzione: il supporto per la compressione sperimentale.\n"
-#: e2fsck/unix.c:1001
+#: e2fsck/unix.c:1035
#, c-format
msgid ""
"E2fsck not compiled with HTREE support,\n"
@@ -2240,38 +2174,39 @@ msgstr ""
"E2fsck non stato compilato con il supporto HTREE,\n"
"\tma il filesystem %s contiene directory HTREE.\n"
-#: e2fsck/unix.c:1044
+#: e2fsck/unix.c:1078
#, c-format
msgid "%s: Filesystem byte order already normalized.\n"
msgstr "%s: Ordine dei byte del filesystem gi normalizzato.\n"
-#: e2fsck/unix.c:1064
+#: e2fsck/unix.c:1098
msgid "while reading bad blocks inode"
msgstr "leggendo l'inode dei blocchi non validi"
-#: e2fsck/unix.c:1066
-#, fuzzy
+#: e2fsck/unix.c:1100
+#, fuzzy, c-format
msgid "This doesn't bode well, but we'll try to go on...\n"
msgstr "Questo non un buon segno, ma si continuer comunque...\n"
-#: e2fsck/unix.c:1073
+#: e2fsck/unix.c:1107
+#, c-format
msgid "Restarting e2fsck from the beginning...\n"
msgstr "Riavvio di e2fsck dall'inizio...\n"
-#: e2fsck/unix.c:1077
+#: e2fsck/unix.c:1111
msgid "while resetting context"
msgstr "resettando il contesto"
-#: e2fsck/unix.c:1084
+#: e2fsck/unix.c:1118
#, c-format
msgid "%s: e2fsck canceled.\n"
msgstr "%s: e2fsck cancellato.\n"
-#: e2fsck/unix.c:1089
+#: e2fsck/unix.c:1123
msgid "aborted"
msgstr "annullato"
-#: e2fsck/unix.c:1097
+#: e2fsck/unix.c:1131
#, c-format
msgid ""
"\n"
@@ -2280,12 +2215,12 @@ msgstr ""
"\n"
"%s: ***** IL FILESYSTEM E' STATO MODIFICATO *****\n"
-#: e2fsck/unix.c:1100
+#: e2fsck/unix.c:1134
#, c-format
msgid "%s: ***** REBOOT LINUX *****\n"
msgstr "%s: ***** RIAVVIARE LINUX *****\n"
-#: e2fsck/unix.c:1106
+#: e2fsck/unix.c:1140
#, c-format
msgid ""
"\n"
@@ -2293,7 +2228,8 @@ msgid ""
"\n"
msgstr ""
"\n"
-"%s: ********** ATTENZIONE: Il filesystem contiene ancora errori ************\n"
+"%s: ********** ATTENZIONE: Il filesystem contiene ancora errori "
+"************\n"
"\n"
#: e2fsck/util.c:131 misc/util.c:68
@@ -2439,11 +2375,14 @@ msgstr "fatto \n"
#, fuzzy, c-format
msgid ""
"Usage: %s [-b block_size] [-i input_file] [-o output_file] [-svwnf]\n"
-" [-c blocks_at_once] [-p num_passes] [-t test_pattern [-t test_pattern [...]]]\n"
+" [-c blocks_at_once] [-p num_passes] [-t test_pattern [-t test_pattern "
+"[...]]]\n"
" device [last_block [start_block]]\n"
msgstr ""
-"Utilizzo: %s [-b dim_blocco] [-i file_di_input] [-o file_di_output] [-svwnf]\n"
-" [-c blocks_at_once] [-p num_passi] [-t modello_di_prova [-t modello_di_prova [...]]]\n"
+"Utilizzo: %s [-b dim_blocco] [-i file_di_input] [-o file_di_output] [-"
+"svwnf]\n"
+" [-c blocks_at_once] [-p num_passi] [-t modello_di_prova [-t "
+"modello_di_prova [...]]]\n"
" device [ultimo_blocco [primo_blocco]]\n"
#: misc/badblocks.c:227
@@ -2505,11 +2444,15 @@ msgstr "Lettura e confronto: "
#: misc/badblocks.c:595
msgid "Checking for bad blocks in non-destructive read-write mode\n"
-msgstr "Ricerca dei blocchi non validi in modalit lettura-scrittura non distruttiva\n"
+msgstr ""
+"Ricerca dei blocchi non validi in modalit lettura-scrittura non "
+"distruttiva\n"
#: misc/badblocks.c:599
msgid "Checking for bad blocks (non-destructive read-write test)\n"
-msgstr "Ricerca dei blocchi non validi (test in moalit lettura-scrittura non distruttiva)\n"
+msgstr ""
+"Ricerca dei blocchi non validi (test in moalit lettura-scrittura non "
+"distruttiva)\n"
#: misc/badblocks.c:606
#, fuzzy
@@ -2525,7 +2468,7 @@ msgstr ""
msgid "during test data write, block %lu"
msgstr "durante la scrittura dei dati del test, blocco %lu"
-#: misc/badblocks.c:788 misc/util.c:152
+#: misc/badblocks.c:788 misc/util.c:158
#, c-format
msgid "%s is mounted; "
msgstr "%s montato: "
@@ -2539,7 +2482,7 @@ msgstr "forzato comunque badblocks. Speriamo che /etc/mtab si errato.\n"
msgid "it's not safe to run badblocks!\n"
msgstr "non sicuro eseguire badblocks!\n"
-#: misc/badblocks.c:853 misc/mke2fs.c:898
+#: misc/badblocks.c:853 misc/mke2fs.c:926
#, c-format
msgid "bad block size - %s"
msgstr "dimensione del blocco non valida - %s"
@@ -2557,7 +2500,8 @@ msgstr "modello di prova non valido: %s\n"
#: misc/badblocks.c:940
#, fuzzy
msgid "Maximum of one test_pattern may be specified in read-only mode"
-msgstr "E' possibile specificare un solo modello di prova in modalit sola lettura"
+msgstr ""
+"E' possibile specificare un solo modello di prova in modalit sola lettura"
#: misc/badblocks.c:946
#, fuzzy
@@ -2576,7 +2520,7 @@ msgstr ""
msgid "while trying to determine device size"
msgstr "tentando di determinare la dimensione del device"
-#: misc/badblocks.c:972 misc/mke2fs.c:1071
+#: misc/badblocks.c:972 misc/mke2fs.c:1099
#, c-format
msgid "bad blocks count - %s"
msgstr "numero dei blocchi non validi - %s"
@@ -2649,11 +2593,11 @@ msgstr "impostando la versione a %s"
msgid "Couldn't allocate path variable in chattr_dir_proc"
msgstr "Impossibile allocare la variabile di percorso nella chattr_dir_proc"
-#: misc/chattr.c:287
+#: misc/chattr.c:291
msgid "= is incompatible with - and +\n"
msgstr "= incompatibile con + e -\n"
-#: misc/chattr.c:295
+#: misc/chattr.c:299
msgid "Must use '-v', =, - or +\n"
msgstr "Si deve usare '-v', =, - o +\n"
@@ -2681,10 +2625,12 @@ msgid "Backup"
msgstr "Backup"
#: misc/dumpe2fs.c:130
+#, c-format
msgid ", Group descriptors at "
msgstr ", Descrittori di gruppo a "
#: misc/dumpe2fs.c:135
+#, c-format
msgid " Group descriptor at "
msgstr " Descrittori di gruppo a"
@@ -2731,7 +2677,7 @@ msgstr "stampando la lista dei blocchi non validi"
msgid "Bad blocks: %d"
msgstr "Blocchi non validi: %d"
-#: misc/dumpe2fs.c:227 misc/tune2fs.c:150
+#: misc/dumpe2fs.c:227 misc/tune2fs.c:153
msgid "while reading journal superblock"
msgstr "leggendo il superblocco del journal"
@@ -2759,16 +2705,18 @@ msgstr ""
"Inizio del journal: %d\n"
"Numero di utenti del journal: %d\n"
-#: misc/dumpe2fs.c:307 misc/mke2fs.c:1085
+#: misc/dumpe2fs.c:307 misc/mke2fs.c:1113
#, c-format
msgid "\tUsing %s\n"
msgstr ""
-#: misc/dumpe2fs.c:334 misc/e2image.c:488 misc/tune2fs.c:760 resize/main.c:230
+#: misc/dumpe2fs.c:334 misc/e2image.c:566 misc/tune2fs.c:778 resize/main.c:234
+#, c-format
msgid "Couldn't find valid filesystem superblock.\n"
msgstr "Impossibile trovare un valido superblocco per il filesystem.\n"
#: misc/dumpe2fs.c:345
+#, c-format
msgid "Note: This is a byte-swapped filesystem\n"
msgstr ""
@@ -2780,8 +2728,8 @@ msgid ""
msgstr ""
#: misc/e2image.c:50
-#, c-format
-msgid "Usage: %s [-r] device file\n"
+#, fuzzy, c-format
+msgid "Usage: %s [-r] device image_file\n"
msgstr "Utilizzo: %s [-r] device file\n"
#: misc/e2image.c:61
@@ -2816,35 +2764,42 @@ msgid "e2label: cannot open %s\n"
msgstr "e2label: impossibile aprire %s\n"
#: misc/e2label.c:62
+#, c-format
msgid "e2label: cannot seek to superblock\n"
msgstr ""
#: misc/e2label.c:67
+#, c-format
msgid "e2label: error reading superblock\n"
msgstr "e2label: errore durante la lettura del superblocco\n"
#: misc/e2label.c:71
+#, c-format
msgid "e2label: not an ext2 filesystem\n"
msgstr "e2label: non un filesystem ext2\n"
-#: misc/e2label.c:96 misc/tune2fs.c:867
+#: misc/e2label.c:96 misc/tune2fs.c:885
+#, c-format
msgid "Warning: label too long, truncating.\n"
msgstr "Attenzione: troncamento dell'etichetta, troppo lunga.\n"
#: misc/e2label.c:99
+#, c-format
msgid "e2label: cannot seek to superblock again\n"
msgstr ""
#: misc/e2label.c:104
+#, c-format
msgid "e2label: error writing superblock\n"
msgstr "e2label: errore durante la scrittura del superblocco\n"
-#: misc/e2label.c:116 misc/tune2fs.c:439
+#: misc/e2label.c:116 misc/tune2fs.c:450
+#, c-format
msgid "Usage: e2label device [newlabel]\n"
msgstr "Utilizzo: e2label device [nuova_etichetta]\n"
#: misc/findsuper.c:126
-#, fuzzy
+#, fuzzy, c-format
msgid "Usage: findsuper device [skipbytes [startkb]]\n"
msgstr "Utilizzo: findsuper device [byte_da_saltare [kb_inizio]]\n"
@@ -2854,7 +2809,7 @@ msgid "skipbytes should be a number, not %s\n"
msgstr "byte_da_saltare dovrebbe essere un numero, non %s\n"
#: misc/findsuper.c:137
-#, fuzzy
+#, fuzzy, c-format
msgid "skipbytes must be a multiple of the sector size\n"
msgstr "byte_da_saltare dev'essere un multiplo della dimensione del settore\n"
@@ -2874,6 +2829,7 @@ msgid "starting at %Ld, with %d byte increments\n"
msgstr ""
#: misc/findsuper.c:158
+#, c-format
msgid " thisoff block fs_blk_sz blksz grp last_mount\n"
msgstr ""
@@ -2941,7 +2897,8 @@ msgid ""
"Either all or none of the filesystem types passed to -t must be prefixed\n"
"with 'no' or '!'.\n"
msgstr ""
-"Tutti o nessun tipo di filesystem passati con l'opzione -t devono essere preceduti\n"
+"Tutti o nessun tipo di filesystem passati con l'opzione -t devono essere "
+"preceduti\n"
"da 'no' o '!'.\n"
#: misc/fsck.c:732
@@ -2991,7 +2948,7 @@ msgstr "Durante la lettura dei flag di %s"
msgid "While reading version on %s"
msgstr "Durante la lettura della versione di %s"
-#: misc/mke2fs.c:91
+#: misc/mke2fs.c:92
#, c-format
msgid ""
"Usage: %s [-c|-t|-l filename] [-b block-size] [-f fragment-size]\n"
@@ -3002,39 +2959,43 @@ msgid ""
msgstr ""
"Utilizzo: %s [-c|-t|-l nomefile] [-b dim_blocchi] [-f dim_frammento]\n"
"\t[-i byte-per-inode] [-j] [-J opzioni-journal] [-N numero-di-inode]\n"
-"\t[-m percentuale-blocchi-riservati] [-o os-origine] [-g blocchi-per-gruppo]\n"
+"\t[-m percentuale-blocchi-riservati] [-o os-origine] [-g blocchi-per-"
+"gruppo]\n"
"\t[-L etichetta-volume] [-M ultima-dir-montata] [-O caratteristica[,...]]\n"
"\t[-r revisione-fs] [-R opz_raid] [-qvSV] device [numero-blocchi]\n"
-#: misc/mke2fs.c:235
+#: misc/mke2fs.c:264
#, c-format
msgid "Running command: %s\n"
msgstr "Esecuzione del comando: %s\n"
-#: misc/mke2fs.c:239
+#: misc/mke2fs.c:268
#, c-format
msgid "while trying run '%s'"
msgstr "provando a caricare '%s'"
-#: misc/mke2fs.c:246
+#: misc/mke2fs.c:275
msgid "while processing list of bad blocks from program"
msgstr "analizzando una lista di blocchi non validi dal programma"
-#: misc/mke2fs.c:273
+#: misc/mke2fs.c:302
#, c-format
msgid "Block %d in primary superblock/group descriptor area bad.\n"
-msgstr "Blocco %d non valido nel superblocco primario/area del descrittore di gruppo.\n"
+msgstr ""
+"Blocco %d non valido nel superblocco primario/area del descrittore di "
+"gruppo.\n"
-#: misc/mke2fs.c:275
+#: misc/mke2fs.c:304
#, c-format
msgid "Blocks %d through %d must be good in order to build a filesystem.\n"
-msgstr "I blocchi da %d a %d devono essere validi per costruire un filesystem.\n"
+msgstr ""
+"I blocchi da %d a %d devono essere validi per costruire un filesystem.\n"
-#: misc/mke2fs.c:278
+#: misc/mke2fs.c:307
msgid "Aborting....\n"
msgstr "Annullamento....\n"
-#: misc/mke2fs.c:298
+#: misc/mke2fs.c:327
#, c-format
msgid ""
"Warning: the backup superblock/group descriptors at block %d contain\n"
@@ -3045,94 +3006,95 @@ msgstr ""
"\tcontengono blocchi non validi.\n"
"\n"
-#: misc/mke2fs.c:316
+#: misc/mke2fs.c:345
msgid "while marking bad blocks as used"
msgstr "contrassegnando i blocchi non validi come utilizzati"
-#: misc/mke2fs.c:374
+#: misc/mke2fs.c:403
msgid "done \n"
msgstr "fatto \n"
-#: misc/mke2fs.c:409
+#: misc/mke2fs.c:438
msgid "while allocating zeroizing buffer"
msgstr "allocando i buffer zeroizing"
-#: misc/mke2fs.c:450
+#: misc/mke2fs.c:479
msgid "Writing inode tables: "
msgstr "Scrittura delle tavole degli inode: "
-#: misc/mke2fs.c:461
+#: misc/mke2fs.c:490
#, c-format
msgid ""
"\n"
"Could not write %d blocks in inode table starting at %d: %s\n"
msgstr ""
"\n"
-"Impossibile scrivere %d blocchi nella tavola degli inode iniziando da %d: %s\n"
+"Impossibile scrivere %d blocchi nella tavola degli inode iniziando da %d: %"
+"s\n"
-#: misc/mke2fs.c:484
+#: misc/mke2fs.c:513
msgid "while creating root dir"
msgstr "creando la directory root"
-#: misc/mke2fs.c:491
+#: misc/mke2fs.c:520
msgid "while reading root inode"
msgstr "creando l'inode root"
-#: misc/mke2fs.c:500
+#: misc/mke2fs.c:529
msgid "while setting root inode ownership"
msgstr "impostando i permessi dell'inode root"
-#: misc/mke2fs.c:518
+#: misc/mke2fs.c:547
msgid "while creating /lost+found"
msgstr "creando /lost+found"
-#: misc/mke2fs.c:525
+#: misc/mke2fs.c:554
#, fuzzy
msgid "while looking up /lost+found"
msgstr "cercando /lost+found"
-#: misc/mke2fs.c:535
+#: misc/mke2fs.c:564
msgid "while expanding /lost+found"
msgstr "espandendo /lost+found"
-#: misc/mke2fs.c:551
+#: misc/mke2fs.c:580
#, fuzzy
msgid "while setting bad block inode"
msgstr "settando l'inode del blocco non valido"
-#: misc/mke2fs.c:583
+#: misc/mke2fs.c:612
#, c-format
msgid "Out of memory erasing sectors %d-%d\n"
msgstr "Fine memoria cancellando i settori %d-%d\n"
-#: misc/mke2fs.c:593
+#: misc/mke2fs.c:622
#, c-format
msgid "Warning: could not read block 0: %s\n"
msgstr "Attenzione: impossibile leggere il blocco 0: %s\n"
-#: misc/mke2fs.c:609
+#: misc/mke2fs.c:638
#, c-format
msgid "Warning: could not erase sector %d: %s\n"
msgstr "Attenzione: impossibile cancellare il settore %d: %s\n"
-#: misc/mke2fs.c:625
+#: misc/mke2fs.c:654
msgid "while initializing journal superblock"
msgstr "inizializzando il superblocco del journal"
-#: misc/mke2fs.c:631
+#: misc/mke2fs.c:660
msgid "Zeroing journal device: "
msgstr "Azzeramento del device di journaling: "
-#: misc/mke2fs.c:638
+#: misc/mke2fs.c:667
#, fuzzy, c-format
msgid "while zeroing journal device (block %u, count %d)"
msgstr "azzerando il device di journaling (blocco %u, numero %d)"
-#: misc/mke2fs.c:649
+#: misc/mke2fs.c:678
msgid "while writing journal superblock"
msgstr "scrivendo il superblocco del journal"
-#: misc/mke2fs.c:664
+#: misc/mke2fs.c:693
#, c-format
msgid ""
"warning: %d blocks unused.\n"
@@ -3141,77 +3103,81 @@ msgstr ""
"attenzione: %d blocchi inutilizzati.\n"
"\n"
-#: misc/mke2fs.c:669
+#: misc/mke2fs.c:698
#, c-format
msgid "Filesystem label=%s\n"
msgstr "Etichetta del filesystem=%s\n"
-#: misc/mke2fs.c:670
+#: misc/mke2fs.c:699
msgid "OS type: "
msgstr "Tipo SO: "
-#: misc/mke2fs.c:675
+#: misc/mke2fs.c:704
msgid "(unknown os)"
msgstr "(so sconosciuto)"
-#: misc/mke2fs.c:678
+#: misc/mke2fs.c:707
#, c-format
msgid "Block size=%u (log=%u)\n"
msgstr "Dimensione blocco=%u (log=%u)\n"
-#: misc/mke2fs.c:680
+#: misc/mke2fs.c:709
#, c-format
msgid "Fragment size=%u (log=%u)\n"
msgstr "Dimensione frammento=%u (log=%u)\n"
-#: misc/mke2fs.c:682
+#: misc/mke2fs.c:711
#, c-format
msgid "%u inodes, %u blocks\n"
msgstr "%u inode, %u blocchi\n"
-#: misc/mke2fs.c:684
+#: misc/mke2fs.c:713
#, c-format
msgid "%u blocks (%2.2f%%) reserved for the super user\n"
msgstr "%u blocchi (%2.2f%%) riservati per l'utente root\n"
-#: misc/mke2fs.c:687
+#: misc/mke2fs.c:716
#, c-format
msgid "First data block=%u\n"
msgstr "Primo blocco dati=%u\n"
-#: misc/mke2fs.c:689
+#: misc/mke2fs.c:718
#, c-format
msgid "%u block groups\n"
msgstr "%u gruppi di blocchi\n"
-#: misc/mke2fs.c:691
+#: misc/mke2fs.c:720
#, fuzzy, c-format
msgid "%u block group\n"
msgstr "%u gruppo di blocchi\n"
-#: misc/mke2fs.c:692
+#: misc/mke2fs.c:721
#, c-format
msgid "%u blocks per group, %u fragments per group\n"
msgstr "%u blocchi per gruppo, %u frammenti per gruppo\n"
-#: misc/mke2fs.c:694
+#: misc/mke2fs.c:723
#, c-format
msgid "%u inodes per group\n"
msgstr "%u inode per gruppo\n"
-#: misc/mke2fs.c:701
+#: misc/mke2fs.c:730
+#, c-format
msgid "Superblock backups stored on blocks: "
msgstr "Backup del superblocco salvati nei blocchi: "
-#: misc/mke2fs.c:751
+#: misc/mke2fs.c:780
+#, c-format
msgid "Couldn't allocate memory to parse raid options!\n"
msgstr "Impossibile allocare memoria per fare il parsing delle opzioni raid!\n"
-#: misc/mke2fs.c:776
+#: misc/mke2fs.c:805
+#, c-format
msgid "Invalid stride parameter.\n"
msgstr ""
-#: misc/mke2fs.c:784
+#: misc/mke2fs.c:813
+#, c-format
msgid ""
"\n"
"Bad raid options specified.\n"
@@ -3233,81 +3199,88 @@ msgstr ""
"\tstride=lunghezza stride in blocchi>\n"
"\n"
-#: misc/mke2fs.c:902
+#: misc/mke2fs.c:930
#, c-format
msgid "Warning: blocksize %d not usable on most systems.\n"
-msgstr "Attenzione: la dimensione di blocco %d non utilizzabile su molti sistemi.\n"
+msgstr ""
+"Attenzione: la dimensione di blocco %d non utilizzabile su molti sistemi.\n"
-#: misc/mke2fs.c:919
+#: misc/mke2fs.c:947
#, c-format
msgid "bad fragment size - %s"
msgstr "dimensione del frammento non valida - %s"
-#: misc/mke2fs.c:925
+#: misc/mke2fs.c:953
+#, c-format
msgid "Warning: fragments not supported. Ignoring -f option\n"
msgstr "Attenzione: frammenti non supportati. Opzione -f ignorata\n"
-#: misc/mke2fs.c:932
+#: misc/mke2fs.c:960
msgid "Illegal number for blocks per group"
msgstr "Numero di blocchi per gruppo non valido"
-#: misc/mke2fs.c:937
+#: misc/mke2fs.c:965
msgid "blocks per group must be multiple of 8"
msgstr "i blocchi per gruppo devono essere multipli di 8"
-#: misc/mke2fs.c:947
+#: misc/mke2fs.c:975
#, c-format
msgid "bad inode ratio %s (min %d/max %d"
msgstr "tasso di inode non valido %s (min %d/max %d)"
-#: misc/mke2fs.c:966
+#: misc/mke2fs.c:994
msgid "in malloc for bad_blocks_filename"
msgstr "nella malloc per bad_blocks_filename"
-#: misc/mke2fs.c:975
+#: misc/mke2fs.c:1003
#, c-format
msgid "bad reserved blocks percent - %s"
msgstr "percentuale di blocchi riservati non valida - %s"
-#: misc/mke2fs.c:1007
+#: misc/mke2fs.c:1035
#, c-format
msgid "bad inode size - %s"
msgstr "dimensione inode non valida - %s"
-#: misc/mke2fs.c:1043 misc/tune2fs.c:294
+#: misc/mke2fs.c:1071 misc/tune2fs.c:302
#, c-format
msgid "Invalid filesystem option set: %s\n"
msgstr "Set di opzioni del filesystem non valido: %s\n"
-#: misc/mke2fs.c:1112 misc/mke2fs.c:1449
+#: misc/mke2fs.c:1140 misc/mke2fs.c:1477
#, c-format
msgid "while trying to open journal device %s\n"
msgstr "durante l'apertura del dispositivo di journaling %s\n"
-#: misc/mke2fs.c:1118
+#: misc/mke2fs.c:1146
#, c-format
msgid "Journal dev blocksize (%d) smaller than minimum blocksize %d\n"
-msgstr "Dimensione dei blocchi del device di journaling (%d) minore della dim minima dei blocchi %d\n"
+msgstr ""
+"Dimensione dei blocchi del device di journaling (%d) minore della dim minima "
+"dei blocchi %d\n"
-#: misc/mke2fs.c:1132
+#: misc/mke2fs.c:1160
#, c-format
msgid "%d-byte blocks too big for system (max %d)"
msgstr "blocchi di %d byte troppo grandi per il sistema (max %d)"
-#: misc/mke2fs.c:1136
+#: misc/mke2fs.c:1164
#, c-format
-msgid "Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
-msgstr "Attenzione: blocchi di %d bytes troppo grandi per il sistema (max %d), continuo comunque\n"
+msgid ""
+"Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
+msgstr ""
+"Attenzione: blocchi di %d bytes troppo grandi per il sistema (max %d), "
+"continuo comunque\n"
-#: misc/mke2fs.c:1161
+#: misc/mke2fs.c:1189
msgid "filesystem"
msgstr "filesystem"
-#: misc/mke2fs.c:1174 resize/main.c:264
+#: misc/mke2fs.c:1202 resize/main.c:268
msgid "while trying to determine filesystem size"
msgstr "tentando di determinare la dimensione del filesystem"
-#: misc/mke2fs.c:1180
+#: misc/mke2fs.c:1208
msgid ""
"Couldn't determine device size; you must specify\n"
"the size of the filesystem\n"
@@ -3315,7 +3288,7 @@ msgstr ""
"Impossibile determinare la dimensione del device: bisogna\n"
"specificare la dimensione del filesystem\n"
-#: misc/mke2fs.c:1187
+#: misc/mke2fs.c:1215
msgid ""
"Device size reported to be zero. Invalid partition specified, or\n"
"\tpartition table wasn't reread after running fdisk, due to\n"
@@ -3323,61 +3296,63 @@ msgid ""
"\tto re-read your partition table.\n"
msgstr ""
"Sembra che la dimensione del device sia zero. Specificata partizione non\n"
-"\tvalida o la tabella delle partizioni non stata riletta dopo l'esecuzione\n"
+"\tvalida o la tabella delle partizioni non stata riletta dopo "
+"l'esecuzione\n"
"\tdi fdisk, poich una partizione modificata era occupata. Potrebbe essere\n"
"\tnecessario riavviare per rileggere la tabella delle partizioni.\n"
-#: misc/mke2fs.c:1205
+#: misc/mke2fs.c:1233
msgid "Filesystem larger than apparent device size."
msgstr "Il filesystem pi grande della dimensione apparente del device."
-#: misc/mke2fs.c:1227
+#: misc/mke2fs.c:1255
msgid "while trying to determine hardware sector size"
msgstr "provando a determinare la dimensione del settore hardware"
-#: misc/mke2fs.c:1241
+#: misc/mke2fs.c:1269
msgid "blocks per group count out of range"
msgstr "conteggio dei blocchi per gruppo fuori dall'intervallo"
-#: misc/mke2fs.c:1251
+#: misc/mke2fs.c:1279
#, c-format
msgid "bad inode size %d (min %d/max %d)"
msgstr "dimensione dell'inode non valida: %d (min %d/max %d)"
-#: misc/mke2fs.c:1257
+#: misc/mke2fs.c:1285
#, c-format
msgid "Warning: %d-byte inodes not usable on most systems\n"
-msgstr "Attenzione: gli inode di %d byte non sono utilizzabili su molti sistemi\n"
+msgstr ""
+"Attenzione: gli inode di %d byte non sono utilizzabili su molti sistemi\n"
-#: misc/mke2fs.c:1308
+#: misc/mke2fs.c:1336
#, fuzzy
msgid "while setting up superblock"
msgstr "impostando il superblocco"
-#: misc/mke2fs.c:1342
+#: misc/mke2fs.c:1370
#, c-format
msgid "unknown os - %s"
msgstr "so sconosciuto - %s"
-#: misc/mke2fs.c:1396
+#: misc/mke2fs.c:1424
msgid "while trying to allocate filesystem tables"
msgstr "tentando di allocare le tabelle del filesystem"
-#: misc/mke2fs.c:1427
+#: misc/mke2fs.c:1455
#, c-format
msgid "while zeroing block %u at end of filesystem"
msgstr "azzerando il blocco %u alla fine del filesystem"
-#: misc/mke2fs.c:1442 misc/tune2fs.c:376
+#: misc/mke2fs.c:1470 misc/tune2fs.c:387
msgid "journal"
msgstr "journal"
-#: misc/mke2fs.c:1454
+#: misc/mke2fs.c:1482
#, c-format
msgid "Adding journal to device %s: "
msgstr "Aggiunta del journal al device %s: "
-#: misc/mke2fs.c:1461
+#: misc/mke2fs.c:1489
#, c-format
msgid ""
"\n"
@@ -3386,16 +3361,17 @@ msgstr ""
"\n"
"\tcercando di agigungere il journal al device %s"
-#: misc/mke2fs.c:1466 misc/mke2fs.c:1490 misc/tune2fs.c:404 misc/tune2fs.c:418
+#: misc/mke2fs.c:1494 misc/mke2fs.c:1518 misc/tune2fs.c:415 misc/tune2fs.c:429
+#, c-format
msgid "done\n"
msgstr "fatto\n"
-#: misc/mke2fs.c:1478
+#: misc/mke2fs.c:1506
#, c-format
msgid "Creating journal (%d blocks): "
msgstr "Creazione del journal (%d blocchi): "
-#: misc/mke2fs.c:1486
+#: misc/mke2fs.c:1514
msgid ""
"\n"
"\twhile trying to create journal"
@@ -3403,11 +3379,15 @@ msgstr ""
"\n"
"\tcercando di creare il journal"
-#: misc/mke2fs.c:1495
+#: misc/mke2fs.c:1523
+#, c-format
msgid "Writing superblocks and filesystem accounting information: "
-msgstr "Scrittura delle informazioni dei superblocchi e dell'accounting del filesystem: "
+msgstr ""
+"Scrittura delle informazioni dei superblocchi e dell'accounting del "
+"filesystem: "
-#: misc/mke2fs.c:1500
+#: misc/mke2fs.c:1528
+#, c-format
msgid ""
"\n"
"Warning, had trouble writing out superblocks."
@@ -3415,7 +3395,8 @@ msgstr ""
"\n"
"Attenzione, problemi durante la scrittura dei superblocchi."
-#: misc/mke2fs.c:1503
+#: misc/mke2fs.c:1531
+#, c-format
msgid ""
"done\n"
"\n"
@@ -3423,7 +3404,8 @@ msgstr ""
"fatto\n"
"\n"
-#: misc/mklost+found.c:48
+#: misc/mklost+found.c:49
+#, c-format
msgid "Usage: mklost+found\n"
msgstr "Utilizzo: mklost+found\n"
@@ -3445,7 +3427,8 @@ msgid ""
msgstr ""
"Utilizzo: %s <dev1> <dev2> <dev3>\n"
"\n"
-"Questo programma stampa le informazioni di partizione per un insieme di device\n"
+"Questo programma stampa le informazioni di partizione per un insieme di "
+"device\n"
"Un utilizzo comune di questo programma :\n"
"\n"
"\t%s /dev/hda?\n"
@@ -3461,11 +3444,11 @@ msgstr "ioctl HDIO_GETGEO"
msgid "BLKGETSIZE ioctl"
msgstr "ioctl BLKGETSIZE"
-#: misc/tune2fs.c:74
+#: misc/tune2fs.c:77
msgid "Please run e2fsck on the filesystem.\n"
msgstr "Eseguire e2fsck sul filesystem.\n"
-#: misc/tune2fs.c:81
+#: misc/tune2fs.c:84
#, c-format
msgid ""
"Usage: %s [-c max-mounts-count] [-e errors-behavior] [-g group]\n"
@@ -3479,56 +3462,57 @@ msgstr ""
"\t[-i intervallo[d|m|w]] [-j] [-J opzioni-journal]\n"
"\t[-l] [-s flag-sparse] [-m percentuale-blocchi-riservati]\n"
"\t[-o [^]opzioni-mount[,...]] [-r numero-blocchi-riservati]\n"
-"\t[-u utente] [-C numero-mount] [-L etichetta-volume] [-M ultima-dir-montata]\n"
+"\t[-u utente] [-C numero-mount] [-L etichetta-volume] [-M ultima-dir-"
+"montata]\n"
"\t[-O [^]caratteristica[,...]] [-T ultimo-controllo] [-U UUID] device\n"
-#: misc/tune2fs.c:138
+#: misc/tune2fs.c:141
msgid "while trying to open external journal"
msgstr "cercando di aprire il journal esterno"
-#: misc/tune2fs.c:142
+#: misc/tune2fs.c:145
#, c-format
msgid "%s is not a journal device.\n"
msgstr "%s non un dispositivo di journaling.\n"
-#: misc/tune2fs.c:157
+#: misc/tune2fs.c:160
msgid "Journal superblock not found!\n"
msgstr "Superblocco del journal non trovato!\n"
-#: misc/tune2fs.c:169
+#: misc/tune2fs.c:172
msgid "Filesystem's UUID not found on journal device.\n"
msgstr "UUID del filesystem non trovato sul dispositivo di journaling.\n"
-#: misc/tune2fs.c:190
+#: misc/tune2fs.c:193
msgid "Journal NOT removed\n"
msgstr "Journal NON rimosso\n"
-#: misc/tune2fs.c:196
+#: misc/tune2fs.c:199
msgid "Journal removed\n"
msgstr "Journal rimosso\n"
-#: misc/tune2fs.c:228
+#: misc/tune2fs.c:231
msgid "while reading journal inode"
msgstr "leggendo l'inode del journal"
-#: misc/tune2fs.c:235
+#: misc/tune2fs.c:238
msgid "while reading bitmaps"
msgstr ""
-#: misc/tune2fs.c:242
+#: misc/tune2fs.c:245
msgid "while clearing journal inode"
msgstr "azzerando l'inode del journal"
-#: misc/tune2fs.c:253
+#: misc/tune2fs.c:256
msgid "while writing journal inode"
msgstr "scrivendo l'inode del journal"
-#: misc/tune2fs.c:268
+#: misc/tune2fs.c:271
#, c-format
msgid "Invalid mount option set: %s\n"
msgstr "Insieme di opzioni di mount non valido: %s\n"
-#: misc/tune2fs.c:309
+#: misc/tune2fs.c:317
msgid ""
"The has_journal flag may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
@@ -3536,7 +3520,7 @@ msgstr ""
"Il flag has_journal pu essere azzerato quando il filesystem non\n"
" montato o montato solo in lettura.\n"
-#: misc/tune2fs.c:317
+#: misc/tune2fs.c:325
msgid ""
"The needs_recovery flag is set. Please run e2fsck before clearing\n"
"the has_journal flag.\n"
@@ -3544,11 +3528,11 @@ msgstr ""
"Il flag needs_recovery impostato. Eseguire e2fsck prima di azzerare\n"
"il flag has_journal.\n"
-#: misc/tune2fs.c:371
+#: misc/tune2fs.c:382
msgid "The filesystem already has a journal.\n"
msgstr "Il filesystem ha gi un journal.\n"
-#: misc/tune2fs.c:388
+#: misc/tune2fs.c:399
#, c-format
msgid ""
"\n"
@@ -3557,21 +3541,21 @@ msgstr ""
"\n"
"\ttentando di aprire il journal in %s\n"
-#: misc/tune2fs.c:392
+#: misc/tune2fs.c:403
#, c-format
msgid "Creating journal on device %s: "
msgstr "Creando il journal per il device %s: "
-#: misc/tune2fs.c:400
+#: misc/tune2fs.c:411
#, c-format
msgid "while adding filesystem to journal on %s"
msgstr "aggiungendo un filesystem al journal in %s"
-#: misc/tune2fs.c:406
+#: misc/tune2fs.c:417
msgid "Creating journal inode: "
msgstr "Creazione dell'inode del journal: "
-#: misc/tune2fs.c:415
+#: misc/tune2fs.c:426
msgid ""
"\n"
"\twhile trying to create journal file"
@@ -3579,131 +3563,133 @@ msgstr ""
"\n"
"\tcercando di creare il file di journal"
-#: misc/tune2fs.c:478
+#: misc/tune2fs.c:492
#, c-format
msgid "Couldn't parse date/time specifier: %s"
msgstr ""
-#: misc/tune2fs.c:500 misc/tune2fs.c:513
+#: misc/tune2fs.c:514 misc/tune2fs.c:527
#, c-format
msgid "bad mounts count - %s"
msgstr "numero di mount non validi - %s"
-#: misc/tune2fs.c:529
+#: misc/tune2fs.c:543
#, fuzzy, c-format
msgid "bad error behavior - %s"
msgstr "comportamento relativo ad un errore non valido - %s"
-#: misc/tune2fs.c:552
+#: misc/tune2fs.c:566
#, c-format
msgid "bad gid/group name - %s"
msgstr "gid/nome gruppo non valido - %s"
-#: misc/tune2fs.c:585
+#: misc/tune2fs.c:599
#, c-format
msgid "bad interval - %s"
msgstr "intervallo non valido - %s"
-#: misc/tune2fs.c:613
+#: misc/tune2fs.c:627
#, c-format
msgid "bad reserved block ratio - %s"
msgstr "percentuale di blocchi riservati non valida - %s"
-#: misc/tune2fs.c:628
+#: misc/tune2fs.c:642
msgid "-o may only be specified once"
msgstr "-o pu essere specificata solo una volta"
-#: misc/tune2fs.c:638
+#: misc/tune2fs.c:652
msgid "-O may only be specified once"
msgstr "-O pu essere specificata solo una volta"
-#: misc/tune2fs.c:648
+#: misc/tune2fs.c:662
#, c-format
msgid "bad reserved blocks count - %s"
msgstr "numero di blocchi riservati non valido - %s"
-#: misc/tune2fs.c:677
+#: misc/tune2fs.c:691
#, c-format
msgid "bad uid/user name - %s"
msgstr "uid/nome utente non valido - %s"
-#: misc/tune2fs.c:783
+#: misc/tune2fs.c:801
#, c-format
msgid "Setting maximal mount count to %d\n"
msgstr "Impostazione del numero massimo di mount a %d\n"
-#: misc/tune2fs.c:789
+#: misc/tune2fs.c:807
#, c-format
msgid "Setting current mount count to %d\n"
msgstr "Impostazione del numero attuale di mount a %d\n"
-#: misc/tune2fs.c:794
+#: misc/tune2fs.c:812
#, fuzzy, c-format
msgid "Setting error behavior to %d\n"
msgstr "Impostazione del comportamento da errore a %d\n"
-#: misc/tune2fs.c:799
+#: misc/tune2fs.c:817
#, c-format
msgid "Setting reserved blocks gid to %lu\n"
msgstr "Impostazione del gid dei blocchi riservati a %lu\n"
-#: misc/tune2fs.c:804
+#: misc/tune2fs.c:822
#, c-format
msgid "Setting interval between check %lu seconds\n"
msgstr "Impostazione dell'intervallo tra i controlli a %lu secondi\n"
-#: misc/tune2fs.c:810
+#: misc/tune2fs.c:828
#, c-format
msgid "Setting reserved blocks percentage to %lu (%u blocks)\n"
-msgstr "Impostazione della percentuale di blocchi riservati a %lu (%u blocchi)\n"
+msgstr ""
+"Impostazione della percentuale di blocchi riservati a %lu (%u blocchi)\n"
-#: misc/tune2fs.c:816
+#: misc/tune2fs.c:834
#, c-format
msgid "reserved blocks count is too big (%lu)"
msgstr "il numero di blocchi riservati troppo alto (%lu)"
-#: misc/tune2fs.c:822
+#: misc/tune2fs.c:840
#, c-format
msgid "Setting reserved blocks count to %lu\n"
msgstr "Impostazione del numero di blocchi riservati a %lu\n"
-#: misc/tune2fs.c:828
+#: misc/tune2fs.c:846
msgid ""
"\n"
"The filesystem already has sparse superblocks.\n"
msgstr ""
-#: misc/tune2fs.c:835
+#: misc/tune2fs.c:853
#, c-format
msgid ""
"\n"
"Sparse superblock flag set. %s"
msgstr ""
-#: misc/tune2fs.c:842
+#: misc/tune2fs.c:860
msgid ""
"\n"
"The filesystem already has sparse superblocks disabled.\n"
msgstr ""
-#: misc/tune2fs.c:850
+#: misc/tune2fs.c:868
#, c-format
msgid ""
"\n"
"Sparse superblock flag cleared. %s"
msgstr ""
-#: misc/tune2fs.c:857
+#: misc/tune2fs.c:875
#, c-format
msgid "Setting time filesystem last checked to %s\n"
-msgstr "Impostazione di data ed ora dell'ultimo controllo del filesystem a %s\n"
+msgstr ""
+"Impostazione di data ed ora dell'ultimo controllo del filesystem a %s\n"
-#: misc/tune2fs.c:863
+#: misc/tune2fs.c:881
#, c-format
msgid "Setting reserved blocks uid to %lu\n"
msgstr "Impostazione dell'uid dei blocchi riservati a %lu\n"
-#: misc/tune2fs.c:896
+#: misc/tune2fs.c:914
msgid "Invalid UUID format\n"
msgstr "Formato UUID non valido\n"
@@ -3724,30 +3710,32 @@ msgstr ""
"\n"
"Sembra che il dispositivo non esista; stato specificato correttamente?\n"
-#: misc/util.c:101
+#: misc/util.c:107
#, c-format
msgid "%s is not a block special device.\n"
msgstr "%s non un device speciale a blocchi.\n"
-#: misc/util.c:130
+#: misc/util.c:136
#, c-format
msgid "%s is entire device, not just one partition!\n"
msgstr "%s un device intero, non solo una partizione.\n"
-#: misc/util.c:154
+#: misc/util.c:160
msgid "mke2fs forced anyway. Hope /etc/mtab is incorrect.\n"
-msgstr "mke2fs stato forzato comunque. Si spera che /etc/mtab sia sbagliato.\n"
+msgstr ""
+"mke2fs stato forzato comunque. Si spera che /etc/mtab sia sbagliato.\n"
-#: misc/util.c:157
+#: misc/util.c:163
#, c-format
msgid "will not make a %s here!\n"
msgstr ""
-#: misc/util.c:171
+#: misc/util.c:177
msgid "Couldn't allocate memory to parse journal options!\n"
-msgstr "Impossibile allocare memoria per fare il parsing delle opzioni del journal!\n"
+msgstr ""
+"Impossibile allocare memoria per fare il parsing delle opzioni del journal!\n"
-#: misc/util.c:213
+#: misc/util.c:219
msgid ""
"\n"
"Bad journal options specified.\n"
@@ -3765,17 +3753,19 @@ msgstr ""
"\n"
"Sono state specificate opzioni non valide per il journal.\n"
"\n"
-"Le opzioni per il journal sono separate da virgole, e possono avere un parametro,\n"
+"Le opzioni per il journal sono separate da virgole, e possono avere un "
+"parametro,\n"
"\tpassato da un segno di uguale ('=').\n"
"\n"
"Opzioni valide per il journal sono:\n"
"\tsize=<dimensione del journal in MB>\n"
"\tdevice=<dispositivo di journal>\n"
"\n"
-"La dimensione del journal dev'essere compreso tra 1024 e 102400 blocchi del filesystem.\n"
+"La dimensione del journal dev'essere compreso tra 1024 e 102400 blocchi del "
+"filesystem.\n"
"\n"
-#: misc/util.c:240
+#: misc/util.c:246
msgid ""
"\n"
"Filesystem too small for a journal\n"
@@ -3783,7 +3773,7 @@ msgstr ""
"\n"
"Filesystem troppo piccolo per un journal\n"
-#: misc/util.c:247
+#: misc/util.c:253
#, c-format
msgid ""
"\n"
@@ -3794,7 +3784,7 @@ msgstr ""
"La dimensione specificata del journal di %d blocchi, ma essa\n"
"dev'essere compresa tra 1024 e 102400 blocchi. Operazione annullata.\n"
-#: misc/util.c:255
+#: misc/util.c:261
msgid ""
"\n"
"Journal size too big for filesystem.\n"
@@ -3802,14 +3792,15 @@ msgstr ""
"\n"
"Dimensione del journal troppo grande per il filesystem.\n"
-#: misc/util.c:274
+#: misc/util.c:280
#, c-format
msgid ""
"This filesystem will be automatically checked every %d mounts or\n"
"%g days, whichever comes first. Use tune2fs -c or -i to override.\n"
msgstr ""
"Questo filesystem verr automaticamente controllato ogni %d mount, o\n"
-"%g giorni, a seconda di quale venga prima. Usare tune2fs -c o -i per cambiare.\n"
+"%g giorni, a seconda di quale venga prima. Usare tune2fs -c o -i per "
+"cambiare.\n"
#: misc/uuidgen.c:30
#, c-format
@@ -3888,7 +3879,7 @@ msgstr "resize2fs %s (%s)\n"
msgid "bad filesystem size - %s"
msgstr "dimensione filesystem non valida - %s"
-#: resize/main.c:296
+#: resize/main.c:300
#, c-format
msgid ""
"The containing partition (or device) is only %d (%dk) blocks.\n"
@@ -3899,7 +3890,7 @@ msgstr ""
"E' stata richiesta una nuova dimensione di %d blocchi.\n"
"\n"
-#: resize/main.c:303
+#: resize/main.c:307
#, c-format
msgid ""
"The filesystem is already %d blocks long. Nothing to do!\n"
@@ -3908,7 +3899,7 @@ msgstr ""
"Il filesystem gi lungo %d blocchi. Nulla da fare!\n"
"\n"
-#: resize/main.c:310
+#: resize/main.c:314
#, c-format
msgid ""
"Please run 'e2fsck -f %s' first.\n"
@@ -3917,12 +3908,12 @@ msgstr ""
"Eseguire prima 'e2fsck -f %s'.\n"
"\n"
-#: resize/main.c:320
+#: resize/main.c:324
#, c-format
msgid "while trying to resize %s"
msgstr "provando a ridimensionare %s"
-#: resize/main.c:325
+#: resize/main.c:329
#, c-format
msgid ""
"The filesystem on %s is now %d blocks long.\n"
@@ -3931,57 +3922,150 @@ msgstr ""
"Il filesystem su %s ora lungo %d blocchi.\n"
"\n"
-#: resize/resize2fs.c:109
+#: resize/resize2fs.c:110
#, c-format
msgid "Number of free blocks: %d/%d, Needed: %d\n"
msgstr "Numero di blocchi liberi: %d/%d, richiesti: %d\n"
-#: resize/resize2fs.c:458
+#: resize/resize2fs.c:459
msgid "meta-data blocks"
msgstr ""
-#: resize/resize2fs.c:581
+#: resize/resize2fs.c:582
msgid "reserved blocks"
msgstr "blocchi riservati"
-#: resize/resize2fs.c:586
+#: resize/resize2fs.c:587
msgid "blocks to be moved"
msgstr "blocchi da spostare"
-#: resize/resize2fs.c:816
+#: resize/resize2fs.c:817
+#, c-format
msgid "Going into desperation mode for block allocations\n"
msgstr "Attivazione 'desperation mode' per l'allocazione dei blocchi\n"
-#: resize/resize2fs.c:920
+#: resize/resize2fs.c:921
#, c-format
msgid "Moving %d blocks %u->%u\n"
msgstr "Spostamento di %d blocchi %u-%u\n"
-#: resize/resize2fs.c:997
+#: resize/resize2fs.c:998
#, c-format
msgid "ino=%u, blockcnt=%lld, %u->%u\n"
msgstr "ino=%u, numblocchi=%lld, %u->%u\n"
-#: resize/resize2fs.c:1165
+#: resize/resize2fs.c:1166
#, c-format
msgid "Inode moved %u->%u\n"
msgstr "Inode mosso %u->%u\n"
-#: resize/resize2fs.c:1233
+#: resize/resize2fs.c:1234
#, c-format
msgid "Inode translate (dir=%u, name=%.*s, %u->%u)\n"
msgstr ""
-#: resize/resize2fs.c:1360
+#: resize/resize2fs.c:1361
#, c-format
msgid "Itable move group %d block %u->%u (diff %d)\n"
msgstr ""
-#: resize/resize2fs.c:1386
+#: resize/resize2fs.c:1387
#, c-format
msgid "%d blocks of zeros...\n"
msgstr "%d blocchi di zeri...\n"
-#: resize/resize2fs.c:1421
+#: resize/resize2fs.c:1422
+#, c-format
msgid "Inode table move finished.\n"
msgstr "Spostamento della tavola degli inode terminato.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "%8d inode used (%d%%)\n"
+#~ msgid_plural ""
+#~ "\n"
+#~ "%8d inodes used (%d%%)\n"
+#~ msgstr[0] ""
+#~ "\n"
+#~ "%8d inode usato (%d%%)\n"
+#~ msgstr[1] ""
+#~ "\n"
+#~ "%8d inode usati (%d%%)\n"
+
+#~ msgid "%8d non-contiguous inode (%0d.%d%%)\n"
+#~ msgid_plural "%8d non-contiguous inodes (%0d.%d%%)\n"
+#~ msgstr[0] "%8d inode non contiguo (%0d.%d%%)\n"
+#~ msgstr[1] "%8d inode non contigui (%0d.%d%%)\n"
+
+#~ msgid "%8d block used (%d%%)\n"
+#~ msgid_plural "%8d blocks used (%d%%)\n"
+#~ msgstr[0] "%8d blocco usato (%d%%)\n"
+#~ msgstr[1] "%8d blocchi usati (%d%%)\n"
+
+#~ msgid "%8d bad block\n"
+#~ msgid_plural "%8d bad blocks\n"
+#~ msgstr[0] "%8d blocco non valido\n"
+#~ msgstr[1] "%8d blocchi non validi\n"
+
+#~ msgid "%8d large file\n"
+#~ msgid_plural "%8d large files\n"
+#~ msgstr[0] "%8d file grande\n"
+#~ msgstr[1] "%8d file grandi\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "%8d regular file\n"
+#~ msgid_plural ""
+#~ "\n"
+#~ "%8d regular files\n"
+#~ msgstr[0] ""
+#~ "\n"
+#~ "%8d file regolare\n"
+#~ msgstr[1] ""
+#~ "\n"
+#~ "%8d file regolari\n"
+
+#~ msgid "%8d directory\n"
+#~ msgid_plural "%8d directories\n"
+#~ msgstr[0] "%8d directory\n"
+#~ msgstr[1] "%8d directory\n"
+
+#~ msgid "%8d character device file\n"
+#~ msgid_plural "%8d character device files\n"
+#~ msgstr[0] "%8d file di dispositivo a caratteri\n"
+#~ msgstr[1] "%8d file di dispositivi a caratteri\n"
+
+#~ msgid "%8d block device file\n"
+#~ msgid_plural "%8d block device files\n"
+#~ msgstr[0] "%8d file di dispositivo a blocchi\n"
+#~ msgstr[1] "%8d file di dispositivi a blocchi\n"
+
+#~ msgid "%8d fifo\n"
+#~ msgid_plural "%8d fifos\n"
+#~ msgstr[0] "%8d fifo\n"
+#~ msgstr[1] "%8d fifo\n"
+
+#~ msgid "%8d link\n"
+#~ msgid_plural "%8d links\n"
+#~ msgstr[0] "%8d collegamento\n"
+#~ msgstr[1] "%8d collegamenti\n"
+
+#~ msgid "%8d symbolic link"
+#~ msgid_plural "%8d symbolic links"
+#~ msgstr[0] "%8d collegamento simbolico"
+#~ msgstr[1] "%8d collegamenti simbolici"
+
+#~ msgid " (%d fast symbolic link)\n"
+#~ msgid_plural " (%d fast symbolic links)\n"
+#~ msgstr[0] " (%d collegamento simbolico veloce)\n"
+#~ msgstr[1] " (%d collegamenti simbolici veloci)\n"
+
+#~ msgid "%8d socket\n"
+#~ msgid_plural "%8d sockets\n"
+#~ msgstr[0] "%8d socket\n"
+#~ msgstr[1] "%8d socket\n"
+
+#~ msgid "%8d file\n"
+#~ msgid_plural "%8d files\n"
+#~ msgstr[0] "%8d file\n"
+#~ msgstr[1] "%8d file\n"
diff --git a/po/pl.gmo b/po/pl.gmo
new file mode 100644
index 00000000..38ab621f
--- /dev/null
+++ b/po/pl.gmo
Binary files differ
diff --git a/po/pl.po b/po/pl.po
index 68eb93fa..689e794f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,17 +6,18 @@
msgid ""
msgstr ""
"Project-Id-Version: e2fsprogs 1.35\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-24 14:17-0500\n"
+"Report-Msgid-Bugs-To: tytso@alum.mit.edu\n"
+"POT-Creation-Date: 2004-11-30 18:46-0500\n"
"PO-Revision-Date: 2004-02-29 20:20+0100\n"
"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
-#: e2fsck/badblocks.c:22 misc/mke2fs.c:194
+#: e2fsck/badblocks.c:22 misc/mke2fs.c:223
#, c-format
msgid "Bad block %u out of range; ignored.\n"
msgstr "Wadliwy blok %u poza zakresem - zignorowany.\n"
@@ -30,10 +31,10 @@ msgid "while reading the bad blocks inode"
msgstr "podczas odczytu i-wza wadliwych blokw"
#: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
-#: e2fsck/unix.c:881 e2fsck/unix.c:913 misc/badblocks.c:997
+#: e2fsck/unix.c:915 e2fsck/unix.c:947 misc/badblocks.c:997
#: misc/badblocks.c:1005 misc/badblocks.c:1019 misc/badblocks.c:1031
-#: misc/dumpe2fs.c:332 misc/e2image.c:486 misc/e2image.c:502 misc/mke2fs.c:210
-#: misc/tune2fs.c:757 resize/main.c:228
+#: misc/dumpe2fs.c:332 misc/e2image.c:475 misc/e2image.c:564
+#: misc/e2image.c:580 misc/mke2fs.c:239 misc/tune2fs.c:775 resize/main.c:232
#, c-format
msgid "while trying to open %s"
msgstr "podczas prby otworzenia %s"
@@ -43,7 +44,7 @@ msgstr "podczas prby otworzenia %s"
msgid "while trying popen '%s'"
msgstr "podczas prby popen '%s'"
-#: e2fsck/badblocks.c:93 misc/mke2fs.c:217
+#: e2fsck/badblocks.c:93 misc/mke2fs.c:246
msgid "while reading in list of bad blocks from file"
msgstr "podczas wczytywania z pliku listy wadliwych blokw"
@@ -54,7 +55,8 @@ msgstr "podczas uaktualniania i-wza wadliwego bloku"
#: e2fsck/badblocks.c:129
#, c-format
msgid "Warning illegal block %u found in bad block inode. Cleared.\n"
-msgstr "Uwaga: niedopuszczalny blok %u w i-wle wadliwego bloku. Wyczyszczono.\n"
+msgstr ""
+"Uwaga: niedopuszczalny blok %u w i-wle wadliwego bloku. Wyczyszczono.\n"
#: e2fsck/ehandler.c:53
#, c-format
@@ -103,6 +105,7 @@ msgid "%s: %s filename nblocks blocksize\n"
msgstr "%s: %s nazwa_pliku liczba_blokw rozmiar_bloku\n"
#: e2fsck/extend.c:43
+#, c-format
msgid "Illegal number of blocks!\n"
msgstr "Niedopuszczalna liczba blokw!\n"
@@ -117,6 +120,7 @@ msgid "Usage: %s disk\n"
msgstr "Skadnia: %s dysk\n"
#: e2fsck/flushb.c:63
+#, c-format
msgid "BLKFLSBUF ioctl not supported! Can't flush buffers.\n"
msgstr "ioctl BLKFLSBUF nie obsugiwany! Nie mona oprni buforw.\n"
@@ -125,12 +129,12 @@ msgstr "ioctl BLKFLSBUF nie obsugiwany! Nie mona oprni buforw.\n"
msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n"
msgstr "Skadnia: %s [-F] [-I bloki_bufora_i-wzw] urzdzenie\n"
-#: e2fsck/iscan.c:83 e2fsck/unix.c:701 resize/main.c:205
+#: e2fsck/iscan.c:83 e2fsck/unix.c:729 resize/main.c:209
#, c-format
msgid "while opening %s for flushing"
msgstr "podczas otwierania %s w celu oprnienia"
-#: e2fsck/iscan.c:88 e2fsck/unix.c:707 resize/main.c:212
+#: e2fsck/iscan.c:88 e2fsck/unix.c:735 resize/main.c:216
#, c-format
msgid "while trying to flush %s"
msgstr "podczas prby oprnienia %s"
@@ -148,31 +152,32 @@ msgstr "podczas pobierania nastpnego i-wza"
msgid "%d inodes scanned.\n"
msgstr "Przeszukano %d i-wzw.\n"
-#: e2fsck/journal.c:449
+#: e2fsck/journal.c:463
msgid "reading journal superblock\n"
msgstr "odczyt superbloku kroniki\n"
-#: e2fsck/journal.c:506
+#: e2fsck/journal.c:520
#, c-format
msgid "%s: no valid journal superblock found\n"
msgstr "%s: nie znaleziono poprawnego superbloku kroniki\n"
-#: e2fsck/journal.c:515
+#: e2fsck/journal.c:529
#, c-format
msgid "%s: journal too short\n"
msgstr "%s: kronika za krtka\n"
-#: e2fsck/journal.c:787
+#: e2fsck/journal.c:802
#, c-format
msgid "%s: recovering journal\n"
msgstr "%s: odtwarzanie z kroniki\n"
-#: e2fsck/journal.c:789
+#: e2fsck/journal.c:804
#, c-format
msgid "%s: won't do journal recovery while read-only\n"
-msgstr "%s: odtworzenie z kroniki nie zostanie wykonane w trybie tylko do odczytu\n"
+msgstr ""
+"%s: odtworzenie z kroniki nie zostanie wykonane w trybie tylko do odczytu\n"
-#: e2fsck/journal.c:810
+#: e2fsck/journal.c:825
#, c-format
msgid "while trying to re-open %s"
msgstr "podczas prby ponownego otwarcia %s"
@@ -329,77 +334,77 @@ msgstr "<zarezerwowany i-wze 10>"
msgid "multiply claimed inode map"
msgstr "wielokrotnie zadeklarowana mapa i-wzw"
-#: e2fsck/pass1b.c:551 e2fsck/pass1b.c:688
+#: e2fsck/pass1b.c:554 e2fsck/pass1b.c:691
#, c-format
msgid "internal error; can't find dup_blk for %d\n"
msgstr "bd wewntrzny; nie mona znale dup_blk dla %d\n"
-#: e2fsck/pass1b.c:731
+#: e2fsck/pass1b.c:734
msgid "returned from clone_file_block"
msgstr "powrt z clone_file_block"
-#: e2fsck/pass1.c:297
+#: e2fsck/pass1.c:298
msgid "in-use inode map"
msgstr "mapa uywanych i-wzw"
-#: e2fsck/pass1.c:306
+#: e2fsck/pass1.c:307
msgid "directory inode map"
msgstr "mapa i-wzw katalogw"
-#: e2fsck/pass1.c:314
+#: e2fsck/pass1.c:315
msgid "regular file inode map"
msgstr "mapa i-wzw zwykych plikw"
-#: e2fsck/pass1.c:321
+#: e2fsck/pass1.c:322
msgid "in-use block map"
msgstr "mapa uywanych blokw"
-#: e2fsck/pass1.c:368
+#: e2fsck/pass1.c:369
msgid "doing inode scan"
msgstr "przeszukiwania i-wzw"
-#: e2fsck/pass1.c:751
+#: e2fsck/pass1.c:752
msgid "Pass 1"
msgstr "Przebieg 1"
-#: e2fsck/pass1.c:810
+#: e2fsck/pass1.c:811
#, c-format
msgid "reading indirect blocks of inode %u"
msgstr "odczytu nie bezporednich blokw i-wza %u"
-#: e2fsck/pass1.c:852
+#: e2fsck/pass1.c:853
msgid "bad inode map"
msgstr "bdna mapa i-wzw"
-#: e2fsck/pass1.c:874
+#: e2fsck/pass1.c:875
msgid "inode in bad block map"
msgstr "i-wze w mapie wadliwych blokw"
-#: e2fsck/pass1.c:894
+#: e2fsck/pass1.c:895
msgid "imagic inode map"
msgstr "mapa i-wzw imagic"
-#: e2fsck/pass1.c:921
+#: e2fsck/pass1.c:922
msgid "multiply claimed block map"
msgstr "wielokrotnie zadeklarowana mapa blokw"
-#: e2fsck/pass1.c:1020
+#: e2fsck/pass1.c:1021
msgid "ext attr block map"
msgstr "mapa blokw rozszerzonych atrybutw"
-#: e2fsck/pass1.c:1782
+#: e2fsck/pass1.c:1783
msgid "block bitmap"
msgstr "bitmapa blokw"
-#: e2fsck/pass1.c:1786
+#: e2fsck/pass1.c:1787
msgid "inode bitmap"
msgstr "bitmapa i-wzw"
-#: e2fsck/pass1.c:1790
+#: e2fsck/pass1.c:1791
msgid "inode table"
msgstr "tablica i-wzw"
-#: e2fsck/pass2.c:293
+#: e2fsck/pass2.c:294
msgid "Pass 2"
msgstr "Przebieg 2"
@@ -693,7 +698,8 @@ msgstr "@S ma bdn kronik ext3 (@i %i).\n"
#: e2fsck/problem.c:190
msgid "External @j has multiple @f users (unsupported).\n"
-msgstr "Zewntrzna @j ma wielu uytkownikw systemu plikw (nie obsugiwane).\n"
+msgstr ""
+"Zewntrzna @j ma wielu uytkownikw systemu plikw (nie obsugiwane).\n"
#: e2fsck/problem.c:195
msgid "Can't find external @j\n"
@@ -710,7 +716,8 @@ msgstr "Zewntrzna @j nie obsuguje tego systemu plikw\n"
#: e2fsck/problem.c:210
msgid ""
"Ext3 @j @S is unknown type %N (unsupported).\n"
-"It is likely that your copy of e2fsck is old and/or doesn't support this @j format.\n"
+"It is likely that your copy of e2fsck is old and/or doesn't support this @j "
+"format.\n"
"It is also possible the @j @S is corrupt.\n"
msgstr ""
"@S kroniki ext3 ma nieznany typ %N (nie obsugiwany).\n"
@@ -908,7 +915,8 @@ msgstr "Podwjny lub wadliwy @b jest uywany!\n"
#: e2fsck/problem.c:425
msgid "Bad @b %b used as bad @b @i indirect @b. "
-msgstr "Wadliwy @b %b jest uywany jako niebiezporedni @b i-w꼳a z wadliwym @biem. "
+msgstr ""
+"Wadliwy @b %b jest uywany jako niebiezporedni @b i-w꼳a z wadliwym @biem. "
#: e2fsck/problem.c:430
msgid ""
@@ -1009,11 +1017,13 @@ msgstr "Bd podczas iteracji po @bach w i-wle %i: %m\n"
#: e2fsck/problem.c:537
msgid "Error storing @i count information (@i=%i, count=%N): %m\n"
-msgstr "Bd podczas zapisu informacji o liczbie i-wzw (@i=%i, liczba=%N): %m\n"
+msgstr ""
+"Bd podczas zapisu informacji o liczbie i-wzw (@i=%i, liczba=%N): %m\n"
#: e2fsck/problem.c:542
msgid "Error storing @d @b information (@i=%i, @b=%b, num=%N): %m\n"
-msgstr "Bd podczas zapisu informacji o @dch @bach (@i=%i, @b=%b, liczba=%N): %m\n"
+msgstr ""
+"Bd podczas zapisu informacji o @dch @bach (@i=%i, @b=%b, liczba=%N): %m\n"
#: e2fsck/problem.c:548
#, c-format
@@ -1084,7 +1094,8 @@ msgstr "Bd podczas przydzielania @bu rozszerzonych atrybutw %b. "
#: e2fsck/problem.c:643
msgid "@a @b %b is corrupt (allocation collision). "
-msgstr "@b rozszerzonych atrybutw %b jest uszkodzony (kolizja przydzielania). "
+msgstr ""
+"@b rozszerzonych atrybutw %b jest uszkodzony (kolizja przydzielania). "
#: e2fsck/problem.c:648
msgid "@a @b %b is corrupt (invalid name). "
@@ -1114,7 +1125,8 @@ msgstr "@b #%B (%b) powoduje, e dowizanie jest zbyt due. "
#: e2fsck/problem.c:677
#, c-format
msgid "@i %i has INDEX_FL flag set on @f without htree support.\n"
-msgstr "@i %i ma ustawion flag INDEX_FL na systemie plikw bez obsugi htree.\n"
+msgstr ""
+"@i %i ma ustawion flag INDEX_FL na systemie plikw bez obsugi htree.\n"
#: e2fsck/problem.c:682
#, c-format
@@ -1177,11 +1189,15 @@ msgstr "Bd podczas iteracji po @bach w i-wle %i (%s): %m\n"
#: e2fsck/problem.c:751 e2fsck/problem.c:1072
msgid "Error addjusting refcount for @a @b %b (@i %i): %m\n"
-msgstr "Bd podczas poprawiania refcount dla @bu rozszerzonych atrybutw %b (@i %i): %m\n"
+msgstr ""
+"Bd podczas poprawiania refcount dla @bu rozszerzonych atrybutw %b (@i %"
+"i): %m\n"
#: e2fsck/problem.c:757
msgid "Pass 1C: Scan directories for @is with dup @bs.\n"
-msgstr "Przebieg 1C: Przeszukiwanie katalogw pod ktem i-wzw z podwjnymi @bami.\n"
+msgstr ""
+"Przebieg 1C: Przeszukiwanie katalogw pod ktem i-wzw z podwjnymi "
+"@bami.\n"
#: e2fsck/problem.c:763
msgid "Pass 1D: Reconciling duplicate @bs\n"
@@ -1461,7 +1477,8 @@ msgstr "@p i-wle @du HTREE %d: wze (%B) ma bdny licznik (%N)\n"
#: e2fsck/problem.c:1092
msgid "@p @h %d: node (%B) has an unordered hash table\n"
-msgstr "@p i-wle @du HTREE %d: wze (%B) ma nie uporzdkowan tablic haszujc\n"
+msgstr ""
+"@p i-wle @du HTREE %d: wze (%B) ma nie uporzdkowan tablic haszujc\n"
#: e2fsck/problem.c:1097
msgid "@p @h %d: node (%B) has bad depth\n"
@@ -1680,8 +1697,12 @@ msgid "Free @bs count wrong (%b, counted=%c).\n"
msgstr "Bdna liczba wolnych @bw (%b, naliczono %c).\n"
#: e2fsck/problem.c:1382
-msgid "PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B endpoints (%i, %j)\n"
-msgstr "BD PROGRAMU: koce bitmap systemu plikw (#%N) (%b, %c) nie zgadzaj si z policzonymi kocami bitmap (%i, %j)\n"
+msgid ""
+"PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B "
+"endpoints (%i, %j)\n"
+msgstr ""
+"BD PROGRAMU: koce bitmap systemu plikw (#%N) (%b, %c) nie zgadzaj si z "
+"policzonymi kocami bitmap (%i, %j)\n"
#: e2fsck/problem.c:1388
msgid "Internal error: fudging end of bitmap (%N)\n"
@@ -1692,7 +1713,7 @@ msgstr "Bd wewntrzny: faszywy koniec bitmapy (%N)\n"
msgid "Unhandled error code (0x%x)!\n"
msgstr "Nie obsuony kod bdu (0x%x)!\n"
-#: e2fsck/problem.c:1594
+#: e2fsck/problem.c:1595
msgid "IGNORED"
msgstr "ZIGNOROWANO"
@@ -1755,6 +1776,7 @@ msgid "while writing inode table (group %d)"
msgstr "podczas zapisu tablicy i-wzw (grupy %d)"
#: e2fsck/swapfs.c:222
+#, c-format
msgid "Pass 0: Doing byte-swap of filesystem\n"
msgstr "Przebieg 0: Wykonywanie zamiany bajtw systemu plikw\n"
@@ -1771,7 +1793,7 @@ msgstr ""
msgid "Byte swap"
msgstr "Zamiana bajtw"
-#: e2fsck/unix.c:67
+#: e2fsck/unix.c:74
#, c-format
msgid ""
"Usage: %s [-panyrcdfvstDFSV] [-b superblock] [-B blocksize]\n"
@@ -1784,14 +1806,16 @@ msgstr ""
"\t\t[-l|-L plik_wadliwych_blokw] [-C fd] [-j zewn-kronika]\n"
"\t\t[-E rozszerzone-opcje] urzdzenie\n"
-#: e2fsck/unix.c:73
+#: e2fsck/unix.c:80
+#, c-format
msgid ""
"\n"
"Emergency help:\n"
" -p Automatic repair (no questions)\n"
" -n Make no changes to the filesystem\n"
" -y Assume \"yes\" to all questions\n"
-" -c Check for bad blocks and add them to the badblock list\n"
+" -c Check for bad blocks and add them to the badblock "
+"list\n"
" -f Force checking even if filesystem is marked clean\n"
msgstr ""
"\n"
@@ -1800,9 +1824,11 @@ msgstr ""
" -n Nie wykonywanie zmian w systemie plikw\n"
" -y Przyjcie odpowiedzi \"tak\" na wszystkie pytania\n"
" -c Szukanie wadliwych blokw i dodanie ich do listy\n"
-" -f Wymuszenie sprawdzenia nawet \"czystego\" systemu plikw\n"
+" -f Wymuszenie sprawdzenia nawet \"czystego\" systemu "
+"plikw\n"
-#: e2fsck/unix.c:79
+#: e2fsck/unix.c:86
+#, c-format
msgid ""
" -v Be verbose\n"
" -b superblock Use alternative superblock\n"
@@ -1813,178 +1839,39 @@ msgid ""
msgstr ""
" -v Pokazywanie wikszej iloci informacji\n"
" -b superblok Uycie innego superbloku\n"
-" -B rozm.bloku Wymuszenie rozmiaru bloku przy poszukiwaniu superbloku\n"
+" -B rozm.bloku Wymuszenie rozmiaru bloku przy poszukiwaniu "
+"superbloku\n"
" -j zewn-kronika Ustawienie pooenia zewntrznej kroniki\n"
" -l plik_zych_blokw Dodanie do listy wadliwych blokw\n"
" -L plik_zych_blokw Ustawienie listy wadliwych blokw\n"
-#: e2fsck/unix.c:113
+#: e2fsck/unix.c:120
#, c-format
msgid "%s: %d/%d files (%0d.%d%% non-contiguous), %d/%d blocks\n"
msgstr "%s: %d/%d plikw (%0d.%d%% niecigych), %d/%d blokw\n"
-#: e2fsck/unix.c:119
-#, c-format
-msgid ""
-"\n"
-"%8d inode used (%d%%)\n"
-msgid_plural ""
-"\n"
-"%8d inodes used (%d%%)\n"
-msgstr[0] ""
-"\n"
-"%8d uyty i-wze (%d%%)\n"
-msgstr[1] ""
-"\n"
-"%8d uyte i-wzy (%d%%)\n"
-msgstr[2] ""
-"\n"
-"%8d uytych i-wzw (%d%%)\n"
-
-#: e2fsck/unix.c:121
-#, c-format
-msgid "%8d non-contiguous inode (%0d.%d%%)\n"
-msgid_plural "%8d non-contiguous inodes (%0d.%d%%)\n"
-msgstr[0] "%8d niecigy i-wze (%0d.%d%%)\n"
-msgstr[1] "%8d niecige i-wzy (%0d.%d%%)\n"
-msgstr[2] "%8d niecigych i-wzw (%0d.%d%%)\n"
-
-#: e2fsck/unix.c:125
+#: e2fsck/unix.c:132
#, c-format
msgid " # of inodes with ind/dind/tind blocks: %d/%d/%d\n"
msgstr " liczba i-wzw z blokami ind/dind/tind: %d/%d/%d\n"
-#: e2fsck/unix.c:127
-#, c-format
-msgid "%8d block used (%d%%)\n"
-msgid_plural "%8d blocks used (%d%%)\n"
-msgstr[0] "%8d uyty blok (%d%%)\n"
-msgstr[1] "%8d uyte bloki (%d%%)\n"
-msgstr[2] "%8d uytych blokw (%d%%)\n"
-
-#: e2fsck/unix.c:130
-#, c-format
-msgid "%8d bad block\n"
-msgid_plural "%8d bad blocks\n"
-msgstr[0] "%8d wadliwy blok\n"
-msgstr[1] "%8d wadliwe bloki\n"
-msgstr[2] "%8d wadliwych blokw\n"
-
-#: e2fsck/unix.c:132
-#, c-format
-msgid "%8d large file\n"
-msgid_plural "%8d large files\n"
-msgstr[0] "%8d duy plik\n"
-msgstr[1] "%8d due pliki\n"
-msgstr[2] "%8d duych plikw\n"
-
-#: e2fsck/unix.c:134
-#, c-format
-msgid ""
-"\n"
-"%8d regular file\n"
-msgid_plural ""
-"\n"
-"%8d regular files\n"
-msgstr[0] ""
-"\n"
-"%8d zwyky plik\n"
-msgstr[1] ""
-"\n"
-"%8d zwyke pliki\n"
-msgstr[2] ""
-"\n"
-"%8d zwykych plikw\n"
-
-#: e2fsck/unix.c:136
-#, c-format
-msgid "%8d directory\n"
-msgid_plural "%8d directories\n"
-msgstr[0] "%8d katalog\n"
-msgstr[1] "%8d katalogi\n"
-msgstr[2] "%8d katalogw\n"
-
-#: e2fsck/unix.c:138
-#, c-format
-msgid "%8d character device file\n"
-msgid_plural "%8d character device files\n"
-msgstr[0] "%8d plik urzdzenia znakowego\n"
-msgstr[1] "%8d pliki urzdze znakowych\n"
-msgstr[2] "%8d plikw urzdze znakowych\n"
-
-#: e2fsck/unix.c:141
-#, c-format
-msgid "%8d block device file\n"
-msgid_plural "%8d block device files\n"
-msgstr[0] "%8d plik urzdzenia blokowego\n"
-msgstr[1] "%8d pliki urzdze blokowych\n"
-msgstr[2] "%8d plikw urzdze blokowych\n"
-
-#: e2fsck/unix.c:143
-#, c-format
-msgid "%8d fifo\n"
-msgid_plural "%8d fifos\n"
-msgstr[0] "%d potok nazwany\n"
-msgstr[1] "%d potoki nazwane\n"
-msgstr[2] "%d potokw nazwanych\n"
-
-#: e2fsck/unix.c:145
-#, c-format
-msgid "%8d link\n"
-msgid_plural "%8d links\n"
-msgstr[0] "%8d dowizanie\n"
-msgstr[1] "%8d dowizania\n"
-msgstr[2] "%8d dowiza\n"
-
-#: e2fsck/unix.c:148
-#, c-format
-msgid "%8d symbolic link"
-msgid_plural "%8d symbolic links"
-msgstr[0] "%8d dowizanie symboliczne"
-msgstr[1] "%8d dowizania symboliczne"
-msgstr[2] "%8d dowiza symbolicznych"
-
-#: e2fsck/unix.c:150
-#, c-format
-msgid " (%d fast symbolic link)\n"
-msgid_plural " (%d fast symbolic links)\n"
-msgstr[0] " (%d szybkie dowizanie symboliczne)\n"
-msgstr[1] " (%d szybkie dowizania symboliczne)\n"
-msgstr[2] " (%d szybkich dowiza symbolicznych)\n"
-
-#: e2fsck/unix.c:152
-#, c-format
-msgid "%8d socket\n"
-msgid_plural "%8d sockets\n"
-msgstr[0] "%8d gniazdo\n"
-msgstr[1] "%8d gniazda\n"
-msgstr[2] "%8d gniazd\n"
-
-#: e2fsck/unix.c:155
-#, c-format
-msgid "%8d file\n"
-msgid_plural "%8d files\n"
-msgstr[0] "%8d plik\n"
-msgstr[1] "%8d pliki\n"
-msgstr[2] "%8d plikw\n"
-
-#: e2fsck/unix.c:169 misc/badblocks.c:781 misc/tune2fs.c:773 misc/util.c:145
+#: e2fsck/unix.c:176 misc/badblocks.c:781 misc/tune2fs.c:791 misc/util.c:151
#: resize/main.c:97
#, c-format
msgid "while determining whether %s is mounted."
msgstr "podczas sprawdzania, czy %s jest podmontowany."
-#: e2fsck/unix.c:184
+#: e2fsck/unix.c:191
#, c-format
msgid "Warning! %s is mounted.\n"
msgstr "Uwaga! %s jest podmontowany.\n"
-#: e2fsck/unix.c:188
+#: e2fsck/unix.c:195
#, c-format
msgid "%s is mounted. "
msgstr "%s jest podmontowany. "
-#: e2fsck/unix.c:190
+#: e2fsck/unix.c:197
msgid ""
"Cannot continue, aborting.\n"
"\n"
@@ -1992,7 +1879,8 @@ msgstr ""
"Nie mona kontynuowa, przerwano.\n"
"\n"
-#: e2fsck/unix.c:191
+#: e2fsck/unix.c:198
+#, c-format
msgid ""
"\n"
"\n"
@@ -2006,60 +1894,63 @@ msgstr ""
"moe spowodowa POWANE uszkodzenie systemu plikw.\n"
"\n"
-#: e2fsck/unix.c:194
+#: e2fsck/unix.c:201
msgid "Do you really want to continue"
msgstr "Naprawd kontynuowa?"
-#: e2fsck/unix.c:196
+#: e2fsck/unix.c:203
+#, c-format
msgid "check aborted.\n"
msgstr "sprawdzanie przerwane.\n"
-#: e2fsck/unix.c:245
+#: e2fsck/unix.c:264
msgid " contains a file system with errors"
msgstr " zawiera system plikw z bdami"
-#: e2fsck/unix.c:247
+#: e2fsck/unix.c:266
msgid " was not cleanly unmounted"
msgstr " nie by czysto odmontowany"
-#: e2fsck/unix.c:251
+#: e2fsck/unix.c:270
#, c-format
msgid " has been mounted %u times without being checked"
msgstr " by montowany %u razy bez sprawdzania"
-#: e2fsck/unix.c:259
+#: e2fsck/unix.c:278
#, c-format
msgid " has gone %u days without being checked"
msgstr " przetrwa %u dni bez sprawdzania"
-#: e2fsck/unix.c:268
+#: e2fsck/unix.c:287
msgid ", check forced.\n"
msgstr ", wymuszono sprawdzenie.\n"
-#: e2fsck/unix.c:271
+#: e2fsck/unix.c:290
#, c-format
msgid "%s: clean, %d/%d files, %d/%d blocks"
msgstr "%s: czysty, %d/%d plikw, %d/%d blokw"
-#: e2fsck/unix.c:286
+#: e2fsck/unix.c:306
msgid " (check after next mount)"
msgstr " (sprawdzenie po nastpnym montowaniu)"
-#: e2fsck/unix.c:288
+#: e2fsck/unix.c:308
#, c-format
msgid " (check in %ld mounts)"
msgstr "(sprawdzenie za %ld montowa)"
-#: e2fsck/unix.c:430
+#: e2fsck/unix.c:450
#, c-format
msgid "ERROR: Couldn't open /dev/null (%s)\n"
msgstr "BD: Nie mona otworzy /dev/null (%s)\n"
-#: e2fsck/unix.c:501
+#: e2fsck/unix.c:521
+#, c-format
msgid "Invalid EA version.\n"
msgstr "Bdna wersja EA.\n"
-#: e2fsck/unix.c:510
+#: e2fsck/unix.c:532
+#, c-format
msgid ""
"Extended options are separated by commas, and may take an argument which\n"
"is set off by an equals ('=') sign. Valid raid options are:\n"
@@ -2071,71 +1962,77 @@ msgstr ""
"\tea_ver=<wersja_ea> (1 lub 2)\n"
"\n"
-#: e2fsck/unix.c:568
+#: e2fsck/unix.c:590
#, c-format
msgid "Error validating file descriptor %d: %s\n"
msgstr "Bd podczas kontroli deskryptora pliku %d: %s\n"
-#: e2fsck/unix.c:572
+#: e2fsck/unix.c:594
msgid "Invalid completion information file descriptor"
msgstr "Bdne informacje dopeniajce deskryptora plikw"
-#: e2fsck/unix.c:587
+#: e2fsck/unix.c:609
msgid "Only one the options -p/-a, -n or -y may be specified."
msgstr "Mona poda tylko opcje -p/-a, -n lub -y."
-#: e2fsck/unix.c:608
+#: e2fsck/unix.c:630
+#, c-format
msgid "The -t option is not supported on this version of e2fsck.\n"
msgstr "Opcja -t nie jest obsugiwana przez t wersj e2fsck.\n"
-#: e2fsck/unix.c:673
+#: e2fsck/unix.c:695
+#, c-format
msgid "Byte-swapping filesystems not compiled in this version of e2fsck\n"
msgstr "Zamiana bajtw systemu plikw nie wkompilowana w t wersj e2fsck\n"
-#: e2fsck/unix.c:690 misc/tune2fs.c:444 misc/tune2fs.c:699 misc/tune2fs.c:716
+#: e2fsck/unix.c:718 misc/tune2fs.c:458 misc/tune2fs.c:716 misc/tune2fs.c:733
#, c-format
msgid "Unable to resolve '%s'"
msgstr "Nie udao si rozwiza '%s'"
-#: e2fsck/unix.c:716
+#: e2fsck/unix.c:744
+#, c-format
msgid "Incompatible options not allowed when byte-swapping.\n"
msgstr "Niekompatybilne opcje nie s dozwolone przy zamianie bajtw.\n"
-#: e2fsck/unix.c:723
+#: e2fsck/unix.c:751
+#, c-format
msgid "The -c and the -l/-L options may not be both used at the same time.\n"
msgstr "Opcje -c oraz -l/-L nie mog by podane jednoczenie.\n"
-#: e2fsck/unix.c:801
+#: e2fsck/unix.c:829
+#, c-format
msgid "Error: ext2fs library version out of date!\n"
msgstr "Bd: wersja biblioteki ext2fs jest za stara!\n"
-#: e2fsck/unix.c:809
+#: e2fsck/unix.c:837
msgid "while trying to initialize program"
msgstr "podczas prby inicjalizacji programu"
-#: e2fsck/unix.c:823
+#: e2fsck/unix.c:851
#, c-format
msgid "\tUsing %s, %s\n"
msgstr "\tUywane %s, %s\n"
-#: e2fsck/unix.c:835
+#: e2fsck/unix.c:863
msgid "need terminal for interactive repairs"
msgstr "interaktywna naprawa wymaga terminala"
-#: e2fsck/unix.c:871
+#: e2fsck/unix.c:905
#, c-format
msgid "%s trying backup blocks...\n"
msgstr "%s podczas prby wykonania kopii zapasowej blokw...\n"
-#: e2fsck/unix.c:872
+#: e2fsck/unix.c:906
msgid "Couldn't find ext2 superblock,"
msgstr "Nie znaleziono superbloku ext2,"
-#: e2fsck/unix.c:873
+#: e2fsck/unix.c:907
msgid "Group descriptors look bad..."
msgstr "Deskryptory grup wygldaj le..."
-#: e2fsck/unix.c:884
+#: e2fsck/unix.c:918
+#, c-format
msgid ""
"The filesystem revision is apparently too high for this version of e2fsck.\n"
"(Or the filesystem superblock is corrupt)\n"
@@ -2145,20 +2042,23 @@ msgstr ""
"(lub superblok systemu plikw jest uszkodzony)\n"
"\n"
-#: e2fsck/unix.c:890
+#: e2fsck/unix.c:924
+#, c-format
msgid "Could this be a zero-length partition?\n"
msgstr "Czy to moe jest partycja zerowej dugoci?\n"
-#: e2fsck/unix.c:892
+#: e2fsck/unix.c:926
#, c-format
msgid "You must have %s access to the filesystem or be root\n"
msgstr "Trzeba mie dostp %s do systemu plikw lub by rootem\n"
-#: e2fsck/unix.c:897
+#: e2fsck/unix.c:931
+#, c-format
msgid "Possibly non-existent or swap device?\n"
msgstr "Zapewne nie istniejce urzdzenie lub swap?\n"
-#: e2fsck/unix.c:900
+#: e2fsck/unix.c:934
+#, c-format
msgid ""
"Disk write-protected; use the -n option to do a read-only\n"
"check of the device.\n"
@@ -2166,36 +2066,39 @@ msgstr ""
"Dysk zabezpieczony przed zapisem; mona uy opcji -n aby sprawdzi\n"
"urzdzenie w trybie tylko do odczytu.\n"
-#: e2fsck/unix.c:916
+#: e2fsck/unix.c:950
msgid "Get a newer version of e2fsck!"
msgstr "Potrzeba nowszej wersji e2fsck!"
-#: e2fsck/unix.c:937
+#: e2fsck/unix.c:971
#, c-format
msgid "while checking ext3 journal for %s"
msgstr "podczas sprawdzania kroniki ext3 dla %s"
-#: e2fsck/unix.c:948
-msgid "Warning: skipping journal recovery because doing a read-only filesystem check.\n"
+#: e2fsck/unix.c:982
+#, c-format
+msgid ""
+"Warning: skipping journal recovery because doing a read-only filesystem "
+"check.\n"
msgstr ""
"Uwaga: pominito odtwarzanie z kroniki z powodu sprawdzania w trybie tylko\n"
"do odczytu.\n"
-#: e2fsck/unix.c:961
+#: e2fsck/unix.c:995
#, c-format
msgid "unable to set superblock flags on %s\n"
msgstr "nie mona ustawi flag superbloku na %s\n"
-#: e2fsck/unix.c:967
+#: e2fsck/unix.c:1001
#, c-format
msgid "while recovering ext3 journal of %s"
msgstr "podczas odtwarzania z kroniki ext3 dla %s"
-#: e2fsck/unix.c:996
+#: e2fsck/unix.c:1030
msgid "Warning: compression support is experimental.\n"
msgstr "Uwaga: obsuga kompresji jest eksperymentalna.\n"
-#: e2fsck/unix.c:1001
+#: e2fsck/unix.c:1035
#, c-format
msgid ""
"E2fsck not compiled with HTREE support,\n"
@@ -2204,37 +2107,39 @@ msgstr ""
"E2fsck skompilowany bez obsugi HTREE,\n"
"\tale system plikw %s ma katalogi HTREE.\n"
-#: e2fsck/unix.c:1044
+#: e2fsck/unix.c:1078
#, c-format
msgid "%s: Filesystem byte order already normalized.\n"
msgstr "%s: kolejno bajtw w systemie plikw ju znormalizowana.\n"
-#: e2fsck/unix.c:1064
+#: e2fsck/unix.c:1098
msgid "while reading bad blocks inode"
msgstr "podczas odczytu i-wza wadliwych blokw"
-#: e2fsck/unix.c:1066
+#: e2fsck/unix.c:1100
+#, c-format
msgid "This doesn't bode well, but we'll try to go on...\n"
msgstr "Nie wry to dobrze, ale sprbuj kontynuowa...\n"
-#: e2fsck/unix.c:1073
+#: e2fsck/unix.c:1107
+#, c-format
msgid "Restarting e2fsck from the beginning...\n"
msgstr "Restart e2fsck od pocztku...\n"
-#: e2fsck/unix.c:1077
+#: e2fsck/unix.c:1111
msgid "while resetting context"
msgstr "podczas resetowania kontekstu"
-#: e2fsck/unix.c:1084
+#: e2fsck/unix.c:1118
#, c-format
msgid "%s: e2fsck canceled.\n"
msgstr "%s: e2fsck przerwany.\n"
-#: e2fsck/unix.c:1089
+#: e2fsck/unix.c:1123
msgid "aborted"
msgstr "przerwano"
-#: e2fsck/unix.c:1097
+#: e2fsck/unix.c:1131
#, c-format
msgid ""
"\n"
@@ -2243,12 +2148,12 @@ msgstr ""
"\n"
"%s: ***** SYSTEM PLIKW ZMODYFIKOWANY *****\n"
-#: e2fsck/unix.c:1100
+#: e2fsck/unix.c:1134
#, c-format
msgid "%s: ***** REBOOT LINUX *****\n"
msgstr "%s: ***** WYMAGANY RESTART LINUKSA *****\n"
-#: e2fsck/unix.c:1106
+#: e2fsck/unix.c:1140
#, c-format
msgid ""
"\n"
@@ -2400,11 +2305,13 @@ msgstr "zakoczone \n"
#, c-format
msgid ""
"Usage: %s [-b block_size] [-i input_file] [-o output_file] [-svwnf]\n"
-" [-c blocks_at_once] [-p num_passes] [-t test_pattern [-t test_pattern [...]]]\n"
+" [-c blocks_at_once] [-p num_passes] [-t test_pattern [-t test_pattern "
+"[...]]]\n"
" device [last_block [start_block]]\n"
msgstr ""
"Skadnia: %s [-b rozm_bloku] [-i plik_wej] [-o plik_wyj] [-svwnf]\n"
-" [-c blokw_naraz] [-p przebiegw] [-t wzr_testowy [-t wzr_testowy [...]]]\n"
+" [-c blokw_naraz] [-p przebiegw] [-t wzr_testowy [-t wzr_testowy "
+"[...]]]\n"
" urzdzenie [ostatni_blok [pocztek]]\n"
#: misc/badblocks.c:227
@@ -2484,7 +2391,7 @@ msgstr ""
msgid "during test data write, block %lu"
msgstr "podczas zapisu testowych danych, blok %lu"
-#: misc/badblocks.c:788 misc/util.c:152
+#: misc/badblocks.c:788 misc/util.c:158
#, c-format
msgid "%s is mounted; "
msgstr "%s jest podmontowany; "
@@ -2497,7 +2404,7 @@ msgstr "badblocks wymuszone mimo to. Mam nadziej, e /etc/mtab si myli.\n"
msgid "it's not safe to run badblocks!\n"
msgstr "nie jest bezpiecznie uruchamia badblocks!\n"
-#: misc/badblocks.c:853 misc/mke2fs.c:898
+#: misc/badblocks.c:853 misc/mke2fs.c:926
#, c-format
msgid "bad block size - %s"
msgstr "rozmiar wadliwego bloku - %s"
@@ -2532,7 +2439,7 @@ msgstr ""
msgid "while trying to determine device size"
msgstr "podczas prby okrelenia rozmiaru urzdzenia"
-#: misc/badblocks.c:972 misc/mke2fs.c:1071
+#: misc/badblocks.c:972 misc/mke2fs.c:1099
#, c-format
msgid "bad blocks count - %s"
msgstr "liczba wadliwych blokw - %s"
@@ -2604,11 +2511,11 @@ msgstr "podczas ustawiania wersji %s"
msgid "Couldn't allocate path variable in chattr_dir_proc"
msgstr "Nie mona przydzieli zmiennej path w chattr_dir_proc"
-#: misc/chattr.c:287
+#: misc/chattr.c:291
msgid "= is incompatible with - and +\n"
msgstr "= jest niekompatybilne z - i +\n"
-#: misc/chattr.c:295
+#: misc/chattr.c:299
msgid "Must use '-v', =, - or +\n"
msgstr "Trzeba uy '-v', =, - lub +\n"
@@ -2636,10 +2543,12 @@ msgid "Backup"
msgstr "Zapasowy"
#: misc/dumpe2fs.c:130
+#, c-format
msgid ", Group descriptors at "
msgstr ", Deskryptory grup pod "
#: misc/dumpe2fs.c:135
+#, c-format
msgid " Group descriptor at "
msgstr ", Deskryptory grup pod "
@@ -2685,7 +2594,7 @@ msgstr "podczas wypisywania listy wadliwych blokw"
msgid "Bad blocks: %d"
msgstr "Wadliwe bloki: %d"
-#: misc/dumpe2fs.c:227 misc/tune2fs.c:150
+#: misc/dumpe2fs.c:227 misc/tune2fs.c:153
msgid "while reading journal superblock"
msgstr "podczas odczytu superbloku kroniki"
@@ -2712,16 +2621,18 @@ msgstr ""
"Pocztek kroniki: %d\n"
"Liczba uytkownikw kroniki: %d\n"
-#: misc/dumpe2fs.c:307 misc/mke2fs.c:1085
+#: misc/dumpe2fs.c:307 misc/mke2fs.c:1113
#, c-format
msgid "\tUsing %s\n"
msgstr "\tUywane %s\n"
-#: misc/dumpe2fs.c:334 misc/e2image.c:488 misc/tune2fs.c:760 resize/main.c:230
+#: misc/dumpe2fs.c:334 misc/e2image.c:566 misc/tune2fs.c:778 resize/main.c:234
+#, c-format
msgid "Couldn't find valid filesystem superblock.\n"
msgstr "Nie mona znale poprawnego superbloku systemu plikw.\n"
#: misc/dumpe2fs.c:345
+#, c-format
msgid "Note: This is a byte-swapped filesystem\n"
msgstr "Uwaga: to jest system plikw z zamienionymi bajtami\n"
@@ -2735,8 +2646,8 @@ msgstr ""
"%s: %s: bd podczas czytania bitmap: %s\n"
#: misc/e2image.c:50
-#, c-format
-msgid "Usage: %s [-r] device file\n"
+#, fuzzy, c-format
+msgid "Usage: %s [-r] device image_file\n"
msgstr "Skadnia: %s [-r] urzdzenie plik\n"
#: misc/e2image.c:61
@@ -2770,34 +2681,42 @@ msgid "e2label: cannot open %s\n"
msgstr "e2label: nie mona otworzy %s\n"
#: misc/e2label.c:62
+#, c-format
msgid "e2label: cannot seek to superblock\n"
msgstr "e2label: nie mona przej do superbloku\n"
#: misc/e2label.c:67
+#, c-format
msgid "e2label: error reading superblock\n"
msgstr "e2label: bd podczas odczytu superbloku\n"
#: misc/e2label.c:71
+#, c-format
msgid "e2label: not an ext2 filesystem\n"
msgstr "e2label: to nie jest system plikw ext2\n"
-#: misc/e2label.c:96 misc/tune2fs.c:867
+#: misc/e2label.c:96 misc/tune2fs.c:885
+#, c-format
msgid "Warning: label too long, truncating.\n"
msgstr "Uwaga: etykieta za duga, skrcono.\n"
#: misc/e2label.c:99
+#, c-format
msgid "e2label: cannot seek to superblock again\n"
msgstr "e2label: nie mona przej ponownie do superbloku\n"
#: misc/e2label.c:104
+#, c-format
msgid "e2label: error writing superblock\n"
msgstr "e2label: bd podczas zapisu superbloku\n"
-#: misc/e2label.c:116 misc/tune2fs.c:439
+#: misc/e2label.c:116 misc/tune2fs.c:450
+#, c-format
msgid "Usage: e2label device [newlabel]\n"
msgstr "Skadnia: e2label urzdzenie [nowa-etykieta]\n"
#: misc/findsuper.c:126
+#, c-format
msgid "Usage: findsuper device [skipbytes [startkb]]\n"
msgstr "Skadnia: findsuper urzdzenie [bajtw-do-pominicia [startkb]]\n"
@@ -2807,6 +2726,7 @@ msgid "skipbytes should be a number, not %s\n"
msgstr "bajtw-do-pominicia powinno by liczb, a nie %s\n"
#: misc/findsuper.c:137
+#, c-format
msgid "skipbytes must be a multiple of the sector size\n"
msgstr "bajtw-do-pominicia musi by wielokrotnoci rozmiaru sektora\n"
@@ -2826,6 +2746,7 @@ msgid "starting at %Ld, with %d byte increments\n"
msgstr "rozpoczto pod %Ld, z krokiem %d bajtw\n"
#: misc/findsuper.c:158
+#, c-format
msgid " thisoff block fs_blk_sz blksz grp last_mount\n"
msgstr " thisoff blok fs_blk_sz blksz grp last_mount\n"
@@ -2917,7 +2838,8 @@ msgstr "--oczekiwanie-- (przebieg %d)\n"
#: misc/fsck.c:1034
msgid "Usage: fsck [-ACNPRTV] [-t fstype] [fs-options] [filesys ...]\n"
-msgstr "Skadnia: fsck [-ACNPRTV] [-t rodzaj-fs] [opcje-fs] [system-plikw ...]\n"
+msgstr ""
+"Skadnia: fsck [-ACNPRTV] [-t rodzaj-fs] [opcje-fs] [system-plikw ...]\n"
#: misc/fsck.c:1076
#, c-format
@@ -2944,7 +2866,7 @@ msgstr "Podczas odczytu flag %s"
msgid "While reading version on %s"
msgstr "Podczas odczytu wersji %s"
-#: misc/mke2fs.c:91
+#: misc/mke2fs.c:92
#, c-format
msgid ""
"Usage: %s [-c|-t|-l filename] [-b block-size] [-f fragment-size]\n"
@@ -2959,35 +2881,35 @@ msgstr ""
"\t[-L etykieta-wolumenu] [-M ostatnio-mont.-katalog] [-O cecha[,...]]\n"
"\t[-r wersja-fs] [-R opcje-raid] [-qvSV] urzdzenie [liczba-blokw]\n"
-#: misc/mke2fs.c:235
+#: misc/mke2fs.c:264
#, c-format
msgid "Running command: %s\n"
msgstr "Uruchamianie polecenia: %s\n"
-#: misc/mke2fs.c:239
+#: misc/mke2fs.c:268
#, c-format
msgid "while trying run '%s'"
msgstr "podczas prby uruchomienia '%s'"
-#: misc/mke2fs.c:246
+#: misc/mke2fs.c:275
msgid "while processing list of bad blocks from program"
msgstr "podczas przetwarzania listy wadliwych blokw z programu"
-#: misc/mke2fs.c:273
+#: misc/mke2fs.c:302
#, c-format
msgid "Block %d in primary superblock/group descriptor area bad.\n"
msgstr "Wadliwy blok %d w gwnym superbloku/obszarze deskryptora grup.\n"
-#: misc/mke2fs.c:275
+#: misc/mke2fs.c:304
#, c-format
msgid "Blocks %d through %d must be good in order to build a filesystem.\n"
msgstr "Bloki od %d do %d musz by dobre, aby stworzy system plikw.\n"
-#: misc/mke2fs.c:278
+#: misc/mke2fs.c:307
msgid "Aborting....\n"
msgstr "Przerwano...\n"
-#: misc/mke2fs.c:298
+#: misc/mke2fs.c:327
#, c-format
msgid ""
"Warning: the backup superblock/group descriptors at block %d contain\n"
@@ -2998,23 +2920,23 @@ msgstr ""
"\twadliwe bloki.\n"
"\n"
-#: misc/mke2fs.c:316
+#: misc/mke2fs.c:345
msgid "while marking bad blocks as used"
msgstr "podczas zaznaczania wadliwych blokw jako uywane"
-#: misc/mke2fs.c:374
+#: misc/mke2fs.c:403
msgid "done \n"
msgstr "zakoczono \n"
-#: misc/mke2fs.c:409
+#: misc/mke2fs.c:438
msgid "while allocating zeroizing buffer"
msgstr "podczas przydzielania bufora zerujcego"
-#: misc/mke2fs.c:450
+#: misc/mke2fs.c:479
msgid "Writing inode tables: "
msgstr "Zapis tablicy i-wzw: "
-#: misc/mke2fs.c:461
+#: misc/mke2fs.c:490
#, c-format
msgid ""
"\n"
@@ -3023,67 +2945,67 @@ msgstr ""
"\n"
"Nie mona zapisa %d blokw w tablicy i-wzw poczwszy od %d: %s\n"
-#: misc/mke2fs.c:484
+#: misc/mke2fs.c:513
msgid "while creating root dir"
msgstr "podczas tworzenia gwnego katalogu"
-#: misc/mke2fs.c:491
+#: misc/mke2fs.c:520
msgid "while reading root inode"
msgstr "podczas odczytu gwnego i-wza"
-#: misc/mke2fs.c:500
+#: misc/mke2fs.c:529
msgid "while setting root inode ownership"
msgstr "podczas ustawiania waciciela gwnego i-wza"
-#: misc/mke2fs.c:518
+#: misc/mke2fs.c:547
msgid "while creating /lost+found"
msgstr "podczas tworzenia /lost+found"
-#: misc/mke2fs.c:525
+#: misc/mke2fs.c:554
msgid "while looking up /lost+found"
msgstr "podczas szukania /lost+found"
-#: misc/mke2fs.c:535
+#: misc/mke2fs.c:564
msgid "while expanding /lost+found"
msgstr "podczas rozszerzania /lost+found"
-#: misc/mke2fs.c:551
+#: misc/mke2fs.c:580
msgid "while setting bad block inode"
msgstr "podczas ustawiania i-wza wadliwych blokw"
-#: misc/mke2fs.c:583
+#: misc/mke2fs.c:612
#, c-format
msgid "Out of memory erasing sectors %d-%d\n"
msgstr "Brak pamici podczas czyszczenia sektorw %d-%d\n"
-#: misc/mke2fs.c:593
+#: misc/mke2fs.c:622
#, c-format
msgid "Warning: could not read block 0: %s\n"
msgstr "Uwaga: nie mona odczyta bloku 0: %s\n"
-#: misc/mke2fs.c:609
+#: misc/mke2fs.c:638
#, c-format
msgid "Warning: could not erase sector %d: %s\n"
msgstr "Uwaga: nie mona wyczyci sektora %d: %s\n"
-#: misc/mke2fs.c:625
+#: misc/mke2fs.c:654
msgid "while initializing journal superblock"
msgstr "podczas inicjalizacji superbloku kroniki"
-#: misc/mke2fs.c:631
+#: misc/mke2fs.c:660
msgid "Zeroing journal device: "
msgstr "Zerowanie urzdzenia kroniki: "
-#: misc/mke2fs.c:638
+#: misc/mke2fs.c:667
#, c-format
msgid "while zeroing journal device (block %u, count %d)"
msgstr "podczas zerowania urzdzenia kroniki (blok %u, liczba %d)"
-#: misc/mke2fs.c:649
+#: misc/mke2fs.c:678
msgid "while writing journal superblock"
msgstr "podczas zapisu superbloku kroniki"
-#: misc/mke2fs.c:664
+#: misc/mke2fs.c:693
#, c-format
msgid ""
"warning: %d blocks unused.\n"
@@ -3092,77 +3014,81 @@ msgstr ""
"uwaga: %d blokw nie uywanych.\n"
"\n"
-#: misc/mke2fs.c:669
+#: misc/mke2fs.c:698
#, c-format
msgid "Filesystem label=%s\n"
msgstr "Etykieta systemu plikw=%s\n"
-#: misc/mke2fs.c:670
+#: misc/mke2fs.c:699
msgid "OS type: "
msgstr "Typ OS: "
-#: misc/mke2fs.c:675
+#: misc/mke2fs.c:704
msgid "(unknown os)"
msgstr "(nieznany system)"
-#: misc/mke2fs.c:678
+#: misc/mke2fs.c:707
#, c-format
msgid "Block size=%u (log=%u)\n"
msgstr "Rozmiar bloku=%u (log=%u)\n"
-#: misc/mke2fs.c:680
+#: misc/mke2fs.c:709
#, c-format
msgid "Fragment size=%u (log=%u)\n"
msgstr "Rozmiar fragmentu=%u (log=%u)\n"
-#: misc/mke2fs.c:682
+#: misc/mke2fs.c:711
#, c-format
msgid "%u inodes, %u blocks\n"
msgstr "%u i-wzw, %u blokw\n"
-#: misc/mke2fs.c:684
+#: misc/mke2fs.c:713
#, c-format
msgid "%u blocks (%2.2f%%) reserved for the super user\n"
msgstr "%u blokw (%2.2f%%) zarezerwowanych dla superuytkownika\n"
-#: misc/mke2fs.c:687
+#: misc/mke2fs.c:716
#, c-format
msgid "First data block=%u\n"
msgstr "Pierwszy blok danych=%u\n"
-#: misc/mke2fs.c:689
+#: misc/mke2fs.c:718
#, c-format
msgid "%u block groups\n"
msgstr "%u grup blokw\n"
-#: misc/mke2fs.c:691
+#: misc/mke2fs.c:720
#, c-format
msgid "%u block group\n"
msgstr "%u grupa blokw\n"
-#: misc/mke2fs.c:692
+#: misc/mke2fs.c:721
#, c-format
msgid "%u blocks per group, %u fragments per group\n"
msgstr "%u blokw w grupie, %u fragmentw w grupie\n"
-#: misc/mke2fs.c:694
+#: misc/mke2fs.c:723
#, c-format
msgid "%u inodes per group\n"
msgstr "%u i-wzw w grupie\n"
-#: misc/mke2fs.c:701
+#: misc/mke2fs.c:730
+#, c-format
msgid "Superblock backups stored on blocks: "
msgstr "Kopie zapasowe superbloku zapisane w blokach: "
-#: misc/mke2fs.c:751
+#: misc/mke2fs.c:780
+#, c-format
msgid "Couldn't allocate memory to parse raid options!\n"
msgstr "Nie mona przydzieli pamici do analizy opcji raid!\n"
-#: misc/mke2fs.c:776
+#: misc/mke2fs.c:805
+#, c-format
msgid "Invalid stride parameter.\n"
msgstr "Bdny parametr stride.\n"
-#: misc/mke2fs.c:784
+#: misc/mke2fs.c:813
+#, c-format
msgid ""
"\n"
"Bad raid options specified.\n"
@@ -3184,81 +3110,85 @@ msgstr ""
"\tstride=<dugo stride w blokach>\n"
"\n"
-#: misc/mke2fs.c:902
+#: misc/mke2fs.c:930
#, c-format
msgid "Warning: blocksize %d not usable on most systems.\n"
msgstr "Uwaga: rozmiar bloku %d nie uywalny na wikszoci systemw.\n"
-#: misc/mke2fs.c:919
+#: misc/mke2fs.c:947
#, c-format
msgid "bad fragment size - %s"
msgstr "zy rozmiar fragmentu - %s"
-#: misc/mke2fs.c:925
+#: misc/mke2fs.c:953
+#, c-format
msgid "Warning: fragments not supported. Ignoring -f option\n"
msgstr "Uwaga: fragmenty nie obsugiwane. Opcja -f zignorowana\n"
-#: misc/mke2fs.c:932
+#: misc/mke2fs.c:960
msgid "Illegal number for blocks per group"
msgstr "Bdna liczba blokw w grupie"
-#: misc/mke2fs.c:937
+#: misc/mke2fs.c:965
msgid "blocks per group must be multiple of 8"
msgstr "liczba blokw w grupie musi by wielokrotnoci 8"
-#: misc/mke2fs.c:947
+#: misc/mke2fs.c:975
#, c-format
msgid "bad inode ratio %s (min %d/max %d"
msgstr "bdny stosunek i-wzw %s (min %d/max %d"
-#: misc/mke2fs.c:966
+#: misc/mke2fs.c:994
msgid "in malloc for bad_blocks_filename"
msgstr "w malloc dla bad_blocks_filename"
-#: misc/mke2fs.c:975
+#: misc/mke2fs.c:1003
#, c-format
msgid "bad reserved blocks percent - %s"
msgstr "bdny procent zarezerwowanych blokw - %s"
-#: misc/mke2fs.c:1007
+#: misc/mke2fs.c:1035
#, c-format
msgid "bad inode size - %s"
msgstr "bdny rozmiar i-wza - %s"
-#: misc/mke2fs.c:1043 misc/tune2fs.c:294
+#: misc/mke2fs.c:1071 misc/tune2fs.c:302
#, c-format
msgid "Invalid filesystem option set: %s\n"
msgstr "Ustawiona bdna opcja systemu plikw: %s\n"
-#: misc/mke2fs.c:1112 misc/mke2fs.c:1449
+#: misc/mke2fs.c:1140 misc/mke2fs.c:1477
#, c-format
msgid "while trying to open journal device %s\n"
msgstr "podczas prby otwarcia urzdzenia kroniki %s\n"
-#: misc/mke2fs.c:1118
+#: misc/mke2fs.c:1146
#, c-format
msgid "Journal dev blocksize (%d) smaller than minimum blocksize %d\n"
msgstr "Rozmiar bloku urzdzenia z kronik (%d) mniejszy od minimalnego %d\n"
-#: misc/mke2fs.c:1132
+#: misc/mke2fs.c:1160
#, c-format
msgid "%d-byte blocks too big for system (max %d)"
msgstr "%d-bajtowe bloki s zbyt due dla systemu (max %d)"
-#: misc/mke2fs.c:1136
+#: misc/mke2fs.c:1164
#, c-format
-msgid "Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
-msgstr "Uwaga: %d-bajtowe bloki s zbyt due dla systemu (max %d), wymuszono kontynuacj\n"
+msgid ""
+"Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
+msgstr ""
+"Uwaga: %d-bajtowe bloki s zbyt due dla systemu (max %d), wymuszono "
+"kontynuacj\n"
-#: misc/mke2fs.c:1161
+#: misc/mke2fs.c:1189
msgid "filesystem"
msgstr "system plikw"
-#: misc/mke2fs.c:1174 resize/main.c:264
+#: misc/mke2fs.c:1202 resize/main.c:268
msgid "while trying to determine filesystem size"
msgstr "podczas prby okrelenia rozmiaru systemu plikw"
-#: misc/mke2fs.c:1180
+#: misc/mke2fs.c:1208
msgid ""
"Couldn't determine device size; you must specify\n"
"the size of the filesystem\n"
@@ -3266,7 +3196,7 @@ msgstr ""
"Nie mona okreli rozmiaru urzdzenia; rozmiar systemu\n"
"plikw musi by podany\n"
-#: misc/mke2fs.c:1187
+#: misc/mke2fs.c:1215
msgid ""
"Device size reported to be zero. Invalid partition specified, or\n"
"\tpartition table wasn't reread after running fdisk, due to\n"
@@ -3278,56 +3208,56 @@ msgstr ""
"\tfdiska z powodu zajtej modyfikowanej partycji. Ponowny odczyt\n"
"\ttablicy partycji moe wymaga rebootu.\n"
-#: misc/mke2fs.c:1205
+#: misc/mke2fs.c:1233
msgid "Filesystem larger than apparent device size."
msgstr "System plikw wikszy od widocznego rozmiaru urzdzenia."
-#: misc/mke2fs.c:1227
+#: misc/mke2fs.c:1255
msgid "while trying to determine hardware sector size"
msgstr "podczas prby okrelenia rozmiaru sprztowego sektora"
-#: misc/mke2fs.c:1241
+#: misc/mke2fs.c:1269
msgid "blocks per group count out of range"
msgstr "liczba blokw w grupie spoza zakresu"
-#: misc/mke2fs.c:1251
+#: misc/mke2fs.c:1279
#, c-format
msgid "bad inode size %d (min %d/max %d)"
msgstr "bdny rozmiar i-wza %d (min %d/max %d)"
-#: misc/mke2fs.c:1257
+#: misc/mke2fs.c:1285
#, c-format
msgid "Warning: %d-byte inodes not usable on most systems\n"
msgstr "Uwaga: %d-bajtowe i-nody bd nie uywalne na wikszoci systemw\n"
-#: misc/mke2fs.c:1308
+#: misc/mke2fs.c:1336
msgid "while setting up superblock"
msgstr "podczas ustawiania superbloku"
-#: misc/mke2fs.c:1342
+#: misc/mke2fs.c:1370
#, c-format
msgid "unknown os - %s"
msgstr "nieznany os - %s"
-#: misc/mke2fs.c:1396
+#: misc/mke2fs.c:1424
msgid "while trying to allocate filesystem tables"
msgstr "podczas prby przydzielenia tablic systemu plikw"
-#: misc/mke2fs.c:1427
+#: misc/mke2fs.c:1455
#, c-format
msgid "while zeroing block %u at end of filesystem"
msgstr "podczas zerowania bloku %u na kocu systemu plikw"
-#: misc/mke2fs.c:1442 misc/tune2fs.c:376
+#: misc/mke2fs.c:1470 misc/tune2fs.c:387
msgid "journal"
msgstr "kronika"
-#: misc/mke2fs.c:1454
+#: misc/mke2fs.c:1482
#, c-format
msgid "Adding journal to device %s: "
msgstr "Dodano kronik do urzdzenia %s: "
-#: misc/mke2fs.c:1461
+#: misc/mke2fs.c:1489
#, c-format
msgid ""
"\n"
@@ -3336,16 +3266,17 @@ msgstr ""
"\n"
"\tpodczas prby dodania kroniki do urzdzenia %s"
-#: misc/mke2fs.c:1466 misc/mke2fs.c:1490 misc/tune2fs.c:404 misc/tune2fs.c:418
+#: misc/mke2fs.c:1494 misc/mke2fs.c:1518 misc/tune2fs.c:415 misc/tune2fs.c:429
+#, c-format
msgid "done\n"
msgstr "wykonano\n"
-#: misc/mke2fs.c:1478
+#: misc/mke2fs.c:1506
#, c-format
msgid "Creating journal (%d blocks): "
msgstr "Tworzenie kroniki (%d blokw): "
-#: misc/mke2fs.c:1486
+#: misc/mke2fs.c:1514
msgid ""
"\n"
"\twhile trying to create journal"
@@ -3353,11 +3284,13 @@ msgstr ""
"\n"
"\tpodczas prby utworzenia kroniki"
-#: misc/mke2fs.c:1495
+#: misc/mke2fs.c:1523
+#, c-format
msgid "Writing superblocks and filesystem accounting information: "
msgstr "Zapis superblokw i podsumowania systemu plikw: "
-#: misc/mke2fs.c:1500
+#: misc/mke2fs.c:1528
+#, c-format
msgid ""
"\n"
"Warning, had trouble writing out superblocks."
@@ -3365,7 +3298,8 @@ msgstr ""
"\n"
"Uwaga, problemy z zapisem superblokw."
-#: misc/mke2fs.c:1503
+#: misc/mke2fs.c:1531
+#, c-format
msgid ""
"done\n"
"\n"
@@ -3373,7 +3307,8 @@ msgstr ""
"wykonano\n"
"\n"
-#: misc/mklost+found.c:48
+#: misc/mklost+found.c:49
+#, c-format
msgid "Usage: mklost+found\n"
msgstr "Skadnia: mklost+found\n"
@@ -3409,11 +3344,11 @@ msgstr "ioctl HDIO_GETGEO"
msgid "BLKGETSIZE ioctl"
msgstr "ioctl BLKGETSIZE"
-#: misc/tune2fs.c:74
+#: misc/tune2fs.c:77
msgid "Please run e2fsck on the filesystem.\n"
msgstr "Prosz uruchomi e2fsck na systemie plikw.\n"
-#: misc/tune2fs.c:81
+#: misc/tune2fs.c:84
#, c-format
msgid ""
"Usage: %s [-c max-mounts-count] [-e errors-behavior] [-g group]\n"
@@ -3431,53 +3366,53 @@ msgstr ""
"\t[-M ostatnio-mont.-katalog] [-O [^]cecha[,...]]\n"
"\t[-T czas-ost.-sprawdz.] [-U UUID] urzdzenie\n"
-#: misc/tune2fs.c:138
+#: misc/tune2fs.c:141
msgid "while trying to open external journal"
msgstr "podczas prby otworzenia zewntrznej kroniki"
-#: misc/tune2fs.c:142
+#: misc/tune2fs.c:145
#, c-format
msgid "%s is not a journal device.\n"
msgstr "%s nie jest urzdzeniem kroniki.\n"
-#: misc/tune2fs.c:157
+#: misc/tune2fs.c:160
msgid "Journal superblock not found!\n"
msgstr "Nie znaleziono superbloku kroniki!\n"
-#: misc/tune2fs.c:169
+#: misc/tune2fs.c:172
msgid "Filesystem's UUID not found on journal device.\n"
msgstr "UUID systemu plikw nie znaleziony na urzdzeniu kroniki.\n"
-#: misc/tune2fs.c:190
+#: misc/tune2fs.c:193
msgid "Journal NOT removed\n"
msgstr "Kronika NIE usunita\n"
-#: misc/tune2fs.c:196
+#: misc/tune2fs.c:199
msgid "Journal removed\n"
msgstr "Kronika usunita\n"
-#: misc/tune2fs.c:228
+#: misc/tune2fs.c:231
msgid "while reading journal inode"
msgstr "podczas odczytu i-wza kroniki"
-#: misc/tune2fs.c:235
+#: misc/tune2fs.c:238
msgid "while reading bitmaps"
msgstr "podczas odczytu bitmap"
-#: misc/tune2fs.c:242
+#: misc/tune2fs.c:245
msgid "while clearing journal inode"
msgstr "podczas czyszczenia i-wza kroniki"
-#: misc/tune2fs.c:253
+#: misc/tune2fs.c:256
msgid "while writing journal inode"
msgstr "podczas zapisu i-wza kroniki"
-#: misc/tune2fs.c:268
+#: misc/tune2fs.c:271
#, c-format
msgid "Invalid mount option set: %s\n"
msgstr "Ustawiona bdna opcja montowania: %s\n"
-#: misc/tune2fs.c:309
+#: misc/tune2fs.c:317
msgid ""
"The has_journal flag may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
@@ -3485,7 +3420,7 @@ msgstr ""
"Flaga has_journal moe by wyczyszczona tylko kiedy system plikw\n"
"jest nie podmontowany lub podmontowany tylko do odczytu.\n"
-#: misc/tune2fs.c:317
+#: misc/tune2fs.c:325
msgid ""
"The needs_recovery flag is set. Please run e2fsck before clearing\n"
"the has_journal flag.\n"
@@ -3493,11 +3428,11 @@ msgstr ""
"Flaga needs_recovery jest ustawiona. Prosz uruchomi e2fsck przed\n"
"czyszczeniem flagi has_journal.\n"
-#: misc/tune2fs.c:371
+#: misc/tune2fs.c:382
msgid "The filesystem already has a journal.\n"
msgstr "System plikw ju ma kronik.\n"
-#: misc/tune2fs.c:388
+#: misc/tune2fs.c:399
#, c-format
msgid ""
"\n"
@@ -3506,21 +3441,21 @@ msgstr ""
"\n"
"\tpodczas prby otworzenia kroniki na %s\n"
-#: misc/tune2fs.c:392
+#: misc/tune2fs.c:403
#, c-format
msgid "Creating journal on device %s: "
msgstr "Tworzenie kroniki na urzdzeniu %s: "
-#: misc/tune2fs.c:400
+#: misc/tune2fs.c:411
#, c-format
msgid "while adding filesystem to journal on %s"
msgstr "podczas dodawania systemu plikw do kroniki na %s"
-#: misc/tune2fs.c:406
+#: misc/tune2fs.c:417
msgid "Creating journal inode: "
msgstr "Tworzenie i-wza kroniki: "
-#: misc/tune2fs.c:415
+#: misc/tune2fs.c:426
msgid ""
"\n"
"\twhile trying to create journal file"
@@ -3528,95 +3463,95 @@ msgstr ""
"\n"
"\tpodczas prby utworzenia pliku kroniki"
-#: misc/tune2fs.c:478
+#: misc/tune2fs.c:492
#, c-format
msgid "Couldn't parse date/time specifier: %s"
msgstr "Nie mona przeanalizowa podanej daty/czasu: %s"
-#: misc/tune2fs.c:500 misc/tune2fs.c:513
+#: misc/tune2fs.c:514 misc/tune2fs.c:527
#, c-format
msgid "bad mounts count - %s"
msgstr "bdna liczba montowa - %s"
-#: misc/tune2fs.c:529
+#: misc/tune2fs.c:543
#, c-format
msgid "bad error behavior - %s"
msgstr "bdne traktowanie bdw - %s"
-#: misc/tune2fs.c:552
+#: misc/tune2fs.c:566
#, c-format
msgid "bad gid/group name - %s"
msgstr "bdny gid/nazwa grupy - %s"
-#: misc/tune2fs.c:585
+#: misc/tune2fs.c:599
#, c-format
msgid "bad interval - %s"
msgstr "bdny odstp - %s"
-#: misc/tune2fs.c:613
+#: misc/tune2fs.c:627
#, c-format
msgid "bad reserved block ratio - %s"
msgstr "bdny procent zarezerwowanych blokw - %s"
-#: misc/tune2fs.c:628
+#: misc/tune2fs.c:642
msgid "-o may only be specified once"
msgstr "-o moe by podane tylko raz"
-#: misc/tune2fs.c:638
+#: misc/tune2fs.c:652
msgid "-O may only be specified once"
msgstr "-O moe by podane tylko raz"
-#: misc/tune2fs.c:648
+#: misc/tune2fs.c:662
#, c-format
msgid "bad reserved blocks count - %s"
msgstr "bdna liczba zarezerwowanych blokw - %s"
-#: misc/tune2fs.c:677
+#: misc/tune2fs.c:691
#, c-format
msgid "bad uid/user name - %s"
msgstr "bdny uid/nazwa uytkownika - %s"
-#: misc/tune2fs.c:783
+#: misc/tune2fs.c:801
#, c-format
msgid "Setting maximal mount count to %d\n"
msgstr "Ustawianie maksymalnej liczby montowa na %d\n"
-#: misc/tune2fs.c:789
+#: misc/tune2fs.c:807
#, c-format
msgid "Setting current mount count to %d\n"
msgstr "Ustawianie aktualnego licznika montowa na %d\n"
-#: misc/tune2fs.c:794
+#: misc/tune2fs.c:812
#, c-format
msgid "Setting error behavior to %d\n"
msgstr "Ustawianie traktowania bdw na %d\n"
-#: misc/tune2fs.c:799
+#: misc/tune2fs.c:817
#, c-format
msgid "Setting reserved blocks gid to %lu\n"
msgstr "Ustawianie gid-a zarezerwowanych blokw na %lu\n"
-#: misc/tune2fs.c:804
+#: misc/tune2fs.c:822
#, c-format
msgid "Setting interval between check %lu seconds\n"
msgstr "Ustawianie odstpu pomidzy sprawdzeniami na %lu sekund\n"
-#: misc/tune2fs.c:810
+#: misc/tune2fs.c:828
#, c-format
msgid "Setting reserved blocks percentage to %lu (%u blocks)\n"
msgstr "Ustawianie procent zarezerwowanych blokw na %lu (%u blokw)\n"
-#: misc/tune2fs.c:816
+#: misc/tune2fs.c:834
#, c-format
msgid "reserved blocks count is too big (%lu)"
msgstr "liczba zarezerwowanych blokw zbyt due (%lu)"
-#: misc/tune2fs.c:822
+#: misc/tune2fs.c:840
#, c-format
msgid "Setting reserved blocks count to %lu\n"
msgstr "Ustawianie liczby zarezerwowanych blokw na %lu\n"
-#: misc/tune2fs.c:828
+#: misc/tune2fs.c:846
msgid ""
"\n"
"The filesystem already has sparse superblocks.\n"
@@ -3624,7 +3559,7 @@ msgstr ""
"\n"
"System plikw ju ma rzadkie superbloki.\n"
-#: misc/tune2fs.c:835
+#: misc/tune2fs.c:853
#, c-format
msgid ""
"\n"
@@ -3633,7 +3568,7 @@ msgstr ""
"\n"
"Flaga rzadkich superblokw ustawiona. %s"
-#: misc/tune2fs.c:842
+#: misc/tune2fs.c:860
msgid ""
"\n"
"The filesystem already has sparse superblocks disabled.\n"
@@ -3641,7 +3576,7 @@ msgstr ""
"\n"
"System plikw ju ma wyczone rzadkie superbloki.\n"
-#: misc/tune2fs.c:850
+#: misc/tune2fs.c:868
#, c-format
msgid ""
"\n"
@@ -3650,17 +3585,17 @@ msgstr ""
"\n"
"Flaga rzadkich superblokw wyczyszczona. %s"
-#: misc/tune2fs.c:857
+#: misc/tune2fs.c:875
#, c-format
msgid "Setting time filesystem last checked to %s\n"
msgstr "Ustawianie czasu ostatniego sprawdzenia systemu plikw na %s\n"
-#: misc/tune2fs.c:863
+#: misc/tune2fs.c:881
#, c-format
msgid "Setting reserved blocks uid to %lu\n"
msgstr "Ustawianie uid-a zarezerwowanych blokw na %lu\n"
-#: misc/tune2fs.c:896
+#: misc/tune2fs.c:914
msgid "Invalid UUID format\n"
msgstr "Bdny format UUID-a\n"
@@ -3681,30 +3616,30 @@ msgstr ""
"\n"
"Urzdzenie najwyraniej nie istnieje; czy zostao podane poprawnie?\n"
-#: misc/util.c:101
+#: misc/util.c:107
#, c-format
msgid "%s is not a block special device.\n"
msgstr "%s nie jest specjalnym urzdzeniem blokowym.\n"
-#: misc/util.c:130
+#: misc/util.c:136
#, c-format
msgid "%s is entire device, not just one partition!\n"
msgstr "%s jest caym urzdzeniem, a nie tylko jedn partycj!\n"
-#: misc/util.c:154
+#: misc/util.c:160
msgid "mke2fs forced anyway. Hope /etc/mtab is incorrect.\n"
msgstr "mke2fs wymuszone mimo to. Mam nadziej, e /etc/mtab si myli.\n"
-#: misc/util.c:157
+#: misc/util.c:163
#, c-format
msgid "will not make a %s here!\n"
msgstr "nie zrobi tutaj %s!\n"
-#: misc/util.c:171
+#: misc/util.c:177
msgid "Couldn't allocate memory to parse journal options!\n"
msgstr "Nie mona przydzieli pamici na analiz opcji kroniki!\n"
-#: misc/util.c:213
+#: misc/util.c:219
msgid ""
"\n"
"Bad journal options specified.\n"
@@ -3732,7 +3667,7 @@ msgstr ""
"Rozmiar kroniki musi by pomidzy 1024 a 102400 blokami systemu plikw.\n"
"\n"
-#: misc/util.c:240
+#: misc/util.c:246
msgid ""
"\n"
"Filesystem too small for a journal\n"
@@ -3740,7 +3675,7 @@ msgstr ""
"\n"
"System plikw za may na kronik\n"
-#: misc/util.c:247
+#: misc/util.c:253
#, c-format
msgid ""
"\n"
@@ -3751,7 +3686,7 @@ msgstr ""
"dany rozmiar kroniki to %d blokw; musi by\n"
"pomidzy 1024 a 102400 blokw. Przerwano.\n"
-#: misc/util.c:255
+#: misc/util.c:261
msgid ""
"\n"
"Journal size too big for filesystem.\n"
@@ -3759,7 +3694,7 @@ msgstr ""
"\n"
"Rozmiar kroniki zbyt duy dla systemu plikw.\n"
-#: misc/util.c:274
+#: misc/util.c:280
#, c-format
msgid ""
"This filesystem will be automatically checked every %d mounts or\n"
@@ -3845,7 +3780,7 @@ msgstr "resize2fs %s (%s)\n"
msgid "bad filesystem size - %s"
msgstr "bdny rozmiar systemu plikw - %s"
-#: resize/main.c:296
+#: resize/main.c:300
#, c-format
msgid ""
"The containing partition (or device) is only %d (%dk) blocks.\n"
@@ -3856,7 +3791,7 @@ msgstr ""
"Zadano nowego rozmiaru %d blokw.\n"
"\n"
-#: resize/main.c:303
+#: resize/main.c:307
#, c-format
msgid ""
"The filesystem is already %d blocks long. Nothing to do!\n"
@@ -3865,7 +3800,7 @@ msgstr ""
"System plikw ju ma wielko %d blokw. Nie ma nic do roboty!\n"
"\n"
-#: resize/main.c:310
+#: resize/main.c:314
#, c-format
msgid ""
"Please run 'e2fsck -f %s' first.\n"
@@ -3874,12 +3809,12 @@ msgstr ""
"Prosz uruchomi najpierw 'e2fsck -f %s'.\n"
"\n"
-#: resize/main.c:320
+#: resize/main.c:324
#, c-format
msgid "while trying to resize %s"
msgstr "podczas prby zmiany rozmiaru %s"
-#: resize/main.c:325
+#: resize/main.c:329
#, c-format
msgid ""
"The filesystem on %s is now %d blocks long.\n"
@@ -3888,57 +3823,169 @@ msgstr ""
"System plikw na %s ma teraz %d blokw.\n"
"\n"
-#: resize/resize2fs.c:109
+#: resize/resize2fs.c:110
#, c-format
msgid "Number of free blocks: %d/%d, Needed: %d\n"
msgstr "Liczba wolnych blokw: %d/%d, potrzeba: %d\n"
-#: resize/resize2fs.c:458
+#: resize/resize2fs.c:459
msgid "meta-data blocks"
msgstr "bloki metadanych"
-#: resize/resize2fs.c:581
+#: resize/resize2fs.c:582
msgid "reserved blocks"
msgstr "zarezerwowane bloki"
-#: resize/resize2fs.c:586
+#: resize/resize2fs.c:587
msgid "blocks to be moved"
msgstr "bloki do przeniesienia"
-#: resize/resize2fs.c:816
+#: resize/resize2fs.c:817
+#, c-format
msgid "Going into desperation mode for block allocations\n"
msgstr "Przejcie w tryb desperacji przy przydzielaniu blokw\n"
-#: resize/resize2fs.c:920
+#: resize/resize2fs.c:921
#, c-format
msgid "Moving %d blocks %u->%u\n"
msgstr "Przenoszenie %d blokw %u->%u\n"
-#: resize/resize2fs.c:997
+#: resize/resize2fs.c:998
#, c-format
msgid "ino=%u, blockcnt=%lld, %u->%u\n"
msgstr "i-wze=%u, blockcnt=%lld, %u->%u\n"
-#: resize/resize2fs.c:1165
+#: resize/resize2fs.c:1166
#, c-format
msgid "Inode moved %u->%u\n"
msgstr "i-wze przeniesiony %u->%u\n"
-#: resize/resize2fs.c:1233
+#: resize/resize2fs.c:1234
#, c-format
msgid "Inode translate (dir=%u, name=%.*s, %u->%u)\n"
msgstr "Tumaczenie i-wza (katalog=%u, nazwa=%.*s, %u->%u)\n"
-#: resize/resize2fs.c:1360
+#: resize/resize2fs.c:1361
#, c-format
msgid "Itable move group %d block %u->%u (diff %d)\n"
msgstr "Przenoszenie i-tablicy grupa %d blok %u->%u (rnica %d)\n"
-#: resize/resize2fs.c:1386
+#: resize/resize2fs.c:1387
#, c-format
msgid "%d blocks of zeros...\n"
msgstr "%d blokw zer...\n"
-#: resize/resize2fs.c:1421
+#: resize/resize2fs.c:1422
+#, c-format
msgid "Inode table move finished.\n"
msgstr "Przenoszenie tablicy i-wzw zakoczone.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "%8d inode used (%d%%)\n"
+#~ msgid_plural ""
+#~ "\n"
+#~ "%8d inodes used (%d%%)\n"
+#~ msgstr[0] ""
+#~ "\n"
+#~ "%8d uyty i-wze (%d%%)\n"
+#~ msgstr[1] ""
+#~ "\n"
+#~ "%8d uyte i-wzy (%d%%)\n"
+#~ msgstr[2] ""
+#~ "\n"
+#~ "%8d uytych i-wzw (%d%%)\n"
+
+#~ msgid "%8d non-contiguous inode (%0d.%d%%)\n"
+#~ msgid_plural "%8d non-contiguous inodes (%0d.%d%%)\n"
+#~ msgstr[0] "%8d niecigy i-wze (%0d.%d%%)\n"
+#~ msgstr[1] "%8d niecige i-wzy (%0d.%d%%)\n"
+#~ msgstr[2] "%8d niecigych i-wzw (%0d.%d%%)\n"
+
+#~ msgid "%8d block used (%d%%)\n"
+#~ msgid_plural "%8d blocks used (%d%%)\n"
+#~ msgstr[0] "%8d uyty blok (%d%%)\n"
+#~ msgstr[1] "%8d uyte bloki (%d%%)\n"
+#~ msgstr[2] "%8d uytych blokw (%d%%)\n"
+
+#~ msgid "%8d bad block\n"
+#~ msgid_plural "%8d bad blocks\n"
+#~ msgstr[0] "%8d wadliwy blok\n"
+#~ msgstr[1] "%8d wadliwe bloki\n"
+#~ msgstr[2] "%8d wadliwych blokw\n"
+
+#~ msgid "%8d large file\n"
+#~ msgid_plural "%8d large files\n"
+#~ msgstr[0] "%8d duy plik\n"
+#~ msgstr[1] "%8d due pliki\n"
+#~ msgstr[2] "%8d duych plikw\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "%8d regular file\n"
+#~ msgid_plural ""
+#~ "\n"
+#~ "%8d regular files\n"
+#~ msgstr[0] ""
+#~ "\n"
+#~ "%8d zwyky plik\n"
+#~ msgstr[1] ""
+#~ "\n"
+#~ "%8d zwyke pliki\n"
+#~ msgstr[2] ""
+#~ "\n"
+#~ "%8d zwykych plikw\n"
+
+#~ msgid "%8d directory\n"
+#~ msgid_plural "%8d directories\n"
+#~ msgstr[0] "%8d katalog\n"
+#~ msgstr[1] "%8d katalogi\n"
+#~ msgstr[2] "%8d katalogw\n"
+
+#~ msgid "%8d character device file\n"
+#~ msgid_plural "%8d character device files\n"
+#~ msgstr[0] "%8d plik urzdzenia znakowego\n"
+#~ msgstr[1] "%8d pliki urzdze znakowych\n"
+#~ msgstr[2] "%8d plikw urzdze znakowych\n"
+
+#~ msgid "%8d block device file\n"
+#~ msgid_plural "%8d block device files\n"
+#~ msgstr[0] "%8d plik urzdzenia blokowego\n"
+#~ msgstr[1] "%8d pliki urzdze blokowych\n"
+#~ msgstr[2] "%8d plikw urzdze blokowych\n"
+
+#~ msgid "%8d fifo\n"
+#~ msgid_plural "%8d fifos\n"
+#~ msgstr[0] "%d potok nazwany\n"
+#~ msgstr[1] "%d potoki nazwane\n"
+#~ msgstr[2] "%d potokw nazwanych\n"
+
+#~ msgid "%8d link\n"
+#~ msgid_plural "%8d links\n"
+#~ msgstr[0] "%8d dowizanie\n"
+#~ msgstr[1] "%8d dowizania\n"
+#~ msgstr[2] "%8d dowiza\n"
+
+#~ msgid "%8d symbolic link"
+#~ msgid_plural "%8d symbolic links"
+#~ msgstr[0] "%8d dowizanie symboliczne"
+#~ msgstr[1] "%8d dowizania symboliczne"
+#~ msgstr[2] "%8d dowiza symbolicznych"
+
+#~ msgid " (%d fast symbolic link)\n"
+#~ msgid_plural " (%d fast symbolic links)\n"
+#~ msgstr[0] " (%d szybkie dowizanie symboliczne)\n"
+#~ msgstr[1] " (%d szybkie dowizania symboliczne)\n"
+#~ msgstr[2] " (%d szybkich dowiza symbolicznych)\n"
+
+#~ msgid "%8d socket\n"
+#~ msgid_plural "%8d sockets\n"
+#~ msgstr[0] "%8d gniazdo\n"
+#~ msgstr[1] "%8d gniazda\n"
+#~ msgstr[2] "%8d gniazd\n"
+
+#~ msgid "%8d file\n"
+#~ msgid_plural "%8d files\n"
+#~ msgstr[0] "%8d plik\n"
+#~ msgstr[1] "%8d pliki\n"
+#~ msgstr[2] "%8d plikw\n"
diff --git a/po/sv.gmo b/po/sv.gmo
new file mode 100644
index 00000000..4e0a3b65
--- /dev/null
+++ b/po/sv.gmo
Binary files differ
diff --git a/po/sv.po b/po/sv.po
index 398a5960..e8f6b278 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: e2fsprogs 1.35\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-24 14:17-0500\n"
+"Report-Msgid-Bugs-To: tytso@alum.mit.edu\n"
+"POT-Creation-Date: 2004-11-30 18:46-0500\n"
"PO-Revision-Date: 2004-03-15 11:17+0100\n"
"Last-Translator: Gran Uddeborg <goeran@uddeborg.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: e2fsck/badblocks.c:22 misc/mke2fs.c:194
+#: e2fsck/badblocks.c:22 misc/mke2fs.c:223
#, c-format
msgid "Bad block %u out of range; ignored.\n"
msgstr "Dligt block %u utanfr giltigt intervall; ignoreras.\n"
@@ -29,10 +29,10 @@ msgid "while reading the bad blocks inode"
msgstr "vid lsning av inoden fr dliga block"
#: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
-#: e2fsck/unix.c:881 e2fsck/unix.c:913 misc/badblocks.c:997
+#: e2fsck/unix.c:915 e2fsck/unix.c:947 misc/badblocks.c:997
#: misc/badblocks.c:1005 misc/badblocks.c:1019 misc/badblocks.c:1031
-#: misc/dumpe2fs.c:332 misc/e2image.c:486 misc/e2image.c:502 misc/mke2fs.c:210
-#: misc/tune2fs.c:757 resize/main.c:228
+#: misc/dumpe2fs.c:332 misc/e2image.c:475 misc/e2image.c:564
+#: misc/e2image.c:580 misc/mke2fs.c:239 misc/tune2fs.c:775 resize/main.c:232
#, c-format
msgid "while trying to open %s"
msgstr "vid frsk att ppna %s"
@@ -42,7 +42,7 @@ msgstr "vid frsk att ppna %s"
msgid "while trying popen '%s'"
msgstr "vid frsk att anvnda popen \"%s\""
-#: e2fsck/badblocks.c:93 misc/mke2fs.c:217
+#: e2fsck/badblocks.c:93 misc/mke2fs.c:246
msgid "while reading in list of bad blocks from file"
msgstr "vid lsning i listan ver dliga block frn fil"
@@ -102,6 +102,7 @@ msgid "%s: %s filename nblocks blocksize\n"
msgstr "%s: %s filnamn nblock blockstorlek\n"
#: e2fsck/extend.c:43
+#, c-format
msgid "Illegal number of blocks!\n"
msgstr "Otilltet antal block!\n"
@@ -116,6 +117,7 @@ msgid "Usage: %s disk\n"
msgstr "Anvndning: %s disk\n"
#: e2fsck/flushb.c:63
+#, c-format
msgid "BLKFLSBUF ioctl not supported! Can't flush buffers.\n"
msgstr "BLKFLSBUF-ioctl stds inte! Kan inte tmma buffertar.\n"
@@ -124,12 +126,12 @@ msgstr "BLKFLSBUF-ioctl stds inte! Kan inte tmma buffertar.\n"
msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n"
msgstr "Anvndning: %s [-F] [-I inodbuffertblock] enhet\n"
-#: e2fsck/iscan.c:83 e2fsck/unix.c:701 resize/main.c:205
+#: e2fsck/iscan.c:83 e2fsck/unix.c:729 resize/main.c:209
#, c-format
msgid "while opening %s for flushing"
msgstr "vid ppning av %s fr utskrivning"
-#: e2fsck/iscan.c:88 e2fsck/unix.c:707 resize/main.c:212
+#: e2fsck/iscan.c:88 e2fsck/unix.c:735 resize/main.c:216
#, c-format
msgid "while trying to flush %s"
msgstr "vid frsk att skriva ut %s"
@@ -147,31 +149,31 @@ msgstr "nr nsta inod hmtades"
msgid "%d inodes scanned.\n"
msgstr "%d inoder genomskta.\n"
-#: e2fsck/journal.c:449
+#: e2fsck/journal.c:463
msgid "reading journal superblock\n"
msgstr "lser journalsuperblock\n"
-#: e2fsck/journal.c:506
+#: e2fsck/journal.c:520
#, c-format
msgid "%s: no valid journal superblock found\n"
msgstr "%s: inget giltigt journalsuperblock hittades\n"
-#: e2fsck/journal.c:515
+#: e2fsck/journal.c:529
#, c-format
msgid "%s: journal too short\n"
msgstr "%s: journalen fr kort\n"
-#: e2fsck/journal.c:787
+#: e2fsck/journal.c:802
#, c-format
msgid "%s: recovering journal\n"
msgstr "%s: terhmtar journalen\n"
-#: e2fsck/journal.c:789
+#: e2fsck/journal.c:804
#, c-format
msgid "%s: won't do journal recovery while read-only\n"
msgstr "%s: terhmtar inte journalen i skrivskyddat lge\n"
-#: e2fsck/journal.c:810
+#: e2fsck/journal.c:825
#, c-format
msgid "while trying to re-open %s"
msgstr "vid frsk att terppna %s"
@@ -344,77 +346,77 @@ msgstr "<Reserverad inod 10>"
msgid "multiply claimed inode map"
msgstr "karta ver flerfaldigt i ansprkstagna inoder"
-#: e2fsck/pass1b.c:551 e2fsck/pass1b.c:688
+#: e2fsck/pass1b.c:554 e2fsck/pass1b.c:691
#, c-format
msgid "internal error; can't find dup_blk for %d\n"
msgstr "internt fel; kan inte hitta dup_blk fr %d\n"
-#: e2fsck/pass1b.c:731
+#: e2fsck/pass1b.c:734
msgid "returned from clone_file_block"
msgstr "tervnde frn clone_file_block"
-#: e2fsck/pass1.c:297
+#: e2fsck/pass1.c:298
msgid "in-use inode map"
msgstr "karta ver anvnda inoder"
-#: e2fsck/pass1.c:306
+#: e2fsck/pass1.c:307
msgid "directory inode map"
msgstr "kataloginodskarta"
-#: e2fsck/pass1.c:314
+#: e2fsck/pass1.c:315
msgid "regular file inode map"
msgstr "inodskarta ver reguljra filer"
-#: e2fsck/pass1.c:321
+#: e2fsck/pass1.c:322
msgid "in-use block map"
msgstr "karta ver anvnda block"
-#: e2fsck/pass1.c:368
+#: e2fsck/pass1.c:369
msgid "doing inode scan"
msgstr "gr inodskning"
-#: e2fsck/pass1.c:751
+#: e2fsck/pass1.c:752
msgid "Pass 1"
msgstr "Pass 1"
-#: e2fsck/pass1.c:810
+#: e2fsck/pass1.c:811
#, c-format
msgid "reading indirect blocks of inode %u"
msgstr "lser indirekt block fr inod %u"
-#: e2fsck/pass1.c:852
+#: e2fsck/pass1.c:853
msgid "bad inode map"
msgstr "karta ver dliga inoder"
-#: e2fsck/pass1.c:874
+#: e2fsck/pass1.c:875
msgid "inode in bad block map"
msgstr "inod i karta ver dliga block"
-#: e2fsck/pass1.c:894
+#: e2fsck/pass1.c:895
msgid "imagic inode map"
msgstr "imagic inodskarta"
-#: e2fsck/pass1.c:921
+#: e2fsck/pass1.c:922
msgid "multiply claimed block map"
msgstr "karta ver flerfaldigt i ansprkstagna block"
-#: e2fsck/pass1.c:1020
+#: e2fsck/pass1.c:1021
msgid "ext attr block map"
msgstr "karta ver block fr utkade attribut"
-#: e2fsck/pass1.c:1782
+#: e2fsck/pass1.c:1783
msgid "block bitmap"
msgstr "blockbitkarta"
-#: e2fsck/pass1.c:1786
+#: e2fsck/pass1.c:1787
msgid "inode bitmap"
msgstr "inodbitkarta"
-#: e2fsck/pass1.c:1790
+#: e2fsck/pass1.c:1791
msgid "inode table"
msgstr "inodstabell"
-#: e2fsck/pass2.c:293
+#: e2fsck/pass2.c:294
msgid "Pass 2"
msgstr "Pass 2"
@@ -723,7 +725,8 @@ msgstr "Extern journal stdjer inte detta filsystem\n"
#: e2fsck/problem.c:210
msgid ""
"Ext3 @j @S is unknown type %N (unsupported).\n"
-"It is likely that your copy of e2fsck is old and/or doesn't support this @j format.\n"
+"It is likely that your copy of e2fsck is old and/or doesn't support this @j "
+"format.\n"
"It is also possible the @j @S is corrupt.\n"
msgstr ""
"Ext3-journalsuperblock r av oknd typ %N (ej sttt).\n"
@@ -742,7 +745,8 @@ msgstr "superblock har inte har-journal-flagga, men har ext3-journal %s.\n"
#: e2fsck/problem.c:228
msgid "@S has ext3 needs_recovery flag set, but no @j.\n"
-msgstr "superblock har ext3-behver-rttas-flagga satt, men har ext3-journal %s.\n"
+msgstr ""
+"superblock har ext3-behver-rttas-flagga satt, men har ext3-journal %s.\n"
#: e2fsck/problem.c:233
msgid "ext3 recovery flag clear, but @j has data.\n"
@@ -762,7 +766,8 @@ msgstr "Rttningsflagga inte satt i reservsuperblock, s kr journal nd.\n"
#: e2fsck/problem.c:253
msgid "%s @o @i %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n"
-msgstr "%s frldrals inod %i (uid=%Iu, gid=%Ig, rttighet=%Im, storlek=%Is)\n"
+msgstr ""
+"%s frldrals inod %i (uid=%Iu, gid=%Ig, rttighet=%Im, storlek=%Is)\n"
#: e2fsck/problem.c:258
msgid "@I @b #%B (%b) found in @o @i %i.\n"
@@ -863,15 +868,18 @@ msgstr "Inod %i r en nollngds katalog. "
#: e2fsck/problem.c:355
msgid "@g %g's @b @B at %b @C.\n"
-msgstr "Grupp %g:s blockbitkarta vid %b str i konflikt med annat filsystemblock.\n"
+msgstr ""
+"Grupp %g:s blockbitkarta vid %b str i konflikt med annat filsystemblock.\n"
#: e2fsck/problem.c:360
msgid "@g %g's @i @B at %b @C.\n"
-msgstr "Grupp %g:s inodbitkarta vid %b str i konflikt med annat filsystemblock.\n"
+msgstr ""
+"Grupp %g:s inodbitkarta vid %b str i konflikt med annat filsystemblock.\n"
#: e2fsck/problem.c:365
msgid "@g %g's @i table at %b @C.\n"
-msgstr "Grupp %g:s inodtabell vid %b str i konflikt med annat filsystemblock.\n"
+msgstr ""
+"Grupp %g:s inodtabell vid %b str i konflikt med annat filsystemblock.\n"
#: e2fsck/problem.c:370
msgid "@g %g's @b @B (%b) is bad. "
@@ -961,7 +969,8 @@ msgstr "Det primra superblocket (%b) r p listan ver dliga block.\n"
#: e2fsck/problem.c:454
msgid "Block %b in the primary @g descriptors is on the bad @b list\n"
-msgstr "Block %b i de primra gruppbeskrivarna r p listan ver dliga block\n"
+msgstr ""
+"Block %b i de primra gruppbeskrivarna r p listan ver dliga block\n"
#: e2fsck/problem.c:460
msgid "Warning: Group %g's @S (%b) is bad.\n"
@@ -969,15 +978,19 @@ msgstr "Varning: Grupp %g:s superblock (%b) r dligt.\n"
#: e2fsck/problem.c:465
msgid "Warning: Group %g's copy of the @g descriptors has a bad @b (%b).\n"
-msgstr "Varning: Grupp %g:s kopia av gruppbeskrivarna har ett dligt block (%b).\n"
+msgstr ""
+"Varning: Grupp %g:s kopia av gruppbeskrivarna har ett dligt block (%b).\n"
#: e2fsck/problem.c:471
msgid "Programming error? @b #%b claimed for no reason in process_bad_@b.\n"
-msgstr "Programmeringsfel? Block nr. %b tas i ansprk utan anledning i process_bad_block.\n"
+msgstr ""
+"Programmeringsfel? Block nr. %b tas i ansprk utan anledning i "
+"process_bad_block.\n"
#: e2fsck/problem.c:477
msgid "@A %N contiguous @b(s) in @b @g %g for %s: %m\n"
-msgstr "Fel vid allokering av %N konsekutiva block i blockgrupp %g fr %s: %m\n"
+msgstr ""
+"Fel vid allokering av %N konsekutiva block i blockgrupp %g fr %s: %m\n"
#: e2fsck/problem.c:482
#, c-format
@@ -1027,7 +1040,9 @@ msgstr "Fel vid lagring av inodsrknarinformation (inod=%i, antal=%N): %m\n"
#: e2fsck/problem.c:542
msgid "Error storing @d @b information (@i=%i, @b=%b, num=%N): %m\n"
-msgstr "Fel vid lagring av katalogblocksinformation (inod=%i, block=%b, antal=%N): %m\n"
+msgstr ""
+"Fel vid lagring av katalogblocksinformation (inod=%i, block=%b, antal=%N): %"
+"m\n"
#: e2fsck/problem.c:548
#, c-format
@@ -1051,7 +1066,8 @@ msgstr ""
#: e2fsck/problem.c:567
#, c-format
msgid "@i %i has @cion flag set on @f without @cion support. "
-msgstr "Inod %i har kompressionsflagga satt p filsystem utan kompressionsstd. "
+msgstr ""
+"Inod %i har kompressionsflagga satt p filsystem utan kompressionsstd. "
#: e2fsck/problem.c:587
msgid "@j is not regular file. "
@@ -1189,7 +1205,9 @@ msgstr "Fel vid iterering ver block i inod %i (%s): %m\n"
#: e2fsck/problem.c:751 e2fsck/problem.c:1072
msgid "Error addjusting refcount for @a @b %b (@i %i): %m\n"
-msgstr "Fel vid justering av referensrknare fr externa attribut-block %b (inod %i): %m\n"
+msgstr ""
+"Fel vid justering av referensrknare fr externa attribut-block %b (inod %"
+"i): %m\n"
#: e2fsck/problem.c:757
msgid "Pass 1C: Scan directories for @is with dup @bs.\n"
@@ -1259,7 +1277,8 @@ msgstr "Post \"%Dn\" i %p (%i) r en lnk till \".\" "
#: e2fsck/problem.c:833
msgid "@E points to @i (%Di) located in a bad @b.\n"
-msgstr "Post \"%Dn\" i %p (%i) pekar p inod (%Di) som finns i ett trasigt block.\n"
+msgstr ""
+"Post \"%Dn\" i %p (%i) pekar p inod (%Di) som finns i ett trasigt block.\n"
#: e2fsck/problem.c:838
msgid "@E @L to @d %P (%Di).\n"
@@ -1285,7 +1304,8 @@ msgstr "\"..\" saknas i kataloginod %i.\n"
#: e2fsck/problem.c:863
msgid "First @e '%Dn' (inode=%Di) in @d @i %i (%p) @s '.'\n"
-msgstr "Frsta post \"%Dn\" (inod=%Di) i kataloginod %i (%p) skulle varit \".\"\n"
+msgstr ""
+"Frsta post \"%Dn\" (inod=%Di) i kataloginod %i (%p) skulle varit \".\"\n"
#: e2fsck/problem.c:868
msgid "Second @e '%Dn' (inode=%Di) in @d @i %i @s '..'\n"
@@ -1410,7 +1430,8 @@ msgstr "Stter filtyp fr post \"%Dn\" i %p (%i) till %N.\n"
#: e2fsck/problem.c:1008
msgid "@E has an incorrect filetype (was %Dt, should be %N).\n"
-msgstr "Post \"%Dn\" i %p (%i) har felaktig filtyp (var %Dt, skulle varit %N).\n"
+msgstr ""
+"Post \"%Dn\" i %p (%i) har felaktig filtyp (var %Dt, skulle varit %N).\n"
#: e2fsck/problem.c:1013
msgid "@E has filetype set.\n"
@@ -1430,7 +1451,9 @@ msgstr "Utkat attribut-block fr inod %i (%Q) r ogiltigt (%If).\n"
#: e2fsck/problem.c:1033
msgid "@f contains large files, but lacks LARGE_FILE flag in @S.\n"
-msgstr "Filsystem innehller stora filer, men saknar flaggan LARGE_FILE i superblock.\n"
+msgstr ""
+"Filsystem innehller stora filer, men saknar flaggan LARGE_FILE i "
+"superblock.\n"
#: e2fsck/problem.c:1038
msgid "@p @h %d: node (%B) not referenced\n"
@@ -1454,7 +1477,8 @@ msgstr "Ogiltig HTREE-katalognod %d (%q). "
#: e2fsck/problem.c:1062
msgid "Forcibly clearing HTREE flag on @i %d (%q). (Beta test code)\n"
-msgstr "Framtvingar nollstllning av HTREE-flagga p inod %d (%q). (Betatestkod)\n"
+msgstr ""
+"Framtvingar nollstllning av HTREE-flagga p inod %d (%q). (Betatestkod)\n"
#: e2fsck/problem.c:1067
msgid "@p @h %d (%q): bad @b number %b.\n"
@@ -1477,7 +1501,8 @@ msgstr ""
#: e2fsck/problem.c:1092
msgid "@p @h %d: node (%B) has an unordered hash table\n"
-msgstr "Problem i HTREE-katalognod %d (%q): not (%B) har en oordnat hash-tabell\n"
+msgstr ""
+"Problem i HTREE-katalognod %d (%q): not (%B) har en oordnat hash-tabell\n"
#: e2fsck/problem.c:1097
msgid "@p @h %d: node (%B) has bad depth\n"
@@ -1568,7 +1593,8 @@ msgstr "ext2fs_new_dir_block: %m nr nytt katalogblock skapades\n"
#: e2fsck/problem.c:1184
#, c-format
msgid "ext2fs_write_dir_@b: %m while writing the @d @b for /@l\n"
-msgstr "ext2fs_write_dir_block: %m vid skrivning av katalogblocket fr /lost+found\n"
+msgstr ""
+"ext2fs_write_dir_block: %m vid skrivning av katalogblocket fr /lost+found\n"
#: e2fsck/problem.c:1189
#, c-format
@@ -1590,7 +1616,8 @@ msgid ""
"Couldn't fix parent of @i %i: Couldn't find parent @d entry\n"
"\n"
msgstr ""
-"Kunde inte rtta frlder till inod %i: Kunde inte hitta frlderkatalogpost\n"
+"Kunde inte rtta frlder till inod %i: Kunde inte hitta "
+"frlderkatalogpost\n"
"\n"
#: e2fsck/problem.c:1204
@@ -1652,7 +1679,8 @@ msgid ""
"@i_link_info[%i] is %N, @i.i_links_count is %Il. They should be the same!\n"
msgstr ""
"VARNING: PROGRAMMERINGSFEL I E2FSCK!\n"
-" ELLER NGON KLANTSKALLE (DU) KONTROLLERAR ETT MONTERAT (AKTIVT) FILSYSTEM.\n"
+" ELLER NGON KLANTSKALLE (DU) KONTROLLERAR ETT MONTERAT (AKTIVT) "
+"FILSYSTEM.\n"
"inod_link_info[%i] r %N, inod.i_links_count r %Il. De skulle vara samma!\n"
#: e2fsck/problem.c:1302
@@ -1696,7 +1724,9 @@ msgid "Free @bs count wrong (%b, counted=%c).\n"
msgstr "Antal fria block r fel (%b, rknade=%c).\n"
#: e2fsck/problem.c:1382
-msgid "PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B endpoints (%i, %j)\n"
+msgid ""
+"PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B "
+"endpoints (%i, %j)\n"
msgstr ""
"PROGRAMMERINGSFEL: filsystem (nr. %N) bitkartas ndpunkter (%b, %c) stmmer\n"
"inte med berknade bitkartendpunkter (%i, %j)\n"
@@ -1710,7 +1740,7 @@ msgstr "Internt fel: fuskar till slut p bitkarta (%N)\n"
msgid "Unhandled error code (0x%x)!\n"
msgstr "Ej hanterad felkod (0x%x)!\n"
-#: e2fsck/problem.c:1594
+#: e2fsck/problem.c:1595
msgid "IGNORED"
msgstr "IGNORERAT"
@@ -1773,6 +1803,7 @@ msgid "while writing inode table (group %d)"
msgstr "vid skrivning av inodstabell (grupp %d)"
#: e2fsck/swapfs.c:222
+#, c-format
msgid "Pass 0: Doing byte-swap of filesystem\n"
msgstr "Pass 0: Bytevxlar filsystem\n"
@@ -1789,7 +1820,7 @@ msgstr ""
msgid "Byte swap"
msgstr "Bytevxling"
-#: e2fsck/unix.c:67
+#: e2fsck/unix.c:74
#, c-format
msgid ""
"Usage: %s [-panyrcdfvstDFSV] [-b superblock] [-B blocksize]\n"
@@ -1802,14 +1833,16 @@ msgstr ""
"\t\t[-l|-L dliga_block_fil] [-C fd] [-j ext-journal]\n"
"\t\t[-E utkade-flaggor] enhet\n"
-#: e2fsck/unix.c:73
+#: e2fsck/unix.c:80
+#, c-format
msgid ""
"\n"
"Emergency help:\n"
" -p Automatic repair (no questions)\n"
" -n Make no changes to the filesystem\n"
" -y Assume \"yes\" to all questions\n"
-" -c Check for bad blocks and add them to the badblock list\n"
+" -c Check for bad blocks and add them to the badblock "
+"list\n"
" -f Force checking even if filesystem is marked clean\n"
msgstr ""
"\n"
@@ -1818,9 +1851,11 @@ msgstr ""
" -n Gr inga frndringar av filsystemet\n"
" -y Anta \"ja\" som svar p alla frgor\n"
" -c Leta efter dliga block och lgg till dem i listan\n"
-" -f Framtvinga kontroll ven om filsystemet r markerat rent\n"
+" -f Framtvinga kontroll ven om filsystemet r markerat "
+"rent\n"
-#: e2fsck/unix.c:79
+#: e2fsck/unix.c:86
+#, c-format
msgid ""
" -v Be verbose\n"
" -b superblock Use alternative superblock\n"
@@ -1836,154 +1871,33 @@ msgstr ""
" -l dliga_block_fil Lgg till till listan ver dliga block\n"
" -L dliga_block_fil Ange lista ver dliga block\n"
-#: e2fsck/unix.c:113
+#: e2fsck/unix.c:120
#, c-format
msgid "%s: %d/%d files (%0d.%d%% non-contiguous), %d/%d blocks\n"
msgstr "%s: %d/%d filer (%0d.%d%% ej sammanhngande), %d/%d block\n"
-#: e2fsck/unix.c:119
-#, c-format
-msgid ""
-"\n"
-"%8d inode used (%d%%)\n"
-msgid_plural ""
-"\n"
-"%8d inodes used (%d%%)\n"
-msgstr[0] ""
-"\n"
-"%8d inod anvnd (%d%%)\n"
-msgstr[1] ""
-"\n"
-"%8d inoder anvnda (%d%%)\n"
-
-#: e2fsck/unix.c:121
-#, c-format
-msgid "%8d non-contiguous inode (%0d.%d%%)\n"
-msgid_plural "%8d non-contiguous inodes (%0d.%d%%)\n"
-msgstr[0] "%8d ej sammanhngande inod (%0d.%d%%)\n"
-msgstr[1] "%8d ej sammanhngande inoder (%0d.%d%%)\n"
-
-#: e2fsck/unix.c:125
+#: e2fsck/unix.c:132
#, c-format
msgid " # of inodes with ind/dind/tind blocks: %d/%d/%d\n"
msgstr " # av inoder med ind/dind/tind-block: %d/%d/%d\n"
-#: e2fsck/unix.c:127
-#, c-format
-msgid "%8d block used (%d%%)\n"
-msgid_plural "%8d blocks used (%d%%)\n"
-msgstr[0] "%8d block anvnt (%d%%)\n"
-msgstr[1] "%8d block anvnda (%d%%)\n"
-
-#: e2fsck/unix.c:130
-#, c-format
-msgid "%8d bad block\n"
-msgid_plural "%8d bad blocks\n"
-msgstr[0] "%8d dligt block\n"
-msgstr[1] "%8d dliga block\n"
-
-#: e2fsck/unix.c:132
-#, c-format
-msgid "%8d large file\n"
-msgid_plural "%8d large files\n"
-msgstr[0] "%8d stor fil\n"
-msgstr[1] "%8d stora filer\n"
-
-#: e2fsck/unix.c:134
-#, c-format
-msgid ""
-"\n"
-"%8d regular file\n"
-msgid_plural ""
-"\n"
-"%8d regular files\n"
-msgstr[0] ""
-"\n"
-"%8d vanlig fil\n"
-msgstr[1] ""
-"\n"
-"%8d vanliga filer\n"
-
-#: e2fsck/unix.c:136
-#, c-format
-msgid "%8d directory\n"
-msgid_plural "%8d directories\n"
-msgstr[0] "%8d katalog\n"
-msgstr[1] "%8d kataloger\n"
-
-#: e2fsck/unix.c:138
-#, c-format
-msgid "%8d character device file\n"
-msgid_plural "%8d character device files\n"
-msgstr[0] "%8d teckenspecialfil\n"
-msgstr[1] "%8d teckenspecialfiler\n"
-
-#: e2fsck/unix.c:141
-#, c-format
-msgid "%8d block device file\n"
-msgid_plural "%8d block device files\n"
-msgstr[0] "%8d blockspecialfil\n"
-msgstr[1] "%8d blockspecialfiler\n"
-
-#: e2fsck/unix.c:143
-#, c-format
-msgid "%8d fifo\n"
-msgid_plural "%8d fifos\n"
-msgstr[0] "%8d fifo\n"
-msgstr[1] "%8d fifo:er\n"
-
-#: e2fsck/unix.c:145
-#, c-format
-msgid "%8d link\n"
-msgid_plural "%8d links\n"
-msgstr[0] "%8d lnk\n"
-msgstr[1] "%8d lnkar\n"
-
-#: e2fsck/unix.c:148
-#, c-format
-msgid "%8d symbolic link"
-msgid_plural "%8d symbolic links"
-msgstr[0] "%8d symbolisk lnk"
-msgstr[1] "%8d symboliska lnkar"
-
-#: e2fsck/unix.c:150
-#, c-format
-msgid " (%d fast symbolic link)\n"
-msgid_plural " (%d fast symbolic links)\n"
-msgstr[0] " (%8d snabb symbolisk lnk)\n"
-msgstr[1] " (%8d snabba symboliska lnkar)\n"
-
-#: e2fsck/unix.c:152
-#, c-format
-msgid "%8d socket\n"
-msgid_plural "%8d sockets\n"
-msgstr[0] "%8d uttag (socket)\n"
-msgstr[1] "%8d uttag (socket)\n"
-
-#: e2fsck/unix.c:155
-#, c-format
-msgid "%8d file\n"
-msgid_plural "%8d files\n"
-msgstr[0] "%8d fil\n"
-msgstr[1] "%8d filer\n"
-
-#: e2fsck/unix.c:169 misc/badblocks.c:781 misc/tune2fs.c:773 misc/util.c:145
+#: e2fsck/unix.c:176 misc/badblocks.c:781 misc/tune2fs.c:791 misc/util.c:151
#: resize/main.c:97
#, c-format
msgid "while determining whether %s is mounted."
msgstr "nr det avgjordes om %s r monterat."
-#: e2fsck/unix.c:184
+#: e2fsck/unix.c:191
#, c-format
msgid "Warning! %s is mounted.\n"
msgstr "Varning! %s r monterat.\n"
-#: e2fsck/unix.c:188
+#: e2fsck/unix.c:195
#, c-format
msgid "%s is mounted. "
msgstr "%s r monterat. "
-#: e2fsck/unix.c:190
+#: e2fsck/unix.c:197
msgid ""
"Cannot continue, aborting.\n"
"\n"
@@ -1991,7 +1905,8 @@ msgstr ""
"Kan inte fortstta, avbryter.\n"
"\n"
-#: e2fsck/unix.c:191
+#: e2fsck/unix.c:198
+#, c-format
msgid ""
"\n"
"\n"
@@ -2005,60 +1920,63 @@ msgstr ""
"ALLVARLIG skada p filsystemet.\n"
"\n"
-#: e2fsck/unix.c:194
+#: e2fsck/unix.c:201
msgid "Do you really want to continue"
msgstr "Vill du verkligen fortstta"
-#: e2fsck/unix.c:196
+#: e2fsck/unix.c:203
+#, c-format
msgid "check aborted.\n"
msgstr "kontroll avbruten.\n"
-#: e2fsck/unix.c:245
+#: e2fsck/unix.c:264
msgid " contains a file system with errors"
msgstr " innehller ett filsystem med fel"
-#: e2fsck/unix.c:247
+#: e2fsck/unix.c:266
msgid " was not cleanly unmounted"
msgstr " var inte flckfritt avmonterat"
-#: e2fsck/unix.c:251
+#: e2fsck/unix.c:270
#, c-format
msgid " has been mounted %u times without being checked"
msgstr " har monterats %u gnger utan att kontrolleras"
-#: e2fsck/unix.c:259
+#: e2fsck/unix.c:278
#, c-format
msgid " has gone %u days without being checked"
msgstr " har inte kontrollerats p %u dagar"
-#: e2fsck/unix.c:268
+#: e2fsck/unix.c:287
msgid ", check forced.\n"
msgstr ", kontroll framtvingad.\n"
-#: e2fsck/unix.c:271
+#: e2fsck/unix.c:290
#, c-format
msgid "%s: clean, %d/%d files, %d/%d blocks"
msgstr "%s: flckfritt, %d/%d filer, %d/%d block"
-#: e2fsck/unix.c:286
+#: e2fsck/unix.c:306
msgid " (check after next mount)"
msgstr " (kontrollera efter nsta montering)"
-#: e2fsck/unix.c:288
+#: e2fsck/unix.c:308
#, c-format
msgid " (check in %ld mounts)"
msgstr " (kontrollera om %ld monteringar)"
-#: e2fsck/unix.c:430
+#: e2fsck/unix.c:450
#, c-format
msgid "ERROR: Couldn't open /dev/null (%s)\n"
msgstr "FEL: Kunde inte ppna /dev/null (%s)\n"
-#: e2fsck/unix.c:501
+#: e2fsck/unix.c:521
+#, c-format
msgid "Invalid EA version.\n"
msgstr "Ogiltig EA-version.\n"
-#: e2fsck/unix.c:510
+#: e2fsck/unix.c:532
+#, c-format
msgid ""
"Extended options are separated by commas, and may take an argument which\n"
"is set off by an equals ('=') sign. Valid raid options are:\n"
@@ -2070,71 +1988,78 @@ msgstr ""
"\tea_ver=<ea_version (1 eller 2)\n"
"\n"
-#: e2fsck/unix.c:568
+#: e2fsck/unix.c:590
#, c-format
msgid "Error validating file descriptor %d: %s\n"
msgstr "Fel vid validering av filidentifierare %d: %s\n"
-#: e2fsck/unix.c:572
+#: e2fsck/unix.c:594
msgid "Invalid completion information file descriptor"
msgstr "Ogiltig filidentifierare fr frloppsinformation"
-#: e2fsck/unix.c:587
+#: e2fsck/unix.c:609
msgid "Only one the options -p/-a, -n or -y may be specified."
msgstr "Endast en av flaggorna -p/-a, -n eller -y kan anges."
-#: e2fsck/unix.c:608
+#: e2fsck/unix.c:630
+#, c-format
msgid "The -t option is not supported on this version of e2fsck.\n"
msgstr "Flaggan -t stdjs inte i denna version av e2fsck.\n"
-#: e2fsck/unix.c:673
+#: e2fsck/unix.c:695
+#, c-format
msgid "Byte-swapping filesystems not compiled in this version of e2fsck\n"
-msgstr "Bytevxling av filsystem r inte inkompilerat i denna version av e2fsck\n"
+msgstr ""
+"Bytevxling av filsystem r inte inkompilerat i denna version av e2fsck\n"
-#: e2fsck/unix.c:690 misc/tune2fs.c:444 misc/tune2fs.c:699 misc/tune2fs.c:716
+#: e2fsck/unix.c:718 misc/tune2fs.c:458 misc/tune2fs.c:716 misc/tune2fs.c:733
#, c-format
msgid "Unable to resolve '%s'"
msgstr "Kan inte hitta \"%s\""
-#: e2fsck/unix.c:716
+#: e2fsck/unix.c:744
+#, c-format
msgid "Incompatible options not allowed when byte-swapping.\n"
msgstr "Inkompatibla flaggor inte tilltna vid bytevxling.\n"
-#: e2fsck/unix.c:723
+#: e2fsck/unix.c:751
+#, c-format
msgid "The -c and the -l/-L options may not be both used at the same time.\n"
msgstr "Flaggorna -c och -l/-L kan inte bda anvndas p samma gng.\n"
-#: e2fsck/unix.c:801
+#: e2fsck/unix.c:829
+#, c-format
msgid "Error: ext2fs library version out of date!\n"
msgstr "Fel: ext2fs-bibliotekversion inaktuell!\n"
-#: e2fsck/unix.c:809
+#: e2fsck/unix.c:837
msgid "while trying to initialize program"
msgstr "vid frsk att initiera program"
-#: e2fsck/unix.c:823
+#: e2fsck/unix.c:851
#, c-format
msgid "\tUsing %s, %s\n"
msgstr "\tAnvnder %s, %s\n"
-#: e2fsck/unix.c:835
+#: e2fsck/unix.c:863
msgid "need terminal for interactive repairs"
msgstr "behver terminal fr interaktiva reparationer"
-#: e2fsck/unix.c:871
+#: e2fsck/unix.c:905
#, c-format
msgid "%s trying backup blocks...\n"
msgstr "%s frsker med reservblock ...\n"
-#: e2fsck/unix.c:872
+#: e2fsck/unix.c:906
msgid "Couldn't find ext2 superblock,"
msgstr "Kunde inte hitta ext2-superblock,"
-#: e2fsck/unix.c:873
+#: e2fsck/unix.c:907
msgid "Group descriptors look bad..."
msgstr "Gruppbeskrivarna ser trasiga ut ..."
-#: e2fsck/unix.c:884
+#: e2fsck/unix.c:918
+#, c-format
msgid ""
"The filesystem revision is apparently too high for this version of e2fsck.\n"
"(Or the filesystem superblock is corrupt)\n"
@@ -2144,20 +2069,23 @@ msgstr ""
"(Eller s r filsystemets superblock trasigt)\n"
"\n"
-#: e2fsck/unix.c:890
+#: e2fsck/unix.c:924
+#, c-format
msgid "Could this be a zero-length partition?\n"
msgstr "Kan detta vara en nollngdspartition?\n"
-#: e2fsck/unix.c:892
+#: e2fsck/unix.c:926
#, c-format
msgid "You must have %s access to the filesystem or be root\n"
msgstr "Du mste ha %s-tkomst till filsystemet eller vara root\n"
-#: e2fsck/unix.c:897
+#: e2fsck/unix.c:931
+#, c-format
msgid "Possibly non-existent or swap device?\n"
msgstr "Kanske inte existerar eller vxlingsenhet?\n"
-#: e2fsck/unix.c:900
+#: e2fsck/unix.c:934
+#, c-format
msgid ""
"Disk write-protected; use the -n option to do a read-only\n"
"check of the device.\n"
@@ -2165,34 +2093,39 @@ msgstr ""
"Skrivskyddad disk; anvnd flaggan -n fr att gra en lsningskontroll\n"
"av enheten.\n"
-#: e2fsck/unix.c:916
+#: e2fsck/unix.c:950
msgid "Get a newer version of e2fsck!"
msgstr "Hmta en nyare version av e2fsck!"
-#: e2fsck/unix.c:937
+#: e2fsck/unix.c:971
#, c-format
msgid "while checking ext3 journal for %s"
msgstr "vid kontroll av ext3-journal fr %s"
-#: e2fsck/unix.c:948
-msgid "Warning: skipping journal recovery because doing a read-only filesystem check.\n"
-msgstr "Varning: hoppar ver journalterhmtning eftersom en lsningskontroll av filsystem grs.\n"
+#: e2fsck/unix.c:982
+#, c-format
+msgid ""
+"Warning: skipping journal recovery because doing a read-only filesystem "
+"check.\n"
+msgstr ""
+"Varning: hoppar ver journalterhmtning eftersom en lsningskontroll av "
+"filsystem grs.\n"
-#: e2fsck/unix.c:961
+#: e2fsck/unix.c:995
#, c-format
msgid "unable to set superblock flags on %s\n"
msgstr "kan inte stta superblocksflaggor p %s\n"
-#: e2fsck/unix.c:967
+#: e2fsck/unix.c:1001
#, c-format
msgid "while recovering ext3 journal of %s"
msgstr "vid terhmtning av ext3-journal fr %s"
-#: e2fsck/unix.c:996
+#: e2fsck/unix.c:1030
msgid "Warning: compression support is experimental.\n"
msgstr "Varning: komprimeringsstd r experimentellt.\n"
-#: e2fsck/unix.c:1001
+#: e2fsck/unix.c:1035
#, c-format
msgid ""
"E2fsck not compiled with HTREE support,\n"
@@ -2201,37 +2134,39 @@ msgstr ""
"E2fsck r inte kompilerat med HTREE-std,\n"
"\tmen filsystem %s har HTREE-kataloger.\n"
-#: e2fsck/unix.c:1044
+#: e2fsck/unix.c:1078
#, c-format
msgid "%s: Filesystem byte order already normalized.\n"
msgstr "%s: Filsystemets byteordning redan normaliserad.\n"
-#: e2fsck/unix.c:1064
+#: e2fsck/unix.c:1098
msgid "while reading bad blocks inode"
msgstr "vid lsning av inod fr dliga block"
-#: e2fsck/unix.c:1066
+#: e2fsck/unix.c:1100
+#, c-format
msgid "This doesn't bode well, but we'll try to go on...\n"
msgstr "Detta bdar inte gott, men vi skall frska att fortstta ...\n"
-#: e2fsck/unix.c:1073
+#: e2fsck/unix.c:1107
+#, c-format
msgid "Restarting e2fsck from the beginning...\n"
msgstr "Startar om e2fsck frn brjan ...\n"
-#: e2fsck/unix.c:1077
+#: e2fsck/unix.c:1111
msgid "while resetting context"
msgstr "vid terstllning av omgivning"
-#: e2fsck/unix.c:1084
+#: e2fsck/unix.c:1118
#, c-format
msgid "%s: e2fsck canceled.\n"
msgstr "%s: e2fsck instlld.\n"
-#: e2fsck/unix.c:1089
+#: e2fsck/unix.c:1123
msgid "aborted"
msgstr "avbruten"
-#: e2fsck/unix.c:1097
+#: e2fsck/unix.c:1131
#, c-format
msgid ""
"\n"
@@ -2240,12 +2175,12 @@ msgstr ""
"\n"
"%s: ***** FILSYSTEMET MODIFIERADES *****\n"
-#: e2fsck/unix.c:1100
+#: e2fsck/unix.c:1134
#, c-format
msgid "%s: ***** REBOOT LINUX *****\n"
msgstr "%s: ***** STARTA OM LINUX *****\n"
-#: e2fsck/unix.c:1106
+#: e2fsck/unix.c:1140
#, c-format
msgid ""
"\n"
@@ -2397,11 +2332,13 @@ msgstr "klar \n"
#, c-format
msgid ""
"Usage: %s [-b block_size] [-i input_file] [-o output_file] [-svwnf]\n"
-" [-c blocks_at_once] [-p num_passes] [-t test_pattern [-t test_pattern [...]]]\n"
+" [-c blocks_at_once] [-p num_passes] [-t test_pattern [-t test_pattern "
+"[...]]]\n"
" device [last_block [start_block]]\n"
msgstr ""
"Anvndning: %s [-b blockstorlek] [-i infil] [-o utfile] [-svwnf]\n"
-" [-c block_t_gngen] [-p antal_pass] [-t testmnster [-t testmnster [...]]]\n"
+" [-c block_t_gngen] [-p antal_pass] [-t testmnster [-t testmnster "
+"[...]]]\n"
" enhet [sista_block [start_block]]\n"
#: misc/badblocks.c:227
@@ -2480,7 +2417,7 @@ msgstr ""
msgid "during test data write, block %lu"
msgstr "vid testdataskrivning, block %lu"
-#: misc/badblocks.c:788 misc/util.c:152
+#: misc/badblocks.c:788 misc/util.c:158
#, c-format
msgid "%s is mounted; "
msgstr "%s r monterat, "
@@ -2493,7 +2430,7 @@ msgstr "badblocks framtvingat nd. Hoppas /etc/mtab r felaktig.\n"
msgid "it's not safe to run badblocks!\n"
msgstr "det r inte skert att kra badblocks!\n"
-#: misc/badblocks.c:853 misc/mke2fs.c:898
+#: misc/badblocks.c:853 misc/mke2fs.c:926
#, c-format
msgid "bad block size - %s"
msgstr "felaktig blockstorlek - %s"
@@ -2528,7 +2465,7 @@ msgstr ""
msgid "while trying to determine device size"
msgstr "vid frsk att avgra enhetsstorlek"
-#: misc/badblocks.c:972 misc/mke2fs.c:1071
+#: misc/badblocks.c:972 misc/mke2fs.c:1099
#, c-format
msgid "bad blocks count - %s"
msgstr "felaktig blockantal - %s"
@@ -2600,11 +2537,11 @@ msgstr "vid sttning av version p %s"
msgid "Couldn't allocate path variable in chattr_dir_proc"
msgstr "Kunde inte allokera skvgsvariabel i chattr_dir_proc"
-#: misc/chattr.c:287
+#: misc/chattr.c:291
msgid "= is incompatible with - and +\n"
msgstr "= r inkompatibelt med - och +\n"
-#: misc/chattr.c:295
+#: misc/chattr.c:299
msgid "Must use '-v', =, - or +\n"
msgstr "Mste anvnda \"-v\", =, - eller +\n"
@@ -2632,10 +2569,12 @@ msgid "Backup"
msgstr "Reserv"
#: misc/dumpe2fs.c:130
+#, c-format
msgid ", Group descriptors at "
msgstr ", Gruppbeskrivare vid "
#: misc/dumpe2fs.c:135
+#, c-format
msgid " Group descriptor at "
msgstr " Gruppbeskrivare vid "
@@ -2681,7 +2620,7 @@ msgstr "vid utskrift av lista ver dliga block"
msgid "Bad blocks: %d"
msgstr "Dliga block: %d"
-#: misc/dumpe2fs.c:227 misc/tune2fs.c:150
+#: misc/dumpe2fs.c:227 misc/tune2fs.c:153
msgid "while reading journal superblock"
msgstr "vid lsning av journalsuperblock"
@@ -2708,16 +2647,18 @@ msgstr ""
"Journalstart: %d\n"
"Journalens anvndarantal: %d\n"
-#: misc/dumpe2fs.c:307 misc/mke2fs.c:1085
+#: misc/dumpe2fs.c:307 misc/mke2fs.c:1113
#, c-format
msgid "\tUsing %s\n"
msgstr "\tAnvnder %s\n"
-#: misc/dumpe2fs.c:334 misc/e2image.c:488 misc/tune2fs.c:760 resize/main.c:230
+#: misc/dumpe2fs.c:334 misc/e2image.c:566 misc/tune2fs.c:778 resize/main.c:234
+#, c-format
msgid "Couldn't find valid filesystem superblock.\n"
msgstr "Kunde inte hitta giltigt filsystemssuperblock.\n"
#: misc/dumpe2fs.c:345
+#, c-format
msgid "Note: This is a byte-swapped filesystem\n"
msgstr "Observera: Detta r ett bytevxlat filsystem\n"
@@ -2731,8 +2672,8 @@ msgstr ""
"%s: %s: fel vid lsning av bitkartor: %s\n"
#: misc/e2image.c:50
-#, c-format
-msgid "Usage: %s [-r] device file\n"
+#, fuzzy, c-format
+msgid "Usage: %s [-r] device image_file\n"
msgstr "Anvndning: %s [-r] enhet fil\n"
#: misc/e2image.c:61
@@ -2766,34 +2707,42 @@ msgid "e2label: cannot open %s\n"
msgstr "e2label: kan inte ppna %s\n"
#: misc/e2label.c:62
+#, c-format
msgid "e2label: cannot seek to superblock\n"
msgstr "e2label: kan inte ska till superblock\n"
#: misc/e2label.c:67
+#, c-format
msgid "e2label: error reading superblock\n"
msgstr "e2label: fel vid lsning av superblock\n"
#: misc/e2label.c:71
+#, c-format
msgid "e2label: not an ext2 filesystem\n"
msgstr "e2label: inte ett ext2-filsystem\n"
-#: misc/e2label.c:96 misc/tune2fs.c:867
+#: misc/e2label.c:96 misc/tune2fs.c:885
+#, c-format
msgid "Warning: label too long, truncating.\n"
msgstr "Varning: etikett fr lng, avkortar.\n"
#: misc/e2label.c:99
+#, c-format
msgid "e2label: cannot seek to superblock again\n"
msgstr "e2label: kan inte ska till superblock igen\n"
#: misc/e2label.c:104
+#, c-format
msgid "e2label: error writing superblock\n"
msgstr "e2label: fel vid skrivning av superblock\n"
-#: misc/e2label.c:116 misc/tune2fs.c:439
+#: misc/e2label.c:116 misc/tune2fs.c:450
+#, c-format
msgid "Usage: e2label device [newlabel]\n"
msgstr "Anvndning: e2label enhet [ny-etikett]\n"
#: misc/findsuper.c:126
+#, c-format
msgid "Usage: findsuper device [skipbytes [startkb]]\n"
msgstr "Anvndning: findsuper enhet [hoppbyte [startkb]]\n"
@@ -2803,6 +2752,7 @@ msgid "skipbytes should be a number, not %s\n"
msgstr "hoppbyte skall vara ett tal, inte %s\n"
#: misc/findsuper.c:137
+#, c-format
msgid "skipbytes must be a multiple of the sector size\n"
msgstr "hoppbyte mste vara en mutipel av sektorstorleken\n"
@@ -2822,6 +2772,7 @@ msgid "starting at %Ld, with %d byte increments\n"
msgstr "startar vid %Ld, med %d bytesteg\n"
#: misc/findsuper.c:158
+#, c-format
msgid " thisoff block fs_blk_sz blksz grp last_mount\n"
msgstr " denna_pos block fs_blk_st blkst grp senaste_montering\n"
@@ -2941,7 +2892,7 @@ msgstr "Vid lsning av flaggor p %s"
msgid "While reading version on %s"
msgstr "Vid lsning av version p %s"
-#: misc/mke2fs.c:91
+#: misc/mke2fs.c:92
#, c-format
msgid ""
"Usage: %s [-c|-t|-l filename] [-b block-size] [-f fragment-size]\n"
@@ -2956,35 +2907,35 @@ msgstr ""
"\t[-L volym-etikett] [-M senast-monterad-katalog] [-O funktion[,...]]\n"
"\t[-r fs-revision] [-R raid_flaggor] [-qvSV] enhet [blockantal]\n"
-#: misc/mke2fs.c:235
+#: misc/mke2fs.c:264
#, c-format
msgid "Running command: %s\n"
msgstr "Kr kommando: %s\n"
-#: misc/mke2fs.c:239
+#: misc/mke2fs.c:268
#, c-format
msgid "while trying run '%s'"
msgstr "vid frsk att kra \"%s\""
-#: misc/mke2fs.c:246
+#: misc/mke2fs.c:275
msgid "while processing list of bad blocks from program"
msgstr "vid bearbetning av lista ver dliga block frn program"
-#: misc/mke2fs.c:273
+#: misc/mke2fs.c:302
#, c-format
msgid "Block %d in primary superblock/group descriptor area bad.\n"
msgstr "Block %d i primr superblock-/gruppbeskrivare r felaktigt.\n"
-#: misc/mke2fs.c:275
+#: misc/mke2fs.c:304
#, c-format
msgid "Blocks %d through %d must be good in order to build a filesystem.\n"
msgstr "Block %d till %d mste vara bra fr att bygga ett filsystem.\n"
-#: misc/mke2fs.c:278
+#: misc/mke2fs.c:307
msgid "Aborting....\n"
msgstr "Avbryter...\n"
-#: misc/mke2fs.c:298
+#: misc/mke2fs.c:327
#, c-format
msgid ""
"Warning: the backup superblock/group descriptors at block %d contain\n"
@@ -2995,23 +2946,23 @@ msgstr ""
"\tdliga block.\n"
"\n"
-#: misc/mke2fs.c:316
+#: misc/mke2fs.c:345
msgid "while marking bad blocks as used"
msgstr "vid markering av dliga block som anvnda"
-#: misc/mke2fs.c:374
+#: misc/mke2fs.c:403
msgid "done \n"
msgstr "klar \n"
-#: misc/mke2fs.c:409
+#: misc/mke2fs.c:438
msgid "while allocating zeroizing buffer"
msgstr "vid allokering av nollstllningsbuffert"
-#: misc/mke2fs.c:450
+#: misc/mke2fs.c:479
msgid "Writing inode tables: "
msgstr "Skriver inodstabeller: "
-#: misc/mke2fs.c:461
+#: misc/mke2fs.c:490
#, c-format
msgid ""
"\n"
@@ -3020,67 +2971,67 @@ msgstr ""
"\n"
"Kunde inte skriva %d block i inodstabell som brjar vid %d: %s\n"
-#: misc/mke2fs.c:484
+#: misc/mke2fs.c:513
msgid "while creating root dir"
msgstr "vid skapande av rotkatalog"
-#: misc/mke2fs.c:491
+#: misc/mke2fs.c:520
msgid "while reading root inode"
msgstr "vid lsning av rotinod"
-#: misc/mke2fs.c:500
+#: misc/mke2fs.c:529
msgid "while setting root inode ownership"
msgstr "vid instllning av rotinodens garskap"
-#: misc/mke2fs.c:518
+#: misc/mke2fs.c:547
msgid "while creating /lost+found"
msgstr "vid skapande av /lost+found"
-#: misc/mke2fs.c:525
+#: misc/mke2fs.c:554
msgid "while looking up /lost+found"
msgstr "vid skning efter /lost+found"
-#: misc/mke2fs.c:535
+#: misc/mke2fs.c:564
msgid "while expanding /lost+found"
msgstr "vid utvidgning av /lost+found"
-#: misc/mke2fs.c:551
+#: misc/mke2fs.c:580
msgid "while setting bad block inode"
msgstr "vid instllning av inod fr dliga block"
-#: misc/mke2fs.c:583
+#: misc/mke2fs.c:612
#, c-format
msgid "Out of memory erasing sectors %d-%d\n"
msgstr "Slut p mine vid radering av sektorer %d-%d\n"
-#: misc/mke2fs.c:593
+#: misc/mke2fs.c:622
#, c-format
msgid "Warning: could not read block 0: %s\n"
msgstr "Varning: kune inte lsa block 0: %s\n"
-#: misc/mke2fs.c:609
+#: misc/mke2fs.c:638
#, c-format
msgid "Warning: could not erase sector %d: %s\n"
msgstr "Varning: kunde inte radera sektor %d: %s\n"
-#: misc/mke2fs.c:625
+#: misc/mke2fs.c:654
msgid "while initializing journal superblock"
msgstr "vid initiering av journalsuperblock"
-#: misc/mke2fs.c:631
+#: misc/mke2fs.c:660
msgid "Zeroing journal device: "
msgstr "Nollstller journalenhet: "
-#: misc/mke2fs.c:638
+#: misc/mke2fs.c:667
#, c-format
msgid "while zeroing journal device (block %u, count %d)"
msgstr "vid nollstllning av journalenhet (block %u, antal %d)"
-#: misc/mke2fs.c:649
+#: misc/mke2fs.c:678
msgid "while writing journal superblock"
msgstr "vid skrivning av journalsuperblock"
-#: misc/mke2fs.c:664
+#: misc/mke2fs.c:693
#, c-format
msgid ""
"warning: %d blocks unused.\n"
@@ -3089,77 +3040,81 @@ msgstr ""
"varning: %d block oanvnda.\n"
"\n"
-#: misc/mke2fs.c:669
+#: misc/mke2fs.c:698
#, c-format
msgid "Filesystem label=%s\n"
msgstr "Filsystemsetikett=%s\n"
-#: misc/mke2fs.c:670
+#: misc/mke2fs.c:699
msgid "OS type: "
msgstr "OS-typ: "
-#: misc/mke2fs.c:675
+#: misc/mke2fs.c:704
msgid "(unknown os)"
msgstr "(oknt os)"
-#: misc/mke2fs.c:678
+#: misc/mke2fs.c:707
#, c-format
msgid "Block size=%u (log=%u)\n"
msgstr "Blockstorlek=%u (log=%u)\n"
-#: misc/mke2fs.c:680
+#: misc/mke2fs.c:709
#, c-format
msgid "Fragment size=%u (log=%u)\n"
msgstr "Fragmentstorlek=%u (log=%u)\n"
-#: misc/mke2fs.c:682
+#: misc/mke2fs.c:711
#, c-format
msgid "%u inodes, %u blocks\n"
msgstr "%u inoder, %u block\n"
-#: misc/mke2fs.c:684
+#: misc/mke2fs.c:713
#, c-format
msgid "%u blocks (%2.2f%%) reserved for the super user\n"
msgstr "%u block (%2.2f%%) reserverade fr superanvndaren\n"
-#: misc/mke2fs.c:687
+#: misc/mke2fs.c:716
#, c-format
msgid "First data block=%u\n"
msgstr "Frsta datablock=%u\n"
-#: misc/mke2fs.c:689
+#: misc/mke2fs.c:718
#, c-format
msgid "%u block groups\n"
msgstr "%u blockgrupper\n"
-#: misc/mke2fs.c:691
+#: misc/mke2fs.c:720
#, c-format
msgid "%u block group\n"
msgstr "%u blockgrupp\n"
-#: misc/mke2fs.c:692
+#: misc/mke2fs.c:721
#, c-format
msgid "%u blocks per group, %u fragments per group\n"
msgstr "%u block per grupp, %u fragment per grupp\n"
-#: misc/mke2fs.c:694
+#: misc/mke2fs.c:723
#, c-format
msgid "%u inodes per group\n"
msgstr "%u inoder per grupp\n"
-#: misc/mke2fs.c:701
+#: misc/mke2fs.c:730
+#, c-format
msgid "Superblock backups stored on blocks: "
msgstr "Superblockkopior lagrade p block: "
-#: misc/mke2fs.c:751
+#: misc/mke2fs.c:780
+#, c-format
msgid "Couldn't allocate memory to parse raid options!\n"
msgstr "Kunde inte allokera minne fr att tolka raid-flaggor!\n"
-#: misc/mke2fs.c:776
+#: misc/mke2fs.c:805
+#, c-format
msgid "Invalid stride parameter.\n"
msgstr "Ogiltig stride-parameter.\n"
-#: misc/mke2fs.c:784
+#: misc/mke2fs.c:813
+#, c-format
msgid ""
"\n"
"Bad raid options specified.\n"
@@ -3181,83 +3136,86 @@ msgstr ""
"\tstride=<stride-lngd i block>\n"
"\n"
-#: misc/mke2fs.c:902
+#: misc/mke2fs.c:930
#, c-format
msgid "Warning: blocksize %d not usable on most systems.\n"
msgstr "Varning: blockstorlek %d r inte anvndbar p de flesta system.\n"
-#: misc/mke2fs.c:919
+#: misc/mke2fs.c:947
#, c-format
msgid "bad fragment size - %s"
msgstr "felaktig fragmentstorlek - %s"
-#: misc/mke2fs.c:925
+#: misc/mke2fs.c:953
+#, c-format
msgid "Warning: fragments not supported. Ignoring -f option\n"
msgstr "Varning: fragment stds inte. Ignorerar -f-flagga\n"
-#: misc/mke2fs.c:932
+#: misc/mke2fs.c:960
msgid "Illegal number for blocks per group"
msgstr "Ogiltigt antal fr block per grupp"
-#: misc/mke2fs.c:937
+#: misc/mke2fs.c:965
msgid "blocks per group must be multiple of 8"
msgstr "block per grupp mste vara en multipel av 8"
-#: misc/mke2fs.c:947
+#: misc/mke2fs.c:975
#, c-format
msgid "bad inode ratio %s (min %d/max %d"
msgstr "felaktigt inodsfrhllande %s (min %d/max %d)"
-#: misc/mke2fs.c:966
+#: misc/mke2fs.c:994
msgid "in malloc for bad_blocks_filename"
msgstr "i malloc fr bad_blocks_filename"
-#: misc/mke2fs.c:975
+#: misc/mke2fs.c:1003
#, c-format
msgid "bad reserved blocks percent - %s"
msgstr "felaktig procent reserverade block - %s"
-#: misc/mke2fs.c:1007
+#: misc/mke2fs.c:1035
#, c-format
msgid "bad inode size - %s"
msgstr "felaktig inodsstorlek - %s"
-#: misc/mke2fs.c:1043 misc/tune2fs.c:294
+#: misc/mke2fs.c:1071 misc/tune2fs.c:302
#, c-format
msgid "Invalid filesystem option set: %s\n"
msgstr "Ogiltig filsystemsflagga satt: %s\n"
-#: misc/mke2fs.c:1112 misc/mke2fs.c:1449
+#: misc/mke2fs.c:1140 misc/mke2fs.c:1477
#, c-format
msgid "while trying to open journal device %s\n"
msgstr "vid frsk att ppna journalenhet %s\n"
-#: misc/mke2fs.c:1118
+#: misc/mke2fs.c:1146
#, c-format
msgid "Journal dev blocksize (%d) smaller than minimum blocksize %d\n"
msgstr "Journalenhetens blockstorlek (%d) mindre n minsta blockstorlek %d\n"
-#: misc/mke2fs.c:1132
+#: misc/mke2fs.c:1160
#, c-format
msgid "%d-byte blocks too big for system (max %d)"
msgstr "%d-byteblock fr stort fr systemet (max %d)"
-#: misc/mke2fs.c:1136
+#: misc/mke2fs.c:1164
#, c-format
-msgid "Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
-msgstr "Varning: %d-byteblock fr stort fr systemet (max %d), tvingas fortstta\n"
+msgid ""
+"Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
+msgstr ""
+"Varning: %d-byteblock fr stort fr systemet (max %d), tvingas fortstta\n"
# "Ett" fr att detta stts in i annan strng dr det fregs av "a".
# ven "journal" kan sttas in p samma plats. Felrapporterat.
-#: misc/mke2fs.c:1161
+#: misc/mke2fs.c:1189
msgid "filesystem"
msgstr "ett filsystem"
-#: misc/mke2fs.c:1174 resize/main.c:264
+#: misc/mke2fs.c:1202 resize/main.c:268
msgid "while trying to determine filesystem size"
msgstr "vid frsk att avgra filsystemstorlek"
-#: misc/mke2fs.c:1180
+#: misc/mke2fs.c:1208
msgid ""
"Couldn't determine device size; you must specify\n"
"the size of the filesystem\n"
@@ -3265,7 +3223,7 @@ msgstr ""
"Kunde inte avgra enhetsstorlek; du mste ange\n"
"storleken p filsystemet\n"
-#: misc/mke2fs.c:1187
+#: misc/mke2fs.c:1215
msgid ""
"Device size reported to be zero. Invalid partition specified, or\n"
"\tpartition table wasn't reread after running fdisk, due to\n"
@@ -3277,58 +3235,58 @@ msgstr ""
"\tav en modifierad partition anvnds och r i bruk. Du kan behva\n"
"\tstarta om fr att lsa om din partitionstabell.\n"
-#: misc/mke2fs.c:1205
+#: misc/mke2fs.c:1233
msgid "Filesystem larger than apparent device size."
msgstr "Filsystem strre n synbar enhetsstorlek."
-#: misc/mke2fs.c:1227
+#: misc/mke2fs.c:1255
msgid "while trying to determine hardware sector size"
msgstr "vid frsk att avgra hrdvarusektorstorlek"
-#: misc/mke2fs.c:1241
+#: misc/mke2fs.c:1269
msgid "blocks per group count out of range"
msgstr "antal block per grupp utanfr giltigt intervall"
-#: misc/mke2fs.c:1251
+#: misc/mke2fs.c:1279
#, c-format
msgid "bad inode size %d (min %d/max %d)"
msgstr "felaktig inodstorlek %d (min %d/max %d)"
-#: misc/mke2fs.c:1257
+#: misc/mke2fs.c:1285
#, c-format
msgid "Warning: %d-byte inodes not usable on most systems\n"
msgstr "Varning: %d-byteinoder inte anvndbara p de flesta system\n"
-#: misc/mke2fs.c:1308
+#: misc/mke2fs.c:1336
msgid "while setting up superblock"
msgstr "vid uppsttning av superblock"
-#: misc/mke2fs.c:1342
+#: misc/mke2fs.c:1370
#, c-format
msgid "unknown os - %s"
msgstr "oknt os - %s"
-#: misc/mke2fs.c:1396
+#: misc/mke2fs.c:1424
msgid "while trying to allocate filesystem tables"
msgstr "vid frsk att allokera filsystemstabeller"
-#: misc/mke2fs.c:1427
+#: misc/mke2fs.c:1455
#, c-format
msgid "while zeroing block %u at end of filesystem"
msgstr "vid nollstllning av block %u vid slutet av filsystem"
# "En" fr att detta stts in i annan strng dr det fregs av "a".
# ven "filsystem" kan sttas in p samma plats. Felrapporterat.
-#: misc/mke2fs.c:1442 misc/tune2fs.c:376
+#: misc/mke2fs.c:1470 misc/tune2fs.c:387
msgid "journal"
msgstr "en journal"
-#: misc/mke2fs.c:1454
+#: misc/mke2fs.c:1482
#, c-format
msgid "Adding journal to device %s: "
msgstr "Lgger till journal till enhet %s: "
-#: misc/mke2fs.c:1461
+#: misc/mke2fs.c:1489
#, c-format
msgid ""
"\n"
@@ -3337,16 +3295,17 @@ msgstr ""
"\n"
"\tvid frsk att lgga till journal till enhet %s"
-#: misc/mke2fs.c:1466 misc/mke2fs.c:1490 misc/tune2fs.c:404 misc/tune2fs.c:418
+#: misc/mke2fs.c:1494 misc/mke2fs.c:1518 misc/tune2fs.c:415 misc/tune2fs.c:429
+#, c-format
msgid "done\n"
msgstr "klar\n"
-#: misc/mke2fs.c:1478
+#: misc/mke2fs.c:1506
#, c-format
msgid "Creating journal (%d blocks): "
msgstr "Skapar journal (%d block): "
-#: misc/mke2fs.c:1486
+#: misc/mke2fs.c:1514
msgid ""
"\n"
"\twhile trying to create journal"
@@ -3354,11 +3313,13 @@ msgstr ""
"\n"
"\tvid frsk att skapa journal"
-#: misc/mke2fs.c:1495
+#: misc/mke2fs.c:1523
+#, c-format
msgid "Writing superblocks and filesystem accounting information: "
msgstr "Skriver superblock och filsystemsbokfringsinformation: "
-#: misc/mke2fs.c:1500
+#: misc/mke2fs.c:1528
+#, c-format
msgid ""
"\n"
"Warning, had trouble writing out superblocks."
@@ -3366,7 +3327,8 @@ msgstr ""
"\n"
"Varning, hade problem att skriva ut superblock."
-#: misc/mke2fs.c:1503
+#: misc/mke2fs.c:1531
+#, c-format
msgid ""
"done\n"
"\n"
@@ -3374,7 +3336,8 @@ msgstr ""
"klar\n"
"\n"
-#: misc/mklost+found.c:48
+#: misc/mklost+found.c:49
+#, c-format
msgid "Usage: mklost+found\n"
msgstr "Anvndning: mklost+found\n"
@@ -3410,11 +3373,11 @@ msgstr "HDIO_GETGEO ioctl"
msgid "BLKGETSIZE ioctl"
msgstr "BLKGETSIZE ioctl"
-#: misc/tune2fs.c:74
+#: misc/tune2fs.c:77
msgid "Please run e2fsck on the filesystem.\n"
msgstr "Kr e2fsck p filsystemet.\n"
-#: misc/tune2fs.c:81
+#: misc/tune2fs.c:84
#, c-format
msgid ""
"Usage: %s [-c max-mounts-count] [-e errors-behavior] [-g group]\n"
@@ -3432,53 +3395,53 @@ msgstr ""
"\t[-M senast-monterad-katalog] [-O [^]funktion[,...]]\n"
"\t[-T senaste-kontroll-tid] [-U UUID] enhet\n"
-#: misc/tune2fs.c:138
+#: misc/tune2fs.c:141
msgid "while trying to open external journal"
msgstr "vid frsk att ppna extern journal"
-#: misc/tune2fs.c:142
+#: misc/tune2fs.c:145
#, c-format
msgid "%s is not a journal device.\n"
msgstr "%s r inte en journalenhet.\n"
-#: misc/tune2fs.c:157
+#: misc/tune2fs.c:160
msgid "Journal superblock not found!\n"
msgstr "Journalsuperblock inte funnet!\n"
-#: misc/tune2fs.c:169
+#: misc/tune2fs.c:172
msgid "Filesystem's UUID not found on journal device.\n"
msgstr "Filsystems UUID inte funnet p journalenhet.\n"
-#: misc/tune2fs.c:190
+#: misc/tune2fs.c:193
msgid "Journal NOT removed\n"
msgstr "Journal INTE borttagen\n"
-#: misc/tune2fs.c:196
+#: misc/tune2fs.c:199
msgid "Journal removed\n"
msgstr "Journal borttagen\n"
-#: misc/tune2fs.c:228
+#: misc/tune2fs.c:231
msgid "while reading journal inode"
msgstr "vid lsning av journalinod"
-#: misc/tune2fs.c:235
+#: misc/tune2fs.c:238
msgid "while reading bitmaps"
msgstr "vid lsning av bitkartor"
-#: misc/tune2fs.c:242
+#: misc/tune2fs.c:245
msgid "while clearing journal inode"
msgstr "vid nollstllning av journalinod"
-#: misc/tune2fs.c:253
+#: misc/tune2fs.c:256
msgid "while writing journal inode"
msgstr "vid skrivning av journalinod"
-#: misc/tune2fs.c:268
+#: misc/tune2fs.c:271
#, c-format
msgid "Invalid mount option set: %s\n"
msgstr "Ogiltig monteringsflagga satt: %s\n"
-#: misc/tune2fs.c:309
+#: misc/tune2fs.c:317
msgid ""
"The has_journal flag may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
@@ -3486,7 +3449,7 @@ msgstr ""
"Flaggan has_journal fr endast nollstllas nr filsystemet r\n"
"omonterat eller monterat enbart fr lsning.\n"
-#: misc/tune2fs.c:317
+#: misc/tune2fs.c:325
msgid ""
"The needs_recovery flag is set. Please run e2fsck before clearing\n"
"the has_journal flag.\n"
@@ -3494,11 +3457,11 @@ msgstr ""
"Flaggan needs_recovery r satt. Kr e2fsck fre flaggan has_journal\n"
"nollstlls.\n"
-#: misc/tune2fs.c:371
+#: misc/tune2fs.c:382
msgid "The filesystem already has a journal.\n"
msgstr "Filsystemet har redan en journal.\n"
-#: misc/tune2fs.c:388
+#: misc/tune2fs.c:399
#, c-format
msgid ""
"\n"
@@ -3507,21 +3470,21 @@ msgstr ""
"\n"
"\tvid frsk att ppna journal p %s\n"
-#: misc/tune2fs.c:392
+#: misc/tune2fs.c:403
#, c-format
msgid "Creating journal on device %s: "
msgstr "Skapar journal p enhet %s: "
-#: misc/tune2fs.c:400
+#: misc/tune2fs.c:411
#, c-format
msgid "while adding filesystem to journal on %s"
msgstr "vid tillgg av filsystem till journal p %s"
-#: misc/tune2fs.c:406
+#: misc/tune2fs.c:417
msgid "Creating journal inode: "
msgstr "Skapar journalinod: "
-#: misc/tune2fs.c:415
+#: misc/tune2fs.c:426
msgid ""
"\n"
"\twhile trying to create journal file"
@@ -3529,95 +3492,95 @@ msgstr ""
"\n"
"\tvid frsk att skapa journalfil"
-#: misc/tune2fs.c:478
+#: misc/tune2fs.c:492
#, c-format
msgid "Couldn't parse date/time specifier: %s"
msgstr "Kunde inte tolka datum-/tidsangivelse: %s"
-#: misc/tune2fs.c:500 misc/tune2fs.c:513
+#: misc/tune2fs.c:514 misc/tune2fs.c:527
#, c-format
msgid "bad mounts count - %s"
msgstr "felaktigt antal monteringar - %s"
-#: misc/tune2fs.c:529
+#: misc/tune2fs.c:543
#, c-format
msgid "bad error behavior - %s"
msgstr "felaktigt felbeteende - %s"
-#: misc/tune2fs.c:552
+#: misc/tune2fs.c:566
#, c-format
msgid "bad gid/group name - %s"
msgstr "felaktigt gid/gruppnamn - %s"
-#: misc/tune2fs.c:585
+#: misc/tune2fs.c:599
#, c-format
msgid "bad interval - %s"
msgstr "felaktigt intervall - %s"
-#: misc/tune2fs.c:613
+#: misc/tune2fs.c:627
#, c-format
msgid "bad reserved block ratio - %s"
msgstr "felaktig andel reserverade block - %s"
-#: misc/tune2fs.c:628
+#: misc/tune2fs.c:642
msgid "-o may only be specified once"
msgstr "-o fr endast anges en gng"
-#: misc/tune2fs.c:638
+#: misc/tune2fs.c:652
msgid "-O may only be specified once"
msgstr "-O fr endast anges en gng"
-#: misc/tune2fs.c:648
+#: misc/tune2fs.c:662
#, c-format
msgid "bad reserved blocks count - %s"
msgstr "felaktigt antal reserverade block - %s"
-#: misc/tune2fs.c:677
+#: misc/tune2fs.c:691
#, c-format
msgid "bad uid/user name - %s"
msgstr "felagtigt uid/anvndarnamn - %s"
-#: misc/tune2fs.c:783
+#: misc/tune2fs.c:801
#, c-format
msgid "Setting maximal mount count to %d\n"
msgstr "Stter max antal monteringar till %d\n"
-#: misc/tune2fs.c:789
+#: misc/tune2fs.c:807
#, c-format
msgid "Setting current mount count to %d\n"
msgstr "Stter aktuellt antal monteringar till %d\n"
-#: misc/tune2fs.c:794
+#: misc/tune2fs.c:812
#, c-format
msgid "Setting error behavior to %d\n"
msgstr "Stter felbeteende till %d\n"
-#: misc/tune2fs.c:799
+#: misc/tune2fs.c:817
#, c-format
msgid "Setting reserved blocks gid to %lu\n"
msgstr "Stter gid fr reserverade block till %lu\n"
-#: misc/tune2fs.c:804
+#: misc/tune2fs.c:822
#, c-format
msgid "Setting interval between check %lu seconds\n"
msgstr "Stter intervall mellan kontroller till %lu sekunder\n"
-#: misc/tune2fs.c:810
+#: misc/tune2fs.c:828
#, c-format
msgid "Setting reserved blocks percentage to %lu (%u blocks)\n"
msgstr "Stter procent reserverade block till %lu (%u block)\n"
-#: misc/tune2fs.c:816
+#: misc/tune2fs.c:834
#, c-format
msgid "reserved blocks count is too big (%lu)"
msgstr "antal reserverade block fr stort (%lu)"
-#: misc/tune2fs.c:822
+#: misc/tune2fs.c:840
#, c-format
msgid "Setting reserved blocks count to %lu\n"
msgstr "Stter antal reserverade block till %lu\n"
-#: misc/tune2fs.c:828
+#: misc/tune2fs.c:846
msgid ""
"\n"
"The filesystem already has sparse superblocks.\n"
@@ -3625,7 +3588,7 @@ msgstr ""
"\n"
"Filsystemet har redan glesa superblock.\n"
-#: misc/tune2fs.c:835
+#: misc/tune2fs.c:853
#, c-format
msgid ""
"\n"
@@ -3634,7 +3597,7 @@ msgstr ""
"\n"
"Flaggan fr glesa superblock satt. %s"
-#: misc/tune2fs.c:842
+#: misc/tune2fs.c:860
msgid ""
"\n"
"The filesystem already has sparse superblocks disabled.\n"
@@ -3642,7 +3605,7 @@ msgstr ""
"\n"
"Filsystemet har redan glesa superblock avslagna.\n"
-#: misc/tune2fs.c:850
+#: misc/tune2fs.c:868
#, c-format
msgid ""
"\n"
@@ -3651,17 +3614,17 @@ msgstr ""
"\n"
"Flaggan fr glesa superblock nollstlld. %s"
-#: misc/tune2fs.c:857
+#: misc/tune2fs.c:875
#, c-format
msgid "Setting time filesystem last checked to %s\n"
msgstr "Stter tidpunkt fr senaste filsystemskontroll till %s\n"
-#: misc/tune2fs.c:863
+#: misc/tune2fs.c:881
#, c-format
msgid "Setting reserved blocks uid to %lu\n"
msgstr "Stter uid fr reserverade block till %lu\n"
-#: misc/tune2fs.c:896
+#: misc/tune2fs.c:914
msgid "Invalid UUID format\n"
msgstr "Ogiltigt UUID-format\n"
@@ -3682,33 +3645,33 @@ msgstr ""
"\n"
"Enheten existerar uppenbarligen inte; angav du den korrekt?\n"
-#: misc/util.c:101
+#: misc/util.c:107
#, c-format
msgid "%s is not a block special device.\n"
msgstr "%s r inte en blockspecialenhet.\n"
-#: misc/util.c:130
+#: misc/util.c:136
#, c-format
msgid "%s is entire device, not just one partition!\n"
msgstr "%s r hela enheten, inte bara en partition!\n"
-#: misc/util.c:154
+#: misc/util.c:160
msgid "mke2fs forced anyway. Hope /etc/mtab is incorrect.\n"
msgstr "mke2fs framtvingat nd. Hoppas /etc/mtab r felaktig.\n"
# %s kan bli "filsystem" eller "journal". Jag har lagt till "en"
# respektive "ett" i versttningarna av dessa strngar istllet.
# Felrapporterat.
-#: misc/util.c:157
+#: misc/util.c:163
#, c-format
msgid "will not make a %s here!\n"
msgstr "skapar inte %s hr!\n"
-#: misc/util.c:171
+#: misc/util.c:177
msgid "Couldn't allocate memory to parse journal options!\n"
msgstr "Kunde inte allokera minne fr att tolka journalflaggor!\n"
-#: misc/util.c:213
+#: misc/util.c:219
msgid ""
"\n"
"Bad journal options specified.\n"
@@ -3736,7 +3699,7 @@ msgstr ""
"Journalstorleken mste vara mellan 1024 och 102400 filsystemsblock.\n"
"\n"
-#: misc/util.c:240
+#: misc/util.c:246
msgid ""
"\n"
"Filesystem too small for a journal\n"
@@ -3744,7 +3707,7 @@ msgstr ""
"\n"
"Filsystem fr litet fr en journal\n"
-#: misc/util.c:247
+#: misc/util.c:253
#, c-format
msgid ""
"\n"
@@ -3755,7 +3718,7 @@ msgstr ""
"Den begrda journalstorleken r %d block; den mste vara\n"
"mellan 1024 och 102400 block. Avbryter.\n"
-#: misc/util.c:255
+#: misc/util.c:261
msgid ""
"\n"
"Journal size too big for filesystem.\n"
@@ -3763,7 +3726,7 @@ msgstr ""
"\n"
"Journalstorleken fr stor fr filsystem.\n"
-#: misc/util.c:274
+#: misc/util.c:280
#, c-format
msgid ""
"This filesystem will be automatically checked every %d mounts or\n"
@@ -3848,7 +3811,7 @@ msgstr "resize2fs %s (%s)\n"
msgid "bad filesystem size - %s"
msgstr "felaktig filsystemsstorlek - %s"
-#: resize/main.c:296
+#: resize/main.c:300
#, c-format
msgid ""
"The containing partition (or device) is only %d (%dk) blocks.\n"
@@ -3859,7 +3822,7 @@ msgstr ""
"De begrde en ny storlek p %d block.\n"
"\n"
-#: resize/main.c:303
+#: resize/main.c:307
#, c-format
msgid ""
"The filesystem is already %d blocks long. Nothing to do!\n"
@@ -3868,7 +3831,7 @@ msgstr ""
"Filsystemet r redan %d block lngt. Inget behver gras!\n"
"\n"
-#: resize/main.c:310
+#: resize/main.c:314
#, c-format
msgid ""
"Please run 'e2fsck -f %s' first.\n"
@@ -3877,12 +3840,12 @@ msgstr ""
"Kr \"e2fsck -f %s\" frst.\n"
"\n"
-#: resize/main.c:320
+#: resize/main.c:324
#, c-format
msgid "while trying to resize %s"
msgstr "vid frsk att ndra storlek p %s"
-#: resize/main.c:325
+#: resize/main.c:329
#, c-format
msgid ""
"The filesystem on %s is now %d blocks long.\n"
@@ -3891,57 +3854,150 @@ msgstr ""
"Filsystemet p %s r nu %d block lngt.\n"
"\n"
-#: resize/resize2fs.c:109
+#: resize/resize2fs.c:110
#, c-format
msgid "Number of free blocks: %d/%d, Needed: %d\n"
msgstr "Antal fria block: %d/%d, Ndvndiga: %d\n"
-#: resize/resize2fs.c:458
+#: resize/resize2fs.c:459
msgid "meta-data blocks"
msgstr "metadatablock"
-#: resize/resize2fs.c:581
+#: resize/resize2fs.c:582
msgid "reserved blocks"
msgstr "reserverade block"
-#: resize/resize2fs.c:586
+#: resize/resize2fs.c:587
msgid "blocks to be moved"
msgstr "block att flytta"
-#: resize/resize2fs.c:816
+#: resize/resize2fs.c:817
+#, c-format
msgid "Going into desperation mode for block allocations\n"
msgstr "Gr in i desperat lge fr blockallokeringar\n"
-#: resize/resize2fs.c:920
+#: resize/resize2fs.c:921
#, c-format
msgid "Moving %d blocks %u->%u\n"
msgstr "Flyttar %d block %u->%u\n"
-#: resize/resize2fs.c:997
+#: resize/resize2fs.c:998
#, c-format
msgid "ino=%u, blockcnt=%lld, %u->%u\n"
msgstr "ino=%u, blockant=%lld, %u->%u\n"
-#: resize/resize2fs.c:1165
+#: resize/resize2fs.c:1166
#, c-format
msgid "Inode moved %u->%u\n"
msgstr "Inod flyttad %u->%u\n"
-#: resize/resize2fs.c:1233
+#: resize/resize2fs.c:1234
#, c-format
msgid "Inode translate (dir=%u, name=%.*s, %u->%u)\n"
msgstr "Inod versatt (dir=%u, namn=%.*s, %u->%u)\n"
-#: resize/resize2fs.c:1360
+#: resize/resize2fs.c:1361
#, c-format
msgid "Itable move group %d block %u->%u (diff %d)\n"
msgstr "Itable flytta grupp %d block %u->%u (skillnad %d)\n"
-#: resize/resize2fs.c:1386
+#: resize/resize2fs.c:1387
#, c-format
msgid "%d blocks of zeros...\n"
msgstr "%d block med nollor ...\n"
-#: resize/resize2fs.c:1421
+#: resize/resize2fs.c:1422
+#, c-format
msgid "Inode table move finished.\n"
msgstr "Flytt av inodtabell klar.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "%8d inode used (%d%%)\n"
+#~ msgid_plural ""
+#~ "\n"
+#~ "%8d inodes used (%d%%)\n"
+#~ msgstr[0] ""
+#~ "\n"
+#~ "%8d inod anvnd (%d%%)\n"
+#~ msgstr[1] ""
+#~ "\n"
+#~ "%8d inoder anvnda (%d%%)\n"
+
+#~ msgid "%8d non-contiguous inode (%0d.%d%%)\n"
+#~ msgid_plural "%8d non-contiguous inodes (%0d.%d%%)\n"
+#~ msgstr[0] "%8d ej sammanhngande inod (%0d.%d%%)\n"
+#~ msgstr[1] "%8d ej sammanhngande inoder (%0d.%d%%)\n"
+
+#~ msgid "%8d block used (%d%%)\n"
+#~ msgid_plural "%8d blocks used (%d%%)\n"
+#~ msgstr[0] "%8d block anvnt (%d%%)\n"
+#~ msgstr[1] "%8d block anvnda (%d%%)\n"
+
+#~ msgid "%8d bad block\n"
+#~ msgid_plural "%8d bad blocks\n"
+#~ msgstr[0] "%8d dligt block\n"
+#~ msgstr[1] "%8d dliga block\n"
+
+#~ msgid "%8d large file\n"
+#~ msgid_plural "%8d large files\n"
+#~ msgstr[0] "%8d stor fil\n"
+#~ msgstr[1] "%8d stora filer\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "%8d regular file\n"
+#~ msgid_plural ""
+#~ "\n"
+#~ "%8d regular files\n"
+#~ msgstr[0] ""
+#~ "\n"
+#~ "%8d vanlig fil\n"
+#~ msgstr[1] ""
+#~ "\n"
+#~ "%8d vanliga filer\n"
+
+#~ msgid "%8d directory\n"
+#~ msgid_plural "%8d directories\n"
+#~ msgstr[0] "%8d katalog\n"
+#~ msgstr[1] "%8d kataloger\n"
+
+#~ msgid "%8d character device file\n"
+#~ msgid_plural "%8d character device files\n"
+#~ msgstr[0] "%8d teckenspecialfil\n"
+#~ msgstr[1] "%8d teckenspecialfiler\n"
+
+#~ msgid "%8d block device file\n"
+#~ msgid_plural "%8d block device files\n"
+#~ msgstr[0] "%8d blockspecialfil\n"
+#~ msgstr[1] "%8d blockspecialfiler\n"
+
+#~ msgid "%8d fifo\n"
+#~ msgid_plural "%8d fifos\n"
+#~ msgstr[0] "%8d fifo\n"
+#~ msgstr[1] "%8d fifo:er\n"
+
+#~ msgid "%8d link\n"
+#~ msgid_plural "%8d links\n"
+#~ msgstr[0] "%8d lnk\n"
+#~ msgstr[1] "%8d lnkar\n"
+
+#~ msgid "%8d symbolic link"
+#~ msgid_plural "%8d symbolic links"
+#~ msgstr[0] "%8d symbolisk lnk"
+#~ msgstr[1] "%8d symboliska lnkar"
+
+#~ msgid " (%d fast symbolic link)\n"
+#~ msgid_plural " (%d fast symbolic links)\n"
+#~ msgstr[0] " (%8d snabb symbolisk lnk)\n"
+#~ msgstr[1] " (%8d snabba symboliska lnkar)\n"
+
+#~ msgid "%8d socket\n"
+#~ msgid_plural "%8d sockets\n"
+#~ msgstr[0] "%8d uttag (socket)\n"
+#~ msgstr[1] "%8d uttag (socket)\n"
+
+#~ msgid "%8d file\n"
+#~ msgid_plural "%8d files\n"
+#~ msgstr[0] "%8d fil\n"
+#~ msgstr[1] "%8d filer\n"
diff --git a/po/tr.gmo b/po/tr.gmo
new file mode 100644
index 00000000..fa0bbe7f
--- /dev/null
+++ b/po/tr.gmo
Binary files differ
diff --git a/po/tr.po b/po/tr.po
index cbf68581..ae7dd51e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: e2fsprogs 1.35\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-24 14:17-0500\n"
+"Report-Msgid-Bugs-To: tytso@alum.mit.edu\n"
+"POT-Creation-Date: 2004-11-30 18:46-0500\n"
"PO-Revision-Date: 2004-03-14 20:15+0300\n"
"Last-Translator: Nilgün Belma Bugüner <nilgun@superonline.com>\n"
"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -16,7 +16,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.0\n"
-#: e2fsck/badblocks.c:22 misc/mke2fs.c:194
+#: e2fsck/badblocks.c:22 misc/mke2fs.c:223
#, c-format
msgid "Bad block %u out of range; ignored.\n"
msgstr "Hatalı blok %u kapsamdışı; yoksayıldı.\n"
@@ -30,10 +30,10 @@ msgid "while reading the bad blocks inode"
msgstr "- hatalı bloklar düğümü okunurken hata oluştu"
#: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
-#: e2fsck/unix.c:881 e2fsck/unix.c:913 misc/badblocks.c:997
+#: e2fsck/unix.c:915 e2fsck/unix.c:947 misc/badblocks.c:997
#: misc/badblocks.c:1005 misc/badblocks.c:1019 misc/badblocks.c:1031
-#: misc/dumpe2fs.c:332 misc/e2image.c:486 misc/e2image.c:502 misc/mke2fs.c:210
-#: misc/tune2fs.c:757 resize/main.c:228
+#: misc/dumpe2fs.c:332 misc/e2image.c:475 misc/e2image.c:564
+#: misc/e2image.c:580 misc/mke2fs.c:239 misc/tune2fs.c:775 resize/main.c:232
#, c-format
msgid "while trying to open %s"
msgstr "- %s açılmaya çalışılırken hata oluştu"
@@ -43,7 +43,7 @@ msgstr "- %s açılmaya çalışılırken hata oluştu"
msgid "while trying popen '%s'"
msgstr "- '%s' veri yolu açılmaya çalışılırken hata oluştu"
-#: e2fsck/badblocks.c:93 misc/mke2fs.c:217
+#: e2fsck/badblocks.c:93 misc/mke2fs.c:246
msgid "while reading in list of bad blocks from file"
msgstr "- dosyadan hatalı bloklar listesinin okunması sırasında hata oluştu"
@@ -54,7 +54,8 @@ msgstr "- hatalı bloklar düğümü güncellenirken hata oluştu"
#: e2fsck/badblocks.c:129
#, c-format
msgid "Warning illegal block %u found in bad block inode. Cleared.\n"
-msgstr "Uyarı: Kuraldışı %u bloğu hatalı bloklar düğümünde bulundu. Temizlendi.\n"
+msgstr ""
+"Uyarı: Kuraldışı %u bloğu hatalı bloklar düğümünde bulundu. Temizlendi.\n"
#: e2fsck/ehandler.c:53
#, c-format
@@ -103,6 +104,7 @@ msgid "%s: %s filename nblocks blocksize\n"
msgstr "%s: %s dosya_ismi blok_sayısı blok_boyu\n"
#: e2fsck/extend.c:43
+#, c-format
msgid "Illegal number of blocks!\n"
msgstr "Blok sayısı kuraldışı!\n"
@@ -117,6 +119,7 @@ msgid "Usage: %s disk\n"
msgstr "Kullanımı: %s disk\n"
#: e2fsck/flushb.c:63
+#, c-format
msgid "BLKFLSBUF ioctl not supported! Can't flush buffers.\n"
msgstr "BLKFLSBUF ioctl desteklenmiyor! Tamponlar boşaltılamadı.\n"
@@ -125,12 +128,12 @@ msgstr "BLKFLSBUF ioctl desteklenmiyor! Tamponlar boşaltılamadı.\n"
msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n"
msgstr "Kullanımı: %s [-F] [-I düğüm_tampon_blokları] aygıt\n"
-#: e2fsck/iscan.c:83 e2fsck/unix.c:701 resize/main.c:205
+#: e2fsck/iscan.c:83 e2fsck/unix.c:729 resize/main.c:209
#, c-format
msgid "while opening %s for flushing"
msgstr "%s temizlik için açılırken hata oluştu"
-#: e2fsck/iscan.c:88 e2fsck/unix.c:707 resize/main.c:212
+#: e2fsck/iscan.c:88 e2fsck/unix.c:735 resize/main.c:216
#, c-format
msgid "while trying to flush %s"
msgstr "%s boşaltılmaya çalışılırken hata oluştu"
@@ -148,31 +151,31 @@ msgstr "sonraki düğüme geçilirken hata oluştu"
msgid "%d inodes scanned.\n"
msgstr "%d düğüm tarandı.\n"
-#: e2fsck/journal.c:449
+#: e2fsck/journal.c:463
msgid "reading journal superblock\n"
msgstr "günlük dosyası super bloğu okunuyor\n"
-#: e2fsck/journal.c:506
+#: e2fsck/journal.c:520
#, c-format
msgid "%s: no valid journal superblock found\n"
msgstr "%s: geçerli gümlük dosyası super bloğu yok\n"
-#: e2fsck/journal.c:515
+#: e2fsck/journal.c:529
#, c-format
msgid "%s: journal too short\n"
msgstr "%s: gümlük dosyası çok kısa\n"
-#: e2fsck/journal.c:787
+#: e2fsck/journal.c:802
#, c-format
msgid "%s: recovering journal\n"
msgstr "%s: günlük dosyasına göre kurtarılıyor\n"
-#: e2fsck/journal.c:789
+#: e2fsck/journal.c:804
#, c-format
msgid "%s: won't do journal recovery while read-only\n"
msgstr "%s: salt-okunur durumdayken günlük dosyasına göre kurtarma yapılamaz\n"
-#: e2fsck/journal.c:810
+#: e2fsck/journal.c:825
#, c-format
msgid "while trying to re-open %s"
msgstr "%s yeniden açılmaya çalışılırken hata oluştu"
@@ -329,77 +332,77 @@ msgstr "<Yedek düğüm 10>"
msgid "multiply claimed inode map"
msgstr "tekrarlanan blokların düğüm eşlemi"
-#: e2fsck/pass1b.c:551 e2fsck/pass1b.c:688
+#: e2fsck/pass1b.c:554 e2fsck/pass1b.c:691
#, c-format
msgid "internal error; can't find dup_blk for %d\n"
msgstr "iç hata; %d için dup_blk bulunamıyor\n"
-#: e2fsck/pass1b.c:731
+#: e2fsck/pass1b.c:734
msgid "returned from clone_file_block"
msgstr "clone_file_block işlevinden döndürüldü"
-#: e2fsck/pass1.c:297
+#: e2fsck/pass1.c:298
msgid "in-use inode map"
msgstr "kullanımdaki düğüm eşlemi"
-#: e2fsck/pass1.c:306
+#: e2fsck/pass1.c:307
msgid "directory inode map"
msgstr "dizin düğümü eşlemi"
-#: e2fsck/pass1.c:314
+#: e2fsck/pass1.c:315
msgid "regular file inode map"
msgstr "normal dosya düğümü eşlemi"
-#: e2fsck/pass1.c:321
+#: e2fsck/pass1.c:322
msgid "in-use block map"
msgstr "kullanımdaki blok eşlemi"
-#: e2fsck/pass1.c:368
+#: e2fsck/pass1.c:369
msgid "doing inode scan"
msgstr "düğüm taraması yapılıyor"
-#: e2fsck/pass1.c:751
+#: e2fsck/pass1.c:752
msgid "Pass 1"
msgstr "1. geçiş"
-#: e2fsck/pass1.c:810
+#: e2fsck/pass1.c:811
#, c-format
msgid "reading indirect blocks of inode %u"
msgstr "%u düğümünün dolaylı blokları okunuyor"
-#: e2fsck/pass1.c:852
+#: e2fsck/pass1.c:853
msgid "bad inode map"
msgstr "hatalı düğüm eşlemi"
-#: e2fsck/pass1.c:874
+#: e2fsck/pass1.c:875
msgid "inode in bad block map"
msgstr "hatalı blok eşlemindeki düğüm"
-#: e2fsck/pass1.c:894
+#: e2fsck/pass1.c:895
msgid "imagic inode map"
msgstr "imagic düğüm eşlemi"
-#: e2fsck/pass1.c:921
+#: e2fsck/pass1.c:922
msgid "multiply claimed block map"
msgstr "tekrarlanan blokların eşlemi"
-#: e2fsck/pass1.c:1020
+#: e2fsck/pass1.c:1021
msgid "ext attr block map"
msgstr "ek özellik bloğu eşlemi"
-#: e2fsck/pass1.c:1782
+#: e2fsck/pass1.c:1783
msgid "block bitmap"
msgstr "blok biteşlemi"
-#: e2fsck/pass1.c:1786
+#: e2fsck/pass1.c:1787
msgid "inode bitmap"
msgstr "düğüm biteşlemi"
-#: e2fsck/pass1.c:1790
+#: e2fsck/pass1.c:1791
msgid "inode table"
msgstr "düğüm tablosu"
-#: e2fsck/pass2.c:293
+#: e2fsck/pass2.c:294
msgid "Pass 2"
msgstr "2. geçiş"
@@ -694,7 +697,8 @@ msgstr "Süper blok hatalı ext3 günlüğü içeriyor (düğüm %i).\n"
#: e2fsck/problem.c:190
msgid "External @j has multiple @f users (unsupported).\n"
-msgstr "Dış günlük çok sayıda dosya sistemi kullanıcısı içeriyor. (desteklenmiyor)\n"
+msgstr ""
+"Dış günlük çok sayıda dosya sistemi kullanıcısı içeriyor. (desteklenmiyor)\n"
#: e2fsck/problem.c:195
msgid "Can't find external @j\n"
@@ -711,7 +715,8 @@ msgstr "Dış günlük bu dosya sistemini desteklemiyor\n"
#: e2fsck/problem.c:210
msgid ""
"Ext3 @j @S is unknown type %N (unsupported).\n"
-"It is likely that your copy of e2fsck is old and/or doesn't support this @j format.\n"
+"It is likely that your copy of e2fsck is old and/or doesn't support this @j "
+"format.\n"
"It is also possible the @j @S is corrupt.\n"
msgstr ""
"Ext3 günlüğü süper blok türü %N bilinmiyor (desteklenmiyor).\n"
@@ -726,7 +731,8 @@ msgstr "Ext3 günlüğü süper bloğu bozuk.\n"
#: e2fsck/problem.c:223
#, c-format
msgid "@S doesn't have has_@j flag, but has ext3 @j %s.\n"
-msgstr "Süper blok has_journal bayrağı içermiyor, ama ext3 günlüğü %s içeriyor.\n"
+msgstr ""
+"Süper blok has_journal bayrağı içermiyor, ama ext3 günlüğü %s içeriyor.\n"
#: e2fsck/problem.c:228
msgid "@S has ext3 needs_recovery flag set, but no @j.\n"
@@ -746,7 +752,9 @@ msgstr "Günlüğü yine de çalıştır"
#: e2fsck/problem.c:248
msgid "Recovery flag not set in backup @S, so running @j anyway.\n"
-msgstr "Yedek süper blokda kurtarma bayrağı temiz olduğundan günlük herşeye rağmen çalışacak.\n"
+msgstr ""
+"Yedek süper blokda kurtarma bayrağı temiz olduğundan günlük herşeye rağmen "
+"çalışacak.\n"
#: e2fsck/problem.c:253
msgid "%s @o @i %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n"
@@ -772,11 +780,15 @@ msgstr "artık düğüm listesindeki düğüm %i kuraldışı\n"
#: e2fsck/problem.c:283
msgid "Ext3 @j @S has an unknown read-only feature flag set.\n"
-msgstr "Ext3 günlüğü süper bloğu bilinmeyen salt-okunur özellikli bir bayrak içeriyor.\n"
+msgstr ""
+"Ext3 günlüğü süper bloğu bilinmeyen salt-okunur özellikli bir bayrak "
+"içeriyor.\n"
#: e2fsck/problem.c:288
msgid "Ext3 @j @S has an unknown incompatible feature flag set.\n"
-msgstr "Ext3 günlüğünün süper bloğu bilinmeyen uyumsuz özellikli bir bayrak içeriyor.\n"
+msgstr ""
+"Ext3 günlüğünün süper bloğu bilinmeyen uyumsuz özellikli bir bayrak "
+"içeriyor.\n"
#: e2fsck/problem.c:293
msgid "@j version not supported by this e2fsck.\n"
@@ -851,15 +863,21 @@ msgstr "Düğüm %i bir sıfır uzunluklu dizindir. "
#: e2fsck/problem.c:355
msgid "@g %g's @b @B at %b @C.\n"
-msgstr "%g grubunun %b deki blok biteşlemi diğer dosya sistemi blokları ile çelişiyor.\n"
+msgstr ""
+"%g grubunun %b deki blok biteşlemi diğer dosya sistemi blokları ile "
+"çelişiyor.\n"
#: e2fsck/problem.c:360
msgid "@g %g's @i @B at %b @C.\n"
-msgstr "%g grubunun %b deki düğüm biteşlemi diğer dosya sistemi blokları ile çelişiyor.\n"
+msgstr ""
+"%g grubunun %b deki düğüm biteşlemi diğer dosya sistemi blokları ile "
+"çelişiyor.\n"
#: e2fsck/problem.c:365
msgid "@g %g's @i table at %b @C.\n"
-msgstr "%g grubunun %b deki düğüm tablosu diğer dosya sistemi blokları ile çelişiyor.\n"
+msgstr ""
+"%g grubunun %b deki düğüm tablosu diğer dosya sistemi blokları ile "
+"çelişiyor.\n"
#: e2fsck/problem.c:370
msgid "@g %g's @b @B (%b) is bad. "
@@ -883,7 +901,9 @@ msgstr "Düğüm %i içindeki blok #%B (%b) kuraldışı. "
#: e2fsck/problem.c:395
msgid "@b #%B (%b) overlaps @f metadata in @i %i. "
-msgstr "Düğüm %i içindeki blok #%B (%b) dosya sistemi metaverisinin üzerine taşıyor. "
+msgstr ""
+"Düğüm %i içindeki blok #%B (%b) dosya sistemi metaverisinin üzerine "
+"taşıyor. "
#: e2fsck/problem.c:400
#, c-format
@@ -948,7 +968,8 @@ msgstr "Birincil dosya sistemi (%b) hatalı bloklar listesinde kayıtlı.\n"
#: e2fsck/problem.c:454
msgid "Block %b in the primary @g descriptors is on the bad @b list\n"
-msgstr "Birincil grup tanımlarındaki blok %b, hatalı bloklar listesinde kayıtlı\n"
+msgstr ""
+"Birincil grup tanımlarındaki blok %b, hatalı bloklar listesinde kayıtlı\n"
#: e2fsck/problem.c:460
msgid "Warning: Group %g's @S (%b) is bad.\n"
@@ -956,15 +977,19 @@ msgstr "Uyarı: %g grubunun superbloğu (%b) hatalı.\n"
#: e2fsck/problem.c:465
msgid "Warning: Group %g's copy of the @g descriptors has a bad @b (%b).\n"
-msgstr "Uyarı %g grubunun grup tanımları kopyası bir hatalı blok içeriyor (%b).\n"
+msgstr ""
+"Uyarı %g grubunun grup tanımları kopyası bir hatalı blok içeriyor (%b).\n"
#: e2fsck/problem.c:471
msgid "Programming error? @b #%b claimed for no reason in process_bad_@b.\n"
-msgstr "Programlama hatası? blok %b, hatalı blok işleminde sebepsiz olarak talep edildi.\n"
+msgstr ""
+"Programlama hatası? blok %b, hatalı blok işleminde sebepsiz olarak talep "
+"edildi.\n"
#: e2fsck/problem.c:477
msgid "@A %N contiguous @b(s) in @b @g %g for %s: %m\n"
-msgstr "%s için %g blok grubunda %N bitişik bloğa yer ayrılırken hata oluştu: %m\n"
+msgstr ""
+"%s için %g blok grubunda %N bitişik bloğa yer ayrılırken hata oluştu: %m\n"
#: e2fsck/problem.c:482
#, c-format
@@ -1006,7 +1031,8 @@ msgstr "Düğümler (%i) taranırken hata oluştu: %m\n"
#: e2fsck/problem.c:532
#, c-format
msgid "Error while iterating over @bs in @i %i: %m\n"
-msgstr "Düğüm %i içindeki bloklar üzerinde işlemler tekrarlanırken hata oluştu: %m\n"
+msgstr ""
+"Düğüm %i içindeki bloklar üzerinde işlemler tekrarlanırken hata oluştu: %m\n"
#: e2fsck/problem.c:537
msgid "Error storing @i count information (@i=%i, count=%N): %m\n"
@@ -1042,7 +1068,9 @@ msgstr ""
#: e2fsck/problem.c:567
#, c-format
msgid "@i %i has @cion flag set on @f without @cion support. "
-msgstr "Düğüm %i sıkıştırma desteklenmeyen dosya sisteminde sıkıştırma bayrağı içeriyor. "
+msgstr ""
+"Düğüm %i sıkıştırma desteklenmeyen dosya sisteminde sıkıştırma bayrağı "
+"içeriyor. "
#: e2fsck/problem.c:587
msgid "@j is not regular file. "
@@ -1117,7 +1145,9 @@ msgstr "Blok #%B (%b) çok büyük sembolik bağ oluşturuyor. "
#: e2fsck/problem.c:677
#, c-format
msgid "@i %i has INDEX_FL flag set on @f without htree support.\n"
-msgstr "Düğüm %i htree desteği bulunmayan dosya sisteminde INDEX_FL bayrağı içeriyor.\n"
+msgstr ""
+"Düğüm %i htree desteği bulunmayan dosya sisteminde INDEX_FL bayrağı "
+"içeriyor.\n"
#: e2fsck/problem.c:682
#, c-format
@@ -1136,7 +1166,8 @@ msgstr "HTREE dizin düğümü %i desteklenmeyen bir hash sürümü (%N) içeriy
#: e2fsck/problem.c:697
#, c-format
msgid "@h %i uses an incompatible htree root node flag.\n"
-msgstr "HTREE dizin düğümü %i uyumsuz bir htree kök düğümü bayrağı kullanıyor.\n"
+msgstr ""
+"HTREE dizin düğümü %i uyumsuz bir htree kök düğümü bayrağı kullanıyor.\n"
#: e2fsck/problem.c:702
msgid "@h %i has a tree depth (%N) which is too big\n"
@@ -1182,7 +1213,9 @@ msgstr ""
#: e2fsck/problem.c:751 e2fsck/problem.c:1072
msgid "Error addjusting refcount for @a @b %b (@i %i): %m\n"
-msgstr "Ek özellik bloğu %b (düğüm %i) için başvuru sayısı ayarlanırken hata oluştu: %m\n"
+msgstr ""
+"Ek özellik bloğu %b (düğüm %i) için başvuru sayısı ayarlanırken hata oluştu: "
+"%m\n"
#: e2fsck/problem.c:757
msgid "Pass 1C: Scan directories for @is with dup @bs.\n"
@@ -1278,7 +1311,8 @@ msgstr "Dizin düğümü %i içinde '..' eksik.\n"
#: e2fsck/problem.c:863
msgid "First @e '%Dn' (inode=%Di) in @d @i %i (%p) @s '.'\n"
-msgstr "Dizin düğümü %i (%p) içindeki ilk girdi '%Dn' (düğüm=%Di) '.' olmalıydı.\n"
+msgstr ""
+"Dizin düğümü %i (%p) içindeki ilk girdi '%Dn' (düğüm=%Di) '.' olmalıydı.\n"
#: e2fsck/problem.c:868
msgid "Second @e '%Dn' (inode=%Di) in @d @i %i @s '..'\n"
@@ -1421,7 +1455,9 @@ msgstr "@F ek özellik bloğu geçersiz (%If).\n"
#: e2fsck/problem.c:1033
msgid "@f contains large files, but lacks LARGE_FILE flag in @S.\n"
-msgstr "Dosya sistemi çok büyük dosyalar içeriyor, ama süperblokta LARGE_FILE bayrağı yok\n"
+msgstr ""
+"Dosya sistemi çok büyük dosyalar içeriyor, ama süperblokta LARGE_FILE "
+"bayrağı yok\n"
#: e2fsck/problem.c:1038
msgid "@p @h %d: node (%B) not referenced\n"
@@ -1433,11 +1469,13 @@ msgstr "HTREE dizin düğümü %d içinde sorun: düğüm (%B) iki kere referans
#: e2fsck/problem.c:1048
msgid "@p @h %d: node (%B) has bad min hash\n"
-msgstr "HTREE dizin düğümü %d içinde sorun: düğüm (%B) hatali asgari hash içeriyor\n"
+msgstr ""
+"HTREE dizin düğümü %d içinde sorun: düğüm (%B) hatali asgari hash içeriyor\n"
#: e2fsck/problem.c:1053
msgid "@p @h %d: node (%B) has bad max hash\n"
-msgstr "HTREE dizin düğümü %d içinde sorun: düğüm (%B) hatali azami hash içeriyor\n"
+msgstr ""
+"HTREE dizin düğümü %d içinde sorun: düğüm (%B) hatali azami hash içeriyor\n"
#: e2fsck/problem.c:1058
msgid "Invalid @h %d (%q). "
@@ -1445,7 +1483,9 @@ msgstr "HTREE dizin düğümü %d (%q) geçersiz. "
#: e2fsck/problem.c:1062
msgid "Forcibly clearing HTREE flag on @i %d (%q). (Beta test code)\n"
-msgstr "Düğüm %d (%q) üzerindeki HTREE bayrağı zorla temizleniyor. (Beta test kodu)\n"
+msgstr ""
+"Düğüm %d (%q) üzerindeki HTREE bayrağı zorla temizleniyor. (Beta test "
+"kodu)\n"
#: e2fsck/problem.c:1067
msgid "@p @h %d (%q): bad @b number %b.\n"
@@ -1458,15 +1498,19 @@ msgstr "HTREE dizin düğümü %d içinde sorun: kök düğümü geçersiz\n"
#: e2fsck/problem.c:1082
msgid "@p @h %d: node (%B) has bad limit (%N)\n"
-msgstr "HTREE dizin düğümü %d içinde sorun: düğüm (%B) hatalı sınır (%N) içeriyor\n"
+msgstr ""
+"HTREE dizin düğümü %d içinde sorun: düğüm (%B) hatalı sınır (%N) içeriyor\n"
#: e2fsck/problem.c:1087
msgid "@p @h %d: node (%B) has bad count (%N)\n"
-msgstr "HTREE dizin düğümü %d içinde sorun: düğüm (%B) hatalı sayım (%N) içeriyor.\n"
+msgstr ""
+"HTREE dizin düğümü %d içinde sorun: düğüm (%B) hatalı sayım (%N) içeriyor.\n"
#: e2fsck/problem.c:1092
msgid "@p @h %d: node (%B) has an unordered hash table\n"
-msgstr "HTREE dizin düğümü %d içinde sorun: düğüm (%B) sırasız bit hash tablosu içeriyor\n"
+msgstr ""
+"HTREE dizin düğümü %d içinde sorun: düğüm (%B) sırasız bit hash tablosu "
+"içeriyor\n"
#: e2fsck/problem.c:1097
msgid "@p @h %d: node (%B) has bad depth\n"
@@ -1695,7 +1739,9 @@ msgid "Free @bs count wrong (%b, counted=%c).\n"
msgstr "Serbest blok sayısı yanlış (%b, sayılan = %c).\n"
#: e2fsck/problem.c:1382
-msgid "PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B endpoints (%i, %j)\n"
+msgid ""
+"PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B "
+"endpoints (%i, %j)\n"
msgstr ""
"PROGRAMLAMA HATASI: dosya sistemi (#%N) biteşlem sınırları (%b, %c)\n"
"ile hesaplanan biteşlem sınırları (%i, %j) uyuşmuyor\n"
@@ -1709,7 +1755,7 @@ msgstr "İç hata: biteşlemin sonunda bozulma (%N)\n"
msgid "Unhandled error code (0x%x)!\n"
msgstr "Elde edilemeyen hata kodu ((0x%x)!\n"
-#: e2fsck/problem.c:1594
+#: e2fsck/problem.c:1595
msgid "IGNORED"
msgstr "YOKSAYILDI"
@@ -1772,6 +1818,7 @@ msgid "while writing inode table (group %d)"
msgstr "- düğüm tablosu yazılırken hata oluştu (grup %d)"
#: e2fsck/swapfs.c:222
+#, c-format
msgid "Pass 0: Doing byte-swap of filesystem\n"
msgstr "Geçiş 0: dosya sisteminin bayt sıralaması düzeltiliyor\n"
@@ -1788,7 +1835,7 @@ msgstr ""
msgid "Byte swap"
msgstr "Ters baytlı"
-#: e2fsck/unix.c:67
+#: e2fsck/unix.c:74
#, c-format
msgid ""
"Usage: %s [-panyrcdfvstDFSV] [-b superblock] [-B blocksize]\n"
@@ -1810,7 +1857,8 @@ msgstr ""
" -D dizinler eniyilenir\n"
" -F tampon bellek işlem öncesi boşaltılır\n"
" -r bu seçenek yoksayılır\n"
-" -s dosya sistemi bayt sıralaması tersse kullanılır.\n"
+" -s dosya sistemi bayt sıralaması tersse "
+"kullanılır.\n"
" Normal sırada ise etkisizdir.\n"
" -S Mevcut bayt sıralamasına bakılmaksızın dosya\n"
" sisteminin bayt sıralaması ters çevrilir\n"
@@ -1821,14 +1869,16 @@ msgstr ""
"Çeviri hatalarını <gnu-tr-u12a@lists.sourceforge.net> adresine bildiriniz.\n"
"\n"
-#: e2fsck/unix.c:73
+#: e2fsck/unix.c:80
+#, c-format
msgid ""
"\n"
"Emergency help:\n"
" -p Automatic repair (no questions)\n"
" -n Make no changes to the filesystem\n"
" -y Assume \"yes\" to all questions\n"
-" -c Check for bad blocks and add them to the badblock list\n"
+" -c Check for bad blocks and add them to the badblock "
+"list\n"
" -f Force checking even if filesystem is marked clean\n"
msgstr ""
"\n"
@@ -1843,7 +1893,8 @@ msgstr ""
" listesine eklenir\n"
" -f disk bölümü temiz bile olsa denetim yapılır\n"
-#: e2fsck/unix.c:79
+#: e2fsck/unix.c:86
+#, c-format
msgid ""
" -v Be verbose\n"
" -b superblock Use alternative superblock\n"
@@ -1862,154 +1913,33 @@ msgstr ""
" -L hatalı_bloklar_dosyası hatalı bloklar listesi belirtilen dosyadakiler\n"
" ile oluşturulur\n"
-#: e2fsck/unix.c:113
+#: e2fsck/unix.c:120
#, c-format
msgid "%s: %d/%d files (%0d.%d%% non-contiguous), %d/%d blocks\n"
msgstr "%s: %d/%d dosya (%%%0d.%d yanyana olmayan düğüm), %d/%d blok\n"
-#: e2fsck/unix.c:119
-#, c-format
-msgid ""
-"\n"
-"%8d inode used (%d%%)\n"
-msgid_plural ""
-"\n"
-"%8d inodes used (%d%%)\n"
-msgstr[0] ""
-"\n"
-"%8d düğüm kullanıldı (%%%d)\n"
-msgstr[1] ""
-"\n"
-"%8d düğüm kullanıldı (%%%d)\n"
-
-#: e2fsck/unix.c:121
-#, c-format
-msgid "%8d non-contiguous inode (%0d.%d%%)\n"
-msgid_plural "%8d non-contiguous inodes (%0d.%d%%)\n"
-msgstr[0] "%8d bitişik olmayan düğüm (%%%0d.%d)\n"
-msgstr[1] "%8d bitişik olmayan düğüm (%%%0d.%d)\n"
-
-#: e2fsck/unix.c:125
+#: e2fsck/unix.c:132
#, c-format
msgid " # of inodes with ind/dind/tind blocks: %d/%d/%d\n"
msgstr " ind/dind/tind bloklarının düğüm sayıları: %d/%d/%d\n"
-#: e2fsck/unix.c:127
-#, c-format
-msgid "%8d block used (%d%%)\n"
-msgid_plural "%8d blocks used (%d%%)\n"
-msgstr[0] "%8d blok kullanıldı (%%%d)\n"
-msgstr[1] "%8d blok kullanıldı (%%%d)\n"
-
-#: e2fsck/unix.c:130
-#, c-format
-msgid "%8d bad block\n"
-msgid_plural "%8d bad blocks\n"
-msgstr[0] "%8d hatalı blok\n"
-msgstr[1] "%8d hatalı blok\n"
-
-#: e2fsck/unix.c:132
-#, c-format
-msgid "%8d large file\n"
-msgid_plural "%8d large files\n"
-msgstr[0] "%8d büyük dosya\n"
-msgstr[1] "%8d büyük dosya\n"
-
-#: e2fsck/unix.c:134
-#, c-format
-msgid ""
-"\n"
-"%8d regular file\n"
-msgid_plural ""
-"\n"
-"%8d regular files\n"
-msgstr[0] ""
-"\n"
-"%8d normal dosya\n"
-msgstr[1] ""
-"\n"
-"%8d normal dosya\n"
-
-#: e2fsck/unix.c:136
-#, c-format
-msgid "%8d directory\n"
-msgid_plural "%8d directories\n"
-msgstr[0] "%8d dizin\n"
-msgstr[1] "%8d dizin\n"
-
-#: e2fsck/unix.c:138
-#, c-format
-msgid "%8d character device file\n"
-msgid_plural "%8d character device files\n"
-msgstr[0] "%8d karakter aygıtı dosyası\n"
-msgstr[1] "%8d karakter aygıtı dosyası\n"
-
-#: e2fsck/unix.c:141
-#, c-format
-msgid "%8d block device file\n"
-msgid_plural "%8d block device files\n"
-msgstr[0] "%8d blok aygıtı dosyası\n"
-msgstr[1] "%8d blok aygıtı dosyası\n"
-
-#: e2fsck/unix.c:143
-#, c-format
-msgid "%8d fifo\n"
-msgid_plural "%8d fifos\n"
-msgstr[0] "%8d fifo\n"
-msgstr[1] "%8d fifo\n"
-
-#: e2fsck/unix.c:145
-#, c-format
-msgid "%8d link\n"
-msgid_plural "%8d links\n"
-msgstr[0] "%8d bağ\n"
-msgstr[1] "%8d bağ\n"
-
-#: e2fsck/unix.c:148
-#, c-format
-msgid "%8d symbolic link"
-msgid_plural "%8d symbolic links"
-msgstr[0] "%8d sembolik bağ"
-msgstr[1] "%8d sembolik bağ"
-
-#: e2fsck/unix.c:150
-#, c-format
-msgid " (%d fast symbolic link)\n"
-msgid_plural " (%d fast symbolic links)\n"
-msgstr[0] " (%d hızlı sembolik bağ)\n"
-msgstr[1] " (%d hızlı sembolik bağ)\n"
-
-#: e2fsck/unix.c:152
-#, c-format
-msgid "%8d socket\n"
-msgid_plural "%8d sockets\n"
-msgstr[0] "%8d soket\n"
-msgstr[1] "%8d soket\n"
-
-#: e2fsck/unix.c:155
-#, c-format
-msgid "%8d file\n"
-msgid_plural "%8d files\n"
-msgstr[0] "%8d dosya\n"
-msgstr[1] "%8d dosya\n"
-
-#: e2fsck/unix.c:169 misc/badblocks.c:781 misc/tune2fs.c:773 misc/util.c:145
+#: e2fsck/unix.c:176 misc/badblocks.c:781 misc/tune2fs.c:791 misc/util.c:151
#: resize/main.c:97
#, c-format
msgid "while determining whether %s is mounted."
msgstr "- %s'in bağlı olup olmadığı saptanmaya çalışılırken hata oluştu."
-#: e2fsck/unix.c:184
+#: e2fsck/unix.c:191
#, c-format
msgid "Warning! %s is mounted.\n"
msgstr "Uyarı! %s bağlı.\n"
-#: e2fsck/unix.c:188
+#: e2fsck/unix.c:195
#, c-format
msgid "%s is mounted. "
msgstr "%s bağlandı. "
-#: e2fsck/unix.c:190
+#: e2fsck/unix.c:197
msgid ""
"Cannot continue, aborting.\n"
"\n"
@@ -2017,8 +1947,8 @@ msgstr ""
"Devam edilemiyor. çıkılıyor.\n"
"\n"
-#: e2fsck/unix.c:191
-#, fuzzy
+#: e2fsck/unix.c:198
+#, fuzzy, c-format
msgid ""
"\n"
"\n"
@@ -2031,60 +1961,63 @@ msgstr ""
"U****YARI!****e2fsck'nın bağlı bir dosya sisteminde çalıştırılması\n"
"ÇOK CİDDİ hasarlara sebep olabilir.****n\n"
-#: e2fsck/unix.c:194
+#: e2fsck/unix.c:201
msgid "Do you really want to continue"
msgstr "Gerçekten devam etmek istiyor musunuz?"
-#: e2fsck/unix.c:196
+#: e2fsck/unix.c:203
+#, c-format
msgid "check aborted.\n"
msgstr "denetim durdu.\n"
-#: e2fsck/unix.c:245
+#: e2fsck/unix.c:264
msgid " contains a file system with errors"
msgstr " hatalı bir dosya sistemi içeriyor"
-#: e2fsck/unix.c:247
+#: e2fsck/unix.c:266
msgid " was not cleanly unmounted"
msgstr " usulünce sistemden ayrılmamış"
-#: e2fsck/unix.c:251
+#: e2fsck/unix.c:270
#, c-format
msgid " has been mounted %u times without being checked"
msgstr " denetlenmeksizin %u kere bağlandı"
-#: e2fsck/unix.c:259
+#: e2fsck/unix.c:278
#, c-format
msgid " has gone %u days without being checked"
msgstr " denetlenmeksizin %u gün geçti"
-#: e2fsck/unix.c:268
+#: e2fsck/unix.c:287
msgid ", check forced.\n"
msgstr ", denetim başlatılacak.\n"
-#: e2fsck/unix.c:271
+#: e2fsck/unix.c:290
#, c-format
msgid "%s: clean, %d/%d files, %d/%d blocks"
msgstr "%s: temiz, %d/%d dosya, %d/%d blok"
-#: e2fsck/unix.c:286
+#: e2fsck/unix.c:306
msgid " (check after next mount)"
msgstr " (sistem bağlandıktan sonra denetle)"
-#: e2fsck/unix.c:288
+#: e2fsck/unix.c:308
#, c-format
msgid " (check in %ld mounts)"
msgstr " (sistem %ld kere bağlandığında denetle)"
-#: e2fsck/unix.c:430
+#: e2fsck/unix.c:450
#, c-format
msgid "ERROR: Couldn't open /dev/null (%s)\n"
msgstr "HATA: /dev/null açılamadı (%s)\n"
-#: e2fsck/unix.c:501
+#: e2fsck/unix.c:521
+#, c-format
msgid "Invalid EA version.\n"
msgstr "Ek özellik sürümü geçersiz.\n"
-#: e2fsck/unix.c:510
+#: e2fsck/unix.c:532
+#, c-format
msgid ""
"Extended options are separated by commas, and may take an argument which\n"
"is set off by an equals ('=') sign. Valid raid options are:\n"
@@ -2096,71 +2029,78 @@ msgstr ""
"\tea_ver=<ek_özellik_sürümü> (1 ya da 2)\n"
"\n"
-#: e2fsck/unix.c:568
+#: e2fsck/unix.c:590
#, c-format
msgid "Error validating file descriptor %d: %s\n"
msgstr "Dosya tanımlayıcı %d değerlendirilirken hata: %s\n"
-#: e2fsck/unix.c:572
+#: e2fsck/unix.c:594
msgid "Invalid completion information file descriptor"
msgstr "Tamamlama bilgisi dosya tanımlayıcısı geçersiz"
-#: e2fsck/unix.c:587
+#: e2fsck/unix.c:609
msgid "Only one the options -p/-a, -n or -y may be specified."
msgstr "Sadece -p/-a, -n veya -y seçeneklerinden biri belirtilebilir."
-#: e2fsck/unix.c:608
+#: e2fsck/unix.c:630
+#, c-format
msgid "The -t option is not supported on this version of e2fsck.\n"
msgstr " -t seçeneği e2fsck'nın bu sürümünde desteklenmiyor.\n"
-#: e2fsck/unix.c:673
+#: e2fsck/unix.c:695
+#, c-format
msgid "Byte-swapping filesystems not compiled in this version of e2fsck\n"
msgstr "e2fsck'nın bu sürümünde derlenmemiş ters baytlı sistemler \n"
-#: e2fsck/unix.c:690 misc/tune2fs.c:444 misc/tune2fs.c:699 misc/tune2fs.c:716
+#: e2fsck/unix.c:718 misc/tune2fs.c:458 misc/tune2fs.c:716 misc/tune2fs.c:733
#, c-format
msgid "Unable to resolve '%s'"
msgstr "'%s' çözümlenemiyor"
-#: e2fsck/unix.c:716
+#: e2fsck/unix.c:744
+#, c-format
msgid "Incompatible options not allowed when byte-swapping.\n"
msgstr "Ters baytlar düzeltilirken uyumsuz seçeneklere izin verilmez.\n"
-#: e2fsck/unix.c:723
+#: e2fsck/unix.c:751
+#, c-format
msgid "The -c and the -l/-L options may not be both used at the same time.\n"
-msgstr " -c seçeneği ile -l ve -L seçenekleri aynı anda birlikte kullanılamaz.\n"
+msgstr ""
+" -c seçeneği ile -l ve -L seçenekleri aynı anda birlikte kullanılamaz.\n"
-#: e2fsck/unix.c:801
+#: e2fsck/unix.c:829
+#, c-format
msgid "Error: ext2fs library version out of date!\n"
msgstr "Hata: ext2fs kitaplık sürümü uygun değil!\n"
-#: e2fsck/unix.c:809
+#: e2fsck/unix.c:837
msgid "while trying to initialize program"
msgstr "- uygulama başlatılmaya çelışılırken hata oluştu"
-#: e2fsck/unix.c:823
+#: e2fsck/unix.c:851
#, c-format
msgid "\tUsing %s, %s\n"
msgstr "\t%s, %s kullanılıyor\n"
-#: e2fsck/unix.c:835
+#: e2fsck/unix.c:863
msgid "need terminal for interactive repairs"
msgstr "etkileşimli onarım için uçbirim gerekli"
-#: e2fsck/unix.c:871
+#: e2fsck/unix.c:905
#, c-format
msgid "%s trying backup blocks...\n"
msgstr "%s yedekleme blokları deneniyor...\n"
-#: e2fsck/unix.c:872
+#: e2fsck/unix.c:906
msgid "Couldn't find ext2 superblock,"
msgstr "ext2 süperbloğu bulunamadı,"
-#: e2fsck/unix.c:873
+#: e2fsck/unix.c:907
msgid "Group descriptors look bad..."
msgstr "Grup tanımlayıcılar hatalı görünüyor..."
-#: e2fsck/unix.c:884
+#: e2fsck/unix.c:918
+#, c-format
msgid ""
"The filesystem revision is apparently too high for this version of e2fsck.\n"
"(Or the filesystem superblock is corrupt)\n"
@@ -2170,20 +2110,23 @@ msgstr ""
"destekliyor gibi. (Ya da dosya sisteminin süperbloğu bozuk olabilir)\n"
"\n"
-#: e2fsck/unix.c:890
+#: e2fsck/unix.c:924
+#, c-format
msgid "Could this be a zero-length partition?\n"
msgstr "Bu sıfır uzunluklu bir disk bölümü olabilir mi?\n"
-#: e2fsck/unix.c:892
+#: e2fsck/unix.c:926
#, c-format
msgid "You must have %s access to the filesystem or be root\n"
msgstr "Dosya sistemine %s erişiminiz olmalı ya da root olmalısınız\n"
-#: e2fsck/unix.c:897
+#: e2fsck/unix.c:931
+#, c-format
msgid "Possibly non-existent or swap device?\n"
msgstr "Bu mevcut olmayan bir aygıt ya da bir takas aygıtı mı acaba?\n"
-#: e2fsck/unix.c:900
+#: e2fsck/unix.c:934
+#, c-format
msgid ""
"Disk write-protected; use the -n option to do a read-only\n"
"check of the device.\n"
@@ -2191,36 +2134,39 @@ msgstr ""
"Disk yazma korumalı; -n seçeneğini kullanarak salt-oku kipinde\n"
"denetim yapınız.\n"
-#: e2fsck/unix.c:916
+#: e2fsck/unix.c:950
msgid "Get a newer version of e2fsck!"
msgstr "e2fsck'nın daha yeni bir sürümünü alın!"
-#: e2fsck/unix.c:937
+#: e2fsck/unix.c:971
#, c-format
msgid "while checking ext3 journal for %s"
msgstr "- %s için ext3 günlüğü denetlenirken hata oluştu"
-#: e2fsck/unix.c:948
-msgid "Warning: skipping journal recovery because doing a read-only filesystem check.\n"
+#: e2fsck/unix.c:982
+#, c-format
+msgid ""
+"Warning: skipping journal recovery because doing a read-only filesystem "
+"check.\n"
msgstr ""
"Uyarı: Dosya sistemi salt-oku kipinde denetlendiğinden\n"
"günlük dosyasına göre kurtarma atlanıyor.\n"
-#: e2fsck/unix.c:961
+#: e2fsck/unix.c:995
#, c-format
msgid "unable to set superblock flags on %s\n"
msgstr "%s üzerine süperblok bayrakları konulamadı\n"
-#: e2fsck/unix.c:967
+#: e2fsck/unix.c:1001
#, c-format
msgid "while recovering ext3 journal of %s"
msgstr "- %s ext3 günlük dosyası kurtarılmaya çalışılırken hata oluştu"
-#: e2fsck/unix.c:996
+#: e2fsck/unix.c:1030
msgid "Warning: compression support is experimental.\n"
msgstr "Uyarı: sıkıştırma desteği deneyseldir.\n"
-#: e2fsck/unix.c:1001
+#: e2fsck/unix.c:1035
#, c-format
msgid ""
"E2fsck not compiled with HTREE support,\n"
@@ -2229,37 +2175,39 @@ msgstr ""
"E2fsck HTREE desteği ile derlenmemiş,\n"
"\tama dosya sistemi %s HTREE dizinleri içeriyor.\n"
-#: e2fsck/unix.c:1044
+#: e2fsck/unix.c:1078
#, c-format
msgid "%s: Filesystem byte order already normalized.\n"
msgstr "%s Dosya sisteminde baytlar zaten normal.\n"
-#: e2fsck/unix.c:1064
+#: e2fsck/unix.c:1098
msgid "while reading bad blocks inode"
msgstr "- hatalı bloklar düğümü okunmaya çalışılırken hata oluştu"
-#: e2fsck/unix.c:1066
+#: e2fsck/unix.c:1100
+#, c-format
msgid "This doesn't bode well, but we'll try to go on...\n"
msgstr "Bu pek hayra alamet değil, ama üstüne gidilecek...\n"
-#: e2fsck/unix.c:1073
+#: e2fsck/unix.c:1107
+#, c-format
msgid "Restarting e2fsck from the beginning...\n"
msgstr "e2fsck baştan başlıyor...\n"
-#: e2fsck/unix.c:1077
+#: e2fsck/unix.c:1111
msgid "while resetting context"
msgstr "- bağlam sıfırlanırken hata oluştu"
-#: e2fsck/unix.c:1084
+#: e2fsck/unix.c:1118
#, c-format
msgid "%s: e2fsck canceled.\n"
msgstr "%s: e2fsck durduruldu.\n"
-#: e2fsck/unix.c:1089
+#: e2fsck/unix.c:1123
msgid "aborted"
msgstr "çıktı"
-#: e2fsck/unix.c:1097
+#: e2fsck/unix.c:1131
#, c-format
msgid ""
"\n"
@@ -2268,12 +2216,12 @@ msgstr ""
"\n"
"%s: ***** DOSYA SİSTEMİ DEĞİŞTİRİLDİ *****\n"
-#: e2fsck/unix.c:1100
+#: e2fsck/unix.c:1134
#, c-format
msgid "%s: ***** REBOOT LINUX *****\n"
msgstr "%s: ***** MAKİNAYI YENİDEN BAŞLATIN *****\n"
-#: e2fsck/unix.c:1106
+#: e2fsck/unix.c:1140
#, c-format
msgid ""
"\n"
@@ -2425,7 +2373,8 @@ msgstr "bitti \n"
#, c-format
msgid ""
"Usage: %s [-b block_size] [-i input_file] [-o output_file] [-svwnf]\n"
-" [-c blocks_at_once] [-p num_passes] [-t test_pattern [-t test_pattern [...]]]\n"
+" [-c blocks_at_once] [-p num_passes] [-t test_pattern [-t test_pattern "
+"[...]]]\n"
" device [last_block [start_block]]\n"
msgstr ""
"Kullanımı: %s [-b blok_boyu] [-i girdi_dosyası] [-o çıktı_dosyası]\n"
@@ -2510,20 +2459,21 @@ msgstr ""
msgid "during test data write, block %lu"
msgstr "veri yazma denemesi sırasında, blok %lu"
-#: misc/badblocks.c:788 misc/util.c:152
+#: misc/badblocks.c:788 misc/util.c:158
#, c-format
msgid "%s is mounted; "
msgstr "%s bağlandı; "
#: misc/badblocks.c:790
msgid "badblocks forced anyway. Hope /etc/mtab is incorrect.\n"
-msgstr "badblocks n'olursa olsun çalıştırılacak. İnşallah /etc/mtab yanlıştır.\n"
+msgstr ""
+"badblocks n'olursa olsun çalıştırılacak. İnşallah /etc/mtab yanlıştır.\n"
#: misc/badblocks.c:794
msgid "it's not safe to run badblocks!\n"
msgstr "'badblocks' çalıştırmak güvenli değil!\n"
-#: misc/badblocks.c:853 misc/mke2fs.c:898
+#: misc/badblocks.c:853 misc/mke2fs.c:926
#, c-format
msgid "bad block size - %s"
msgstr "blok uzunluğu hatalı - %s"
@@ -2556,7 +2506,7 @@ msgstr "Aygıt alanı saptanamadı; Elle bir değer girmelisiniz\n"
msgid "while trying to determine device size"
msgstr "- aygıt alanı saptanmaya çalışılırken hata oluştu"
-#: misc/badblocks.c:972 misc/mke2fs.c:1071
+#: misc/badblocks.c:972 misc/mke2fs.c:1099
#, c-format
msgid "bad blocks count - %s"
msgstr "blok sayısı hatalı - %s"
@@ -2599,17 +2549,22 @@ msgstr ""
"\n"
" A: erişim zamanı güncellenmez\n"
" a: sadece dosyanın sonuna ekleme yapılabilir. root değiştirebilir.\n"
-" c: sıkıştırılmış; dosyanın okuma-yazma sırasındaki açılması/sıkıştırılması\n"
+" c: sıkıştırılmış; dosyanın okuma-yazma sırasındaki açılması/"
+"sıkıştırılması\n"
" çekirdeğin denetimindedir.\n"
" d: dökümlenmez; dump uygulamasından etkilenmez.\n"
" D: bir dizine uygulanır ve dizindeki değişiklikler eşzamanlı işlenir.\n"
-" i: değişmez; dosya içeriği silinemez, yazılamaz, dosyaya bağ oluşturulamaz\n"
+" i: değişmez; dosya içeriği silinemez, yazılamaz, dosyaya bağ "
+"oluşturulamaz\n"
" ve ismi değiştirilemez. Sadece root bu özelliği değiştirebilir.\n"
-" j: günlükleme; dosya sistemi ext3 olarak bağlanmışsa bu özellik etkisizdir\n"
-" s: silinme güvenliği; bu özellik verilen bir dosya silindiğinde veri alanı\n"
+" j: günlükleme; dosya sistemi ext3 olarak bağlanmışsa bu özellik "
+"etkisizdir\n"
+" s: silinme güvenliği; bu özellik verilen bir dosya silindiğinde veri "
+"alanı\n"
" sıfırlarla doldurulur\n"
" S: eşzamanlı güncellemeler; bu özelliği içeren bir dosyaya tüm\n"
-" değişiklikler anında yazılır, sistemin 'sync' seçeneği ile bağlanmasına\n"
+" değişiklikler anında yazılır, sistemin 'sync' seçeneği ile "
+"bağlanmasına\n"
" eşdeğer özellik sağlar\n"
" u: silinememezlik; bu dosya silindiğinde içeriği saklanır, silecek\n"
" kullanıcıya silinme sırasında sorulmasını sağlar.\n"
@@ -2661,11 +2616,11 @@ msgstr "- %s üzerinde sürüm belirlenirken hata oluştu"
msgid "Couldn't allocate path variable in chattr_dir_proc"
msgstr "chattr_dir_proc işlevinde dosya yolu değişkenine yer ayrılamadı"
-#: misc/chattr.c:287
+#: misc/chattr.c:291
msgid "= is incompatible with - and +\n"
msgstr "= ile + ve - uyumsuz\n"
-#: misc/chattr.c:295
+#: misc/chattr.c:299
msgid "Must use '-v', =, - or +\n"
msgstr "'-v', =, - veya + kullanılmalı\n"
@@ -2679,11 +2634,13 @@ msgstr ""
"\n"
"Seçenekler:\n"
" -b hatalı olarak imlenmiş blokları gösterir\n"
-" -f dosya sistemi dumpe2fs'in bilmediği özellikler içerse bile\n"
+" -f dosya sistemi dumpe2fs'in bilmediği özellikler içerse "
+"bile\n"
" bilgilerin dökümlenmesini sağlar\n"
" -h grup tanımlayıcıları değil sadece süperblok bilgilerini\n"
" gösterir\n"
-" -i belirtilen aygıt için e2image tarafından oluşturulmuş disk\n"
+" -i belirtilen aygıt için e2image tarafından oluşturulmuş "
+"disk\n"
" görüntüsü dosyasının verilerini gösterir\n"
" -x ayrıntılı olarak grupların bilgileri gösterilir\n"
" -V sürüm bilgileri gösterilir ve çıkar\n"
@@ -2712,12 +2669,14 @@ msgid "Backup"
msgstr "Yedek"
#: misc/dumpe2fs.c:130
+#, c-format
msgid ", Group descriptors at "
msgstr ""
" \n"
" Grup tanımlayıcı: "
#: misc/dumpe2fs.c:135
+#, c-format
msgid " Group descriptor at "
msgstr ""
" \n"
@@ -2767,7 +2726,7 @@ msgstr "- hatalı bloklar listesi basılırken hata oluştu"
msgid "Bad blocks: %d"
msgstr "Hatalı bloklar: %d"
-#: misc/dumpe2fs.c:227 misc/tune2fs.c:150
+#: misc/dumpe2fs.c:227 misc/tune2fs.c:153
msgid "while reading journal superblock"
msgstr "- günlük dosyası süperbloğu okunurken hata oluştu"
@@ -2794,16 +2753,18 @@ msgstr ""
"Günlük başlangıcı: %d\n"
"Günlük kullanıcı sayısı: %d\n"
-#: misc/dumpe2fs.c:307 misc/mke2fs.c:1085
+#: misc/dumpe2fs.c:307 misc/mke2fs.c:1113
#, c-format
msgid "\tUsing %s\n"
msgstr "\t%s kullanılıyor\n"
-#: misc/dumpe2fs.c:334 misc/e2image.c:488 misc/tune2fs.c:760 resize/main.c:230
+#: misc/dumpe2fs.c:334 misc/e2image.c:566 misc/tune2fs.c:778 resize/main.c:234
+#, c-format
msgid "Couldn't find valid filesystem superblock.\n"
msgstr "Geçerli süperblok bulunamadı.\n"
#: misc/dumpe2fs.c:345
+#, c-format
msgid "Note: This is a byte-swapped filesystem\n"
msgstr "Bilgi: Bu bir ters-baytlı dosya sistemi\n"
@@ -2817,8 +2778,8 @@ msgstr ""
"%s: %s: biteşlemler okunurken hata oluştu: %s\n"
#: misc/e2image.c:50
-#, c-format
-msgid "Usage: %s [-r] device file\n"
+#, fuzzy, c-format
+msgid "Usage: %s [-r] device image_file\n"
msgstr ""
"Kullanımı: %s [-r] AYGIT DOSYA\n"
"\n"
@@ -2826,7 +2787,8 @@ msgstr ""
"Örn: 4GB lık bir sistem için yaklaşık 3MB lık bir görüntü dosyası\n"
"oluşturulur. Bu dosya, dosya sistemini kurtarmak için uzmanlarca\n"
"kullanılabilir. Belli aralıklarla bu dosyanın başka bir dosya sistemine\n"
-"kaydedilmesi önerilir. -r seçeneği temel biçemli bir dosya üretir, çok büyük\n"
+"kaydedilmesi önerilir. -r seçeneği temel biçemli bir dosya üretir, çok "
+"büyük\n"
"olacağından önerilmez. DOSYA yerine - verilirse dosya standart çıktıya\n"
"yazılır.\n"
@@ -2861,30 +2823,37 @@ msgid "e2label: cannot open %s\n"
msgstr "e2label: %s açılamıyor\n"
#: misc/e2label.c:62
+#, c-format
msgid "e2label: cannot seek to superblock\n"
msgstr "e2label: süperbloka erişilemiyor\n"
#: misc/e2label.c:67
+#, c-format
msgid "e2label: error reading superblock\n"
msgstr "e2label: süperblok okunurken hata oluştu\n"
#: misc/e2label.c:71
+#, c-format
msgid "e2label: not an ext2 filesystem\n"
msgstr "e2label: bir ext2 dosya sistemi değil\n"
-#: misc/e2label.c:96 misc/tune2fs.c:867
+#: misc/e2label.c:96 misc/tune2fs.c:885
+#, c-format
msgid "Warning: label too long, truncating.\n"
msgstr "Uyarı: etiket çok uzun, kırpılıyor.\n"
#: misc/e2label.c:99
+#, c-format
msgid "e2label: cannot seek to superblock again\n"
msgstr "e2label: süperbloğa yine erişilemedi\n"
#: misc/e2label.c:104
+#, c-format
msgid "e2label: error writing superblock\n"
msgstr "e2label: süperbloğa yazılırken hata oluştu\n"
-#: misc/e2label.c:116 misc/tune2fs.c:439
+#: misc/e2label.c:116 misc/tune2fs.c:450
+#, c-format
msgid "Usage: e2label device [newlabel]\n"
msgstr ""
" \n"
@@ -2893,6 +2862,7 @@ msgstr ""
"\n"
#: misc/findsuper.c:126
+#, c-format
msgid "Usage: findsuper device [skipbytes [startkb]]\n"
msgstr "Kullanımı: findsuper aygıt [atlanacak_baytlar [başlangıç_kb]]\n"
@@ -2902,6 +2872,7 @@ msgid "skipbytes should be a number, not %s\n"
msgstr "atlanacak_baytlar bir sayı olmalı, %s değil\n"
#: misc/findsuper.c:137
+#, c-format
msgid "skipbytes must be a multiple of the sector size\n"
msgstr "atlanacak_baytlar sektör boyunun katları olmalı\n"
@@ -2921,6 +2892,7 @@ msgid "starting at %Ld, with %d byte increments\n"
msgstr "%Ld de başlayıp %d bayt arttırımla\n"
#: misc/findsuper.c:158
+#, c-format
msgid " thisoff block fs_blk_sz blksz grp last_mount\n"
msgstr " thisoff blok ds_blok_boyu blokboyu grup son_bağlama\n"
@@ -3023,14 +2995,16 @@ msgstr ""
"bir bölüm etiketi ya da UUID verilebilir.\n"
"\n"
"Seçenekler:\n"
-" -s Denetimi hızlandırır. Etkileşimli kipte iyi bir seçimdir.\n"
+" -s Denetimi hızlandırır. Etkileşimli kipte iyi bir "
+"seçimdir.\n"
" -t dstürü Denetlenecek dosya sistemlerinin türleri belirtilir.\n"
" -A /etc/fstab dosyasındaki denetlenmesi öngörülmüş\n"
" sistemlerin denetimleri yapılır.\n"
" -C Denetim süreci bir göstergeyle gösterilir.\n"
" -N Denetim yapılıyormuş gibi görünür, bir şey yapılmaz.\n"
" -P -A seçeneği ile birlikte kullanılarak kök dosya sistemi\n"
-" denetlenirken diğer dosya sistemleri de paralel denetlenir\n"
+" denetlenirken diğer dosya sistemleri de paralel "
+"denetlenir\n"
" -R -A seçeneği ile kullanıldığında kök dosya sistemi\n"
" denetlenmez.\n"
" -T Başlangıçta başlık gösterilmez.\n"
@@ -3067,7 +3041,8 @@ msgstr ""
"Dosyaların özelliklerini listeler.\n"
"\n"
"Seçenekler:\n"
-" -a '.' ile başlayanlar dahil dizinlerin içindeki tüm dosyaları listeler\n"
+" -a '.' ile başlayanlar dahil dizinlerin içindeki tüm dosyaları "
+"listeler\n"
" -d dosyalar gibi dizinleri de listeler\n"
" -R dizinler ve içerikleri ardışık olarak listelenir\n"
" -V sürüm bilgileri gösterilir\n"
@@ -3086,7 +3061,7 @@ msgstr "- %s üzerinde bayraklar okunurken hata oluştu"
msgid "While reading version on %s"
msgstr "- %s üzerinde sürüm okunurken hata oluştu"
-#: misc/mke2fs.c:91
+#: misc/mke2fs.c:92
#, c-format
msgid ""
"Usage: %s [-c|-t|-l filename] [-b block-size] [-f fragment-size]\n"
@@ -3109,8 +3084,10 @@ msgstr ""
" -g her-gruptaki-blok-sayısı\n"
" -i dosya-indeksi-uzunluğu boş bir dizinin disk üzerinde kaplayabileceği\n"
" en küçük alan, bayt cinsinden verilir.\n"
-" -j ext3 dosya sistemi için günlük dosyası oluşturur\n"
-" -J ile günlük dosyasının özellikleri verilmezse\n"
+" -j ext3 dosya sistemi için günlük dosyası "
+"oluşturur\n"
+" -J ile günlük dosyasının özellikleri "
+"verilmezse\n"
" dosya öntanımlı özelliklrele oluşturulur.\n"
" DİKKAT: Linux çekirdeğinde ext3 desteği yoksa\n"
" sistem ext2 olarak kullanılabilir\n"
@@ -3122,8 +3099,10 @@ msgstr ""
" -M son-bağlanan-dizin dosya istemine son bağlanan dizin belirtilir\n"
" -n dosya sistemi oluşturulmaz, sadece işlemleri\n"
" gösterir\n"
-" -N dosya-indeksi-sayısı sistemdeki toplam dosya indeksi sayısı belirtilir\n"
-" -o işletim-sistemi dosya sisteminin 'creator os' alanına yazılacak\n"
+" -N dosya-indeksi-sayısı sistemdeki toplam dosya indeksi sayısı "
+"belirtilir\n"
+" -o işletim-sistemi dosya sisteminin 'creator os' alanına "
+"yazılacak\n"
" değer. Normalde Linux'tur.\n"
" -O özellik[,...] belirtilen özellikte dosya sistemi oluşturur.\n"
" Özellikler aşağıda verilmiştir.\n"
@@ -3132,54 +3111,57 @@ msgstr ""
" -R raid_seçenekleri bu seçenekler için man sayfasına bakınız\n"
" -S kurtarma amacıyla sadece süper blok ve grup\n"
" tanımlayıcılar yeniden yazılır\n"
-" -T dosya-sistemi-türü dosya sisteminin nasıl kullanılacağı belirtilir\n"
+" -T dosya-sistemi-türü dosya sisteminin nasıl kullanılacağı "
+"belirtilir\n"
" Türler için man sayfasına bakınız.\n"
" -v işlem sırasında ayrıntılı bilgi verilir\n"
" -V sürüm bilgileri gösterilir ve çıkar\n"
"Günlükleme seçenekleri:\n"
-" size=günlük-uzunluğu Günlük dosyasının uzunluğu MB olarak belirtilir\n"
+" size=günlük-uzunluğu Günlük dosyasının uzunluğu MB olarak "
+"belirtilir\n"
" device=dış-günlük-aygıtı Başka bir aygıt üzerindeki günlük dosyasının\n"
" kullanılması sağlanır.\n"
"\n"
"Özellikler:\n"
" sparse_super Yedek süperblokların sayısını sınırlamakta kullanılır.\n"
" filetype Dizin kayıtlarında dosya türü bilgisi saklanır.\n"
-" has_journal -j seçeneği ile aynı. Bir ext3 günlük dosyası oluşturur.\n"
+" has_journal -j seçeneği ile aynı. Bir ext3 günlük dosyası "
+"oluşturur.\n"
"\n"
"Çeviri hatalarını <gnu-tr-u12a@lists.sourceforge.net> adresine bildiriniz.\n"
"\n"
-#: misc/mke2fs.c:235
+#: misc/mke2fs.c:264
#, c-format
msgid "Running command: %s\n"
msgstr "Çalışan komut: %s\n"
-#: misc/mke2fs.c:239
+#: misc/mke2fs.c:268
#, c-format
msgid "while trying run '%s'"
msgstr "- '%s' çalıştırılırken hata oluştu"
-#: misc/mke2fs.c:246
+#: misc/mke2fs.c:275
msgid "while processing list of bad blocks from program"
msgstr "- hatalı bloklar listesi işlenirken hata oluştu"
-#: misc/mke2fs.c:273
+#: misc/mke2fs.c:302
#, c-format
msgid "Block %d in primary superblock/group descriptor area bad.\n"
msgstr "Birincil süperblok/grup tanımı alanındaki blok %d hatalı\n"
-#: misc/mke2fs.c:275
+#: misc/mke2fs.c:304
#, c-format
msgid "Blocks %d through %d must be good in order to build a filesystem.\n"
msgstr ""
"Bir dosya sistemi oluşturulurken %d den %d ye kadar olan\n"
"bloklar hatasız olmak zorundadır.\n"
-#: misc/mke2fs.c:278
+#: misc/mke2fs.c:307
msgid "Aborting....\n"
msgstr "Çıkılıyor...\n"
-#: misc/mke2fs.c:298
+#: misc/mke2fs.c:327
#, c-format
msgid ""
"Warning: the backup superblock/group descriptors at block %d contain\n"
@@ -3190,23 +3172,23 @@ msgstr ""
"\"hatalı bloklar\" içeriyor.\n"
"\n"
-#: misc/mke2fs.c:316
+#: misc/mke2fs.c:345
msgid "while marking bad blocks as used"
msgstr "- hatalı bloklar kullanılmış olarak imlenirken hata oluştu"
-#: misc/mke2fs.c:374
+#: misc/mke2fs.c:403
msgid "done \n"
msgstr "bitti \n"
-#: misc/mke2fs.c:409
+#: misc/mke2fs.c:438
msgid "while allocating zeroizing buffer"
msgstr "- sıfırlama tampon belleği ayrılırken hata oluştu"
-#: misc/mke2fs.c:450
+#: misc/mke2fs.c:479
msgid "Writing inode tables: "
msgstr "Düğüm tabloları yazılıyor: "
-#: misc/mke2fs.c:461
+#: misc/mke2fs.c:490
#, c-format
msgid ""
"\n"
@@ -3215,67 +3197,67 @@ msgstr ""
"\n"
"%2d de başlayan düğüm tablosundaki %1d blok yazılamadı: %3s\n"
-#: misc/mke2fs.c:484
+#: misc/mke2fs.c:513
msgid "while creating root dir"
msgstr "- kök dizin oluşturulurken hata"
-#: misc/mke2fs.c:491
+#: misc/mke2fs.c:520
msgid "while reading root inode"
msgstr "- kök düğümü okunurken hata oluştu"
-#: misc/mke2fs.c:500
+#: misc/mke2fs.c:529
msgid "while setting root inode ownership"
msgstr "- kök düğümünün sahibi belirlenirken hata oluştu"
-#: misc/mke2fs.c:518
+#: misc/mke2fs.c:547
msgid "while creating /lost+found"
msgstr "- /lost+found dizini oluşturulurken hata oluştu"
-#: misc/mke2fs.c:525
+#: misc/mke2fs.c:554
msgid "while looking up /lost+found"
msgstr "- /lost+found dizine bakılırken hata oluştu"
-#: misc/mke2fs.c:535
+#: misc/mke2fs.c:564
msgid "while expanding /lost+found"
msgstr "- /lost+found dizini genişletilirken hata oluştu"
-#: misc/mke2fs.c:551
+#: misc/mke2fs.c:580
msgid "while setting bad block inode"
msgstr "- hatalı blok düğümü belirlenirken hata oluştu"
-#: misc/mke2fs.c:583
+#: misc/mke2fs.c:612
#, c-format
msgid "Out of memory erasing sectors %d-%d\n"
msgstr "%d-%d arasındaki sektörler silinirken bellek yetmedi\n"
-#: misc/mke2fs.c:593
+#: misc/mke2fs.c:622
#, c-format
msgid "Warning: could not read block 0: %s\n"
msgstr "Uyarı: blok 0 okunamadı: %s\n"
-#: misc/mke2fs.c:609
+#: misc/mke2fs.c:638
#, c-format
msgid "Warning: could not erase sector %d: %s\n"
msgstr "Uyarı: %d. sektör silinemedi: %s\n"
-#: misc/mke2fs.c:625
+#: misc/mke2fs.c:654
msgid "while initializing journal superblock"
msgstr "- gümlük superbloğu ilklendirilirken hata oluştu"
-#: misc/mke2fs.c:631
+#: misc/mke2fs.c:660
msgid "Zeroing journal device: "
msgstr "Günlük aygıtı temizleniyor: "
-#: misc/mke2fs.c:638
+#: misc/mke2fs.c:667
#, c-format
msgid "while zeroing journal device (block %u, count %d)"
msgstr "- günlük aygıtı temizlenirken (blok %u, %d blok) hata oluştu"
-#: misc/mke2fs.c:649
+#: misc/mke2fs.c:678
msgid "while writing journal superblock"
msgstr "- günlük süperbloğu yazılırken hata oluştu"
-#: misc/mke2fs.c:664
+#: misc/mke2fs.c:693
#, c-format
msgid ""
"warning: %d blocks unused.\n"
@@ -3284,77 +3266,81 @@ msgstr ""
"uyarı: %d blok kullanılmamış.\n"
"\n"
-#: misc/mke2fs.c:669
+#: misc/mke2fs.c:698
#, c-format
msgid "Filesystem label=%s\n"
msgstr "Dosya sistemi ismi = %s\n"
-#: misc/mke2fs.c:670
+#: misc/mke2fs.c:699
msgid "OS type: "
msgstr "İşl. Sist. türü: "
-#: misc/mke2fs.c:675
+#: misc/mke2fs.c:704
msgid "(unknown os)"
msgstr "(bilinmeyen işl. sist.)"
-#: misc/mke2fs.c:678
+#: misc/mke2fs.c:707
#, c-format
msgid "Block size=%u (log=%u)\n"
msgstr "Blok boyu = %u (günlük kaydı = %u)\n"
-#: misc/mke2fs.c:680
+#: misc/mke2fs.c:709
#, c-format
msgid "Fragment size=%u (log=%u)\n"
msgstr "Adımlama boyu = %u (günlük kaydı = %u)\n"
-#: misc/mke2fs.c:682
+#: misc/mke2fs.c:711
#, c-format
msgid "%u inodes, %u blocks\n"
msgstr "%u düğüm, %u blok\n"
-#: misc/mke2fs.c:684
+#: misc/mke2fs.c:713
#, c-format
msgid "%u blocks (%2.2f%%) reserved for the super user\n"
msgstr "%u blok (%%%2.2f) süper kullanıcı için ayrıldı\n"
-#: misc/mke2fs.c:687
+#: misc/mke2fs.c:716
#, c-format
msgid "First data block=%u\n"
msgstr "İlk veri bloğu = %u\n"
-#: misc/mke2fs.c:689
+#: misc/mke2fs.c:718
#, c-format
msgid "%u block groups\n"
msgstr "%u blok grubu\n"
-#: misc/mke2fs.c:691
+#: misc/mke2fs.c:720
#, c-format
msgid "%u block group\n"
msgstr "%u blok grubu\n"
-#: misc/mke2fs.c:692
+#: misc/mke2fs.c:721
#, c-format
msgid "%u blocks per group, %u fragments per group\n"
msgstr "Grup başına %u blok ve %u sekme\n"
-#: misc/mke2fs.c:694
+#: misc/mke2fs.c:723
#, c-format
msgid "%u inodes per group\n"
msgstr "grup başına %u düğüm\n"
-#: misc/mke2fs.c:701
+#: misc/mke2fs.c:730
+#, c-format
msgid "Superblock backups stored on blocks: "
msgstr "Süperblokların bulunduğu bloklar:"
-#: misc/mke2fs.c:751
+#: misc/mke2fs.c:780
+#, c-format
msgid "Couldn't allocate memory to parse raid options!\n"
msgstr "Raid seçenekleri için bellek ayrılamadı!\n"
-#: misc/mke2fs.c:776
+#: misc/mke2fs.c:805
+#, c-format
msgid "Invalid stride parameter.\n"
msgstr "'stride' parametresi geçersiz.\n"
-#: misc/mke2fs.c:784
+#: misc/mke2fs.c:813
+#, c-format
msgid ""
"\n"
"Bad raid options specified.\n"
@@ -3375,81 +3361,85 @@ msgstr ""
"\tstride=<bloklardaki adım uzunluğu>\n"
"\n"
-#: misc/mke2fs.c:902
+#: misc/mke2fs.c:930
#, c-format
msgid "Warning: blocksize %d not usable on most systems.\n"
msgstr "Uyarı: blok uzunluğu %d birçok sistemde kullanımdışıdır.\n"
-#: misc/mke2fs.c:919
+#: misc/mke2fs.c:947
#, c-format
msgid "bad fragment size - %s"
msgstr "sekme boyu hatalı - %s"
-#: misc/mke2fs.c:925
+#: misc/mke2fs.c:953
+#, c-format
msgid "Warning: fragments not supported. Ignoring -f option\n"
msgstr "Uyarı: sekmeler desteklenmediğinden -f seçeneği yoksayılıyor\n"
-#: misc/mke2fs.c:932
+#: misc/mke2fs.c:960
msgid "Illegal number for blocks per group"
msgstr "Grup başına blok sayısı kuraldışı"
-#: misc/mke2fs.c:937
+#: misc/mke2fs.c:965
msgid "blocks per group must be multiple of 8"
msgstr "grup başına blok sayısı 8'in katları olmalıdır"
-#: misc/mke2fs.c:947
+#: misc/mke2fs.c:975
#, c-format
msgid "bad inode ratio %s (min %d/max %d"
msgstr "düğüm oranı %s hatalı (en az %d/en çok %d)"
-#: misc/mke2fs.c:966
+#: misc/mke2fs.c:994
msgid "in malloc for bad_blocks_filename"
msgstr "- bad_blocks_filename için bellek ayrılırken"
-#: misc/mke2fs.c:975
+#: misc/mke2fs.c:1003
#, c-format
msgid "bad reserved blocks percent - %s"
msgstr "yedek blok yüzdesi hatalı - %s"
-#: misc/mke2fs.c:1007
+#: misc/mke2fs.c:1035
#, c-format
msgid "bad inode size - %s"
msgstr "düğüm uzunluğu hatalı - %s"
-#: misc/mke2fs.c:1043 misc/tune2fs.c:294
+#: misc/mke2fs.c:1071 misc/tune2fs.c:302
#, c-format
msgid "Invalid filesystem option set: %s\n"
msgstr "Geçersiz dosya sistemi seçeneği: %s\n"
-#: misc/mke2fs.c:1112 misc/mke2fs.c:1449
+#: misc/mke2fs.c:1140 misc/mke2fs.c:1477
#, c-format
msgid "while trying to open journal device %s\n"
msgstr "- %s günlük aygıtı açılmaya çalışılırken hata\n"
-#: misc/mke2fs.c:1118
+#: misc/mke2fs.c:1146
#, c-format
msgid "Journal dev blocksize (%d) smaller than minimum blocksize %d\n"
msgstr "Günlük aygıtının blok boyu (%d) asgari blok boyundan (%d) küçük\n"
-#: misc/mke2fs.c:1132
+#: misc/mke2fs.c:1160
#, c-format
msgid "%d-byte blocks too big for system (max %d)"
msgstr "%d baytlık bloklar sistem için çok büyük (en çok %d)"
-#: misc/mke2fs.c:1136
+#: misc/mke2fs.c:1164
#, c-format
-msgid "Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
-msgstr "Uyarı: %d baytlık bloklar sistem için çok büyük (en çok %d), ama devam ediliyor\n"
+msgid ""
+"Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
+msgstr ""
+"Uyarı: %d baytlık bloklar sistem için çok büyük (en çok %d), ama devam "
+"ediliyor\n"
-#: misc/mke2fs.c:1161
+#: misc/mke2fs.c:1189
msgid "filesystem"
msgstr "dosya sistemi"
-#: misc/mke2fs.c:1174 resize/main.c:264
+#: misc/mke2fs.c:1202 resize/main.c:268
msgid "while trying to determine filesystem size"
msgstr "- dosya sistemi uzunluğu saptanmaya çalışılırken hata oluştu"
-#: misc/mke2fs.c:1180
+#: misc/mke2fs.c:1208
msgid ""
"Couldn't determine device size; you must specify\n"
"the size of the filesystem\n"
@@ -3457,7 +3447,7 @@ msgstr ""
"Aygıt alanı saptanamadı; dosya sistemi için\n"
"bir uzunluk belirtmelisiniz\n"
-#: misc/mke2fs.c:1187
+#: misc/mke2fs.c:1215
msgid ""
"Device size reported to be zero. Invalid partition specified, or\n"
"\tpartition table wasn't reread after running fdisk, due to\n"
@@ -3470,56 +3460,56 @@ msgstr ""
"Disk bölümleme tablosunun yeniden okunması için sisteminizi yeniden\n"
"başlatmalısınız.\n"
-#: misc/mke2fs.c:1205
+#: misc/mke2fs.c:1233
msgid "Filesystem larger than apparent device size."
msgstr "Dosya sisteminin uzunluğu görünürdeki uzunluktan büyük."
-#: misc/mke2fs.c:1227
+#: misc/mke2fs.c:1255
msgid "while trying to determine hardware sector size"
msgstr "- donanımsal sektör boyu saptanmaya çalışılırken"
-#: misc/mke2fs.c:1241
+#: misc/mke2fs.c:1269
msgid "blocks per group count out of range"
msgstr "Grup başına blok sayısı kapsamdışı"
-#: misc/mke2fs.c:1251
+#: misc/mke2fs.c:1279
#, c-format
msgid "bad inode size %d (min %d/max %d)"
msgstr "düğüm uzunluğu %d hatalı (en az %d/en çok %d)"
-#: misc/mke2fs.c:1257
+#: misc/mke2fs.c:1285
#, c-format
msgid "Warning: %d-byte inodes not usable on most systems\n"
msgstr "Uyarı: %d baytlık düğümler bir çok sistemde kullanımdışıdır.\n"
-#: misc/mke2fs.c:1308
+#: misc/mke2fs.c:1336
msgid "while setting up superblock"
msgstr "- süperblok ayarlanırken hata oluştu"
-#: misc/mke2fs.c:1342
+#: misc/mke2fs.c:1370
#, c-format
msgid "unknown os - %s"
msgstr "bilinmeyen işletim sistemi - %s"
-#: misc/mke2fs.c:1396
+#: misc/mke2fs.c:1424
msgid "while trying to allocate filesystem tables"
msgstr "- dosya sistemi tabloları ayrılmaya çalışılırken hata oluştu"
-#: misc/mke2fs.c:1427
+#: misc/mke2fs.c:1455
#, c-format
msgid "while zeroing block %u at end of filesystem"
msgstr "dosya sisteminin sonunda blok %u sıfırlanırken"
-#: misc/mke2fs.c:1442 misc/tune2fs.c:376
+#: misc/mke2fs.c:1470 misc/tune2fs.c:387
msgid "journal"
msgstr "günlük"
-#: misc/mke2fs.c:1454
+#: misc/mke2fs.c:1482
#, c-format
msgid "Adding journal to device %s: "
msgstr "%s'e günlük ekleniyor: "
-#: misc/mke2fs.c:1461
+#: misc/mke2fs.c:1489
#, c-format
msgid ""
"\n"
@@ -3528,16 +3518,17 @@ msgstr ""
"\n"
"\tgünlük %s e eklenmeye çalışılırken hata oluştu"
-#: misc/mke2fs.c:1466 misc/mke2fs.c:1490 misc/tune2fs.c:404 misc/tune2fs.c:418
+#: misc/mke2fs.c:1494 misc/mke2fs.c:1518 misc/tune2fs.c:415 misc/tune2fs.c:429
+#, c-format
msgid "done\n"
msgstr "tamam\n"
-#: misc/mke2fs.c:1478
+#: misc/mke2fs.c:1506
#, c-format
msgid "Creating journal (%d blocks): "
msgstr "Günlük oluşturuluyor (%d blok): "
-#: misc/mke2fs.c:1486
+#: misc/mke2fs.c:1514
msgid ""
"\n"
"\twhile trying to create journal"
@@ -3545,11 +3536,13 @@ msgstr ""
"\n"
"\tgünlük oluşturulmaya çalışılırken hata oluştu"
-#: misc/mke2fs.c:1495
+#: misc/mke2fs.c:1523
+#, c-format
msgid "Writing superblocks and filesystem accounting information: "
msgstr "Süperblokların ve dosya sisteminin hesap bilgileri yazılıyor: "
-#: misc/mke2fs.c:1500
+#: misc/mke2fs.c:1528
+#, c-format
msgid ""
"\n"
"Warning, had trouble writing out superblocks."
@@ -3557,7 +3550,8 @@ msgstr ""
"\n"
"Uyarı, süperblokların tamamına yazma sorunu var."
-#: misc/mke2fs.c:1503
+#: misc/mke2fs.c:1531
+#, c-format
msgid ""
"done\n"
"\n"
@@ -3565,7 +3559,8 @@ msgstr ""
"bitti\n"
"\n"
-#: misc/mklost+found.c:48
+#: misc/mklost+found.c:49
+#, c-format
msgid "Usage: mklost+found\n"
msgstr "Kullanımı: mklost+found\n"
@@ -3601,11 +3596,11 @@ msgstr "HDIO_GETGEO ioctl"
msgid "BLKGETSIZE ioctl"
msgstr "BLKGETSIZE ioctl"
-#: misc/tune2fs.c:74
+#: misc/tune2fs.c:77
msgid "Please run e2fsck on the filesystem.\n"
msgstr "Lütfen dosya sisteminde e2fsck çalıştırın.\n"
-#: misc/tune2fs.c:81
+#: misc/tune2fs.c:84
#, c-format
msgid ""
"Usage: %s [-c max-mounts-count] [-e errors-behavior] [-g group]\n"
@@ -3620,17 +3615,20 @@ msgstr ""
"Dosya sisteminin ayarlanabilir parametrelerini değiştirmekte kullanılır.\n"
"\n"
"Seçenekler:\n"
-" -c SAYI İki dosyasistemi denetimi arasında dosya sisteminin\n"
+" -c SAYI İki dosyasistemi denetimi arasında dosya "
+"sisteminin\n"
" en çok kaç defa bağlanabileceği belirtilir.\n"
" -C SAYI -c ile aynı\n"
" -e hata-davranışı Hata oluştuğunda ne yapılacağı belirtilir.\n"
" 'continue': hata yoksayılır. 'remount-ro': dosya\n"
" sistemi salt-okunur olarak bağlanır. 'panic':\n"
" çekirdek paniği oluşur.\n"
-" -g grup Yedek blokların hangi kullanıcı grubuna ayrılacağı\n"
+" -g grup Yedek blokların hangi kullanıcı grubuna "
+"ayrılacağı\n"
" belirtilir. Grup ismi ya da numarası verilebilir.\n"
" -u kullanıcı Yedek blokların hangi kullanıcıya ayrılacağı\n"
-" belirtilir. Kull. ismi ya da numarası verilebilir.\n"
+" belirtilir. Kull. ismi ya da numarası "
+"verilebilir.\n"
" -i süre[d|m|w] İki denetim arasındaki en büyük süre belirtilir.\n"
" Gün(d), ay(m), hafta(w) olarak verilebilir. 0 ile\n"
" zamana bağlı denetim ayarı kaldırılır.\n"
@@ -3652,12 +3650,14 @@ msgstr ""
" -T son-denetim-zamanı Betiklerle kullanmak içindir\n"
" -U UUID|clear|random|time\n"
" Dosya sisteminin evrensel tek kimliği veya (UUID)\n"
-" hangi yöntemle belirleneceği belirtilir.'clear' ile\n"
+" hangi yöntemle belirleneceği belirtilir.'clear' "
+"ile\n"
" silinir; 'random' rasgele, 'time' zamana göre bir\n"
" kimlik üretir.\n"
"\n"
"Günlükleme seçenekleri:\n"
-" size=günlük-uzunluğu Günlük dosyasının uzunluğu MB olarak belirtilir\n"
+" size=günlük-uzunluğu Günlük dosyasının uzunluğu MB olarak "
+"belirtilir\n"
" device=dış-günlük-aygıtı Başka bir aygıt üzerindeki günlük dosyasının\n"
" kullanılması sağlanır.\n"
"\n"
@@ -3667,58 +3667,60 @@ msgstr ""
"eklenir.\n"
" sparse_super Yedek süperblokların sayısını sınırlamakta kullanılır.\n"
" filetype Dizin kayıtlarında dosya türü bilgisi saklanır.\n"
-" has_journal -j seçeneği ile aynı. Bir ext3 günlük dosyası oluşturur.\n"
+" has_journal -j seçeneği ile aynı. Bir ext3 günlük dosyası "
+"oluşturur.\n"
"\n"
"Çeviri hatalarını <gnu-tr-u12a@lists.sourceforge.net> adresine bildiriniz.\n"
"\n"
-#: misc/tune2fs.c:138
+#: misc/tune2fs.c:141
msgid "while trying to open external journal"
msgstr "- dış günlük açılmaya çalışılırken hata oluştu"
-#: misc/tune2fs.c:142
+#: misc/tune2fs.c:145
#, c-format
msgid "%s is not a journal device.\n"
msgstr "%s bir günlükleme aygıtı değil.\n"
-#: misc/tune2fs.c:157
+#: misc/tune2fs.c:160
msgid "Journal superblock not found!\n"
msgstr "Günlük süperbloğu yok!\n"
-#: misc/tune2fs.c:169
+#: misc/tune2fs.c:172
msgid "Filesystem's UUID not found on journal device.\n"
-msgstr "Günlükleme aygıtında dosya sisteminin evrensel tek kimliği (UUID) yok.\n"
+msgstr ""
+"Günlükleme aygıtında dosya sisteminin evrensel tek kimliği (UUID) yok.\n"
-#: misc/tune2fs.c:190
+#: misc/tune2fs.c:193
msgid "Journal NOT removed\n"
msgstr "Günlük silinMEdi\n"
-#: misc/tune2fs.c:196
+#: misc/tune2fs.c:199
msgid "Journal removed\n"
msgstr "Günlük silindi\n"
-#: misc/tune2fs.c:228
+#: misc/tune2fs.c:231
msgid "while reading journal inode"
msgstr "- günlük düğümü okunurken hata oluştu"
-#: misc/tune2fs.c:235
+#: misc/tune2fs.c:238
msgid "while reading bitmaps"
msgstr "- biteşlemler okunurken hata oluştu"
-#: misc/tune2fs.c:242
+#: misc/tune2fs.c:245
msgid "while clearing journal inode"
msgstr "- günlük düğümü temizlenirken hata oluştu"
-#: misc/tune2fs.c:253
+#: misc/tune2fs.c:256
msgid "while writing journal inode"
msgstr "- günlük düğümü yazılırken hata oluştu"
-#: misc/tune2fs.c:268
+#: misc/tune2fs.c:271
#, c-format
msgid "Invalid mount option set: %s\n"
msgstr "Geçersiz dosya sistemi seçeneği belirtidi: %s\n"
-#: misc/tune2fs.c:309
+#: misc/tune2fs.c:317
msgid ""
"The has_journal flag may only be cleared when the filesystem is\n"
"unmounted or mounted read-only.\n"
@@ -3726,7 +3728,7 @@ msgstr ""
"has_journal bayrağı sadece dosya sistemi bağlı değilken ya da salt-okunur\n"
"bağlıyken temizlenebilir.\n"
-#: misc/tune2fs.c:317
+#: misc/tune2fs.c:325
msgid ""
"The needs_recovery flag is set. Please run e2fsck before clearing\n"
"the has_journal flag.\n"
@@ -3734,11 +3736,11 @@ msgstr ""
"needs_recovery bayrağı gerekiyor. Lütfen has_journal bayrağı\n"
"temizlenmeden önce e2fsck çalıştırın.\n"
-#: misc/tune2fs.c:371
+#: misc/tune2fs.c:382
msgid "The filesystem already has a journal.\n"
msgstr "Dosya sisteminde bir günlük dosyası zaten var.\n"
-#: misc/tune2fs.c:388
+#: misc/tune2fs.c:399
#, c-format
msgid ""
"\n"
@@ -3747,21 +3749,21 @@ msgstr ""
"\n"
"\t%s üzerindeki günlük açılmaya çalışılırken hata oluştu\n"
-#: misc/tune2fs.c:392
+#: misc/tune2fs.c:403
#, c-format
msgid "Creating journal on device %s: "
msgstr "%s üzerinde günlük dosyası oluşturuluyor: "
-#: misc/tune2fs.c:400
+#: misc/tune2fs.c:411
#, c-format
msgid "while adding filesystem to journal on %s"
msgstr "- %s üzerindeki günlük dosyasına dosya sistemi eklenirken hata oluştu"
-#: misc/tune2fs.c:406
+#: misc/tune2fs.c:417
msgid "Creating journal inode: "
msgstr "Günlük düğümü oluşturuluyor: "
-#: misc/tune2fs.c:415
+#: misc/tune2fs.c:426
msgid ""
"\n"
"\twhile trying to create journal file"
@@ -3769,95 +3771,95 @@ msgstr ""
"\n"
"\tgünlük dosyası oluşturulmaya çalışılırken hata oluştu"
-#: misc/tune2fs.c:478
+#: misc/tune2fs.c:492
#, c-format
msgid "Couldn't parse date/time specifier: %s"
msgstr "Tarih/zaman belirteci çözümlenemedi: %s"
-#: misc/tune2fs.c:500 misc/tune2fs.c:513
+#: misc/tune2fs.c:514 misc/tune2fs.c:527
#, c-format
msgid "bad mounts count - %s"
msgstr "bağlama sayısı hatalı - %s"
-#: misc/tune2fs.c:529
+#: misc/tune2fs.c:543
#, c-format
msgid "bad error behavior - %s"
msgstr "hata davranışı hatalı - %s"
-#: misc/tune2fs.c:552
+#: misc/tune2fs.c:566
#, c-format
msgid "bad gid/group name - %s"
msgstr "grup ismi/numarası hatalı -%s"
-#: misc/tune2fs.c:585
+#: misc/tune2fs.c:599
#, c-format
msgid "bad interval - %s"
msgstr "süre hatalı - %s"
-#: misc/tune2fs.c:613
+#: misc/tune2fs.c:627
#, c-format
msgid "bad reserved block ratio - %s"
msgstr "yedek blok oranı hatalı - %s"
-#: misc/tune2fs.c:628
+#: misc/tune2fs.c:642
msgid "-o may only be specified once"
msgstr "-o yalnız bir kere kullanılabilir"
-#: misc/tune2fs.c:638
+#: misc/tune2fs.c:652
msgid "-O may only be specified once"
msgstr "-O yalnız bir kere kullanılabilir"
-#: misc/tune2fs.c:648
+#: misc/tune2fs.c:662
#, c-format
msgid "bad reserved blocks count - %s"
msgstr "yedek blok sayısı hatalı - %s"
-#: misc/tune2fs.c:677
+#: misc/tune2fs.c:691
#, c-format
msgid "bad uid/user name - %s"
msgstr "kullanıcı ismi/numarası hatalı - %s"
-#: misc/tune2fs.c:783
+#: misc/tune2fs.c:801
#, c-format
msgid "Setting maximal mount count to %d\n"
msgstr "En fazla bağlama sayısı %d olarak belirleniyor\n"
-#: misc/tune2fs.c:789
+#: misc/tune2fs.c:807
#, c-format
msgid "Setting current mount count to %d\n"
msgstr "Şimdiki bağlama sayısı %d olarak belirleniyor\n"
-#: misc/tune2fs.c:794
+#: misc/tune2fs.c:812
#, c-format
msgid "Setting error behavior to %d\n"
msgstr "Hata davranışı %d olarak belirleniyor\n"
-#: misc/tune2fs.c:799
+#: misc/tune2fs.c:817
#, c-format
msgid "Setting reserved blocks gid to %lu\n"
msgstr "Yedek blokların grup numarası %lu olarak belirleniyor\n"
-#: misc/tune2fs.c:804
+#: misc/tune2fs.c:822
#, c-format
msgid "Setting interval between check %lu seconds\n"
msgstr "Denetimler arasındaki süre %lu saniye olarak belirleniyor\n"
-#: misc/tune2fs.c:810
+#: misc/tune2fs.c:828
#, c-format
msgid "Setting reserved blocks percentage to %lu (%u blocks)\n"
msgstr "Yedek blokların yüzdesi %lu (%u blok) olarak belirleniyor\n"
-#: misc/tune2fs.c:816
+#: misc/tune2fs.c:834
#, c-format
msgid "reserved blocks count is too big (%lu)"
msgstr "yedek ayrılmış blok sayısı çok büyük (%lu)"
-#: misc/tune2fs.c:822
+#: misc/tune2fs.c:840
#, c-format
msgid "Setting reserved blocks count to %lu\n"
msgstr "Yedek blok sayısı %lu olarak belirleniyor\n"
-#: misc/tune2fs.c:828
+#: misc/tune2fs.c:846
msgid ""
"\n"
"The filesystem already has sparse superblocks.\n"
@@ -3865,7 +3867,7 @@ msgstr ""
"\n"
"Dosya sistemindeki süperbloklar zaten azaltılmış.\n"
-#: misc/tune2fs.c:835
+#: misc/tune2fs.c:853
#, c-format
msgid ""
"\n"
@@ -3874,7 +3876,7 @@ msgstr ""
"\n"
"Süperblok azaltma bayrağı konuldu. %s"
-#: misc/tune2fs.c:842
+#: misc/tune2fs.c:860
msgid ""
"\n"
"The filesystem already has sparse superblocks disabled.\n"
@@ -3882,7 +3884,7 @@ msgstr ""
"\n"
"Dosya sisteminde süperblok azaltma bayrağı zaten etkin değil.\n"
-#: misc/tune2fs.c:850
+#: misc/tune2fs.c:868
#, c-format
msgid ""
"\n"
@@ -3891,17 +3893,17 @@ msgstr ""
"\n"
"Süperblok azaltma bayrağı temizlendi. %s"
-#: misc/tune2fs.c:857
+#: misc/tune2fs.c:875
#, c-format
msgid "Setting time filesystem last checked to %s\n"
msgstr "Dosya sisteminin son denetim zamanı %s yapılıyor\n"
-#: misc/tune2fs.c:863
+#: misc/tune2fs.c:881
#, c-format
msgid "Setting reserved blocks uid to %lu\n"
msgstr "Ayrılan blokların kullanıcı numarası %lu olarak ayarlanıyor\n"
-#: misc/tune2fs.c:896
+#: misc/tune2fs.c:914
msgid "Invalid UUID format\n"
msgstr "Geçersiz UUID biçemi\n"
@@ -3922,30 +3924,30 @@ msgstr ""
"\n"
"Aygıt görünmüyor; doğru belirttiğinize emin misiniz?\n"
-#: misc/util.c:101
+#: misc/util.c:107
#, c-format
msgid "%s is not a block special device.\n"
msgstr "%s blok özellikli bir aygıt değil.\n"
-#: misc/util.c:130
+#: misc/util.c:136
#, c-format
msgid "%s is entire device, not just one partition!\n"
msgstr "%s diskin tamamı! Bir disk bölümü değil!\n"
-#: misc/util.c:154
+#: misc/util.c:160
msgid "mke2fs forced anyway. Hope /etc/mtab is incorrect.\n"
msgstr "mke2fs n'olursa olsun çalıştırılacak. İnşallah /etc/mtab yanlıştır.\n"
-#: misc/util.c:157
+#: misc/util.c:163
#, c-format
msgid "will not make a %s here!\n"
msgstr "burada bir %s yapılmayacak!\n"
-#: misc/util.c:171
+#: misc/util.c:177
msgid "Couldn't allocate memory to parse journal options!\n"
msgstr "Günlük seçenekleri için bellek ayrılamadı!\n"
-#: misc/util.c:213
+#: misc/util.c:219
msgid ""
"\n"
"Bad journal options specified.\n"
@@ -3973,7 +3975,7 @@ msgstr ""
"Günlük dosyasının uzunluğu 1024 ile 102400 blok arasında seçilebilir.\n"
"\n"
-#: misc/util.c:240
+#: misc/util.c:246
msgid ""
"\n"
"Filesystem too small for a journal\n"
@@ -3981,7 +3983,7 @@ msgstr ""
"\n"
"Dosya sistemi bir günlük için çok küçük\n"
-#: misc/util.c:247
+#: misc/util.c:253
#, c-format
msgid ""
"\n"
@@ -3992,7 +3994,7 @@ msgstr ""
"Günlük dosyasının uzunluğu %d blok olarak belirtilmiş.\n"
"1024 ile 102400 blok arasında olmalı. Çıkılıyor.\n"
-#: misc/util.c:255
+#: misc/util.c:261
msgid ""
"\n"
"Journal size too big for filesystem.\n"
@@ -4000,7 +4002,7 @@ msgstr ""
"\n"
"Günlük dosyası dosya sistemi için çok büyük.\n"
-#: misc/util.c:274
+#: misc/util.c:280
#, c-format
msgid ""
"This filesystem will be automatically checked every %d mounts or\n"
@@ -4107,7 +4109,7 @@ msgstr "resize2fs %s (%s)\n"
msgid "bad filesystem size - %s"
msgstr "dosya sistemi uzunluğu hatalı - %s"
-#: resize/main.c:296
+#: resize/main.c:300
#, c-format
msgid ""
"The containing partition (or device) is only %d (%dk) blocks.\n"
@@ -4118,7 +4120,7 @@ msgstr ""
"Siz ise %d blokluk bir boyut istediniz.\n"
"\n"
-#: resize/main.c:303
+#: resize/main.c:307
#, c-format
msgid ""
"The filesystem is already %d blocks long. Nothing to do!\n"
@@ -4127,7 +4129,7 @@ msgstr ""
"Dosya sistemi zaten %d blok uzunlukta. Hiçbir şey yapılmadı!\n"
"\n"
-#: resize/main.c:310
+#: resize/main.c:314
#, c-format
msgid ""
"Please run 'e2fsck -f %s' first.\n"
@@ -4136,12 +4138,12 @@ msgstr ""
"Lütfen önce 'e2fsck -f %s' komutunu çalıştırın.\n"
"\n"
-#: resize/main.c:320
+#: resize/main.c:324
#, c-format
msgid "while trying to resize %s"
msgstr "- %s yeniden boyutlandırılırken hata oluştu"
-#: resize/main.c:325
+#: resize/main.c:329
#, c-format
msgid ""
"The filesystem on %s is now %d blocks long.\n"
@@ -4150,57 +4152,151 @@ msgstr ""
"%s üzerindeki dosya sistemi şimdi %d blok uzunlukta.\n"
"\n"
-#: resize/resize2fs.c:109
+#: resize/resize2fs.c:110
#, c-format
msgid "Number of free blocks: %d/%d, Needed: %d\n"
msgstr "Serbest blok sayısı: %d/%d, Gereken: %d\n"
-#: resize/resize2fs.c:458
+#: resize/resize2fs.c:459
msgid "meta-data blocks"
msgstr "meta-veri blokları"
-#: resize/resize2fs.c:581
+#: resize/resize2fs.c:582
msgid "reserved blocks"
msgstr "yedek bloklar"
-#: resize/resize2fs.c:586
+#: resize/resize2fs.c:587
msgid "blocks to be moved"
msgstr "taşınacak bloklar"
-#: resize/resize2fs.c:816
+#: resize/resize2fs.c:817
+#, c-format
msgid "Going into desperation mode for block allocations\n"
msgstr "Blok tahsislerinde umutsuz kipe geçiliyor\n"
-#: resize/resize2fs.c:920
+#: resize/resize2fs.c:921
#, c-format
msgid "Moving %d blocks %u->%u\n"
msgstr "%d blok taşınıyor %u->%u\n"
-#: resize/resize2fs.c:997
+#: resize/resize2fs.c:998
#, c-format
msgid "ino=%u, blockcnt=%lld, %u->%u\n"
msgstr "düğüm = %u, block_sayısı = %lld, %u->%u\n"
-#: resize/resize2fs.c:1165
+#: resize/resize2fs.c:1166
#, c-format
msgid "Inode moved %u->%u\n"
msgstr "Düğüm taşındı %u->%u\n"
-#: resize/resize2fs.c:1233
+#: resize/resize2fs.c:1234
#, c-format
msgid "Inode translate (dir=%u, name=%.*s, %u->%u)\n"
msgstr "Düğüm çevirisi (dizin = %u, isim= %.*s, %u->%u)\n"
-#: resize/resize2fs.c:1360
+#: resize/resize2fs.c:1361
#, c-format
msgid "Itable move group %d block %u->%u (diff %d)\n"
-msgstr "Düğüm tablosu %d. grubun blokları %u -> %u arasında taşınıyor (fark %d)\n"
+msgstr ""
+"Düğüm tablosu %d. grubun blokları %u -> %u arasında taşınıyor (fark %d)\n"
-#: resize/resize2fs.c:1386
+#: resize/resize2fs.c:1387
#, c-format
msgid "%d blocks of zeros...\n"
msgstr "%d sıfırlı blok...\n"
-#: resize/resize2fs.c:1421
+#: resize/resize2fs.c:1422
+#, c-format
msgid "Inode table move finished.\n"
msgstr "Düğüm tablosunun taşınması tamamlandı.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "%8d inode used (%d%%)\n"
+#~ msgid_plural ""
+#~ "\n"
+#~ "%8d inodes used (%d%%)\n"
+#~ msgstr[0] ""
+#~ "\n"
+#~ "%8d düğüm kullanıldı (%%%d)\n"
+#~ msgstr[1] ""
+#~ "\n"
+#~ "%8d düğüm kullanıldı (%%%d)\n"
+
+#~ msgid "%8d non-contiguous inode (%0d.%d%%)\n"
+#~ msgid_plural "%8d non-contiguous inodes (%0d.%d%%)\n"
+#~ msgstr[0] "%8d bitişik olmayan düğüm (%%%0d.%d)\n"
+#~ msgstr[1] "%8d bitişik olmayan düğüm (%%%0d.%d)\n"
+
+#~ msgid "%8d block used (%d%%)\n"
+#~ msgid_plural "%8d blocks used (%d%%)\n"
+#~ msgstr[0] "%8d blok kullanıldı (%%%d)\n"
+#~ msgstr[1] "%8d blok kullanıldı (%%%d)\n"
+
+#~ msgid "%8d bad block\n"
+#~ msgid_plural "%8d bad blocks\n"
+#~ msgstr[0] "%8d hatalı blok\n"
+#~ msgstr[1] "%8d hatalı blok\n"
+
+#~ msgid "%8d large file\n"
+#~ msgid_plural "%8d large files\n"
+#~ msgstr[0] "%8d büyük dosya\n"
+#~ msgstr[1] "%8d büyük dosya\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "%8d regular file\n"
+#~ msgid_plural ""
+#~ "\n"
+#~ "%8d regular files\n"
+#~ msgstr[0] ""
+#~ "\n"
+#~ "%8d normal dosya\n"
+#~ msgstr[1] ""
+#~ "\n"
+#~ "%8d normal dosya\n"
+
+#~ msgid "%8d directory\n"
+#~ msgid_plural "%8d directories\n"
+#~ msgstr[0] "%8d dizin\n"
+#~ msgstr[1] "%8d dizin\n"
+
+#~ msgid "%8d character device file\n"
+#~ msgid_plural "%8d character device files\n"
+#~ msgstr[0] "%8d karakter aygıtı dosyası\n"
+#~ msgstr[1] "%8d karakter aygıtı dosyası\n"
+
+#~ msgid "%8d block device file\n"
+#~ msgid_plural "%8d block device files\n"
+#~ msgstr[0] "%8d blok aygıtı dosyası\n"
+#~ msgstr[1] "%8d blok aygıtı dosyası\n"
+
+#~ msgid "%8d fifo\n"
+#~ msgid_plural "%8d fifos\n"
+#~ msgstr[0] "%8d fifo\n"
+#~ msgstr[1] "%8d fifo\n"
+
+#~ msgid "%8d link\n"
+#~ msgid_plural "%8d links\n"
+#~ msgstr[0] "%8d bağ\n"
+#~ msgstr[1] "%8d bağ\n"
+
+#~ msgid "%8d symbolic link"
+#~ msgid_plural "%8d symbolic links"
+#~ msgstr[0] "%8d sembolik bağ"
+#~ msgstr[1] "%8d sembolik bağ"
+
+#~ msgid " (%d fast symbolic link)\n"
+#~ msgid_plural " (%d fast symbolic links)\n"
+#~ msgstr[0] " (%d hızlı sembolik bağ)\n"
+#~ msgstr[1] " (%d hızlı sembolik bağ)\n"
+
+#~ msgid "%8d socket\n"
+#~ msgid_plural "%8d sockets\n"
+#~ msgstr[0] "%8d soket\n"
+#~ msgstr[1] "%8d soket\n"
+
+#~ msgid "%8d file\n"
+#~ msgid_plural "%8d files\n"
+#~ msgstr[0] "%8d dosya\n"
+#~ msgstr[1] "%8d dosya\n"
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 14:30:05 +0000