diff -Nurp pacman-2.9.5/aclocal.m4 pacman-i18n-0.1.1/aclocal.m4 --- pacman-2.9.5/aclocal.m4 1970-01-01 01:00:00.000000000 +0100 +++ pacman-i18n-0.1.1/aclocal.m4 2004-12-24 13:06:57.000000000 +0000 @@ -0,0 +1,2602 @@ +# codeset.m4 serial AM1 (gettext-0.10.40) +dnl Copyright (C) 2000-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([AM_LANGINFO_CODESET], +[ + AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, + [AC_TRY_LINK([#include ], + [char* cs = nl_langinfo(CODESET);], + am_cv_langinfo_codeset=yes, + am_cv_langinfo_codeset=no) + ]) + if test $am_cv_langinfo_codeset = yes; then + AC_DEFINE(HAVE_LANGINFO_CODESET, 1, + [Define if you have and nl_langinfo(CODESET).]) + fi +]) +# 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 +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 , 1995-2000. +dnl Bruno Haible , 2000-2003. + +dnl Macro to add for using GNU gettext. + +dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). +dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The +dnl default (if it is not specified or empty) is 'no-libtool'. +dnl INTLSYMBOL should be 'external' for packages with no intl directory, +dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory. +dnl If INTLSYMBOL is 'use-libtool', then a libtool library +dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, +dnl depending on --{enable,disable}-{shared,static} and on the presence of +dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library +dnl $(top_builddir)/intl/libintl.a will be created. +dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext +dnl implementations (in libc or libintl) without the ngettext() function +dnl will be ignored. If NEEDSYMBOL is specified and is +dnl 'need-formatstring-macros', then GNU gettext implementations that don't +dnl support the ISO C 99 formatstring macros will be ignored. +dnl INTLDIR is used to find the intl libraries. If empty, +dnl the value `$(top_builddir)/intl/' is used. +dnl +dnl The result of the configuration is one of three cases: +dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled +dnl and used. +dnl Catalog format: GNU --> install in $(datadir) +dnl Catalog extension: .mo after installation, .gmo in source tree +dnl 2) GNU gettext has been found in the system's C library. +dnl Catalog format: GNU --> install in $(datadir) +dnl Catalog extension: .mo after installation, .gmo in source tree +dnl 3) No internationalization, always use English msgid. +dnl Catalog format: none +dnl Catalog extension: none +dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur. +dnl The use of .gmo is historical (it was needed to avoid overwriting the +dnl GNU format catalogs when building on a platform with an X/Open gettext), +dnl but we keep it in order not to force irrelevant filename changes on the +dnl maintainers. +dnl +AC_DEFUN([AM_GNU_GETTEXT], +[ + dnl Argument checking. + ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , + [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT +])])])])]) + ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , + [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT +])])])]) + define(gt_included_intl, ifelse([$1], [external], [no], [yes])) + define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], [])) + + AC_REQUIRE([AM_PO_SUBDIRS])dnl + ifelse(gt_included_intl, yes, [ + AC_REQUIRE([AM_INTL_SUBDIR])dnl + ]) + + dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + + dnl Sometimes libintl requires libiconv, so first search for libiconv. + dnl Ideally we would do this search only after the + dnl if test "$USE_NLS" = "yes"; then + dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then + dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT + dnl the configure script would need to contain the same shell code + dnl again, outside any 'if'. There are two solutions: + dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. + dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. + dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not + dnl documented, we avoid it. + ifelse(gt_included_intl, yes, , [ + AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) + ]) + + dnl Set USE_NLS. + AM_NLS + + ifelse(gt_included_intl, yes, [ + BUILD_INCLUDED_LIBINTL=no + USE_INCLUDED_LIBINTL=no + ]) + LIBINTL= + LTLIBINTL= + POSUB= + + dnl If we use NLS figure out what method + if test "$USE_NLS" = "yes"; then + gt_use_preinstalled_gnugettext=no + ifelse(gt_included_intl, yes, [ + AC_MSG_CHECKING([whether included gettext is requested]) + AC_ARG_WITH(included-gettext, + [ --with-included-gettext use the GNU gettext library included here], + nls_cv_force_use_gnu_gettext=$withval, + nls_cv_force_use_gnu_gettext=no) + AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) + + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + ]) + dnl User does not insist on using GNU NLS library. Figure out what + dnl to use. If GNU gettext is available we use this. Else we have + dnl to fall back to GNU NLS library. + + dnl Add a version number to the cache macros. + define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1))) + define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc]) + define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl]) + + AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, + [AC_TRY_LINK([#include +]ifelse([$2], [need-formatstring-macros], +[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) +#endif +changequote(,)dnl +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; +changequote([,])dnl +], [])[extern int _nl_msg_cat_cntr; +extern int *_nl_domain_bindings;], + [bindtextdomain ("", ""); +return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], + gt_cv_func_gnugettext_libc=yes, + gt_cv_func_gnugettext_libc=no)]) + + if test "$gt_cv_func_gnugettext_libc" != "yes"; then + dnl Sometimes libintl requires libiconv, so first search for libiconv. + ifelse(gt_included_intl, yes, , [ + AM_ICONV_LINK + ]) + dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL + dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv]) + dnl because that would add "-liconv" to LIBINTL and LTLIBINTL + dnl even if libiconv doesn't exist. + AC_LIB_LINKFLAGS_BODY([intl]) + AC_CACHE_CHECK([for GNU gettext in libintl], + gt_cv_func_gnugettext_libintl, + [gt_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $INCINTL" + gt_save_LIBS="$LIBS" + LIBS="$LIBS $LIBINTL" + dnl Now see whether libintl exists and does not depend on libiconv. + AC_TRY_LINK([#include +]ifelse([$2], [need-formatstring-macros], +[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) +#endif +changequote(,)dnl +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; +changequote([,])dnl +], [])[extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias ();], + [bindtextdomain ("", ""); +return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], + gt_cv_func_gnugettext_libintl=yes, + gt_cv_func_gnugettext_libintl=no) + dnl Now see whether libintl exists and depends on libiconv. + if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then + LIBS="$LIBS $LIBICONV" + AC_TRY_LINK([#include +]ifelse([$2], [need-formatstring-macros], +[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) +#endif +changequote(,)dnl +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; +changequote([,])dnl +], [])[extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias ();], + [bindtextdomain ("", ""); +return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)], + [LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + gt_cv_func_gnugettext_libintl=yes + ]) + fi + CPPFLAGS="$gt_save_CPPFLAGS" + LIBS="$gt_save_LIBS"]) + fi + + dnl If an already present or preinstalled GNU gettext() is found, + dnl use it. But if this macro is used in GNU gettext, and GNU + dnl gettext is already preinstalled in libintl, we update this + 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-runtime \ + && test "$PACKAGE" != gettext-tools; }; then + gt_use_preinstalled_gnugettext=yes + else + dnl Reset the values set by searching for libintl. + LIBINTL= + LTLIBINTL= + INCINTL= + fi + + ifelse(gt_included_intl, yes, [ + if test "$gt_use_preinstalled_gnugettext" != "yes"; then + dnl GNU gettext is not found in the C library. + dnl Fall back on included GNU gettext library. + nls_cv_use_gnu_gettext=yes + fi + fi + + if test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Mark actions used to generate GNU NLS library. + BUILD_INCLUDED_LIBINTL=yes + USE_INCLUDED_LIBINTL=yes + LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV" + LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV" + LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` + fi + + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Mark actions to use GNU gettext tools. + CATOBJEXT=.gmo + fi + ]) + + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + AC_DEFINE(ENABLE_NLS, 1, + [Define to 1 if translation of program messages to the user's native language + is requested.]) + else + USE_NLS=no + 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 + if test "$gt_cv_func_gnugettext_libintl" = "yes"; then + AC_MSG_CHECKING([how to link with libintl]) + AC_MSG_RESULT([$LIBINTL]) + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) + fi + + dnl For backward compatibility. Some packages may be using this. + AC_DEFINE(HAVE_GETTEXT, 1, + [Define if the GNU gettext() function is already present or preinstalled.]) + AC_DEFINE(HAVE_DCGETTEXT, 1, + [Define if the GNU dcgettext() function is already present or preinstalled.]) + fi + + dnl We need to process the po/ directory. + POSUB=po + fi + + 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-runtime || test "$PACKAGE" = gettext-tools; then + BUILD_INCLUDED_LIBINTL=yes + fi + + dnl Make all variables we use known to autoconf. + AC_SUBST(BUILD_INCLUDED_LIBINTL) + AC_SUBST(USE_INCLUDED_LIBINTL) + AC_SUBST(CATOBJEXT) + + dnl For backward compatibility. Some configure.ins may be using this. + nls_cv_header_intl= + nls_cv_header_libgt= + + dnl For backward compatibility. Some Makefiles may be using this. + DATADIRNAME=share + AC_SUBST(DATADIRNAME) + + dnl For backward compatibility. Some Makefiles may be using this. + INSTOBJEXT=.mo + AC_SUBST(INSTOBJEXT) + + dnl For backward compatibility. Some Makefiles may be using this. + 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) + ]) + + dnl For backward compatibility. Some Makefiles may be using this. + INTLLIBS="$LIBINTL" + AC_SUBST(INTLLIBS) + + dnl Make all documented variables known to autoconf. + AC_SUBST(LIBINTL) + AC_SUBST(LTLIBINTL) + AC_SUBST(POSUB) +]) + + +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. +AC_DEFUN([AM_INTL_SUBDIR], +[ + AC_REQUIRE([AC_PROG_INSTALL])dnl + AC_REQUIRE([AM_MKINSTALLDIRS])dnl + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_CANONICAL_HOST])dnl + AC_REQUIRE([AC_PROG_RANLIB])dnl + 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 + AC_REQUIRE([gt_INTDIV0])dnl + 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([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 ]) + gt_CHECK_DECL(_snwprintf, [#include ]) + + 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 ]) + gt_CHECK_DECL(fgets_unlocked, [#include ]) + gt_CHECK_DECL(getc_unlocked, [#include ]) + + 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 + if test $ac_cv_header_locale_h = yes; then + AM_LC_MESSAGES + fi + + dnl intl/plural.c is generated from intl/plural.y. It requires bison, + dnl because plural.y uses bison specific features. It requires at least + dnl bison-1.26 because earlier versions generate a plural.c that doesn't + dnl compile. + dnl bison is only needed for the maintainer (who touches plural.y). But in + dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put + dnl the rule in general Makefile. Now, some people carelessly touch the + dnl files or have a broken "make" program, hence the plural.c rule will + dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not + dnl present or too old. + AC_CHECK_PROGS([INTLBISON], [bison]) + if test -z "$INTLBISON"; then + ac_verc_fail=yes + else + dnl Found it, now check the version. + AC_MSG_CHECKING([version of bison]) +changequote(<<,>>)dnl + 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;; + 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) +changequote([,])dnl + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + esac + AC_MSG_RESULT([$ac_prog_version]) + fi + if test $ac_verc_fail = yes; then + INTLBISON=: + fi +]) + + +dnl gt_CHECK_DECL(FUNC, INCLUDES) +dnl Check whether a function is declared. +AC_DEFUN([gt_CHECK_DECL], +[ + 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_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.]) +]) + + +dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) +AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) +# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40) +dnl Copyright (C) 2000-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. + +# Test for the GNU C Library, version 2.1 or newer. +# From Bruno Haible. + +AC_DEFUN([jm_GLIBC21], + [ + AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, + ac_cv_gnu_library_2_1, + [AC_EGREP_CPP([Lucky GNU user], + [ +#include +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) + Lucky GNU user + #endif +#endif + ], + ac_cv_gnu_library_2_1=yes, + ac_cv_gnu_library_2_1=no) + ] + ) + AC_SUBST(GLIBC21) + GLIBC21="$ac_cv_gnu_library_2_1" + ] +) +# iconv.m4 serial AM4 (gettext-0.11.3) +dnl Copyright (C) 2000-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([AM_ICONV_LINKFLAGS_BODY], +[ + dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + + dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV + dnl accordingly. + AC_LIB_LINKFLAGS_BODY([iconv]) +]) + +AC_DEFUN([AM_ICONV_LINK], +[ + dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and + dnl those with the standalone portable GNU libiconv installed). + + dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV + dnl accordingly. + AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) + + dnl Add $INCICONV to CPPFLAGS before performing the following checks, + dnl because if the user has installed libiconv and not disabled its use + dnl via --without-libiconv-prefix, he wants to use it. The first + dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. + am_save_CPPFLAGS="$CPPFLAGS" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) + + AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ + am_cv_func_iconv="no, consider installing GNU libiconv" + am_cv_lib_iconv=no + AC_TRY_LINK([#include +#include ], + [iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);], + am_cv_func_iconv=yes) + if test "$am_cv_func_iconv" != yes; then + am_save_LIBS="$LIBS" + LIBS="$LIBS $LIBICONV" + AC_TRY_LINK([#include +#include ], + [iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);], + am_cv_lib_iconv=yes + am_cv_func_iconv=yes) + LIBS="$am_save_LIBS" + fi + ]) + if test "$am_cv_func_iconv" = yes; then + AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) + fi + if test "$am_cv_lib_iconv" = yes; then + AC_MSG_CHECKING([how to link with libiconv]) + AC_MSG_RESULT([$LIBICONV]) + else + dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV + dnl either. + CPPFLAGS="$am_save_CPPFLAGS" + LIBICONV= + LTLIBICONV= + fi + AC_SUBST(LIBICONV) + AC_SUBST(LTLIBICONV) +]) + +AC_DEFUN([AM_ICONV], +[ + AM_ICONV_LINK + if test "$am_cv_func_iconv" = yes; then + AC_MSG_CHECKING([for iconv declaration]) + AC_CACHE_VAL(am_cv_proto_iconv, [ + AC_TRY_COMPILE([ +#include +#include +extern +#ifdef __cplusplus +"C" +#endif +#if defined(__STDC__) || defined(__cplusplus) +size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); +#else +size_t iconv(); +#endif +], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") + 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);"]) + am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` + AC_MSG_RESULT([$]{ac_t:- + }[$]am_cv_proto_iconv) + AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, + [Define as const if the declaration of iconv() needs const.]) + fi +]) +# intdiv0.m4 serial 1 (gettext-0.11.3) +dnl Copyright (C) 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([gt_INTDIV0], +[ + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_CANONICAL_HOST])dnl + + AC_CACHE_CHECK([whether integer division by zero raises SIGFPE], + gt_cv_int_divbyzero_sigfpe, + [ + AC_TRY_RUN([ +#include +#include + +static void +#ifdef __cplusplus +sigfpe_handler (int sig) +#else +sigfpe_handler (sig) int sig; +#endif +{ + /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ + exit (sig != SIGFPE); +} + +int x = 1; +int y = 0; +int z; +int nan; + +int main () +{ + signal (SIGFPE, sigfpe_handler); +/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */ +#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP) + signal (SIGTRAP, sigfpe_handler); +#endif +/* Linux/SPARC yields signal SIGILL. */ +#if defined (__sparc__) && defined (__linux__) + signal (SIGILL, sigfpe_handler); +#endif + + z = x / y; + nan = y / y; + exit (1); +} +], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no, + [ + # Guess based on the CPU. + case "$host_cpu" in + alpha* | i[34567]86 | m68k | s390*) + gt_cv_int_divbyzero_sigfpe="guessing yes";; + *) + gt_cv_int_divbyzero_sigfpe="guessing no";; + esac + ]) + ]) + case "$gt_cv_int_divbyzero_sigfpe" in + *yes) value=1;; + *) value=0;; + esac + 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 +#include +#if HAVE_STDINT_H_WITH_UINTMAX +#include +#endif +#if HAVE_INTTYPES_H_WITH_UINTMAX +#include +#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 or .]) + 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 +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_INTTYPES_H if exists and doesn't clash with +# . + +AC_DEFUN([gt_HEADER_INTTYPES_H], +[ + AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h, + [ + AC_TRY_COMPILE( + [#include +#include ], + [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no) + ]) + if test $gt_cv_header_inttypes_h = yes; then + AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1, + [Define if exists and doesn't clash with .]) + fi +]) +# 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 +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_INTTYPES_H_WITH_UINTMAX if exists, +# doesn't clash with , and declares uintmax_t. + +AC_DEFUN([jm_AC_HEADER_INTTYPES_H], +[ + AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, + [AC_TRY_COMPILE( + [#include +#include ], + [uintmax_t i = (uintmax_t) -1;], + jm_ac_cv_header_inttypes_h=yes, + 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 exists, doesn't clash with , + and declares uintmax_t. ]) + fi +]) +# inttypes-pri.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 +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. + +# Define PRI_MACROS_BROKEN if exists and defines the PRI* +# macros to non-string values. This is the case on AIX 4.3.3. + +AC_DEFUN([gt_INTTYPES_PRI], +[ + AC_REQUIRE([gt_HEADER_INTTYPES_H]) + if test $gt_cv_header_inttypes_h = yes; then + AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], + gt_cv_inttypes_pri_broken, + [ + AC_TRY_COMPILE([#include +#ifdef PRId32 +char *p = PRId32; +#endif +], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes) + ]) + fi + if test "$gt_cv_inttypes_pri_broken" = yes; then + AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, + [Define if exists and defines unusable PRI* macros.]) + fi +]) +# isc-posix.m4 serial 2 (gettext-0.11.2) +dnl Copyright (C) 1995-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. + +# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. + +# This test replaces the one in autoconf. +# Currently this macro should have the same name as the autoconf macro +# because gettext's gettext.m4 (distributed in the automake package) +# still uses it. Otherwise, the use in gettext.m4 makes autoheader +# give these diagnostics: +# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX +# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX + +undefine([AC_ISC_POSIX]) + +AC_DEFUN([AC_ISC_POSIX], + [ + dnl This test replaces the obsolescent AC_ISC_POSIX kludge. + AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) + ] +) +# lcmessage.m4 serial 3 (gettext-0.11.3) +dnl Copyright (C) 1995-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 +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 , 1995. + +# Check whether LC_MESSAGES is available in . + +AC_DEFUN([AM_LC_MESSAGES], +[ + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your file defines LC_MESSAGES.]) + fi +]) +# 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 +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl Subroutines of libtool.m4, +dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision +dnl with libtool.m4. + +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. +case `$LD -v 2>&1 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. + AC_MSG_CHECKING([for ld used by GCC]) + 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 + AC_MSG_CHECKING([for GNU ld]) +else + AC_MSG_CHECKING([for non-GNU ld]) +fi +AC_CACHE_VAL(acl_cv_path_LD, +[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]) +LD="$acl_cv_path_LD" +if test -n "$LD"; then + AC_MSG_RESULT($LD) +else + AC_MSG_RESULT(no) +fi +test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) +AC_LIB_PROG_LD_GNU +]) +# 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 +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 AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and +dnl the libraries corresponding to explicit and implicit dependencies. +dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and +dnl augments the CPPFLAGS variable. +AC_DEFUN([AC_LIB_LINKFLAGS], +[ + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + define([Name],[translit([$1],[./-], [___])]) + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ + AC_LIB_LINKFLAGS_BODY([$1], [$2]) + ac_cv_lib[]Name[]_libs="$LIB[]NAME" + ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" + ac_cv_lib[]Name[]_cppflags="$INC[]NAME" + ]) + LIB[]NAME="$ac_cv_lib[]Name[]_libs" + LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" + INC[]NAME="$ac_cv_lib[]Name[]_cppflags" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) + AC_SUBST([LIB]NAME) + AC_SUBST([LTLIB]NAME) + dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the + dnl results of this search when this library appears as a dependency. + HAVE_LIB[]NAME=yes + undefine([Name]) + undefine([NAME]) +]) + +dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) +dnl searches for libname and the libraries corresponding to explicit and +dnl implicit dependencies, together with the specified include files and +dnl the ability to compile and link the specified testcode. If found, it +dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and +dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and +dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs +dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. +AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], +[ + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + define([Name],[translit([$1],[./-], [___])]) + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + + dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME + dnl accordingly. + AC_LIB_LINKFLAGS_BODY([$1], [$2]) + + dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, + dnl because if the user has installed lib[]Name and not disabled its use + dnl via --without-lib[]Name-prefix, he wants to use it. + ac_save_CPPFLAGS="$CPPFLAGS" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) + + AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ + ac_save_LIBS="$LIBS" + LIBS="$LIBS $LIB[]NAME" + AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) + LIBS="$ac_save_LIBS" + ]) + if test "$ac_cv_lib[]Name" = yes; then + HAVE_LIB[]NAME=yes + AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) + AC_MSG_CHECKING([how to link with lib[]$1]) + AC_MSG_RESULT([$LIB[]NAME]) + else + HAVE_LIB[]NAME=no + dnl If $LIB[]NAME didn't lead to a usable library, we don't need + dnl $INC[]NAME either. + CPPFLAGS="$ac_save_CPPFLAGS" + LIB[]NAME= + LTLIB[]NAME= + fi + AC_SUBST([HAVE_LIB]NAME) + AC_SUBST([LIB]NAME) + AC_SUBST([LTLIB]NAME) + undefine([Name]) + undefine([NAME]) +]) + +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. +AC_DEFUN([AC_LIB_RPATH], +[ + AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS + AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld + AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host + AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir + AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ + 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 + ]) + 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" + dnl Determine whether the user wants rpath handling at all. + AC_ARG_ENABLE(rpath, + [ --disable-rpath do not hardcode runtime library paths], + :, enable_rpath=yes) +]) + +dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and +dnl the libraries corresponding to explicit and implicit dependencies. +dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. +AC_DEFUN([AC_LIB_LINKFLAGS_BODY], +[ + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + dnl By default, look in $includedir and $libdir. + use_additional=yes + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + 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], +[ + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + else + additional_includedir="$withval/include" + additional_libdir="$withval/lib" + fi + fi +]) + dnl Search the library and its dependencies in $additional_libdir and + dnl $LDFLAGS. Using breadth-first-seach. + LIB[]NAME= + LTLIB[]NAME= + INC[]NAME= + rpathdirs= + ltrpathdirs= + names_already_handled= + names_next_round='$1 $2' + while test -n "$names_next_round"; do + names_this_round="$names_next_round" + names_next_round= + for name in $names_this_round; do + already_handled= + for n in $names_already_handled; do + if test "$n" = "$name"; then + already_handled=yes + break + fi + done + if test -z "$already_handled"; then + names_already_handled="$names_already_handled $name" + dnl See if it was already located by an earlier AC_LIB_LINKFLAGS + dnl or AC_LIB_HAVE_LINKFLAGS call. + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + eval value=\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" = yes; then + eval value=\"\$LIB$uppername\" + test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" + eval value=\"\$LTLIB$uppername\" + test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" + else + dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined + dnl that this library doesn't exist. So just drop it. + : + fi + else + dnl Search the library lib$name in $additional_libdir and $LDFLAGS + dnl and the already constructed $LIBNAME/$LTLIBNAME. + found_dir= + found_la= + found_so= + found_a= + if test $use_additional = yes; then + if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then + found_dir="$additional_libdir" + found_so="$additional_libdir/lib$name.$shlibext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi + else + if test -f "$additional_libdir/lib$name.$libext"; then + found_dir="$additional_libdir" + found_a="$additional_libdir/lib$name.$libext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi + fi + fi + fi + if test "X$found_dir" = "X"; then + for x in $LDFLAGS $LTLIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then + found_dir="$dir" + found_so="$dir/lib$name.$shlibext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + else + if test -f "$dir/lib$name.$libext"; then + found_dir="$dir" + found_a="$dir/lib$name.$libext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + dnl Found the library. + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + dnl Linking with a shared library. We attempt to hardcode its + dnl directory into the executable's runpath, unless it's the + dnl standard /usr/lib. + if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then + dnl No hardcoding is needed. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + dnl Use an explicit option to hardcode DIR into the resulting + dnl binary. + dnl Potentially add DIR to ltrpathdirs. + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + dnl The hardcoding into $LIBNAME is system dependent. + if test "$hardcode_direct" = yes; then + dnl Using DIR/libNAME.so during linking hardcodes DIR into the + dnl resulting binary. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + dnl Use an explicit option to hardcode DIR into the resulting + dnl binary. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + dnl Potentially add DIR to rpathdirs. + dnl The rpathdirs will be appended to $LIBNAME at the end. + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + dnl Rely on "-L$found_dir". + dnl But don't add it if it's already contained in the LDFLAGS + dnl or the already constructed $LIBNAME + haveit= + for x in $LDFLAGS $LIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" + fi + if test "$hardcode_minus_L" != no; then + dnl FIXME: Not sure whether we should use + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" + dnl here. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH + dnl here, because this doesn't fit in flags passed to the + dnl compiler. So give up. No hardcoding. This affects only + dnl very old systems. + dnl FIXME: Not sure whether we should use + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" + dnl here. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + dnl Linking with a static library. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" + else + dnl We shouldn't come here, but anyway it's good to have a + dnl fallback. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" + fi + fi + dnl Assume the include files are nearby. + additional_includedir= + case "$found_dir" in + */lib | */lib/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + dnl Potentially add $additional_includedir to $INCNAME. + dnl But don't add it + dnl 1. if it's the standard /usr/include, + dnl 2. if it's /usr/local/include and we are using GCC on Linux, + dnl 3. if it's already present in $CPPFLAGS or the already + dnl constructed $INCNAME, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INC[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + dnl Really add $additional_includedir to $INCNAME. + INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + dnl Look for dependencies. + if test -n "$found_la"; then + dnl Read the .la file. It defines the variables + dnl dlname, library_names, old_library, dependency_libs, current, + dnl age, revision, installed, dlopen, dlpreopen, libdir. + save_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$save_libdir" + dnl We use only dependency_libs. + for dep in $dependency_libs; do + case "$dep" in + -L*) + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. + dnl But don't add it + dnl 1. if it's the standard /usr/lib, + dnl 2. if it's /usr/local/lib and we are using GCC on Linux, + dnl 3. if it's already present in $LDFLAGS or the already + dnl constructed $LIBNAME, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_libdir" != "X/usr/lib"; then + haveit= + if test "X$additional_libdir" = "X/usr/local/lib"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + haveit= + for x in $LDFLAGS $LIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LIBNAME. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LTLIBNAME. + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + dnl Potentially add DIR to rpathdirs. + dnl The rpathdirs will be appended to $LIBNAME at the end. + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + dnl Potentially add DIR to ltrpathdirs. + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + dnl Handle this in the next round. + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + dnl Handle this in the next round. Throw away the .la's + dnl directory; it is already contained in a preceding -L + dnl option. + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + dnl Most likely an immediate library name. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" + ;; + esac + done + fi + else + dnl Didn't find the library; assume it is in the system directories + dnl known to the linker and runtime loader. (All the system + dnl directories known to the linker should also be known to the + dnl runtime loader, otherwise the system is severely misconfigured.) + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" + fi + fi + fi + done + done + if test "X$rpathdirs" != "X"; then + if test -n "$hardcode_libdir_separator"; then + dnl Weird platform: only the last -rpath option counts, the user must + dnl pass all path elements in one option. We can arrange that for a + dnl single library, but not when more than one $LIBNAMEs are used. + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + done + dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" + else + dnl The -rpath options are cumulative. + for found_dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" != "X"; then + dnl When using libtool, the option that works for both libraries and + dnl executables is -R. The -R options are cumulative. + for found_dir in $ltrpathdirs; do + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" + done + fi +]) + +dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, +dnl unless already present in VAR. +dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes +dnl contains two or three consecutive elements that belong together. +AC_DEFUN([AC_LIB_APPENDTOVAR], +[ + for element in [$2]; do + haveit= + for x in $[$1]; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + [$1]="${[$1]}${[$1]:+ }$element" + fi + done +]) +# 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 +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 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 +dnl with the same --prefix option. +dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate +dnl libraries, but is otherwise very convenient. +AC_DEFUN([AC_LIB_PREFIX], +[ + AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + dnl By default, look in $includedir and $libdir. + use_additional=yes + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + 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], +[ + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + else + additional_includedir="$withval/include" + additional_libdir="$withval/lib" + fi + fi +]) + if test $use_additional = yes; then + dnl Potentially add $additional_includedir to $CPPFLAGS. + dnl But don't add it + dnl 1. if it's the standard /usr/include, + dnl 2. if it's already present in $CPPFLAGS, + dnl 3. if it's /usr/local/include and we are using GCC on Linux, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + for x in $CPPFLAGS; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + dnl Really add $additional_includedir to $CPPFLAGS. + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" + fi + fi + fi + fi + dnl Potentially add $additional_libdir to $LDFLAGS. + dnl But don't add it + dnl 1. if it's the standard /usr/lib, + dnl 2. if it's already present in $LDFLAGS, + dnl 3. if it's /usr/local/lib and we are using GCC on Linux, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_libdir" != "X/usr/lib"; then + haveit= + for x in $LDFLAGS; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test "X$additional_libdir" = "X/usr/local/lib"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LDFLAGS. + LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" + fi + fi + fi + fi + fi +]) + +dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, +dnl acl_final_exec_prefix, containing the values to which $prefix and +dnl $exec_prefix will expand at the end of the configure script. +AC_DEFUN([AC_LIB_PREPARE_PREFIX], +[ + dnl Unfortunately, prefix and exec_prefix get only finally determined + dnl at the end of configure. + 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" +]) + +dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the +dnl variables prefix and exec_prefix bound to the values they will have +dnl at the end of the configure script. +AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], +[ + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + $1 + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" +]) +# 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 , 1995-2000. +dnl Bruno Haible , 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 , 1995-2000. +dnl Bruno Haible , 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 < "$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" < /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" <> "$ac_file.tmp" < +#include +/* 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 +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 , 1996. + +# Search path for a program which passes the given test. + +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], +[ +# 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_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 + AC_MSG_RESULT([$]$1) +else + AC_MSG_RESULT(no) +fi +AC_SUBST($1)dnl +]) +# 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 +#if HAVE_STDINT_H +#include +#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 ], result=?) + _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo, + [#include ], result=?) + _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint, + [#include ], 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 + 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 +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_STDINT_H_WITH_UINTMAX if exists, +# doesn't clash with , and declares uintmax_t. + +AC_DEFUN([jm_AC_HEADER_STDINT_H], +[ + AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h, + [AC_TRY_COMPILE( + [#include +#include ], + [uintmax_t i = (uintmax_t) -1;], + jm_ac_cv_header_stdint_h=yes, + 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 exists, doesn't clash with , + and declares uintmax_t. ]) + fi +]) +# 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 +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. + +AC_PREREQ(2.13) + +# Define uintmax_t to 'unsigned long' or 'unsigned long long' +# if it is not already defined in or . + +AC_DEFUN([jm_AC_TYPE_UINTMAX_T], +[ + AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) + AC_REQUIRE([jm_AC_HEADER_STDINT_H]) + if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then + AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG]) + test $ac_cv_type_unsigned_long_long = yes \ + && 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 and don't define.]) + else + AC_DEFINE(HAVE_UINTMAX_T, 1, + [Define if you have the 'uintmax_t' type in or .]) + fi +]) +# 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 +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_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 = 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.]) + 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 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 + 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 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 + 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 -Nurp pacman-2.9.5/ChangeLog-i18n pacman-i18n-0.1.1/ChangeLog-i18n --- pacman-2.9.5/ChangeLog-i18n 1970-01-01 01:00:00.000000000 +0100 +++ pacman-i18n-0.1.1/ChangeLog-i18n 2005-01-21 14:06:32.000000000 +0000 @@ -0,0 +1,14 @@ +Matthias-Christian Ott @ Fr Jan 21 15:06:02 CET 2005 + [RELEASE]: 0.1.1 + +Matthias-Christian Ott @ Fr Jan 21 15:02:21 CET 2005 + [PATCH]: Pacman 2.9.5 + Upgrade to the Pacman 2.9.5 source + +Matthias-Christian Ott @ Mi Dez 29 15:15:53 CET 2004 + [BUGFIX]: pacman.c:3855 + + - Fixed the Yes/No Bug (https://lists.berlios.de/pipermail/arch-i18n-common/2004-December/000043.html) + +Matthias-Christian Ott @ Mo Dez 27 20:19:04 CET 2004 + [RELEASE]: 0.1 diff -Nurp pacman-2.9.5/config.h.in pacman-i18n-0.1.1/config.h.in --- pacman-2.9.5/config.h.in 2004-04-19 08:17:56.000000000 +0100 +++ pacman-i18n-0.1.1/config.h.in 2004-12-24 13:06:46.000000000 +0000 @@ -91,6 +91,9 @@ /* Define to 1 if you have the `strverscmp' function. */ #undef HAVE_STRVERSCMP +/* Define to 1 if you have the `setlocale` funktion. */ +#undef HAVE_SETLOCALE + /* Define to 1 if you have the header file, and it defines `DIR'. */ #undef HAVE_SYS_DIR_H @@ -108,6 +111,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have header file. */ +#undef HAVE_LOCALE_H + /* Define to 1 if you have the `vprintf' function. */ #undef HAVE_VPRINTF @@ -155,3 +161,7 @@ /* Define to `unsigned' if does not define. */ #undef size_t + +#undef ENABLE_NLS + + diff -Nurp pacman-2.9.5/configure pacman-i18n-0.1.1/configure --- pacman-2.9.5/configure 2004-04-19 08:17:56.000000000 +0100 +++ pacman-i18n-0.1.1/configure 2004-12-24 13:06:45.000000000 +0000 @@ -1,11 +1,10 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.57 for FULL-PACKAGE-NAME VERSION. +# Generated by GNU Autoconf 2.59 for FULL-PACKAGE-NAME VERSION. # # Report bugs to . # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# 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. ## --------------------- ## @@ -22,9 +21,10 @@ if test -n "${ZSH_VERSION+set}" && (emul 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 (FOO=FOO; unset FOO) >/dev/null 2>&1; then +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -43,7 +43,7 @@ for as_var in \ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + 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 @@ -220,16 +220,17 @@ 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="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +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="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" # IFS @@ -310,7 +311,7 @@ ac_includes_default="\ # include #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 CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE CXX CXXFLAGS ac_ct_CXX CPP EGREP LIBOBJS LTLIBOBJS' +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 CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE CXX CXXFLAGS ac_ct_CXX CPP EGREP MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -669,7 +670,7 @@ done # Be sure to have absolute paths. for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir + localstatedir libdir includedir oldincludedir infodir mandir do eval ac_val=$`echo $ac_var` case $ac_val in @@ -709,10 +710,10 @@ if test -z "$srcdir"; then # Try the directory containing this script, then its parent. ac_confdir=`(dirname "$0") 2>/dev/null || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || echo X"$0" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } /^X\(\/\/\)[^/].*/{ s//\1/; q; } @@ -812,9 +813,9 @@ _ACEOF cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -839,6 +840,10 @@ Fine tuning of the installation director _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 @@ -848,6 +853,21 @@ if test -n "$ac_init_help"; then esac cat <<\_ACEOF +Optional Features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --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-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-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 @@ -896,12 +916,45 @@ case $srcdir in ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + +# 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. @@ -912,7 +965,7 @@ ac_abs_top_srcdir=`cd "$ac_dir" && cd $a echo $SHELL $ac_srcdir/configure --help=recursive elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then + test -f $ac_srcdir/configure.in; then echo $ac_configure --help else @@ -926,10 +979,9 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF FULL-PACKAGE-NAME configure VERSION -generated by GNU Autoconf 2.57 +generated by GNU Autoconf 2.59 -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 -Free Software Foundation, Inc. +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 @@ -941,7 +993,7 @@ This file contains any messages produced running configure, to aid debugging if configure makes a mistake. It was created by FULL-PACKAGE-NAME $as_me VERSION, which was -generated by GNU Autoconf 2.57. Invocation command line was +generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1018,19 +1070,19 @@ do 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. + 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 + 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. @@ -1064,12 +1116,12 @@ _ASBOX 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" + "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" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } @@ -1098,7 +1150,7 @@ _ASBOX for ac_var in $ac_subst_files do eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + echo "$ac_var='"'"'$ac_val'"'"'" done | sort echo fi @@ -1117,7 +1169,7 @@ _ASBOX echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 - rm -f core core.* *.core && + rm -f core *.core && rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status ' 0 @@ -1197,7 +1249,7 @@ fi # 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 + 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" @@ -1214,13 +1266,13 @@ echo "$as_me: error: \`$ac_var' was not ,);; *) 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:$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:$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:$LINENO: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + ac_cache_corrupted=: fi;; esac # Pass precious variables to config.status. @@ -1617,7 +1669,6 @@ ac_compiler=`set X $ac_compile; echo $2` (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -1637,8 +1688,8 @@ ac_clean_files="$ac_clean_files a.out a. # 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" >&5 -echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 +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 @@ -1658,23 +1709,23 @@ 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. - ;; + # This is the source file. + ;; [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; + # 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;; + 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;; + break;; esac done else @@ -1748,8 +1799,8 @@ for ac_file in conftest.exe conftest con 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;; + export ac_cv_exeext + break;; * ) break;; esac done @@ -1774,7 +1825,6 @@ if test "${ac_cv_objext+set}" = set; the echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -1825,7 +1875,6 @@ if test "${ac_cv_c_compiler_gnu+set}" = echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -1845,11 +1894,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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 -s conftest.$ac_objext' + { 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=$? @@ -1862,7 +1921,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi @@ -1878,7 +1937,6 @@ if test "${ac_cv_prog_cc_g+set}" = set; echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -1895,11 +1953,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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 -s conftest.$ac_objext' + { 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=$? @@ -1912,7 +1980,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_prog_cc_g=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +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 @@ -1939,7 +2007,6 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -1967,6 +2034,16 @@ static char *f (char * (*g) (char **, in 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);}; @@ -1993,11 +2070,21 @@ 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>&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 -s conftest.$ac_objext' + { 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=$? @@ -2010,7 +2097,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext +rm -f conftest.err conftest.$ac_objext done rm -f conftest.$ac_ext conftest.$ac_objext CC=$ac_save_CC @@ -2038,19 +2125,28 @@ cat >conftest.$ac_ext <<_ACEOF _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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 -s conftest.$ac_objext' + { 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 \ - ''\ - '#include ' \ + '' \ '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 ();' \ @@ -2058,14 +2154,13 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include $ac_declaration +#include int main () { @@ -2076,11 +2171,21 @@ exit (42); _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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 -s conftest.$ac_objext' + { 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=$? @@ -2093,9 +2198,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 continue fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2112,11 +2216,21 @@ exit (42); _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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 -s conftest.$ac_objext' + { 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=$? @@ -2128,7 +2242,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done rm -f conftest* if test -n "$ac_declaration"; then @@ -2142,7 +2256,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +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' @@ -2185,6 +2299,7 @@ ac_configure="$SHELL $ac_aux_dir/configu # 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 "$as_me:$LINENO: checking for a BSD-compatible install" >&5 echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 @@ -2201,6 +2316,7 @@ do 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. @@ -2208,20 +2324,20 @@ case $as_dir/ in # 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 "$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="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + 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="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi done done ;; @@ -2264,7 +2380,7 @@ fi 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_,'` +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 @@ -2410,7 +2526,6 @@ if test "${ac_cv_cxx_compiler_gnu+set}" echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2430,11 +2545,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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 -s conftest.$ac_objext' + { ac_try='test -z "$ac_cxx_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=$? @@ -2447,7 +2572,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi @@ -2463,7 +2588,6 @@ if test "${ac_cv_prog_cxx_g+set}" = set; echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2480,11 +2604,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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 -s conftest.$ac_objext' + { ac_try='test -z "$ac_cxx_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=$? @@ -2497,7 +2631,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_prog_cxx_g=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 @@ -2517,8 +2651,7 @@ else fi fi for ac_declaration in \ - ''\ - '#include ' \ + '' \ '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 ();' \ @@ -2526,14 +2659,13 @@ for ac_declaration in \ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include $ac_declaration +#include int main () { @@ -2544,11 +2676,21 @@ exit (42); _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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 -s conftest.$ac_objext' + { ac_try='test -z "$ac_cxx_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=$? @@ -2561,9 +2703,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 continue fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2580,11 +2721,21 @@ exit (42); _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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 -s conftest.$ac_objext' + { ac_try='test -z "$ac_cxx_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=$? @@ -2596,7 +2747,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done rm -f conftest* if test -n "$ac_declaration"; then @@ -2623,7 +2774,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2647,11 +2797,21 @@ printf (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&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 -s conftest$ac_exeext' + { 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=$? @@ -2664,7 +2824,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_c_printf=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +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_c_printf" >&5 @@ -2691,7 +2852,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ltar $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2715,11 +2875,21 @@ tar_open (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&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 -s conftest$ac_exeext' + { 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=$? @@ -2732,7 +2902,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_tar_tar_open=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +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_tar_tar_open" >&5 @@ -2759,7 +2930,6 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lz $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2783,11 +2953,21 @@ gzread (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&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 -s conftest$ac_exeext' + { 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=$? @@ -2800,7 +2980,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_z_gzread=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +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_z_gzread" >&5 @@ -2834,7 +3015,6 @@ if eval "test \"\${$as_ac_Header+set}\" echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2854,11 +3034,21 @@ return 0; _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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 -s conftest.$ac_objext' + { 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=$? @@ -2871,7 +3061,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_Header=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext +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 @@ -2894,7 +3084,6 @@ else ac_func_search_save_LIBS=$LIBS ac_cv_search_opendir=no cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2918,11 +3107,21 @@ opendir (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&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 -s conftest$ac_exeext' + { 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=$? @@ -2934,12 +3133,12 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "$ac_cv_search_opendir" = no; then for ac_lib in dir; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -2963,11 +3162,21 @@ opendir (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&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 -s conftest$ac_exeext' + { 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=$? @@ -2980,7 +3189,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext done fi LIBS=$ac_func_search_save_LIBS @@ -3001,7 +3211,6 @@ else ac_func_search_save_LIBS=$LIBS ac_cv_search_opendir=no cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3025,11 +3234,21 @@ opendir (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&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 -s conftest$ac_exeext' + { 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=$? @@ -3041,12 +3260,12 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "$ac_cv_search_opendir" = no; then for ac_lib in x; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3070,11 +3289,21 @@ opendir (); _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&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 -s conftest$ac_exeext' + { 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=$? @@ -3087,7 +3316,8 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext done fi LIBS=$ac_func_search_save_LIBS @@ -3129,7 +3359,6 @@ do # 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 -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3140,7 +3369,7 @@ cat >>conftest.$ac_ext <<_ACEOF #else # include #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -3152,6 +3381,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c (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 @@ -3172,7 +3402,6 @@ 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 -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3190,6 +3419,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c (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 @@ -3236,7 +3466,6 @@ do # 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 -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3247,7 +3476,7 @@ cat >>conftest.$ac_ext <<_ACEOF #else # include #endif - Syntax error + Syntax error _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -3259,6 +3488,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c (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 @@ -3279,7 +3509,6 @@ 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 -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3297,6 +3526,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c (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 @@ -3357,7 +3587,6 @@ if test "${ac_cv_header_stdc+set}" = set echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3378,11 +3607,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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 -s conftest.$ac_objext' + { 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=$? @@ -3395,12 +3634,11 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_stdc=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +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 -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3422,7 +3660,6 @@ 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 <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3447,7 +3684,6 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3459,9 +3695,9 @@ cat >>conftest.$ac_ext <<_ACEOF # 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')) + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) #endif @@ -3472,7 +3708,7 @@ main () int i; for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) + || toupper (i) != TOUPPER (i)) exit(2); exit (0); } @@ -3497,7 +3733,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi @@ -3522,7 +3758,7 @@ fi for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.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 @@ -3531,7 +3767,6 @@ if eval "test \"\${$as_ac_Header+set}\" echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3543,11 +3778,21 @@ $ac_includes_default _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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 -s conftest.$ac_objext' + { 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=$? @@ -3560,7 +3805,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_Header=no" fi -rm -f conftest.$ac_objext conftest.$ac_ext +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 @@ -3584,7 +3829,9 @@ done -for ac_header in arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h unistd.h + + +for ac_header in arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h unistd.h libintl.h locale.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then @@ -3600,7 +3847,6 @@ else echo "$as_me:$LINENO: checking $ac_header usability" >&5 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3611,11 +3857,21 @@ $ac_includes_default _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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 -s conftest.$ac_objext' + { 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=$? @@ -3628,7 +3884,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +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 @@ -3636,7 +3892,6 @@ echo "${ECHO_T}$ac_header_compiler" >&6 echo "$as_me:$LINENO: checking $ac_header presence" >&5 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3654,6 +3909,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c (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 @@ -3673,33 +3929,32 @@ echo "$as_me:$LINENO: result: $ac_header echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +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 preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&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 ) + 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: 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 bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## --------------------------------- ## +## Report this to BUG-REPORT-ADDRESS ## +## --------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -3710,7 +3965,7 @@ echo $ECHO_N "checking for $ac_header... if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - eval "$as_ac_Header=$ac_header_preproc" + 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 @@ -3726,59 +3981,1839 @@ fi done -# Checks for typedefs, structures, and compiler characteristics. -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 + + 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 + + + + 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 - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ + USE_NLS=yes +fi; + echo "$as_me:$LINENO: result: $USE_NLS" >&5 +echo "${ECHO_T}$USE_NLS" >&6 -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; + + + + +# 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 "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 +MSGFMT="$ac_cv_path_MSGFMT" +if test "$MSGFMT" != ":"; then + echo "$as_me:$LINENO: result: $MSGFMT" >&5 +echo "${ECHO_T}$MSGFMT" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + # 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 + 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 +GMSGFMT=$ac_cv_path_GMSGFMT + +if test -n "$GMSGFMT"; then + echo "$as_me:$LINENO: result: $GMSGFMT" >&5 +echo "${ECHO_T}$GMSGFMT" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +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 + +# 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 "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 + 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 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 + +# 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 "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 "$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 "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" + +# Make sure we can run config.sub. +$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/'` + + + +# 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 &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. +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" + + else + additional_includedir="$withval/include" + additional_libdir="$withval/lib" + fi + fi + +fi; + LIBICONV= + LTLIBICONV= + INCICONV= + rpathdirs= + ltrpathdirs= + names_already_handled= + names_next_round='iconv ' + while test -n "$names_next_round"; do + names_this_round="$names_next_round" + names_next_round= + for name in $names_this_round; do + already_handled= + for n in $names_already_handled; do + if test "$n" = "$name"; then + already_handled=yes + break + fi + done + if test -z "$already_handled"; then + names_already_handled="$names_already_handled $name" + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + eval value=\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" = yes; then + eval value=\"\$LIB$uppername\" + test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value" + eval value=\"\$LTLIB$uppername\" + test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value" + else + : + fi + else + found_dir= + found_la= + found_so= + found_a= + if test $use_additional = yes; then + if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then + found_dir="$additional_libdir" + found_so="$additional_libdir/lib$name.$shlibext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi + else + if test -f "$additional_libdir/lib$name.$libext"; then + found_dir="$additional_libdir" + found_a="$additional_libdir/lib$name.$libext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi + fi + 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" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then + found_dir="$dir" + found_so="$dir/lib$name.$shlibext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + else + if test -f "$dir/lib$name.$libext"; then + found_dir="$dir" + found_a="$dir/lib$name.$libext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + else + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + if test "$hardcode_direct" = yes; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + else + if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + haveit= + for x in $LDFLAGS $LIBICONV; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir" + fi + if test "$hardcode_minus_L" != no; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" + else + LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a" + else + LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name" + fi + fi + additional_includedir= + case "$found_dir" in + */lib | */lib/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + 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" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + if test -n "$found_la"; then + save_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$save_libdir" + for dep in $dependency_libs; do + case "$dep" in + -L*) + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + if test "X$additional_libdir" != "X/usr/lib"; then + haveit= + if test "X$additional_libdir" = "X/usr/local/lib"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + 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" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIBICONV; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + LIBICONV="${LIBICONV}${LIBICONV:+ }$dep" + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep" + ;; + esac + done + fi + else + LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name" + fi + fi + fi + done + done + if test "X$rpathdirs" != "X"; then + if test -n "$hardcode_libdir_separator"; then + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + done + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" + else + for found_dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" != "X"; then + for found_dir in $ltrpathdirs; do + LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir" + done + fi + + + + + + + + + + + + + + + + + + + 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; + echo "$as_me:$LINENO: result: $USE_NLS" >&5 +echo "${ECHO_T}$USE_NLS" >&6 + + + + + LIBINTL= + LTLIBINTL= + POSUB= + + if test "$USE_NLS" = "yes"; then + gt_use_preinstalled_gnugettext=no + + + + + + + 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 +extern int _nl_msg_cat_cntr; +extern int *_nl_domain_bindings; +int +main () +{ +bindtextdomain ("", ""); +return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + ; + 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 "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +gt_cv_func_gnugettext1_libc=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +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 + + + + + + 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" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" + fi + done + + + 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 <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +int +main () +{ +iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); + ; + 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 "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +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 <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +int +main () +{ +iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); + ; + 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 "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$am_save_LIBS" + fi + +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 <<\_ACEOF +#define HAVE_ICONV 1 +_ACEOF + + fi + if test "$am_cv_lib_iconv" = yes; then + 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 + + + + + + + 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. +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" + + else + additional_includedir="$withval/include" + additional_libdir="$withval/lib" + fi + fi + +fi; + LIBINTL= + LTLIBINTL= + INCINTL= + rpathdirs= + ltrpathdirs= + names_already_handled= + names_next_round='intl ' + while test -n "$names_next_round"; do + names_this_round="$names_next_round" + names_next_round= + for name in $names_this_round; do + already_handled= + for n in $names_already_handled; do + if test "$n" = "$name"; then + already_handled=yes + break + fi + done + if test -z "$already_handled"; then + names_already_handled="$names_already_handled $name" + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + eval value=\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" = yes; then + eval value=\"\$LIB$uppername\" + test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value" + eval value=\"\$LTLIB$uppername\" + test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value" + else + : + fi + else + found_dir= + found_la= + found_so= + found_a= + if test $use_additional = yes; then + if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then + found_dir="$additional_libdir" + found_so="$additional_libdir/lib$name.$shlibext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi + else + if test -f "$additional_libdir/lib$name.$libext"; then + found_dir="$additional_libdir" + found_a="$additional_libdir/lib$name.$libext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi + fi + 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" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then + found_dir="$dir" + found_so="$dir/lib$name.$shlibext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + else + if test -f "$dir/lib$name.$libext"; then + found_dir="$dir" + found_a="$dir/lib$name.$libext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + else + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + if test "$hardcode_direct" = yes; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + else + if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + haveit= + for x in $LDFLAGS $LIBINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir" + fi + if test "$hardcode_minus_L" != no; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" + else + LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a" + else + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name" + fi + fi + additional_includedir= + case "$found_dir" in + */lib | */lib/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + 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" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + if test -n "$found_la"; then + save_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$save_libdir" + for dep in $dependency_libs; do + case "$dep" in + -L*) + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + if test "X$additional_libdir" != "X/usr/lib"; then + haveit= + if test "X$additional_libdir" = "X/usr/local/lib"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + 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" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIBINTL; do + + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + LIBINTL="${LIBINTL}${LIBINTL:+ }$dep" + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep" + ;; + esac + done + fi + else + LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name" + fi + fi + fi + done + done + if test "X$rpathdirs" != "X"; then + if test -n "$hardcode_libdir_separator"; then + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + done + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" + else + for found_dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" != "X"; then + for found_dir in $ltrpathdirs; do + LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir" + done + fi + + 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 <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (); +int +main () +{ +bindtextdomain ("", ""); +return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) + ; + 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 "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +gt_cv_func_gnugettext1_libintl=no +fi +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 <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +extern int _nl_msg_cat_cntr; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias (); +int +main () +{ +bindtextdomain ("", ""); +return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) + ; + 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 "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + fi + CPPFLAGS="$gt_save_CPPFLAGS" + LIBS="$gt_save_LIBS" +fi +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-runtime \ + && test "$PACKAGE" != gettext-tools; }; then + gt_use_preinstalled_gnugettext=yes + else + LIBINTL= + LTLIBINTL= + INCINTL= + fi + + + + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + +cat >>confdefs.h <<\_ACEOF +#define ENABLE_NLS 1 +_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 "$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" + exec_prefix="$acl_final_exec_prefix" + eval x=\"$x\" + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" + + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" + fi + done + + fi + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_GETTEXT 1 +_ACEOF + + +cat >>confdefs.h <<\_ACEOF +#define HAVE_DCGETTEXT 1 +_ACEOF + + fi + + POSUB=po + fi + + + + INTLLIBS="$LIBINTL" + + + + + + + +# Checks for typedefs, structures, and compiler characteristics. +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. */ @@ -3796,11 +5831,21 @@ main () _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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 -s conftest.$ac_objext' + { 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=$? @@ -3813,7 +5858,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_c_const=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 @@ -3831,7 +5876,6 @@ if test "${ac_cv_type_mode_t+set}" = set echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3851,11 +5895,21 @@ if (sizeof (mode_t)) _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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 -s conftest.$ac_objext' + { 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=$? @@ -3868,7 +5922,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_mode_t=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5 echo "${ECHO_T}$ac_cv_type_mode_t" >&6 @@ -3888,7 +5942,6 @@ if test "${ac_cv_type_size_t+set}" = set echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3908,11 +5961,21 @@ if (sizeof (size_t)) _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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 -s conftest.$ac_objext' + { 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=$? @@ -3925,7 +5988,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_size_t=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +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 @@ -3945,7 +6008,6 @@ if test "${ac_cv_header_time+set}" = set echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3966,11 +6028,21 @@ return 0; _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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 -s conftest.$ac_objext' + { 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=$? @@ -3983,7 +6055,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_time=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 @@ -4001,7 +6073,6 @@ if test "${ac_cv_type_uid_t+set}" = set; echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4045,7 +6116,6 @@ else ac_cv_func_closedir_void=yes else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4085,7 +6155,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_func_closedir_void=yes fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +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_func_closedir_void" >&5 @@ -4110,7 +6180,6 @@ if test "$as_ln_s" = "ln -s" && ln -s co ac_cv_func_lstat_dereferences_slashed_symlink=no else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4122,8 +6191,8 @@ main () { struct stat sbuf; /* Linux will dereference the symlink and fail. - That is better in the sense that it means we will not - have to compile and use the lstat wrapper. */ + That is better in the sense that it means we will not + have to compile and use the lstat wrapper. */ exit (lstat ("conftest.sym/", &sbuf) ? 0 : 1); ; return 0; @@ -4149,7 +6218,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_func_lstat_dereferences_slashed_symlink=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi else # If the `ln -s' command failed, then we probably don't even @@ -4170,7 +6239,14 @@ _ACEOF if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then - LIBOBJS="$LIBOBJS lstat.$ac_objext" + case $LIBOBJS in + "lstat.$ac_objext" | \ + *" lstat.$ac_objext" | \ + "lstat.$ac_objext "* | \ + *" lstat.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS lstat.$ac_objext" ;; +esac + fi echo "$as_me:$LINENO: checking whether lstat accepts an empty string" >&5 @@ -4182,7 +6258,6 @@ else ac_cv_func_lstat_empty_string_bug=yes else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4218,13 +6293,20 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_func_lstat_empty_string_bug=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +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_func_lstat_empty_string_bug" >&5 echo "${ECHO_T}$ac_cv_func_lstat_empty_string_bug" >&6 if test $ac_cv_func_lstat_empty_string_bug = yes; then - LIBOBJS="$LIBOBJS lstat.$ac_objext" + case $LIBOBJS in + "lstat.$ac_objext" | \ + *" lstat.$ac_objext" | \ + "lstat.$ac_objext "* | \ + *" lstat.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS lstat.$ac_objext" ;; +esac + cat >>confdefs.h <<_ACEOF #define HAVE_LSTAT_EMPTY_STRING_BUG 1 @@ -4244,7 +6326,6 @@ if test "$as_ln_s" = "ln -s" && ln -s co ac_cv_func_lstat_dereferences_slashed_symlink=no else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4256,8 +6337,8 @@ main () { struct stat sbuf; /* Linux will dereference the symlink and fail. - That is better in the sense that it means we will not - have to compile and use the lstat wrapper. */ + That is better in the sense that it means we will not + have to compile and use the lstat wrapper. */ exit (lstat ("conftest.sym/", &sbuf) ? 0 : 1); ; return 0; @@ -4283,7 +6364,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_func_lstat_dereferences_slashed_symlink=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi else # If the `ln -s' command failed, then we probably don't even @@ -4304,7 +6385,14 @@ _ACEOF if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then - LIBOBJS="$LIBOBJS lstat.$ac_objext" + case $LIBOBJS in + "lstat.$ac_objext" | \ + *" lstat.$ac_objext" | \ + "lstat.$ac_objext "* | \ + *" lstat.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS lstat.$ac_objext" ;; +esac + fi @@ -4324,7 +6412,6 @@ else echo "$as_me:$LINENO: checking $ac_header usability" >&5 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4335,11 +6422,21 @@ $ac_includes_default _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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 -s conftest.$ac_objext' + { 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=$? @@ -4352,7 +6449,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +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 @@ -4360,7 +6457,6 @@ echo "${ECHO_T}$ac_header_compiler" >&6 echo "$as_me:$LINENO: checking $ac_header presence" >&5 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4378,6 +6474,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c (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 @@ -4397,33 +6494,32 @@ echo "$as_me:$LINENO: result: $ac_header echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +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 preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&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 ) + 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: 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 bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## --------------------------------- ## +## Report this to BUG-REPORT-ADDRESS ## +## --------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -4434,7 +6530,7 @@ echo $ECHO_N "checking for $ac_header... if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - eval "$as_ac_Header=$ac_header_preproc" + 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 @@ -4458,7 +6554,6 @@ else ac_cv_func_malloc_0_nonnull=no else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4498,7 +6593,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_func_malloc_0_nonnull=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +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_func_malloc_0_nonnull" >&5 @@ -4514,7 +6609,14 @@ else #define HAVE_MALLOC 0 _ACEOF - LIBOBJS="$LIBOBJS malloc.$ac_objext" + case $LIBOBJS in + "malloc.$ac_objext" | \ + *" malloc.$ac_objext" | \ + "malloc.$ac_objext "* | \ + *" malloc.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS malloc.$ac_objext" ;; +esac + cat >>confdefs.h <<\_ACEOF #define malloc rpl_malloc @@ -4541,7 +6643,6 @@ else echo "$as_me:$LINENO: checking $ac_header usability" >&5 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4552,11 +6653,21 @@ $ac_includes_default _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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 -s conftest.$ac_objext' + { 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=$? @@ -4569,7 +6680,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +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 @@ -4577,7 +6688,6 @@ echo "${ECHO_T}$ac_header_compiler" >&6 echo "$as_me:$LINENO: checking $ac_header presence" >&5 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4595,6 +6705,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c (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 @@ -4614,33 +6725,32 @@ echo "$as_me:$LINENO: result: $ac_header echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +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 preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&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 ) + 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: 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 bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## --------------------------------- ## +## Report this to BUG-REPORT-ADDRESS ## +## --------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -4651,7 +6761,7 @@ echo $ECHO_N "checking for $ac_header... if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - eval "$as_ac_Header=$ac_header_preproc" + 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 @@ -4675,7 +6785,6 @@ else ac_cv_func_realloc_0_nonnull=no else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4715,7 +6824,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_func_realloc_0_nonnull=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +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_func_realloc_0_nonnull" >&5 @@ -4731,7 +6840,14 @@ else #define HAVE_REALLOC 0 _ACEOF - LIBOBJS="$LIBOBJS realloc.$ac_objext" + case $LIBOBJS in + "realloc.$ac_objext" | \ + *" realloc.$ac_objext" | \ + "realloc.$ac_objext "* | \ + *" realloc.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS realloc.$ac_objext" ;; +esac + cat >>confdefs.h <<\_ACEOF #define realloc rpl_realloc @@ -4759,7 +6875,6 @@ else echo "$as_me:$LINENO: checking $ac_header usability" >&5 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4770,11 +6885,21 @@ $ac_includes_default _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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 -s conftest.$ac_objext' + { 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=$? @@ -4787,7 +6912,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +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 @@ -4795,7 +6920,6 @@ echo "${ECHO_T}$ac_header_compiler" >&6 echo "$as_me:$LINENO: checking $ac_header presence" >&5 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4813,6 +6937,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c (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 @@ -4832,33 +6957,32 @@ echo "$as_me:$LINENO: result: $ac_header echo "${ECHO_T}$ac_header_preproc" >&6 # So? What about this header? -case $ac_header_compiler:$ac_header_preproc in - yes:no ) +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 preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-autoconf@gnu.org. ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&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 ) + 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: 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 bug-autoconf@gnu.org. ## -## ------------------------------------ ## +## --------------------------------- ## +## Report this to BUG-REPORT-ADDRESS ## +## --------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -4869,7 +6993,7 @@ echo $ECHO_N "checking for $ac_header... if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - eval "$as_ac_Header=$ac_header_preproc" + 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 @@ -4893,7 +7017,6 @@ else for ac_arg1 in 'int' 'size_t' 'unsigned long' 'unsigned'; do for ac_arg5 in 'struct timeval *' 'const struct timeval *'; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4911,19 +7034,29 @@ int main () { extern int select ($ac_arg1, - $ac_arg234, $ac_arg234, $ac_arg234, - $ac_arg5); + $ac_arg234, $ac_arg234, $ac_arg234, + $ac_arg5); ; return 0; } _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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 -s conftest.$ac_objext' + { 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=$? @@ -4935,7 +7068,7 @@ else sed 's/^/| /' conftest.$ac_ext >&5 fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done done done @@ -4972,7 +7105,6 @@ if test "${ac_cv_type_signal+set}" = set echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -4999,11 +7131,21 @@ int i; _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&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 -s conftest.$ac_objext' + { 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=$? @@ -5016,7 +7158,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_type_signal=int fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 echo "${ECHO_T}$ac_cv_type_signal" >&6 @@ -5035,7 +7177,6 @@ else ac_cv_func_stat_empty_string_bug=yes else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -5071,13 +7212,20 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_func_stat_empty_string_bug=no fi -rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +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_func_stat_empty_string_bug" >&5 echo "${ECHO_T}$ac_cv_func_stat_empty_string_bug" >&6 if test $ac_cv_func_stat_empty_string_bug = yes; then - LIBOBJS="$LIBOBJS stat.$ac_objext" + case $LIBOBJS in + "stat.$ac_objext" | \ + *" stat.$ac_objext" | \ + "stat.$ac_objext "* | \ + *" stat.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS stat.$ac_objext" ;; +esac + cat >>confdefs.h <<_ACEOF #define HAVE_STAT_EMPTY_STRING_BUG 1 @@ -5095,21 +7243,28 @@ if eval "test \"\${$as_ac_var+set}\" = s echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* 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 declares $ac_func. + For example, HP-UX 11i 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. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ + #ifdef __STDC__ # include #else # include #endif + +#undef $ac_func + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -5140,11 +7295,21 @@ return f != $ac_func; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&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 -s conftest$ac_exeext' + { 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=$? @@ -5157,7 +7322,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +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 @@ -5172,21 +7338,28 @@ if test "${ac_cv_func__doprnt+set}" = se echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* 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 declares _doprnt. + For example, HP-UX 11i declares gettimeofday. */ +#define _doprnt innocuous__doprnt + /* System header to define __stub macros and hopefully few prototypes, which can conflict with char _doprnt (); below. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ + #ifdef __STDC__ # include #else # include #endif + +#undef _doprnt + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -5217,11 +7390,21 @@ return f != _doprnt; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&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 -s conftest$ac_exeext' + { 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=$? @@ -5234,7 +7417,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func__doprnt=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +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 @@ -5264,7 +7448,8 @@ done -for ac_func in gethostbyname memmove memset mkdir realpath rmdir select socket strcasecmp strchr strdup strerror strstr strverscmp + +for ac_func in gethostbyname memmove memset mkdir realpath rmdir select socket strcasecmp strchr strdup strerror strstr strverscmp setlocale do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -5273,21 +7458,28 @@ if eval "test \"\${$as_ac_var+set}\" = s echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" /* 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 declares $ac_func. + For example, HP-UX 11i 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. Prefer to if __STDC__ is defined, since exists even on freestanding compilers. */ + #ifdef __STDC__ # include #else # include #endif + +#undef $ac_func + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" @@ -5318,11 +7510,21 @@ return f != $ac_func; _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&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 -s conftest$ac_exeext' + { 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=$? @@ -5335,7 +7537,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +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 @@ -5378,13 +7581,13 @@ _ACEOF # `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" + "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" + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; } | @@ -5414,13 +7617,13 @@ test "x$exec_prefix" = xNONE && exec_pre # 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[ ]*=/{ + ac_vpsub='/^[ ]*VPATH[ ]*=/{ s/:*\$(srcdir):*/:/; s/:*\${srcdir}:*/:/; s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; +s/^\([^=]*=[ ]*\):*/\1/; s/:*$//; -s/^[^=]*=[ ]*$//; +s/^[^=]*=[ ]*$//; }' fi @@ -5431,7 +7634,7 @@ 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$//'` + 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' @@ -5475,9 +7678,10 @@ if test -n "${ZSH_VERSION+set}" && (emul 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 (FOO=FOO; unset FOO) >/dev/null 2>&1; then +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -5496,7 +7700,7 @@ for as_var in \ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + 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 @@ -5675,16 +7879,17 @@ 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="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" +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="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" # IFS @@ -5710,8 +7915,8 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by FULL-PACKAGE-NAME $as_me VERSION, which was -generated by GNU Autoconf 2.57. Invocation command line was +This file was extended by FULL-PACKAGE-INTL $as_me VERSION, which was +generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -5755,9 +7960,9 @@ Usage: $0 [OPTIONS] [FILE]... -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 + instantiate the configuration file FILE --header=FILE[:TEMPLATE] - instantiate the configuration header FILE + instantiate the configuration header FILE Configuration files: $config_files @@ -5765,17 +7970,19 @@ $config_files Configuration headers: $config_headers +Configuration commands: +$config_commands + Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -FULL-PACKAGE-NAME config.status VERSION -configured by $0, generated by GNU Autoconf 2.57, +FULL-PACKAGE-INTL config.status VERSION +configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +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 @@ -5865,7 +8072,20 @@ 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 @@ -5875,6 +8095,7 @@ do case "$ac_config_target" in # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} @@ -5889,6 +8110,7 @@ done if $ac_need_defaults; then test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi # Have a temporary directory for convenience. Make it in the build tree @@ -5977,6 +8199,26 @@ s,@CXXFLAGS@,$CXXFLAGS,;t t s,@ac_ct_CXX@,$ac_ct_CXX,;t t s,@CPP@,$CPP,;t t s,@EGREP@,$EGREP,;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,@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,@LIBICONV@,$LIBICONV,;t t +s,@LTLIBICONV@,$LTLIBICONV,;t t +s,@INTLLIBS@,$INTLLIBS,;t t +s,@LIBINTL@,$LIBINTL,;t t +s,@LTLIBINTL@,$LTLIBINTL,;t t +s,@POSUB@,$POSUB,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF @@ -6008,9 +8250,9 @@ _ACEOF (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" + 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" + 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 @@ -6028,21 +8270,21 @@ for ac_file in : $CONFIG_FILES; do test # 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,:.*,,'` ;; + 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=`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 || + 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; } @@ -6058,10 +8300,10 @@ echo X"$ac_file" | 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 || + 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; } @@ -6099,12 +8341,45 @@ case $srcdir in ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ac_top_srcdir=$ac_top_builddir$srcdir ;; esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` + +# 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 case $INSTALL in @@ -6126,7 +8401,7 @@ echo "$as_me: creating $ac_file" >&6;} configure_input="$ac_file. " fi configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -6135,24 +8410,24 @@ echo "$as_me: creating $ac_file" >&6;} 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 + # 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;; + 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 + 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;; + fi;; esac done` || { (exit 1); exit 1; } _ACEOF @@ -6194,12 +8469,12 @@ cat >>$CONFIG_STATUS <<\_ACEOF # NAME is the cpp macro being defined and VALUE is the value it is being given. # # ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='[ ].*$,\1#\2' +ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' +ac_dB='[ ].*$,\1#\2' ac_dC=' ' ac_dD=',;t' # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' ac_uB='$,\1#\2define\3' ac_uC=' ' ac_uD=',;t' @@ -6208,11 +8483,11 @@ for ac_file in : $CONFIG_HEADERS; do tes # 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,:.*,,'` ;; + 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=`echo "$ac_file" | sed 's,:.*,,'` ;; * ) ac_file_in=$ac_file.in ;; esac @@ -6226,28 +8501,29 @@ echo "$as_me: creating $ac_file" >&6;} 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 + # 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;; + # Do quote $f, to prevent DOS paths from being IFS'd. + 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 + 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;; + fi;; esac done` || { (exit 1); exit 1; } # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in + sed 's/[ ]*$//' $ac_file_inputs >$tmp/in _ACEOF @@ -6270,9 +8546,9 @@ s/[\\&,]/\\&/g s,[\\$`],\\&,g t clear : clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp : end _ACEOF # If some macros were called several times there might be several times @@ -6286,13 +8562,13 @@ rm -f confdef2sed.sed # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. cat >>conftest.undefs <<\_ACEOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, +s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, _ACEOF # Break up conftest.defines because some shells have a limit on the size # of here documents, and old seds have small limits too (100 cmds). echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS +echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS echo ' :' >>$CONFIG_STATUS rm -f conftest.tail @@ -6301,7 +8577,7 @@ do # Write a limited-size here document to $tmp/defines.sed. echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS + echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS # Work around the forget-to-reset-the-flag bug. echo 't clr' >>$CONFIG_STATUS echo ': clr' >>$CONFIG_STATUS @@ -6328,7 +8604,7 @@ do # Write a limited-size here document to $tmp/undefs.sed. echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS + echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS # Work around the forget-to-reset-the-flag bug. echo 't clr' >>$CONFIG_STATUS echo ': clr' >>$CONFIG_STATUS @@ -6362,10 +8638,10 @@ echo "$as_me: $ac_file is unchanged" >&6 else 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 || + 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; } @@ -6381,10 +8657,10 @@ echo X"$ac_file" | 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 || + 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; } @@ -6406,6 +8682,232 @@ echo "$as_me: error: cannot create direc fi done _ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF + +# +# 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; }; }; } + + 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 + + + { 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 + *:*) 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 ;; + esac +done +_ACEOF cat >>$CONFIG_STATUS <<\_ACEOF diff -Nurp pacman-2.9.5/configure.in pacman-i18n-0.1.1/configure.in --- pacman-2.9.5/configure.in 2004-04-19 08:17:56.000000000 +0100 +++ pacman-i18n-0.1.1/configure.in 2004-12-24 13:06:27.000000000 +0000 @@ -21,7 +21,9 @@ AC_CHECK_LIB([z], [gzread], , AC_MSG_ERR # Checks for header files. AC_HEADER_DIRENT AC_HEADER_STDC -AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h unistd.h]) +AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h unistd.h libintl.h locale.h]) + +AM_GNU_GETTEXT([external]) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -40,7 +42,7 @@ AC_FUNC_SELECT_ARGTYPES AC_TYPE_SIGNAL AC_FUNC_STAT AC_FUNC_VPRINTF -AC_CHECK_FUNCS([gethostbyname memmove memset mkdir realpath rmdir select socket strcasecmp strchr strdup strerror strstr strverscmp]) +AC_CHECK_FUNCS([gethostbyname memmove memset mkdir realpath rmdir select socket strcasecmp strchr strdup strerror strstr strverscmp setlocale]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff -Nurp pacman-2.9.5/doc/ChangeLog pacman-i18n-0.1.1/doc/ChangeLog --- pacman-2.9.5/doc/ChangeLog 1970-01-01 01:00:00.000000000 +0100 +++ pacman-i18n-0.1.1/doc/ChangeLog 2005-01-01 10:47:18.000000000 +0000 @@ -0,0 +1,15 @@ +Armando M. Baratti @ Sa Jan 1 11:45:47 CET 2005 + [PORTUGUESE]: Translation + + - Add pt_BR Manpages + +Matthias-Christian Ott + [RELEASE]: 0.1.1 + +Gan Lu @ Mo Dez 13 17:13:54 CET 2004 + [CHINESE SIMPLIFIED]: Translation + + - Added Chinese Simplified Makepkg Manpage + +Matthias-Christian Ott + [RELEASE]: 0.1 diff -Nurp pacman-2.9.5/Makefile.in pacman-i18n-0.1.1/Makefile.in --- pacman-2.9.5/Makefile.in 2005-01-11 23:14:15.000000000 +0000 +++ pacman-i18n-0.1.1/Makefile.in 2005-01-21 13:28:03.000000000 +0000 @@ -41,34 +41,43 @@ SRCDIR = $(TOPDIR)/src/ OBJDIR = $(TOPDIR)/src/ MANSRC = $(TOPDIR)/doc/ SCRDIR = $(TOPDIR)/scripts/ +DATADIR = @datadir@ +LOCALEDIR = $(DATADIR)/locale CXX = @CC@ CXXFLAGS += @CFLAGS@ -g -Wall -pedantic -fno-exceptions \ - -D_GNU_SOURCE -DPACVER=\"$(PACVER)\" -I. -Ilibftp + -D_GNU_SOURCE -DPACVER=\"$(PACVER)\" -DLOCALEDIR=\"$(LOCALEDIR)\" -I. -Ilibftp LDFLAGS += @LDFLAGS@ -Llibftp -lftp -ltar -lz SRCS = $(SRCDIR)pacman.c \ - $(SRCDIR)db.c \ - $(SRCDIR)util.c \ - $(SRCDIR)list.c \ - $(SRCDIR)package.c \ - $(SRCDIR)pacsync.c \ - $(SRCDIR)md5.c \ - $(SRCDIR)md5driver.c \ - $(SRCDIR)strhash.c \ - $(SRCDIR)vercmp.c \ - $(SRCDIR)rpmvercmp.c + $(SRCDIR)db.c \ + $(SRCDIR)util.c \ + $(SRCDIR)list.c \ + $(SRCDIR)package.c \ + $(SRCDIR)pacsync.c \ + $(SRCDIR)md5.c \ + $(SRCDIR)md5driver.c \ + $(SRCDIR)strhash.c \ + $(SRCDIR)vercmp.c \ + $(SRCDIR)rpmvercmp.c \ + $(SRCDIR)i18n.c + OBJECTS = $(OBJDIR)pacman.o \ - $(OBJDIR)db.o \ - $(OBJDIR)util.o \ - $(OBJDIR)list.o \ - $(OBJDIR)package.o \ - $(OBJDIR)pacsync.o \ - $(OBJDIR)md5.o \ - $(OBJDIR)md5driver.o \ - $(OBJDIR)strhash.o \ - $(OBJDIR)rpmvercmp.o + $(OBJDIR)db.o \ + $(OBJDIR)util.o \ + $(OBJDIR)list.o \ + $(OBJDIR)package.o \ + $(OBJDIR)pacsync.o \ + $(OBJDIR)md5.o \ + $(OBJDIR)md5driver.o \ + $(OBJDIR)strhash.o \ + $(OBJDIR)rpmvercmp.o \ + $(OBJDIR)i18n.o + +PO_LINGUAS = cz de es nl pt_BR pt_PT ru sv + +MAN_LINGUAS = pl pt_BR zh_CN all: libftp.a pacman vercmp convertdb man @@ -79,8 +88,8 @@ pacman: $(OBJECTS) libftp.a vercmp: $(OBJDIR)vercmp.o $(OBJDIR)rpmvercmp.o $(CXX) $(OBJDIR)vercmp.o $(OBJDIR)rpmvercmp.o $(CXXFLAGS) -o $@ -convertdb: $(OBJDIR)convertdb.o $(OBJDIR)list.o $(OBJDIR)util.o - $(CXX) $(OBJDIR)convertdb.o $(OBJDIR)list.o $(OBJDIR)util.o $(LDFLAGS) -o $@ +convertdb: $(OBJDIR)convertdb.o $(OBJDIR)list.o $(OBJDIR)util.o $(OBJDIR)i18n.o + $(CXX) $(OBJDIR)convertdb.o $(OBJDIR)list.o $(OBJDIR)util.o $(OBJDIR)i18n.o $(LDFLAGS) -o $@ .c.o: $(SRCS) $(CXX) $(CXXFLAGS) -o $@ -c $< @@ -108,8 +117,18 @@ install: pacman vercmp convertdb man $(INSTALL) -D -m0755 $(SCRDIR)updatesync $(DESTDIR)$(BINDIR)/updatesync $(INSTALL) -D -m0644 $(MANSRC)pacman.8 $(DESTDIR)$(MANDIR)/man8/pacman.8 $(INSTALL) -D -m0644 $(MANSRC)makepkg.8 $(DESTDIR)$(MANDIR)/man8/makepkg.8 + + for i in $(MAN_LINGUAS) ; do \ + $(INSTALL) -D -m0644 $(MANSRC)$$i/pacman.8 $(DESTDIR)$(MANDIR)/$$i/man8/pacman.8 ; \ + $(INSTALL) -D -m0644 $(MANSRC)$$i/makepkg.8 $(DESTDIR)$(MANDIR)/$$i/man8/makepkg.8 ; \ + done + $(INSTALL) -D -m0644 etc/pacman.conf $(DESTDIR)/etc/pacman.conf $(INSTALL) -D -m0644 etc/makepkg.conf $(DESTDIR)/etc/makepkg.conf + + for i in $(PO_LINGUAS) ; do \ + $(INSTALL) -D -m0644 po/$$i.mo $(DESTDIR)$(LOCALEDIR)/$$i/LC_MESSAGES/pacman.mo ; \ + done clean: rm -f *~ $(OBJDIR)*.o $(MANSRC)*.8 diff -Nurp pacman-2.9.5/po/ChangeLog pacman-i18n-0.1.1/po/ChangeLog --- pacman-2.9.5/po/ChangeLog 1970-01-01 01:00:00.000000000 +0100 +++ pacman-i18n-0.1.1/po/ChangeLog 2005-01-21 14:07:46.000000000 +0000 @@ -0,0 +1,106 @@ +Matthias-Christian Ott @ Fr Jan 21 15:07:21 CET 2005 + [RELEASE]: 0.1.6 + +Matthias-Christian Ott @ Fr Jan 21 15:03:37 CET 2005 + [GERMAN]: Update to 2.9.5 + + - Updated the German Translation (Pacman 2.9.5) + +Gan Lu @ Do Dez 30 12:15:57 CET 2004 + [CHINESE (SIMPLIFIED)]: Translation + + - Added Chinese (simplified) Translation + +Benoit Fay @ Do Dez 30 11:44:24 CET 2004 + [FRENCH]: Translation + + - Added French Translation + +Yonathan Dossow @ We Dez 29 13:39:07 CET 2004 + [SPANISH]: Translation + + - [S/n] now work ... restoring + +Joao Estevao @ Mi Dez 29 22:20:37 CET 2004 + [PORTUGUESE]: Bug Fix in "pt_PT" + + - Fixed some Expressions + +Matthias-Christian Ott @ Mi Dez 29 22:25:46 CET 2004 + [SPANISH]: Y/n to S/n Fix + + - Restored Version 1.4 of es.po, because S/n is working now (Yonathan was faster with updating) + +Yonathan Dossow @ We Dez 29 00:51:07 CET 2004 + [SPANISH]: Translation + + - Fixed bad strings + - go back [Y/n], [S/n] no work + +Yonathan Dossow @ Mo Dez 27 20:43:45 CET 2004 + [SPANISH]: Translation + + - Fixed some \n :S + +Matthias-Christian Ott @ So Dez 26 10:18:36 CET 2004 + [RELEASE]: 0.1.5 + +Joao Estevao @ So Dec 26 10:00:23 CET 2004 + [PORTUGUESE]: Bug Fix in "pt_PT" + + - Fixed some Expressions + +Matthias-Christian Ott @ Sa Dez 25 18:11:38 CET 2004 + [RELEASE]: 0.1.4 + +Yonathan Dossow @ Sa Dez 25 18:10:36 CET 2004 + [SPANISH]: Translation + + - Added Spanish Translation + +Vladimir Marteev @ Sa Dez 25 18:09:37 CET 2004 + [RUSSIAN]: Translation + + - Added Russian Translation + +Matthias-Christian Ott @ Do Dez 23 22:38:05 CET 2004 + [RELEASE]: 0.1.3 + +Matthias-Christian Ott @ Do Dez 23 22:38:05 CET 2004 + [GERMAN]: Full Rewrite + + - Rewrote German Translation + +Niklas Paro @ Do Dez 23 22:36:27 CET 2004 + [SWEDISH]: Bugfix + + - Fixed some Expressions + +Joao Estevao & Armando M. Baratti @ Do Dez 23 22:32:30 CET 2004 + [PORTUGUESE]: pt_PT & pt_BR Translation + + - Added Portuguese Translations + +Matthias-Christian Ott @ Mo Dez 20 21:49:55 CET 2004 + [RELEASE]: 0.1.2 + +Redshift @ Mo Dez 20 21:49:55 CET 2004 + [DUTCH]: Translation + + - Added Dutch Translation + +Matthias-Christian Ott @ Do Dez 16 14:40:36 CET 2004 + [RELEASE]: 0.1.1 + +Matthias-Christian Ott @ Do Dez 16 14:40:36 CET 2004 + [FIX]: New URI + + - Added new URI + +Lukas Konarovsky @ Do Dez 16 14:40:36 CET 2004 + [CZECH]: Translation + + - Added czech Translation + +Matthias-Christian Ott + [RELEASE]: 0.1 diff -Nurp pacman-2.9.5/po/template/ChangeLog pacman-i18n-0.1.1/po/template/ChangeLog --- pacman-2.9.5/po/template/ChangeLog 1970-01-01 01:00:00.000000000 +0100 +++ pacman-i18n-0.1.1/po/template/ChangeLog 2004-12-24 13:07:49.000000000 +0000 @@ -0,0 +1,18 @@ +Matthias-Christian Ott @ Di Dez 21 15:32:11 CET 2004 + [RELEASE]: 0.1.2 + +Matthias-Christian Ott @ Di Dez 21 15:32:11 CET 2004 + [PACMAN]: Pacman 2.9.4 released + + - Recreation of the template + +Matthias-Christian Ott @ Do Dez 16 14:40:36 CET 2004 + [RELEASE]: 0.1.1 + +Matthias-Christian Ott @ Do Dez 16 14:40:36 CET 2004 + [FIX]: New URI + + - Added new URI + +Matthias-Christian Ott + [RELEASE]: 0.1 diff -Nurp pacman-2.9.5/po/template/CVS/Entries pacman-i18n-0.1.1/po/template/CVS/Entries --- pacman-2.9.5/po/template/CVS/Entries 1970-01-01 01:00:00.000000000 +0100 +++ pacman-i18n-0.1.1/po/template/CVS/Entries 2004-12-24 14:43:12.000000000 +0000 @@ -0,0 +1,3 @@ +/ChangeLog/1.2/Fri Dec 24 13:07:49 2004// +/po.pot/1.2/Fri Dec 24 13:07:49 2004// +D diff -Nurp pacman-2.9.5/po/template/CVS/Repository pacman-i18n-0.1.1/po/template/CVS/Repository --- pacman-2.9.5/po/template/CVS/Repository 1970-01-01 01:00:00.000000000 +0100 +++ pacman-i18n-0.1.1/po/template/CVS/Repository 2004-12-24 13:19:37.000000000 +0000 @@ -0,0 +1 @@ +pacman-i18n/po/template diff -Nurp pacman-2.9.5/po/template/CVS/Root pacman-i18n-0.1.1/po/template/CVS/Root --- pacman-2.9.5/po/template/CVS/Root 1970-01-01 01:00:00.000000000 +0100 +++ pacman-i18n-0.1.1/po/template/CVS/Root 2004-12-24 13:19:37.000000000 +0000 @@ -0,0 +1 @@ +matott@cvs.berlios.de:/cvsroot/arch-i18n diff -Nurp pacman-2.9.5/po/template/po.pot pacman-i18n-0.1.1/po/template/po.pot --- pacman-2.9.5/po/template/po.pot 1970-01-01 01:00:00.000000000 +0100 +++ pacman-i18n-0.1.1/po/template/po.pot 2004-12-24 13:07:49.000000000 +0000 @@ -0,0 +1,1560 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2004 Matthias-Christian Ott +# This file is distributed under the same license as the PACKAGE package. +# Matthias-Christian Ott , 2004 +# + +msgid "" +msgstr "" +"Project-Id-Version: pacman 2.9.4\n\n" +"Report-Msgid-Bugs-To: http://developer.berlios.de/bugs/?group_id=2716\n" +"POT-Creation-Date: 2004-12-02 16:08+0100\n" +"PO-Revision-Date: 2004-12-21 14:48+0100\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Arch Linux Translation Team \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/convertdb.c:54 +#, c-format +msgid "converts a pacman 1.x database to a pacman 2.0 format\n" +msgstr "" + +#: src/convertdb.c:55 +#, c-format +msgid "" +"usage: %s \n" +"\n" +msgstr "" + + +#: src/convertdb.c:56 +#, c-format +msgid "" +"convertdb will convert all package data from /var/lib/pacman/pacman.db\n" +msgstr "" + + +#: src/convertdb.c:57 +#, c-format +msgid "" +"to a 2.0 format and place it in target_dir.\n" +"\n" +msgstr "" + + +#: src/convertdb.c:78 +#, c-format +msgid "converting %s\n" +msgstr "" + +#: src/db.c:281 db.c:406 +#, c-format +msgid "error: %s: %s\n" +msgstr "" + +#: src/db.c:433 +#, c-format +msgid "db_read: error: %s: %s\n" +msgstr "" + +#: src/db.c:735 +#, c-format +msgid "%s: exists in \"%s\" (target) and \"%s\" (target)" +msgstr "" + +#: src/db.c:796 +#, c-format +msgid "%s: %s: exists in filesystem" +msgstr "" + +#: src/list.c:305 +#, c-format +msgid "None\n" +msgstr "" + +#: src/md5driver.c:45 +#, c-format +msgid "%s can't be opened\n" +msgstr "" + +#: src/package.c:53 pacman.c:1774 +msgid "could not open package" +msgstr "" + +#: src/package.c:74 +#, c-format +msgid "load_pkg: missing package name in %s.\n" +msgstr "" + +#: src/package.c:79 +#, c-format +msgid "load_pkg: missing package version in %s.\n" +msgstr "" + +#: src/package.c:115 +#, c-format +msgid "warning: could not remove tempfile %s\n" +msgstr "" + +#: src/package.c:132 +#, c-format +msgid "bad package file in %s" +msgstr "" + +#: src/package.c:142 +#, c-format +msgid "load_pkg: missing package info file in %s\n" +msgstr "" + +#: src/package.c:182 package.c:223 +#, c-format +msgid "%s: syntax error in description file line %d\n" +msgstr "" + +#: src/package.c:183 package.c:224 +msgid "error" +msgstr "" + +#: src/package.c:332 +#, c-format +msgid "Name : %s\n" +msgstr "" + +#: src/package.c:333 +#, c-format +msgid "Version : %s\n" +msgstr "" + +#: src/package.c:335 +msgid "Groups :" +msgstr "" + +#: src/package.c:337 +#, c-format +msgid "Packager : %s\n" +msgstr "" + +#: src/package.c:338 +#, c-format +msgid "URL : %s\n" +msgstr "" + +#: src/package.c:339 +#, c-format +msgid "License : %s\n" +msgstr "" + +#: src/package.c:340 +#, c-format +msgid "Architecture : %s\n" +msgstr "" + +#: src/package.c:341 +#, c-format +msgid "Size : %ld\n" +msgstr "" + +#: src/package.c:342 +#, c-format +msgid "Build Date : %s %s\n" +msgstr "" + +#: src/package.c:343 +#, c-format +msgid "Install Date : %s %s\n" +msgstr "" + +#: src/package.c:344 +#, c-format +msgid "Install Script : %s\n" +msgstr "" + +#: src/package.c:344 +msgid "Yes" +msgstr "" + +#: src/package.c:344 +msgid "No" +msgstr "" + +#: src/package.c:345 +#, c-format +msgid "Reason: : " +msgstr "" + +#: src/package.c:347 +#, c-format +msgid "explicitly installed\n" +msgstr "" + +#: src/package.c:348 +#, c-format +msgid "installed as a dependency for another package\n" +msgstr "" + +#: src/package.c:349 +#, c-format +msgid "unknown\n" +msgstr "" + +#: src/package.c:352 +msgid "Provides :" +msgstr "" + +#: src/package.c:355 +msgid "Depends On :" +msgstr "" + +#: src/package.c:358 +msgid "Required By :" +msgstr "" + +#: src/package.c:361 +msgid "Conflicts With :" +msgstr "" + +#: src/package.c:363 +#, c-format +msgid "Description : " +msgstr "" + +#: src/package.c:378 +#, c-format +msgid "Name : %s\n" +msgstr "" + +#: src/package.c:379 +#, c-format +msgid "Version : %s\n" +msgstr "" + +#: src/package.c:381 +msgid "Groups :" +msgstr "" + +#: src/package.c:384 +msgid "Provides :" +msgstr "" + +#: src/package.c:387 +msgid "Depends On :" +msgstr "" + +#: src/package.c:390 +msgid "Conflicts With :" +msgstr "" + +#: src/package.c:393 +msgid "Replaces :" +msgstr "" + +#: src/package.c:395 +#, c-format +msgid "Size (compressed) : %ld\n" +msgstr "" + +#: src/package.c:396 +#, c-format +msgid "Description : " +msgstr "" + +#: src/package.c:398 +#, c-format +msgid "" +"\n" +"MD5 Sum : %s\n" +msgstr "" + +#: src/pacman.c:166 +#, c-format +msgid "error: you cannot perform this operation unless you are root.\n" +msgstr "" + +#: src/pacman.c:172 +#, c-format +msgid "error: unable to lock pacman database.\n" +msgstr "" + +#: src/pacman.c:173 +#, c-format +msgid " if you're sure pacman is not already running, you\n" +msgstr "" + +#: src/pacman.c:174 +#, c-format +msgid " can remove %s\n" +msgstr "" + +#: src/pacman.c:196 +msgid "warning: cannot open logfile" +msgstr "" + +#: src/pacman.c:210 +#, c-format +msgid "Installation Root: %s\n" +msgstr "" + +#: src/pacman.c:212 +#, c-format +msgid "Top-level DB Path: %s%s\n" +msgstr "" + +#: src/pacman.c:214 +msgid "Targets:" +msgstr "" + +#: src/pacman.c:223 +#, c-format +msgid "initializing database %s...\n" +msgstr "" + +#: src/pacman.c:227 +#, c-format +msgid "error: could not create database.\n" +msgstr "" + +#: src/pacman.c:231 +#, c-format +msgid "error: could not open database.\n" +msgstr "" + +#: src/pacman.c:248 +#, c-format +msgid "" +"error: no operation specified (use -h for help)\n" +"\n" +msgstr "" + +#: src/pacman.c:295 +#, c-format +msgid "conflict: %s\n" +msgstr "" + +#: src/pacman.c:299 +#, c-format +msgid "requires: %s" +msgstr "" + +#: src/pacman.c:337 +#, c-format +msgid "error: no usable package repositories configured.\n" +msgstr "" + +#: src/pacman.c:353 +#, c-format +msgid "removing old packages from cache... " +msgstr "" + +#: src/pacman.c:356 +#, c-format +msgid "error: could not access cache directory\n" +msgstr "" + +#: src/pacman.c:427 +#, c-format +msgid "removing all packages from cache... " +msgstr "" + +#: src/pacman.c:429 +#, c-format +msgid "error: could not remove cache directory: %s\n" +msgstr "" + +#: src/pacman.c:435 +#, c-format +msgid "error: could not create new cache directory: %s\n" +msgstr "" + +#: src/pacman.c:440 pacman.c:1283 pacman.c:1564 pacman.c:1700 pacman.c:2002 +#: src/pacman.c:2037 pacman.c:2305 +#, c-format +msgid "done.\n" +msgstr "" + +#: src/pacman.c:446 +#, c-format +msgid ":: Synchronizing package databases... \n" +msgstr "" + +#: src/pacman.c:447 +msgid "synchronizing package lists" +msgstr "" + +#: src/pacman.c:459 +#, c-format +msgid "error: could not open sync database: %s\n" +msgstr "" + +#: src/pacman.c:460 +#, c-format +msgid " have you used --refresh yet?\n" +msgstr "" + +#: src/pacman.c:534 pacman.c:813 pacman.c:2099 +msgid " " +msgstr "" + +#: src/pacman.c:574 pacman.c:2466 pacman.c:2514 pacman.c:2523 +#, c-format +msgid "Package \"%s\" was not found.\n" +msgstr "" + +#: src/pacman.c:605 +#, c-format +msgid "Repository \"%s\" was not found.\n" +msgstr "" + +#: src/pacman.c:616 +msgid "starting full system upgrade" +msgstr "" + +#: src/pacman.c:628 +#, c-format +msgid ":: %s-%s: ignoring package upgrade (to be replaced by %s-%s)\n" +msgstr "" + +#: src/pacman.c:631 +#, c-format +msgid ":: Replace %s with %s from \"%s\"? [Y/n] " +msgstr "" + +#: src/pacman.c:694 +#, c-format +msgid ":: %s: local version (%s) is newer than repo version (%s)\n" +msgstr "" + +#: src/pacman.c:705 +#, c-format +msgid ":: %s-%s: ignoring package upgrade (%s)\n" +msgstr "" + +#: src/pacman.c:729 +#, c-format +msgid "" +":: Above packages will be skipped. To manually upgrade use 'pacman -S " +"'\n" +msgstr "" + +#: src/pacman.c:739 +#, c-format +msgid "" +"\n" +":: pacman has detected a newer version of the \"pacman\" package.\n" +msgstr "" + +#: src/pacman.c:740 +#, c-format +msgid ":: It is recommended that you allow pacman to upgrade itself\n" +msgstr "" + +#: src/pacman.c:741 +#, c-format +msgid ":: first, then you can re-run the operation with the newer version.\n" +msgstr "" + +#: src/pacman.c:743 +msgid ":: Upgrade pacman first? [Y/n] " +msgstr "" + +#: src/pacman.c:812 pacman.c:2098 +#, c-format +msgid ":: group %s:\n" +msgstr "" + +#: src/pacman.c:814 +msgid " Install whole content? [Y/n] " +msgstr "" + +#: src/pacman.c:820 +#, c-format +msgid ":: Install %s from group %s? [Y/n] " +msgstr "" + +#: src/pacman.c:827 +#, c-format +msgid "%s: not found in sync db\n" +msgstr "" + +#: src/pacman.c:831 +#, c-format +msgid "%s: not present in \"%s\" repository\n" +msgstr "" + +#: src/pacman.c:844 +#, c-format +msgid ":: %s-%s: local version is newer. Upgrade anyway? [Y/n] " +msgstr "" + +#: src/pacman.c:853 +#, c-format +msgid ":: %s-%s: is up to date. Upgrade anyway? [Y/n] " +msgstr "" + +#: src/pacman.c:896 +#, c-format +msgid "error: unresolvable dependencies:\n" +msgstr "" + +#: src/pacman.c:899 pacman.c:1586 +#, c-format +msgid " %s: requires %s" +msgstr "" + +#: src/pacman.c:906 +#, c-format +msgid " but it is not in the sync db\n" +msgstr "" + +#: src/pacman.c:1001 pacman.c:1608 +#, c-format +msgid ":: %s conflicts with %s. Remove %s? [Y/n] " +msgstr "" + +#: src/pacman.c:1007 pacman.c:1614 +#, c-format +msgid "" +"\n" +"error: package conflicts detected\n" +msgstr "" + +#: src/pacman.c:1012 pacman.c:1619 +#, c-format +msgid "" +"\n" +"error: %s conflicts with %s\n" +msgstr "" + +#: src/pacman.c:1082 +#, c-format +msgid "" +"\n" +"Remove: " +msgstr "" + +#: src/pacman.c:1104 +#, c-format +msgid "" +"\n" +"Targets: " +msgstr "" + +#: src/pacman.c:1107 +#, c-format +msgid "" +"\n" +"\n" +"Total Package Size: %.1f MB\n" +msgstr "" + +#: src/pacman.c:1117 +#, c-format +msgid "" +"\n" +"Beginning download...\n" +msgstr "" + +#: src/pacman.c:1120 +msgid "" +"\n" +"Proceed with download? [Y/n] " +msgstr "" + +#: src/pacman.c:1128 +#, c-format +msgid "" +"\n" +"Beginning upgrade process...\n" +msgstr "" + +#: src/pacman.c:1131 +msgid "" +"\n" +"Proceed with upgrade? [Y/n] " +msgstr "" + +#: src/pacman.c:1178 +#, c-format +msgid " %s-%s%s is already in the cache\n" +msgstr "" + +#: src/pacman.c:1200 +#, c-format +msgid "" +"\n" +":: Retrieving packages from %s...\n" +msgstr "" + +#: src/pacman.c:1206 +#, c-format +msgid "warning: no %s cache exists. creating..." +msgstr "" + +#: src/pacman.c:1212 +msgid "warning: couldn't create package cache, using /tmp instead" +msgstr "" + +#: src/pacman.c:1219 +#, c-format +msgid "error: failed to retrieve some files from %s\n" +msgstr "" + +#: src/pacman.c:1241 +#, c-format +msgid "checking package integrity... " +msgstr "" + +#: src/pacman.c:1257 +#, c-format +msgid "error: can't get md5 checksum for package %s\n" +msgstr "" + +#: src/pacman.c:1267 +#, c-format +msgid "error: can't get md5 checksum for archive %s\n" +msgstr "" + +#: src/pacman.c:1276 +#, c-format +msgid "error: archive %s is corrupted\n" +msgstr "" + +#: src/pacman.c:1300 +msgid "checking dependencies of packages designated for removal...\n" +msgstr "" + +#: src/pacman.c:1307 pacman.c:2152 +#, c-format +msgid "error: this will break the following dependencies:\n" +msgstr "" + +#: src/pacman.c:1310 pacman.c:2155 +#, c-format +msgid " %s: is required by %s\n" +msgstr "" + +#: src/pacman.c:1329 pacman.c:1747 +#, c-format +msgid "" +"\n" +"upgrade aborted.\n" +msgstr "" + +#: src/pacman.c:1361 +#, c-format +msgid "package removal failed. aborting...\n" +msgstr "" + +#: src/pacman.c:1504 +#, c-format +msgid "error: failed to download %s\n" +msgstr "" + +#: src/pacman.c:1520 +#, c-format +msgid "loading package data... " +msgstr "" + +#: src/pacman.c:1524 +#, c-format +msgid "reading %s... " +msgstr "" + +#: src/pacman.c:1531 +#, c-format +msgid "" +"\n" +"error: package \"%s\" has more than one hyphen in its version (%s)\n" +msgstr "" + +#: src/pacman.c:1539 +msgid "not installed or lesser version\n" +msgstr "" + +#: src/pacman.c:1552 +msgid "replacing older version in target list. " +msgstr "" + +#: src/pacman.c:1560 +msgid "done\n" +msgstr "" + +#: src/pacman.c:1575 pacman.c:2136 +msgid "checking dependencies...\n" +msgstr "" + +#: src/pacman.c:1583 +#, c-format +msgid "error: unsatisfied dependencies:\n" +msgstr "" + +#: src/pacman.c:1655 +#, c-format +msgid "" +"\n" +"%s aborted.\n" +msgstr "" + +#: src/pacman.c:1655 pacman.c:3346 +msgid "upgrade" +msgstr "" + +#: src/pacman.c:1655 +msgid "install" +msgstr "" + +#: src/pacman.c:1672 +msgid "sorting by dependencies\n" +msgstr "" + +#: src/pacman.c:1687 +#, c-format +msgid "checking for file conflicts... " +msgstr "" + +#: src/pacman.c:1691 +#, c-format +msgid "" +"\n" +"error: the following file conflicts were found:\n" +msgstr "" + +#: src/pacman.c:1693 +#, c-format +msgid " %s\n" +msgstr "" + +#: src/pacman.c:1697 +#, c-format +msgid "" +"\n" +"errors occurred, no packages were upgraded.\n" +msgstr "" + +#: src/pacman.c:1719 +#, c-format +msgid "error: %s is already installed. (try --upgrade)\n" +msgstr "" + +#: src/pacman.c:1728 +#, c-format +msgid "upgrading %s... " +msgstr "" + +#: src/pacman.c:1743 +msgid "removing old package first...\n" +msgstr "" + +#: src/pacman.c:1763 +#, c-format +msgid "installing %s... " +msgstr "" + +#: src/pacman.c:1777 +msgid "extracting files...\n" +msgstr "" + +#: src/pacman.c:1825 pacman.c:1933 +#, c-format +msgid "could not extract %s: %s" +msgstr "" + +#: src/pacman.c:1846 +#, c-format +msgid "checking md5 hashes for %s\n" +msgstr "" + +#: src/pacman.c:1847 +#, c-format +msgid " current: %s\n" +msgstr "" + +#: src/pacman.c:1848 +#, c-format +msgid " new: %s\n" +msgstr "" + +#: src/pacman.c:1850 +#, c-format +msgid " original: %s\n" +msgstr "" + +#: src/pacman.c:1862 pacman.c:1895 +#, c-format +msgid "error: could not rename %s: %s" +msgstr "" + +#: src/pacman.c:1865 +#, c-format +msgid "error: could not copy %s to %s: %s" +msgstr "" + +#: src/pacman.c:1868 pacman.c:1897 pacman.c:2224 +#, c-format +msgid "warning: %s saved as %s" +msgstr "" + +#: src/pacman.c:1878 pacman.c:1881 pacman.c:1887 +msgid " action: installing new file\n" +msgstr "" + +#: src/pacman.c:1885 +msgid " action: leaving existing file in place\n" +msgstr "" + +#: src/pacman.c:1891 +msgid " action: saving current file and installing new one\n" +msgstr "" + +#: src/pacman.c:1904 +#, c-format +msgid "error: could not copy %s to %s: %s\n" +msgstr "" + +#: src/pacman.c:1919 +#, c-format +msgid "%s is in NoUpgrade - skipping\n" +msgstr "" + +#: src/pacman.c:1921 +#, c-format +msgid "warning: extracting %s%s as %s" +msgstr "" + +#: src/pacman.c:1957 +#, c-format +msgid "errors occurred while %s %s" +msgstr "" + +#: src/pacman.c:1958 +msgid "upgrading" +msgstr "" + +#: src/pacman.c:1958 +msgid "installing" +msgstr "" + +#: src/pacman.c:1988 +msgid "Updating database..." +msgstr "" + +#: src/pacman.c:1999 +#, c-format +msgid "error updating database for %s!" +msgstr "" + +#: src/pacman.c:2004 +#, c-format +msgid "upgraded %s (%s -> %s)" +msgstr "" + +#: src/pacman.c:2007 +#, c-format +msgid "installed %s (%s)" +msgstr "" + +#: src/pacman.c:2065 pacman.c:2319 +#, c-format +msgid "running \"%s\"\n" +msgstr "" + +#: src/pacman.c:2100 +msgid " Remove whole content? [Y/n] " +msgstr "" + +#: src/pacman.c:2107 +#, c-format +msgid ":: Remove %s from group %s? [Y/n] " +msgstr "" + +#: src/pacman.c:2118 +#, c-format +msgid "error: could not find %s in database\n" +msgstr "" + +#: src/pacman.c:2126 +#, c-format +msgid ":: %s is designated as a HoldPkg. Remove anyway? [Y/n] " +msgstr "" + +#: src/pacman.c:2164 +msgid "finding removable dependencies...\n" +msgstr "" + +#: src/pacman.c:2170 +msgid "" +"\n" +"Targets:" +msgstr "" + +#: src/pacman.c:2172 +msgid "" +"\n" +"Do you want to remove these packages? [Y/n] " +msgstr "" + +#: src/pacman.c:2183 +#, c-format +msgid "removing %s... " +msgstr "" + +#: src/pacman.c:2206 +#, c-format +msgid "file %s does not exist\n" +msgstr "" + +#: src/pacman.c:2228 pacman.c:2235 +msgid "cannot remove file" +msgstr "" + +#: src/pacman.c:2306 +#, c-format +msgid "removed %s (%s)" +msgstr "" + +#: src/pacman.c:2364 +#, c-format +msgid "Group \"%s\" was not found.\n" +msgstr "" + +#: src/pacman.c:2381 +#, c-format +msgid "error: no package file was specified for --file\n" +msgstr "" + +#: src/pacman.c:2386 +#, c-format +msgid "error: %s is not a package\n" +msgstr "" + +#: src/pacman.c:2409 +#, c-format +msgid "error: no file was specified for --owns\n" +msgstr "" + +#: src/pacman.c:2419 +#, c-format +msgid "%s is owned by %s %s\n" +msgstr "" + +#: src/pacman.c:2426 +#, c-format +msgid "No package owns %s\n" +msgstr "" + +#: src/pacman.c:2430 +#, c-format +msgid "error: %s is not a file.\n" +msgstr "" + +#: src/pacman.c:2490 +#, c-format +msgid "error calculating md5sum for %s\n" +msgstr "" + +#: src/pacman.c:2494 +#, c-format +msgid "MODIFIED\t%s\n" +msgstr "" + +#: src/pacman.c:2496 +#, c-format +msgid "NOT MODIFIED\t%s\n" +msgstr "" + +#: src/pacman.c:2499 +#, c-format +msgid "MISSING\t\t%s\n" +msgstr "" + +#: src/pacman.c:2570 +msgid "warning: possible dependency cycle detected\n" +msgstr "" + +#: src/pacman.c:2646 +#, c-format +msgid "warning: cannot find package \"%s\" or anything that provides it!\n" +msgstr "" + +#: src/pacman.c:2651 +#, c-format +msgid "dep is NULL!\n" +msgstr "" + +#: src/pacman.c:2661 +#, c-format +msgid "excluding %s -- explicitly installed\n" +msgstr "" + +#: src/pacman.c:2747 +#, c-format +msgid "error: cannot resolve dependencies for \"%s\":\n" +msgstr "" + +#: src/pacman.c:2748 +#, c-format +msgid " \"%s\" is not in the package set\n" +msgstr "" + +#: src/pacman.c:2764 +#, c-format +msgid "resolving %s\n" +msgstr "" + +#: src/pacman.c:2789 +#, c-format +msgid "%s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] " +msgstr "" + +#: src/pacman.c:2797 +#, c-format +msgid "adding %s-%s\n" +msgstr "" + +#: src/pacman.c:2800 +#, c-format +msgid "error: cannot resolve dependencies for \"%s\"\n" +msgstr "" + +#: src/pacman.c:2805 +#, c-format +msgid "dependency cycle detected: %s\n" +msgstr "" + +#: src/pacman.c:3055 +#, c-format +msgid "warning: invalid dependency in %s" +msgstr "" + +#: src/pacman.c:3122 +#, c-format +msgid "data error: %s supposedly provides %s, but it was not found in db\n" +msgstr "" + +#: src/pacman.c:3282 +msgid "error creating temp directory" +msgstr "" + +#: src/pacman.c:3298 pacman.c:3320 +#, c-format +msgid "warning: could not remove tmpdir %s\n" +msgstr "" + +#: src/pacman.c:3308 +#, c-format +msgid "Executing %s script...\n" +msgstr "" + +#: src/pacman.c:3310 +#, c-format +msgid "echo \"umask 0022; source %s %s %s %s\" | chroot %s /bin/sh" +msgstr "" + +#: src/pacman.c:3313 +#, c-format +msgid "echo \"umask 0022; source %s %s %s\" | chroot %s /bin/sh" +msgstr "" + +#: src/pacman.c:3410 +msgid "bad root path" +msgstr "" + +#: src/pacman.c:3424 +#, c-format +msgid "" +"error: only one operation may be used at a time\n" +"\n" +msgstr "" + +#: src/pacman.c:3474 +#, c-format +msgid "config: new section '%s'\n" +msgstr "" + +#: src/pacman.c:3476 +#, c-format +msgid "config: line %d: bad section name\n" +msgstr "" + +#: src/pacman.c:3480 +#, c-format +msgid "" +"config: line %d: '%s' is reserved and cannot be used as a package tree\n" +msgstr "" + +#: src/pacman.c:3506 pacman.c:3525 pacman.c:3609 pacman.c:3668 +#, c-format +msgid "config: line %d: syntax error\n" +msgstr "" + +#: src/pacman.c:3512 +#, c-format +msgid "config: line %d: all directives must belong to a section\n" +msgstr "" + +#: src/pacman.c:3518 +msgid "config: nopassiveftp\n" +msgstr "" + +#: src/pacman.c:3521 +msgid "config: usesyslog\n" +msgstr "" + +#: src/pacman.c:3533 +#, c-format +msgid "config: including %s\n" +msgstr "" + +#: src/pacman.c:3542 pacman.c:3547 +#, c-format +msgid "config: noupgrade: %s\n" +msgstr "" + +#: src/pacman.c:3554 pacman.c:3559 +#, c-format +msgid "config: ignorepkg: %s\n" +msgstr "" + +#: src/pacman.c:3566 pacman.c:3571 +#, c-format +msgid "config: holdpkg: %s\n" +msgstr "" + +#: src/pacman.c:3578 +#, c-format +msgid "config: dbpath: %s\n" +msgstr "" + +#: src/pacman.c:3584 +#, c-format +msgid "config: log file: %s\n" +msgstr "" + +#: src/pacman.c:3588 +#, c-format +msgid "config: xfercommand: %s\n" +msgstr "" + +#: src/pacman.c:3598 pacman.c:3624 pacman.c:3630 +#, c-format +msgid "config: line %d: bad server location\n" +msgstr "" + +#: src/pacman.c:3604 +#, c-format +msgid "config: proxyserver: %s\n" +msgstr "" + +#: src/pacman.c:3607 +#, c-format +msgid "config: proxyport: %u\n" +msgstr "" + +#: src/pacman.c:3661 +#, c-format +msgid "config: line %d: protocol %s is not supported\n" +msgstr "" + +#: src/pacman.c:3665 +#, c-format +msgid "config: %s: server: %s %s %s\n" +msgstr "" + +#: src/pacman.c:3688 +#, c-format +msgid "usage: %s {-h --help}\n" +msgstr "" + +#: src/pacman.c:3689 +#, c-format +msgid " %s {-V --version}\n" +msgstr "" + +#: src/pacman.c:3690 +#, c-format +msgid " %s {-A --add} [options] \n" +msgstr "" + +#: src/pacman.c:3691 +#, c-format +msgid " %s {-R --remove} [options] \n" +msgstr "" + +#: src/pacman.c:3692 +#, c-format +msgid " %s {-U --upgrade} [options] \n" +msgstr "" + +#: src/pacman.c:3693 +#, c-format +msgid " %s {-F --freshen} [options] \n" +msgstr "" + +#: src/pacman.c:3694 +#, c-format +msgid " %s {-Q --query} [options] [package]\n" +msgstr "" + +#: src/pacman.c:3695 +#, c-format +msgid " %s {-S --sync} [options] [package]\n" +msgstr "" + +#: src/pacman.c:3696 +#, c-format +msgid "" +"\n" +"use '%s --help' with other options for more syntax\n" +"\n" +msgstr "" + +#: src/pacman.c:3699 +#, c-format +msgid "usage: %s {-A --add} [options] \n" +msgstr "" + +#: src/pacman.c:3700 pacman.c:3705 pacman.c:3717 pacman.c:3722 pacman.c:3734 +#, c-format +msgid "options:\n" +msgstr "" + +#: src/pacman.c:3701 pacman.c:3707 pacman.c:3718 pacman.c:3736 +#, c-format +msgid " -d, --nodeps skip dependency checks\n" +msgstr "" + +#: src/pacman.c:3702 pacman.c:3719 pacman.c:3737 +#, c-format +msgid " -f, --force force install, overwrite conflicting files\n" +msgstr "" + +#: src/pacman.c:3704 +#, c-format +msgid "usage: %s {-R --remove} [options] \n" +msgstr "" + +#: src/pacman.c:3706 +#, c-format +msgid "" +" -c, --cascade remove packages and all packages that depend on them\n" +msgstr "" + +#: src/pacman.c:3708 +#, c-format +msgid " -k, --dbonly only remove database entry, do not remove files\n" +msgstr "" + +#: src/pacman.c:3709 +#, c-format +msgid " -n, --nosave remove configuration files as well\n" +msgstr "" + +#: src/pacman.c:3710 +#, c-format +msgid "" +" -s, --recursive remove dependencies also (that won't break packages)\n" +msgstr "" + +#: src/pacman.c:3713 +#, c-format +msgid "usage: %s {-F --freshen} [options] \n" +msgstr "" + +#: src/pacman.c:3715 +#, c-format +msgid "usage: %s {-U --upgrade} [options] \n" +msgstr "" + +#: src/pacman.c:3721 +#, c-format +msgid "usage: %s {-Q --query} [options] [package]\n" +msgstr "" + +#: src/pacman.c:3723 +#, c-format +msgid "" +" -e, --orphans list all packages that were explicitly installed\n" +msgstr "" + +#: src/pacman.c:3724 +#, c-format +msgid " and are not required by any other packages\n" +msgstr "" + +#: src/pacman.c:3725 pacman.c:3738 +#, c-format +msgid " -g, --groups view all members of a package group\n" +msgstr "" + +#: src/pacman.c:3726 +#, c-format +msgid " -i, --info view package information (use -ii for more)\n" +msgstr "" + +#: src/pacman.c:3727 +#, c-format +msgid " -l, --list list the contents of the queried package\n" +msgstr "" + +#: src/pacman.c:3728 +#, c-format +msgid " -o, --owns query the package that owns \n" +msgstr "" + +#: src/pacman.c:3729 +#, c-format +msgid "" +" -p, --file pacman will query the package file [package] instead " +"of\n" +msgstr "" + +#: src/pacman.c:3730 +#, c-format +msgid " looking in the database\n" +msgstr "" + +#: src/pacman.c:3731 +#, c-format +msgid "" +" -s, --search search locally-installed packages for matching " +"strings\n" +msgstr "" + +#: src/pacman.c:3733 +#, c-format +msgid "usage: %s {-S --sync} [options] [package]\n" +msgstr "" + +#: src/pacman.c:3735 +#, c-format +msgid "" +" -c, --clean remove old packages from cache directory (use -cc for " +"all)\n" +msgstr "" + +#: src/pacman.c:3739 +#, c-format +msgid " -i, --info view package information\n" +msgstr "" + +#: src/pacman.c:3740 +#, c-format +msgid "" +" -l, --list list all packages belonging to the specified " +"repository\n" +msgstr "" + +#: src/pacman.c:3741 +#, c-format +msgid "" +" -p, --print-uris print out download URIs for each package to be " +"installed\n" +msgstr "" + +#: src/pacman.c:3742 +#, c-format +msgid " -s, --search search remote repositories for matching strings\n" +msgstr "" + +#: src/pacman.c:3743 +#, c-format +msgid " -u, --sysupgrade upgrade all packages that are out of date\n" +msgstr "" + +#: src/pacman.c:3744 +#, c-format +msgid "" +" -w, --downloadonly download packages but do not install/upgrade anything\n" +msgstr "" + +#: src/pacman.c:3745 +#, c-format +msgid "" +" -y, --refresh download fresh package databases from the server\n" +msgstr "" + +#: src/pacman.c:3746 +#, c-format +msgid "" +" --ignore ignore a package upgrade (can be used more than once)\n" +msgstr "" + +#: src/pacman.c:3748 +#, c-format +msgid " --config set an alternate configuration file\n" +msgstr "" + +#: src/pacman.c:3749 +#, c-format +msgid " --noconfirm do not ask for any confirmation\n" +msgstr "" + +#: src/pacman.c:3750 +#, c-format +msgid " -v, --verbose be verbose\n" +msgstr "" + +#: src/pacman.c:3751 +#, c-format +msgid " -r, --root set an alternate installation root\n" +msgstr "" + +#: src/pacman.c:3752 +#, c-format +msgid " -b, --dbpath set an alternate database location\n" +msgstr "" + +#: src/pacman.c:3838 +msgid "Y" +msgstr "" + +#: src/pacman.c:3838 +msgid "YES" +msgstr "" + +#: src/pacman.c:3869 +#, c-format +msgid "warning: could not remove lock file %s" +msgstr "" + +#: src/pacsync.c:84 +#, c-format +msgid "failed to get lastupdate time for %s (no big deal)\n" +msgstr "" + +#: src/pacsync.c:95 +#, c-format +msgid "pacsync: new mtime for %s: %s\n" +msgstr "" + +#: src/pacsync.c:98 +#, c-format +msgid "failed to synchronize %s\n" +msgstr "" + +#: src/pacsync.c:101 +#, c-format +msgid ":: %s is up to date\n" +msgstr "" + +#: src/pacsync.c:108 +#, c-format +msgid "removing %s (if it exists)\n" +msgstr "" + +#: src/pacsync.c:117 +#, c-format +msgid "unpacking %s...\n" +msgstr "" + +#: src/pacsync.c:183 +#, c-format +msgid "connecting to %s:21\n" +msgstr "" + +#: src/pacsync.c:185 pacsync.c:216 pacsync.c:386 +#, c-format +msgid "error: cannot connect to %s\n" +msgstr "" + +#: src/pacsync.c:189 +#, c-format +msgid "error: anonymous login failed\n" +msgstr "" + +#: src/pacsync.c:194 +#, c-format +msgid "error: could not cwd to %s: %s\n" +msgstr "" + +#: src/pacsync.c:200 +#, c-format +msgid "warning: failed to set passive mode\n" +msgstr "" + +#: src/pacsync.c:203 +msgid "FTP passive mode not set\n" +msgstr "" + +#: src/pacsync.c:211 pacsync.c:381 +#, c-format +msgid "connecting to %s\n" +msgstr "" + +#: src/pacsync.c:213 pacsync.c:383 +#, c-format +msgid "connecting to %s:%u\n" +msgstr "" + +#: src/pacsync.c:275 +#, c-format +msgid "error: could not chdir to %s\n" +msgstr "" + +#: src/pacsync.c:279 +#, c-format +msgid "running command: %s\n" +msgstr "" + +#: src/pacsync.c:282 +#, c-format +msgid "error running XferCommand: fork failed!\n" +msgstr "" + +#: src/pacsync.c:286 +#, c-format +msgid "XferCommand command returned non-zero status code (%d)\n" +msgstr "" + +#: src/pacsync.c:331 +#, c-format +msgid "warning: failed to get filesize for %s\n" +msgstr "" + +#: src/pacsync.c:337 +#, c-format +msgid "warning: failed to get mtime for %s\n" +msgstr "" + +#: src/pacsync.c:342 +#, c-format +msgid "mtimes are identical, skipping %s\n" +msgstr "" + +#: src/pacsync.c:356 +#, c-format +msgid "warning: failed to resume download -- restarting\n" +msgstr "" + +#: src/pacsync.c:363 pacsync.c:407 +#, c-format +msgid "" +"\n" +"failed downloading %s from %s: %s\n" +msgstr "" + +#: src/pacsync.c:416 +#, c-format +msgid "copying %s to %s/%s\n" +msgstr "" + +#: src/pacsync.c:419 +#, c-format +msgid "failed copying %s\n" +msgstr "" + +#: src/util.c:105 +#, c-format +msgid "bad tar archive: %s" +msgstr "" + +#: src/util.c:113 +#, c-format +msgid "could not extract %s: %s\n" +msgstr "" + +#: src/util.h:26 +#, c-format +msgid "malloc failure: could not allocate %d bytes\n" +msgstr "" diff -Nurp pacman-2.9.5/po/TRANSLATORS pacman-i18n-0.1.1/po/TRANSLATORS --- pacman-2.9.5/po/TRANSLATORS 1970-01-01 01:00:00.000000000 +0100 +++ pacman-i18n-0.1.1/po/TRANSLATORS 2005-01-03 23:06:36.000000000 +0000 @@ -0,0 +1,16 @@ +German: Matthias-Christian Ott +Swedish: Carl-Adam Brengesjo & Johan Viklund & Niklas Paro +Chinese (simplified): Gan Lu +Chinese (traditional): S.Barret Dolph -> Pegasus International School +French: Strat & Benoit Chesneau & Michel Di-Croc & Benoit FAY +Portuguese: Luis Felipe Strano Moraes & Joao Estevao & Helder Correia & Armando M. Baratti +Russian: Vladimir Marteev +Spanish: Linus Casassa & Yonathan Dossow & Oscar Estrada & Leonardo Gallego +Dutch: RedShift +Bulgarian: Lazar Alexiev +Czech: Lukas Konarovsky +Norwegian: Haakon Nilsen +Armenian: Sergey Manucharyan +Hebrew: Joshua Rubin +Polish: Jaroslaw Swierczynski +Japanese: SENRI Hiroshi diff -Nurp pacman-2.9.5/src/convertdb.c pacman-i18n-0.1.1/src/convertdb.c --- pacman-2.9.5/src/convertdb.c 2005-01-11 23:14:15.000000000 +0000 +++ pacman-i18n-0.1.1/src/convertdb.c 2005-01-21 13:28:19.000000000 +0000 @@ -31,6 +31,7 @@ #include "pacconf.h" #include "list.h" #include "util.h" +#include "i18n.h" unsigned short pmo_verbose = 0; @@ -50,11 +51,27 @@ int main(int argc, char* argv[]) sprintf(dbdir, "/%s", PACDBDIR); + char *lang = NULL; + + lang = getenv ("LC_ALL"); + + if (lang == NULL || lang[0] == '\0') + { + lang = getenv ("LC_MESSAGES"); + } + + if (lang == NULL || lang[0] == '\0') + { + lang = getenv ("LANG"); + } + + i18ninit (lang); + if(argc < 2) { - printf("converts a pacman 1.x database to a pacman 2.0 format\n"); - printf("usage: %s \n\n", basename(argv[0])); - printf("convertdb will convert all package data from /var/lib/pacman/pacman.db\n"); - printf("to a 2.0 format and place it in target_dir.\n\n"); + printf(_("converts a pacman 1.x database to a pacman 2.0 format\n")); + printf(_("usage: %s \n\n"), basename(argv[0])); + printf(_("convertdb will convert all package data from /var/lib/pacman/pacman.db\n")); + printf(_("to a 2.0 format and place it in target_dir.\n\n")); return(0); } @@ -75,7 +92,7 @@ int main(int argc, char* argv[]) } trim(name); trim(ver); - fprintf(stderr, "converting %s\n", name); + fprintf(stderr, _("converting %s\n"), name); /* package directory */ snprintf(topdir, PATH_MAX, "%s/%s-%s", argv[1], name, ver); mkdir(topdir, 0755); diff -Nurp pacman-2.9.5/src/db.c pacman-i18n-0.1.1/src/db.c --- pacman-2.9.5/src/db.c 2005-01-11 23:14:15.000000000 +0000 +++ pacman-i18n-0.1.1/src/db.c 2005-01-21 13:28:27.000000000 +0000 @@ -32,6 +32,7 @@ #include "strhash.h" #include "util.h" #include "db.h" +#include "i18n.h" /* Open a database and return a pacdb_t handle */ pacdb_t* db_open(char *root, char *pkgdir, char *treename) @@ -278,7 +279,7 @@ pkginfo_t* db_read(pacdb_t *db, struct d snprintf(path, PATH_MAX, "%s/%s/desc", db->path, ent->d_name); fp = fopen(path, "r"); if(fp == NULL) { - fprintf(stderr, "error: %s: %s\n", path, strerror(errno)); + fprintf(stderr, _("error: %s: %s\n"), path, strerror(errno)); FREEPKG(info); return(NULL); } @@ -403,7 +404,7 @@ pkginfo_t* db_read(pacdb_t *db, struct d snprintf(path, PATH_MAX, "%s/%s/files", db->path, ent->d_name); fp = fopen(path, "r"); if(fp == NULL) { - fprintf(stderr, "error: %s: %s\n", path, strerror(errno)); + fprintf(stderr, _("error: %s: %s\n"), path, strerror(errno)); FREEPKG(info); return(NULL); } @@ -430,7 +431,7 @@ pkginfo_t* db_read(pacdb_t *db, struct d snprintf(path, PATH_MAX, "%s/%s/depends", db->path, ent->d_name); fp = fopen(path, "r"); if(fp == NULL) { - fprintf(stderr, "db_read: error: %s: %s\n", path, strerror(errno)); + fprintf(stderr, _("db_read: error: %s: %s\n"), path, strerror(errno)); FREEPKG(info); return(NULL); } @@ -732,7 +733,7 @@ PMList* db_find_conflicts(pacdb_t *db, P } if(strhash_isin(htables[e], filestr)) { MALLOC(str, 512); - snprintf(str, 512, "%s: exists in \"%s\" (target) and \"%s\" (target)", + snprintf(str, 512, _("%s: exists in \"%s\" (target) and \"%s\" (target)"), filestr, p1->name, p2->name); conflicts = list_add(conflicts, str); } @@ -793,7 +794,7 @@ PMList* db_find_conflicts(pacdb_t *db, P } if(!ok) { MALLOC(str, 512); - snprintf(str, 512, "%s: %s: exists in filesystem", p->name, path); + snprintf(str, 512, _("%s: %s: exists in filesystem"), p->name, path); conflicts = list_add(conflicts, str); } } diff -Nurp pacman-2.9.5/src/i18n.c pacman-i18n-0.1.1/src/i18n.c --- pacman-2.9.5/src/i18n.c 1970-01-01 01:00:00.000000000 +0100 +++ pacman-i18n-0.1.1/src/i18n.c 2004-12-24 13:07:20.000000000 +0000 @@ -0,0 +1,50 @@ +/* + * i18n.c - Implement functions defined in i18n.h + * + * Copyright (c) 2004 Carl-Adam Brengesjo + * + * 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 + * the Free Software Foundation; either version 2 of the License, 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 General Public License for more details. + * + * You should have received a copy of the GNU 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. + * + * Note: This file is part of the Arch Linux Translation Project + * + */ +#include "i18n.h" + +#if HAVE_LOCALE_H +# include +#else +# define setlocale(category, locale) +#endif + +#define PACKAGE "pacman" + +/* Initializes GNU Gettext with specified locale (default is "") */ +void i18ninit(const char* locale) +{ + +#ifdef HAVE_SETLOCALE + /* Set the active locale */ + setlocale(LC_ALL, locale); +#endif + +#if ENABLE_NLS + /* Set the directory containing the translations. */ + bindtextdomain(PACKAGE, LOCALEDIR); + /* Set the active domain for future gettext() calls. */ + textdomain(PACKAGE); +#endif + +} diff -Nurp pacman-2.9.5/src/i18n.h pacman-i18n-0.1.1/src/i18n.h --- pacman-2.9.5/src/i18n.h 1970-01-01 01:00:00.000000000 +0100 +++ pacman-i18n-0.1.1/src/i18n.h 2004-12-24 13:07:20.000000000 +0000 @@ -0,0 +1,61 @@ +/* + * i18n.h - Includes GNU gettext and provides macros for accessing it. + * + * Copyright (c) 2004 Carl-Adam Brengesjo + * + * 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 + * the Free Software Foundation; either version 2 of the License, 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 General Public License for more details. + * + * You should have received a copy of the GNU 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. + * + * Note: This file is part of the Arch Linux Translation Project + * + */ + +#include "config.h" + +#ifndef _PACMAN_I18N_H +#define _PACMAN_I18N_H 1 + +#if ENABLE_NLS + +/* Get declarations of GNU message catalog functions. */ +# include + +/* our own init function */ +void i18ninit(const char* locale); + +#else + +/* i18n disabled, define macros in place for the functions */ + +#define gettext(msgid) ((const char*) (msgid)) +#define dgettext(domain, msgid) ((const char*) (msgid)) +#define dcgettext(domain, msgid, category) ((const char*) (msgid)) +#define ngettext(msgid1, msgid2, n) \ + ((N) == 1 ? (const char*) (msgid1) : (const char*) (msgid2)) +#define dngettext(domain, msgid1, msgid2, n) \ + ((N) == 1 ? (const char*) (msgid1) : (const char*) (msgid2)) +#define dcngettext(domain, msgid1, msgid2, n, category) \ + ((N) == 1 ? (const char*) (msgid1) : (const char*) (msgid2)) +#define textdomain(domain) ((const char*) (domain)) +#define bindtextdomain(domain, dir) ((const char*) (dir)) +#define bind_textdomain_codeset(domain, codeset) ((const char*) (codeset)) + +#endif /* if ENABLE_NLS */ + +/* Define our macros */ +#define _(s) gettext(s) +#define gettext_noop(s) s + +#endif /* ifndef _PACMAN_I18N_H */ diff -Nurp pacman-2.9.5/src/list.c pacman-i18n-0.1.1/src/list.c --- pacman-2.9.5/src/list.c 2005-01-11 23:14:15.000000000 +0000 +++ pacman-i18n-0.1.1/src/list.c 2005-01-21 16:23:19.000000000 +0000 @@ -25,6 +25,7 @@ #include #include #include "list.h" +#include "i18n.h" /* Check PMList sanity * @@ -321,7 +322,7 @@ void list_display(const char *title, PML } printf("\n"); } else { - printf("None\n"); + printf(_("None\n")); } } @@ -376,7 +377,7 @@ PMList* list_add_sorted(PMList *list, vo add->last = list->last; list->last = NULL; } - list = add; /* Start or empty, new list head. */ + list = add; /* Start or empty, new list head. */ /* Start or empty, new list head. */ } return(list); diff -Nurp pacman-2.9.5/src/md5driver.c pacman-i18n-0.1.1/src/md5driver.c --- pacman-2.9.5/src/md5driver.c 2004-04-19 08:17:56.000000000 +0100 +++ pacman-i18n-0.1.1/src/md5driver.c 2004-12-24 13:07:20.000000000 +0000 @@ -23,6 +23,7 @@ documentation and/or software. #include #include #include "md5.h" +#include "i18n.h" /* Length of test block, number of test blocks. */ @@ -42,7 +43,7 @@ char* MDFile(char *filename) unsigned char buffer[1024], digest[16]; if((file = fopen(filename, "rb")) == NULL) { - printf ("%s can't be opened\n", filename); + printf (_("%s can't be opened\n"), filename); } else { char *ret; int i; diff -Nurp pacman-2.9.5/src/package.c pacman-i18n-0.1.1/src/package.c --- pacman-2.9.5/src/package.c 2005-01-11 23:14:15.000000000 +0000 +++ pacman-i18n-0.1.1/src/package.c 2005-01-21 16:05:20.000000000 +0000 @@ -30,6 +30,7 @@ #include "pacconf.h" #include "util.h" #include "package.h" +#include "i18n.h" pkginfo_t* load_pkg(char *pkgfile) { @@ -50,7 +51,7 @@ pkginfo_t* load_pkg(char *pkgfile) }; if(tar_open(&tar, pkgfile, &gztype, O_RDONLY, 0, TAR_GNU) == -1) { - perror("could not open package"); + perror(_("could not open package")); return(NULL); } @@ -71,7 +72,7 @@ pkginfo_t* load_pkg(char *pkgfile) /* parse the info file */ parse_descfile(descfile, info, &backup, 0); if(!strlen(info->name)) { - fprintf(stderr, "load_pkg: missing package name in %s.\n", pkgfile); + fprintf(stderr, _("load_pkg: missing package name in %s.\n"), pkgfile); FREEPKG(info); unlink(descfile); FREE(descfile); @@ -79,7 +80,7 @@ pkginfo_t* load_pkg(char *pkgfile) return(NULL); } if(!strlen(info->version)) { - fprintf(stderr, "load_pkg: missing package version in %s.\n", pkgfile); + fprintf(stderr, _("load_pkg: missing package version in %s.\n"), pkgfile); FREEPKG(info); unlink(descfile); FREE(descfile); @@ -112,7 +113,7 @@ pkginfo_t* load_pkg(char *pkgfile) FREE(str); fclose(fp); if(unlink(fn)) { - fprintf(stderr, "warning: could not remove tempfile %s\n", fn); + fprintf(stderr, _("warning: could not remove tempfile %s\n"), fn); } FREE(fn); filelist = 1; @@ -129,7 +130,7 @@ pkginfo_t* load_pkg(char *pkgfile) if(TH_ISREG(tar) && tar_skip_regfile(tar)) { char errorstr[255]; - snprintf(errorstr, 255, "bad package file in %s", pkgfile); + snprintf(errorstr, 255, _("bad package file in %s"), pkgfile); perror(errorstr); FREEPKG(info); return(NULL); @@ -139,7 +140,7 @@ pkginfo_t* load_pkg(char *pkgfile) tar_close(tar); if(!config) { - fprintf(stderr, "load_pkg: missing package info file in %s\n", pkgfile); + fprintf(stderr, _("load_pkg: missing package info file in %s\n"), pkgfile); FREEPKG(info); return(NULL); } @@ -181,8 +182,8 @@ int parse_descfile(char *descfile, pkgin ptr = line; key = strsep(&ptr, "="); if(key == NULL || ptr == NULL) { - fprintf(stderr, "%s: syntax error in description file line %d\n", - info->name[0] != '\0' ? info->name : "error", linenum); + fprintf(stderr, _("%s: syntax error in description file line %d\n"), + info->name[0] != '\0' ? info->name : _("error"), linenum); } else { trim(key); key = strtoupper(key); @@ -222,8 +223,8 @@ int parse_descfile(char *descfile, pkgin } else if(!strcmp(key, "BACKUP")) { bak = list_add(bak, strdup(ptr)); } else { - fprintf(stderr, "%s: syntax error in description file line %d\n", - info->name[0] != '\0' ? info->name : "error", linenum); + fprintf(stderr, _("%s: syntax error in description file line %d\n"), + info->name[0] != '\0' ? info->name : _("error"), linenum); } } line[0] = '\0'; @@ -333,42 +334,45 @@ void dump_pkg_full(pkginfo_t *info) return; } - printf("Name : %s\n", info->name); - printf("Version : %s\n", info->version); + printf(_("Name : %s\n"), info->name); + printf(_("Version : %s\n"), info->version); pm = list_sort(info->groups); - list_display("Groups :", pm); + list_display(_("Groups :"), pm); FREELIST(pm); - printf("Packager : %s\n", info->packager); - printf("URL : %s\n", info->url); + printf(_("Packager : %s\n"), info->packager); + printf(_("URL : %s\n"), info->url); pm = list_sort(info->license); - list_display("License :", pm); + list_display(_("License :"), pm); FREELIST(pm); - printf("Architecture : %s\n", info->arch); - printf("Size : %ld\n", info->size); - printf("Build Date : %s %s\n", info->builddate, strlen(info->builddate) ? "UTC" : ""); - printf("Install Date : %s %s\n", info->installdate, strlen(info->installdate) ? "UTC" : ""); - printf("Install Script : %s\n", (info->scriptlet ? "Yes" : "No")); - printf("Reason: : "); + printf(_("Architecture : %s\n"), info->arch); + printf(_("Size : %ld\n"), info->size); + printf(_("Build Date : %s %s\n"), info->builddate, strlen(info->builddate) ? "UTC" : ""); + printf(_("Install Date : %s %s\n"), info->installdate, strlen(info->installdate) ? "UTC" : ""); + printf(_("Install Script : %s\n"), (info->scriptlet ? "Yes" : "No")); + printf(_("Reason: : ")); switch(info->reason) { - case REASON_EXPLICIT: printf("explicitly installed\n"); break; - case REASON_DEPEND: printf("installed as a dependency for another package\n"); break; - default: printf("unknown\n"); break; + case REASON_EXPLICIT: printf(_("explicitly installed\n")); break; + case REASON_DEPEND: printf(_("installed as a dependency for another package\n")); break; + default: printf(_("unknown\n")); break; } pm = list_sort(info->provides); - list_display("Provides :", pm); + list_display(_("Provides :"), pm); FREELIST(pm); pm = list_sort(info->depends); - list_display("Depends On :", pm); + list_display(_("Depends On :"), pm); FREELIST(pm); pm = list_sort(info->requiredby); - list_display("Required By :", pm); + list_display(_("Required By :"), pm); FREELIST(pm); pm = list_sort(info->conflicts); - list_display("Conflicts With :", pm); + list_display(_("Conflicts With :"), pm); FREELIST(pm); - printf("Description : "); - indentprint(info->desc, 17); - printf("\n"); + printf(_("Description : ")); + /* i18n causes the list to have various list widths, + * grep the width this locale is using. + */ + indentprint(info->desc, strlen(_("Description : "))); + printf(_("\n")); } /* Display the content of a sync package @@ -379,28 +383,31 @@ void dump_pkg_sync(pkginfo_t *info, char return; } - printf("Repository : %s\n", treename); - printf("Name : %s\n", info->name); - printf("Version : %s\n", info->version); + printf(_("Repository : %s\n"), treename); + printf(_("Name : %s\n"), info->name); + printf(_("Version : %s\n"), info->version); pm = list_sort(info->groups); - list_display("Groups :", pm); + list_display(_("Groups :"), pm); FREELIST(pm); pm = list_sort(info->provides); - list_display("Provides :", pm); + list_display(_("Provides :"), pm); FREELIST(pm); pm = list_sort(info->depends); - list_display("Depends On :", pm); + list_display(_("Depends On :"), pm); FREELIST(pm); pm = list_sort(info->conflicts); - list_display("Conflicts With :", pm); + list_display(_("Conflicts With :"), pm); FREELIST(pm); pm = list_sort(info->replaces); - list_display("Replaces :", pm); + list_display(_("Replaces :"), pm); FREELIST(pm); - printf("Size (compressed) : %ld\n", info->size); - printf("Description : "); - indentprint(info->desc, 20); - printf("\nMD5 Sum : %s\n", info->md5sum); + printf(_("Size (compressed) : %ld\n"), info->size); + printf(_("Description : ")); + /* i18n causes the list to have various list widths, + * grep the width this locale is using. + */ + indentprint(info->desc, strlen(_("Description : "))); + printf(_("\nMD5 Sum : %s\n"), info->md5sum); } int split_pkgname(char *pkgfile, char *name, char *version) diff -Nurp pacman-2.9.5/src/pacman.c pacman-i18n-0.1.1/src/pacman.c --- pacman-2.9.5/src/pacman.c 2005-01-11 23:14:16.000000000 +0000 +++ pacman-i18n-0.1.1/src/pacman.c 2005-01-21 16:15:33.000000000 +0000 @@ -46,6 +46,7 @@ #include "db.h" #include "pacsync.h" #include "pacman.h" +#include "i18n.h" /* * GLOBALS @@ -126,11 +127,27 @@ int main(int argc, char *argv[]) maxcols = atoi(cenv); } + char *lang = NULL; + + lang = getenv ("LC_ALL"); + + if (lang == NULL || lang[0] == '\0') + { + lang = getenv ("LC_MESSAGES"); + } + + if (lang == NULL || lang[0] == '\0') + { + lang = getenv ("LANG"); + } + + i18ninit (lang); + if(argc < 2) { usage(PM_MAIN, (char*)basename(argv[0])); return(0); } - + /* default root */ MALLOC(pmo_root, PATH_MAX); strcpy(pmo_root, "/"); @@ -164,15 +181,15 @@ int main(int argc, char *argv[]) /* special case: PM_SYNC can be used w/ pmo_s_search by any user */ } else { if(myuid) { - fprintf(stderr, "error: you cannot perform this operation unless you are root.\n"); + fprintf(stderr, _("error: you cannot perform this operation unless you are root.\n")); return(1); } pm_access = READ_WRITE; /* lock */ if(lckmk(lckfile, 1, 1) == -1) { - fprintf(stderr, "error: unable to lock pacman database.\n"); - fprintf(stderr, " if you're sure pacman is not already running, you\n"); - fprintf(stderr, " can remove %s\n", lckfile); + fprintf(stderr, _("error: unable to lock pacman database.\n")); + fprintf(stderr, _(" if you're sure pacman is not already running, you\n")); + fprintf(stderr, _(" can remove %s\n"), lckfile); return(32); } } @@ -194,7 +211,7 @@ int main(int argc, char *argv[]) /* open the log file */ logfd = fopen(pmo_logfile, "a"); if(logfd == NULL) { - perror("warning: cannot open logfile"); + perror(_("warning: cannot open logfile")); } } @@ -208,11 +225,11 @@ int main(int argc, char *argv[]) pmo_root = ptr; } - vprint("Installation Root: %s\n", pmo_root); + vprint(_("Installation Root: %s\n"), pmo_root); /* db location */ - vprint("Top-level DB Path: %s%s\n", pmo_root, pmo_dbpath); + vprint(_("Top-level DB Path: %s%s\n"), pmo_root, pmo_dbpath); if(pmo_verbose) { - list_display("Targets:", pm_targets); + list_display(_("Targets:"), pm_targets); } db_local = db_open(pmo_root, pmo_dbpath, "local"); @@ -221,15 +238,15 @@ int main(int argc, char *argv[]) char path[PATH_MAX]; snprintf(path, PATH_MAX, "%s%s/local", pmo_root, pmo_dbpath); - vprint("initializing database %s...\n", path); + vprint(_("initializing database %s...\n"), path); ret = makepath(path); if(ret) { - fprintf(stderr, "error: could not create database.\n"); + fprintf(stderr, _("error: could not create database.\n")); cleanup(1); } if((db_local = db_open(pmo_root, pmo_dbpath, "local")) == NULL) { - fprintf(stderr, "error: could not open database.\n"); + fprintf(stderr, _("error: could not open database.\n")); cleanup(1); } } @@ -239,7 +256,7 @@ int main(int argc, char *argv[]) /* the operation requires at least one target */ if(list_count(pm_targets) == 0 && !(pmo_op == PM_QUERY || (pmo_op == PM_SYNC && (pmo_s_sync || pmo_s_upgrade || pmo_s_clean || pmo_group || pmo_q_list)))) { - fprintf(stderr, "error: no targets specified\n"); + fprintf(stderr, _("error: no targets specified\n")); usage(pmo_op, (char*)basename(argv[0])); } @@ -255,7 +272,7 @@ int main(int argc, char *argv[]) default: ret = 0; if(list_count(pm_targets) > 0) { - fprintf(stderr, "error: no operation specified\n"); + fprintf(stderr, _("error: no operation specified\n")); usage(pmo_op, (char*)basename(argv[0])); ret = 1; } @@ -293,11 +310,11 @@ int pacman_deptest(pacdb_t *db, PMList * depmissing_t *miss = (depmissing_t*)lp->data; if(miss->type == CONFLICT) { /* we can't auto-resolve conflicts */ - printf("conflict: %s\n", miss->depend.name); + printf(_("conflict: %s\n"), miss->depend.name); ret = 127; } else if(miss->type == DEPEND || miss->type == REQUIRED) { if(!pmo_d_resolve) { - printf("requires: %s", miss->depend.name); + printf(_("requires: %s"), miss->depend.name); switch(miss->depend.mod) { case DEP_EQ: printf("=%s", miss->depend.version); break; case DEP_GE: printf(">=%s", miss->depend.version); break; @@ -335,7 +352,7 @@ int pacman_sync(pacdb_t *db, PMList *tar PMList *databases = NULL; if(!list_count(pmc_syncs)) { - fprintf(stderr, "error: no usable package repositories configured.\n"); + fprintf(stderr, _("error: no usable package repositories configured.\n")); return(1); } @@ -351,10 +368,10 @@ int pacman_sync(pacdb_t *db, PMList *tar snprintf(dirpath, PATH_MAX, "%s%s", pmo_root, CACHEDIR); - printf("removing old packages from cache... "); + printf(_("removing old packages from cache... ")); dir = opendir(dirpath); if(dir == NULL) { - fprintf(stderr, "error: could not access cache directory\n"); + fprintf(stderr, _("error: could not access cache directory\n")); return(1); } rewinddir(dir); @@ -425,27 +442,27 @@ int pacman_sync(pacdb_t *db, PMList *tar snprintf(path, PATH_MAX, "%s%s", pmo_root, CACHEDIR); - printf("removing all packages from cache... "); + printf(_("removing all packages from cache... ")); if(rmrf(path)) { - fprintf(stderr, "error: could not remove cache directory: %s\n", strerror(errno)); + fprintf(stderr, _("error: could not remove cache directory: %s\n"), strerror(errno)); return(1); } oldmask = umask(0000); if(makepath(path)) { - fprintf(stderr, "error: could not create new cache directory: %s\n", strerror(errno)); + fprintf(stderr, _("error: could not create new cache directory: %s\n"), strerror(errno)); return(1); } umask(oldmask); } - printf("done.\n"); + printf(_("done.\n")); return(0); } if(pmo_s_sync) { /* grab a fresh package list */ - printf(":: Synchronizing package databases... \n"); - logaction(NULL, "synchronizing package lists"); + printf(_(":: Synchronizing package databases... \n")); + logaction(NULL, _("synchronizing package lists")); sync_synctree(); } @@ -457,8 +474,8 @@ int pacman_sync(pacdb_t *db, PMList *tar db_sync = db_open(pmo_root, pmo_dbpath, sync->treename); if(db_sync == NULL) { - fprintf(stderr, "error: could not open sync database: %s\n", sync->treename); - fprintf(stderr, " have you used --refresh yet?\n"); + fprintf(stderr, _("error: could not open sync database: %s\n"), sync->treename); + fprintf(stderr, _(" have you used --refresh yet?\n")); return(1); } MALLOC(dbs, sizeof(dbsync_t)); @@ -572,7 +589,7 @@ int pacman_sync(pacdb_t *db, PMList *tar } } if(!found) { - fprintf(stderr, "Package \"%s\" was not found.\n", (char *)i->data); + fprintf(stderr, _("Package \"%s\" was not found.\n"), (char *)i->data); allgood = 0; break; } @@ -603,7 +620,7 @@ int pacman_sync(pacdb_t *db, PMList *tar } } if(!found) { - printf("Repository \"%s\" was not found.\n", (char *)i->data); + printf(_("Repository \"%s\" was not found.\n"), (char *)i->data); allgood = 0; break; } @@ -614,7 +631,7 @@ int pacman_sync(pacdb_t *db, PMList *tar int ignore = 0; syncpkg_t *s = NULL; - logaction(NULL, "starting full system upgrade"); + logaction(NULL, _("starting full system upgrade")); /* check for "recommended" package replacements */ for(i = databases; i && allgood; i = i->next) { dbsync_t *dbs = (dbsync_t*)i->data; @@ -626,10 +643,10 @@ int pacman_sync(pacdb_t *db, PMList *tar pkginfo_t *p = (pkginfo_t*)m->data; if(!strcmp(k->data, p->name)) { if(is_in(p->name, pmo_ignorepkg) || is_in(p->name, pmo_s_ignore)) { - fprintf(stderr, ":: %s-%s: ignoring package upgrade (to be replaced by %s-%s)\n", + fprintf(stderr, _(":: %s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"), p->name, p->version, pkg->name, pkg->version); ignore = 1; - } else if(yesno(":: Replace %s with %s from \"%s\"? [Y/n] ", p->name, pkg->name, dbs->db->treename)) { + } else if(yesno(_(":: Replace %s with %s from \"%s\"? [Y/n] "), p->name, pkg->name, dbs->db->treename)) { /* if confirmed, add this to the 'final' list, designating 'p' as * the package to replace. */ @@ -692,7 +709,7 @@ int pacman_sync(pacdb_t *db, PMList *tar cmp = rpmvercmp(local->version, sync->pkg->version); if(cmp > 0 && !sync->pkg->force) { /* local version is newer */ - fprintf(stderr, ":: %s: local (%s) appears to be newer than repo (%s/%s)\n", + fprintf(stderr, _(":: %s: local (%s) appears to be newer than repo (%s/%s)\n"), local->name, local->version, sync->dbs->sync->treename, sync->pkg->version); newer = 1; FREE(sync); @@ -703,7 +720,7 @@ int pacman_sync(pacdb_t *db, PMList *tar continue; } else if(is_in((char*)i->data, pmo_ignorepkg) || is_in((char*)i->data, pmo_s_ignore)) { /* package should be ignored (IgnorePkg) */ - fprintf(stderr, ":: %s-%s: ignoring package upgrade (%s)\n", + fprintf(stderr, _(":: %s-%s: ignoring package upgrade (%s)\n"), local->name, local->version, sync->pkg->version); ignore = 1; FREE(sync); @@ -727,7 +744,7 @@ int pacman_sync(pacdb_t *db, PMList *tar } } if((newer || ignore) && allgood) { - fprintf(stderr, ":: Above packages will be skipped. To manually upgrade use 'pacman -S '\n"); + fprintf(stderr, _(":: Above packages will be skipped. To manually upgrade use 'pacman -S '\n")); } /* check if pacman itself is one of the packages to upgrade. if so, we * we should upgrade ourselves first and then re-exec as the new version. @@ -737,11 +754,11 @@ int pacman_sync(pacdb_t *db, PMList *tar */ s = find_pkginsync("pacman", final); if(s && list_count(final) > 1) { - fprintf(stderr, "\n:: pacman has detected a newer version of the \"pacman\" package.\n"); - fprintf(stderr, ":: It is recommended that you allow pacman to upgrade itself\n"); - fprintf(stderr, ":: first, then you can re-run the operation with the newer version.\n"); - fprintf(stderr, "::\n"); - if(yesno(":: Upgrade pacman first? [Y/n] ")) { + fprintf(stderr, _("\n:: pacman has detected a newer version of the \"pacman\" package.\n")); + fprintf(stderr, _(":: It is recommended that you allow pacman to upgrade itself\n")); + fprintf(stderr, _(":: first, then you can re-run the operation with the newer version.\n")); + fprintf(stderr, _("::\n")); + if(yesno(_(":: Upgrade pacman first? [Y/n] "))) { /* XXX: leaving final un-freed is a big memory leak, but pacman quits * right after this upgrade anyway, so... */ @@ -901,26 +901,26 @@ int pacman_sync(pacdb_t *db, PMList *tar FREELIST(k); k = tmp; - printf(":: group %s:\n", targ); + printf(_(":: group %s:\n"), targ); list_display(" ", k); - if(yesno(" Install whole content? [Y/n] ")) { + if(yesno(_(" Install whole content? [Y/n] "))) { targets = list_merge(targets, k); FREELIST(k); } else { PMList *l; for(l = k; l; l = l->next) { - if(yesno(":: Install %s from group %s? [Y/n] ", (char*)l->data, targ)) { + if(yesno(_(":: Install %s from group %s? [Y/n] "), (char*)l->data, targ)) { targets = list_add(targets, strdup((char*)l->data)); } } } FREELIST(k); } else { - fprintf(stderr, "%s: not found in sync db\n", targ); + fprintf(stderr, _("%s: not found in sync db\n"), targ); allgood = 0; } } else { - fprintf(stderr, "%s: not present in \"%s\" repository\n", targ, treename); + fprintf(stderr, _("%s: not present in \"%s\" repository\n"), targ, treename); allgood = 0; } FREE(sync); @@ -842,7 +859,7 @@ int pacman_sync(pacdb_t *db, PMList *tar cmp = rpmvercmp(local->version, sync->pkg->version); if(cmp > 0) { /* local version is newer - get confirmation first */ - if(!yesno(":: %s-%s: local version is newer. Upgrade anyway? [Y/n] ", local->name, local->version)) { + if(!yesno(_(":: %s-%s: local version is newer. Upgrade anyway? [Y/n] "), local->name, local->version)) { FREEPKG(local); FREEPKG(sync->pkg); FREE(sync); @@ -851,7 +868,7 @@ int pacman_sync(pacdb_t *db, PMList *tar } } else if(cmp == 0) { /* versions are identical */ - if(!yesno(":: %s-%s: is up to date. Upgrade anyway? [Y/n] ", local->name, local->version)) { + if(!yesno(_(":: %s-%s: is up to date. Upgrade anyway? [Y/n] "), local->name, local->version)) { FREEPKG(local); FREEPKG(sync->pkg); FREE(sync); @@ -894,17 +911,17 @@ int pacman_sync(pacdb_t *db, PMList *tar depmissing_t *miss = (depmissing_t*)i->data; if(miss->type == DEPEND || miss->type == REQUIRED) { if(!errorout) { - fprintf(stderr, "error: unresolvable dependencies:\n"); + fprintf(stderr, _("error: unresolvable dependencies:\n")); errorout = 1; } - fprintf(stderr, " %s: requires %s", miss->target, miss->depend.name); + fprintf(stderr, _(" %s: requires %s"), miss->target, miss->depend.name); switch(miss->depend.mod) { case DEP_EQ: fprintf(stderr, "=%s", miss->depend.version); break; case DEP_GE: fprintf(stderr, ">=%s", miss->depend.version); break; case DEP_LE: fprintf(stderr, "<=%s", miss->depend.version); break; } if(miss->type == DEPEND) { - fprintf(stderr, " but it is not in the sync db\n"); + fprintf(stderr, _(" but it is not in the sync db\n")); } else { fprintf(stderr, "\n"); } @@ -999,18 +1016,18 @@ int pacman_sync(pacdb_t *db, PMList *tar strcpy(p1.version, "1.0-1"); if(is_pkgin(&p1, pm_packages)) { - if(yesno(":: %s conflicts with %s. Remove %s? [Y/n] ", + if(yesno(_(":: %s conflicts with %s. Remove %s? [Y/n] "), miss->target, miss->depend.name, miss->depend.name)) { /* remove miss->depend.name */ rmtargs = list_add(rmtargs, strdup(miss->depend.name)); } else { /* abort */ - fprintf(stderr, "\nerror: package conflicts detected\n"); + fprintf(stderr, _("\nerror: package conflicts detected\n")); errorout = 1; } } else { if(!is_in(miss->depend.name, rmtargs) & !is_in(miss->target, rmtargs)) { - fprintf(stderr, "\nerror: %s conflicts with %s\n", miss->target, + fprintf(stderr, _("\nerror: %s conflicts with %s\n"), miss->target, miss->depend.name); errorout = 1; } @@ -1080,7 +1097,7 @@ int pacman_sync(pacdb_t *db, PMList *tar } } if(list) { - printf("\nRemove: "); + printf(_("\nRemove: ")); str = buildstring(list); indentprint(str, 9); printf("\n"); @@ -1102,10 +1119,10 @@ int pacman_sync(pacdb_t *db, PMList *tar if(mb < 0.1) { mb = 0.1; } - printf("\nTargets: "); + printf(_("\nTargets: ")); str = buildstring(list); indentprint(str, 9); - printf("\n\nTotal Package Size: %.1f MB\n", mb); + printf(_("\n\nTotal Package Size: %.1f MB\n"), mb); FREELIST(list); FREE(str); } @@ -1115,10 +1132,10 @@ int pacman_sync(pacdb_t *db, PMList *tar if(allgood && final && final->data) { if(pmo_s_downloadonly) { if(pmo_noconfirm) { - printf("\nBeginning download...\n"); + printf(_("\nBeginning download...\n")); confirm = 1; } else { - confirm = yesno("\nProceed with download? [Y/n] "); + confirm = yesno(_("\nProceed with download? [Y/n] ")); } } else { /* don't get any confirmation if we're called from makepkg */ @@ -1126,10 +1143,10 @@ int pacman_sync(pacdb_t *db, PMList *tar confirm = 1; } else { if(pmo_noconfirm) { - printf("\nBeginning upgrade process...\n"); + printf(_("\nBeginning upgrade process...\n")); confirm = 1; } else { - confirm = yesno("\nProceed with upgrade? [Y/n] "); + confirm = yesno(_("\nProceed with upgrade? [Y/n] ")); } } } @@ -1176,7 +1193,7 @@ int pacman_sync(pacdb_t *db, PMList *tar snprintf(path, PATH_MAX, "%s-%s%s", sync->pkg->name, sync->pkg->version, PKGEXT); files = list_add(files, strdup(path)); } else { - vprint(" %s-%s%s is already in the cache\n", sync->pkg->name, sync->pkg->version, PKGEXT); + vprint(_(" %s-%s%s is already in the cache\n"), sync->pkg->name, sync->pkg->version, PKGEXT); count++; } } @@ -1198,26 +1215,26 @@ int pacman_sync(pacdb_t *db, PMList *tar } else { struct stat buf; - printf("\n:: Retrieving packages from %s...\n", current->treename); + printf(_("\n:: Retrieving packages from %s...\n"), current->treename); fflush(stdout); if(stat(ldir, &buf)) { mode_t oldmask; /* no cache directory.... try creating it */ - logaction(stderr, "warning: no %s cache exists. creating...", ldir); + logaction(stderr, _("warning: no %s cache exists. creating..."), ldir); oldmask = umask(0000); if(makepath(ldir)) { /* couldn't mkdir the cache directory, so fall back to /tmp and unlink * the package afterwards. */ - logaction(stderr, "warning: couldn't create package cache, using /tmp instead"); + logaction(stderr, _("warning: couldn't create package cache, using /tmp instead")); snprintf(ldir, PATH_MAX, "/tmp"); varcache = 0; } umask(oldmask); } if(downloadfiles(current->servers, ldir, files)) { - fprintf(stderr, "error: failed to retrieve some files from %s\n", current->treename); + fprintf(stderr, _("error: failed to retrieve some files from %s\n"), current->treename); allgood = 0; } } @@ -1239,7 +1256,7 @@ int pacman_sync(pacdb_t *db, PMList *tar if(allgood) { /* Check integrity of files */ - printf("checking package integrity... "); + printf(_("checking package integrity... ")); fflush(stdout); for(i = final; i; i = i->next) { @@ -1255,7 +1272,7 @@ int pacman_sync(pacdb_t *db, PMList *tar if(allgood) { printf("\n"); } - fprintf(stderr, "error: can't get md5 checksum for package %s\n", pkgname); + fprintf(stderr, _("error: can't get md5 checksum for package %s\n"), pkgname); allgood = 0; continue; } @@ -1265,7 +1282,7 @@ int pacman_sync(pacdb_t *db, PMList *tar if(allgood) { printf("\n"); } - fprintf(stderr, "error: can't get md5 checksum for archive %s\n", pkgname); + fprintf(stderr, _("error: can't get md5 checksum for archive %s\n"), pkgname); allgood = 0; continue; } @@ -1274,14 +1291,14 @@ int pacman_sync(pacdb_t *db, PMList *tar if(allgood) { printf("\n"); } - fprintf(stderr, "error: archive %s is corrupted\n", pkgname); + fprintf(stderr, _("error: archive %s is corrupted\n"), pkgname); allgood = 0; } FREE(md5sum2); } if(allgood) { - printf("done.\n"); + printf(_("done.\n")); } else { fprintf(stderr, "\n"); } @@ -1389,7 +1389,7 @@ int pacman_sync(pacdb_t *db, PMList *tar pkginfo_t *p = db_scan(db, i->data, INFRQ_DESC | INFRQ_DEPENDS); rmtargs_p = list_add(rmtargs_p, p); } - vprint("checking dependencies of packages designated for removal...\n"); + vprint(_("checking dependencies of packages designated for removal...\n")); i = checkdeps(db, PM_REMOVE, rmtargs_p); for(j = i; j; j = j->next) { depmissing_t* miss = (depmissing_t*)j->data; @@ -1401,7 +1401,7 @@ int pacman_sync(pacdb_t *db, PMList *tar pkginfo_t *leavingp = db_scan(db, miss->target, INFRQ_DESC | INFRQ_DEPENDS); pkginfo_t *conflictp = db_scan(db, miss->depend.name, INFRQ_DESC | INFRQ_DEPENDS); if(!leavingp || !conflictp) { - fprintf(stderr, "error: something has gone horribly wrong\n"); + fprintf(stderr, _("error: something has gone horribly wrong\n")); allgood = 0; goto sync_cleanup; } @@ -1420,7 +1420,7 @@ int pacman_sync(pacdb_t *db, PMList *tar for(o = sp->pkg->provides; o && !pfound; o = o->next) { if(!strcmp(m->data, o->data)) { /* found matching provisio -- we're good to go */ - vprint("Found a matching provides (%s) in %s, conflict aborted\n", + vprint(_("Found a matching provides (%s) in %s, conflict aborted\n"), (char*)o->data, sp->pkg->name); pfound = 1; } @@ -1434,10 +1434,10 @@ int pacman_sync(pacdb_t *db, PMList *tar if(!pfound) { if(allgood) { - fprintf(stderr, "error: this will break the following dependencies:\n"); + fprintf(stderr, _("error: this will break the following dependencies:\n")); allgood = 0; } - printf(" %s: is required by %s\n", miss->target, miss->depend.name); + printf(_(" %s: is required by %s\n"), miss->target, miss->depend.name); } } } @@ -1327,7 +1344,7 @@ int pacman_sync(pacdb_t *db, PMList *tar pmo_nodeps = oldval; FREELIST(rmtargs); if(retcode == 1) { - fprintf(stderr, "\nupgrade aborted.\n"); + fprintf(stderr, _("\nupgrade aborted.\n")); allgood = 0; } /* reload package cache */ @@ -1359,7 +1376,7 @@ int pacman_sync(pacdb_t *db, PMList *tar allgood = !pacman_remove(db, rmtargs); pmo_nodeps = oldval; if(!allgood) { - fprintf(stderr, "package removal failed. aborting...\n"); + fprintf(stderr, _("package removal failed. aborting...\n")); } } /* install targets */ @@ -1501,7 +1518,7 @@ int pacman_add(pacdb_t *db, PMList *targ servers = list_add(servers, server); files = list_add(files, fn); if(downloadfiles(servers, ".", files)) { - fprintf(stderr, "error: failed to download %s\n", (char*)targ->data); + fprintf(stderr, _("error: failed to download %s\n"), (char*)targ->data); return(1); } FREELIST(servers); @@ -1517,18 +1534,18 @@ int pacman_add(pacdb_t *db, PMList *targ * Load meta-data from package files * */ - printf("loading package data... "); + printf(_("loading package data... ")); fflush(stdout); for(targ = targets; targ; targ = targ->next) { /* Populate the package struct */ - vprint("reading %s... ", (char*)targ->data); + vprint(_("reading %s... "), (char*)targ->data); info = load_pkg((char*)targ->data); if(info == NULL) { return(1); } /* no additional hyphens in version strings */ if(strchr(info->version, '-') != strrchr(info->version, '-')) { - fprintf(stderr, "\nerror: package \"%s\" has more than one hyphen in its version (%s)\n", + fprintf(stderr, _("\nerror: package \"%s\" has more than one hyphen in its version (%s)\n"), info->name, info->version); return(1); } @@ -1536,7 +1553,7 @@ int pacman_add(pacdb_t *db, PMList *targ /* only upgrade/install this package if it is already installed and at a lesser version */ pkginfo_t *dummy = db_scan(db, info->name, INFRQ_DESC); if(dummy == NULL || rpmvercmp(dummy->version, info->version) >= 0) { - vprint("not installed or lesser version\n"); + vprint(_("not installed or lesser version\n")); FREEPKG(info); FREEPKG(dummy); continue; @@ -1549,16 +1566,16 @@ int pacman_add(pacdb_t *db, PMList *targ pkginfo_t *pkg = (pkginfo_t*)j->data; if(!strcmp(pkg->name, info->name)) { if(rpmvercmp(pkg->version, info->version) < 0) { - vprint("replacing older version in target list. "); + vprint(_("replacing older version in target list. ")); FREEPKG(j->data); j->data = info; } } } - vprint("done\n"); + vprint(_("done\n")); alltargs = list_add(alltargs, info); } - printf("done.\n"); + printf(_("done.\n")); /* * Check dependencies @@ -1569,7 +1586,7 @@ int pacman_add(pacdb_t *db, PMList *targ * it is already done in pacman_sync. */ if(!pmo_nodeps && pmo_op != PM_SYNC) { int errorout = 0; - vprint("checking dependencies...\n"); + vprint(_("checking dependencies...\n")); lp = checkdeps(db, (pmo_upgrade ? PM_UPGRADE : PM_ADD), alltargs); if(lp) { /* look for unsatisfied dependencies */ @@ -1577,10 +1594,10 @@ int pacman_add(pacdb_t *db, PMList *targ depmissing_t* miss = (depmissing_t*)j->data; if(miss->type == DEPEND || miss->type == REQUIRED) { if(!errorout) { - fprintf(stderr, "error: unsatisfied dependencies:\n"); + fprintf(stderr, _("error: unsatisfied dependencies:\n")); errorout = 1; } - printf(" %s: requires %s", miss->target, miss->depend.name); + printf(_(" %s: requires %s"), miss->target, miss->depend.name); switch(miss->depend.mod) { case DEP_EQ: printf("=%s", miss->depend.version); break; case DEP_GE: printf(">=%s", miss->depend.version); break; @@ -1602,18 +1619,18 @@ int pacman_add(pacdb_t *db, PMList *targ sprintf(p1.version, "1.0-1"); if(is_pkgin(&p1, pm_packages)) { - if(yesno(":: %s conflicts with %s. Remove %s? [Y/n] ", + if(yesno(_(":: %s conflicts with %s. Remove %s? [Y/n] "), miss->target, miss->depend.name, miss->depend.name)) { /* remove miss->depend.name */ rmtargs = list_add(rmtargs, strdup(miss->depend.name)); } else { /* abort */ - fprintf(stderr, "\nerror: package conflicts detected\n"); + fprintf(stderr, _("\nerror: package conflicts detected\n")); errorout = 1; } } else { if(!is_in(miss->depend.name, rmtargs) & !is_in(miss->target, rmtargs)) { - fprintf(stderr, "\nerror: %s conflicts with %s\n", miss->target, + fprintf(stderr, _("\nerror: %s conflicts with %s\n"), miss->target, miss->depend.name); errorout = 1; } @@ -1649,7 +1666,7 @@ int pacman_add(pacdb_t *db, PMList *targ retcode = pacman_remove(db, rmtargs); list_free(rmtargs); if(retcode == 1) { - fprintf(stderr, "\n%s aborted.\n", oldupg ? "upgrade" : "install"); + fprintf(stderr, _("\n%s aborted.\n"), oldupg ? _("upgrade") : _("install")); return(1); } /* reload package cache */ @@ -1666,7 +1683,7 @@ int pacman_add(pacdb_t *db, PMList *targ } /* re-order w.r.t. dependencies */ - vprint("sorting by dependencies\n"); + vprint(_("sorting by dependencies\n")); lp = sortbydeps(alltargs, PM_ADD); /* free the old alltargs */ for(j = alltargs; j; j = j->next) { @@ -1825,20 +1825,20 @@ int pacman_add(pacdb_t *db, PMList *targ * */ if(!pmo_force) { - printf("checking for file conflicts... "); + printf(_("checking for file conflicts... ")); fflush(stdout); lp = db_find_conflicts(db, alltargs, pmo_root, &skiplist); if(lp) { - printf("\nerror: the following file conflicts were found:\n"); + printf(_("\nerror: the following file conflicts were found:\n")); for(j = lp; j; j = j->next) { printf(" %s\n", (char*)j->data); } printf("\n"); FREELIST(lp); - printf("\nerrors occurred, no packages were upgraded.\n"); + printf(_("\nerrors occurred, no packages were upgraded.\n")); return(1); } - printf("done.\n"); + printf(_("done.\n")); FREELIST(lp); } @@ -1713,7 +1730,7 @@ int pacman_add(pacdb_t *db, PMList *targ pmo_upgrade = real_pmo_upgrade; /* check for an already installed package */ if(!pmo_upgrade && is_pkgin(info, pm_packages)) { - fprintf(stderr, "error: %s is already installed. (try --upgrade)\n", info->name); + fprintf(stderr, _("error: %s is already installed. (try --upgrade)\n"), info->name); continue; } @@ -1722,7 +1739,7 @@ int pacman_add(pacdb_t *db, PMList *targ if(is_pkgin(info, pm_packages)) { int retcode; - printf("upgrading %s... ", info->name); + printf(_("upgrading %s... "), info->name); neednl = 1; /* we'll need the full record for backup checks later */ @@ -1881,11 +1881,11 @@ int pacman_add(pacdb_t *db, PMList *targ PMList* tmp = list_add(NULL, strdup(info->name)); /* copy over the install reason */ info->reason = oldpkg->reason; - vprint("removing old package first...\n"); + vprint(_("removing old package first...\n")); retcode = pacman_remove(db, tmp, skiplist); FREELIST(tmp); if(retcode == 1) { - fprintf(stderr, "\nupgrade aborted.\n"); + fprintf(stderr, _("\nupgrade aborted.\n")); return(1); } /* reload package cache */ @@ -1757,7 +1774,7 @@ int pacman_add(pacdb_t *db, PMList *targ } if(!pmo_upgrade) { - printf("installing %s... ", info->name); + printf(_("installing %s... "), info->name); neednl = 1; /* pre_install scriptlet */ if(info->scriptlet) { @@ -1768,10 +1785,10 @@ int pacman_add(pacdb_t *db, PMList *targ /* open the .tar.gz package */ if(tar_open(&tar, info->filename, &gztype, O_RDONLY, 0, TAR_GNU) == -1) { - perror("could not open package"); + perror(_("could not open package")); return(1); } - vprint("extracting files...\n"); + vprint(_("extracting files...\n")); for(i = 0; !th_read(tar); i++) { int nb = 0; int notouch = 0; @@ -1819,7 +1836,7 @@ int pacman_add(pacdb_t *db, PMList *targ temp = strdup("/tmp/pacman_XXXXXX"); mkstemp(temp); if(tar_extract_file(tar, temp)) { - logaction(stderr, "could not extract %s: %s", pathname, strerror(errno)); + logaction(stderr, _("could not extract %s: %s"), pathname, strerror(errno)); errors++; continue; } @@ -1840,11 +1857,11 @@ int pacman_add(pacdb_t *db, PMList *targ } } - vprint("checking md5 hashes for %s\n", expath); - vprint(" current: %s\n", md5_local); - vprint(" new: %s\n", md5_pkg); + vprint(_("checking md5 hashes for %s\n"), expath); + vprint(_(" current: %s\n"), md5_local); + vprint(_(" new: %s\n"), md5_pkg); if(md5_orig) { - vprint(" original: %s\n", md5_orig); + vprint(_(" original: %s\n"), md5_orig); } if(!pmo_upgrade) { @@ -1856,13 +1873,13 @@ int pacman_add(pacdb_t *db, PMList *targ char newpath[PATH_MAX]; snprintf(newpath, PATH_MAX, "%s.pacorig", expath); if(rename(expath, newpath)) { - logaction(stderr, "error: could not rename %s: %s", expath, strerror(errno)); + logaction(stderr, _("error: could not rename %s: %s"), expath, strerror(errno)); } if(copyfile(temp, expath)) { - logaction(stderr, "error: could not copy %s to %s: %s", temp, expath, strerror(errno)); + logaction(stderr, _("error: could not copy %s to %s: %s"), temp, expath, strerror(errno)); errors++; } else { - logaction(stderr, "warning: %s saved as %s", expath, newpath); + logaction(stderr, _("warning: %s saved as %s"), expath, newpath); } } } else if(md5_orig) { @@ -2032,28 +2032,28 @@ int pacman_add(pacdb_t *db, PMList *targ /* the fun part */ if(!strcmp(md5_orig, md5_local)) { if(!strcmp(md5_local, md5_pkg)) { - vprint(" action: installing new file\n"); + vprint(_(" action: installing new file\n")); installnew = 1; } else { - vprint(" action: installing new file\n"); + vprint(_(" action: installing new file\n")); installnew = 1; } } else if(!strcmp(md5_orig, md5_pkg)) { - vprint(" action: leaving existing file in place\n"); + vprint(_(" action: leaving existing file in place\n")); } else if(!strcmp(md5_local, md5_pkg)) { - vprint(" action: installing new file\n"); + vprint(_(" action: installing new file\n")); installnew = 1; } else { - vprint(" action: leaving file in place, installing new one as .pacnew\n"); + vprint(_(" action: leaving file in place, installing new one as .pacnew\n")); strncat(expath, ".pacnew", PATH_MAX); - logaction(stderr, "warning: extracting %s%s as %s", pmo_root, pathname, expath); + logaction(stderr, _("warning: extracting %s%s as %s"), pmo_root, pathname, expath); installnew = 1; } if(installnew) { /*vprint(" %s\n", expath);*/ if(copyfile(temp, expath)) { - fprintf(stderr, "error: could not copy %s to %s: %s\n", temp, expath, strerror(errno)); + fprintf(stderr, _("error: could not copy %s to %s: %s\n"), temp, expath, strerror(errno)); errors++; } } @@ -2069,9 +2069,9 @@ int pacman_add(pacdb_t *db, PMList *targ if(!notouch) { /*vprint(" %s\n", expath);*/ } else { - vprint("%s is in NoUpgrade - skipping\n", pathname); + vprint(_("%s is in NoUpgrade - skipping\n"), pathname); strncat(expath, ".pacnew", PATH_MAX); - logaction(stderr, "warning: extracting %s%s as %s", pmo_root, pathname, expath); + logaction(stderr, _("warning: extracting %s%s as %s"), pmo_root, pathname, expath); } if(pmo_force) { /* if pmo_force was used, then unlink() each file (whether it's there @@ -1927,7 +1944,7 @@ int pacman_add(pacdb_t *db, PMList *targ unlink(expath); } if(tar_extract_file(tar, expath)) { - logaction(stderr, "could not extract %s: %s", pathname, strerror(errno)); + logaction(stderr, _("could not extract %s: %s"), pathname, strerror(errno)); errors++; } /* calculate an md5 hash if this is in info->backup */ @@ -1951,8 +1968,8 @@ int pacman_add(pacdb_t *db, PMList *targ tar_close(tar); if(errors) { ret = 1; - logaction(stderr, "errors occurred while %s %s", - (pmo_upgrade ? "upgrading" : "installing"), info->name); + logaction(stderr, _("errors occurred while %s %s"), + (pmo_upgrade ? _("upgrading") : _("installing")), info->name); /* XXX: this "else" is disabled so the db_write() ALWAYS occurs. If it doesn't * packages can get lost during an upgrade. @@ -1982,7 +1999,7 @@ int pacman_add(pacdb_t *db, PMList *targ } } - vprint("Updating database..."); + vprint(_("Updating database...")); /* Figure out whether this package was installed explicitly by the user * or installed as a dependency for another package */ @@ -1993,15 +2010,15 @@ int pacman_add(pacdb_t *db, PMList *targ /* make an install date (in UTC) */ strncpy(info->installdate, asctime(gmtime(&t)), sizeof(info->installdate)); if(db_write(db, info, INFRQ_ALL)) { - logaction(stderr, "error updating database for %s!", info->name); + logaction(stderr, _("error updating database for %s!"), info->name); return(1); } - vprint("done.\n"); + vprint(_("done.\n")); if(pmo_upgrade && oldpkg) { - logaction(NULL, "upgraded %s (%s -> %s)", info->name, + logaction(NULL, _("upgraded %s (%s -> %s)"), info->name, oldpkg->version, info->version); } else { - logaction(NULL, "installed %s (%s)", info->name, info->version); + logaction(NULL, _("installed %s (%s)"), info->name, info->version); } /* update dependency packages' REQUIREDBY fields */ @@ -2031,7 +2048,7 @@ int pacman_add(pacdb_t *db, PMList *targ db_write(db, depinfo, INFRQ_DEPENDS); freepkg(depinfo); } - printf("done.\n"); fflush(stdout); + printf(_("done.\n")); fflush(stdout); /* run the post-install/upgrade script if it exists */ snprintf(pm_install, PATH_MAX, "%s%s/%s/%s-%s/install", pmo_root, pmo_dbpath, db->treename, info->name, info->version); @@ -2058,7 +2075,7 @@ int pacman_add(pacdb_t *db, PMList *targ if(!stat(expath, &buf)) { char cmd[PATH_MAX]; snprintf(cmd, PATH_MAX, "%s -r %s", expath, pmo_root); - vprint("running \"%s\"\n", cmd); + vprint(_("running \"%s\"\n"), cmd); system(cmd); } } @@ -2091,16 +2108,16 @@ int pacman_remove(pacdb_t *db, PMList *t groups = find_groups(db); if(is_in((char *)lp->data, groups)) { PMList *pkgs = pkg_ingroup(db, (char *)lp->data); - printf(":: group %s:\n", (char*)lp->data); + printf(_(":: group %s:\n"), (char*)lp->data); list_display(" ", pkgs); - if(yesno(" Remove whole content? [Y/n] ")) { + if(yesno(_(" Remove whole content? [Y/n] "))) { for(j = pkgs; j; j = j->next) { info = db_scan(db, (char *)j->data, INFRQ_ALL); alltargs = list_add(alltargs, info); } } else { for(j = pkgs; j; j = j->next) { - if(yesno(":: Remove %s from group %s? [Y/n] ", (char*)j->data, (char*)lp->data)) { + if(yesno(_(":: Remove %s from group %s? [Y/n] "), (char*)j->data, (char*)lp->data)) { info = db_scan(db, (char *)j->data, INFRQ_ALL); alltargs = list_add(alltargs, info); } @@ -2111,7 +2128,7 @@ int pacman_remove(pacdb_t *db, PMList *t continue; } FREELIST(groups); - fprintf(stderr, "error: could not find %s in database\n", (char*)lp->data); + fprintf(stderr, _("error: could not find %s in database\n"), (char*)lp->data); return(1); } if(pmo_op == PM_REMOVE) { @@ -2119,7 +2136,7 @@ int pacman_remove(pacdb_t *db, PMList *t * confirmation first */ for(j = pmo_holdpkg; j && j->data; j = j->next) { if(!strcmp(info->name, j->data)) { - if(!yesno(":: %s is designated as a HoldPkg. Remove anyway? [Y/n] ", info->name)) { + if(!yesno(_(":: %s is designated as a HoldPkg. Remove anyway? [Y/n] "), info->name)) { return(1); } break; @@ -2129,7 +2146,7 @@ int pacman_remove(pacdb_t *db, PMList *t alltargs = list_add(alltargs, info); } if(!pmo_nodeps && !pmo_upgrade) { - vprint("checking dependencies...\n"); + vprint(_("checking dependencies...\n")); lp = checkdeps(db, PM_REMOVE, alltargs); if(lp) { if(pmo_r_cascade) { @@ -2145,10 +2162,10 @@ int pacman_remove(pacdb_t *db, PMList *t lp = checkdeps(db, PM_REMOVE, alltargs); } } else { - fprintf(stderr, "error: this will break the following dependencies:\n"); + fprintf(stderr, _("error: this will break the following dependencies:\n")); for(j = lp; j; j = j->next) { depmissing_t* miss = (depmissing_t*)j->data; - printf(" %s: is required by %s\n", miss->target, miss->depend.name); + printf(_(" %s: is required by %s\n"), miss->target, miss->depend.name); } FREELISTPKGS(alltargs); list_free(lp); @@ -2157,12 +2174,12 @@ int pacman_remove(pacdb_t *db, PMList *t } if(pmo_r_recurse) { - vprint("finding removable dependencies...\n"); + vprint(_("finding removable dependencies...\n")); alltargs = removedeps(db, alltargs); } /* re-order w.r.t. dependencies */ - vprint("sorting by dependencies\n"); + vprint(_("sorting by dependencies\n")); lp = sortbydeps(alltargs, PM_REMOVE); /* free the old alltargs */ for(j = alltargs; j; j = j->next) { @@ -2173,9 +2190,9 @@ int pacman_remove(pacdb_t *db, PMList *t if(pmo_r_recurse || pmo_r_cascade) { /* list targets */ - list_display("\nTargets:", alltargs); + list_display(_("\nTargets:"), alltargs); /* get confirmation */ - if(yesno("\nDo you want to remove these packages? [Y/n] ") == 0) { + if(yesno(_("\nDo you want to remove these packages? [Y/n] ")) == 0) { FREELISTPKGS(alltargs); return(1); } @@ -2360,7 +2360,7 @@ int pacman_remove(pacdb_t *db, PMList *t snprintf(pm_install, PATH_MAX, "%s%s/%s/%s-%s/install", pmo_root, pmo_dbpath, db->treename, info->name, info->version); runscriptlet(pm_install, "pre_remove", info->version, NULL); - printf("removing %s... ", info->name); + printf(_("removing %s... "), info->name); neednl = 1; fflush(stdout); } @@ -2209,11 +2226,11 @@ int pacman_remove(pacdb_t *db, PMList *t } snprintf(line, PATH_MAX, "%s%s", pmo_root, (char*)lp->data); if(lstat(line, &buf)) { - vprint("file %s does not exist\n", line); + vprint(_("file %s does not exist\n"), line); continue; } if(S_ISDIR(buf.st_mode)) { - /*vprint(" removing directory %s\n", line);*/ + /*vprint(_(" removing directory %s\n"), line);*/ if(rmdir(line)) { /* this is okay, other packages are probably using it. */ } @@ -2414,18 +2414,18 @@ int pacman_remove(pacdb_t *db, PMList *t newpath = (char*)realloc(newpath, strlen(line)+strlen(".pacsave")+1); sprintf(newpath, "%s.pacsave", line); rename(line, newpath); - logaction(stderr, "warning: %s saved as %s", line, newpath); + logaction(stderr, _("warning: %s saved as %s"), line, newpath); } else { - /*vprint(" unlinking %s\n", line);*/ + /*vprint(_(" unlinking %s\n", line));*/ if(unlink(line)) { - perror("cannot remove file"); + perror(_("cannot remove file")); } } } } else { - /*vprint(" unlinking %s\n", line);*/ + /*vprint(_(" unlinking %s\n", line));*/ if(unlink(line)) { - perror("cannot remove file"); + perror(_("cannot remove file")); } } } @@ -2308,8 +2325,8 @@ int pacman_remove(pacdb_t *db, PMList *t freepkg(depinfo); } if(!pmo_upgrade) { - printf("done.\n"); - logaction(NULL, "removed %s (%s)", info->name, info->version); + printf(_("done.\n")); + logaction(NULL, _("removed %s (%s)"), info->name, info->version); } } @@ -2322,7 +2339,7 @@ int pacman_remove(pacdb_t *db, PMList *t if(!stat(line, &buf)) { char cmd[PATH_MAX]; snprintf(cmd, PATH_MAX, "%s -r %s", line, pmo_root); - vprint("running \"%s\"\n", cmd); + vprint(_("running \"%s\"\n"), cmd); system(cmd); } } @@ -2367,7 +2384,7 @@ int pacman_query(pacdb_t *db, PMList *ta } } else { if(!is_in(package, groups)) { - fprintf(stderr, "Group \"%s\" was not found.\n", package); + fprintf(stderr, _("Group \"%s\" was not found.\n"), package); FREELIST(groups); return(2); } @@ -2384,12 +2401,12 @@ int pacman_query(pacdb_t *db, PMList *ta /* output info for a .tar.gz package */ if(pmo_q_isfile) { if(package == NULL) { - fprintf(stderr, "error: no package file was specified for --file\n"); + fprintf(stderr, _("error: no package file was specified for --file\n")); return(1); } info = load_pkg(package); if(info == NULL) { - fprintf(stderr, "error: %s is not a package\n", package); + fprintf(stderr, _("error: %s is not a package\n"), package); return(1); } if(pmo_q_info) { @@ -2412,7 +2429,7 @@ int pacman_query(pacdb_t *db, PMList *ta if(pmo_q_owns) { char rpath[PATH_MAX]; if(package == NULL) { - fprintf(stderr, "error: no file was specified for --owns\n"); + fprintf(stderr, _("error: no file was specified for --owns\n")); return(1); } if(realpath(package, rpath)) { @@ -2619,18 +2619,18 @@ int pacman_query(pacdb_t *db, PMList *ta for(lp = info->files; lp && !gotcha; lp = lp->next) { sprintf(path, "%s%s", pmo_root, (char*)lp->data); if(!strcmp(path, rpath)) { - printf("%s is owned by %s %s\n", rpath, info->name, info->version); + printf(_("%s is owned by %s %s\n"), rpath, info->name, info->version); gotcha = 1; } } FREEPKG(info); } if(!gotcha) { - fprintf(stderr, "No package owns %s\n", package); + fprintf(stderr, _("No package owns %s\n"), package); } continue; } else { - fprintf(stderr, "error: %s is not a file.\n", package); + fprintf(stderr, _("error: %s is not a file.\n"), package); return(1); } } @@ -2469,7 +2486,7 @@ int pacman_query(pacdb_t *db, PMList *ta if(pmo_q_info || pmo_q_list) { info = db_scan(db, package, INFRQ_ALL); if(info == NULL) { - fprintf(stderr, "Package \"%s\" was not found.\n", package); + fprintf(stderr, _("Package \"%s\" was not found.\n"), package); return(2); } if(pmo_q_info) { @@ -2493,7 +2510,7 @@ int pacman_query(pacdb_t *db, PMList *ta if(!stat(path, &buf)) { md5sum = MDFile(path); if(md5sum == NULL) { - fprintf(stderr, "error calculating md5sum for %s\n", path); + fprintf(stderr, _("error calculating md5sum for %s\n"), path); continue; } if(strcmp(md5sum, ptr)) { @@ -2517,7 +2534,7 @@ int pacman_query(pacdb_t *db, PMList *ta } else if(pmo_q_orphans) { info = db_scan(db, package, INFRQ_DESC | INFRQ_DEPENDS); if(info == NULL) { - fprintf(stderr, "Package \"%s\" was not found.\n", package); + fprintf(stderr, _("Package \"%s\" was not found.\n"), package); return(2); } if(info->requiredby == NULL) { @@ -2526,7 +2543,7 @@ int pacman_query(pacdb_t *db, PMList *ta } else { info = db_scan(db, package, INFRQ_DESC); if(info == NULL) { - fprintf(stderr, "Package \"%s\" was not found.\n", package); + fprintf(stderr, _("Package \"%s\" was not found.\n"), package); return(2); } printf("%s %s\n", info->name, info->version); @@ -2576,7 +2593,7 @@ PMList* sortbydeps(PMList *targets, int while(change) { change = 0; if(numscans > numtargs) { - vprint("warning: possible dependency cycle detected\n"); + vprint(_("warning: possible dependency cycle detected\n")); change = 0; continue; } @@ -2662,12 +2679,12 @@ PMList* removedeps(pacdb_t *db, PMList * /* package not found... look for a provisio instead */ k = whatprovides(db, depend.name); if(k == NULL) { - fprintf(stderr, "warning: cannot find package \"%s\" or anything that provides it!\n", depend.name); + fprintf(stderr, _("warning: cannot find package \"%s\" or anything that provides it!\n"), depend.name); continue; } dep = db_scan(db, k->data, INFRQ_DESC | INFRQ_DEPENDS); if(dep == NULL) { - fprintf(stderr, "dep is NULL!\n"); + fprintf(stderr, _("dep is NULL!\n")); fflush(stderr); } FREELIST(k); @@ -2677,7 +2694,7 @@ PMList* removedeps(pacdb_t *db, PMList * } /* see if it was explicitly installed */ if(dep->reason == REASON_EXPLICIT) { - vprint("excluding %s -- explicitly installed\n", dep->name); + vprint(_("excluding %s -- explicitly installed\n"), dep->name); needed = 1; } /* see if other packages need it */ @@ -2763,8 +2780,8 @@ int resolvedeps(pacdb_t *local, PMList * FREELIST(provides); } if(!found) { - fprintf(stderr, "error: cannot resolve dependencies for \"%s\":\n", miss->target); - fprintf(stderr, " \"%s\" is not in the package set\n", miss->depend.name); + fprintf(stderr, _("error: cannot resolve dependencies for \"%s\":\n"), miss->target); + fprintf(stderr, _(" \"%s\" is not in the package set\n"), miss->depend.name); return(1); } found = 0; @@ -2780,7 +2797,7 @@ int resolvedeps(pacdb_t *local, PMList * FREE(sync); continue; } - vprint("resolvedeps: resolving %s\n", sync->pkg->name); + vprint(_("resolvedeps: resolving %s\n"), sync->pkg->name); found = 0; for(j = trail; j; j = j->next) { syncpkg_t *tmp = (syncpkg_t*)j->data; @@ -2805,7 +2822,7 @@ int resolvedeps(pacdb_t *local, PMList * } } if(found) { - usedep = yesno("%s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] ", + usedep = yesno(_("%s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] "), miss->target, sync->pkg->name); } if(usedep) { @@ -3082,15 +3082,15 @@ int resolvedeps(pacdb_t *local, PMList * if(resolvedeps(local, databases, sync, list, trail)) { return(1); } - vprint("resolvedeps: adding %s-%s\n", sync->pkg->name, sync->pkg->version); + vprint(_("resolvedeps: adding %s-%s\n"), sync->pkg->name, sync->pkg->version); list = list_add(list, sync); } else { - fprintf(stderr, "error: cannot resolve dependencies for \"%s\"\n", miss->target); + fprintf(stderr, _("error: cannot resolve dependencies for \"%s\"\n"), miss->target); return(1); } } else { /* cycle detected -- skip it */ - vprint("resolvedeps: dependency cycle detected: %s\n", sync->pkg->name); + vprint(_("resolvedeps: dependency cycle detected: %s\n"), sync->pkg->name); FREEPKG(sync->pkg); FREE(sync); } @@ -3071,7 +3088,7 @@ PMList* checkdeps(pacdb_t *db, unsigned for(j = tp->depends; j; j = j->next) { /* split into name/version pairs */ if(splitdep((char*)j->data, &depend)) { - logaction(stderr, "warning: invalid dependency in %s", (char*)tp->name); + logaction(stderr, _("warning: invalid dependency in %s"), (char*)tp->name); continue; } found = 0; @@ -3138,7 +3155,7 @@ PMList* checkdeps(pacdb_t *db, unsigned pkginfo_t *p = db_scan(db, k->data, INFRQ_DESC); if(p == NULL) { /* wtf */ - fprintf(stderr, "data error: %s supposedly provides %s, but it was not found in db\n", + fprintf(stderr, _("data error: %s supposedly provides %s, but it was not found in db\n"), (char*)k->data, depend.name); FREELIST(k); continue; @@ -3298,7 +3315,7 @@ int runscriptlet(char *installfn, char * } snprintf(tmpdir, PATH_MAX, "%stmp/pacman-XXXXXX", pmo_root); if(mkdtemp(tmpdir) == NULL) { - perror("error creating temp directory"); + perror(_("error creating temp directory")); return(1); } unpack(installfn, tmpdir, ".INSTALL"); @@ -3314,7 +3331,7 @@ int runscriptlet(char *installfn, char * if(!grep(scriptfn, script)) { /* script not found in scriptlet file */ if(strlen(tmpdir) && rmrf(tmpdir)) { - fprintf(stderr, "warning: could not remove tmpdir %s\n", tmpdir); + fprintf(stderr, _("warning: could not remove tmpdir %s\n"), tmpdir); } return(0); } @@ -3324,7 +3341,7 @@ int runscriptlet(char *installfn, char * /* just in case our cwd was removed in the upgrade operation */ chdir("/"); - vprint("Executing %s script...\n", script); + vprint(_("Executing %s script...\n"), script); if(oldver) { snprintf(cmdline, PATH_MAX, "echo \"umask 0022; source %s %s %s %s\" | chroot %s /bin/sh", scriptpath, script, ver, oldver, pmo_root); @@ -3336,7 +3353,7 @@ int runscriptlet(char *installfn, char * system(cmdline); if(strlen(tmpdir) && rmrf(tmpdir)) { - fprintf(stderr, "warning: could not remove tmpdir %s\n", tmpdir); + fprintf(stderr, _("warning: could not remove tmpdir %s\n"), tmpdir); } chdir(cwd); return(0); @@ -3440,7 +3457,7 @@ int parseargs(int op, int argc, char **a } if(pmo_op == 0) { - fprintf(stderr, "error: only one operation may be used at a time\n\n"); + fprintf(stderr, _("error: only one operation may be used at a time\n\n")); return(1); } @@ -3490,13 +3507,13 @@ int parseconfig(char *configfile) ptr++; strncpy(section, ptr, min(255, strlen(ptr)-1)); section[min(255, strlen(ptr)-1)] = '\0'; - vprint("config: new section '%s'\n", section); + vprint(_("config: new section '%s'\n"), section); if(!strlen(section)) { - fprintf(stderr, "config: line %d: bad section name\n", linenum); + fprintf(stderr, _("config: line %d: bad section name\n"), linenum); return(1); } if(!strcmp(section, "local")) { - fprintf(stderr, "config: line %d: '%s' is reserved and cannot be used as a package tree\n", + fprintf(stderr, _("config: line %d: '%s' is reserved and cannot be used as a package tree\n"), linenum, section); return(1); } @@ -3522,26 +3539,26 @@ int parseconfig(char *configfile) ptr = line; key = strsep(&ptr, "="); if(key == NULL) { - fprintf(stderr, "config: line %d: syntax error\n", linenum); + fprintf(stderr, _("config: line %d: syntax error\n"), linenum); return(1); } trim(key); key = strtoupper(key); if(!strlen(section) && strcmp(key, "INCLUDE")) { - fprintf(stderr, "config: line %d: all directives must belong to a section\n", linenum); + fprintf(stderr, _("config: line %d: all directives must belong to a section\n"), linenum); return(1); } if(ptr == NULL) { if(!strcmp(key, "NOPASSIVEFTP")) { pmo_nopassiveftp = 1; - vprint("config: nopassiveftp\n"); + vprint(_("config: nopassiveftp\n")); } else if(!strcmp(key, "USESYSLOG")) { pmo_usesyslog = 1; - vprint("config: usesyslog\n"); + vprint(_("config: usesyslog\n")); } else if(!strcmp(key, "ILOVECANDY")) { pmo_chomp = 1; } else { - fprintf(stderr, "config: line %d: syntax error\n", linenum); + fprintf(stderr, _("config: line %d: syntax error\n"), linenum); return(1); } } else { @@ -3549,7 +3566,7 @@ int parseconfig(char *configfile) if(!strcmp(key, "INCLUDE")) { char conf[PATH_MAX]; strncpy(conf, ptr, PATH_MAX); - vprint("config: including %s\n", conf); + vprint(_("config: including %s\n"), conf); parseconfig(conf); } else if(!strcmp(section, "options")) { if(!strcmp(key, "NOUPGRADE")) { @@ -3859,65 +3859,65 @@ int parseconfig(char *configfile) while((q = strchr(p, ' '))) { *q = '\0'; pmo_noupgrade = list_add(pmo_noupgrade, strdup(p)); - vprint("config: noupgrade: %s\n", p); + vprint(_("config: noupgrade: %s\n"), p); p = q; p++; } pmo_noupgrade = list_add(pmo_noupgrade, strdup(p)); - vprint("config: noupgrade: %s\n", p); + vprint(_("config: noupgrade: %s\n"), p); } else if(!strcmp(key, "NOEXTRACT")) { char *p = ptr; char *q; while((q = strchr(p, ' '))) { *q = '\0'; pmo_noextract = list_add(pmo_noextract, strdup(p)); - vprint("config: noextract: %s\n", p); + vprint(_("config: noextract: %s\n"), p); p = q; p++; } pmo_noextract = list_add(pmo_noextract, strdup(p)); - vprint("config: noextract: %s\n", p); + vprint(_("config: noextract: %s\n"), p); } else if(!strcmp(key, "IGNOREPKG")) { char *p = ptr; char *q; while((q = strchr(p, ' '))) { *q = '\0'; pmo_ignorepkg = list_add(pmo_ignorepkg, strdup(p)); - vprint("config: ignorepkg: %s\n", p); + vprint(_("config: ignorepkg: %s\n"), p); p = q; p++; } pmo_ignorepkg = list_add(pmo_ignorepkg, strdup(p)); - vprint("config: ignorepkg: %s\n", p); + vprint(_("config: ignorepkg: %s\n"), p); } else if(!strcmp(key, "HOLDPKG")) { char *p = ptr; char *q; while((q = strchr(p, ' '))) { *q = '\0'; pmo_holdpkg = list_add(pmo_holdpkg, strdup(p)); - vprint("config: holdpkg: %s\n", p); + vprint(_("config: holdpkg: %s\n"), p); p = q; p++; } pmo_holdpkg = list_add(pmo_holdpkg, strdup(p)); - vprint("config: holdpkg: %s\n", p); + vprint(_("config: holdpkg: %s\n"), p); } else if(!strcmp(key, "DBPATH")) { /* shave off the leading slash, if there is one */ if(*ptr == '/') { ptr++; } strncpy(pmo_dbpath, ptr, PATH_MAX); - vprint("config: dbpath: %s\n", pmo_dbpath); + vprint(_("config: dbpath: %s\n"), pmo_dbpath); } else if (!strcmp(key, "LOGFILE")) { if(pmo_logfile) { FREE(pmo_logfile); } pmo_logfile = strndup(ptr, PATH_MAX); - vprint("config: log file: %s\n", pmo_logfile); + vprint(_("config: log file: %s\n"), pmo_logfile); } else if (!strcmp(key, "XFERCOMMAND")) { FREE(pmo_xfercommand); pmo_xfercommand = strndup(ptr, PATH_MAX); - vprint("config: xfercommand: %s\n", pmo_xfercommand); + vprint(_("config: xfercommand: %s\n"), pmo_xfercommand); } else if (!strcmp(key, "PROXYSERVER")) { char *p; if(pmo_proxyhost) { @@ -3614,18 +3631,18 @@ int parseconfig(char *configfile) if(p) { p += 3; if(p == NULL || *p == '\0') { - fprintf(stderr, "config: line %d: bad server location\n", linenum); + fprintf(stderr, _("config: line %d: bad server location\n"), linenum); return(1); } ptr = p; } pmo_proxyhost = strndup(ptr, PATH_MAX); - vprint("config: proxyserver: %s\n", pmo_proxyhost); + vprint(_("config: proxyserver: %s\n"), pmo_proxyhost); } else if (!strcmp(key, "PROXYPORT")) { pmo_proxyport = (unsigned short)atoi(ptr); - vprint("config: proxyport: %u\n", pmo_proxyport); + vprint(_("config: proxyport: %u\n"), pmo_proxyport); } else { - fprintf(stderr, "config: line %d: syntax error\n", linenum); + fprintf(stderr, _("config: line %d: syntax error\n"), linenum); return(1); } } else { @@ -3640,13 +3657,13 @@ int parseconfig(char *configfile) p = strstr(ptr, "://"); if(p == NULL) { - fprintf(stderr, "config: line %d: bad server location\n", linenum); + fprintf(stderr, _("config: line %d: bad server location\n"), linenum); return(1); } *p = '\0'; p++; p++; p++; if(p == NULL || *p == '\0') { - fprintf(stderr, "config: line %d: bad server location\n", linenum); + fprintf(stderr, _("config: line %d: bad server location\n"), linenum); return(1); } server->protocol = strdup(ptr); @@ -3677,14 +3694,14 @@ int parseconfig(char *configfile) sprintf(server->path, "%s/", p); } } else { - fprintf(stderr, "config: line %d: protocol %s is not supported\n", linenum, ptr); + fprintf(stderr, _("config: line %d: protocol %s is not supported\n"), linenum, ptr); return(1); } /* add to the list */ - vprint("config: %s: server: %s %s %s\n", section, server->protocol, server->server, server->path); + vprint(_("config: %s: server: %s %s %s\n"), section, server->protocol, server->server, server->path); sync->servers = list_add(sync->servers, server); } else { - fprintf(stderr, "config: line %d: syntax error\n", linenum); + fprintf(stderr, _("config: line %d: syntax error\n"), linenum); return(1); } } @@ -4017,73 +4017,73 @@ int parseconfig(char *configfile) void usage(int op, char *myname) { if(op == PM_MAIN) { - printf("usage: %s {-h --help}\n", myname); - printf(" %s {-V --version}\n", myname); - printf(" %s {-A --add} [options] \n", myname); - printf(" %s {-R --remove} [options] \n", myname); - printf(" %s {-U --upgrade} [options] \n", myname); - printf(" %s {-F --freshen} [options] \n", myname); - printf(" %s {-Q --query} [options] [package]\n", myname); - printf(" %s {-S --sync} [options] [package]\n", myname); - printf("\nuse '%s --help' with other options for more syntax\n\n", myname); + printf(_("usage: %s {-h --help}\n"), myname); + printf(_(" %s {-V --version}\n"), myname); + printf(_(" %s {-A --add} [options] \n"), myname); + printf(_(" %s {-R --remove} [options] \n"), myname); + printf(_(" %s {-U --upgrade} [options] \n"), myname); + printf(_(" %s {-F --freshen} [options] \n"), myname); + printf(_(" %s {-Q --query} [options] [package]\n"), myname); + printf(_(" %s {-S --sync} [options] [package]\n"), myname); + printf(_("\nuse '%s --help' with other options for more syntax\n\n"), myname); } else { if(op == PM_ADD) { - printf("usage: %s {-A --add} [options] \n", myname); - printf("options:\n"); - printf(" -d, --nodeps skip dependency checks\n"); - printf(" -f, --force force install, overwrite conflicting files\n"); + printf(_("usage: %s {-A --add} [options] \n"), myname); + printf(_("options:\n")); + printf(_(" -d, --nodeps skip dependency checks\n")); + printf(_(" -f, --force force install, overwrite conflicting files\n")); } else if(op == PM_REMOVE) { - printf("usage: %s {-R --remove} [options] \n", myname); - printf("options:\n"); - printf(" -c, --cascade remove packages and all packages that depend on them\n"); - printf(" -d, --nodeps skip dependency checks\n"); - printf(" -k, --dbonly only remove database entry, do not remove files\n"); - printf(" -n, --nosave remove configuration files as well\n"); - printf(" -s, --recursive remove dependencies also (that won't break packages)\n"); + printf(_("usage: %s {-R --remove} [options] \n"), myname); + printf(_("options:\n")); + printf(_(" -c, --cascade remove packages and all packages that depend on them\n")); + printf(_(" -d, --nodeps skip dependency checks\n")); + printf(_(" -k, --dbonly only remove database entry, do not remove files\n")); + printf(_(" -n, --nosave remove configuration files as well\n")); + printf(_(" -s, --recursive remove dependencies also (that won't break packages)\n")); } else if(op == PM_UPGRADE) { if(pmo_freshen) { - printf("usage: %s {-F --freshen} [options] \n", myname); + printf(_("usage: %s {-F --freshen} [options] \n"), myname); } else { - printf("usage: %s {-U --upgrade} [options] \n", myname); + printf(_("usage: %s {-U --upgrade} [options] \n"), myname); } - printf("options:\n"); - printf(" -d, --nodeps skip dependency checks\n"); - printf(" -f, --force force install, overwrite conflicting files\n"); + printf(_("options:\n")); + printf(_(" -d, --nodeps skip dependency checks\n")); + printf(_(" -f, --force force install, overwrite conflicting files\n")); } else if(op == PM_QUERY) { - printf("usage: %s {-Q --query} [options] [package]\n", myname); - printf("options:\n"); - printf(" -e, --orphans list all packages that were explicitly installed\n"); - printf(" and are not required by any other packages\n"); - printf(" -g, --groups view all members of a package group\n"); - printf(" -i, --info view package information (use -ii for more)\n"); - printf(" -l, --list list the contents of the queried package\n"); - printf(" -m, --foreign list all packages that were not found in the sync db(s)\n"); - printf(" -o, --owns query the package that owns \n"); - printf(" -p, --file pacman will query the package file [package] instead of\n"); - printf(" looking in the database\n"); - printf(" -s, --search search locally-installed packages for matching regexps\n"); + printf(_("usage: %s {-Q --query} [options] [package]\n"), myname); + printf(_("options:\n")); + printf(_(" -e, --orphans list all packages that were explicitly installed\n")); + printf(_(" and are not required by any other packages\n")); + printf(_(" -g, --groups view all members of a package group\n")); + printf(_(" -i, --info view package information (use -ii for more)\n")); + printf(_(" -l, --list list the contents of the queried package\n")); + printf(_(" -m, --foreign list all packages that were not found in the sync db(s)\n")); + printf(_(" -o, --owns query the package that owns \n")); + printf(_(" -p, --file pacman will query the package file [package] instead of\n")); + printf(_(" looking in the database\n")); + printf(_(" -s, --search search locally-installed packages for matching regexps\n")); } else if(op == PM_SYNC) { - printf("usage: %s {-S --sync} [options] [package]\n", myname); - printf("options:\n"); - printf(" -c, --clean remove old packages from cache directory (use -cc for all)\n"); - printf(" -d, --nodeps skip dependency checks\n"); - printf(" -f, --force force install, overwrite conflicting files\n"); - printf(" -g, --groups view all members of a package group\n"); - printf(" -i, --info view package information\n"); - printf(" -l, --list list all packages belonging to the specified repository\n"); - printf(" -p, --print-uris print out download URIs for each package to be installed\n"); - printf(" -s, --search search remote repositories for matching regexps\n"); - printf(" -u, --sysupgrade upgrade all packages that are out of date\n"); - printf(" -w, --downloadonly download packages but do not install/upgrade anything\n"); - printf(" -y, --refresh download fresh package databases from the server\n"); - printf(" --ignore ignore a package upgrade (can be used more than once)\n"); + printf(_("usage: %s {-S --sync} [options] [package]\n"), myname); + printf(_("options:\n")); + printf(_(" -c, --clean remove old packages from cache directory (use -cc for all)\n")); + printf(_(" -d, --nodeps skip dependency checks\n")); + printf(_(" -f, --force force install, overwrite conflicting files\n")); + printf(_(" -g, --groups view all members of a package group\n")); + printf(_(" -i, --info view package information\n")); + printf(_(" -l, --list list all packages belonging to the specified repository\n")); + printf(_(" -p, --print-uris print out download URIs for each package to be installed\n")); + printf(_(" -s, --search search remote repositories for matching regexps\n")); + printf(_(" -u, --sysupgrade upgrade all packages that are out of date\n")); + printf(_(" -w, --downloadonly download packages but do not install/upgrade anything\n")); + printf(_(" -y, --refresh download fresh package databases from the server\n")); + printf(_(" --ignore ignore a package upgrade (can be used more than once)\n")); } - printf(" --config set an alternate configuration file\n"); - printf(" --noconfirm do not ask for any confirmation\n"); - printf(" --noprogressbar do not show a progress bar when downloading files\n"); - printf(" -v, --verbose be verbose\n"); - printf(" -r, --root set an alternate installation root\n"); - printf(" -b, --dbpath set an alternate database location\n"); + printf(_(" --config set an alternate configuration file\n")); + printf(_(" --noconfirm do not ask for any confirmation\n")); + printf(_(" --noprogressbar do not show a progress bar when downloading files\n")); + printf(_(" -v, --verbose be verbose\n")); + printf(_(" -r, --root set an alternate installation root\n")); + printf(_(" -b, --dbpath set an alternate database location\n")); } } @@ -4091,12 +4091,12 @@ void usage(int op, char *myname) */ void version(void) { - printf("\n"); - printf(" .--. Pacman v%s\n", PACVER); - printf("/ _.-' .-. .-. .-. Copyright (C) 2002-2006 Judd Vinet \n"); - printf("\\ '-. '-' '-' '-' \n"); - printf(" '--' This program may be freely redistributed under\n"); - printf(" the terms of the GNU General Public License\n\n"); + printf(_("\n")); + printf(_(" .--. Pacman v%s\n"), PACVER); + printf(_("/ _.-' .-. .-. .-. Copyright (C) 2002-2006 Judd Vinet \n")); + printf(_("\\ '-. '-' '-' '-' \n")); + printf(_(" '--' This program may be freely redistributed under\n")); + printf(_(" the terms of the GNU General Public License\n\n")); } /* Output a message to stderr, and (optionally) syslog and/or a logfile */ @@ -3854,7 +3871,7 @@ int yesno(char *fmt, ...) fflush(stdout); if(fgets(response, 32, stdin)) { trim(response); - if(!strcasecmp(response, "Y") || !strcasecmp(response, "YES") || !strlen(response)) { + if(!strcasecmp(response, _("Y")) || !strcasecmp(response, _("YES")) || !strlen(response)) { return(1); } } @@ -3885,7 +3902,7 @@ void cleanup(int signum) PMList *lp; if(pm_access == READ_WRITE && lckrm(lckfile)) { - logaction(stderr, "warning: could not remove lock file %s", lckfile); + logaction(stderr, _("warning: could not remove lock file %s"), lckfile); } if(workfile) { /* remove the current file being downloaded (as it's not complete) */ diff -Nurp pacman-2.9.5/src/pacsync.c pacman-i18n-0.1.1/src/pacsync.c --- pacman-2.9.5/src/pacsync.c 2005-01-11 23:14:16.000000000 +0000 +++ pacman-i18n-0.1.1/src/pacsync.c 2005-01-21 13:58:27.000000000 +0000 @@ -34,6 +34,8 @@ #include "db.h" #include "util.h" #include "pacsync.h" +#include "pacman.h" +#include "i18n.h" /* progress bar */ static int log_progress(netbuf *ctl, int xfered, void *arg); @@ -81,7 +83,7 @@ int sync_synctree() /* get the lastupdate time */ snprintf(path, PATH_MAX, "%s/%s", ldir, sync->treename); if(db_getlastupdate(path, lastupdate)) { - vprint("failed to get lastupdate time for %s (no big deal)\n", sync->treename); + vprint(_("failed to get lastupdate time for %s (no big deal)\n"), sync->treename); } else { mtime = lastupdate; } @@ -92,20 +94,20 @@ int sync_synctree() success = 1; ret = downloadfiles_forreal(sync->servers, ldir, files, mtime, newmtime); - vprint("pacsync: new mtime for %s: %s\n", sync->treename, newmtime); + vprint(_("pacsync: new mtime for %s: %s\n"), sync->treename, newmtime); FREELIST(files); if(ret > 0) { - fprintf(stderr, "failed to synchronize %s\n", sync->treename); + fprintf(stderr, _("failed to synchronize %s\n"), sync->treename); success = 0; } else if(ret < 0) { - printf(":: %s is up to date\n", sync->treename); + printf(_(":: %s is up to date\n"), sync->treename); } else { snprintf(path, PATH_MAX, "%s/%s.db.tar.gz", ldir, sync->treename); if(success) { snprintf(ldir, PATH_MAX, "%s%s/%s", pmo_root, pmo_dbpath, sync->treename); /* remove the old dir */ - vprint("removing %s (if it exists)\n", ldir); + vprint(_("removing %s (if it exists)\n"), ldir); rmrf(ldir); /* make the new dir */ @@ -114,7 +116,7 @@ int sync_synctree() umask(oldmask); /* uncompress the sync database */ - vprint("unpacking %s...\n", path); + vprint(_("unpacking %s...\n"), path); if(unpack(path, ldir, NULL)) { return(1); } @@ -180,27 +182,27 @@ int downloadfiles_forreal(PMList *server if(!pmo_xfercommand && strcmp(server->protocol, "file")) { if(!strcmp(server->protocol, "ftp") && !pmo_proxyhost) { FtpInit(); - vprint("connecting to %s:21\n", server->server); + vprint(_("connecting to %s:21\n"), server->server); if(!FtpConnect(server->server, &control)) { - fprintf(stderr, "error: cannot connect to %s\n", server->server); + fprintf(stderr, _("error: cannot connect to %s\n"), server->server); continue; } if(!FtpLogin("anonymous", "arch@guest", control)) { - fprintf(stderr, "error: anonymous login failed\n"); + fprintf(stderr, _("error: anonymous login failed\n")); FtpQuit(control); continue; } if(!FtpChdir(server->path, control)) { - fprintf(stderr, "error: could not cwd to %s: %s\n", server->path, + fprintf(stderr, _("error: could not cwd to %s: %s\n"), server->path, FtpLastResponse(control)); continue; } if(!pmo_nopassiveftp) { if(!FtpOptions(FTPLIB_CONNMODE, FTPLIB_PASSIVE, control)) { - fprintf(stderr, "warning: failed to set passive mode\n"); + fprintf(stderr, _("warning: failed to set passive mode\n")); } } else { - vprint("FTP passive mode not set\n"); + vprint(_("FTP passive mode not set\n")); } } else if(pmo_proxyhost) { char *host; @@ -208,12 +210,12 @@ int downloadfiles_forreal(PMList *server host = (pmo_proxyhost) ? pmo_proxyhost : server->server; port = (pmo_proxyport) ? pmo_proxyport : 80; if(strchr(host, ':')) { - vprint("connecting to %s\n", host); + vprint(_("connecting to %s\n"), host); } else { - vprint("connecting to %s:%u\n", host, port); + vprint(_("connecting to %s:%u\n"), host, port); } if(!HttpConnect(host, port, &control)) { - fprintf(stderr, "error: cannot connect to %s\n", host); + fprintf(stderr, _("error: cannot connect to %s\n"), host); continue; } } @@ -272,18 +274,18 @@ int downloadfiles_forreal(PMList *server /* cwd to the download directory */ getcwd(cwd, PATH_MAX); if(chdir(localpath)) { - fprintf(stderr, "error: could not chdir to %s\n", localpath); + fprintf(stderr, _("error: could not chdir to %s\n"), localpath); return(1); } /* execute the parsed command via /bin/sh -c */ - vprint("running command: %s\n", parsedCmd); + vprint(_("running command: %s\n"), parsedCmd); ret = system(parsedCmd); if(ret == -1) { - fprintf(stderr, "error running XferCommand: fork failed!\n"); + fprintf(stderr, _("error running XferCommand: fork failed!\n")); return(1); } else if(ret != 0) { /* download failed */ - vprint("XferCommand command returned non-zero status code (%d)\n", ret); + vprint(_("XferCommand command returned non-zero status code (%d)\n"), ret); } else { /* download was successful */ complete = list_add(complete, fn); @@ -328,18 +330,18 @@ int downloadfiles_forreal(PMList *server if(!strcmp(server->protocol, "ftp") && !pmo_proxyhost) { if(!FtpSize(fn, &fsz, FTPLIB_IMAGE, control)) { - fprintf(stderr, "warning: failed to get filesize for %s\n", fn); + fprintf(stderr, _("warning: failed to get filesize for %s\n"), fn); } /* check mtimes */ if(mtime1 || mtime2) { char fmtime[64]; if(!FtpModDate(fn, fmtime, sizeof(fmtime)-1, control)) { - fprintf(stderr, "warning: failed to get mtime for %s\n", fn); + fprintf(stderr, _("warning: failed to get mtime for %s\n"), fn); } else { trim(fmtime); if(mtime1 && !strcmp(mtime1, fmtime)) { /* mtimes are identical, skip this file */ - vprint("mtimes are identical, skipping %s\n", fn); + vprint(_("mtimes are identical, skipping %s\n"), fn); filedone = -1; complete = list_add(complete, fn); } @@ -353,14 +355,14 @@ int downloadfiles_forreal(PMList *server if(!stat(output, &st)) { offset = (int)st.st_size; if(!FtpRestart(offset, control)) { - fprintf(stderr, "warning: failed to resume download -- restarting\n"); + fprintf(stderr, _("warning: failed to resume download -- restarting\n")); /* can't resume: */ /* unlink the file in order to restart download from scratch */ unlink(output); } } if(!FtpGet(output, fn, FTPLIB_IMAGE, control)) { - fprintf(stderr, "\nfailed downloading %s from %s: %s\n", + fprintf(stderr, _("\nfailed downloading %s from %s: %s\n"), fn, server->server, FtpLastResponse(control)); /* we leave the partially downloaded file in place so it can be resumed later */ } else { @@ -378,12 +380,12 @@ int downloadfiles_forreal(PMList *server host = (pmo_proxyhost) ? pmo_proxyhost : server->server; port = (pmo_proxyhost) ? pmo_proxyport : 80; if(strchr(host, ':')) { - vprint("connecting to %s\n", host); + vprint(_("connecting to %s\n"), host); } else { - vprint("connecting to %s:%u\n", host, port); + vprint(_("connecting to %s:%u\n"), host, port); } if(!HttpConnect(host, port, &control)) { - fprintf(stderr, "error: cannot connect to %s\n", host); + fprintf(stderr, _("error: cannot connect to %s\n"), host); continue; } /* set up our progress bar's callback (and idle timeout) */ @@ -404,7 +406,7 @@ int downloadfiles_forreal(PMList *server snprintf(src, PATH_MAX, "%s://%s%s%s", server->protocol, server->server, server->path, fn); } if(!HttpGet(server->server, output, src, &fsz, control, offset)) { - fprintf(stderr, "\nfailed downloading %s from %s: %s\n", + fprintf(stderr, _("\nfailed downloading %s from %s: %s\n"), src, server->server, FtpLastResponse(control)); /* we leave the partially downloaded file in place so it can be resumed later */ } else { @@ -413,10 +415,10 @@ int downloadfiles_forreal(PMList *server } else if(!strcmp(server->protocol, "file")) { char src[PATH_MAX]; snprintf(src, PATH_MAX, "%s%s", server->path, fn); - vprint("copying %s to %s/%s\n", src, localpath, fn); + vprint(_("copying %s to %s/%s\n"), src, localpath, fn); /* local repository, just copy the file */ if(copyfile(src, output)) { - fprintf(stderr, "failed copying %s\n", src); + fprintf(stderr, _("failed copying %s\n"), src); } else { filedone = 1; } diff -Nurp pacman-2.9.5/src/util.c pacman-i18n-0.1.1/src/util.c --- pacman-2.9.5/src/util.c 2005-01-11 23:14:16.000000000 +0000 +++ pacman-i18n-0.1.1/src/util.c 2005-01-21 14:00:27.000000000 +0000 @@ -31,6 +31,7 @@ #include #include #include "util.h" +#include "i18n.h" extern unsigned short pmo_verbose; @@ -102,7 +103,7 @@ int unpack(char *archive, const char *pr if(fn && strcmp(fn, th_get_pathname(tar))) { if(TH_ISREG(tar) && tar_skip_regfile(tar)) { char errorstr[255]; - snprintf(errorstr, 255, "bad tar archive: %s", archive); + snprintf(errorstr, 255, _("bad tar archive: %s"), archive); perror(errorstr); return(1); } @@ -110,7 +111,7 @@ int unpack(char *archive, const char *pr } snprintf(expath, PATH_MAX, "%s/%s", prefix, th_get_pathname(tar)); if(tar_extract_file(tar, expath)) { - fprintf(stderr, "could not extract %s: %s\n", th_get_pathname(tar), strerror(errno)); + fprintf(stderr, _("could not extract %s: %s\n"), th_get_pathname(tar), strerror(errno)); } if(fn) break; } diff -Nurp pacman-2.9.5/src/vercmp.c pacman-i18n-0.1.1/src/vercmp.c --- pacman-2.9.5/src/vercmp.c 2005-01-11 23:14:16.000000000 +0000 +++ pacman-i18n-0.1.1/src/vercmp.c 2005-01-21 14:00:45.000000000 +0000 @@ -22,13 +22,14 @@ #include #include #include "rpmvercmp.h" +#include "i18n.h" int main(int argc, char *argv[]) { char s1[255] = ""; char s2[255] = ""; int ret; - + if(argc > 1) { strncpy(s1, argv[1], 255); }